升级WxJava版本

rememberber · Mar 2, 2020 · facfc2e · facfc2e
1 parent 0955ac7
commit facfc2e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/pom.xml b/pom.xml
@@ -20,9 +20,9 @@
 
         <java.version>1.8</java.version>
         <logback.version>1.2.3</logback.version>
-        <weixin-java-mp.version>3.6.0</weixin-java-mp.version>
-        <weixin-java-cp.version>3.6.0</weixin-java-cp.version>
-        <weixin-java-miniapp.version>3.6.0</weixin-java-miniapp.version>
+        <weixin-java-mp.version>3.7.0</weixin-java-mp.version>
+        <weixin-java-cp.version>3.7.0</weixin-java-cp.version>
+        <weixin-java-miniapp.version>3.7.0</weixin-java-miniapp.version>
         <emoji-java.version>4.0.0</emoji-java.version>
         <hutool-all.version>4.6.2</hutool-all.version>
         <opencsv.version>4.6</opencsv.version>

diff --git a/src/main/java/com/fangxuele/tool/push/logic/msgmaker/WxMaSubscribeMsgMaker.java b/src/main/java/com/fangxuele/tool/push/logic/msgmaker/WxMaSubscribeMsgMaker.java
@@ -1,6 +1,5 @@
 package com.fangxuele.tool.push.logic.msgmaker;
 
-import cn.binarywang.wx.miniapp.bean.WxMaSubscribeData;
 import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import com.fangxuele.tool.push.bean.TemplateData;
 import com.fangxuele.tool.push.ui.form.msg.MaSubscribeMsgForm;
@@ -68,12 +67,11 @@ public WxMaSubscribeMessage makeMsg(String[] msgData) {
         String templateUrlEvaluated = TemplateUtil.evaluate(templateUrl, velocityContext);
         wxMaSubscribeMessage.setPage(templateUrlEvaluated);
 
-        WxMaSubscribeData wxMaSubscribeData;
+        WxMaSubscribeMessage.Data wxMaSubscribeData;
         for (TemplateData templateData : templateDataList) {
-            wxMaSubscribeData = new WxMaSubscribeData();
+            wxMaSubscribeData = new WxMaSubscribeMessage.Data();
             wxMaSubscribeData.setName(templateData.getName());
             wxMaSubscribeData.setValue(TemplateUtil.evaluate(templateData.getValue(), velocityContext));
-            wxMaSubscribeData.setColor(templateData.getColor());
             wxMaSubscribeMessage.addData(wxMaSubscribeData);
         }
 

diff --git a/src/main/java/com/fangxuele/tool/push/logic/msgsender/WxMaTemplateMsgSender.java b/src/main/java/com/fangxuele/tool/push/logic/msgsender/WxMaTemplateMsgSender.java
@@ -2,6 +2,7 @@
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
 import cn.binarywang.wx.miniapp.bean.WxMaTemplateMessage;
 import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
 import com.fangxuele.tool.push.App;
@@ -38,14 +39,14 @@ public SendResult send(String[] msgData) {
 
         try {
             String openId = msgData[0];
-            WxMaTemplateMessage wxMaTemplateMessage = wxMaTemplateMsgMaker.makeMsg(msgData);
-            wxMaTemplateMessage.setToUser(openId);
-            wxMaTemplateMessage.setFormId(msgData[1]);
+            WxMaSubscribeMessage wxMaSubscribeMessage = new WxMaSubscribeMessage();
+            wxMaSubscribeMessage.setToUser(openId);
+            wxMaSubscribeMessage.setTemplateId(msgData[1]);
             if (PushControl.dryRun) {
                 sendResult.setSuccess(true);
                 return sendResult;
             } else {
-                wxMaService.getMsgService().sendTemplateMsg(wxMaTemplateMessage);
+                wxMaService.getMsgService().sendSubscribeMsg(wxMaSubscribeMessage);
             }
         } catch (Exception e) {
             sendResult.setSuccess(false);