diff --git a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/ChatMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/ChatMessageHandler.java index 97c025cf..f3b2a12e 100644 --- a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/ChatMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/ChatMessageHandler.java @@ -17,7 +17,7 @@ public class ChatMessageHandler implements WeixinMessageHandler { } @Override - public WeixinResponse doHandle(WeixinRequest request, WeixinMessage message, Set nodeNames) { + public WeixinResponse doHandle(WeixinRequest request, WeixinMessage message) { WeixinChatMessage chatMessage = null; // 转换为实体 return BlankResponse.global; } diff --git a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/CustomMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/CustomMessageHandler.java index 682979e6..490f61b9 100644 --- a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/CustomMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/CustomMessageHandler.java @@ -27,7 +27,7 @@ public class CustomMessageHandler implements WeixinMessageHandler { } @Override - public WeixinResponse doHandle(WeixinRequest request, WeixinMessage message, Set nodeNames) { + public WeixinResponse doHandle(WeixinRequest request, WeixinMessage messager) { return new TextResponse("是你,是你,还是你。"); } diff --git a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/HelloMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/HelloMessageHandler.java index 0f78529a..9c870f96 100644 --- a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/HelloMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/HelloMessageHandler.java @@ -27,7 +27,7 @@ public class HelloMessageHandler extends TextMessageHandler { } @Override - public WeixinResponse doHandle0(WeixinRequest request, TextMessage message) { + public WeixinResponse doHandle0(TextMessage message) { /** * 返回用户「world」文本 */ diff --git a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/SubscribeMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/SubscribeMessageHandler.java index da7e54b6..20b3f00c 100644 --- a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/SubscribeMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/SubscribeMessageHandler.java @@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse; public class SubscribeMessageHandler extends MessageHandlerAdapter { @Override - public WeixinResponse doHandle0(WeixinRequest request, ScribeEventMessage message) { + public WeixinResponse doHandle0(ScribeEventMessage message) { return new TextResponse("欢迎关注~"); } } diff --git a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/TextMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/TextMessageHandler.java index cdddd8f9..6c47f9ae 100644 --- a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/TextMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/TextMessageHandler.java @@ -19,7 +19,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse; @Component public class TextMessageHandler extends MessageHandlerAdapter { @Override - public WeixinResponse doHandle0(WeixinRequest request, TextMessage message) { + public WeixinResponse doHandle0(TextMessage message) { return new TextResponse("收到了文本消息"); } } diff --git a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/VoiceMessageHandler.java b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/VoiceMessageHandler.java index 8f2e6187..dcb21695 100644 --- a/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/VoiceMessageHandler.java +++ b/weixin4j-example/src/main/java/com/foxinmy/weixin4j/example/server/handler/VoiceMessageHandler.java @@ -20,7 +20,7 @@ import com.foxinmy.weixin4j.response.WeixinResponse; public class VoiceMessageHandler extends MessageHandlerAdapter { @Override - public WeixinResponse doHandle0(WeixinRequest request, VoiceMessage message) { + public WeixinResponse doHandle0(VoiceMessage message) { /** * 返回一段文字给用户 */ diff --git a/weixin4j-server/CHANGE.md b/weixin4j-server/CHANGE.md index a9b515ab..04cd38fe 100644 --- a/weixin4j-server/CHANGE.md +++ b/weixin4j-server/CHANGE.md @@ -148,4 +148,12 @@ * 2017-08-29 - + 修复在可执行包下获取不到包的类bug \ No newline at end of file + + 修复在可执行包下获取不到包的类bug + +* 2017-11-12 + + + `WeixinServerBootstrap`类新增shutdown方法 + + + `MessageHandlerAdapter`类`doHandle0`方法去掉WeixinRequest参数传递 + + + version upgrade to 1.1.9 \ No newline at end of file diff --git a/weixin4j-server/pom.xml b/weixin4j-server/pom.xml index 717313fb..d15af0e3 100644 --- a/weixin4j-server/pom.xml +++ b/weixin4j-server/pom.xml @@ -8,7 +8,7 @@ 1.7.9 weixin4j-server - 1.1.8 + 1.1.9 weixin4j-server https://github.com/foxinmy/weixin4j/tree/master/weixin4j-server 微信消息netty服务器 diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java index 0c121bfd..547dd1d9 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/handler/MultipleMessageHandlerAdapter.java @@ -32,18 +32,20 @@ public abstract class MultipleMessageHandlerAdapter implements WeixinMessageHand @Override public boolean canHandle(WeixinRequest request, WeixinMessage message, Set nodeNames) { - return message != null && messageClasses.contains(message.getClass()) && canHandle0(message); + return message != null && messageClasses.contains(message.getClass()) && canHandle0(request, message); } /** * 能否处理请求 * + * @param request + * 微信请求 * @param message * 微信消息 * @return true则执行doHandler * @throws WeixinException */ - protected boolean canHandle0(WeixinMessage message) { + protected boolean canHandle0(WeixinRequest request, WeixinMessage message) { return true; } diff --git a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java index 6e5bd75c..03b8a952 100644 --- a/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java +++ b/weixin4j-server/src/main/java/com/foxinmy/weixin4j/startup/WeixinServerBootstrap.java @@ -358,5 +358,5 @@ public final class WeixinServerBootstrap { return true; } - public final static String VERSION = "1.1.8"; + public final static String VERSION = "1.1.9"; } \ No newline at end of file