From a1cf719d268a9d16db81ece94e75037c844f898f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 18 二月 2020 14:47:23 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java | 188 +++++++++++++++++++++++-----------------------
1 files changed, 94 insertions(+), 94 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
index d7bf923..09a5d13 100644
--- a/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
+++ b/ruoyi/src/main/java/com/ruoyi/project/system/controller/SysLoginController.java
@@ -1,94 +1,94 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import java.util.Set;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.framework.security.LoginUser;
-import com.ruoyi.framework.security.service.SysLoginService;
-import com.ruoyi.framework.security.service.SysPermissionService;
-import com.ruoyi.framework.security.service.TokenService;
-import com.ruoyi.framework.web.domain.AjaxResult;
-import com.ruoyi.project.system.domain.SysMenu;
-import com.ruoyi.project.system.domain.SysUser;
-import com.ruoyi.project.system.service.ISysMenuService;
-
-/**
- * 鐧诲綍楠岃瘉
- *
- * @author ruoyi
- */
-@RestController
-public class SysLoginController
-{
- @Autowired
- private SysLoginService loginService;
-
- @Autowired
- private ISysMenuService menuService;
-
- @Autowired
- private SysPermissionService permissionService;
-
- @Autowired
- private TokenService tokenService;
-
- /**
- * 鐧诲綍鏂规硶
- *
- * @param username 鐢ㄦ埛鍚�
- * @param password 瀵嗙爜
- * @param captcha 楠岃瘉鐮�
- * @param uuid 鍞竴鏍囪瘑
- * @return 缁撴灉
- */
- @PostMapping("/login")
- public AjaxResult login(String username, String password, String code, String uuid)
- {
- AjaxResult ajax = AjaxResult.success();
- // 鐢熸垚浠ょ墝
- String token = loginService.login(username, password, code, uuid);
- ajax.put(Constants.TOKEN, token);
- return ajax;
- }
-
- /**
- * 鑾峰彇鐢ㄦ埛淇℃伅
- *
- * @return 鐢ㄦ埛淇℃伅
- */
- @GetMapping("getInfo")
- public AjaxResult getInfo()
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- SysUser user = loginUser.getUser();
- // 瑙掕壊闆嗗悎
- Set<String> roles = permissionService.getRolePermission(user);
- // 鏉冮檺闆嗗悎
- Set<String> permissions = permissionService.getMenuPermission(user);
- AjaxResult ajax = AjaxResult.success();
- ajax.put("user", user);
- ajax.put("roles", roles);
- ajax.put("permissions", permissions);
- return ajax;
- }
-
- /**
- * 鑾峰彇璺敱淇℃伅
- *
- * @return 璺敱淇℃伅
- */
- @GetMapping("getRouters")
- public AjaxResult getRouters()
- {
- LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
- // 鐢ㄦ埛淇℃伅
- SysUser user = loginUser.getUser();
- List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
- return AjaxResult.success(menuService.buildMenus(menus));
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.List;
+import java.util.Set;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.constant.Constants;
+import com.ruoyi.common.utils.ServletUtils;
+import com.ruoyi.framework.security.LoginUser;
+import com.ruoyi.framework.security.service.SysLoginService;
+import com.ruoyi.framework.security.service.SysPermissionService;
+import com.ruoyi.framework.security.service.TokenService;
+import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.domain.SysMenu;
+import com.ruoyi.project.system.domain.SysUser;
+import com.ruoyi.project.system.service.ISysMenuService;
+
+/**
+ * 鐧诲綍楠岃瘉
+ *
+ * @author ruoyi
+ */
+@RestController
+public class SysLoginController
+{
+ @Autowired
+ private SysLoginService loginService;
+
+ @Autowired
+ private ISysMenuService menuService;
+
+ @Autowired
+ private SysPermissionService permissionService;
+
+ @Autowired
+ private TokenService tokenService;
+
+ /**
+ * 鐧诲綍鏂规硶
+ *
+ * @param username 鐢ㄦ埛鍚�
+ * @param password 瀵嗙爜
+ * @param captcha 楠岃瘉鐮�
+ * @param uuid 鍞竴鏍囪瘑
+ * @return 缁撴灉
+ */
+ @PostMapping("/login")
+ public AjaxResult login(String username, String password, String code, String uuid)
+ {
+ AjaxResult ajax = AjaxResult.success();
+ // 鐢熸垚浠ょ墝
+ String token = loginService.login(username, password, code, uuid);
+ ajax.put(Constants.TOKEN, token);
+ return ajax;
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛淇℃伅
+ *
+ * @return 鐢ㄦ埛淇℃伅
+ */
+ @GetMapping("getInfo")
+ public AjaxResult getInfo()
+ {
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ SysUser user = loginUser.getUser();
+ // 瑙掕壊闆嗗悎
+ Set<String> roles = permissionService.getRolePermission(user);
+ // 鏉冮檺闆嗗悎
+ Set<String> permissions = permissionService.getMenuPermission(user);
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("user", user);
+ ajax.put("roles", roles);
+ ajax.put("permissions", permissions);
+ return ajax;
+ }
+
+ /**
+ * 鑾峰彇璺敱淇℃伅
+ *
+ * @return 璺敱淇℃伅
+ */
+ @GetMapping("getRouters")
+ public AjaxResult getRouters()
+ {
+ LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+ // 鐢ㄦ埛淇℃伅
+ SysUser user = loginUser.getUser();
+ List<SysMenu> menus = menuService.selectMenuTreeByUserId(user.getUserId());
+ return AjaxResult.success(menuService.buildMenus(menus));
+ }
+}
--
Gitblit v1.9.3