⬆️ 升级sdk版本为4.6.0

binarywang · binarywang · commit 5a24283f94b8 · 2023-12-28T23:47:08.000+08:00
diff --git a/commit.sh b/commit.sh
@@ -0,0 +1,4 @@
+git commit -a -m ":arrow_up: 升级sdk版本为4.6.0"
+git pull --rebase
+
+git push origin master
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
 
-        <weixin-java-mp.version>4.5.0</weixin-java-mp.version>
+        <weixin-java-mp.version>4.6.0</weixin-java-mp.version>
         <spring.version>6.0.14</spring.version>
         <spring-security.version>5.5.7</spring-security.version>
         <guava.version>32.0.0-jre</guava.version>
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/controller/WxMpPortalController.java b/src/main/java/com/github/binarywang/demo/wx/mp/controller/WxMpPortalController.java
@@ -16,7 +16,7 @@
 @RequestMapping("/wechat/portal")
 public class WxMpPortalController {
   private final Logger logger = LoggerFactory.getLogger(this.getClass());
-  
+
   private WeixinService wxService;
 
   @Autowired
@@ -30,7 +30,7 @@ public String authGet(@RequestParam(name = "signature", required = false) String
                         @RequestParam(name = "timestamp", required = false) String timestamp,
                         @RequestParam(name = "nonce", required = false) String nonce,
                         @RequestParam(name = "echostr", required = false) String echostr) {
-    this.logger.info("\n接收到来自微信服务器的认证消息：[{}, {}, {}, {}]", signature, timestamp, nonce, echostr);
+    log.info("\n接收到来自微信服务器的认证消息：[{}, {}, {}, {}]", signature, timestamp, nonce, echostr);
 
     if (StringUtils.isAnyBlank(signature, timestamp, nonce, echostr)) {
       throw new IllegalArgumentException("请求参数非法，请核实!");
@@ -49,7 +49,7 @@ public String post(@RequestBody String requestBody, @RequestParam("signature") S
                      @RequestParam(name = "encrypt_type", required = false) String encType,
                      @RequestParam(name = "msg_signature", required = false) String msgSignature,
                      @RequestParam("timestamp") String timestamp, @RequestParam("nonce") String nonce) {
-    this.logger.info("\n接收微信请求：[signature=[{}], encType=[{}], msgSignature=[{}],"
+    log.info("\n接收微信请求：[signature=[{}], encType=[{}], msgSignature=[{}],"
         + " timestamp=[{}], nonce=[{}], requestBody=[\n{}\n] ",
       signature, encType, msgSignature, timestamp, nonce, requestBody);
 
@@ -71,7 +71,7 @@ public String post(@RequestBody String requestBody, @RequestParam("signature") S
       // aes加密的消息
       WxMpXmlMessage inMessage = WxMpXmlMessage.fromEncryptedXml(requestBody,
         this.wxService.getWxMpConfigStorage(), timestamp, nonce, msgSignature);
-      this.logger.debug("\n消息解密后内容为：\n{} ", inMessage.toString());
+      log.debug("\n消息解密后内容为：\n{} ", inMessage.toString());
       WxMpXmlOutMessage outMessage = this.wxService.route(inMessage);
       if (outMessage == null) {
         return "";
@@ -80,7 +80,7 @@ public String post(@RequestBody String requestBody, @RequestParam("signature") S
       out = outMessage.toEncryptedXml(this.wxService.getWxMpConfigStorage());
     }
 
-    this.logger.debug("\n组装回复信息：{}", out);
+    log.debug("\n组装回复信息：{}", out);
 
     return out;
   }
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/handler/LocationHandler.java b/src/main/java/com/github/binarywang/demo/wx/mp/handler/LocationHandler.java
@@ -27,16 +27,16 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
         String content = "感谢反馈，您的的地理位置已收到！";
         return new TextBuilder().build(content, wxMessage, null);
       } catch (Exception e) {
-        this.logger.error("位置消息接收处理失败", e);
+        log.error("位置消息接收处理失败", e);
         return null;
       }
     }
 
     //上报地理位置事件
-    this.logger.info("\n上报地理位置 。。。 ");
-    this.logger.info("\n纬度 : " + wxMessage.getLatitude());
-    this.logger.info("\n经度 : " + wxMessage.getLongitude());
-    this.logger.info("\n精度 : " + String.valueOf(wxMessage.getPrecision()));
+    log.info("\n上报地理位置 。。。 ");
+    log.info("\n纬度 : " + wxMessage.getLatitude());
+    log.info("\n经度 : " + wxMessage.getLongitude());
+    log.info("\n精度 : " + String.valueOf(wxMessage.getPrecision()));
 
     //TODO  可以将用户地理位置信息保存到本地数据库，以便以后使用
 
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/handler/LogHandler.java b/src/main/java/com/github/binarywang/demo/wx/mp/handler/LogHandler.java
@@ -29,7 +29,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
                                   Map<String, Object> context, WxMpService wxMpService,
                                   WxSessionManager sessionManager) {
     try {
-      this.logger.info("\n接收到请求消息，内容：{}", JSON.writeValueAsString(wxMessage));
+      log.info("\n接收到请求消息，内容：{}", JSON.writeValueAsString(wxMessage));
     } catch (JsonProcessingException e) {
       e.printStackTrace();
     }
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/handler/SubscribeHandler.java b/src/main/java/com/github/binarywang/demo/wx/mp/handler/SubscribeHandler.java
@@ -22,7 +22,7 @@ public class SubscribeHandler extends AbstractHandler {
   public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
                                   WxSessionManager sessionManager) throws WxErrorException {
 
-    this.logger.info("新关注用户 OPENID: " + wxMessage.getFromUser());
+    log.info("新关注用户 OPENID: " + wxMessage.getFromUser());
 
     WeixinService weixinService = (WeixinService) wxMpService;
 
@@ -37,7 +37,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> co
     try {
       responseResult = handleSpecial(wxMessage);
     } catch (Exception e) {
-      this.logger.error(e.getMessage(), e);
+      log.error(e.getMessage(), e);
     }
 
     if (responseResult != null) {
@@ -47,7 +47,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> co
     try {
       return new TextBuilder().build("感谢关注", wxMessage, weixinService);
     } catch (Exception e) {
-      this.logger.error(e.getMessage(), e);
+      log.error(e.getMessage(), e);
     }
 
     return null;
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/handler/UnsubscribeHandler.java b/src/main/java/com/github/binarywang/demo/wx/mp/handler/UnsubscribeHandler.java
@@ -19,7 +19,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
                                   Map<String, Object> context, WxMpService wxMpService,
                                   WxSessionManager sessionManager) {
     String openId = wxMessage.getFromUser();
-    this.logger.info("取消关注用户 OPENID: " + openId);
+    log.info("取消关注用户 OPENID: " + openId);
     // TODO 可以更新本地数据库为取消关注状态
     return null;
   }
diff --git a/src/main/java/com/github/binarywang/demo/wx/mp/service/WeixinService.java b/src/main/java/com/github/binarywang/demo/wx/mp/service/WeixinService.java
@@ -126,7 +126,7 @@ public WxMpXmlOutMessage route(WxMpXmlMessage message) {
     try {
       return this.router.route(message);
     } catch (Exception e) {
-      this.logger.error(e.getMessage(), e);
+      log.error(e.getMessage(), e);
     }
 
     return null;
@@ -137,7 +137,7 @@ public boolean hasKefuOnline() {
       WxMpKfOnlineList kfOnlineList = this.getKefuService().kfOnlineList();
       return kfOnlineList != null && kfOnlineList.getKfOnlineList().size() > 0;
     } catch (Exception e) {
-      this.logger.error("获取客服在线状态异常: " + e.getMessage(), e);
+      log.error("获取客服在线状态异常: " + e.getMessage(), e);
     }
 
     return false;

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,`
`29`	`29`	`Map<String, Object> context, WxMpService wxMpService,`
`30`	`30`	`WxSessionManager sessionManager) {`
`31`	`31`	`try {`
`32`		`- this.logger.info("\n接收到请求消息，内容：{}", JSON.writeValueAsString(wxMessage));`
	`32`	`+ log.info("\n接收到请求消息，内容：{}", JSON.writeValueAsString(wxMessage));`
`33`	`33`	`} catch (JsonProcessingException e) {`
`34`	`34`	`e.printStackTrace();`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,`
`19`	`19`	`Map<String, Object> context, WxMpService wxMpService,`
`20`	`20`	`WxSessionManager sessionManager) {`
`21`	`21`	`String openId = wxMessage.getFromUser();`
`22`		`- this.logger.info("取消关注用户 OPENID: " + openId);`
	`22`	`+ log.info("取消关注用户 OPENID: " + openId);`
`23`	`23`	`// TODO 可以更新本地数据库为取消关注状态`
`24`	`24`	`return null;`
`25`	`25`	`}`