|
@@ -2,9 +2,14 @@ package com.ozs.web.controller.system;
|
|
|
|
|
|
import java.util.List;
|
|
|
import java.util.Set;
|
|
|
+import java.util.prefs.BackingStoreException;
|
|
|
|
|
|
+import com.ozs.common.core.controller.BaseController;
|
|
|
import com.ozs.common.core.domain.model.LoginUser;
|
|
|
+import com.ozs.common.core.redis.RedisCache;
|
|
|
+import com.ozs.common.utils.StringUtils;
|
|
|
import com.ozs.framework.web.service.TokenService;
|
|
|
+import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
import com.ozs.common.constant.Constants;
|
|
@@ -22,10 +27,11 @@ import com.ozs.system.service.ISysMenuService;
|
|
|
*
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
+@Slf4j
|
|
|
@RestController
|
|
|
//@RequestMapping("/app")
|
|
|
@RequestMapping("")
|
|
|
-public class SysLoginController {
|
|
|
+public class SysLoginController extends BaseController {
|
|
|
@Autowired
|
|
|
private SysLoginService loginService;
|
|
|
|
|
@@ -38,6 +44,9 @@ public class SysLoginController {
|
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private RedisCache redisCache;
|
|
|
+
|
|
|
/**
|
|
|
* 登录方法
|
|
|
*
|
|
@@ -46,6 +55,13 @@ public class SysLoginController {
|
|
|
*/
|
|
|
@PostMapping("/login")
|
|
|
public AjaxResult login(@RequestBody LoginBody loginBody) {
|
|
|
+ // 判断账号是否在其他电脑登陆
|
|
|
+ String userId = loginService.getUserIdByUserName(loginBody.getUsername());
|
|
|
+ log.info("111111111-----" + userId);
|
|
|
+ if (!StringUtils.isEmpty(userId)) {
|
|
|
+ log.info("22222222-----" + userId);
|
|
|
+ redisCache.deleteObject(userId);
|
|
|
+ }
|
|
|
AjaxResult ajax = AjaxResult.success();
|
|
|
// 生成令牌
|
|
|
String token = loginService.login(loginBody.getUsername(), loginBody.getPassword(), loginBody.getCode(),
|
|
@@ -88,8 +104,7 @@ public class SysLoginController {
|
|
|
* @return 用户信息
|
|
|
*/
|
|
|
@GetMapping("getInfo")
|
|
|
- public AjaxResult getInfo()
|
|
|
- {
|
|
|
+ public AjaxResult getInfo() {
|
|
|
SysUser user = SecurityUtils.getLoginUser().getUser();
|
|
|
// 角色集合
|
|
|
Set<String> roles = permissionService.getRolePermission(user);
|
|
@@ -108,8 +123,7 @@ public class SysLoginController {
|
|
|
* @return 路由信息
|
|
|
*/
|
|
|
@GetMapping("getRouters")
|
|
|
- public AjaxResult getRouters()
|
|
|
- {
|
|
|
+ public AjaxResult getRouters() {
|
|
|
Long userId = SecurityUtils.getId();
|
|
|
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
|
|
|
return AjaxResult.success(menuService.buildMenus(menus));
|