issue binarywang#47 同步规则同步执行，异步规则异步执行

chanjarster · chanjarster · commit c5b9d568e500 · 2014-12-09T12:10:19.000+08:00
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
@@ -87,25 +87,17 @@ public WxCpXmlOutMessage route(final WxCpXmlMessage wxMessage) {
       return null;
     }
 
-    if (matchRules.get(0).async) {
-      // 只要第一个是异步的，那就异步执行
-      // 在另一个线程里执行
-      executorService.submit(new Runnable() {
-        public void run() {
-          for (final Rule rule : matchRules) {
-            rule.service(wxMessage);
-          }
-        }
-      });
-      return null;
-    }
-
     WxCpXmlOutMessage res = null;
     for (final Rule rule : matchRules) {
-      // 返回最后一个匹配规则的结果
-      res = rule.service(wxMessage);
-      if (!rule.reEnter) {
-        break;
+      // 返回最后一个非异步的rule的执行结果
+      if(rule.async) {
+        executorService.submit(new Runnable() {
+          public void run() {
+            rule.service(wxMessage);
+          }
+        });
+      } else {
+        res = rule.service(wxMessage);
       }
     }
     return res;
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
@@ -87,25 +87,17 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage) {
       return null;
     }
     
-    if (matchRules.get(0).async) {
-      // 只要第一个是异步的，那就异步执行
-      // 在另一个线程里执行
-      executorService.execute(new Runnable() {
-        public void run() {
-          for (final Rule rule : matchRules) {
-            rule.service(wxMessage);
-          }
-        }
-      });
-      return null;
-    }
-    
     WxMpXmlOutMessage res = null;
     for (final Rule rule : matchRules) {
-      // 返回最后一个匹配规则的结果
-      res = rule.service(wxMessage);
-      if (!rule.reEnter) {
-        break;
+      // 返回最后一个非异步的rule的执行结果
+      if(rule.async) {
+        executorService.submit(new Runnable() {
+          public void run() {
+            rule.service(wxMessage);
+          }
+        });
+      } else {
+        res = rule.service(wxMessage);
       }
     }
     return res;
