Commit 479a17e0 by fengshuonan

权限设置和修改菜单刷新用户的菜单信息

parent 89a7efa7
...@@ -27,6 +27,7 @@ import cn.stylefeng.guns.core.log.LogObjectHolder; ...@@ -27,6 +27,7 @@ import cn.stylefeng.guns.core.log.LogObjectHolder;
import cn.stylefeng.guns.modular.system.entity.Menu; import cn.stylefeng.guns.modular.system.entity.Menu;
import cn.stylefeng.guns.modular.system.model.MenuDto; import cn.stylefeng.guns.modular.system.model.MenuDto;
import cn.stylefeng.guns.modular.system.service.MenuService; import cn.stylefeng.guns.modular.system.service.MenuService;
import cn.stylefeng.guns.modular.system.service.UserService;
import cn.stylefeng.guns.modular.system.warpper.MenuWarpper; import cn.stylefeng.guns.modular.system.warpper.MenuWarpper;
import cn.stylefeng.roses.core.base.controller.BaseController; import cn.stylefeng.roses.core.base.controller.BaseController;
import cn.stylefeng.roses.core.reqres.response.ResponseData; import cn.stylefeng.roses.core.reqres.response.ResponseData;
...@@ -57,6 +58,9 @@ public class MenuController extends BaseController { ...@@ -57,6 +58,9 @@ public class MenuController extends BaseController {
@Autowired @Autowired
private MenuService menuService; private MenuService menuService;
@Autowired
private UserService userService;
/** /**
* 跳转到菜单列表列表页面 * 跳转到菜单列表列表页面
* *
...@@ -116,6 +120,9 @@ public class MenuController extends BaseController { ...@@ -116,6 +120,9 @@ public class MenuController extends BaseController {
this.menuService.updateById(resultMenu); this.menuService.updateById(resultMenu);
//刷新当前用户菜单
this.userService.refreshCurrentUser();
return SUCCESS_TIP; return SUCCESS_TIP;
} }
......
...@@ -42,6 +42,9 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> { ...@@ -42,6 +42,9 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
@Resource @Resource
private RelationMapper relationMapper; private RelationMapper relationMapper;
@Resource
private UserService userService;
/** /**
* 添加角色 * 添加角色
* *
...@@ -101,6 +104,9 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> { ...@@ -101,6 +104,9 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> {
relation.setMenuId(id); relation.setMenuId(id);
this.relationMapper.insert(relation); this.relationMapper.insert(relation);
} }
// 刷新当前用户的权限
userService.refreshCurrentUser();
} }
/** /**
......
package cn.stylefeng.guns.modular.system.service; package cn.stylefeng.guns.modular.system.service;
import cn.hutool.core.bean.BeanUtil;
import cn.stylefeng.guns.core.common.constant.Const; import cn.stylefeng.guns.core.common.constant.Const;
import cn.stylefeng.guns.core.common.constant.state.ManagerStatus; import cn.stylefeng.guns.core.common.constant.state.ManagerStatus;
import cn.stylefeng.guns.core.common.exception.BizExceptionEnum; import cn.stylefeng.guns.core.common.exception.BizExceptionEnum;
import cn.stylefeng.guns.core.common.node.MenuNode; import cn.stylefeng.guns.core.common.node.MenuNode;
import cn.stylefeng.guns.core.shiro.ShiroKit; import cn.stylefeng.guns.core.shiro.ShiroKit;
import cn.stylefeng.guns.core.shiro.ShiroUser; import cn.stylefeng.guns.core.shiro.ShiroUser;
import cn.stylefeng.guns.core.shiro.service.UserAuthService;
import cn.stylefeng.guns.core.util.ApiMenuFilter; import cn.stylefeng.guns.core.util.ApiMenuFilter;
import cn.stylefeng.guns.modular.system.entity.User; import cn.stylefeng.guns.modular.system.entity.User;
import cn.stylefeng.guns.modular.system.factory.UserFactory; import cn.stylefeng.guns.modular.system.factory.UserFactory;
...@@ -35,13 +37,16 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -35,13 +37,16 @@ public class UserService extends ServiceImpl<UserMapper, User> {
@Autowired @Autowired
private MenuService menuService; private MenuService menuService;
@Autowired
private UserAuthService userAuthService;
/** /**
* 添加用戶 * 添加用戶
* *
* @author fengshuonan * @author fengshuonan
* @Date 2018/12/24 22:51 * @Date 2018/12/24 22:51
*/ */
public void addUser(UserDto user){ public void addUser(UserDto user) {
// 判断账号是否重复 // 判断账号是否重复
User theUser = this.getByAccount(user.getAccount()); User theUser = this.getByAccount(user.getAccount());
...@@ -62,7 +67,7 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -62,7 +67,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
* @author fengshuonan * @author fengshuonan
* @Date 2018/12/24 22:53 * @Date 2018/12/24 22:53
*/ */
public void editUser(UserDto user){ public void editUser(UserDto user) {
User oldUser = this.getById(user.getUserId()); User oldUser = this.getById(user.getUserId());
if (ShiroKit.hasRole(Const.ADMIN_NAME)) { if (ShiroKit.hasRole(Const.ADMIN_NAME)) {
...@@ -84,7 +89,7 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -84,7 +89,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
* @author fengshuonan * @author fengshuonan
* @Date 2018/12/24 22:54 * @Date 2018/12/24 22:54
*/ */
public void deleteUser(Long userId){ public void deleteUser(Long userId) {
//不能删除超级管理员 //不能删除超级管理员
if (userId.equals(Const.ADMIN_ID)) { if (userId.equals(Const.ADMIN_ID)) {
...@@ -110,7 +115,7 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -110,7 +115,7 @@ public class UserService extends ServiceImpl<UserMapper, User> {
* @author fengshuonan * @author fengshuonan
* @Date 2018/12/24 22:45 * @Date 2018/12/24 22:45
*/ */
public void changePwd(String oldPassword,String newPassword) { public void changePwd(String oldPassword, String newPassword) {
Long userId = ShiroKit.getUserNotNull().getId(); Long userId = ShiroKit.getUserNotNull().getId();
User user = this.getById(userId); User user = this.getById(userId);
...@@ -193,4 +198,19 @@ public class UserService extends ServiceImpl<UserMapper, User> { ...@@ -193,4 +198,19 @@ public class UserService extends ServiceImpl<UserMapper, User> {
} }
/**
* 刷新当前登录用户的信息
*
* @author fengshuonan
* @Date 2019/1/19 5:59 PM
*/
public void refreshCurrentUser() {
ShiroUser user = ShiroKit.getUserNotNull();
Long id = user.getId();
User currentUser = this.getById(id);
ShiroUser shiroUser = userAuthService.shiroUser(currentUser);
ShiroUser lastUser = ShiroKit.getUser();
BeanUtil.copyProperties(shiroUser, lastUser);
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment