diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ObjectUtils.java b/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ObjectUtils.java index 4ec35ae1bbf79e316d81132069fa70e8e4562ae6..ba1baca9e73aeb386015fea1c5db717b40d0eb80 100644 --- a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ObjectUtils.java +++ b/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ObjectUtils.java @@ -423,6 +423,11 @@ public class ObjectUtils { return count; } + public static String changePackageToMatch(String packageName){ + Assert.isNotEmpty(packageName, "参数 packageName 不能为空"); + return packageName.replace(".", "/") + "/**"; + } + private static boolean containsText(CharSequence str) { int strLen = str.length(); for (int i = 0; i < strLen; i++) { diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/BasicMainResourcePatternDefiner.java b/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/BasicMainResourcePatternDefiner.java index c3a2eb5a115aa64fd90db455d2630b211af71a95..461a5ca27482da906c19ab52eab3a29d0c6a3277 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/BasicMainResourcePatternDefiner.java +++ b/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/BasicMainResourcePatternDefiner.java @@ -17,6 +17,8 @@ package com.gitee.starblues.core.launcher.plugin; import com.gitee.starblues.core.classloader.MainResourcePatternDefiner; +import com.gitee.starblues.utils.Assert; +import com.gitee.starblues.utils.ObjectUtils; import java.util.HashSet; import java.util.Set; @@ -31,7 +33,7 @@ public class BasicMainResourcePatternDefiner implements MainResourcePatternDefin private final String mainPackageName; public BasicMainResourcePatternDefiner(String mainPackageName) { - this.mainPackageName = mainPackageName; + this.mainPackageName = ObjectUtils.changePackageToMatch(mainPackageName); } @Override diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMainResourcePatternDefiner.java b/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMainResourcePatternDefiner.java index e998516f6d57f88e78231e54748f3cfa0a3f42c3..8772b542c3e8cd3d90184f6b84d07c1d4508e9f3 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMainResourcePatternDefiner.java +++ b/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMainResourcePatternDefiner.java @@ -19,6 +19,7 @@ package com.gitee.starblues.core.launcher.plugin; import com.gitee.starblues.core.descriptor.InsidePluginDescriptor; import com.gitee.starblues.core.launcher.JavaMainResourcePatternDefiner; import com.gitee.starblues.spring.MainApplicationContext; +import com.gitee.starblues.utils.Assert; import com.gitee.starblues.utils.ObjectUtils; import com.gitee.starblues.utils.SpringBeanCustomUtils; @@ -53,7 +54,7 @@ public class PluginMainResourcePatternDefiner extends JavaMainResourcePatternDef if(!ObjectUtils.isEmpty(includePatterns)){ includeResourcePatterns.addAll(includePatterns); } else { - includeResourcePatterns.add(mainPackage); + includeResourcePatterns.add(ObjectUtils.changePackageToMatch(mainPackage)); } includeResourcePatterns.add(FRAMEWORK); addWebIncludeResourcePatterns(includeResourcePatterns); @@ -151,4 +152,6 @@ public class PluginMainResourcePatternDefiner extends JavaMainResourcePatternDef } } + + }