Merge remote-tracking branch 'origin/feature/MasterGroup_mess'

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/MessageServiceImpl.java

@@ -95,7 +95,7 @@ public class MessageServiceImpl implements MessageService {
     @Value("${wx.message.lang}")
     private String lang;
 
-    private static RestTemplate restTemplate;
+    private RestTemplate restTemplate;
     private ClientHttpRequestFactory factory;
     @Autowired
     public void setFactory() {
@@ -213,46 +213,6 @@ public class MessageServiceImpl implements MessageService {
         return new Result();
     }
 
-    /**
-     * 小程序消息推送demo
-     *
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author wanggonfeng
-     * @date 2020/05/26 14:18
-     */
-    public Result sendMessage() {
-        // 跳转小程序类型：developer为开发版；trial为体验版；formal为正式版；默认为正式版
-        String miniprogram_state = "trial";
-        // 模板ID
-        String template_id = "wagGg4eAeHu1N2N0o8Vhyan41Gr3DqFBD81o5Lv7XnQ";
-        // 用户openID    oZCeb5TZc2oBwT4jHb0kDmQsN0Xw
-        String openId = "oZCeb5TZc2oBwT4jHb0kDmQsN0Xw";//os3585flOvphXsb7XNmYOZtooEro  oZCeb5W6GEUCVHG3InnPv1Q6r0f0
-        // 小程序跳转页
-        String page = "pages/index/index";
-        // 进入小程序查看”的语言类型，支持zh_CN(简体中文)、en_US(英文)、zh_HK(繁体中文)、zh_TW(繁体中文)，默认为zh_CN
-        String lang = "zh_CN";
-
-        // 获取access_token
-        String access_token = getAccess_token(analysisAppId, analysisSecret);
-        // 拼接URL
-        String url = "https://api.weixin.qq.com/cgi-bin/message/subscribe/send?access_token=" + access_token;
-
-        // 配置模板内容
-        Map<String, TemplateData> m = new HashMap<>(5);
-        TemplateData keyword1 = new TemplateData();
-        keyword1.setValue("您有新的话题，请登录小程序查看！");
-        m.put("thing1", keyword1);
-        TemplateData keyword2 = new TemplateData();
-        SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String dateStr = sdf.format(new Date());
-        keyword2.setValue(dateStr);
-        m.put("time2", keyword2);
-
-        String resultMsg = sendMessageByOpenId(openId,url,miniprogram_state,template_id,m,lang,page);
-
-        return new Result().ok(resultMsg);
-    }
-
     @Override
     public Result sendMessage(SendMessageFormDTO formDto) {