From be7766b5f0dec84d537af9811e50f46ab3dfdb2a Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期一, 08 八月 2022 10:03:56 +0800 Subject: [PATCH] update 同步ruoyi --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 20 ++++---------------- 1 files changed, 4 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 053d57f..d4d0570 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,6 @@ 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 lombok.RequiredArgsConstructor; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -36,7 +32,6 @@ * @author Lion Li */ @Validated -@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠$悊"}) @RequiredArgsConstructor @RestController public class SysLoginController { @@ -53,7 +48,6 @@ * @return 缁撴灉 */ @Anonymous - @ApiOperation("鐧诲綍鏂规硶") @PostMapping("/login") public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) { Map<String, Object> ajax = new HashMap<>(); @@ -71,7 +65,6 @@ * @return 缁撴灉 */ @Anonymous - @ApiOperation("鐭俊鐧诲綍(绀轰緥)") @PostMapping("/smsLogin") public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) { Map<String, Object> ajax = new HashMap<>(); @@ -88,7 +81,6 @@ * @return 缁撴灉 */ @Anonymous - @ApiOperation("灏忕▼搴忕櫥褰�(绀轰緥)") @PostMapping("/xcxLogin") public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) { Map<String, Object> ajax = new HashMap<>(); @@ -98,15 +90,13 @@ 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("閫�鍑烘垚鍔�"); } @@ -115,7 +105,6 @@ * * @return 鐢ㄦ埛淇℃伅 */ - @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅") @GetMapping("getInfo") public R<Map<String, Object>> getInfo() { SysUser user = userService.selectUserById(LoginHelper.getUserId()); @@ -135,7 +124,6 @@ * * @return 璺敱淇℃伅 */ - @ApiOperation("鑾峰彇璺敱淇℃伅") @GetMapping("getRouters") public R<List<RouterVo>> getRouters() { Long userId = LoginHelper.getUserId(); -- Gitblit v1.9.3