issue #86 handler, intercept方法签名添加throw WxException

chanjarster · chanjarster · commit b9214902531c · 2015-01-23T17:20:05.000+08:00
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/LogExceptionHandler.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/LogExceptionHandler.java
@@ -0,0 +1,19 @@
+package me.chanjar.weixin.common.util;
+
+import me.chanjar.weixin.common.exception.WxErrorException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+
+public class LogExceptionHandler implements WxErrorExceptionHandler {
+
+  private Logger log = LoggerFactory.getLogger(WxErrorExceptionHandler.class);
+
+  @Override
+  public void handle(WxErrorException e) {
+
+    log.error("Error happens", e);
+
+  }
+
+}
diff --git a/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/WxErrorExceptionHandler.java b/weixin-java-common/src/main/java/me/chanjar/weixin/common/util/WxErrorExceptionHandler.java
@@ -0,0 +1,12 @@
+package me.chanjar.weixin.common.util;
+
+import me.chanjar.weixin.common.exception.WxErrorException;
+
+/**
+ * WxErrorException处理器
+ */
+public interface WxErrorExceptionHandler {
+
+  public void handle(WxErrorException e);
+
+}
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageHandler.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageHandler.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.cp.api;
 
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSession;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
@@ -24,6 +25,6 @@ public interface WxCpMessageHandler {
   public WxCpXmlOutMessage handle(WxCpXmlMessage wxMessage,
                                   Map<String, Object> context,
                                   WxCpService wxCpService,
-                                  WxSessionManager sessionManager);
+                                  WxSessionManager sessionManager) throws WxErrorException;
 
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageInterceptor.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageInterceptor.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.cp.api;
 
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
 
@@ -24,6 +25,6 @@ public interface WxCpMessageInterceptor {
   public boolean intercept(WxCpXmlMessage wxMessage,
                           Map<String, Object> context,
                           WxCpService wxCpService,
-                          WxSessionManager sessionManager);
+                          WxSessionManager sessionManager) throws WxErrorException;
 
 }
diff --git a/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java b/weixin-java-cp/src/main/java/me/chanjar/weixin/cp/api/WxCpMessageRouter.java
@@ -1,6 +1,9 @@
 package me.chanjar.weixin.cp.api;
 
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.*;
+import me.chanjar.weixin.common.util.LogExceptionHandler;
+import me.chanjar.weixin.common.util.WxErrorExceptionHandler;
 import me.chanjar.weixin.common.util.WxMessageDuplicateChecker;
 import me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateChecker;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
@@ -62,11 +65,14 @@ public class WxCpMessageRouter {
 
   private WxSessionManager sessionManager;
 
+  private WxErrorExceptionHandler exceptionHandler;
+
   public WxCpMessageRouter(WxCpService wxCpService) {
     this.wxCpService = wxCpService;
     this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE);
     this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker();
     this.sessionManager = new StandardSessionManager();
+    this.exceptionHandler = new LogExceptionHandler();
   }
 
   /**
@@ -143,12 +149,12 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
         futures.add(
             executorService.submit(new Runnable() {
               public void run() {
-                rule.service(wxMessage, wxCpService, sessionManager);
+                rule.service(wxMessage, wxCpService, sessionManager, exceptionHandler);
               }
             })
         );
       } else {
-        res = rule.service(wxMessage, wxCpService, sessionManager);
+        res = rule.service(wxMessage, wxCpService, sessionManager, exceptionHandler);
         // 在同步操作结束，session访问结束
         log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
         sessionEndAccess(wxMessage);
@@ -425,22 +431,35 @@ protected boolean test(WxCpXmlMessage wxMessage) {
      * @param wxMessage
      * @return true 代表继续执行别的router，false 代表停止执行别的router
      */
-    protected WxCpXmlOutMessage service(WxCpXmlMessage wxMessage, WxCpService wxCpService, WxSessionManager sessionManager) {
-      Map<String, Object> context = new HashMap<String, Object>();
-      // 如果拦截器不通过
-      for (WxCpMessageInterceptor interceptor : this.interceptors) {
-        if (!interceptor.intercept(wxMessage, context, wxCpService, sessionManager)) {
-          return null;
+    protected WxCpXmlOutMessage service(WxCpXmlMessage wxMessage,
+                                        WxCpService wxCpService,
+                                        WxSessionManager sessionManager,
+                                        WxErrorExceptionHandler exceptionHandler) {
+
+      try {
+
+        Map<String, Object> context = new HashMap<String, Object>();
+        // 如果拦截器不通过
+        for (WxCpMessageInterceptor interceptor : this.interceptors) {
+          if (!interceptor.intercept(wxMessage, context, wxCpService, sessionManager)) {
+            return null;
+          }
         }
-      }
 
-      // 交给handler处理
-      WxCpXmlOutMessage res = null;
-      for (WxCpMessageHandler handler : this.handlers) {
-        // 返回最后handler的结果
-        res = handler.handle(wxMessage, context, wxCpService, sessionManager);
+        // 交给handler处理
+        WxCpXmlOutMessage res = null;
+        for (WxCpMessageHandler handler : this.handlers) {
+          // 返回最后handler的结果
+          res = handler.handle(wxMessage, context, wxCpService, sessionManager);
+        }
+        return res;
+
+      } catch (WxErrorException e) {
+        exceptionHandler.handle(e);
       }
-      return res;
+
+      return null;
+
     }
 
   }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageHandler.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.api;
 
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
 import me.chanjar.weixin.mp.bean.WxMpXmlOutMessage;
@@ -23,6 +24,6 @@ public interface WxMpMessageHandler {
   public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage,
                                   Map<String, Object> context,
                                   WxMpService wxMpService,
-                                  WxSessionManager sessionManager);
+                                  WxSessionManager sessionManager) throws WxErrorException;
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageInterceptor.java
@@ -1,5 +1,6 @@
 package me.chanjar.weixin.mp.api;
 
+import me.chanjar.weixin.common.exception.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
 import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
 
@@ -24,6 +25,6 @@ public interface WxMpMessageInterceptor {
   public boolean intercept(WxMpXmlMessage wxMessage,
                             Map<String, Object> context,
                             WxMpService wxMpService,
-                            WxSessionManager sessionManager);
+                            WxSessionManager sessionManager) throws WxErrorException;
 
 }
diff --git a/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java b/weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMessageRouter.java
@@ -1,7 +1,12 @@
 package me.chanjar.weixin.mp.api;
 
-import me.chanjar.weixin.common.api.WxConsts;
-import me.chanjar.weixin.common.session.*;
+import me.chanjar.weixin.common.exception.WxErrorException;
+import me.chanjar.weixin.common.session.InternalSession;
+import me.chanjar.weixin.common.session.InternalSessionManager;
+import me.chanjar.weixin.common.session.StandardSessionManager;
+import me.chanjar.weixin.common.session.WxSessionManager;
+import me.chanjar.weixin.common.util.LogExceptionHandler;
+import me.chanjar.weixin.common.util.WxErrorExceptionHandler;
 import me.chanjar.weixin.common.util.WxMessageDuplicateChecker;
 import me.chanjar.weixin.common.util.WxMessageInMemoryDuplicateChecker;
 import me.chanjar.weixin.mp.bean.WxMpXmlMessage;
@@ -61,11 +66,14 @@ public class WxMpMessageRouter {
 
   private WxSessionManager sessionManager;
 
+  private WxErrorExceptionHandler exceptionHandler;
+
   public WxMpMessageRouter(WxMpService wxMpService) {
     this.wxMpService = wxMpService;
     this.executorService = Executors.newFixedThreadPool(DEFAULT_THREAD_POOL_SIZE);
     this.messageDuplicateChecker = new WxMessageInMemoryDuplicateChecker();
     this.sessionManager = new StandardSessionManager();
+    this.exceptionHandler = new LogExceptionHandler();
   }
 
   /**
@@ -142,12 +150,12 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
         futures.add(
             executorService.submit(new Runnable() {
               public void run() {
-                rule.service(wxMessage, wxMpService, sessionManager);
+                rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler);
               }
             })
         );
       } else {
-        res = rule.service(wxMessage, wxMpService, sessionManager);
+        res = rule.service(wxMessage, wxMpService, sessionManager, exceptionHandler);
         // 在同步操作结束，session访问结束
         log.debug("End session access: async=false, sessionId={}", wxMessage.getFromUserName());
         sessionEndAccess(wxMessage);
@@ -409,22 +417,33 @@ protected boolean test(WxMpXmlMessage wxMessage) {
      * @param wxMessage
      * @return true 代表继续执行别的router，false 代表停止执行别的router
      */
-    protected WxMpXmlOutMessage service(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) {
-      Map<String, Object> context = new HashMap<String, Object>();
-      // 如果拦截器不通过
-      for (WxMpMessageInterceptor interceptor : this.interceptors) {
-        if (!interceptor.intercept(wxMessage, context, wxMpService, sessionManager)) {
-          return null;
+    protected WxMpXmlOutMessage service(WxMpXmlMessage wxMessage,
+                                        WxMpService wxMpService,
+                                        WxSessionManager sessionManager,
+                                        WxErrorExceptionHandler exceptionHandler) {
+
+      try {
+
+        Map<String, Object> context = new HashMap<String, Object>();
+        // 如果拦截器不通过
+        for (WxMpMessageInterceptor interceptor : this.interceptors) {
+          if (!interceptor.intercept(wxMessage, context, wxMpService, sessionManager)) {
+            return null;
+          }
         }
+
+        // 交给handler处理
+        WxMpXmlOutMessage res = null;
+        for (WxMpMessageHandler handler : this.handlers) {
+          // 返回最后handler的结果
+          res = handler.handle(wxMessage, context, wxMpService, sessionManager);
+        }
+        return res;
+      } catch (WxErrorException e) {
+        exceptionHandler.handle(e);
       }
-      
-      // 交给handler处理
-      WxMpXmlOutMessage res = null;
-      for (WxMpMessageHandler handler : this.handlers) {
-        // 返回最后handler的结果
-        res = handler.handle(wxMessage, context, wxMpService, sessionManager);
-      }
-      return res;
+      return null;
+
     }
     
   }
diff --git a/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java b/weixin-java-mp/src/test/java/me/chanjar/weixin/mp/demo/DemoGuessNumberHandler.java
@@ -35,7 +35,7 @@ private boolean isUserAnswering(WxMpXmlMessage message) {
 
   @Override
   public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> context, WxMpService wxMpService,
-      WxSessionManager sessionManager) {
+      WxSessionManager sessionManager) throws WxErrorException {
 
     if (isUserWantGuess(wxMessage)) {
       letsGo(wxMessage, wxMpService, sessionManager);
@@ -49,38 +49,30 @@ public WxMpXmlOutMessage handle(WxMpXmlMessage wxMessage, Map<String, Object> co
 
   }
 
-  protected void letsGo(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) {
+  protected void letsGo(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
     WxSession session = sessionManager.getSession(wxMessage.getFromUserName());
     if (session.getAttribute("guessing") == null) {
       WxMpCustomMessage m = WxMpCustomMessage
           .TEXT()
           .toUser(wxMessage.getFromUserName())
           .content("请猜一个100以内的数字")
           .build();
-      try {
-        wxMpService.customMessageSend(m);
-      } catch (WxErrorException e) {
-        e.printStackTrace();
-      }
+      wxMpService.customMessageSend(m);
     } else {
       WxMpCustomMessage m = WxMpCustomMessage
           .TEXT()
           .toUser(wxMessage.getFromUserName())
           .content("放弃了吗？那请重新猜一个100以内的数字")
           .build();
-      try {
-        wxMpService.customMessageSend(m);
-      } catch (WxErrorException e) {
-        e.printStackTrace();
-      }
+      wxMpService.customMessageSend(m);
     }
 
     session.setAttribute("guessing", Boolean.TRUE);
     session.setAttribute("number", random.nextInt(100));
   }
 
 
-  protected void giveHint(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) {
+  protected void giveHint(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSessionManager sessionManager) throws WxErrorException {
 
     WxSession session = sessionManager.getSession(wxMessage.getFromUserName());
 
@@ -100,35 +92,23 @@ protected void giveHint(WxMpXmlMessage wxMessage, WxMpService wxMpService, WxSes
           .toUser(wxMessage.getFromUserName())
           .content("小了")
           .build();
-      try {
-        wxMpService.customMessageSend(m);
-      } catch (WxErrorException e) {
-        e.printStackTrace();
-      }
+      wxMpService.customMessageSend(m);
 
     } else if (guessNumber > answer) {
       WxMpCustomMessage m = WxMpCustomMessage
           .TEXT()
           .toUser(wxMessage.getFromUserName())
           .content("大了")
           .build();
-      try {
-        wxMpService.customMessageSend(m);
-      } catch (WxErrorException e) {
-        e.printStackTrace();
-      }
+      wxMpService.customMessageSend(m);
     } else {
       WxMpCustomMessage m = WxMpCustomMessage
           .TEXT()
           .toUser(wxMessage.getFromUserName())
           .content("Bingo!")
           .build();
-      try {
-        session.removeAttribute("guessing");
-        wxMpService.customMessageSend(m);
-      } catch (WxErrorException e) {
-        e.printStackTrace();
-      }
+      session.removeAttribute("guessing");
+      wxMpService.customMessageSend(m);
     }
 
   }
