From e5c56958e734fb41c5bf87d86f3f79c8d9584682 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Fri, 29 May 2020 18:27:25 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B9=A6=E8=AE=B0=E5=9C=A8=E7=BA=BF?= =?UTF-8?q?=E3=80=91=E3=80=90=E5=BE=AE=E4=BF=A1=E9=80=9A=E7=9F=A5=E6=8E=A8?= =?UTF-8?q?=E9=80=81=E5=B7=A5=E5=85=B7=E4=BB=A5=E5=8F=8Ademo=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc-api/epdc-api-server/pom.xml | 15 ++++++++++++ .../epdc/service/impl/MessageServiceImpl.java | 24 +++++++++++++++---- .../esua/epdc/utils/WxSendMessageUtils.java | 13 ---------- .../src/main/resources/application.yml | 10 ++++++++ 4 files changed, 44 insertions(+), 18 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml index 30ccfe30c..e01165d63 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/pom.xml @@ -199,6 +199,11 @@ wxfa4afaa2b5f9c876 7db9f049c78c9a6cafa673deebe8330d wagGg4eAeHu1N2N0o8Vhyan41Gr3DqFBD81o5Lv7XnQ + + trial + pages/index/index + https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token= + zh_CN @@ -245,6 +250,11 @@ wxfa4afaa2b5f9c876 7db9f049c78c9a6cafa673deebe8330d wagGg4eAeHu1N2N0o8Vhyan41Gr3DqFBD81o5Lv7XnQ + + trial + pages/index/index + https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token= + zh_CN @@ -292,6 +302,11 @@ wxfa4afaa2b5f9c876 7db9f049c78c9a6cafa673deebe8330d wagGg4eAeHu1N2N0o8Vhyan41Gr3DqFBD81o5Lv7XnQ + + formal + pages/index/index + https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token= + zh_CN diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java index 94e58e232..81dbf9dd7 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java @@ -93,6 +93,20 @@ public class MessageServiceImpl implements MessageService { @Value("${wx.message.workTemplate}") private String workTemplate; + @Value("${wx.message.jumpType}") + private String jumpType; + + @Value("${wx.message.page}") + private String page; + + @Value("${wx.message.url}") + private String url; + + @Value("${wx.message.lang}") + private String lang; + + + /** * 注册审核失败服务消息模版 */ @@ -253,7 +267,7 @@ public class MessageServiceImpl implements MessageService { // 获取access_token String analysis_access_token = WxSendMessageUtils.getAccess_token(analysisAppId, analysisSecret); // 拼接URL - String analysis_url = WxSendMessageUtils.url + analysis_access_token; + String analysis_url = url + analysis_access_token; Integer analysisResult = sendOpenIdListMessage(analyOpenIdList, analysisTemplate,analysis_url); log.info("本次小程序消息推送数据端共【" + analyOpenIdList.size() + "】接收者，发送成功【" + analysisResult + "】条。"); } @@ -261,7 +275,7 @@ public class MessageServiceImpl implements MessageService { // 获取access_token String work_access_token = WxSendMessageUtils.getAccess_token(workAppId, workSecret); // 拼接URL - String work_url = WxSendMessageUtils.url + work_access_token; + String work_url = url + work_access_token; Integer workResult = sendOpenIdListMessage(workOpenIdList,workTemplate,work_url); log.info("本次小程序消息推送工作端共【" + workOpenIdList.size() + "】接收者，发送成功【" + workResult + "】条。"); } @@ -290,11 +304,11 @@ public class MessageServiceImpl implements MessageService { String resultMsg = WxSendMessageUtils.sendMessageByOpenId( openId, url, - WxSendMessageUtils.miniprogram_state, + jumpType, templateId, m, - WxSendMessageUtils.lang, - WxSendMessageUtils.page); + lang, + page); System.out.println("接收者【" + openId + "】,发送结果【" + resultMsg + "】"); //解析返回信息 Map map = JSONObject.parseObject(resultMsg, Map.class); diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java index 2d18ca3f3..54fd46070 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/utils/WxSendMessageUtils.java @@ -42,19 +42,6 @@ public class WxSendMessageUtils { this.restTemplate = new RestTemplate(this.factory); } - //小程序发送消息相关参数 - // 跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版 - public static String miniprogram_state = "trial"; - - // 进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN - public static String lang = "zh_CN"; - - //接口路径 - public static String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token="; - - // 小程序跳转页 - public static String page = "pages/index/index"; - /** * diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml index 5f6be2c42..807785c9f 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml @@ -173,6 +173,16 @@ wx: # 模板 workTemplate: @work.wx.ma.template@ + # 通用参数 + # 跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版 + jumpType: @wx.ma.jumpType@ + # 小程序跳转页 + page: @wx.ma.page@ + # 接口路径 + url: @wx.ma.url@ + # 进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN + lang: @wx.ma.lang@ + token: