From 910d24fc4646d4da68b56dec4c108f65933bbc67 Mon Sep 17 00:00:00 2001
From: zxc <954985706@qq.com>
Date: Fri, 24 Jul 2020 15:00:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0-=E4=BB=A3=E7=A0=81=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=9B=9E=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/WarrantController.java    | 4 ++--
 .../src/main/java/com/epmet/service/WarrantService.java      | 2 +-
 .../main/java/com/epmet/service/impl/WarrantServiceImpl.java | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WarrantController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WarrantController.java
index 1cb35bb666..2760162a5c 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WarrantController.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WarrantController.java
@@ -26,9 +26,9 @@ public class WarrantController {
     private WarrantService warrantService;
 
     @RequestMapping(value ="/{APPID}/callback")
-    public void acceptMessageAndEvent(HttpServletRequest request, @PathVariable("APPID") String appid,
+    public String acceptMessageAndEvent(HttpServletRequest request, @PathVariable("APPID") String appid,
                                       HttpServletResponse response)throws IOException, DocumentException, AesException {
-        warrantService.acceptMessageAndEvent(request, appid, response);
+        return warrantService.acceptMessageAndEvent(request, appid, response);
     }
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/WarrantService.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/WarrantService.java
index 4ae4cfd5e1..9393704594 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/WarrantService.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/WarrantService.java
@@ -13,6 +13,6 @@ import java.io.IOException;
  */
 public interface WarrantService {
 
-    void acceptMessageAndEvent(HttpServletRequest request,String appid,HttpServletResponse response)throws IOException, DocumentException, AesException;
+    String acceptMessageAndEvent(HttpServletRequest request,String appid,HttpServletResponse response)throws IOException, DocumentException, AesException;
 
 }
diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
index b49c04788e..d5a3d500af 100644
--- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
+++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/WarrantServiceImpl.java
@@ -65,14 +65,14 @@ public class WarrantServiceImpl implements WarrantService {
      */
     @Transactional(rollbackFor = Exception.class)
     @Override
-    public void acceptMessageAndEvent(HttpServletRequest request, String appId, HttpServletResponse response)throws IOException, DocumentException, AesException {
+    public String acceptMessageAndEvent(HttpServletRequest request, String appId, HttpServletResponse response)throws IOException, DocumentException, AesException {
         log.info("appId："+ appId);
         request.setCharacterEncoding(ModuleConstant.UTF8);
         String msgSignature = request.getParameter(ModuleConstant.MSG_SIGNATURE);
         String timeStamp = request.getParameter(ModuleConstant.TIMESTAMP);
         String nonce = request.getParameter(ModuleConstant.NONCE);
         if (!StringUtils.isNotBlank(msgSignature)) {
-            return;// 微信推送给第三方开放平台的消息一定是加过密的，无消息加密无法解密消息
+            return ModuleConstant.SUCCESS;// 微信推送给第三方开放平台的消息一定是加过密的，无消息加密无法解密消息
         }
         InputStream inputStream;
         String postData = null;
@@ -119,5 +119,6 @@ public class WarrantServiceImpl implements WarrantService {
         }
         String codeCustomerId = codeCustomerDao.selectCodeCustomerId(codeAuditRecord);
         codeAuditResultDao.updateAuditResult(customerId,codeCustomerId,codeResult);
+        return ModuleConstant.SUCCESS;
     }
 }