From 17f0c20242c6ee3d35b9ee8f677d747ed012423c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 02 九月 2022 16:30:20 +0800
Subject: [PATCH] remove 移除maven docker插件 过于老旧功能缺陷大 使用idea自带的docker插件替代
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java | 54 +++++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 13 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 3a033e5..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,20 +1,18 @@
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;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginBody;
+import com.ruoyi.common.core.domain.model.SmsLoginBody;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.system.domain.vo.RouterVo;
import com.ruoyi.system.service.ISysMenuService;
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;
@@ -22,6 +20,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
+import javax.validation.constraints.NotBlank;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -33,7 +32,6 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠＄悊"})
@RequiredArgsConstructor
@RestController
public class SysLoginController {
@@ -49,7 +47,7 @@
* @param loginBody 鐧诲綍淇℃伅
* @return 缁撴灉
*/
- @ApiOperation("鐧诲綍鏂规硶")
+ @Anonymous
@PostMapping("/login")
public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
Map<String, Object> ajax = new HashMap<>();
@@ -60,13 +58,45 @@
return R.ok(ajax);
}
- @ApiOperation("鐧诲嚭鏂规硶")
+ /**
+ * 鐭俊鐧诲綍(绀轰緥)
+ *
+ * @param smsLoginBody 鐧诲綍淇℃伅
+ * @return 缁撴灉
+ */
+ @Anonymous
+ @PostMapping("/smsLogin")
+ public R<Map<String, Object>> smsLogin(@Validated @RequestBody SmsLoginBody smsLoginBody) {
+ Map<String, Object> ajax = new HashMap<>();
+ // 鐢熸垚浠ょ墝
+ String token = loginService.smsLogin(smsLoginBody.getPhonenumber(), smsLoginBody.getSmsCode());
+ ajax.put(Constants.TOKEN, token);
+ return R.ok(ajax);
+ }
+
+ /**
+ * 灏忕▼搴忕櫥褰�(绀轰緥)
+ *
+ * @param xcxCode 灏忕▼搴廲ode
+ * @return 缁撴灉
+ */
+ @Anonymous
+ @PostMapping("/xcxLogin")
+ public R<Map<String, Object>> xcxLogin(@NotBlank(message = "{xcx.code.not.blank}") String xcxCode) {
+ Map<String, Object> ajax = new HashMap<>();
+ // 鐢熸垚浠ょ墝
+ String token = loginService.xcxLogin(xcxCode);
+ ajax.put(Constants.TOKEN, token);
+ return R.ok(ajax);
+ }
+
+ /**
+ * 閫�鍑虹櫥褰�
+ */
+ @Anonymous
@PostMapping("/logout")
public R<Void> logout() {
- try {
- StpUtil.logout();
- } catch (NotLoginException e) {
- }
+ loginService.logout();
return R.ok("閫�鍑烘垚鍔�");
}
@@ -75,7 +105,6 @@
*
* @return 鐢ㄦ埛淇℃伅
*/
- @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅")
@GetMapping("getInfo")
public R<Map<String, Object>> getInfo() {
SysUser user = userService.selectUserById(LoginHelper.getUserId());
@@ -95,7 +124,6 @@
*
* @return 璺敱淇℃伅
*/
- @ApiOperation("鑾峰彇璺敱淇℃伅")
@GetMapping("getRouters")
public R<List<RouterVo>> getRouters() {
Long userId = LoginHelper.getUserId();
--
Gitblit v1.9.3