From 2a06b2e866eff968833fe0705d031e0ac028541b Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Fri, 7 Apr 2023 17:04:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/cn/pluss/platform/util/MobV2PushUtil.java | 2 ++ .../src/main/resources/config/application-common.yml | 2 +- pluss-manage-page/src/main/resources/application.yml | 3 +++ .../platform/merchantOrder/impl/MerchantOrderServiceImpl.java | 4 ++-- .../java/cn/pluss/platform/user/impl/GeneralPushUtil.java | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java index 48e576f..0c733bc 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobV2PushUtil.java @@ -162,6 +162,8 @@ public class MobV2PushUtil { ApiResult>> apiResult = pushApi.pushBatchByAlias(pushBatchDTO); + log.info("[uni推送]PushResult result is {}", apiResult.getData()); + if (apiResult.isSuccess()) { // success System.out.println(apiResult.getData()); 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 bcef10e..aa34061 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: wxfffc7bff64c7a11e + APPLETS_APPID: wxc2bb94c0ddda1032 APPSECRET: 4e00bbf3fc75a1ff68ce866fd13f2bcc # b84ee0efaa0d9a649746ac65525f8e10 KEY: 微信原生加密用的KEY diff --git a/pluss-manage-page/src/main/resources/application.yml b/pluss-manage-page/src/main/resources/application.yml index 978381b..348b186 100644 --- a/pluss-manage-page/src/main/resources/application.yml +++ b/pluss-manage-page/src/main/resources/application.yml @@ -31,3 +31,6 @@ server: port: 8083 servlet: context-path: /manage + compression: + enabled: true + mime-types: application/json diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java index f07514b..47f6d80 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantOrder/impl/MerchantOrderServiceImpl.java @@ -1964,7 +1964,7 @@ public class MerchantOrderServiceImpl extends ServiceImpl Date: Fri, 7 Apr 2023 18:00:24 +0800 Subject: [PATCH 2/5] update --- .../java/cn/pluss/platform/util/GetuiPushUtil.java | 5 +++++ .../src/main/java/cn/pluss/platform/util/IPush.java | 10 ++++++++++ .../main/java/cn/pluss/platform/util/JGPushUtil.java | 5 +++++ .../main/java/cn/pluss/platform/util/MobPushUtil.java | 5 +++++ 4 files changed, 25 insertions(+) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java index 7633cfd..5bdb407 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/GetuiPushUtil.java @@ -229,6 +229,11 @@ public class GetuiPushUtil implements IPush { sendAndroidByAlias(alias, notificationTitle, msgContent, extrasParam); } + @Override + public void sendAllPlatByAliasExt(List alias, String notificationTitle, String msgContent, String extrasParam) { + + } + @Override public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) { init(); diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java index 351b2b2..9c1b10a 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/IPush.java @@ -34,6 +34,16 @@ public interface IPush { */ void sendAllPlatByAlias(List alias, String notificationTitle, String msgContent, String extrasParam); + /** + * 推送到全部，android & iOS + * + * @param alias id数组 + * @param notificationTitle 推送通知标题 + * @param msgContent 推送内容 + * @param extrasParam 附加参数 + */ + void sendAllPlatByAliasExt(List alias, String notificationTitle, String msgContent, String extrasParam); + /** * 推送到全部iphone * diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java index e087cd4..6e55f35 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/JGPushUtil.java @@ -96,6 +96,11 @@ public class JGPushUtil implements IPush { sendAndResultHandle(pushPayload); } + @Override + public void sendAllPlatByAliasExt(List alias, String notificationTitle, String msgContent, String extrasParam) { + + } + @Override public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) { PushPayload pushPayload = getPayLoadBuilder(notificationTitle, msgContent, extrasParam) diff --git a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java index cde2d6d..1e56c69 100644 --- a/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java +++ b/pluss-common-bundle/src/main/java/cn/pluss/platform/util/MobPushUtil.java @@ -119,6 +119,11 @@ public class MobPushUtil implements IPush { sendAndResultHandle(push); } + @Override + public void sendAllPlatByAliasExt(List alias, String notificationTitle, String msgContent, String extrasParam) { + + } + @Override public void sendIOSAll(String notificationTitle, String msgContent, String extrasParam) { PushNotify notify = generalPushNotify(notificationTitle, msgContent, extrasParam); From 29ff052e5fee23c008287828b4a6cd50733e92dd Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Fri, 7 Apr 2023 18:00:58 +0800 Subject: [PATCH 3/5] update --- .../impl/MerchantChannelStatusServiceImpl.java | 6 +++--- .../merchantOrder/impl/MerchantOrderServiceImpl.java | 2 +- .../cn/pluss/platform/user/impl/GeneralPushUtil.java | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java index 0a75f3d..2b49e32 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java @@ -188,8 +188,8 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl alias, String notificationTitle, String msgContent, String extrasParam) { + try { + MobV2PushUtil.sendSingleByAlias(alias, notificationTitle, msgContent, "payload:{voice:\"" + msgContent + "\",type:\"1\"}}"); } catch (Exception e) { From dfb187b78986572a9208f4a51dbc05b8cdaf6751 Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Mon, 10 Apr 2023 10:43:41 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=87?= =?UTF-8?q?=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-common.yml | 2 +- .../main/java/cn/pluss/platform/task/BaseMerAuditHandler.java | 3 ++- .../main/java/cn/pluss/platform/task/RyxMerAuditHandler.java | 3 ++- .../main/java/cn/pluss/platform/task/SxfMerAuditHandler.java | 3 ++- .../cn/pluss/platform/controller/home/MerchantController.java | 4 ++-- 5 files changed, 9 insertions(+), 6 deletions(-) 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") From 9c0608c42de289709f4ade49b2c7bf263e25dda9 Mon Sep 17 00:00:00 2001 From: zhujunshuai <602228920@qq.com> Date: Mon, 10 Apr 2023 17:28:05 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9appid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/config/application-common.yml | 2 +- .../java/cn/pluss/platform/task/BaseMerAuditHandler.java | 2 +- .../java/cn/pluss/platform/task/RyxMerAuditHandler.java | 2 +- .../java/cn/pluss/platform/task/SxfMerAuditHandler.java | 2 +- .../pluss/platform/controller/home/MerchantController.java | 6 ++++++ 5 files changed, 10 insertions(+), 4 deletions(-) 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 bcef10e..aa34061 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: wxfffc7bff64c7a11e + APPLETS_APPID: wxc2bb94c0ddda1032 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 d81425f..2e1adeb 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 @@ -123,7 +123,7 @@ public abstract class BaseMerAuditHandler implements //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("?title=").append(merchantBaseInfo.getAlias()); sb.append("&password=").append(userInfo.getPassword().toLowerCase()); sb.append("&mobile=").append(userInfo.getLoginName()); sb.append("&syb_m_id=").append(merchantStore.getId()); 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 e589a9a..418a7a7 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 @@ -280,7 +280,7 @@ public class RyxMerAuditHandler { //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("?title=").append(merchantBaseInfo.getAlias()); sb.append("&password=").append(userInfo.getPassword().toLowerCase()); sb.append("&mobile=").append(userInfo.getLoginName()); sb.append("&syb_m_id=").append(merchantStore.getId()); 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 5adef24..32c6ebd 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 @@ -353,7 +353,7 @@ public class SxfMerAuditHandler { //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("?title=").append(merchantBaseInfo.getAlias()); sb.append("&password=").append(userInfo.getPassword().toLowerCase()); sb.append("&mobile=").append(userInfo.getLoginName()); sb.append("&syb_m_id=").append(merchantStore.getId()); 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 3040a27..cc2bf22 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 @@ -208,6 +208,12 @@ public class MerchantController { return "68eb6c8f59bf143e3165aa5198c6905f"; } + @GetMapping("/auth/Hhk6kRGkb7.txt") + @ResponseBody + public String Hhk6kRGkb7() { + return "c9b7ead4b4b0efd96c335aad9d445f04"; + } + @GetMapping("/account/auth") public String accountAuth(HttpServletResponse response, HttpServletRequest request) { String url = "/merchant/account/bind";