| 
5 | 5 | import lombok.extern.slf4j.Slf4j;  | 
6 | 6 | import me.chanjar.weixin.common.api.WxErrorExceptionHandler;  | 
7 | 7 | import me.chanjar.weixin.common.api.WxMessageDuplicateChecker;  | 
8 |  | -import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateChecker;  | 
9 | 8 | import me.chanjar.weixin.common.api.WxMessageInMemoryDuplicateCheckerSingleton;  | 
10 | 9 | import me.chanjar.weixin.common.session.InternalSession;  | 
11 | 10 | import me.chanjar.weixin.common.session.InternalSessionManager;  | 
 | 
16 | 15 | import me.chanjar.weixin.mp.bean.message.WxMpXmlOutMessage;  | 
17 | 16 | import me.chanjar.weixin.mp.util.WxMpConfigStorageHolder;  | 
18 | 17 | import org.apache.commons.lang3.StringUtils;  | 
19 |  | -import org.slf4j.Logger;  | 
20 |  | -import org.slf4j.LoggerFactory;  | 
21 | 18 | 
 
  | 
22 |  | -import javax.xml.ws.Holder;  | 
23 | 19 | import java.util.ArrayList;  | 
24 | 20 | import java.util.HashMap;  | 
25 | 21 | import java.util.List;  | 
@@ -106,8 +102,9 @@ public void shutDownExecutorService(Integer second) {  | 
106 | 102 |  try {  | 
107 | 103 |  if (!this.executorService.awaitTermination(second, TimeUnit.SECONDS)) {  | 
108 | 104 |  this.executorService.shutdownNow();  | 
109 |  | - if (!this.executorService.awaitTermination(second, TimeUnit.SECONDS))  | 
 | 105 | + if (!this.executorService.awaitTermination(second, TimeUnit.SECONDS)) {  | 
110 | 106 |  log.error("线程池未关闭!");  | 
 | 107 | + }  | 
111 | 108 |  }  | 
112 | 109 |  } catch (InterruptedException ie) {  | 
113 | 110 |  this.executorService.shutdownNow();  | 
@@ -176,14 +173,16 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String,  | 
176 | 173 |  /**  | 
177 | 174 |  * 处理不同appid微信消息  | 
178 | 175 |  */  | 
179 |  | - public WxMpXmlOutMessage route(final String appid, final WxMpXmlMessage wxMessage, final Map<String, Object> context) {  | 
 | 176 | + public WxMpXmlOutMessage route(final String appid, final WxMpXmlMessage wxMessage,  | 
 | 177 | + final Map<String, Object> context) {  | 
180 | 178 |  return route(wxMessage, context, this.wxMpService.switchoverTo(appid));  | 
181 | 179 |  }  | 
182 | 180 | 
 
  | 
183 | 181 |  /**  | 
184 | 182 |  * 处理微信消息.  | 
185 | 183 |  */  | 
186 |  | - public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String, Object> context, WxMpService wxMpService) {  | 
 | 184 | + public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String, Object> context,  | 
 | 185 | + WxMpService wxMpService) {  | 
187 | 186 |  if (wxMpService == null) {  | 
188 | 187 |  wxMpService = this.wxMpService;  | 
189 | 188 |  }  | 
@@ -218,7 +217,8 @@ public WxMpXmlOutMessage route(final WxMpXmlMessage wxMessage, final Map<String,  | 
218 | 217 |  this.executorService.submit(() -> {  | 
219 | 218 |  //传入父线程的appId  | 
220 | 219 |  this.wxMpService.switchoverTo(appId);  | 
221 |  | - rule.service(wxMessage, context, mpService, WxMpMessageRouter.this.sessionManager, WxMpMessageRouter.this.exceptionHandler);  | 
 | 220 | + rule.service(wxMessage, context, mpService, WxMpMessageRouter.this.sessionManager,  | 
 | 221 | + WxMpMessageRouter.this.exceptionHandler);  | 
222 | 222 |  })  | 
223 | 223 |  );  | 
224 | 224 |  } else {  | 
 | 
0 commit comments