From 7fe08cea4402e2dadd42aff601d4762ed7107b63 Mon Sep 17 00:00:00 2001
From: yanglin <yanglin@axzo.cn>
Date: Wed, 12 Feb 2025 14:08:48 +0800
Subject: [PATCH] =?UTF-8?q?REQ-3201:=20=E5=A4=87=E4=BB=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/axzo/nanopart/ess/api/EssCallbackApi.java |  3 ++-
 .../ess/server/ess/EssCallbackController.java         | 11 ++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/EssCallbackApi.java b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/EssCallbackApi.java
index 7a9b2a43..cd391cd9 100644
--- a/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/EssCallbackApi.java
+++ b/ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/EssCallbackApi.java
@@ -2,6 +2,7 @@ package cn.axzo.nanopart.ess.api;
 
 import cn.axzo.framework.domain.web.result.ApiResult;
 import cn.axzo.nanopart.ess.api.request.CallbackContent;
+import cn.axzo.nanopart.ess.api.request.CallbackRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,6 +16,6 @@ import javax.validation.Valid;
 public interface EssCallbackApi {
 
     @PostMapping("api/ess/callback")
-    ApiResult<Object> callback(@RequestBody @Valid CallbackContent content);
+    ApiResult<Object> callback(@RequestBody @Valid CallbackRequest request);
 
 }
\ No newline at end of file
diff --git a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssCallbackController.java b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssCallbackController.java
index 6f9310b1..96801e36 100644
--- a/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssCallbackController.java
+++ b/ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssCallbackController.java
@@ -5,15 +5,12 @@ import cn.axzo.nanopart.ess.api.EssCallbackApi;
 import cn.axzo.nanopart.ess.api.enums.EssContractState;
 import cn.axzo.nanopart.ess.api.enums.EssSealState;
 import cn.axzo.nanopart.ess.api.enums.EssSealType;
-import cn.axzo.nanopart.ess.api.request.CallbackContent;
 import cn.axzo.nanopart.ess.api.request.CallbackRequest;
 import cn.axzo.nanopart.ess.api.request.CallbackRequest.OrgAuthorizationFinish;
 import cn.axzo.nanopart.ess.server.dao.EssLogDao;
 import cn.axzo.nanopart.ess.server.entity.EssLog;
 import cn.axzo.nanopart.ess.server.ess.domain.EssOuOpenId;
 import cn.axzo.nanopart.ess.server.ess.domain.EssPersonOpenId;
-import cn.hutool.core.codec.Base64Decoder;
-import com.alibaba.fastjson.JSON;
 import lombok.AccessLevel;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -100,12 +97,8 @@ class EssCallbackController implements EssCallbackApi, InitializingBean {
     }
 
     @Override
-    public ApiResult<Object> callback(CallbackContent content) {
-        log.info("ess callback: {}", content);
-        if (content.getEncrypt() == null || content.getEncrypt().length() < 20)
-            return ApiResult.ok("success");
-        String requestBody = Base64Decoder.decodeStr(content.getEncrypt());
-        CallbackRequest request = JSON.parseObject(requestBody, CallbackRequest.class);
+    public ApiResult<Object> callback(CallbackRequest request) {
+        log.info("ess callback: {}", request);
         Object subject = null;
         try {
             CallbackType callbackType = CallbackType.parse(request.getMsgType()).orElse(null);