From eb2d1250a08d0f74f793da4e80337034783d2185 Mon Sep 17 00:00:00 2001
From: KingStar <z237794193@qq.com>
Date: Thu, 10 Mar 2022 13:40:00 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8F=92=E4=BB=B6=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=8E=B7=E5=8F=96=E4=B8=BB=E7=A8=8B=E5=BA=8F=E7=B1=BB?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=20=E4=BF=AE=E5=A4=8D=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E6=97=A0=E6=B3=95=E8=8E=B7=E5=8F=96=E4=B8=BB=E7=A8=8B?=
 =?UTF-8?q?=E5=BA=8F=E7=B1=BB=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/gitee/starblues/utils/ObjectUtils.java | 5 +++++
 .../launcher/plugin/BasicMainResourcePatternDefiner.java     | 4 +++-
 .../launcher/plugin/PluginMainResourcePatternDefiner.java    | 5 ++++-
 3 files changed, 12 insertions(+), 2 deletions(-)

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 4ec35ae..ba1baca 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 c3a2eb5..461a5ca 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 e998516..8772b54 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
         }
     }
 
+
+
 }
-- 
Gitee