From b9931cda30d13a02c29194bbf387f87b0a9d368b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 六月 2022 15:25:22 +0800
Subject: [PATCH] !192 优化登出方法 Merge pull request !192 from zendwang/dev

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |   15 +++++++--------
 1 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
index 37f7e99..9c40578 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
@@ -1,7 +1,6 @@
 package com.ruoyi.web.controller.system;
 
-import cn.dev33.satoken.exception.NotLoginException;
-import cn.dev33.satoken.stp.StpUtil;
+import com.ruoyi.common.annotation.Anonymous;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.domain.entity.SysMenu;
@@ -51,6 +50,7 @@
      * @param loginBody 鐧诲綍淇℃伅
      * @return 缁撴灉
      */
+    @Anonymous
     @ApiOperation("鐧诲綍鏂规硶")
     @PostMapping("/login")
     public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
@@ -68,6 +68,7 @@
      * @param smsLoginBody 鐧诲綍淇℃伅
      * @return 缁撴灉
      */
+    @Anonymous
     @ApiOperation("鐭俊鐧诲綍(绀轰緥)")
     @PostMapping("/smsLogin")
     public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
@@ -84,7 +85,8 @@
      * @param xcxCode 灏忕▼搴廲ode
      * @return 缁撴灉
      */
-    @ApiOperation("鐭俊鐧诲綍(绀轰緥)")
+    @Anonymous
+    @ApiOperation("灏忕▼搴忕櫥褰�(绀轰緥)")
     @PostMapping("/xcxLogin")
     public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
         Map<String, Object> ajax = new HashMap<>();
@@ -94,14 +96,11 @@
         return R.ok(ajax);
     }
 
+    @Anonymous
     @ApiOperation("鐧诲嚭鏂规硶")
     @PostMapping("/logout")
     public R<Void> logout() {
-        try {
-            StpUtil.logout();
-            loginService.logout(LoginHelper.getUsername());
-        } catch (NotLoginException e) {
-        }
+        loginService.logout();
         return R.ok("閫�鍑烘垚鍔�");
     }
 

--
Gitblit v1.9.3