From e430bfca38cdae9dd230f951e108a75caebccb61 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期三, 24 四月 2024 10:56:47 +0800
Subject: [PATCH] 完善代码
---
pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java | 43 +++++++++++++++++++++++++++++++------------
1 files changed, 31 insertions(+), 12 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 79eb195..8d16790 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
@@ -4,6 +4,7 @@
import com.dy.common.util.MD5;
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pmsGlobal.aop.Log;
import com.dy.pmsGlobal.pojoBa.BaUser;
import com.mysql.cj.util.StringUtils;
import jakarta.servlet.http.HttpServletRequest;
@@ -45,11 +46,17 @@
* @return 鐧诲綍鐢ㄦ埛鍊煎璞�
*/
@PostMapping(path = "login", consumes = MediaType.APPLICATION_JSON_VALUE)//鍓嶇鎻愪氦json鏁版嵁
+ @Log("鐢ㄦ埛鐧诲綍(json)")
public BaseResponse<UserVo> login(@RequestBody @Valid LoginVo vo, BindingResult bindingResult) {
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ try {
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ return this.doLogin(vo) ;
+ } catch (Exception e) {
+ log.error("鏌ヨ涓�涓敤鎴锋暟鎹紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
- return this.doLogin(vo) ;
}
/**
@@ -58,11 +65,17 @@
* @return 鐧诲綍鐢ㄦ埛鍊煎璞�
*/
@PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)//鍓嶇鎻愪氦form琛ㄥ崟鏁版嵁
+ @Log("鐢ㄦ埛鐧诲綍(form)")
public BaseResponse<UserVo> loginForm(@RequestBody @Valid LoginVo vo, BindingResult bindingResult){
- if(bindingResult != null && bindingResult.hasErrors()){
- return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ try{
+ if(bindingResult != null && bindingResult.hasErrors()){
+ return BaseResponseUtils.buildFail(Objects.requireNonNull(bindingResult.getFieldError()).getDefaultMessage());
+ }
+ return this.doLogin(vo) ;
+ } catch (Exception e) {
+ log.error("鏌ヨ涓�涓敤鎴锋暟鎹紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
- return this.doLogin(vo) ;
}
@@ -72,13 +85,19 @@
* @return 姝ｅ父閫�鍑虹櫥褰曡繑鍥瀟rue锛屽惁鍒欒繑鍥瀎alse
*/
@GetMapping(path = "logout")
+ @Log("閫�鍑虹櫥褰�")
public BaseResponse<Boolean> logout(HttpServletRequest hr){
- String token = hr.getHeader("token") ;
- if(token != null){
- this.sv.logout(token) ;
- return BaseResponseUtils.buildSuccess(true);
- }else{
- return BaseResponseUtils.buildFail("鏈粠header涓緱鍒皌oken");
+ try{
+ String token = hr.getHeader("token") ;
+ if(token != null){
+ this.sv.logout(token) ;
+ return BaseResponseUtils.buildSuccess(true);
+ }else{
+ return BaseResponseUtils.buildFail("鏈粠header涓緱鍒皌oken");
+ }
+ } catch (Exception e) {
+ log.error("鏌ヨ涓�涓敤鎴锋暟鎹紓甯�", e);
+ return BaseResponseUtils.buildException(e.getMessage());
}
}
--
Gitblit v1.8.0