From 74c698fb0f094d7d322cfe6a218cf7c86e82a43f Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期五, 30 九月 2022 11:26:18 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/sys/SignController.java |   53 +++++++++++++++++++++++++----------------------------
 1 files changed, 25 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/sys/SignController.java b/src/main/java/com/lf/server/controller/sys/SignController.java
index 72c30ce..30b462b 100644
--- a/src/main/java/com/lf/server/controller/sys/SignController.java
+++ b/src/main/java/com/lf/server/controller/sys/SignController.java
@@ -122,11 +122,11 @@
      * @return
      */
     @GetMapping(value = "/logout")
-    public ResponseMsg<Object> logout(HttpServletRequest req, HttpServletResponse res) {
+    public ResponseMsg<Boolean> logout(HttpServletRequest req, HttpServletResponse res) {
         try {
             String token = WebHelper.getToken(req);
             if (StringHelper.isEmpty(token)) {
-                return fail("娌℃湁妫�娴嬪埌浠ょ墝", null);
+                return fail("娌℃湁妫�娴嬪埌浠ょ墝", false);
             }
 
             //...
@@ -134,36 +134,12 @@
 
             return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
         } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
+            return fail(ex.getMessage(), false);
         }
     }
 
     /**
-     * 妫�鏌ヤ护鐗�
-     *
-     * @param req
-     * @param res
-     * @return
-     */
-    @GetMapping(value = "/check")
-    public ResponseMsg<Object> check(HttpServletRequest req, HttpServletResponse res) {
-        try {
-            String token = WebHelper.getToken(req);
-            if (StringHelper.isEmpty(token)) {
-                return fail("娌℃湁妫�娴嬪埌浠ょ墝", null);
-            }
-
-            //...
-            Boolean flag = tokenService.isLogin(req, res);
-
-            return success(flag ? "鐢ㄦ埛宸茬櫥褰�" : "鐢ㄦ埛鏈櫥褰�", flag);
-        } catch (Exception ex) {
-            return fail(ex.getMessage(), null);
-        }
-    }
-
-    /**
-     * 鏄惁鐧诲綍
+     * 鏄�/鍚︾櫥褰�
      *
      * @return ResponseMsg<String>
      */
@@ -177,4 +153,25 @@
             return fail(ex.getMessage(), false);
         }
     }
+
+    /**
+     * 鑾峰彇褰撳墠鐢ㄦ埛
+     *
+     * @param req
+     * @param res
+     * @return
+     */
+    @GetMapping("/getCurrentUser")
+    public ResponseMsg<UsersEntity> getCurrentUser(HttpServletRequest req, HttpServletResponse res) {
+        try {
+            UsersEntity ue = tokenService.getCurrentUser(req);
+            if (ue == null) {
+                return fail("娌℃湁鎵惧埌", null);
+            }
+
+            return success(ue);
+        } catch (Exception ex) {
+            return fail(ex.getMessage(), null);
+        }
+    }
 }

--
Gitblit v1.9.3