gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【rule】更新ant正则url校验和layui菜单拼接，增加context-path

pull/3/head
fengshuonan 2021-01-02 22:14:40 +08:00
parent f9f016698d
commit 4b702db3e4
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kernel-a-rule/src/main/java/cn/stylefeng/roses/kernel/rule/util/AntPathMatcherUtil.java
View File

@ -22,10 +22,10 @@ public class AntPathMatcherUtil {
* @author fengshuonan * @author fengshuonan
* @date 2020/12/15 22:31 * @date 2020/12/15 22:31
*/ */
public static Boolean getAntMatchFLag(String requestURI, List<String> antPatterns) { public static Boolean getAntMatchFLag(String requestURI, String contextPath, List<String> antPatterns) {
AntPathMatcher antPathMatcher = new AntPathMatcher(); AntPathMatcher antPathMatcher = new AntPathMatcher();
for (String notAuthResourcePattern : antPatterns) { for (String notAuthResourcePattern : antPatterns) {
if (antPathMatcher.match(notAuthResourcePattern, requestURI)) { if (antPathMatcher.match(contextPath + notAuthResourcePattern, requestURI)) {
return true; return true;
} }
} }

9
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/factory/LayuiMenusFactory.java
View File

@ -1,11 +1,10 @@
package cn.stylefeng.roses.kernel.menu.modular.factory; package cn.stylefeng.roses.kernel.menu.modular.factory;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.extra.spring.SpringUtil; import cn.hutool.extra.spring.SpringUtil;
import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu; import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;
import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.rule.factory.DefaultTreeBuildFactory;
import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
import cn.stylefeng.roses.kernel.system.AppServiceApi; import cn.stylefeng.roses.kernel.system.AppServiceApi;
import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenus; import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenus;
import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiIndexMenuTreeNode; import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiIndexMenuTreeNode;
@ -32,6 +31,8 @@ public class LayuiMenusFactory {
*/ */
public static List<LayuiAppIndexMenus> createLayuiAppIndexMenus(List<SysMenu> sysMenuList) { public static List<LayuiAppIndexMenus> createLayuiAppIndexMenus(List<SysMenu> sysMenuList) {
String contextPath = HttpServletUtil.getRequest().getContextPath();
ArrayList<LayuiAppIndexMenus> resultList = new ArrayList<>(); ArrayList<LayuiAppIndexMenus> resultList = new ArrayList<>();
// 找出用户有多少个应用的菜单 // 找出用户有多少个应用的菜单
@ -54,6 +55,10 @@ public class LayuiMenusFactory {
for (SysMenu appMenu : appMenus) { for (SysMenu appMenu : appMenus) {
LayuiIndexMenuTreeNode layuiIndexMenuTreeNode = new LayuiIndexMenuTreeNode(); LayuiIndexMenuTreeNode layuiIndexMenuTreeNode = new LayuiIndexMenuTreeNode();
BeanUtil.copyProperties(appMenu, layuiIndexMenuTreeNode); BeanUtil.copyProperties(appMenu, layuiIndexMenuTreeNode);
// 每个节点的url要加上context-path
layuiIndexMenuTreeNode.setRouter(contextPath + layuiIndexMenuTreeNode.getRouter());
layuiIndexMenuTreeNodes.add(layuiIndexMenuTreeNode); layuiIndexMenuTreeNodes.add(layuiIndexMenuTreeNode);
} }