From dd25573ebce3450d90d0012a30b12a5185bc7310 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 08 七月 2022 15:49:15 +0800
Subject: [PATCH] update 使用 @param 注释替换 @Parameter 注解 fix 修复 token 无法传递 与 无法持久化问题
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 27 +++++++++++----------------
1 files changed, 11 insertions(+), 16 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 facf6ce..10b9dce 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;
@@ -14,8 +13,7 @@
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.system.service.SysLoginService;
import com.ruoyi.system.service.SysPermissionService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -35,7 +33,7 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠＄悊"})
+@Tag(name = "鐧诲綍楠岃瘉鎺у埗鍣�", description = "鐧诲綍楠岃瘉绠＄悊")
@RequiredArgsConstructor
@RestController
public class SysLoginController {
@@ -51,7 +49,7 @@
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @ApiOperation("鐧诲綍鏂规硶")
+ @Anonymous
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -68,7 +66,7 @@
* @param smsLoginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @ApiOperation("鐭俊鐧诲綍(绀轰緥)")
+ @Anonymous
@PostMapping("/smsLogin")
public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -84,7 +82,7 @@
* @param xcxCode 灏忕▼搴廲ode
* @return 缁撴灉
*/
- @ApiOperation("灏忕▼搴忕櫥褰�(绀轰緥)")
+ @Anonymous
@PostMapping("/xcxLogin")
public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
Map<String, Object> ajax = new HashMap<>();
@@ -94,14 +92,13 @@
return R.ok(ajax);
}
- @ApiOperation("鐧诲嚭鏂规硶")
+ /**
+ * 閫�鍑虹櫥褰�
+ */
+ @Anonymous
@PostMapping("/logout")
public R<Void> logout() {
- try {
- StpUtil.logout();
- loginService.logout(LoginHelper.getUsername());
- } catch (NotLoginException e) {
- }
+ loginService.logout();
return R.ok("閫�鍑烘垚鍔�");
}
@@ -110,7 +107,6 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("getInfo")
public R<Map<String, Object>> getInfo() {
SysUser user = userService.selectUserById(LoginHelper.getUserId());
@@ -130,7 +126,6 @@
*
* @return 璺敱淇℃伅
*/
- @ApiOperation("鑾峰彇璺敱淇℃伅")
@GetMapping("getRouters")
public R<List<RouterVo>> getRouters() {
Long userId = LoginHelper.getUserId();
--
Gitblit v1.9.3