WFC/be.wfc
2
0
Fork 0
Code Activity

feat: 登录认证的类型分为sys/u，对应系统和用户平台

Browse Source
This commit is contained in:
TsMask
2024-11-27 15:23:49 +08:00
parent b7e8da2091
commit 5b8c1b1e94
25 changed files with 262 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysProfileController.java
View File

@@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.multipart.MultipartFile;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.common.core.domain.R;
import org.wfc.common.core.utils.StringUtils;
import org.wfc.common.core.utils.file.FileTypeUtils;
@@ -23,7 +24,6 @@ import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.system.api.RemoteFileService;
import org.wfc.system.api.domain.SysFile;
import org.wfc.system.api.domain.SysUser;
import org.wfc.system.api.model.LoginUser;
import org.wfc.system.service.ISysUserService;
/**
@@ -65,8 +65,8 @@ public class SysProfileController extends BaseController
@PutMapping
public AjaxResult updateProfile(@RequestBody SysUser user)
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser currentUser = loginUser.getSysUser();
LoginUser<SysUser> loginUser = SecurityUtils.getLoginUser();
SysUser currentUser = loginUser.getUser();
currentUser.setNickName(user.getNickName());
currentUser.setEmail(user.getEmail());
currentUser.setPhonenumber(user.getPhonenumber());
@@ -110,8 +110,10 @@ public class SysProfileController extends BaseController
if (userService.resetUserPwd(username, newPassword) > 0)
{
// 更新缓存用户密码
LoginUser loginUser = SecurityUtils.getLoginUser();
loginUser.getSysUser().setPassword(newPassword);
LoginUser<SysUser> loginUser = SecurityUtils.getLoginUser();
SysUser sysUser = loginUser.getUser();
sysUser.setPassword(newPassword);
loginUser.setUser(sysUser);
tokenService.setLoginUser(loginUser);
return success();
}
@@ -127,7 +129,7 @@ public class SysProfileController extends BaseController
{
if (!file.isEmpty())
{
LoginUser loginUser = SecurityUtils.getLoginUser();
LoginUser<SysUser> loginUser = SecurityUtils.getLoginUser();
String extension = FileTypeUtils.getExtension(file);
if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION))
{
@@ -144,7 +146,9 @@ public class SysProfileController extends BaseController
AjaxResult ajax = AjaxResult.success();
ajax.put("imgUrl", url);
// 更新缓存用户头像
loginUser.getSysUser().setAvatar(url);
SysUser sysUser = loginUser.getUser();
sysUser.setAvatar(url);
loginUser.setUser(sysUser);
tokenService.setLoginUser(loginUser);
return ajax;
}

12
wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserController.java
View File

@@ -29,7 +29,7 @@ import org.wfc.common.security.utils.SecurityUtils;
import org.wfc.system.api.domain.SysDept;
import org.wfc.system.api.domain.SysRole;
import org.wfc.system.api.domain.SysUser;
import org.wfc.system.api.model.LoginUser;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.system.service.ISysConfigService;
import org.wfc.system.service.ISysDeptService;
import org.wfc.system.service.ISysPermissionService;
@@ -133,7 +133,7 @@ public class SysUserController extends BaseController
*/
@InnerAuth
@GetMapping("/info/{username}")
public R<LoginUser> info(@PathVariable("username") String username)
public R<LoginUser<SysUser>> info(@PathVariable("username") String username)
{
SysUser sysUser = userService.selectUserByUserName(username);
if (StringUtils.isNull(sysUser))
@@ -144,8 +144,8 @@ public class SysUserController extends BaseController
Set<String> roles = permissionService.getRolePermission(sysUser);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser);
LoginUser<SysUser> sysUserVo = new LoginUser<SysUser>();
sysUserVo.setUser(sysUser);
sysUserVo.setRoles(roles);
sysUserVo.setPermissions(permissions);
return R.ok(sysUserVo);
@@ -188,8 +188,8 @@ public class SysUserController extends BaseController
@GetMapping("getInfo")
public AjaxResult getInfo()
{
LoginUser loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getSysUser();
LoginUser<SysUser> loginUser = SecurityUtils.getLoginUser();
SysUser user = loginUser.getUser();
// 角色集合
Set<String> roles = permissionService.getRolePermission(user);
// 权限集合

2
wfc-modules/wfc-system/src/main/java/org/wfc/system/controller/SysUserOnlineController.java
View File

@@ -19,7 +19,7 @@ import org.wfc.common.log.annotation.Log;
import org.wfc.common.log.enums.BusinessType;
import org.wfc.common.redis.service.RedisService;
import org.wfc.common.security.annotation.RequiresPermissions;
import org.wfc.system.api.model.LoginUser;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.system.domain.SysUserOnline;
import org.wfc.system.service.ISysUserOnlineService;

2
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/ISysUserOnlineService.java
View File

@@ -1,6 +1,6 @@
package org.wfc.system.service;
import org.wfc.system.api.model.LoginUser;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.system.domain.SysUserOnline;
/**

2
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysDictTypeServiceImpl.java
View File

@@ -73,7 +73,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
@Override
public List<SysDictData> selectDictDataByType(String dictType)
{
List<SysDictData> dictDatas = DictUtils.getDictCache(dictType);
List<SysDictData> dictDatas = DictUtils.getDictCache(dictType, SysDictData.class);
if (StringUtils.isNotEmpty(dictDatas))
{
return dictDatas;

2
wfc-modules/wfc-system/src/main/java/org/wfc/system/service/impl/SysUserOnlineServiceImpl.java
View File

@@ -2,7 +2,7 @@ package org.wfc.system.service.impl;
import org.springframework.stereotype.Service;
import org.wfc.common.core.utils.StringUtils;
import org.wfc.system.api.model.LoginUser;
import org.wfc.common.core.domain.LoginUser;
import org.wfc.system.domain.SysUserOnline;
import org.wfc.system.service.ISysUserOnlineService;