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 d95a697f..94d897f6 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 @@ -1,11 +1,9 @@ package net.lab1024.smartadmin.module.system.wxpay; -import lombok.Data; 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.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.io.*; @@ -16,8 +14,9 @@ public class MyConfig implements WXPayConfig { // private String path ="C:/Users/Administrator/IdeaProjects/smart-admin/smart-admin-service/smart-admin-api/src/main/resources/wxpay/"; private String path ="/home/royalcanin-dev/cert/"; - public String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX"; +// public String notify_url = "http://47.96.75.242:10086/smart-admin-api/royalcanin/updateOrderWX"; + public String notify_url = "https://royalcanincn.escase.cn/jc/royalcanin/royalcanin/updateOrderWX"; // 微信支付h5 回调地址 public static String NOTIFY_URL_H5 = "https://www.XXXXXX.com/server/weixin/WxQuery"; @@ -37,14 +36,16 @@ public class MyConfig implements WXPayConfig { public String getAppID() { return "wx3c51c14272f63a64"; } + //wxa9a0ae603bbe6ceb public String getMchID() { return "1315161001"; } - +// 16717629989 public String getKey() { return "b69497999e8fd1f8f1f0a9591b24eb72"; } + //indexphpcorecertapicert201903200 public InputStream getCertStream() { ByteArrayInputStream certBis = new ByteArrayInputStream(this.certData); diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index 9a7c742b..d1d5632e 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1706,6 +1706,5 @@ CREATE TABLE IF NOT EXISTS `t_royalcanin_notify_operate_log` ( `create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (`id`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; -COMMIT; -- \ No newline at end of file