diff --git a/smart-admin-service/pom.xml b/smart-admin-service/pom.xml
index 614d201d..6afc9b2f 100644
--- a/smart-admin-service/pom.xml
+++ b/smart-admin-service/pom.xml
@@ -325,7 +325,9 @@
dev
-
+
+ true
+
telework
@@ -350,9 +352,7 @@
prod
-
- true
-
+
diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
index 63de0f70..7500b708 100644
--- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
+++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
@@ -4,17 +4,17 @@ package net.lab1024.smartadmin.module.system.wxpay;
import net.lab1024.smartadmin.module.system.wxpay.sdk.IWXPayDomain;
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConfig;
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConstants;
+import org.apache.commons.io.IOUtils;
import org.springframework.stereotype.Component;
import java.io.*;
+
+
+
@Component
public class MyConfig implements WXPayConfig {
-// private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/";
- private String path ="/var/www/html/shop/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/pro/";
-
-// public String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX";
public String notify_url = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/updateOrderWX";
@@ -26,11 +26,9 @@ public class MyConfig implements WXPayConfig {
private byte[] certData;
-
public MyConfig() throws Exception {
- File file = new File(path+"apiclient_cert.p12");
- InputStream certStream = new FileInputStream(file);
- this.certData = new byte[(int) file.length()];
+ InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("wxpay/pro/apiclient_cert.p12");
+ this.certData = IOUtils.toByteArray(certStream);
certStream.read(this.certData);
certStream.close();
}
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
index 3f86d801..a886a753 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
@@ -132,4 +132,4 @@ royalcanin.memberaddress = http://miniapp-test.royalcanin.com.cn:7080/crm/member
royalcanin.member = http://miniapp-test.royalcanin.com.cn:7080/crm/member/
royalcanin.order = https://miniapp-test.royalcanin.com.cn/rcmini/h5/orderMaster/
royalcanin.goods = https://miniapp-test.royalcanin.com.cn/rcmini/h5/
-royalcanin.goods.ip = https://royalcanincn.escase.cn/jc/royalcanin/
\ No newline at end of file
+royalcanin.goods.ip = https://royalcanincn.escase.cn/jc/royalcanin/
diff --git a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
index 0b4340f4..cfa97b2f 100644
--- a/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
+++ b/smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
@@ -128,4 +128,4 @@ royalcanin.memberaddress = http://crm.royalcanin.com.cn:8080/crm/memberAddress/
royalcanin.member = http://crm.royalcanin.com.cn:8080/crm/member/
royalcanin.order = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/
royalcanin.goods = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/
-royalcanin.goods.ip = https://shop.royalcanin.com.cn/royalcanin/royalcanin/
\ No newline at end of file
+royalcanin.goods.ip = https://shop.royalcanin.com.cn/royalcanin/royalcanin/