diff --git a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java index 07f705625..21140ab24 100644 --- a/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java +++ b/coolstore-partner-common/src/main/java/com/cool/store/constants/CommonConstants.java @@ -10,6 +10,8 @@ public class CommonConstants { public static final String REQUEST_ID = "requestId"; + public static final String MESSAGE_ID = "messageId"; + public static final String ACCESS_TOKEN_KEY = "access_token"; public static final String REFRESH_TOKEN_KEY = "refresh_token"; diff --git a/coolstore-partner-common/src/main/java/com/cool/store/enums/IDCardSideEnum.java b/coolstore-partner-common/src/main/java/com/cool/store/enums/IDCardSideEnum.java new file mode 100644 index 000000000..ce4f76114 --- /dev/null +++ b/coolstore-partner-common/src/main/java/com/cool/store/enums/IDCardSideEnum.java @@ -0,0 +1,32 @@ +package com.cool.store.enums; + +/** + * @author zhangchenbiao + * @FileName: IDCardSideEnum + * @Description: 身份证正反面类型 + * @date 2023-06-16 16:49 + */ +public enum IDCardSideEnum { + + FACE("face", "正面"), + BACK("back", "反面") + ; + + private String code; + + private String message; + + IDCardSideEnum(String code, String message) { + this.code = code; + this.message = message; + } + + + public String getCode() { + return code; + } + + public String getMessage() { + return message; + } +} diff --git a/coolstore-partner-service/src/main/java/com/cool/store/mq/RocketMqLogAspect.java b/coolstore-partner-service/src/main/java/com/cool/store/mq/RocketMqLogAspect.java index 1f1cc1c27..59f62f5e1 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/mq/RocketMqLogAspect.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/mq/RocketMqLogAspect.java @@ -45,10 +45,9 @@ public class RocketMqLogAspect { Object[] args = joinPoint.getArgs(); Message message = (Message)args[0]; String traceId = message.getMsgID() + Constants.TOPIC_PARTITION_SEPARATOR + message.getReconsumeTimes(); - Map context = MDC.getCopyOfContextMap(); - if(Objects.isNull(context)){ - MDC.put(CommonConstants.REQUEST_ID, traceId); - } + String requestId = message.getUserProperties(CommonConstants.REQUEST_ID); + MDC.put(CommonConstants.REQUEST_ID, requestId); + MDC.put(CommonConstants.MESSAGE_ID, traceId); } catch (IllegalArgumentException e) { log.info("MDC mqBeforeLog", e); } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java b/coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java index 0a7bf8b6c..7ec359b0c 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/AliyunService.java @@ -1,6 +1,7 @@ package com.cool.store.service; import com.cool.store.dto.partner.DescribePhoneNumberDTO; +import com.cool.store.enums.IDCardSideEnum; import com.cool.store.exception.ApiException; import com.cool.store.vo.cuser.IdentityCardInfoVO; @@ -24,6 +25,6 @@ public interface AliyunService { * @param faceImageUrl * @return */ - IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl) throws ApiException; + IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl, IDCardSideEnum sideEnum) throws ApiException; } diff --git a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java index 0d171c9f1..348dccb1d 100644 --- a/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java +++ b/coolstore-partner-service/src/main/java/com/cool/store/service/impl/AliyunServiceImpl.java @@ -9,6 +9,7 @@ import com.aliyun.ocr20191230.models.RecognizeIdentityCardResponseBody; import com.aliyun.teaopenapi.models.Config; import com.cool.store.dto.partner.DescribePhoneNumberDTO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.IDCardSideEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.service.AliyunService; @@ -61,7 +62,7 @@ public class AliyunServiceImpl implements AliyunService { } @Override - public IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl) throws ApiException { + public IdentityCardInfoVO getIdentityCardInfo(String faceImageUrl, IDCardSideEnum sideEnum) throws ApiException { //todo zcb ak sk替换 com.aliyun.teaopenapi.models.Config config = new com.aliyun.teaopenapi.models.Config() .setAccessKeyId("LTAI5t9RaXvABZbHvoXjDFJ1") @@ -74,7 +75,7 @@ public class AliyunServiceImpl implements AliyunService { InputStream inputStream = url.openConnection().getInputStream(); com.aliyun.ocr20191230.models.RecognizeIdentityCardAdvanceRequest recognizeIdentityCardAdvanceRequest = new com.aliyun.ocr20191230.models.RecognizeIdentityCardAdvanceRequest() .setImageURLObject(inputStream) - .setSide("face"); + .setSide(sideEnum.getCode()); com.aliyun.teautil.models.RuntimeOptions runtime = new com.aliyun.teautil.models.RuntimeOptions(); RecognizeIdentityCardResponse idCardResponse = client.recognizeIdentityCardAdvance(recognizeIdentityCardAdvanceRequest, runtime); log.info("身份证解析结果:{}", JSONObject.toJSONString(idCardResponse)); diff --git a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java index e0c16c7f4..8a6c7d9c4 100644 --- a/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java +++ b/coolstore-partner-webb/src/main/java/com/cool/store/controller/TestController.java @@ -13,6 +13,7 @@ import com.cool.store.entity.HyOpenAreaInfoDO; import com.cool.store.entity.EnterpriseUserDO; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.IDCardSideEnum; import com.cool.store.exception.ApiException; import com.cool.store.exception.ServiceException; import com.cool.store.mapper.HyOpenAreaInfoMapper; @@ -205,7 +206,7 @@ public class TestController { @ApiOperation("根据身份证正面解析获取数据") public ResponseResult getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl){ try { - IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl); + IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl, IDCardSideEnum.FACE); return ResponseResult.success(identityCardInfo); } catch (Exception e) { throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL); diff --git a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java index c41b9ea90..1778ad83b 100644 --- a/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java +++ b/coolstore-partner-webc/src/main/java/com/cool/store/controller/PartnerController.java @@ -2,6 +2,7 @@ package com.cool.store.controller; import com.cool.store.context.PartnerUserHolder; import com.cool.store.enums.ErrorCodeEnum; +import com.cool.store.enums.IDCardSideEnum; import com.cool.store.exception.ServiceException; import com.cool.store.request.BaseUserInfoRequest; import com.cool.store.request.PartnerBaseInfoRequest; @@ -208,9 +209,9 @@ public class PartnerController { @GetMapping(path = "/getIdentityCardInfo") @ApiOperation("根据身份证正面解析获取数据") - public ResponseResult getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl){ + public ResponseResult getIdentityCardInfo(@RequestParam(value = "faceImageUrl")String faceImageUrl, @RequestParam("side")IDCardSideEnum sideEnum){ try { - IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl); + IdentityCardInfoVO identityCardInfo = aliyunService.getIdentityCardInfo(faceImageUrl, sideEnum); return ResponseResult.success(identityCardInfo); } catch (Exception e) { throw new ServiceException(ErrorCodeEnum.IDENTITY_CARD_PARSE_FAIL);