升级SDK，并修复相应代码

binarywang · binarywang · commit 272817b21634 · 2016-10-28T11:24:42.000+08:00
diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.build.locales>zh_CN</project.build.locales>
 		<project.build.jdk>1.7</project.build.jdk>
-		<weixin-java-mp.version>2.2.4</weixin-java-mp.version>
+		<weixin-java-mp.version>2.2.5</weixin-java-mp.version>
 	</properties>
 
 	<dependencies>
diff --git a/src/main/java/com/github/binarywang/demo/wechat/builder/AbstractBuilder.java b/src/main/java/com/github/binarywang/demo/wechat/builder/AbstractBuilder.java
@@ -4,8 +4,8 @@
 import org.slf4j.LoggerFactory;
 
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * 
diff --git a/src/main/java/com/github/binarywang/demo/wechat/builder/ImageBuilder.java b/src/main/java/com/github/binarywang/demo/wechat/builder/ImageBuilder.java
@@ -1,9 +1,9 @@
 package com.github.binarywang.demo.wechat.builder;
 
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutImageMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutImageMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * 
diff --git a/src/main/java/com/github/binarywang/demo/wechat/builder/TextBuilder.java b/src/main/java/com/github/binarywang/demo/wechat/builder/TextBuilder.java
@@ -1,9 +1,9 @@
 package com.github.binarywang.demo.wechat.builder;
 
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutTextMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutTextMessage;
 
 /**
  * 
diff --git a/src/main/java/com/github/binarywang/demo/wechat/config/WechatMpConfiguration.java b/src/main/java/com/github/binarywang/demo/wechat/config/WechatMpConfiguration.java
@@ -62,7 +62,7 @@ public WxMpService wxMpService(WxMpConfigStorage configStorage) {
     public WxMpMessageRouter router(WxMpService wxMpService) {
         final WxMpMessageRouter newRouter = new WxMpMessageRouter(wxMpService);
 
-        // 记录所有事件的日志
+        // 记录所有事件的日志 （异步执行）
         newRouter.rule().handler(this.logHandler).next();
 
         // 接收客服会话管理事件
diff --git a/src/main/java/com/github/binarywang/demo/wechat/controller/WechatController.java b/src/main/java/com/github/binarywang/demo/wechat/controller/WechatController.java
@@ -13,8 +13,8 @@
 
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * @author Binary Wang
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/KfSessionHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/KfSessionHandler.java
@@ -6,8 +6,8 @@
 
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * 
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/LocationHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/LocationHandler.java
@@ -11,8 +11,8 @@
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * 
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/LogHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/LogHandler.java
@@ -8,8 +8,8 @@
 
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * @author Binary Wang
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/MenuHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/MenuHandler.java
@@ -9,8 +9,8 @@
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * @author Binary Wang
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/MsgHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/MsgHandler.java
@@ -14,8 +14,8 @@
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * 
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/NullHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/NullHandler.java
@@ -6,8 +6,8 @@
 
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * 
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/StoreCheckNotifyHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/StoreCheckNotifyHandler.java
@@ -6,8 +6,8 @@
 
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * 门店审核事件处理
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/SubscribeHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/SubscribeHandler.java
@@ -11,8 +11,8 @@
 import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 import me.chanjar.weixin.mp.bean.result.WxMpUser;
 
 /**
diff --git a/src/main/java/com/github/binarywang/demo/wechat/handler/UnsubscribeHandler.java b/src/main/java/com/github/binarywang/demo/wechat/handler/UnsubscribeHandler.java
@@ -8,8 +8,8 @@
 
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.api.WxMpService;
-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;
+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;
 
 /**
  * @author Binary Wang

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,8 @@`
`4`	`4`	`import org.slf4j.LoggerFactory;`
`5`	`5`
`6`	`6`	`import me.chanjar.weixin.mp.api.WxMpService;`
`7`		`-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;`
`8`		`-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;`
	`7`	`+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;`
	`8`	`+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;`
`9`	`9`
`10`	`10`	`/**`
`11`	`11`	`*`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,8 @@`
`6`	`6`
`7`	`7`	`import me.chanjar.weixin.common.session.WxSessionManager;`
`8`	`8`	`import me.chanjar.weixin.mp.api.WxMpService;`
`9`		`-import me.chanjar.weixin.mp.bean.WxMpXmlMessage;`
`10`		`-import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;`
	`9`	`+import me.chanjar.weixin.mp.bean.message.WxMpXmlMessage;`
	`10`	`+import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`*`