From b8a9ab562c0d87de1d0c1ee2e51c2d8b7883f5b0 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 24 一月 2022 12:06:32 +0800
Subject: [PATCH] Merge branch 'stmp' into Phase3
---
pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
index be48bd2..868901a 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
@@ -2,6 +2,7 @@
import com.pollex.pam.domain.OtpTmp;
import com.pollex.pam.enums.OtpTmpStatusEnum;
+import com.pollex.pam.web.rest.errors.OtpLoginFailException;
import com.pollex.pam.web.rest.vm.VerifyOtpVM;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -37,25 +38,21 @@
@Transactional
public void verifyOtp(String account, String indexKey, String otpCode) {
- try {
- if(applicationProperty.isMockLogin()){
- loginRecordService.saveOTPLoginSuccessRecord(account);
- log.debug("Do MockLogin");
- } else { // otp logon
- OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode);
- if (otpResponseDTO.isSuccess()) {
- loginRecordService.saveOTPLoginSuccessRecord(account);
- }
- else {
- loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason());
- throw new AuthenticationCredentialsNotFoundException("");
- }
+ if (applicationProperty.isMockLogin()) {
+ log.debug("Do MockLogin");
+ } else { // otp logon
+ OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode);
+ if (otpResponseDTO.isSuccess()) {
+ log.info("otp login success!, account = {}", account);
}
- setVerrifiedOtpTmp(account, indexKey);
- } catch (Exception e) {
- log.error("Exception: ", e);
- throw new AuthenticationCredentialsNotFoundException("");
+ else {
+ log.info("otp login fail... , account = {}, error code = {}, failReason = {}", account, otpResponseDTO.getFailCode(), otpResponseDTO.getFailReason());
+ loginRecordService.saveOTPLoginFailRecord(account, otpResponseDTO.getFailReason());
+ throw new OtpLoginFailException(otpResponseDTO.getFailCode());
+ }
}
+ loginRecordService.saveOTPLoginSuccessRecord(account);
+ setVerrifiedOtpTmp(account, indexKey);
}
private void setVerrifiedOtpTmp(String account, String indexKey) {
--
Gitblit v1.8.0