From dae77c6087f0e9c7db8d4ec57242a0226d324552 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期二, 01 八月 2023 09:18:00 +0800
Subject: [PATCH] Merge branch '2023_CR2' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into 2023_CR2

---
 pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 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 ff21125..a17426e 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/OtpUtilService.java
@@ -35,10 +35,18 @@
 
     @Transactional
     public void verifyOtp(String account, String indexKey, String otpCode) {
-        if (applicationProperty.isMockLogin()) {
+        
+    	OtpTmp otpTmp = otpTmpService.findByAccountAndIndexKey(account, indexKey);
+    	if(otpTmp==null) {
+    		log.info("otp login fail... , account = {}, indexKey = {}, failReason = {}", account, indexKey, "Index key and account field mismatch");
+            throw new OtpLoginFailException("otp error");
+    	}
+    	
+    	if (applicationProperty.isMockLogin()) {
             log.debug("Do MockLogin");
         } else {  // otp logon
-            OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode);
+        	
+        	OtpResponseDTO otpResponseDTO = otpWebService.verifyOTP(indexKey, otpCode);
             if (otpResponseDTO.isSuccess()) {
                 log.info("otp login success!, account = {}", account);
             }

--
Gitblit v1.8.0