xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-04 03:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!141 2022-2-08 Carl

Browse Source 
Merge pull request !141 from Admin/sit-Carl
This commit is contained in:
Admin 2022-02-08 06:57:49 +00:00 committed by Gitee
commit d251f881ef
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
smart-admin-service/pom.xml
View File

@ -325,7 +325,9 @@
<properties> <properties>
<profiles.active>dev</profiles.active> <profiles.active>dev</profiles.active>
</properties> </properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile> </profile>
<profile> <profile>
<id>telework</id> <id>telework</id>
@ -350,9 +352,7 @@
<properties> <properties>
<profiles.active>prod</profiles.active> <profiles.active>prod</profiles.active>
</properties> </properties>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
</profile> </profile>
</profiles> </profiles>

14
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/MyConfig.java
View File

@ -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.IWXPayDomain;
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConfig; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConfig;
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConstants; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayConstants;
import org.apache.commons.io.IOUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import java.io.*; import java.io.*;
@Component @Component
public class MyConfig implements WXPayConfig { 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"; public String notify_url = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/updateOrderWX";
@ -26,11 +26,9 @@ public class MyConfig implements WXPayConfig {
private byte[] certData; private byte[] certData;
public MyConfig() throws Exception { public MyConfig() throws Exception {
File file = new File(path+"apiclient_cert.p12"); InputStream certStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("wxpay/pro/apiclient_cert.p12");
InputStream certStream = new FileInputStream(file); this.certData = IOUtils.toByteArray(certStream);
this.certData = new byte[(int) file.length()];
certStream.read(this.certData); certStream.read(this.certData);
certStream.close(); certStream.close();
} }

2
smart-admin-service/smart-admin-api/src/main/resources/dev/application.properties
View File

@ -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.member = http://miniapp-test.royalcanin.com.cn:7080/crm/member/
royalcanin.order = https://miniapp-test.royalcanin.com.cn/rcmini/h5/orderMaster/ royalcanin.order = https://miniapp-test.royalcanin.com.cn/rcmini/h5/orderMaster/
royalcanin.goods = https://miniapp-test.royalcanin.com.cn/rcmini/h5/ royalcanin.goods = https://miniapp-test.royalcanin.com.cn/rcmini/h5/
royalcanin.goods.ip = https://royalcanincn.escase.cn/jc/royalcanin/ royalcanin.goods.ip = https://royalcanincn.escase.cn/jc/royalcanin/

2
smart-admin-service/smart-admin-api/src/main/resources/prod/application.properties
View File

@ -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.member = http://crm.royalcanin.com.cn:8080/crm/member/
royalcanin.order = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/ royalcanin.order = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/orderMaster/
royalcanin.goods = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/ royalcanin.goods = https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/
royalcanin.goods.ip = https://shop.royalcanin.com.cn/royalcanin/royalcanin/ royalcanin.goods.ip = https://shop.royalcanin.com.cn/royalcanin/royalcanin/