diff --git a/src/main/java/META-INF/application-template.xml b/src/main/java/META-INF/application-template.xml index 548452fe5..0b3f9502a 100644 --- a/src/main/java/META-INF/application-template.xml +++ b/src/main/java/META-INF/application-template.xml @@ -1,368 +1,368 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/org/redkale/boot/ClassFilter.java b/src/main/java/org/redkale/boot/ClassFilter.java index 45fd567e0..88a8e7f10 100644 --- a/src/main/java/org/redkale/boot/ClassFilter.java +++ b/src/main/java/org/redkale/boot/ClassFilter.java @@ -108,8 +108,10 @@ public final class ClassFilter { Set includeValues, Set excludeValues) { ClassFilter filter = new ClassFilter(classLoader, null, null, excludeSuperClasses); - filter.setIncludePatterns(includeRegxs == null ? null : includeRegxs.split(";")); - filter.setExcludePatterns(excludeRegxs == null ? null : excludeRegxs.split(";")); + filter.setIncludePatterns( + includeRegxs == null ? null : includeRegxs.replace(',', ';').split(";")); + filter.setExcludePatterns( + excludeRegxs == null ? null : excludeRegxs.replace(',', ';').split(";")); filter.setPrivilegeIncludes(includeValues); filter.setPrivilegeExcludes(excludeValues); return filter; diff --git a/src/main/java/org/redkale/boot/NodeServer.java b/src/main/java/org/redkale/boot/NodeServer.java index f3443116b..2945e116b 100644 --- a/src/main/java/org/redkale/boot/NodeServer.java +++ b/src/main/java/org/redkale/boot/NodeServer.java @@ -628,8 +628,8 @@ public abstract class NodeServer { if (list.getBoolValue("autoload", true)) { String includes = list.getValue("includes", ""); String excludes = list.getValue("excludes", ""); - filter.setIncludePatterns(includes.split(";")); - filter.setExcludePatterns(excludes.split(";")); + filter.setIncludePatterns(includes.replace(',', ';').split(";")); + filter.setExcludePatterns(excludes.replace(',', ';').split(";")); } else if (ref2 == null || ref2 == Annotation.class) { // service如果是autoload=false则不需要加载 filter.setRefused(true); } else if (ref2 != Annotation.class) { diff --git a/src/main/java/org/redkale/mq/spi/MessageModuleEngine.java b/src/main/java/org/redkale/mq/spi/MessageModuleEngine.java index 0265a2e4f..f42b9bc3e 100644 --- a/src/main/java/org/redkale/mq/spi/MessageModuleEngine.java +++ b/src/main/java/org/redkale/mq/spi/MessageModuleEngine.java @@ -424,8 +424,8 @@ public class MessageModuleEngine extends ModuleEngine { if (consumerConf.getBoolValue("autoload", true)) { String includes = consumerConf.getValue("includes", ""); String excludes = consumerConf.getValue("excludes", ""); - filter.setIncludePatterns(includes.split(";")); - filter.setExcludePatterns(excludes.split(";")); + filter.setIncludePatterns(includes.replace(',', ';').split(";")); + filter.setExcludePatterns(excludes.replace(',', ';').split(";")); } else { filter.setRefused(true); }