From b832880e1fcf3307387d53106078498f68a95853 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 05 三月 2024 16:59:02 +0800
Subject: [PATCH] 移除TestLoginResource

---
 pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java |   14 ++++++++++++--
 1 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java
index fc49c7d..6bb5f5e 100644
--- a/pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java
+++ b/pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java
@@ -46,13 +46,22 @@
 
     @Autowired
     ConsultantService consultantService;
+    
+    @Autowired
+    AesUtil aesUtil;
 
     @AuditLoggingInject(type = CONSULTANT_LOGIN)
     @PostMapping("/authenticate/{imgCode}")
     public ResponseEntity<UserJWTController.JWTToken> authorize(
     		@RequestBody EServiceLoginVM eServiceLoginVM
     		, HttpServletResponse response, HttpServletRequest request,
-			@PathVariable String imgCode){
+			@PathVariable String imgCode) throws Exception{
+    	
+    	
+    	String paswword = aesUtil.aesDecode(eServiceLoginVM.getPassword());
+    	if(!StringUtils.hasText(paswword)) {
+    		throw new OtpLoginFailException("撖Ⅳ閫�撖仃���");
+    	}
     	
     	HttpSession session = request.getSession();
     	String sessionImpCode = (String) session.getAttribute("img_code");
@@ -65,10 +74,11 @@
     	if(!imgCode.equals(sessionImpCode)) {
     		throw new OtpLoginFailException("撽�Ⅳ頛詨�隤�");
     	}
+    	
     	session.setAttribute("img_code", null);
     	EServiceAuthenticationToken authenticationToken = new EServiceAuthenticationToken(
             eServiceLoginVM.getUsername(),
-            AesUtil.aesDecode(eServiceLoginVM.getPassword())
+            paswword
         );
 
         Authentication authentication = authenticationManagerBuilder.getObject().authenticate(authenticationToken);

--
Gitblit v1.8.0