diff --git a/pluss-common-bundle/src/main/resources/config/application-common.yml b/pluss-common-bundle/src/main/resources/config/application-common.yml index aa34061..bcef10e 100644 --- a/pluss-common-bundle/src/main/resources/config/application-common.yml +++ b/pluss-common-bundle/src/main/resources/config/application-common.yml @@ -100,7 +100,7 @@ parameter: APPID: wx212769170d2c6b2a # wxfffc7bff64c7a11e #小程序付款APPID - APPLETS_APPID: wxc2bb94c0ddda1032 + APPLETS_APPID: wxfffc7bff64c7a11e APPSECRET: 4e00bbf3fc75a1ff68ce866fd13f2bcc # b84ee0efaa0d9a649746ac65525f8e10 KEY: 微信原生加密用的KEY diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java index 65e4643..d81425f 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/BaseMerAuditHandler.java @@ -120,7 +120,8 @@ public abstract class BaseMerAuditHandler implements QueryWrapper queryWrapper = new QueryWrapper() .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06"); MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper); - String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; + //String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; + String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store"; StringBuffer sb = new StringBuffer(baseUrl); sb.append("&title=").append(merchantBaseInfo.getAlias()); sb.append("&password=").append(userInfo.getPassword().toLowerCase()); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java index 16af0f9..e589a9a 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/RyxMerAuditHandler.java @@ -277,7 +277,8 @@ public class RyxMerAuditHandler { QueryWrapper queryWrapper = new QueryWrapper() .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06"); MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper); - String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; + //String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; + String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store"; StringBuffer sb = new StringBuffer(baseUrl); sb.append("&title=").append(merchantBaseInfo.getAlias()); sb.append("&password=").append(userInfo.getPassword().toLowerCase()); diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java index 433bf54..5adef24 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/task/SxfMerAuditHandler.java @@ -350,7 +350,8 @@ public class SxfMerAuditHandler { QueryWrapper queryWrapper = new QueryWrapper() .eq("merchantCode", merchantChannelStatus.getMerchantCode()).eq("photoType", "06"); MerchantImage merchantImage = merchantImageMapper.selectOne(queryWrapper); - String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; + //String baseUrl = "https://life.sxczgkj.cn/web/wmerchant.php?c=site&a=entry&ctrl=store&ac=oauth&op=add_merchan&do=web&m=we7_wmall&i=1"; + String baseUrl = "https://kysh.sxczgkj.cn/javaApi/java-api/add-store"; StringBuilder sb = new StringBuilder(baseUrl); sb.append("&title=").append(merchantBaseInfo.getAlias()); sb.append("&password=").append(userInfo.getPassword().toLowerCase()); diff --git a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java index 90fad62..3040a27 100644 --- a/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java +++ b/pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java @@ -202,10 +202,10 @@ public class MerchantController { return "3cdbacb2d4ceefa36ef1c43d0c562fb9"; }*/ - @GetMapping("/auth/Hhk6kRGkb7.txt") + @GetMapping("/auth/ODzUwrTrcr.txt") @ResponseBody public String aKfAirN1hO() { - return "c9b7ead4b4b0efd96c335aad9d445f04"; + return "68eb6c8f59bf143e3165aa5198c6905f"; } @GetMapping("/account/auth")