From 22341d46c035634e71b973545864444f24ebed9e Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期三, 24 八月 2022 14:35:12 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/web/rest/EServiceResource.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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 b12ae2d..8c9dd25 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
@@ -1,11 +1,10 @@
package com.pollex.pam.web.rest;
-import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
-import com.pollex.pam.business.service.ConsultantService;
-import com.pollex.pam.security.jwt.JWTFilter;
-import com.pollex.pam.security.jwt.TokenProvider;
-import com.pollex.pam.business.security.token.EServiceAuthenticationToken;
-import com.pollex.pam.business.web.vm.EServiceLoginVM;
+import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_LOGIN;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -23,11 +22,13 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.CONSULTANT_LOGIN;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import com.pollex.pam.business.aop.logging.audit.AuditLoggingInject;
+import com.pollex.pam.business.security.token.EServiceAuthenticationToken;
+import com.pollex.pam.business.service.ConsultantService;
+import com.pollex.pam.business.web.errors.OtpLoginFailException;
+import com.pollex.pam.business.web.vm.EServiceLoginVM;
+import com.pollex.pam.security.jwt.JWTFilter;
+import com.pollex.pam.security.jwt.TokenProvider;
@RestController
@RequestMapping("/api/eService")
@@ -50,20 +51,19 @@
public ResponseEntity<UserJWTController.JWTToken> authorize(
@RequestBody EServiceLoginVM eServiceLoginVM
, HttpServletResponse response, HttpServletRequest request,
- @PathVariable String imgCode) {
- log.debug("imgCode:::::::"+imgCode);
+ @PathVariable String imgCode){
HttpSession session = request.getSession();
String sessionImpCode = (String) session.getAttribute("img_code");
if (!StringUtils.hasText(sessionImpCode)
|| !StringUtils.hasText(imgCode)) {
- return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
+ throw new OtpLoginFailException("撽�Ⅳ頛詨�隤�");
}
if(!imgCode.equals(sessionImpCode)) {
- return ResponseEntity.status(HttpStatus.BAD_REQUEST).build();
+ throw new OtpLoginFailException("撽�Ⅳ頛詨�隤�");
}
-
+ session.setAttribute("img_code", null);
EServiceAuthenticationToken authenticationToken = new EServiceAuthenticationToken(
eServiceLoginVM.getUsername(),
--
Gitblit v1.8.0