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); 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/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/merchantChannelStatus/impl/MerchantChannelStatusServiceImpl.java index 43e5ebd..700db5b 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,6 +188,7 @@ public class MerchantChannelStatusServiceImpl extends ServiceImpl 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("?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 16af0f9..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 @@ -277,9 +277,10 @@ 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("?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 433bf54..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 @@ -350,9 +350,10 @@ 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("?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/user/impl/GeneralPushUtil.java b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java index 464b2cf..dbe07d2 100644 --- a/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java +++ b/pluss-service-bundle/src/main/java/cn/pluss/platform/user/impl/GeneralPushUtil.java @@ -68,7 +68,18 @@ public class GeneralPushUtil implements IPush { mobPushUtil.sendIOSByAlias(alias, notificationTitle, msgContent, extrasParam); userPushService.push(alias, notificationTitle, msgContent, extrasParam);*/ - MobV2PushUtil.sendSingleByAlias(alias, "快银到账1万元", "快银到账1万元", "payload:{voice:\"快银到账1万元\",type:\"1\"}}"); + //MobV2PushUtil.sendSingleByAlias(alias, notificationTitle, msgContent, "payload:{voice:\"" + msgContent + "\",type:\"1\"}}"); + + } catch (Exception e) { + e.printStackTrace(); + } + } + + @Override + public void sendAllPlatByAliasExt(List alias, String notificationTitle, String msgContent, String extrasParam) { + try { + + MobV2PushUtil.sendSingleByAlias(alias, notificationTitle, msgContent, "payload:{voice:\"" + msgContent + "\",type:\"1\"}}"); } catch (Exception e) { e.printStackTrace(); 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..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 @@ -202,9 +202,15 @@ public class MerchantController { return "3cdbacb2d4ceefa36ef1c43d0c562fb9"; }*/ - @GetMapping("/auth/Hhk6kRGkb7.txt") + @GetMapping("/auth/ODzUwrTrcr.txt") @ResponseBody public String aKfAirN1hO() { + return "68eb6c8f59bf143e3165aa5198c6905f"; + } + + @GetMapping("/auth/Hhk6kRGkb7.txt") + @ResponseBody + public String Hhk6kRGkb7() { return "c9b7ead4b4b0efd96c335aad9d445f04"; }