From 5c12029ffa88d2818354b36f902f998398ba330e Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 11 Apr 2024 11:00:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=AA=8C=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/cool/store/enums/ErrorCodeEnum.java | 4 ++++ .../java/com/cool/store/service/impl/KdzApiServiceImpl.java | 2 +- .../com/cool/store/controller/webb/KdzApiController.java | 5 +---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java index ce1d7ee49..e191818fd 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/ErrorCodeEnum.java @@ -144,6 +144,10 @@ public enum ErrorCodeEnum { TIME_FALSE(109002, "结束时间不能早于开始时间",null), + BUSINESS_ID_NOT_EXIST(109003, "kdzBusinessId解析异常,请检查",null), + + VERIFY_MD5_FALSE(109004, "验签失败,请检查",null), + ; diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java index 53cf4a012..4e21adaa7 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/KdzApiServiceImpl.java @@ -34,7 +34,7 @@ public class KdzApiServiceImpl implements KdzApiService { String kdzBusinessId = request.getKdzBusinessId(); String lineId = splitMethod(kdzBusinessId); if (StringUtil.isBlank(lineId)){ - throw new ServiceException("kdzBusinessId解析异常,请检查"); + throw new ServiceException(ErrorCodeEnum.BUSINESS_ID_NOT_EXIST); } LineInfoDO lineInfoDO = lineInfoMapper.getByLineId(Long.valueOf(lineId)); if (Objects.isNull(lineInfoDO)){ diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index 190bee0a9..abcb82ba7 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -31,7 +31,7 @@ public class KdzApiController { @RequestBody XfsgOpenApiRequest request) { log.info("auditResult requestBody :{}", JSONObject.toJSONString(request)); if(!verifyMD5(request,eid)){ - return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); + return ResponseResult.fail(ErrorCodeEnum.VERIFY_MD5_FALSE); } if(eid == null || request.getBizContent() == null){ return ResponseResult.fail(ErrorCodeEnum.PARAMS_VALIDATE_ERROR); @@ -47,10 +47,7 @@ public class KdzApiController { sb.append("timestamp=").append(request.getTimestamp()).append("&"); //企业唯一标识enterpriseId sb.append("enterpriseId=").append(eid).append("&"); - sb.append("bizContent=").append(request.getBizContent()); - String md5 = EncryptUtil.xfsgMd5(sb.toString()); - return md5.equals(request.getSign()); } From f9dab07f8f2a1ece7377f0acb59bb4516e2a8d29 Mon Sep 17 00:00:00 2001 From: guohb Date: Thu, 11 Apr 2024 11:21:40 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=AA=8C=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/cool/store/controller/webb/KdzApiController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java index abcb82ba7..6e770c72d 100644 --- a/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java +++ b/coolstore-partner-web/src/main/java/com/cool/store/controller/webb/KdzApiController.java @@ -46,7 +46,7 @@ public class KdzApiController { //用户唯一标识id sb.append("timestamp=").append(request.getTimestamp()).append("&"); //企业唯一标识enterpriseId - sb.append("enterpriseId=").append(eid).append("&"); + sb.append("enterpriseId=").append(eid); String md5 = EncryptUtil.xfsgMd5(sb.toString()); return md5.equals(request.getSign()); }