Merge remote-tracking branch 'origin/master'

This commit is contained in:
guixinman
2025-06-18 17:31:55 +08:00
3 changed files with 3 additions and 4 deletions

View File

@@ -30,7 +30,6 @@ public class ALiVerifySourceServiceImpl implements FactorVerificationSourceServi
@Override
public RealNameTwoFactorVerificationDTO twoVerify(RealNameTwoFactorVerificationDTO verificationDTO) {
IdCardReq requestDTO = AliVerifyMapMapper.INSTANCE.toDTO(verificationDTO);
log.info("二要素认证:{}", JSONUtil.toJsonStr(requestDTO));
AlitaResult<IdCardRes> result = aliVerifyService.verify(requestDTO);
handlerResult(result, verificationDTO);
return verificationDTO;
@@ -39,7 +38,7 @@ public class ALiVerifySourceServiceImpl implements FactorVerificationSourceServi
private void handlerResult(AlitaResult<?> result, FactorVerificationDTO verificationDTO) {
verificationDTO.setInvokeData(JsonUtils.toJsonString(result));
verificationDTO.setInvokeData(JsonUtils.toNoEmptyJson(result));
AuthStatusEnum targetStatus = null;
if (SdkConstants.SDK_INVOKE_NOT_REACH_CODE.equals(result.getCode())) {
// 接口调起失败,未拿到返回结果,视为未调起

View File

@@ -61,7 +61,7 @@ public class AliVerifyServiceImpl implements AliVerifyService {
return AlitaResult.success(res.getData());
}
return AlitaResult.error(SdkConstants.SDK_HTTP_INVOKE_RESPONSE_FAIL_CODE,
res.getCode() + res.getData().getDesc());
res.getData() == null ? res.getMsg() : res.getData().getDesc());
} catch (Exception e) {
return AlitaResult.error(SdkConstants.SDK_RESPONSE_CONVERT_ERROR_CODE,
e.getMessage());

View File

@@ -91,7 +91,7 @@ public class UserRealNameTwoVerificationServiceImpl implements UserRealNameTwoVe
.cardNo(createDTO.getCardNo())
.build());
Assert.isTrue(AuthStatusEnum.AUTH_SUCCESS.getType().equals(verifyResultData.getStatus()),
"未认证成功:" + verifyResultData.getFailReason());
"实名不通过");
userService.authenticatePersonUser(
AuthenticateUserDTO.builder().cardNo(cardNo)
.realName(realName).userId(user.getId())