#1079 小程序增加对转发客服消息功能的支持

weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/demo/WxMaDemoServer.java

@@ -1,15 +1,5 @@
 package cn.binarywang.wx.miniapp.demo;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Map;
-import java.util.concurrent.locks.ReentrantLock;
-
-import org.eclipse.jetty.server.Server;
-import org.eclipse.jetty.servlet.ServletHandler;
-import org.eclipse.jetty.servlet.ServletHolder;
-
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
 import cn.binarywang.wx.miniapp.bean.WxMaKefuMessage;
@@ -20,11 +10,23 @@ import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.constant.WxMaConstants;
 import cn.binarywang.wx.miniapp.message.WxMaMessageHandler;
 import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
+import cn.binarywang.wx.miniapp.message.WxMaXmlOutMessage;
 import cn.binarywang.wx.miniapp.test.TestConfig;
 import com.google.common.collect.Lists;
+import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.session.WxSessionManager;
+import org.eclipse.jetty.server.Server;
+import org.eclipse.jetty.servlet.ServletHandler;
+import org.eclipse.jetty.servlet.ServletHolder;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Calendar;
+import java.util.Map;
+import java.util.concurrent.locks.ReentrantLock;
 
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
@@ -33,29 +35,31 @@ public class WxMaDemoServer {
 
   private static final WxMaMessageHandler logHandler = new WxMaMessageHandler() {
     @Override
-    public void handle(WxMaMessage wxMessage, Map<String, Object> context,
-                       WxMaService service, WxSessionManager sessionManager) throws WxErrorException {
+    public WxMaXmlOutMessage handle(WxMaMessage wxMessage, Map<String, Object> context,
+                                    WxMaService service, WxSessionManager sessionManager) throws WxErrorException {
       System.out.println("收到消息：" + wxMessage.toString());
       service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("收到信息为：" + wxMessage.toJson())
         .toUser(wxMessage.getFromUser()).build());
+      return null;
     }
   };
 
   private static final WxMaMessageHandler textHandler = new WxMaMessageHandler() {
     @Override
-    public void handle(WxMaMessage wxMessage, Map<String, Object> context,
-                       WxMaService service, WxSessionManager sessionManager)
+    public WxMaXmlOutMessage handle(WxMaMessage wxMessage, Map<String, Object> context,
+                                    WxMaService service, WxSessionManager sessionManager)
       throws WxErrorException {
       service.getMsgService().sendKefuMsg(WxMaKefuMessage.newTextBuilder().content("回复文本消息")
         .toUser(wxMessage.getFromUser()).build());
+      return null;
     }
 
   };
 
   private static final WxMaMessageHandler picHandler = new WxMaMessageHandler() {
     @Override
-    public void handle(WxMaMessage wxMessage, Map<String, Object> context,
-                       WxMaService service, WxSessionManager sessionManager) throws WxErrorException {
+    public WxMaXmlOutMessage handle(WxMaMessage wxMessage, Map<String, Object> context,
+                                    WxMaService service, WxSessionManager sessionManager) throws WxErrorException {
       try {
         WxMediaUploadResult uploadResult = service.getMediaService()
           .uploadMedia(WxMaConstants.MediaType.IMAGE, "png",
@@ -69,13 +73,14 @@ public class WxMaDemoServer {
       } catch (WxErrorException e) {
         e.printStackTrace();
       }
+      return null;
     }
   };
 
   private static final WxMaMessageHandler qrcodeHandler = new WxMaMessageHandler() {
     @Override
-    public void handle(WxMaMessage wxMessage, Map<String, Object> context,
-                       WxMaService service, WxSessionManager sessionManager) throws WxErrorException {
+    public WxMaXmlOutMessage handle(WxMaMessage wxMessage, Map<String, Object> context,
+                                    WxMaService service, WxSessionManager sessionManager) throws WxErrorException {
       try {
         final File file = service.getQrcodeService().createQrcode("123", 430);
         WxMediaUploadResult uploadResult = service.getMediaService().uploadMedia(WxMaConstants.MediaType.IMAGE, file);
@@ -88,13 +93,14 @@ public class WxMaDemoServer {
       } catch (WxErrorException e) {
         e.printStackTrace();
       }
+      return null;
     }
   };
 
   private static final WxMaMessageHandler templateMsgHandler = new WxMaMessageHandler() {
     @Override
-    public void handle(WxMaMessage wxMessage, Map<String, Object> context,
-                       WxMaService service, WxSessionManager sessionManager)
+    public WxMaXmlOutMessage handle(WxMaMessage wxMessage, Map<String, Object> context,
+                                    WxMaService service, WxSessionManager sessionManager)
       throws WxErrorException {
       service.getMsgService().sendTemplateMsg(WxMaTemplateMessage.builder()
         .templateId(templateId).data(Lists.newArrayList(
@@ -102,10 +108,22 @@ public class WxMaDemoServer {
         .toUser(wxMessage.getFromUser())
         .formId("自己替换可用的formid")
         .build());
+      return null;
     }
 
   };
 
+  private static final WxMaMessageHandler customerServiceMessageHandler = new WxMaMessageHandler() {
+    @Override
+    public WxMaXmlOutMessage handle(WxMaMessage message, Map<String, Object> context, WxMaService service, WxSessionManager sessionManager) {
+      return new WxMaXmlOutMessage()
+        .setMsgType(WxConsts.XmlMsgType.TRANSFER_CUSTOMER_SERVICE)
+        .setFromUserName(message.getToUser())
+        .setCreateTime(Calendar.getInstance().getTimeInMillis() / 1000)
+        .setToUserName(message.getFromUser());
+    }
+  };
+
   private static WxMaConfig config;
   private static WxMaService service;
   private static WxMaMessageRouter router;
@@ -142,7 +160,8 @@ public class WxMaDemoServer {
         .rule().async(false).content("模板").handler(templateMsgHandler).end()
         .rule().async(false).content("文本").handler(textHandler).end()
         .rule().async(false).content("图片").handler(picHandler).end()
-        .rule().async(false).content("二维码").handler(qrcodeHandler).end();
+        .rule().async(false).content("二维码").handler(qrcodeHandler).end()
+        .rule().async(false).content("转发客服").handler(customerServiceMessageHandler).end();
     } catch (IOException e) {
       e.printStackTrace();
     }

weixin-java-miniapp/src/test/java/cn/binarywang/wx/miniapp/demo/WxMaPortalServlet.java

@@ -5,6 +5,8 @@ import cn.binarywang.wx.miniapp.bean.WxMaMessage;
 import cn.binarywang.wx.miniapp.config.WxMaConfig;
 import cn.binarywang.wx.miniapp.constant.WxMaConstants;
 import cn.binarywang.wx.miniapp.message.WxMaMessageRouter;
+import cn.binarywang.wx.miniapp.message.WxMaXmlOutMessage;
+import lombok.AllArgsConstructor;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -18,19 +20,13 @@ import java.util.Objects;
 /**
  * @author <a href="https://github.com/binarywang">Binary Wang</a>
  */
+@AllArgsConstructor
 public class WxMaPortalServlet extends HttpServlet {
   private static final long serialVersionUID = 1L;
 
-  private WxMaConfig wxMaConfig;
-  private WxMaService wxMaService;
-  private WxMaMessageRouter wxMaMessageRouter;
-
-  WxMaPortalServlet(WxMaConfig wxMaConfig, WxMaService wxMaService,
-                    WxMaMessageRouter wxMaMessageRouter) {
-    this.wxMaConfig = wxMaConfig;
-    this.wxMaService = wxMaService;
-    this.wxMaMessageRouter = wxMaMessageRouter;
-  }
+  private WxMaConfig config;
+  private WxMaService service;
+  private WxMaMessageRouter messageRouter;
 
   @Override
   protected void service(HttpServletRequest request, HttpServletResponse response)
@@ -42,7 +38,7 @@ public class WxMaPortalServlet extends HttpServlet {
     String nonce = request.getParameter("nonce");
     String timestamp = request.getParameter("timestamp");
 
-    if (!this.wxMaService.checkSignature(timestamp, nonce, signature)) {
+    if (!this.service.checkSignature(timestamp, nonce, signature)) {
       // 消息签名不正确，说明不是公众平台发过来的消息
       response.getWriter().println("非法请求");
       return;
@@ -56,7 +52,7 @@ public class WxMaPortalServlet extends HttpServlet {
     }
 
     String encryptType = request.getParameter("encrypt_type");
-    final boolean isJson = Objects.equals(this.wxMaConfig.getMsgDataFormat(), WxMaConstants.MsgDataFormat.JSON);
+    final boolean isJson = Objects.equals(this.config.getMsgDataFormat(), WxMaConstants.MsgDataFormat.JSON);
     if (StringUtils.isBlank(encryptType)) {
       // 明文传输的消息
       WxMaMessage inMessage;
@@ -66,7 +62,12 @@ public class WxMaPortalServlet extends HttpServlet {
         inMessage = WxMaMessage.fromXml(request.getInputStream());
       }
 
-      this.wxMaMessageRouter.route(inMessage);
+      final WxMaXmlOutMessage outMessage = this.messageRouter.route(inMessage);
+      if (outMessage != null) {
+        response.getWriter().write(outMessage.toXml());
+        return;
+      }
+
       response.getWriter().write("success");
       return;
     }
@@ -76,12 +77,16 @@ public class WxMaPortalServlet extends HttpServlet {
       String msgSignature = request.getParameter("msg_signature");
       WxMaMessage inMessage;
       if (isJson) {
-        inMessage = WxMaMessage.fromEncryptedJson(request.getInputStream(), this.wxMaConfig);
+        inMessage = WxMaMessage.fromEncryptedJson(request.getInputStream(), this.config);
       } else {//xml
-        inMessage = WxMaMessage.fromEncryptedXml(request.getInputStream(), this.wxMaConfig, timestamp, nonce, msgSignature);
+        inMessage = WxMaMessage.fromEncryptedXml(request.getInputStream(), this.config, timestamp, nonce, msgSignature);
       }
 
-      this.wxMaMessageRouter.route(inMessage);
+      final WxMaXmlOutMessage outMessage = this.messageRouter.route(inMessage);
+      if (outMessage != null) {
+        response.getWriter().write(outMessage.toEncryptedXml(this.config));
+        return;
+      }
       response.getWriter().write("success");
       return;
     }