|
@@ -7,12 +7,14 @@ import com.usky.common.core.util.StringUtils;
|
|
|
import com.usky.common.security.auth.AuthUtil;
|
|
|
import com.usky.common.security.service.TokenService;
|
|
|
import com.usky.common.security.utils.SecurityUtils;
|
|
|
+import com.usky.system.domain.SysPerson;
|
|
|
import com.usky.system.domain.SysUser;
|
|
|
import com.usky.system.domain.SysUserVO;
|
|
|
import com.usky.system.model.LoginUser;
|
|
|
import com.usky.system.service.ISysPermissionService;
|
|
|
import com.usky.system.service.ISysUserService;
|
|
|
import com.usky.system.service.SysLoginService;
|
|
|
+import com.usky.system.service.SysPersonService;
|
|
|
import com.usky.system.service.vo.LoginBody;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -29,8 +31,7 @@ import java.util.Set;
|
|
|
* @author ruoyi
|
|
|
*/
|
|
|
@RestController
|
|
|
-public class TokenController
|
|
|
-{
|
|
|
+public class TokenController {
|
|
|
@Autowired
|
|
|
private TokenService tokenService;
|
|
|
|
|
@@ -43,9 +44,11 @@ public class TokenController
|
|
|
@Autowired
|
|
|
private ISysPermissionService permissionService;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private SysPersonService sysPersonService;
|
|
|
+
|
|
|
@PostMapping("login")
|
|
|
- public ApiResult<?> login(@RequestBody LoginBody form)
|
|
|
- {
|
|
|
+ public ApiResult<?> login(@RequestBody LoginBody form) {
|
|
|
// 用户登录
|
|
|
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getTenantId());
|
|
|
// 获取登录token
|
|
@@ -54,23 +57,22 @@ public class TokenController
|
|
|
|
|
|
|
|
|
@PostMapping("appLogin")
|
|
|
- public ApiResult<?> appLogin(@RequestBody LoginBody form)
|
|
|
- {
|
|
|
+ public ApiResult<?> appLogin(@RequestBody LoginBody form) {
|
|
|
// String phone = null;
|
|
|
// 用户登录
|
|
|
- SysUser userInfo = sysLoginService.appLogin(form.getUsername(), form.getPassword(), form.getTenantId(),form.getPhone(),form.getVerify());
|
|
|
+ SysUser userInfo = sysLoginService.appLogin(form.getUsername(), form.getPassword(), form.getTenantId(), form.getPhone(), form.getVerify());
|
|
|
LoginUser SysUser = new LoginUser();
|
|
|
SysUserVO sysUserVO = BeanMapperUtils.map(userInfo, SysUserVO.class);
|
|
|
SysUser.setSysUser(sysUserVO);
|
|
|
+ SysPerson sysPerson = sysPersonService.getsysPerson(userInfo.getUserId());
|
|
|
+ SysUser.setSysPerson(sysPerson);
|
|
|
// 获取登录token
|
|
|
return ApiResult.success(tokenService.createToken(SysUser));
|
|
|
}
|
|
|
|
|
|
|
|
|
-
|
|
|
@PostMapping("login1")
|
|
|
- public ApiResult<?> login1(@RequestBody LoginBody form)
|
|
|
- {
|
|
|
+ public ApiResult<?> login1(@RequestBody LoginBody form) {
|
|
|
// 用户登录
|
|
|
LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getTenantId());
|
|
|
// 获取登录token
|
|
@@ -78,11 +80,9 @@ public class TokenController
|
|
|
}
|
|
|
|
|
|
@DeleteMapping("logout")
|
|
|
- public ApiResult<?> logout(HttpServletRequest request)
|
|
|
- {
|
|
|
+ public ApiResult<?> logout(HttpServletRequest request) {
|
|
|
String token = SecurityUtils.getToken(request);
|
|
|
- if (StringUtils.isNotEmpty(token))
|
|
|
- {
|
|
|
+ if (StringUtils.isNotEmpty(token)) {
|
|
|
String username = JwtUtils.getUserName(token);
|
|
|
// 删除用户缓存记录
|
|
|
AuthUtil.logoutByToken(token);
|
|
@@ -93,11 +93,9 @@ public class TokenController
|
|
|
}
|
|
|
|
|
|
@PostMapping("refresh")
|
|
|
- public ApiResult<?> refresh(HttpServletRequest request)
|
|
|
- {
|
|
|
+ public ApiResult<?> refresh(HttpServletRequest request) {
|
|
|
LoginUser loginUser = tokenService.getLoginUser(request);
|
|
|
- if (Objects.nonNull(loginUser))
|
|
|
- {
|
|
|
+ if (Objects.nonNull(loginUser)) {
|
|
|
// 刷新令牌有效期
|
|
|
tokenService.refreshToken(loginUser);
|
|
|
return ApiResult.success();
|
|
@@ -111,14 +109,13 @@ public class TokenController
|
|
|
* @return 用户信息
|
|
|
*/
|
|
|
@GetMapping("getInfo")
|
|
|
- public ApiResult getInfo()
|
|
|
- {
|
|
|
+ public ApiResult getInfo() {
|
|
|
Long userId = SecurityUtils.getUserId();
|
|
|
// 角色集合
|
|
|
Set<String> roles = permissionService.getRolePermission(userId);
|
|
|
// 权限集合
|
|
|
Set<String> permissions = permissionService.getMenuPermission(userId);
|
|
|
- Map<String,Object> ajax = new HashMap<>();
|
|
|
+ Map<String, Object> ajax = new HashMap<>();
|
|
|
ajax.put("user", sysUserService.selectUserById(userId));
|
|
|
ajax.put("roles", roles);
|
|
|
ajax.put("permissions", permissions);
|