diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java index 36c1f4c4..7e0d7785 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/controller/SyncIamController.java @@ -332,33 +332,42 @@ public class SyncIamController { MessageHeader messageHeader = acceptDecryptPo.getMessageHeader(); BpmcResponseDto bpmcResponseDto = BpmcResponseDto.success(); + SendPoEncryptPo sendPoEncryptPo = new SendPoEncryptPo(); if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getType())){ bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE); bpmcResponseDto.setMessage("接口类型(type)未传参,请检查"); log.error(bpmcResponseDto.getMessage()); - return this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo.getReturns().setData(bpmcResponseDto.toString()); + return sendPoEncryptPo; } if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getEntity())){ bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE); bpmcResponseDto.setMessage("数据实体(entity)未传参,请检查"); log.error(bpmcResponseDto.getMessage()); - return this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo.getReturns().setData(bpmcResponseDto.toString()); + return sendPoEncryptPo; } if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getAction())){ bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE); bpmcResponseDto.setMessage("操作方式(action)未传参,请检查"); log.error(bpmcResponseDto.getMessage()); - return this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo.getReturns().setData(bpmcResponseDto.toString()); + return sendPoEncryptPo; } if (CharSequenceUtil.isEmpty(bpmcAcceptDto.getSignature())){ bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE); bpmcResponseDto.setMessage("签名(signature)未传参,请检查"); log.error(bpmcResponseDto.getMessage()); - return this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo.getReturns().setData(bpmcResponseDto.toString()); + return sendPoEncryptPo; } // 验证签名 @@ -367,7 +376,9 @@ public class SyncIamController { bpmcResponseDto.setReturnCode(DockingConstant.IAM_ERROR_RESULT_CODE); bpmcResponseDto.setMessage("签名校验不通过,请检查"); log.error(bpmcResponseDto.getMessage()); - return this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo.getReturns().setData(bpmcResponseDto.toString()); + return sendPoEncryptPo; } try { @@ -402,7 +413,9 @@ public class SyncIamController { bpmcResponseDto = BpmcResponseDto.error(e.getMessage()); } log.info(bpmcResponseDto.getMessage()); - return this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo = this.syncIamService.handlerGloablEncryptResponse(messageHeader, bpmcResponseDto); + sendPoEncryptPo.getReturns().setData(bpmcResponseDto.toString()); + return sendPoEncryptPo; } private BpmcResponseDto bpmcTypeRoleResource(ObjectMapper objectMapper, BpmcAcceptDto bpmcAcceptDto, BpmcResponseDto bpmcResponseDto) throws JsonProcessingException { List roleResourceDtoList = objectMapper.readValue(bpmcAcceptDto.getEntity(), new TypeReference>() {}); diff --git a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java index c0219858..b811a8fb 100644 --- a/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java +++ b/laws-modules-docking/src/main/java/com/jero/modules/docking/iam/dto/response/BpmcResponseDto.java @@ -7,8 +7,15 @@ public class BpmcResponseDto { private String returnCode; - private String message; + @Override + public String toString() { + return "{" + + "returnCode='" + returnCode + '\'' + + ", message='" + message + '\'' + + '}'; + } + private String message; public static BpmcResponseDto success(){ BpmcResponseDto bpmcResponseDto = new BpmcResponseDto(); bpmcResponseDto.returnCode = "200"; // 成功时固定为200