From 4bfb26b38d28eb56cb1a63ce1d0af426087d0f77 Mon Sep 17 00:00:00 2001
From: Guoqs <123@jsowell.com>
Date: Wed, 25 Sep 2024 11:49:14 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=A1=E9=AA=8C=E7=AD=BE=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsowell/api/thirdparty/ThirdPartyBaseController.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java
index c93a603d1..b955746b9 100644
--- a/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java
+++ b/jsowell-admin/src/main/java/com/jsowell/api/thirdparty/ThirdPartyBaseController.java
@@ -180,6 +180,10 @@ public class ThirdPartyBaseController extends BaseController {
      * verifySignature
      */
     protected boolean verifySignature(CommonParamsDTO dto) {
+        return this.verifySignature(dto, null);
+    }
+
+    protected boolean verifySignature(CommonParamsDTO dto, String signSecret) {
         // 查询密钥
         String operatorId = StringUtils.isNotBlank(dto.getOperatorID()) ? dto.getOperatorID() : dto.getPlatformID();
         ThirdPartySecretInfoVO secretInfoVO = thirdpartySecretInfoService.queryByOperatorId(operatorId);
@@ -187,7 +191,9 @@ public class ThirdPartyBaseController extends BaseController {
             throw new BusinessException("1", "无此对接平台");
         }
         // 校验签名，使用响应方的密钥
-        String signSecret = secretInfoVO.getOurSigSecret();
+        if (StringUtils.isBlank(signSecret)) {
+            signSecret = secretInfoVO.getTheirSigSecret();
+        }
         Map<String, String> map = Maps.newLinkedHashMap();
         String operatorID = dto.getOperatorID();
         if (StringUtils.isNotBlank(operatorID)) {