From bef93a3facab3b343512046e714a1d1b2ea750a6 Mon Sep 17 00:00:00 2001
From: liuxm <liuxm@fescotech.com>
Date: 星期一, 22 四月 2024 08:51:55 +0800
Subject: [PATCH] 用户功能调试

---
 pms-parent/pms-web-sso/src/main/java/com/dy/sso/busi/SsoCtrl.java |   39 +++++++++++++++++++++++++++------------
 1 files changed, 27 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..3bc9662 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
@@ -46,10 +46,15 @@
      */
     @PostMapping(path = "login", consumes = MediaType.APPLICATION_JSON_VALUE)//鍓嶇鎻愪氦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) ;
     }
 
     /**
@@ -59,10 +64,15 @@
      */
     @PostMapping(path = "loginForm", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)//鍓嶇鎻愪氦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) ;
     }
 
 
@@ -73,12 +83,17 @@
      */
     @GetMapping(path = "logout")
     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