diff --git a/smallboot-api/common/auth/src/main/resources/application-auth.yml b/smallboot-api/common/auth/src/main/resources/application-auth.yml index 201e33a..14dd123 100644 --- a/smallboot-api/common/auth/src/main/resources/application-auth.yml +++ b/smallboot-api/common/auth/src/main/resources/application-auth.yml @@ -13,15 +13,16 @@ sa-token: # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录) is-concurrent: false # 在多人登录同一账号时，是否共用一个token (为true时所有登录共用一个token, 为false时每次登录新建一个token) + # tips: 使用 jwt-simple 模式后，is-share=false 恒等于 false。 is-share: false # token风格 - token-style: random-128 + # token-style: random-128 # 是否从cookie中读取token is-read-cookie: false # 是否从请求体里读取token is-read-body: false # 是否从head中读取token - is-read-head: true + # is-read-head: true # 是否输出操作日志 is-log: true # 是否在初始化配置时打印版本字符画 diff --git a/smallboot-api/common/base/src/main/java/com/zhengqing/common/base/model/bo/JwtUserBO.java b/smallboot-api/common/base/src/main/java/com/zhengqing/common/base/model/bo/JwtUserBO.java index c724954..9caeb46 100644 --- a/smallboot-api/common/base/src/main/java/com/zhengqing/common/base/model/bo/JwtUserBO.java +++ b/smallboot-api/common/base/src/main/java/com/zhengqing/common/base/model/bo/JwtUserBO.java @@ -7,6 +7,8 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import java.util.List; + /** *

* 用户token信息 @@ -22,15 +24,18 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor public class JwtUserBO extends BaseBO { - @ApiModelProperty(value = "认证来源") + @ApiModelProperty("认证来源") private AuthSourceEnum authSourceEnum; - @ApiModelProperty(value = "用户ID") + @ApiModelProperty("用户ID") private String userId; - @ApiModelProperty(value = "用户名") + @ApiModelProperty("用户名") private String userName; + @ApiModelProperty("角色编码") + private List roleCodeList; + /** * 获取B端用户ID */ diff --git a/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/WebAppConfig.java b/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/WebAppConfig.java index 2712996..e7157f3 100644 --- a/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/WebAppConfig.java +++ b/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/WebAppConfig.java @@ -1,6 +1,6 @@ package com.zhengqing.common.core.config; -import com.zhengqing.common.core.config.interceptor.HandlerInterceptorForTokenUser; +import com.zhengqing.common.core.config.interceptor.HandlerInterceptorForToken; import org.springframework.context.annotation.Configuration; import org.springframework.web.servlet.config.annotation.InterceptorRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; @@ -20,7 +20,7 @@ public class WebAppConfig implements WebMvcConfigurer { @Override public void addInterceptors(InterceptorRegistry registry) { // 可添加多个 - registry.addInterceptor(new HandlerInterceptorForTokenUser()).addPathPatterns("/**"); + registry.addInterceptor(new HandlerInterceptorForToken()).addPathPatterns("/**"); } } diff --git a/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/interceptor/HandlerInterceptorForTokenUser.java b/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/interceptor/HandlerInterceptorForToken.java similarity index 54% rename from smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/interceptor/HandlerInterceptorForTokenUser.java rename to smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/interceptor/HandlerInterceptorForToken.java index 2822a52..95237f4 100644 --- a/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/interceptor/HandlerInterceptorForTokenUser.java +++ b/smallboot-api/common/core/src/main/java/com/zhengqing/common/core/config/interceptor/HandlerInterceptorForToken.java @@ -1,19 +1,29 @@ package com.zhengqing.common.core.config.interceptor; import cn.dev33.satoken.stp.StpUtil; +import cn.hutool.core.collection.CollectionUtil; import cn.hutool.json.JSONUtil; +import com.google.common.collect.Lists; import com.zhengqing.common.base.constant.AppConstant; +import com.zhengqing.common.base.constant.SecurityConstant; import com.zhengqing.common.base.context.JwtUserContext; import com.zhengqing.common.base.context.SysUserContext; import com.zhengqing.common.base.context.UmsUserContext; +import com.zhengqing.common.base.enums.ApiResultCodeEnum; +import com.zhengqing.common.base.exception.MyException; import com.zhengqing.common.base.model.bo.JwtUserBO; import com.zhengqing.common.core.config.WebAppConfig; +import com.zhengqing.common.redis.util.RedisUtil; import org.apache.commons.lang3.StringUtils; +import org.springframework.util.AntPathMatcher; +import org.springframework.util.PathMatcher; import org.springframework.web.servlet.HandlerInterceptor; import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; +import java.util.Map; /** *

拦截器 -- token用户信息

@@ -22,7 +32,7 @@ import javax.servlet.http.HttpServletResponse; * @description 注册使用参考 {@link WebAppConfig} * @date 2022/1/10 16:28 */ -public class HandlerInterceptorForTokenUser implements HandlerInterceptor { +public class HandlerInterceptorForToken implements HandlerInterceptor { /** * 在业务处理器处理请求之前被调用。预处理，可以进行编码、安全控制、权限校验等处理 @@ -35,6 +45,10 @@ public class HandlerInterceptorForTokenUser implements HandlerInterceptor { return true; } JwtUserBO jwtUserBO = JSONUtil.toBean(StpUtil.getLoginId().toString(), JwtUserBO.class); + + // 校验权限 + this.checkPermission(request, jwtUserBO); + JwtUserContext.set(jwtUserBO); switch (jwtUserBO.getAuthSourceEnum()) { case B: @@ -51,6 +65,57 @@ public class HandlerInterceptorForTokenUser implements HandlerInterceptor { return true; } + /** + * 校验权限 + * + * @param request 请求 + * @param jwtUserBO 用户信息 + * @return void + * @author zhengqingya + * @date 2023/2/13 15:52 + */ + private void checkPermission(HttpServletRequest request, JwtUserBO jwtUserBO) { + String method = request.getMethod(); + String path = request.getRequestURI(); + // "GET:/web/api/user/*" + String restfulPath = method + ":" + path; + + /** + * URL鉴权 + * [URL-角色集合] + * [{'key':'GET:/web/api/user/*','value':['ADMIN','TEST']},...] + */ + Map urlPermReRoleMap = RedisUtil.hGetAll(SecurityConstant.URL_PERM_RE_ROLES); + + // 根据请求路径获取有访问权限的角色列表 + List authorizedRoleList = Lists.newLinkedList(); + // 是否需要鉴权，默认未设置拦截规则不需鉴权 + boolean isCheck = false; + PathMatcher pathMatcher = new AntPathMatcher(); + for (Map.Entry permRoles : urlPermReRoleMap.entrySet()) { + String perm = (String) permRoles.getKey(); + if (pathMatcher.match(perm, restfulPath)) { + List roleCodeList = JSONUtil.toList((String) permRoles.getValue(), String.class); + authorizedRoleList.addAll(roleCodeList); + isCheck = true; + } + } + + if (!isCheck) { + return; + } + + if (CollectionUtil.isNotEmpty(authorizedRoleList)) { + List roleCodeList = jwtUserBO.getRoleCodeList(); + for (String roleCodeItem : roleCodeList) { + if (authorizedRoleList.contains(roleCodeItem)) { + return; + } + } + } + throw new MyException(ApiResultCodeEnum.UN_LOGIN.getCode(), "无操作权限"); + } + /** * 在业务处理器处理请求执行完成后，生成视图之前执行。 * 后处理（调用了Service并返回ModelAndView，但未进行页面渲染），有机会修改ModelAndView diff --git a/smallboot-api/doc/smallboot.sql b/smallboot-api/doc/smallboot.sql index a80c5a7..fda064d 100644 --- a/smallboot-api/doc/smallboot.sql +++ b/smallboot-api/doc/smallboot.sql @@ -1,17 +1,17 @@ /* Navicat Premium Data Transfer - Source Server : 3306 + Source Server : localhost_mysql_3306 Source Server Type : MySQL - Source Server Version : 50726 - Source Host : localhost:3306 + Source Server Version : 50726 (5.7.26-log) + Source Host : 127.0.0.1:3306 Source Schema : smallboot Target Server Type : MySQL - Target Server Version : 50726 + Target Server Version : 50726 (5.7.26-log) File Encoding : 65001 - Date: 10/02/2023 15:08:30 + Date: 13/02/2023 18:17:22 */ SET NAMES utf8mb4; @@ -73,7 +73,7 @@ INSERT INTO `t_sys_dict` VALUES (172, 3, 'element_icon', 'ArrowRight', 'ArrowRig INSERT INTO `t_sys_dict` VALUES (173, 3, 'element_icon', 'ArrowRightBold', 'ArrowRightBold', 1, 9, '', 1, '2020-08-30 03:16:51', 1, '2022-07-22 09:59:13', 0); INSERT INTO `t_sys_dict` VALUES (174, 3, 'element_icon', 'ArrowUp', 'ArrowUp', 1, 10, '', 1, '2020-08-30 03:18:32', 1, '2022-07-22 09:59:19', 0); INSERT INTO `t_sys_dict` VALUES (180, 1, 'permission_btn', '设计表', 'design_table', 1, 31, NULL, 1, '2020-09-06 19:09:40', 0, '2021-08-28 00:03:02', 0); -INSERT INTO `t_sys_dict` VALUES (181, 6, 'oauth_type', 'gitee', '1', 1, 1, NULL, 1, '2020-12-06 13:16:39', 0, '2021-08-28 00:03:02', 0); +INSERT INTO `t_sys_dict` VALUES (181, 6, 'oauth_type', 'gitee', '1', 1, 1, '', 1, '2020-12-06 13:16:39', 0, '2023-02-13 11:17:41', 0); INSERT INTO `t_sys_dict` VALUES (182, 6, 'oauth_type', 'github', '2', 1, 2, NULL, 1, '2020-12-06 13:16:54', 0, '2021-08-28 00:03:02', 0); INSERT INTO `t_sys_dict` VALUES (183, 6, 'oauth_type', 'qq', '3', 1, 3, NULL, 1, '2020-12-06 13:17:03', 0, '2021-08-28 00:03:02', 0); INSERT INTO `t_sys_dict` VALUES (184, 3, 'element_icon', 'Monitor', 'Monitor', 1, 11, NULL, 0, '2023-02-01 16:42:06', 0, '2023-02-01 16:42:06', 0); @@ -143,8 +143,8 @@ INSERT INTO `t_sys_menu` VALUES (5, '角色管理', 'role', NULL, 'role', 2, 3, INSERT INTO `t_sys_menu` VALUES (6, '角色权限', 'roleForm', NULL, 'roleForm', 2, 8, 'system/role/form', 1, NULL, 1, 0, 1, 1, 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51', 0); INSERT INTO `t_sys_menu` VALUES (8, '个人中心', 'personal-center', NULL, 'personal-center', 2, 2, 'system/personal-center/index', 0, NULL, 1, 0, 0, 1, 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51', 0); INSERT INTO `t_sys_menu` VALUES (10, '数据字典', 'dict', NULL, 'dict', 2, 10, 'system/dict/index', 0, NULL, 1, 0, 0, 1, 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51', 0); -INSERT INTO `t_sys_menu` VALUES (11, '首页', 'dashboard', 'Loading', '/', 0, 0, 'Layout', 0, '/dashboard', 1, 0, 0, 0, 1, '2020-08-22 15:01:51', 0, '2023-02-01 16:39:06', 0); -INSERT INTO `t_sys_menu` VALUES (12, '首页', 'Dashboard', '', '/dashboard', 11, 1, 'dashboard/index', 0, '', 1, 0, 0, 0, 1, '2020-08-22 15:01:51', 1, '2022-07-15 16:53:46', 0); +INSERT INTO `t_sys_menu` VALUES (11, '首页', 'dashboard', 'Loading', '/', 0, 0, 'Layout', 0, 'dashboard', 1, 0, 0, 0, 1, '2020-08-22 15:01:51', 0, '2023-02-01 16:39:06', 0); +INSERT INTO `t_sys_menu` VALUES (12, '首页', 'Dashboard', '', 'dashboard', 11, 1, 'dashboard/index', 0, '', 1, 0, 0, 0, 1, '2020-08-22 15:01:51', 1, '2022-07-15 16:53:46', 0); -- ---------------------------- -- Table structure for t_sys_oauth_client @@ -192,16 +192,15 @@ CREATE TABLE `t_sys_permission` ( `update_by` int(11) NOT NULL COMMENT '修改人', `update_time` datetime NOT NULL COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 6 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统管理-菜单关联权限表' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 8 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统管理-菜单关联权限表' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of t_sys_permission -- ---------------------------- -INSERT INTO `t_sys_permission` VALUES (1, '查看用户', 4, 78, 'sys:user:view', 'GET:/web/api/user/*', 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51'); -INSERT INTO `t_sys_permission` VALUES (2, '编辑用户', 4, 75, 'sys:user:edit', 'PUT:/web/api/user/*', 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51'); -INSERT INTO `t_sys_permission` VALUES (3, '新增用户', 4, 76, 'sys:user:add', 'POST:/web/api/user', 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51'); -INSERT INTO `t_sys_permission` VALUES (4, '删除用户', 4, 77, 'sys:user:delete', 'DELETE:/web/api/user/*', 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51'); -INSERT INTO `t_sys_permission` VALUES (5, 'demo测试', 4, 77, 'sys:demo:test', 'GET:/demo/web/api/demo/demo/*', 1, '2020-08-22 15:01:51', 1, '2020-08-22 15:01:51'); +INSERT INTO `t_sys_permission` VALUES (1, '查看用户分页列表', 4, 78, 'sys:user:list:page', 'GET:/web/api/system/user/listPage', 1, '2020-08-22 15:01:51', 1, '2023-02-13 16:54:33'); +INSERT INTO `t_sys_permission` VALUES (2, '编辑用户', 4, 75, 'sys:user:edit', 'PUT:/web/api/system/user', 1, '2020-08-22 15:01:51', 1, '2023-02-13 16:51:45'); +INSERT INTO `t_sys_permission` VALUES (3, '新增用户', 4, 76, 'sys:user:add', 'POST:/web/api/system/user', 1, '2020-08-22 15:01:51', 1, '2023-02-13 16:13:06'); +INSERT INTO `t_sys_permission` VALUES (4, '删除用户', 4, 77, 'sys:user:delete', 'DELETE:/web/api/system/user', 1, '2020-08-22 15:01:51', 1, '2023-02-13 16:13:16'); -- ---------------------------- -- Table structure for t_sys_property @@ -262,28 +261,18 @@ CREATE TABLE `t_sys_role_menu` ( `update_by` int(11) NOT NULL COMMENT '修改人', `update_time` datetime NOT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间', PRIMARY KEY (`id`) USING BTREE -) ENGINE = InnoDB AUTO_INCREMENT = 141 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统管理-角色菜单关联表' ROW_FORMAT = COMPACT; +) ENGINE = InnoDB AUTO_INCREMENT = 148 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '系统管理-角色菜单关联表' ROW_FORMAT = COMPACT; -- ---------------------------- -- Records of t_sys_role_menu -- ---------------------------- -INSERT INTO `t_sys_role_menu` VALUES (124, 1, 11, 0, '2023-02-01 16:39:27', 0, '2023-02-01 16:39:27'); -INSERT INTO `t_sys_role_menu` VALUES (125, 1, 12, 0, '2023-02-01 16:39:27', 0, '2023-02-01 16:39:27'); -INSERT INTO `t_sys_role_menu` VALUES (126, 1, 27, 0, '2023-02-01 16:39:27', 0, '2023-02-01 16:39:27'); -INSERT INTO `t_sys_role_menu` VALUES (127, 1, 41, 0, '2023-02-01 16:39:27', 0, '2023-02-01 16:39:27'); -INSERT INTO `t_sys_role_menu` VALUES (128, 1, 42, 0, '2023-02-01 16:39:27', 0, '2023-02-01 16:39:27'); -INSERT INTO `t_sys_role_menu` VALUES (129, 9, 11, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (130, 9, 12, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (131, 9, 2, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (132, 9, 4, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (133, 9, 8, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (134, 9, 5, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (135, 9, 6, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (136, 9, 3, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (137, 9, 10, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (138, 9, 27, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (139, 9, 41, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); -INSERT INTO `t_sys_role_menu` VALUES (140, 9, 42, 0, '2023-02-01 16:39:32', 0, '2023-02-01 16:39:32'); +INSERT INTO `t_sys_role_menu` VALUES (141, 9, 2, 1, '2023-02-13 18:05:59', 1, '2023-02-13 18:05:59'); +INSERT INTO `t_sys_role_menu` VALUES (142, 9, 4, 1, '2023-02-13 18:05:59', 1, '2023-02-13 18:05:59'); +INSERT INTO `t_sys_role_menu` VALUES (143, 9, 8, 1, '2023-02-13 18:05:59', 1, '2023-02-13 18:05:59'); +INSERT INTO `t_sys_role_menu` VALUES (144, 9, 5, 1, '2023-02-13 18:05:59', 1, '2023-02-13 18:05:59'); +INSERT INTO `t_sys_role_menu` VALUES (145, 9, 6, 1, '2023-02-13 18:05:59', 1, '2023-02-13 18:05:59'); +INSERT INTO `t_sys_role_menu` VALUES (146, 9, 3, 1, '2023-02-13 18:05:59', 1, '2023-02-13 18:05:59'); +INSERT INTO `t_sys_role_menu` VALUES (147, 9, 10, 1, '2023-02-13 18:05:59', 1, '2023-02-13 18:05:59'); -- ---------------------------- -- Table structure for t_sys_role_permission @@ -339,7 +328,7 @@ CREATE TABLE `t_sys_user` ( -- Records of t_sys_user -- ---------------------------- INSERT INTO `t_sys_user` VALUES (1, 'admin', '3014dcb9ee3639535d5d9301b32c840c', '郑清', 1, '15188888888', 'zhengqingya@it.com', 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/80/h/80', 1, '2020-08-22 15:01:51', 0, '2023-02-10 14:30:54', 0); -INSERT INTO `t_sys_user` VALUES (2, 'test', '3014dcb9ee3639535d5d9301b32c840c', '测试号', 1, '', '', 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/80/h/80', 1, '2020-08-22 15:01:51', 0, '2023-02-10 15:04:56', 0); +INSERT INTO `t_sys_user` VALUES (2, 'test', '3014dcb9ee3639535d5d9301b32c840c', '测试号', 1, '', '', 'https://wpimg.wallstcn.com/f778738c-e4f8-4870-b634-56703b4acafe.gif?imageView2/1/w/80/h/80', 1, '2020-08-22 15:01:51', 1, '2023-02-13 11:56:39', 0); -- ---------------------------- -- Table structure for t_sys_user_re_oauth diff --git a/smallboot-api/system/src/main/java/com/zhengqing/system/api/SysMenuController.java b/smallboot-api/system/src/main/java/com/zhengqing/system/api/SysMenuController.java index a2a19e9..5110299 100644 --- a/smallboot-api/system/src/main/java/com/zhengqing/system/api/SysMenuController.java +++ b/smallboot-api/system/src/main/java/com/zhengqing/system/api/SysMenuController.java @@ -9,14 +9,15 @@ import com.zhengqing.system.model.dto.SysMenuSaveDTO; import com.zhengqing.system.model.vo.SysMenuReBtnPermListVO; import com.zhengqing.system.model.vo.SysMenuTreeVO; import com.zhengqing.system.service.ISysMenuService; +import com.zhengqing.system.service.ISysPermissionBusinessService; import com.zhengqing.system.service.ISysPermissionService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import javax.annotation.Resource; import java.util.List; /** @@ -30,15 +31,16 @@ import java.util.List; */ @Slf4j @RestController +@RequiredArgsConstructor @RequestMapping(ServiceConstant.SERVICE_API_PREFIX_WEB_SYSTEM + "/menu") @Api(tags = "系统管理 - 菜单表接口") public class SysMenuController extends BaseController { - @Resource - private ISysMenuService menuService; + private final ISysMenuService menuService; - @Resource - private ISysPermissionService sysPermissionService; + private final ISysPermissionService sysPermissionService; + + private final ISysPermissionBusinessService sysPermissionBusinessService; // @GetMapping("/listPage") // @ApiOperation("列表分页") @@ -90,6 +92,7 @@ public class SysMenuController extends BaseController { @ApiOperation("菜单关联按钮权限-删除") public void deleteMenuReBtnPerm(@RequestParam Integer id) { this.sysPermissionService.removeById(id); + this.sysPermissionBusinessService.refreshRedisPerm(); } @NoRepeatSubmit @@ -98,6 +101,7 @@ public class SysMenuController extends BaseController { public void addMenuReBtnPerm(@Validated @RequestBody SysMenuReBtnPermSaveDTO params) { params.setId(null); this.sysPermissionService.addOrUpdateData(params); + this.sysPermissionBusinessService.refreshRedisPerm(); } @NoRepeatSubmit @@ -105,6 +109,7 @@ public class SysMenuController extends BaseController { @ApiOperation("菜单关联按钮权限-更新") public void updateMenuReBtnPerm(@Validated(UpdateGroup.class) @RequestBody SysMenuReBtnPermSaveDTO params) { this.sysPermissionService.addOrUpdateData(params); + this.sysPermissionBusinessService.refreshRedisPerm(); } } diff --git a/smallboot-api/system/src/main/java/com/zhengqing/system/service/impl/AuthServiceImpl.java b/smallboot-api/system/src/main/java/com/zhengqing/system/service/impl/AuthServiceImpl.java index 1091867..88c387d 100644 --- a/smallboot-api/system/src/main/java/com/zhengqing/system/service/impl/AuthServiceImpl.java +++ b/smallboot-api/system/src/main/java/com/zhengqing/system/service/impl/AuthServiceImpl.java @@ -8,7 +8,8 @@ import com.zhengqing.common.auth.model.vo.AuthLoginVO; import com.zhengqing.common.auth.service.IAuthService; import com.zhengqing.common.base.enums.AuthSourceEnum; import com.zhengqing.common.base.model.bo.JwtUserBO; -import com.zhengqing.system.entity.SysUser; +import com.zhengqing.system.model.dto.SysUserPermDTO; +import com.zhengqing.system.model.vo.SysUserPermVO; import com.zhengqing.system.service.ISysUserService; import com.zhengqing.system.util.PasswordUtil; import lombok.RequiredArgsConstructor; @@ -36,9 +37,8 @@ public class AuthServiceImpl implements IAuthService { String username = params.getUsername(); String password = params.getPassword(); - SysUser sysUser = this.sysUserService.getUserByUsername(username); - Assert.notNull(sysUser, "账号不存在！"); - boolean isValid = PasswordUtil.isValidPassword(password, sysUser.getPassword()); + SysUserPermVO userPerm = this.sysUserService.getUserPerm(SysUserPermDTO.builder().username(username).build()); + boolean isValid = PasswordUtil.isValidPassword(password, userPerm.getPassword()); // 校验原始密码是否正确 Assert.isTrue(isValid, "密码错误！"); @@ -47,8 +47,9 @@ public class AuthServiceImpl implements IAuthService { StpUtil.login(JSONUtil.toJsonStr( JwtUserBO.builder() .authSourceEnum(AuthSourceEnum.B) - .userId(String.valueOf(sysUser.getUserId())) - .userName(sysUser.getUsername()) + .userId(String.valueOf(userPerm.getUserId())) + .userName(userPerm.getUsername()) + .roleCodeList(userPerm.getRoleCodeList()) .build() )); return AuthLoginVO.builder() diff --git a/smallboot-web/src/assets/404_images/404.png b/smallboot-web/src/assets/404_images/404.png new file mode 100644 index 0000000..3d8e230 Binary files /dev/null and b/smallboot-web/src/assets/404_images/404.png differ diff --git a/smallboot-web/src/assets/404_images/404_cloud.png b/smallboot-web/src/assets/404_images/404_cloud.png new file mode 100644 index 0000000..c6281d0 Binary files /dev/null and b/smallboot-web/src/assets/404_images/404_cloud.png differ diff --git a/smallboot-web/src/permission.ts b/smallboot-web/src/permission.ts index 2a24a09..0a4d7e3 100644 --- a/smallboot-web/src/permission.ts +++ b/smallboot-web/src/permission.ts @@ -6,8 +6,9 @@ import 'nprogress/nprogress.css' NProgress.configure({ showSpinner: false }) // 进度环显示/隐藏 // 白名单路由 -const whiteList = ['/login', '/auth-redirect', '/bus/model/detail'] +const whiteList = ['/login', '/auth-redirect'] +// 全局守卫 router.beforeEach(async (to, from, next) => { NProgress.start() const { user, permission } = useStore() @@ -31,7 +32,7 @@ router.beforeEach(async (to, from, next) => { const roleNames = user.roleNames const accessRoutes: any = await permission.generateRoutes(roleNames) accessRoutes.forEach((route: any) => { - router.addRoute(route) + router.addRoute(route) // 动态添加可访问路由表 }) next({ ...to, replace: true }) } catch (error) { diff --git a/smallboot-web/src/router/index.ts b/smallboot-web/src/router/index.ts index cf1eaa6..ced8e49 100644 --- a/smallboot-web/src/router/index.ts +++ b/smallboot-web/src/router/index.ts @@ -1,8 +1,23 @@ import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router' import useStore from '@/store' +export const Layout = () => import('@/layout/index.vue'); + // 静态路由 export const constantRoutes: Array = [ + { + path: '/', + component: Layout, + redirect: 'dashboard', + children: [ + { + path: 'dashboard', + component: () => import('@/views/dashboard/index.vue'), + name: 'Dashboard', + meta: { title: '首页', icon: 'House', affix: true } + } + ] + }, { path: '/login', component: () => import('@/views/login/index.vue'), @@ -12,7 +27,8 @@ export const constantRoutes: Array = [ component: () => import('@/views/test/index.vue'), }, { - path: '/404', + // path: '/404', + path: '/:pathMatch(.*)*', // 防止浏览器刷新时路由未找到警告提示: vue-router.mjs:35 [Vue Router warn]: No match found for location with path "/xxx" component: () => import('@/views/error-page/404.vue'), }, { diff --git a/smallboot-web/src/views/error-page/401.vue b/smallboot-web/src/views/error-page/401.vue index b9a5f89..4383828 100644 --- a/smallboot-web/src/views/error-page/401.vue +++ b/smallboot-web/src/views/error-page/401.vue @@ -1,4 +1,30 @@ -\ + + + + diff --git a/smallboot-web/src/views/error-page/404.vue b/smallboot-web/src/views/error-page/404.vue index 07e8696..7f3007a 100644 --- a/smallboot-web/src/views/error-page/404.vue +++ b/smallboot-web/src/views/error-page/404.vue @@ -1,3 +1,228 @@ + + + + diff --git a/smallboot-web/src/views/system/role/list.vue b/smallboot-web/src/views/system/role/list.vue index b57de19..e38cc0a 100644 --- a/smallboot-web/src/views/system/role/list.vue +++ b/smallboot-web/src/views/system/role/list.vue @@ -99,5 +99,4 @@ async function deleteData(id: number) { refreshTableData() } - +