Merge remote-tracking branch 'origin/dev_thirdplatform' into dev

# Conflicts:
#	epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java

@@ -190,7 +190,26 @@ public class WarrantServiceImpl implements WarrantService {
 //            messagePushTextDao.insertMessageText(messagePushTextFormDTO);
             String content = messagePushTextFormDTO.getContent();
             log.info(String.format(ThirdRunTimeInfoConstant.CONTENT,content));
-            this.processTextMessage(request, response, content, toUserName, fromUserName);
+            if(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT.equals(content)){
+                log.info("收到消息，要回复了......");
+//            String returnContent = content+ModuleConstant._CALL_BACK;
+                String returnContent = "TESTCOMPONENT_MSG_TYPE_TEXT_callback";
+                log.info("拼接的回复内容【普通】："+returnContent);
+                String resultContent = replyTextMessage(request, response, returnContent, toUserName, fromUserName);
+                log.info("加密的回复内容为："+result);
+                PrintWriter pw = response.getWriter();
+                pw.write(resultContent);
+                pw.flush();
+            }else if(StringUtils.startsWithIgnoreCase(content, ModuleConstant.QUERY_AUTH_CODE)){
+                PrintWriter pw = response.getWriter();//需在5秒内返回空串表明暂时不回复，然后再立即使用客服消息接口发送消息回复粉丝
+                pw.write("");
+                pw.flush();
+
+                log.info(String.format(ThirdRunTimeInfoConstant.TEXT_MESSAGE_LOG_INFO,content,content.split(ThirdRedisKeyConstant.COLON)[NumConstant.ONE],fromUserName,toUserName));
+                //接下来客服API再回复一次消息
+                String[] split = content.split(ThirdRedisKeyConstant.COLON);
+                replyApiTextMessage(split[NumConstant.ONE],fromUserName);
+            }
         }
     }
 
@@ -293,26 +312,7 @@ public class WarrantServiceImpl implements WarrantService {
     public void processTextMessage(HttpServletRequest request, HttpServletResponse response,
                                    String content,String toUserName, String fromUserName)
             throws IOException, DocumentException{
-        if(ModuleConstant.TESTCOMPONENT_MSG_TYPE_TEXT.equals(content)){
-            log.info("收到消息，要回复了......");
-//            String returnContent = content+ModuleConstant._CALL_BACK;
-            String returnContent = "TESTCOMPONENT_MSG_TYPE_TEXT_callback";
-            log.info("拼接的回复内容【普通】："+returnContent);
-            String result = replyTextMessage(request, response, returnContent, toUserName, fromUserName);
-            log.info("加密的回复内容为："+result);
-            PrintWriter pw = response.getWriter();
-            pw.write(result);
-            pw.flush();
-        }else if(StringUtils.startsWithIgnoreCase(content, ModuleConstant.QUERY_AUTH_CODE)){
-            PrintWriter pw = response.getWriter();//需在5秒内返回空串表明暂时不回复，然后再立即使用客服消息接口发送消息回复粉丝
-            pw.write("");
-            pw.flush();
 
-            log.info(String.format(ThirdRunTimeInfoConstant.TEXT_MESSAGE_LOG_INFO,content,content.split(ThirdRedisKeyConstant.COLON)[NumConstant.ONE],fromUserName,toUserName));
-            //接下来客服API再回复一次消息
-            String[] split = content.split(ThirdRedisKeyConstant.COLON);
-            replyApiTextMessage(split[NumConstant.ONE],fromUserName);
-        }
     }
 
 
@@ -335,9 +335,8 @@ public class WarrantServiceImpl implements WarrantService {
         sb.append("<xml>");
         sb.append("<ToUserName><![CDATA["+toUserName+"]]></ToUserName>");
         sb.append("<FromUserName><![CDATA["+fromUserName+"]]></FromUserName>");
-//        sb.append("<CreateTime><![CDATA["+createTime+"]]></CreateTime>");
+        sb.append("<CreateTime><![CDATA["+createTime+"]]></CreateTime>");
-//        sb.append("<MsgType><![CDATA[text]]></MsgType>");
+        sb.append("<MsgType><![CDATA[text]]></MsgType>");
-
         sb.append("<Content><![CDATA["+content+"]]></Content>");
         sb.append("</xml>");
         String replyMsg = sb.toString();