|
@@ -182,21 +182,38 @@ public class WeixinController {
|
|
//扫码用户openID
|
|
//扫码用户openID
|
|
String openId = requestJson.getStr("FromUserName");
|
|
String openId = requestJson.getStr("FromUserName");
|
|
|
|
|
|
- List<EventCallback> callbackList = registerCallbackList();
|
|
|
|
|
|
+// List<EventCallback> callbackList = registerCallbackList();
|
|
|
|
|
|
boolean processed = false;
|
|
boolean processed = false;
|
|
|
|
|
|
- //开发者在5秒内未回复任何内容
|
|
|
|
- for (EventCallback callback: callbackList) {
|
|
|
|
- if (StringUtils.isNotEmpty(eventKey) && eventKey.startsWith(callback.getCode())){
|
|
|
|
- callback.process(wechatId,openId,eventKey);
|
|
|
|
|
|
+ if (StringUtils.isNotEmpty(eventKey) && eventKey.indexOf(",")!=-1) {
|
|
|
|
+ String[] keys = eventKey.split(",");
|
|
|
|
+ String eventCode = keys[0];
|
|
|
|
|
|
- WeixinUtil.replyTextMessage(response,wechatId,openId,callback.getMessage());
|
|
|
|
|
|
+ ReplyMessage replyMessage = replyMessageService.findByEvent(wechatId, eventCode);
|
|
|
|
+
|
|
|
|
+ if (replyMessage != null) {
|
|
|
|
+ EventCallback callback = new EventCallback(replyMessage.getEvent(), replyMessage.getCallbackUrl());
|
|
|
|
+
|
|
|
|
+ callback.process(wechatId, openId, eventKey);
|
|
|
|
+
|
|
|
|
+ WeixinUtil.replyTextMessage(response, wechatId, openId, callback.getMessage());
|
|
|
|
|
|
processed = true;
|
|
processed = true;
|
|
- break;
|
|
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+ //开发者在5秒内未回复任何内容
|
|
|
|
+// for (EventCallback callback : callbackList) {
|
|
|
|
+// if (StringUtils.isNotEmpty(eventKey) && eventKey.startsWith(callback.getCode())) {
|
|
|
|
+// callback.process(wechatId, openId, eventKey);
|
|
|
|
+//
|
|
|
|
+// WeixinUtil.replyTextMessage(response, wechatId, openId, callback.getMessage());
|
|
|
|
+//
|
|
|
|
+// processed = true;
|
|
|
|
+// break;
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
+// }
|
|
|
|
|
|
if(!processed) {
|
|
if(!processed) {
|
|
String responseText = "success";
|
|
String responseText = "success";
|
|
@@ -240,6 +257,8 @@ public class WeixinController {
|
|
// PromotionCallback promotionCallback = new PromotionCallback(piccAdminScanConfig.getPromotionCode(),piccAdminScanConfig.getPromotionCallbackUrl());
|
|
// PromotionCallback promotionCallback = new PromotionCallback(piccAdminScanConfig.getPromotionCode(),piccAdminScanConfig.getPromotionCallbackUrl());
|
|
// promotionCallback.setReplyMessageService(replyMessageService);
|
|
// promotionCallback.setReplyMessageService(replyMessageService);
|
|
|
|
|
|
|
|
+
|
|
|
|
+
|
|
return list;
|
|
return list;
|
|
}
|
|
}
|
|
|
|
|