From 71609e40ba719ff40c27bb00d7f5f4af521a80e2 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期五, 26 四月 2024 08:52:09 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pms-SV
---
pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 13 ++++++-------
1 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
index 35026d1..8e93c9c 100644
--- a/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
+++ b/pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java
@@ -54,9 +54,8 @@
*/
@PostMapping(path = "login", consumes = MediaType.APPLICATION_JSON_VALUE)//鍓嶇鎻愪氦json鏁版嵁
@Log("鐢ㄦ埛鐧诲綍(json)")
- public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo,
- HttpSession session,
- BindingResult bindingResult) {
+ public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo,BindingResult bindingResult,
+ HttpSession session) {
try {
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -80,12 +79,12 @@
/**
* 瀹㈡埛绔姹傜敤鎴风櫥褰曪紝瀹㈡埛绔彁浜orm琛ㄥ崟
- * @param vo 鐧诲綍鐢ㄦ埛form琛ㄥ崟瀵硅薄
+ * @param loginVo 鐧诲綍鐢ㄦ埛form琛ㄥ崟瀵硅薄
* @return 鐧诲綍鐢ㄦ埛鍊煎璞�
*/
@PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)//鍓嶇鎻愪氦form琛ㄥ崟鏁版嵁
@Log("鐢ㄦ埛鐧诲綍(form)")
- public BaseResponse<UserVo> loginForm(@RequestBody @Valid LoginVo vo, HttpSession session,BindingResult bindingResult){
+ public BaseResponse<UserVo> loginForm(@Valid LoginVo loginVo, BindingResult bindingResult,HttpSession session){
try{
if(bindingResult != null && bindingResult.hasErrors()){
return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
@@ -93,9 +92,9 @@
// 浠嶴ession涓幏鍙栦繚瀛樼殑楠岃瘉鐮�
String sessionCaptcha = (String) session.getAttribute("captcha");
// 棣栧厛楠岃瘉楠岃瘉鐮�
- if (vo.captcha != null && vo.captcha.equalsIgnoreCase(sessionCaptcha)) {
+ if (loginVo.captcha != null && loginVo.captcha.equalsIgnoreCase(sessionCaptcha)) {
session.removeAttribute("captcha");
- return this.doLogin(vo) ;
+ return this.doLogin(loginVo) ;
} else {
// 楠岃瘉鐮侀敊璇紝杩斿洖鐧诲綍椤甸潰骞舵樉绀洪敊璇俊鎭�
return BaseResponseUtils.buildFail("楠岃瘉鐮侀敊璇�");
--
Gitblit v1.8.0