From 541cdc1cc13e5a4e11aceff8d0ff97225f36bbfd Mon Sep 17 00:00:00 2001
From: Guoqs <autumn.g@foxmail.com>
Date: Wed, 8 May 2024 19:02:54 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=AF=B9=E6=8E=A5lianlian=E5=B9=B3?=
 =?UTF-8?q?=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../thirdparty/ThirdPartyBaseController.java   | 18 ++++++++++++++++++
 .../lianlian/LianLianController.java           |  9 +++++----
 .../java/com/jsowell/common/util/JWTUtils.java |  5 -----
 .../lianlian/common/CommonResult.java          |  5 +++--
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java
index bdf1b2079..a10bab0e0 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/ThirdPartyBaseController.java
@@ -6,6 +6,7 @@ import com.google.common.collect.Maps;
 import com.jsowell.common.annotation.Anonymous;
 import com.jsowell.common.core.controller.BaseController;
 import com.jsowell.common.exception.BusinessException;
+import com.jsowell.common.util.JWTUtils;
 import com.jsowell.common.util.StringUtils;
 import com.jsowell.pile.thirdparty.CommonParamsDTO;
 import com.jsowell.pile.vo.ThirdPartySecretInfoVO;
@@ -51,6 +52,23 @@ public class ThirdPartyBaseController extends BaseController {
     //     }
     // }
 
+    /**
+     * 验证token
+     */
+    protected boolean verifyToken(String token) {
+        if (StringUtils.equals(token, "jsowellTest")) {
+            // 为了方便测试，token为jsowellTest校验通过
+            return true;
+        }
+        boolean result;
+        try {
+            result = JWTUtils.checkThirdPartyToken(token);
+        } catch (Exception e) {
+            result = false;
+        }
+        return result;
+    }
+
     /**
      * 验证签名
      */
diff --git a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java
index c342fcf8e..4ce282e62 100644
--- a/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/web/controller/thirdparty/lianlian/LianLianController.java
@@ -3,6 +3,7 @@ package com.jsowell.web.controller.thirdparty.lianlian;
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
 import com.jsowell.common.annotation.Anonymous;
+import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum;
 import com.jsowell.common.enums.thirdparty.ThirdPlatformTypeEnum;
 import com.jsowell.common.enums.ykc.ReturnCodeEnum;
 import com.jsowell.common.exception.BusinessException;
@@ -417,17 +418,17 @@ public class LianLianController extends ThirdPartyBaseController {
         logger.info("联联平台请求启动充电 params :{}", JSON.toJSONString(dto));
         try {
             // 校验令牌
-            String token = request.getHeader("Authorization");
-            if (!JWTUtils.checkThirdPartyToken(token)) {
+            boolean verifyToken = verifyToken(request.getHeader("Authorization"));
+            if (!verifyToken) {
                 // 校验失败
-                return CommonResult.failed("令牌校验错误");
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.TOKEN_ERROR);
             }
 
             // 校验签名
             boolean verifySign = verifySign(dto);
             if (!verifySign) {
                 // 签名错误
-                return CommonResult.failed("签名校验错误");
+                return CommonResult.failed(ThirdPartyReturnCodeEnum.SIGN_ERROR);
             }
 
             // 解析入参
diff --git a/jsowell-common/src/main/java/com/jsowell/common/util/JWTUtils.java b/jsowell-common/src/main/java/com/jsowell/common/util/JWTUtils.java
index 00d240cf1..39fff47c1 100644
--- a/jsowell-common/src/main/java/com/jsowell/common/util/JWTUtils.java
+++ b/jsowell-common/src/main/java/com/jsowell/common/util/JWTUtils.java
@@ -138,11 +138,6 @@ public class JWTUtils {
 	 * @return
 	 */
 	public static boolean checkThirdPartyToken(String token) {
-		if (StringUtils.equals(token, "jsowellTest")) {
-			// 为了方便测试，token为jsowellTest校验通过
-			return true;
-		}
-
 		token = getToken(token);
 		if (StringUtils.isBlank(token)) {
 			throw new BusinessException(ReturnCodeEnum.CODE_TOKEN_ERROR);
diff --git a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java
index b99c9aefa..6642f34f2 100644
--- a/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java
+++ b/jsowell-thirdparty/src/main/java/com/jsowell/thirdparty/lianlian/common/CommonResult.java
@@ -2,6 +2,7 @@ package com.jsowell.thirdparty.lianlian.common;
 
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.jsowell.common.enums.thirdparty.ThirdPartyReturnCodeEnum;
 import com.jsowell.thirdparty.lianlian.common.enums.ResultCode;
 
 /**
@@ -54,8 +55,8 @@ public class CommonResult<T> {
      * @param <T>
      * @return
      */
-    public static <T> CommonResult<T> failed(ResultCode resultCode) {
-        return new CommonResult<T>(resultCode.getCode(), resultCode.getMsg(), null, null);
+    public static <T> CommonResult<T> failed(ThirdPartyReturnCodeEnum resultCode) {
+        return new CommonResult<T>(Long.parseLong(resultCode.getRet()), resultCode.getMsg(), null, null);
     }
 
     /**