diff --git a/device-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java b/device-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java index b16667bfcb74fbb150d2713859cc35b3ad1173ca..3ae8ffcc8987d7ae51a9c32fd71377371f3d57aa 100644 --- a/device-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java +++ b/device-manager/src/main/java/com/mortals/xhx/base/system/resource/service/impl/ResourceServiceImpl.java @@ -93,7 +93,7 @@ public class ResourceServiceImpl extends AbstractCRUDServiceImpl refreshResourceUrl(String packageName, Context context) { List> classList = ControllerScanUtil.getAllClassByPackageName(packageName); //System.out.println(classList); //获取到了所有的类 - List newResourcelist = ControllerScanUtil.getAnnotationInfo(classList); + List newResourcelist = ControllerScanUtil.getAnnotationInfo(classList).stream().filter(f->!ObjectUtils.isEmpty(f.getUrl())).collect(Collectors.toList()); Map> localResourceMap = this.find(new ResourceQuery()).stream().collect(Collectors.groupingBy(x -> x.getName())); Map> newResourceMap = newResourcelist.stream().collect(Collectors.groupingBy(x -> x.getName())); diff --git a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceSendMsgController.java b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceSendMsgController.java index ee9c63e3bc46d625077d68a59d14f88bd60ea272..d61bee60677df72e9b27ef1af15d716a93d2954f 100644 --- a/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceSendMsgController.java +++ b/device-manager/src/main/java/com/mortals/xhx/busiz/web/DeviceSendMsgController.java @@ -3,6 +3,7 @@ package com.mortals.xhx.busiz.web; import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.mortals.framework.annotation.UnAuth; @@ -167,5 +168,15 @@ public class DeviceSendMsgController { return JSON.toJSONString(rsp); } + public static void main(String[] args) { + String input = "/example/path/to/file"; + + // 去掉开头和结尾的 \ + String result = StrUtil.removeSuffix(StrUtil.removePrefix(input, "/"), "/"); + + System.out.println("处理前: " + input); + System.out.println("处理后: " + result); + } + } diff --git a/device-manager/src/main/java/com/mortals/xhx/common/utils/ControllerScanUtil.java b/device-manager/src/main/java/com/mortals/xhx/common/utils/ControllerScanUtil.java index 59e026e079d1c734f3ef5b36b78252540cd8a1be..9a65824c874a30b2eb455b1bd49684846f572a81 100644 --- a/device-manager/src/main/java/com/mortals/xhx/common/utils/ControllerScanUtil.java +++ b/device-manager/src/main/java/com/mortals/xhx/common/utils/ControllerScanUtil.java @@ -73,7 +73,7 @@ public class ControllerScanUtil { if (ObjectUtils.isEmpty(result)) { if (requestMappingCls != null) { - result = requestMappingCls.value()[0].toUpperCase() + "接口模块"; + result = StrUtil.removeSuffix(StrUtil.removePrefix(requestMappingCls.value()[0].toUpperCase(), "/"), "/") + "接口模块"; } resourceViewEntity.setName(result + "-查看"); resourceEditEntity.setName(result + "-维护");