Merge remote-tracking branch 'origin/V1' into V1

common/src/main/java/com/jpsoft/smart/cpbuilder/TextBuilder.java

@@ -11,7 +11,7 @@ import me.chanjar.weixin.cp.bean.WxCpXmlOutTextMessage;
 public class TextBuilder extends AbstractBuilder {
 
   @Override
-  public WxCpXmlOutMessage build(String content, WxCpXmlMessage wxMessage,
+  public WxCpXmlOutTextMessage build(String content, WxCpXmlMessage wxMessage,
                                  WxCpService service) {
     WxCpXmlOutTextMessage m = WxCpXmlOutMessage.TEXT().content(content)
         .fromUser(wxMessage.getToUserName()).toUser(wxMessage.getFromUserName())

common/src/main/java/com/jpsoft/smart/cphandler/MsgHandler.java

@@ -1,5 +1,6 @@
 package com.jpsoft.smart.cphandler;
 
+import cn.hutool.json.JSONObject;
 import com.jpsoft.smart.cpbuilder.TextBuilder;
 import me.chanjar.weixin.common.api.WxConsts;
 import me.chanjar.weixin.common.session.WxSessionManager;
@@ -10,6 +11,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
+
 /**
  * @author Binary Wang(https://github.com/binarywang)
  */
@@ -22,6 +24,10 @@ public class MsgHandler extends AbstractHandler {
         final String msgType = wxMessage.getMsgType();
         if (msgType == null) {
             // 如果msgType没有，就自己根据具体报文内容做处理
+         //   return new TextBuilder().build("success", wxMessage, cpService);
+            logger.warn("安装测试"+wxMessage);
+            Map map = wxMessage.getAllFieldsMap();
+            String authCode = (String) map.get("AuthCode");
             return new TextBuilder().build("success", wxMessage, cpService);
         }
 

web/src/main/java/com/jpsoft/smart/modules/wechat/controller/WxCpController.java

@@ -7,6 +7,7 @@ import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.cp.api.WxCpService;
 import me.chanjar.weixin.cp.bean.WxCpXmlMessage;
 import me.chanjar.weixin.cp.bean.WxCpXmlOutMessage;
+import me.chanjar.weixin.cp.bean.WxCpXmlOutTextMessage;
 import me.chanjar.weixin.cp.util.crypto.WxCpCryptUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -74,6 +75,10 @@ public class WxCpController {
         if (outMessage == null) {
             return "";
         }
+        String msg = outMessage.toString();
+        if (msg.contains("success")){
+            return "success";
+        }
 
         String out = outMessage.toEncryptedXml(wxCpService.getWxCpConfigStorage());
         log.debug("\n组装回复信息：{}", out);