From 6ee30852606dc7d28a6838ac0d837714d8fc9aab Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 28 十二月 2022 15:03:00 +0800
Subject: [PATCH] add 增加 GET 请求提交日期参数 默认格式化配置

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java |   69 +++++++++++++++++++++++-----------
 1 files changed, 46 insertions(+), 23 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..78c44e3 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 cn.dev33.satoken.annotation.SaIgnore;
 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.LoginUser;
+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,10 +20,10 @@
 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;
-import java.util.Set;
 
 /**
  * 鐧诲綍楠岃瘉
@@ -33,7 +31,6 @@
  * @author Lion Li
  */
 @Validated
-@Api(value = "鐧诲綍楠岃瘉鎺у埗鍣�", tags = {"鐧诲綍楠岃瘉绠＄悊"})
 @RequiredArgsConstructor
 @RestController
 public class SysLoginController {
@@ -41,7 +38,6 @@
     private final SysLoginService loginService;
     private final ISysMenuService menuService;
     private final ISysUserService userService;
-    private final SysPermissionService permissionService;
 
     /**
      * 鐧诲綍鏂规硶
@@ -49,7 +45,7 @@
      * @param loginBody 鐧诲綍淇℃伅
      * @return 缁撴灉
      */
-    @ApiOperation("鐧诲綍鏂规硶")
+    @SaIgnore
     @PostMapping("/login")
     public R<Map<String, Object>> login(@Validated @RequestBody LoginBody loginBody) {
         Map<String, Object> ajax = new HashMap<>();
@@ -60,13 +56,45 @@
         return R.ok(ajax);
     }
 
-    @ApiOperation("鐧诲嚭鏂规硶")
+    /**
+     * 鐭俊鐧诲綍(绀轰緥)
+     *
+     * @param smsLoginBody 鐧诲綍淇℃伅
+     * @return 缁撴灉
+     */
+    @SaIgnore
+    @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 缁撴灉
+     */
+    @SaIgnore
+    @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);
+    }
+
+    /**
+     * 閫�鍑虹櫥褰�
+     */
+    @SaIgnore
     @PostMapping("/logout")
     public R<Void> logout() {
-        try {
-            StpUtil.logout();
-        } catch (NotLoginException e) {
-        }
+        loginService.logout();
         return R.ok("閫�鍑烘垚鍔�");
     }
 
@@ -75,18 +103,14 @@
      *
      * @return 鐢ㄦ埛淇℃伅
      */
-    @ApiOperation("鑾峰彇鐢ㄦ埛淇℃伅")
     @GetMapping("getInfo")
     public R<Map<String, Object>> getInfo() {
-        SysUser user = userService.selectUserById(LoginHelper.getUserId());
-        // 瑙掕壊闆嗗悎
-        Set<String> roles = permissionService.getRolePermission(user);
-        // 鏉冮檺闆嗗悎
-        Set<String> permissions = permissionService.getMenuPermission(user);
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        SysUser user = userService.selectUserById(loginUser.getUserId());
         Map<String, Object> ajax = new HashMap<>();
         ajax.put("user", user);
-        ajax.put("roles", roles);
-        ajax.put("permissions", permissions);
+        ajax.put("roles", loginUser.getRolePermission());
+        ajax.put("permissions", loginUser.getMenuPermission());
         return R.ok(ajax);
     }
 
@@ -95,7 +119,6 @@
      *
      * @return 璺敱淇℃伅
      */
-    @ApiOperation("鑾峰彇璺敱淇℃伅")
     @GetMapping("getRouters")
     public R<List<RouterVo>> getRouters() {
         Long userId = LoginHelper.getUserId();

--
Gitblit v1.9.3