wangli/nanopart
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

REQ-3201: 备份

Browse Source
This commit is contained in:
yanglin 2025-02-12 14:08:48 +08:00
parent 21186b3797
commit 7fe08cea44
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ess/ess-api/src/main/java/cn/axzo/nanopart/ess/api/EssCallbackApi.java
View File

@ -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);
}

11
ess/ess-server/src/main/java/cn/axzo/nanopart/ess/server/ess/EssCallbackController.java
View File

@ -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);