mirror of
https://github.com/dromara/RuoYi-Vue-Plus.git
synced 2025-09-24 07:19:46 +08:00
Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
Conflicts: README.md ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java ruoyi-ui/package.json ruoyi-ui/src/views/system/menu/index.vue
This commit is contained in:
@ -9,11 +9,41 @@ import com.ruoyi.common.exception.CustomException;
|
||||
|
||||
/**
|
||||
* 安全服务工具类
|
||||
*
|
||||
*
|
||||
* @author ruoyi
|
||||
*/
|
||||
public class SecurityUtils
|
||||
{
|
||||
/**
|
||||
* 用户ID
|
||||
**/
|
||||
public static Long getUserId()
|
||||
{
|
||||
try
|
||||
{
|
||||
return getLoginUser().getUserId();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new CustomException("获取用户ID异常", HttpStatus.UNAUTHORIZED);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取部门ID
|
||||
**/
|
||||
public static Long getDeptId()
|
||||
{
|
||||
try
|
||||
{
|
||||
return getLoginUser().getDeptId();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
throw new CustomException("获取部门ID异常", HttpStatus.UNAUTHORIZED);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取用户账户
|
||||
**/
|
||||
@ -79,7 +109,7 @@ public class SecurityUtils
|
||||
|
||||
/**
|
||||
* 是否为管理员
|
||||
*
|
||||
*
|
||||
* @param userId 用户ID
|
||||
* @return 结果
|
||||
*/
|
||||
|
Reference in New Issue
Block a user