From 0b077806196ceb8a68af93f00880ccc70aee50c2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 07 七月 2022 18:08:14 +0800
Subject: [PATCH] add 整合 springdoc 移除 knife4j
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 27 ++++++++++-----------------
1 files changed, 10 insertions(+), 17 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 cdb1d6c..d0b3152 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,5 @@
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;
@@ -15,8 +13,8 @@
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.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.GetMapping;
@@ -36,7 +34,7 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠＄悊"})
+@Tag(name ="鐧诲綍楠岃瘉鎺у埗鍣�", description = "鐧诲綍楠岃瘉绠＄悊")
@RequiredArgsConstructor
@RestController
public class SysLoginController {
@@ -53,7 +51,7 @@
* @return 缁撴灉
*/
@Anonymous
- @ApiOperation("鐧诲綍鏂规硶")
+ @Operation(summary = "鐧诲綍鏂规硶")
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -71,7 +69,7 @@
* @return 缁撴灉
*/
@Anonymous
- @ApiOperation("鐭俊鐧诲綍(绀轰緥)")
+ @Operation(summary = "鐭俊鐧诲綍(绀轰緥)")
@PostMapping("/smsLogin")
public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -88,7 +86,7 @@
* @return 缁撴灉
*/
@Anonymous
- @ApiOperation("灏忕▼搴忕櫥褰�(绀轰緥)")
+ @Operation(summary = "灏忕▼搴忕櫥褰�(绀轰緥)")
@PostMapping("/xcxLogin")
public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
Map<String, Object> ajax = new HashMap<>();
@@ -99,15 +97,10 @@
}
@Anonymous
- @ApiOperation("鐧诲嚭鏂规硶")
+ @Operation(summary = "鐧诲嚭鏂规硶")
@PostMapping("/logout")
public R<Void> logout() {
- try {
- String username = LoginHelper.getUsername();
- StpUtil.logout();
- loginService.logout(username);
- } catch (NotLoginException e) {
- }
+ loginService.logout();
return R.ok("閫�鍑烘垚鍔�");
}
@@ -116,7 +109,7 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅")
+ @Operation(summary = "鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("getInfo")
public R<Map<String, Object>> getInfo() {
SysUser user = userService.selectUserById(LoginHelper.getUserId());
@@ -136,7 +129,7 @@
*
* @return 璺敱淇℃伅
*/
- @ApiOperation("鑾峰彇璺敱淇℃伅")
+ @Operation(summary = "鑾峰彇璺敱淇℃伅")
@GetMapping("getRouters")
public R<List<RouterVo>> getRouters() {
Long userId = LoginHelper.getUserId();
--
Gitblit v1.9.3