From 0d78b68089c2cc65d514098031ca5f6b1f5162ff Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Sat, 16 Jan 2021 15:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90scanner=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=89=AB=E6=8F=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/resource/scanner/ApiResourceScanner.java | 3 ++- .../resource/modular/service/impl/SysResourceServiceImpl.java | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/resource/scanner/ApiResourceScanner.java b/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/resource/scanner/ApiResourceScanner.java index e69290768..49a299bed 100644 --- a/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/resource/scanner/ApiResourceScanner.java +++ b/kernel-d-scanner/scanner-sdk-scanner/src/main/java/cn/stylefeng/roses/kernel/resource/scanner/ApiResourceScanner.java @@ -315,7 +315,8 @@ public class ApiResourceScanner implements BeanPostProcessor { controllerPath = "/" + controllerPath; } - return controllerPath + path; + // 前缀多个左斜杠替换为一个 + return (controllerPath + path).replaceAll("/+", "/"); } /** diff --git a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java index ae30ca388..ac6e5ddfa 100644 --- a/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java +++ b/kernel-s-system/system-business-resource/src/main/java/cn/stylefeng/roses/kernel/resource/modular/service/impl/SysResourceServiceImpl.java @@ -101,6 +101,7 @@ public class SysResourceServiceImpl extends ServiceImpl sysResourceLambdaQueryWrapper = new LambdaQueryWrapper<>(); + sysResourceLambdaQueryWrapper.eq(SysResource::getViewFlag, YesOrNotEnum.N.getCode()); sysResourceLambdaQueryWrapper.select(SysResource::getAppCode, SysResource::getModularCode, SysResource::getModularName, SysResource::getResourceCode, SysResource::getUrl, SysResource::getResourceName); List allResource = this.list(sysResourceLambdaQueryWrapper);