Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
前端资源
RuoYi-Vue
提交
7736097f
R
RuoYi-Vue
项目概览
前端资源
/
RuoYi-Vue
11 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Vue
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
7736097f
编写于
8月 08, 2021
作者:
R
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
提取通用方法到基类控制器
上级
fc60c003
变更
15
显示空白变更内容
内联
并排
Showing
15 changed file
with
147 addition
and
66 deletion
+147
-66
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
.../com/ruoyi/web/controller/system/SysConfigController.java
+2
-3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
...va/com/ruoyi/web/controller/system/SysDeptController.java
+2
-3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
...om/ruoyi/web/controller/system/SysDictDataController.java
+2
-3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
...om/ruoyi/web/controller/system/SysDictTypeController.java
+2
-3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
...a/com/ruoyi/web/controller/system/SysLoginController.java
+3
-4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
...va/com/ruoyi/web/controller/system/SysMenuController.java
+5
-17
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
.../com/ruoyi/web/controller/system/SysNoticeController.java
+2
-3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
...va/com/ruoyi/web/controller/system/SysPostController.java
+2
-3
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
...va/com/ruoyi/web/controller/system/SysRoleController.java
+3
-4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
...va/com/ruoyi/web/controller/system/SysUserController.java
+4
-4
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
...java/com/ruoyi/common/core/controller/BaseController.java
+49
-15
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
...in/java/com/ruoyi/common/core/domain/model/LoginUser.java
+38
-0
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
...n/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
+30
-0
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
...m/ruoyi/framework/web/service/UserDetailsServiceImpl.java
+1
-1
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
...in/java/com/ruoyi/quartz/controller/SysJobController.java
+2
-3
未找到文件。
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
浏览文件 @
7736097f
...
...
@@ -19,7 +19,6 @@ import com.ruoyi.common.core.controller.BaseController;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.system.domain.SysConfig
;
import
com.ruoyi.system.service.ISysConfigService
;
...
...
@@ -90,7 +89,7 @@ public class SysConfigController extends BaseController
{
return
AjaxResult
.
error
(
"新增参数'"
+
config
.
getConfigName
()
+
"'失败,参数键名已存在"
);
}
config
.
setCreateBy
(
SecurityUtils
.
getUsername
());
config
.
setCreateBy
(
getUsername
());
return
toAjax
(
configService
.
insertConfig
(
config
));
}
...
...
@@ -106,7 +105,7 @@ public class SysConfigController extends BaseController
{
return
AjaxResult
.
error
(
"修改参数'"
+
config
.
getConfigName
()
+
"'失败,参数键名已存在"
);
}
config
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
config
.
setUpdateBy
(
getUsername
());
return
toAjax
(
configService
.
updateConfig
(
config
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDeptController.java
浏览文件 @
7736097f
...
...
@@ -20,7 +20,6 @@ import com.ruoyi.common.core.controller.BaseController;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.entity.SysDept
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.system.service.ISysDeptService
;
...
...
@@ -113,7 +112,7 @@ public class SysDeptController extends BaseController
{
return
AjaxResult
.
error
(
"新增部门'"
+
dept
.
getDeptName
()
+
"'失败,部门名称已存在"
);
}
dept
.
setCreateBy
(
SecurityUtils
.
getUsername
());
dept
.
setCreateBy
(
getUsername
());
return
toAjax
(
deptService
.
insertDept
(
dept
));
}
...
...
@@ -138,7 +137,7 @@ public class SysDeptController extends BaseController
{
return
AjaxResult
.
error
(
"该部门包含未停用的子部门!"
);
}
dept
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
dept
.
setUpdateBy
(
getUsername
());
return
toAjax
(
deptService
.
updateDept
(
dept
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
浏览文件 @
7736097f
...
...
@@ -19,7 +19,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import
com.ruoyi.common.core.domain.entity.SysDictData
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.system.service.ISysDictDataService
;
...
...
@@ -91,7 +90,7 @@ public class SysDictDataController extends BaseController
@PostMapping
public
AjaxResult
add
(
@Validated
@RequestBody
SysDictData
dict
)
{
dict
.
setCreateBy
(
SecurityUtils
.
getUsername
());
dict
.
setCreateBy
(
getUsername
());
return
toAjax
(
dictDataService
.
insertDictData
(
dict
));
}
...
...
@@ -103,7 +102,7 @@ public class SysDictDataController extends BaseController
@PutMapping
public
AjaxResult
edit
(
@Validated
@RequestBody
SysDictData
dict
)
{
dict
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
dict
.
setUpdateBy
(
getUsername
());
return
toAjax
(
dictDataService
.
updateDictData
(
dict
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java
浏览文件 @
7736097f
...
...
@@ -19,7 +19,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import
com.ruoyi.common.core.domain.entity.SysDictType
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.system.service.ISysDictTypeService
;
...
...
@@ -76,7 +75,7 @@ public class SysDictTypeController extends BaseController
{
return
AjaxResult
.
error
(
"新增字典'"
+
dict
.
getDictName
()
+
"'失败,字典类型已存在"
);
}
dict
.
setCreateBy
(
SecurityUtils
.
getUsername
());
dict
.
setCreateBy
(
getUsername
());
return
toAjax
(
dictTypeService
.
insertDictType
(
dict
));
}
...
...
@@ -92,7 +91,7 @@ public class SysDictTypeController extends BaseController
{
return
AjaxResult
.
error
(
"修改字典'"
+
dict
.
getDictName
()
+
"'失败,字典类型已存在"
);
}
dict
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
dict
.
setUpdateBy
(
getUsername
());
return
toAjax
(
dictTypeService
.
updateDictType
(
dict
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysLoginController.java
浏览文件 @
7736097f
...
...
@@ -13,6 +13,7 @@ import com.ruoyi.common.core.domain.entity.SysMenu;
import
com.ruoyi.common.core.domain.entity.SysUser
;
import
com.ruoyi.common.core.domain.model.LoginBody
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.framework.web.service.SysLoginService
;
import
com.ruoyi.framework.web.service.SysPermissionService
;
...
...
@@ -85,10 +86,8 @@ public class SysLoginController
@GetMapping
(
"getRouters"
)
public
AjaxResult
getRouters
()
{
LoginUser
loginUser
=
tokenService
.
getLoginUser
(
ServletUtils
.
getRequest
());
// 用户信息
SysUser
user
=
loginUser
.
getUser
();
List
<
SysMenu
>
menus
=
menuService
.
selectMenuTreeByUserId
(
user
.
getUserId
());
Long
userId
=
SecurityUtils
.
getUserId
();
List
<
SysMenu
>
menus
=
menuService
.
selectMenuTreeByUserId
(
userId
);
return
AjaxResult
.
success
(
menuService
.
buildMenus
(
menus
));
}
}
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysMenuController.java
浏览文件 @
7736097f
...
...
@@ -17,12 +17,8 @@ import com.ruoyi.common.constant.UserConstants;
import
com.ruoyi.common.core.controller.BaseController
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.entity.SysMenu
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.framework.web.service.TokenService
;
import
com.ruoyi.system.service.ISysMenuService
;
/**
...
...
@@ -37,9 +33,6 @@ public class SysMenuController extends BaseController
@Autowired
private
ISysMenuService
menuService
;
@Autowired
private
TokenService
tokenService
;
/**
* 获取菜单列表
*/
...
...
@@ -47,9 +40,7 @@ public class SysMenuController extends BaseController
@GetMapping
(
"/list"
)
public
AjaxResult
list
(
SysMenu
menu
)
{
LoginUser
loginUser
=
tokenService
.
getLoginUser
(
ServletUtils
.
getRequest
());
Long
userId
=
loginUser
.
getUser
().
getUserId
();
List
<
SysMenu
>
menus
=
menuService
.
selectMenuList
(
menu
,
userId
);
List
<
SysMenu
>
menus
=
menuService
.
selectMenuList
(
menu
,
getUserId
());
return
AjaxResult
.
success
(
menus
);
}
...
...
@@ -69,9 +60,7 @@ public class SysMenuController extends BaseController
@GetMapping
(
"/treeselect"
)
public
AjaxResult
treeselect
(
SysMenu
menu
)
{
LoginUser
loginUser
=
tokenService
.
getLoginUser
(
ServletUtils
.
getRequest
());
Long
userId
=
loginUser
.
getUser
().
getUserId
();
List
<
SysMenu
>
menus
=
menuService
.
selectMenuList
(
menu
,
userId
);
List
<
SysMenu
>
menus
=
menuService
.
selectMenuList
(
menu
,
getUserId
());
return
AjaxResult
.
success
(
menuService
.
buildMenuTreeSelect
(
menus
));
}
...
...
@@ -81,8 +70,7 @@ public class SysMenuController extends BaseController
@GetMapping
(
value
=
"/roleMenuTreeselect/{roleId}"
)
public
AjaxResult
roleMenuTreeselect
(
@PathVariable
(
"roleId"
)
Long
roleId
)
{
LoginUser
loginUser
=
tokenService
.
getLoginUser
(
ServletUtils
.
getRequest
());
List
<
SysMenu
>
menus
=
menuService
.
selectMenuList
(
loginUser
.
getUser
().
getUserId
());
List
<
SysMenu
>
menus
=
menuService
.
selectMenuList
(
getUserId
());
AjaxResult
ajax
=
AjaxResult
.
success
();
ajax
.
put
(
"checkedKeys"
,
menuService
.
selectMenuListByRoleId
(
roleId
));
ajax
.
put
(
"menus"
,
menuService
.
buildMenuTreeSelect
(
menus
));
...
...
@@ -105,7 +93,7 @@ public class SysMenuController extends BaseController
{
return
AjaxResult
.
error
(
"新增菜单'"
+
menu
.
getMenuName
()
+
"'失败,地址必须以http(s)://开头"
);
}
menu
.
setCreateBy
(
SecurityUtils
.
getUsername
());
menu
.
setCreateBy
(
getUsername
());
return
toAjax
(
menuService
.
insertMenu
(
menu
));
}
...
...
@@ -129,7 +117,7 @@ public class SysMenuController extends BaseController
{
return
AjaxResult
.
error
(
"修改菜单'"
+
menu
.
getMenuName
()
+
"'失败,上级菜单不能选择自己"
);
}
menu
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
menu
.
setUpdateBy
(
getUsername
());
return
toAjax
(
menuService
.
updateMenu
(
menu
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
浏览文件 @
7736097f
...
...
@@ -17,7 +17,6 @@ import com.ruoyi.common.core.controller.BaseController;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.system.domain.SysNotice
;
import
com.ruoyi.system.service.ISysNoticeService
;
...
...
@@ -63,7 +62,7 @@ public class SysNoticeController extends BaseController
@PostMapping
public
AjaxResult
add
(
@Validated
@RequestBody
SysNotice
notice
)
{
notice
.
setCreateBy
(
SecurityUtils
.
getUsername
());
notice
.
setCreateBy
(
getUsername
());
return
toAjax
(
noticeService
.
insertNotice
(
notice
));
}
...
...
@@ -75,7 +74,7 @@ public class SysNoticeController extends BaseController
@PutMapping
public
AjaxResult
edit
(
@Validated
@RequestBody
SysNotice
notice
)
{
notice
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
notice
.
setUpdateBy
(
getUsername
());
return
toAjax
(
noticeService
.
updateNotice
(
notice
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysPostController.java
浏览文件 @
7736097f
...
...
@@ -18,7 +18,6 @@ import com.ruoyi.common.core.controller.BaseController;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.system.domain.SysPost
;
import
com.ruoyi.system.service.ISysPostService
;
...
...
@@ -83,7 +82,7 @@ public class SysPostController extends BaseController
{
return
AjaxResult
.
error
(
"新增岗位'"
+
post
.
getPostName
()
+
"'失败,岗位编码已存在"
);
}
post
.
setCreateBy
(
SecurityUtils
.
getUsername
());
post
.
setCreateBy
(
getUsername
());
return
toAjax
(
postService
.
insertPost
(
post
));
}
...
...
@@ -103,7 +102,7 @@ public class SysPostController extends BaseController
{
return
AjaxResult
.
error
(
"修改岗位'"
+
post
.
getPostName
()
+
"'失败,岗位编码已存在"
);
}
post
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
post
.
setUpdateBy
(
getUsername
());
return
toAjax
(
postService
.
updatePost
(
post
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java
浏览文件 @
7736097f
...
...
@@ -21,7 +21,6 @@ import com.ruoyi.common.core.domain.entity.SysUser;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.ServletUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
...
...
@@ -97,7 +96,7 @@ public class SysRoleController extends BaseController
{
return
AjaxResult
.
error
(
"新增角色'"
+
role
.
getRoleName
()
+
"'失败,角色权限已存在"
);
}
role
.
setCreateBy
(
SecurityUtils
.
getUsername
());
role
.
setCreateBy
(
getUsername
());
return
toAjax
(
roleService
.
insertRole
(
role
));
}
...
...
@@ -119,7 +118,7 @@ public class SysRoleController extends BaseController
{
return
AjaxResult
.
error
(
"修改角色'"
+
role
.
getRoleName
()
+
"'失败,角色权限已存在"
);
}
role
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
role
.
setUpdateBy
(
getUsername
());
if
(
roleService
.
updateRole
(
role
)
>
0
)
{
...
...
@@ -157,7 +156,7 @@ public class SysRoleController extends BaseController
public
AjaxResult
changeStatus
(
@RequestBody
SysRole
role
)
{
roleService
.
checkRoleAllowed
(
role
);
role
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
role
.
setUpdateBy
(
getUsername
());
return
toAjax
(
roleService
.
updateRoleStatus
(
role
));
}
...
...
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
浏览文件 @
7736097f
...
...
@@ -137,7 +137,7 @@ public class SysUserController extends BaseController
{
return
AjaxResult
.
error
(
"新增用户'"
+
user
.
getUserName
()
+
"'失败,邮箱账号已存在"
);
}
user
.
setCreateBy
(
SecurityUtils
.
getUsername
());
user
.
setCreateBy
(
getUsername
());
user
.
setPassword
(
SecurityUtils
.
encryptPassword
(
user
.
getPassword
()));
return
toAjax
(
userService
.
insertUser
(
user
));
}
...
...
@@ -161,7 +161,7 @@ public class SysUserController extends BaseController
{
return
AjaxResult
.
error
(
"修改用户'"
+
user
.
getUserName
()
+
"'失败,邮箱账号已存在"
);
}
user
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
user
.
setUpdateBy
(
getUsername
());
return
toAjax
(
userService
.
updateUser
(
user
));
}
...
...
@@ -186,7 +186,7 @@ public class SysUserController extends BaseController
{
userService
.
checkUserAllowed
(
user
);
user
.
setPassword
(
SecurityUtils
.
encryptPassword
(
user
.
getPassword
()));
user
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
user
.
setUpdateBy
(
getUsername
());
return
toAjax
(
userService
.
resetPwd
(
user
));
}
...
...
@@ -199,7 +199,7 @@ public class SysUserController extends BaseController
public
AjaxResult
changeStatus
(
@RequestBody
SysUser
user
)
{
userService
.
checkUserAllowed
(
user
);
user
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
user
.
setUpdateBy
(
getUsername
());
return
toAjax
(
userService
.
updateUserStatus
(
user
));
}
...
...
ruoyi-common/src/main/java/com/ruoyi/common/core/controller/BaseController.java
浏览文件 @
7736097f
...
...
@@ -11,10 +11,12 @@ import com.github.pagehelper.PageHelper;
import
com.github.pagehelper.PageInfo
;
import
com.ruoyi.common.constant.HttpStatus
;
import
com.ruoyi.common.core.domain.AjaxResult
;
import
com.ruoyi.common.core.domain.model.LoginUser
;
import
com.ruoyi.common.core.page.PageDomain
;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.core.page.TableSupport
;
import
com.ruoyi.common.utils.DateUtils
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.sql.SqlUtil
;
...
...
@@ -86,6 +88,38 @@ public class BaseController
return
rspData
;
}
/**
* 返回成功
*/
public
AjaxResult
success
()
{
return
AjaxResult
.
success
();
}
/**
* 返回失败消息
*/
public
AjaxResult
error
()
{
return
AjaxResult
.
error
();
}
/**
* 返回成功消息
*/
public
AjaxResult
success
(
String
message
)
{
return
AjaxResult
.
success
(
message
);
}
/**
* 返回失败消息
*/
public
AjaxResult
error
(
String
message
)
{
return
AjaxResult
.
error
(
message
);
}
/**
* 响应返回结果
*
...
...
@@ -109,42 +143,42 @@ public class BaseController
}
/**
*
返回成功
*
页面跳转
*/
public
AjaxResult
success
(
)
public
String
redirect
(
String
url
)
{
return
AjaxResult
.
success
(
);
return
StringUtils
.
format
(
"redirect:{}"
,
url
);
}
/**
*
返回失败消
息
*
获取用户缓存信
息
*/
public
AjaxResult
erro
r
()
public
LoginUser
getLoginUse
r
()
{
return
AjaxResult
.
erro
r
();
return
SecurityUtils
.
getLoginUse
r
();
}
/**
*
返回成功消息
*
获取登录用户id
*/
public
AjaxResult
success
(
String
message
)
public
Long
getUserId
(
)
{
return
AjaxResult
.
success
(
message
);
return
getLoginUser
().
getUserId
(
);
}
/**
*
返回失败消息
*
获取登录部门id
*/
public
AjaxResult
error
(
String
message
)
public
Long
getDeptId
(
)
{
return
AjaxResult
.
error
(
message
);
return
getLoginUser
().
getDeptId
(
);
}
/**
*
页面跳转
*
获取登录用户名
*/
public
String
redirect
(
String
url
)
public
String
getUsername
(
)
{
return
StringUtils
.
format
(
"redirect:{}"
,
url
);
return
getLoginUser
().
getUsername
(
);
}
}
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/model/LoginUser.java
浏览文件 @
7736097f
...
...
@@ -16,6 +16,16 @@ public class LoginUser implements UserDetails
{
private
static
final
long
serialVersionUID
=
1L
;
/**
* 用户ID
*/
private
Long
userId
;
/**
* 部门ID
*/
private
Long
deptId
;
/**
* 用户唯一标识
*/
...
...
@@ -61,6 +71,26 @@ public class LoginUser implements UserDetails
*/
private
SysUser
user
;
public
Long
getUserId
()
{
return
userId
;
}
public
void
setUserId
(
Long
userId
)
{
this
.
userId
=
userId
;
}
public
Long
getDeptId
()
{
return
deptId
;
}
public
void
setDeptId
(
Long
deptId
)
{
this
.
deptId
=
deptId
;
}
public
String
getToken
()
{
return
token
;
...
...
@@ -81,6 +111,14 @@ public class LoginUser implements UserDetails
this
.
permissions
=
permissions
;
}
public
LoginUser
(
Long
userId
,
Long
deptId
,
SysUser
user
,
Set
<
String
>
permissions
)
{
this
.
userId
=
userId
;
this
.
deptId
=
deptId
;
this
.
user
=
user
;
this
.
permissions
=
permissions
;
}
@JsonIgnore
@Override
public
String
getPassword
()
...
...
ruoyi-common/src/main/java/com/ruoyi/common/utils/SecurityUtils.java
浏览文件 @
7736097f
...
...
@@ -14,6 +14,36 @@ import com.ruoyi.common.exception.CustomException;
*/
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
);
}
}
/**
* 获取用户账户
**/
...
...
ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/UserDetailsServiceImpl.java
浏览文件 @
7736097f
...
...
@@ -55,6 +55,6 @@ public class UserDetailsServiceImpl implements UserDetailsService
public
UserDetails
createLoginUser
(
SysUser
user
)
{
return
new
LoginUser
(
user
,
permissionService
.
getMenuPermission
(
user
));
return
new
LoginUser
(
user
.
getUserId
(),
user
.
getDeptId
(),
user
,
permissionService
.
getMenuPermission
(
user
));
}
}
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
浏览文件 @
7736097f
...
...
@@ -19,7 +19,6 @@ import com.ruoyi.common.core.domain.AjaxResult;
import
com.ruoyi.common.core.page.TableDataInfo
;
import
com.ruoyi.common.enums.BusinessType
;
import
com.ruoyi.common.exception.job.TaskException
;
import
com.ruoyi.common.utils.SecurityUtils
;
import
com.ruoyi.common.utils.StringUtils
;
import
com.ruoyi.common.utils.poi.ExcelUtil
;
import
com.ruoyi.quartz.domain.SysJob
;
...
...
@@ -93,7 +92,7 @@ public class SysJobController extends BaseController
{
return
error
(
"新增任务'"
+
job
.
getJobName
()
+
"'失败,目标字符串不允许'http(s)//'调用"
);
}
job
.
setCreateBy
(
SecurityUtils
.
getUsername
());
job
.
setCreateBy
(
getUsername
());
return
toAjax
(
jobService
.
insertJob
(
job
));
}
...
...
@@ -117,7 +116,7 @@ public class SysJobController extends BaseController
{
return
error
(
"修改任务'"
+
job
.
getJobName
()
+
"'失败,目标字符串不允许'http(s)//'调用"
);
}
job
.
setUpdateBy
(
SecurityUtils
.
getUsername
());
job
.
setUpdateBy
(
getUsername
());
return
toAjax
(
jobService
.
updateJob
(
job
));
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录