From aa0f9381d424b98e86845c6da21e2fd8640fe056 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 21 二月 2022 18:32:45 +0800
Subject: [PATCH] [update] 若顧問狀態非啟用時,則搜尋及推薦會找不到該顧問

---
 pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java |   32 ++++++++++++--------------------
 1 files changed, 12 insertions(+), 20 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..9736d8e 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;
@@ -27,9 +28,6 @@
     @Autowired
     OtpTmpService otpTmpService;
 
-    @Autowired
-    LoginRecordService loginRecordService;
-
     @Transactional
     public void verifyOtp(VerifyOtpVM verifyOtpParam) {
         verifyOtp(verifyOtpParam.getAccount(), verifyOtpParam.getIndexKey(), verifyOtpParam.getOtpCode());
@@ -37,25 +35,19 @@
 
     @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());
+                throw new OtpLoginFailException(otpResponseDTO.getFailCode());
+            }
         }
+        setVerrifiedOtpTmp(account, indexKey);
     }
 
     private void setVerrifiedOtpTmp(String account, String indexKey) {

--
Gitblit v1.8.0