|
@@ -1,12 +1,22 @@
|
|
|
package com.ruoyi.web.controller.system;
|
|
|
|
|
|
+import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.Set;
|
|
|
+
|
|
|
+import com.ruoyi.common.core.domain.entity.SysUserVo;
|
|
|
+import com.ruoyi.common.core.domain.model.LoginUser;
|
|
|
+import com.ruoyi.common.utils.StringUtils;
|
|
|
+import com.ruoyi.framework.web.service.TokenService;
|
|
|
+import com.ruoyi.system.service.ISysUserService;
|
|
|
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.RequestBody;
|
|
|
-import org.springframework.web.bind.annotation.RestController;
|
|
|
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
|
|
|
+import org.springframework.security.core.Authentication;
|
|
|
+import org.springframework.security.core.context.SecurityContextHolder;
|
|
|
+import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
|
|
|
+import org.springframework.validation.annotation.Validated;
|
|
|
+import org.springframework.web.bind.annotation.*;
|
|
|
import com.ruoyi.common.constant.Constants;
|
|
|
import com.ruoyi.common.core.domain.AjaxResult;
|
|
|
import com.ruoyi.common.core.domain.entity.SysMenu;
|
|
@@ -17,6 +27,8 @@ import com.ruoyi.framework.web.service.SysLoginService;
|
|
|
import com.ruoyi.framework.web.service.SysPermissionService;
|
|
|
import com.ruoyi.system.service.ISysMenuService;
|
|
|
|
|
|
+import javax.servlet.http.HttpServletRequest;
|
|
|
+
|
|
|
/**
|
|
|
* 登录验证
|
|
|
*
|
|
@@ -34,6 +46,12 @@ public class SysLoginController
|
|
|
@Autowired
|
|
|
private SysPermissionService permissionService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private TokenService tokenService;
|
|
|
+
|
|
|
+ @Autowired
|
|
|
+ private ISysUserService userService;
|
|
|
+
|
|
|
/**
|
|
|
* 登录方法
|
|
|
*
|
|
@@ -83,4 +101,43 @@ public class SysLoginController
|
|
|
List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
|
|
|
return AjaxResult.success(menuService.buildMenus(menus));
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 校验token 会议使用
|
|
|
+ * @return 结果
|
|
|
+ */
|
|
|
+ @PostMapping("/checkToken")
|
|
|
+ public AjaxResult checkToken(HttpServletRequest request)
|
|
|
+ {
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser(request);
|
|
|
+ if (StringUtils.isNotNull(loginUser))
|
|
|
+ {
|
|
|
+ SysUser user = loginUser.getUser();
|
|
|
+ String userName = user.getUserName();
|
|
|
+ Long userId = user.getUserId();
|
|
|
+ Map<String,Object> map = new HashMap<>(2);
|
|
|
+ map.put("userName",userName);
|
|
|
+ map.put("userId",userId);
|
|
|
+ return AjaxResult.success(map);
|
|
|
+ }
|
|
|
+ return AjaxResult.error("获取用户信息异常");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 校验token 根据用户ids查询用户信息 会议使用
|
|
|
+ * @return 结果
|
|
|
+ */
|
|
|
+ @PostMapping("/getUserInfoList")
|
|
|
+ public AjaxResult getUserInfoList(HttpServletRequest request, @RequestBody SysUserVo sysUserVo)
|
|
|
+ {
|
|
|
+ LoginUser loginUser = tokenService.getLoginUser(request);
|
|
|
+ if (StringUtils.isNotNull(loginUser))
|
|
|
+ {
|
|
|
+ SysUser sysUser = new SysUser();
|
|
|
+ sysUser.setUserIds(sysUserVo.getUserIds());
|
|
|
+ List<SysUser> userInfoList = userService.getUserInfoList(sysUser);
|
|
|
+ return AjaxResult.success(userInfoList);
|
|
|
+ }
|
|
|
+ return AjaxResult.error("获取用户信息异常");
|
|
|
+ }
|
|
|
}
|