diff --git a/README_zh.md b/README_zh.md index 37e1827a06a4fe86b49fb5bd0764b83dd8be6911..7b14600a2608a4fb2278163715df4ae49e67d42a 100644 --- a/README_zh.md +++ b/README_zh.md @@ -2,7 +2,14 @@ - 全新`3.0.0`版本上线啦，为动态扩展系统而生的框架。 -**当前alpha测试版本暂未将依赖包上传到远程仓库, 使用时, 暂可下载源码, 在本地编译后进行尝鲜！！！** +### 背景 +在当下后端市场，还是以`SpringBoot`为核心框架进行系统开发，本框架可以在`SpringBoot`系统上进行插件式的开发，将插件当做一个`mini`版本的`SpringBoot`进行系统扩展开发，可以解决如下痛点： +1. 在`To-B`系统场景中，不同甲方会有不同的需求，在不打分支和改动系统核心代码的前提下，可以在插件中进行扩展开发特定功能，不同甲方使用不同插件，完美解决非核心系统的扩展功能开发。 +2. 在`To-C`系统场景中，可以在主程序通过定义`java-interface`，在插件中做不同实现，来达到动态扩展系统功能。 +3. 在开发中，由于引入了不同版本的依赖，导致系统无法运行，本框架可以完美解决在不同插件中定义不同版本的依赖，从底层进行隔离，以解决引入不同版本依赖冲突的问题。比如可以解决同一个程序同时连接`mysql-5`和`mysql-8`版本数据库。 +4. 在开发中，不同插件依赖不同框架的功能，可以按需引入。比如在插件A引入连接`mysql`、在插件B引入连接`elasticsearch`、在插件C引入连接`oracle`。 +5. 在插件中，可以任意集成不同的非`web`类型的`springboot-xx-starter`，然后将不同插件功能组装起来，以达到一个统一对外提供服务的完整系统，实现系统组装化、插拔化开发。 +6. 在不重启主程序的前提下，对插件进行动态的安装、卸载。 ### 介绍 该框架可以在`SpringBoot`项目上开发出插件功能，在插件中可以和`SpringBoot`使用方式一模一样。使用了本框架您可以实现如下需求： diff --git a/pom.xml b/pom.xml index 5df6ef751672a1a156a381adfc09d971f543fd07..4847d111bc7296a71288fe4cc467b8cd5b75f303 100644 --- a/pom.xml +++ b/pom.xml @@ -11,26 +11,65 @@ com.gitee.starblues - springboot-plugin-framework-parent + spring-brick-parent pom - 3.0.0-alpha - - spring boot 插件开发集成包 + 3.0.0 - spring-plugin-framework-common - springboot-plugin-framework-loader - springboot-plugin-framework - springboot-plugin-bootstrap - springboot-plugin-maven-packager + spring-brick-common + spring-brick-loader + spring-brick + spring-brick-bootstrap + spring-brick-maven-packager 1.8 UTF-8 3.8.1 + + 3.1.0 + 3.1.0 + 3.1.0 + 1.6 + + + The Apache Software License, Version 2.0 + http://www.apache.org/licenses/LICENSE-2.0.txt + repo + + + + + https://gitee.com/starblues/springboot-plugin-framework-parent + scm:https://gitee.com/starblues/springboot-plugin-framework-parent.git + scm:https://gitee.com/starblues/springboot-plugin-framework-parent.git + 1.0 + + + + + sonatype-nexus-snapshots + oss Snapshots Repository + https://oss.sonatype.org/content/repositories/snapshots + + + sonatype-nexus-staging + oss Staging Repository + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + + + StarBlues + starblues@foxmail.com + https://gitee.com/starblues/ + + + @@ -42,8 +81,77 @@ ${java.version} + + + org.apache.maven.plugins + maven-source-plugin + ${maven-source-plugin.version} + + + package + + jar-no-fork + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + ${plugin.skip} + + + + package + + jar + + + + + + + org.apache.maven.plugins + maven-gpg-plugin + ${maven-gpg-plugin.version} + + ${plugin.skip} + + + + sign-artifacts + verify + + sign + + + + + + + dev + + true + + + true + + + + + release + + false + + + + + \ No newline at end of file diff --git a/springboot-plugin-bootstrap/pom.xml b/spring-brick-bootstrap/pom.xml similarity index 77% rename from springboot-plugin-bootstrap/pom.xml rename to spring-brick-bootstrap/pom.xml index 85dfe0e4bd1c86623a4a6bff638a3f0435606e9b..45d8b2eae1672249fe32db34623a6f63f4327cd0 100644 --- a/springboot-plugin-bootstrap/pom.xml +++ b/spring-brick-bootstrap/pom.xml @@ -2,14 +2,17 @@ + 4.0.0 + - springboot-plugin-framework-parent + spring-brick-parent com.gitee.starblues - 3.0.0-alpha + 3.0.0 - 4.0.0 - springboot-plugin-bootstrap + spring-brick-bootstrap + jar + 插件引导模块 @@ -17,7 +20,7 @@ UTF-8 3.8.1 - 3.0.0-alpha + 3.0.0 1.9.6 1.7.7 @@ -40,18 +43,18 @@ slf4j-api ${slf4j.version} - - com.fasterxml.jackson.core - jackson-databind - ${jackson.version} - com.gitee.starblues - springboot-plugin-framework - ${springboot-plugin-framework} + spring-brick + ${project.version} provided true + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + org.springframework.boot spring-boot @@ -82,18 +85,4 @@ - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - - - \ No newline at end of file diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigureMainPluginEnvironment.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigureMainPluginEnvironment.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigureMainPluginEnvironment.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigureMainPluginEnvironment.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigurePluginEnvironment.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigurePluginEnvironment.java similarity index 96% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigurePluginEnvironment.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigurePluginEnvironment.java index ea0bae35e67f405b9ce38ab00208b56bf10e89b6..c159c6e9b470648b34f8885e72c18d9f2c539328 100644 --- a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigurePluginEnvironment.java +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/ConfigurePluginEnvironment.java @@ -73,8 +73,8 @@ class ConfigurePluginEnvironment { env.put(SPRING_JMX_UNIQUE_NAMES, true); env.put(SPRING_ADMIN_JMX_NAME, SPRING_ADMIN_JMX_VALUE + pluginId); env.put(REGISTER_SHUTDOWN_HOOK_PROPERTY, false); - env.put(MBEAN_DOMAIN_PROPERTY_NAME, null); - environment.getPropertySources().addLast(new MapPropertySource(PLUGIN_PROPERTY_NAME, env)); + env.put(MBEAN_DOMAIN_PROPERTY_NAME, pluginId); + environment.getPropertySources().addFirst(new MapPropertySource(PLUGIN_PROPERTY_NAME, env)); if(processorContext.runMode() == ProcessorContext.RunMode.ONESELF){ ConfigureMainPluginEnvironment configureMainPluginEnvironment = diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/DefaultSpringPluginHook.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/DefaultSpringPluginHook.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/DefaultSpringPluginHook.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/DefaultSpringPluginHook.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java similarity index 90% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java index 7b677469853cd105b387772ae95b1a7ed59e9497..53a55368e9971b990a1ed3c039d4ede5e69f721f 100644 --- a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptyMainApplicationContext.java @@ -24,6 +24,7 @@ import org.springframework.beans.factory.ObjectProvider; import org.springframework.core.ResolvableType; import java.lang.annotation.Annotation; +import java.util.Collections; import java.util.Map; import java.util.Set; @@ -45,4 +46,9 @@ public class EmptyMainApplicationContext implements MainApplicationContext { public void close() throws Exception { } + + @Override + public Map> getConfigurableEnvironment() { + return Collections.emptyMap(); + } } diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptySpringBeanFactory.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptySpringBeanFactory.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptySpringBeanFactory.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/EmptySpringBeanFactory.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginApplicationContext.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginApplicationContext.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginApplicationContext.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginApplicationContext.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginListableBeanFactory.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginListableBeanFactory.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginListableBeanFactory.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginListableBeanFactory.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginOneselfInteractive.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginOneselfInteractive.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginOneselfInteractive.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginOneselfInteractive.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginSpringApplication.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginSpringApplication.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginSpringApplication.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/PluginSpringApplication.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/SpringPluginBootstrap.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/SpringPluginBootstrap.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/SpringPluginBootstrap.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/SpringPluginBootstrap.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/DisablePluginWeb.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/DisablePluginWeb.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/DisablePluginWeb.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/DisablePluginWeb.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/OneselfConfig.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/OneselfConfig.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/OneselfConfig.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/annotation/OneselfConfig.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ComposeSpringPluginProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ComposeSpringPluginProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ComposeSpringPluginProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ComposeSpringPluginProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/DefaultProcessorContext.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/DefaultProcessorContext.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/DefaultProcessorContext.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/DefaultProcessorContext.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ExtractBeanProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ExtractBeanProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ExtractBeanProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ExtractBeanProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/FrameDefineBeanProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/FrameDefineBeanProcessor.java similarity index 74% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/FrameDefineBeanProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/FrameDefineBeanProcessor.java index b4c6549182214e2c075d579466a8026f24932587..56fcb6af01916a9de51eaf1c8c57d56230c3229a 100644 --- a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/FrameDefineBeanProcessor.java +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/FrameDefineBeanProcessor.java @@ -17,6 +17,9 @@ package com.gitee.starblues.bootstrap.processor; +import com.gitee.starblues.bootstrap.realize.DefaultMainEnvironmentProvider; +import com.gitee.starblues.bootstrap.realize.EmptyMainEnvironmentProvider; +import com.gitee.starblues.bootstrap.realize.MainEnvironmentProvider; import com.gitee.starblues.core.descriptor.InsidePluginDescriptor; import com.gitee.starblues.integration.AutoIntegrationConfiguration; import com.gitee.starblues.integration.ExtendPointConfiguration; @@ -36,11 +39,17 @@ public class FrameDefineBeanProcessor implements SpringPluginProcessor { InsidePluginDescriptor pluginDescriptor = context.getPluginDescriptor(); ConfigurableListableBeanFactory beanFactory = applicationContext.getBeanFactory(); beanFactory.registerSingleton("pluginDescriptor", pluginDescriptor.toPluginDescriptor()); + beanFactory.registerSingleton("mainApplicationContext", context.getMainApplicationContext()); + MainEnvironmentProvider mainEnvironmentProvider = null; if(context.runMode() == ProcessorContext.RunMode.ONESELF){ beanFactory.registerSingleton("integrationConfiguration", new AutoIntegrationConfiguration()); applicationContext.registerBean(ExtendPointConfiguration.class); + mainEnvironmentProvider = new EmptyMainEnvironmentProvider(); + } else { + mainEnvironmentProvider = new DefaultMainEnvironmentProvider(context.getMainApplicationContext()); } + beanFactory.registerSingleton("mainEnvironmentProvider", mainEnvironmentProvider); } @Override diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/InvokeOtherPluginProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/InvokeOtherPluginProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/InvokeOtherPluginProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/InvokeOtherPluginProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorContext.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorContext.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorContext.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorContext.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorException.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorException.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorException.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/ProcessorException.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/SpringPluginProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/SpringPluginProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/SpringPluginProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/SpringPluginProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegister.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegister.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegister.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegister.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistration.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistration.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistration.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistration.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistry.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistry.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistry.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/interceptor/PluginInterceptorRegistry.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeBeanFactory.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeBeanFactory.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeBeanFactory.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeBeanFactory.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeProxyHandler.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeProxyHandler.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeProxyHandler.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/invoke/InvokeProxyHandler.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/scanner/PluginClassPathBeanDefinitionScanner.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/scanner/PluginClassPathBeanDefinitionScanner.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/scanner/PluginClassPathBeanDefinitionScanner.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/scanner/PluginClassPathBeanDefinitionScanner.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginControllerProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginControllerProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginControllerProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginControllerProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginInterceptorsProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginInterceptorsProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginInterceptorsProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginInterceptorsProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginSpringDocControllerProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginSpringDocControllerProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginSpringDocControllerProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginSpringDocControllerProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginStaticResourceProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginStaticResourceProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginStaticResourceProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/PluginStaticResourceProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/PluginThymeleafProcessor.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/PluginThymeleafProcessor.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/PluginThymeleafProcessor.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/PluginThymeleafProcessor.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/ThymeleafConfigParse.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/ThymeleafConfigParse.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/ThymeleafConfigParse.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/processor/web/thymeleaf/ThymeleafConfigParse.java diff --git a/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/DefaultMainEnvironmentProvider.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/DefaultMainEnvironmentProvider.java new file mode 100644 index 0000000000000000000000000000000000000000..8487d3664dd6c607272685cccc47dd56471c2aaf --- /dev/null +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/DefaultMainEnvironmentProvider.java @@ -0,0 +1,123 @@ +/** + * Copyright [2019-2022] [starBlues] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.gitee.starblues.bootstrap.realize; + +import com.gitee.starblues.loader.utils.ObjectUtils; +import com.gitee.starblues.spring.MainApplicationContext; + +import java.util.Map; +import java.util.function.Function; + +/** + * 主程序配置信息提供者默认实现 + * + * @author starBlues + * @version 3.0.0 + */ +public class DefaultMainEnvironmentProvider implements MainEnvironmentProvider{ + + private final MainApplicationContext mainApplicationContext; + + public DefaultMainEnvironmentProvider(MainApplicationContext mainApplicationContext) { + this.mainApplicationContext = mainApplicationContext; + } + + @Override + public Object getValue(String name) { + Map> configurableEnvironment = mainApplicationContext.getConfigurableEnvironment(); + if(ObjectUtils.isEmpty(configurableEnvironment)){ + return null; + } + for (Map.Entry> entry : configurableEnvironment.entrySet()) { + Map value = entry.getValue(); + Object o = value.get(name); + if(o != null){ + return o; + } + } + return null; + } + + @Override + public String getString(String name) { + return getValue(name, String::valueOf); + } + + @Override + public Integer getInteger(String name) { + return getValue(name, value -> { + if(value instanceof Integer){ + return (Integer) value; + } + return Integer.parseInt(String.valueOf(value)); + }); + } + + @Override + public Long getLong(String name) { + return getValue(name, value -> { + if(value instanceof Long){ + return (Long) value; + } + return Long.parseLong(String.valueOf(value)); + }); + } + + @Override + public Double getDouble(String name) { + return getValue(name, value -> { + if(value instanceof Double){ + return (Double) value; + } + return Double.parseDouble(String.valueOf(value)); + }); + } + + @Override + public Float getFloat(String name) { + return getValue(name, value -> { + if(value instanceof Float){ + return (Float) value; + } + return Float.parseFloat(String.valueOf(value)); + }); + } + + @Override + public Boolean getBoolean(String name) { + return getValue(name, value -> { + if(value instanceof Boolean){ + return (Boolean) value; + } + return Boolean.parseBoolean(String.valueOf(value)); + }); + } + + @Override + public Map> getAll() { + return mainApplicationContext.getConfigurableEnvironment(); + } + + private T getValue(String name, Function function){ + Object value = getValue(name); + if(value == null){ + return null; + } + return function.apply(value); + } + +} diff --git a/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/EmptyMainEnvironmentProvider.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/EmptyMainEnvironmentProvider.java new file mode 100644 index 0000000000000000000000000000000000000000..8180226fff2cf9e92bb7b7ba1e5fd56c0ca417c0 --- /dev/null +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/EmptyMainEnvironmentProvider.java @@ -0,0 +1,68 @@ +/** + * Copyright [2019-2022] [starBlues] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.gitee.starblues.bootstrap.realize; + +import java.util.Collections; +import java.util.Map; + +/** + * 主程序配置信息提供者空值实现 + * + * @author starBlues + * @version 3.0.0 + */ +public class EmptyMainEnvironmentProvider implements MainEnvironmentProvider{ + @Override + public Object getValue(String name) { + return null; + } + + @Override + public String getString(String name) { + return null; + } + + @Override + public Integer getInteger(String name) { + return null; + } + + @Override + public Long getLong(String name) { + return null; + } + + @Override + public Double getDouble(String name) { + return null; + } + + @Override + public Float getFloat(String name) { + return null; + } + + @Override + public Boolean getBoolean(String name) { + return null; + } + + @Override + public Map> getAll() { + return Collections.emptyMap(); + } +} diff --git a/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/MainEnvironmentProvider.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/MainEnvironmentProvider.java new file mode 100644 index 0000000000000000000000000000000000000000..ea68a164bec6f04e3b4c5e32c73b51c1f778c8b6 --- /dev/null +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/MainEnvironmentProvider.java @@ -0,0 +1,84 @@ +/** + * Copyright [2019-2022] [starBlues] + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.gitee.starblues.bootstrap.realize; + +import java.util.Map; + +/** + * 主程序配置信息提供者 + * + * @author starBlues + * @version 3.0.0 + */ +public interface MainEnvironmentProvider { + + /** + * 根据名称获取配置值 + * @param name 配置名称 + * @return 配置值 + */ + Object getValue(String name); + + /** + * 根据名称获取 String 类型配置值 + * @param name 配置名称 + * @return 配置值 + */ + String getString(String name); + + /** + * 根据名称获取 Integer 类型配置值 + * @param name 配置名称 + * @return 配置值 + */ + Integer getInteger(String name); + + /** + * 根据名称获取 Long 类型配置值 + * @param name 配置名称 + * @return 配置值 + */ + Long getLong(String name); + + /** + * 根据名称获取 Double 类型配置值 + * @param name 配置名称 + * @return 配置值 + */ + Double getDouble(String name); + + /** + * 根据名称获取 Float 类型配置值 + * @param name 配置名称 + * @return 配置值 + */ + Float getFloat(String name); + + /** + * 根据名称获取 Boolean 类型配置值 + * @param name 配置名称 + * @return 配置值 + */ + Boolean getBoolean(String name); + + /** + * 获取所有配置集合 + * @return Map + */ + Map> getAll(); + +} diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/PluginCloseListener.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/PluginCloseListener.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/PluginCloseListener.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/PluginCloseListener.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/StopValidator.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/StopValidator.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/StopValidator.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/realize/StopValidator.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/AnnotationUtils.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/AnnotationUtils.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/AnnotationUtils.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/AnnotationUtils.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/DestroyUtils.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/DestroyUtils.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/DestroyUtils.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/DestroyUtils.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/ProcessorUtils.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/ProcessorUtils.java similarity index 100% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/ProcessorUtils.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/ProcessorUtils.java diff --git a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/SpringBeanUtils.java b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/SpringBeanUtils.java similarity index 99% rename from springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/SpringBeanUtils.java rename to spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/SpringBeanUtils.java index ceb1987b292b587135156b2618e4a96c6a0427d0..db039fbfc9bd59a05b63f0da3cef5d0206114caa 100644 --- a/springboot-plugin-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/SpringBeanUtils.java +++ b/spring-brick-bootstrap/src/main/java/com/gitee/starblues/bootstrap/utils/SpringBeanUtils.java @@ -92,7 +92,7 @@ public class SpringBeanUtils { * 通过注解获取bean * @param applicationContext applicationContext * @param annotationType 注解类型 - * @return List + * @return List */ public static List getBeansWithAnnotation(ApplicationContext applicationContext, Class annotationType){ diff --git a/spring-plugin-framework-common/pom.xml b/spring-brick-common/pom.xml similarity index 48% rename from spring-plugin-framework-common/pom.xml rename to spring-brick-common/pom.xml index 07b3ef30649b30a4ba2313b264f3ac9baf3e9dd3..90be99fd61909125b5a3fd5b325a14af3153afbb 100644 --- a/spring-plugin-framework-common/pom.xml +++ b/spring-brick-common/pom.xml @@ -4,9 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.gitee.starblues - spring-plugin-framework-common - 3.0.0-alpha + + spring-brick-parent + com.gitee.starblues + 3.0.0 + + + spring-brick-common jar @@ -15,19 +19,4 @@ 3.8.1 - - - - - org.apache.maven.plugins - maven-compiler-plugin - ${maven-compiler-plugin.version} - - ${java.version} - ${java.version} - - - - - \ No newline at end of file diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/AbstractDependencyPlugin.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/AbstractDependencyPlugin.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/AbstractDependencyPlugin.java rename to spring-brick-common/src/main/java/com/gitee/starblues/common/AbstractDependencyPlugin.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/Constants.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/Constants.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/Constants.java rename to spring-brick-common/src/main/java/com/gitee/starblues/common/Constants.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/DependencyPlugin.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/DependencyPlugin.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/DependencyPlugin.java rename to spring-brick-common/src/main/java/com/gitee/starblues/common/DependencyPlugin.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/ManifestKey.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/ManifestKey.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/ManifestKey.java rename to spring-brick-common/src/main/java/com/gitee/starblues/common/ManifestKey.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/PackageStructure.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/PackageStructure.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/PackageStructure.java rename to spring-brick-common/src/main/java/com/gitee/starblues/common/PackageStructure.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/PackageType.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/PackageType.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/PackageType.java rename to spring-brick-common/src/main/java/com/gitee/starblues/common/PackageType.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/PluginDescriptorKey.java b/spring-brick-common/src/main/java/com/gitee/starblues/common/PluginDescriptorKey.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/common/PluginDescriptorKey.java rename to spring-brick-common/src/main/java/com/gitee/starblues/common/PluginDescriptorKey.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/Assert.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/Assert.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/Assert.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/Assert.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/CompareClassTypeUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/CompareClassTypeUtils.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/CompareClassTypeUtils.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/CompareClassTypeUtils.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/FieldFilter.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/FieldFilter.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/FieldFilter.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/FieldFilter.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/FilesUtils.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ObjectUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/ObjectUtils.java similarity index 98% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ObjectUtils.java rename to spring-brick-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-brick-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/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/PropertiesUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/PropertiesUtils.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/PropertiesUtils.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/PropertiesUtils.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ReflectionUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/ReflectionUtils.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ReflectionUtils.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/ReflectionUtils.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/ResourceUtils.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/StringUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/StringUtils.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/StringUtils.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/StringUtils.java diff --git a/spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/UrlUtils.java b/spring-brick-common/src/main/java/com/gitee/starblues/utils/UrlUtils.java similarity index 100% rename from spring-plugin-framework-common/src/main/java/com/gitee/starblues/utils/UrlUtils.java rename to spring-brick-common/src/main/java/com/gitee/starblues/utils/UrlUtils.java diff --git a/springboot-plugin-framework-loader/pom.xml b/spring-brick-loader/pom.xml similarity index 69% rename from springboot-plugin-framework-loader/pom.xml rename to spring-brick-loader/pom.xml index d2a4a044ee0ed336a682fd2a99aac587e449862c..8159265ea799e8d748a4d58b16bfab6e58b57a71 100644 --- a/springboot-plugin-framework-loader/pom.xml +++ b/spring-brick-loader/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - springboot-plugin-framework-parent + spring-brick-parent com.gitee.starblues - 3.0.0-alpha + 3.0.0 4.0.0 - springboot-plugin-framework-loader + spring-brick-loader diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/PluginResourceStorage.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/PluginResourceStorage.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/PluginResourceStorage.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/PluginResourceStorage.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/archive/Archive.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/archive/Archive.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/archive/Archive.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/archive/Archive.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/archive/ExplodedArchive.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/archive/ExplodedArchive.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/archive/ExplodedArchive.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/archive/ExplodedArchive.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/archive/JarFileArchive.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/archive/JarFileArchive.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/archive/JarFileArchive.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/archive/JarFileArchive.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/GenericClassLoader.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/GenericClassLoader.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/GenericClassLoader.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/GenericClassLoader.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/ExcludeResource.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/ExcludeResource.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/ExcludeResource.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/ExcludeResource.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/IncludeResource.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/IncludeResource.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/IncludeResource.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/filter/IncludeResource.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/Resource.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/Resource.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/Resource.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/Resource.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/ResourceByteGetter.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/ResourceByteGetter.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/ResourceByteGetter.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/ResourceByteGetter.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/AbstractResourceLoader.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/AbstractResourceLoader.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/AbstractResourceLoader.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/AbstractResourceLoader.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ClassPathLoader.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ClassPathLoader.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ClassPathLoader.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ClassPathLoader.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResource.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResource.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResource.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResource.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResourceLoaderFactory.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResourceLoaderFactory.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResourceLoaderFactory.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/DefaultResourceLoaderFactory.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/JarResourceLoader.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/JarResourceLoader.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/JarResourceLoader.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/JarResourceLoader.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoader.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoader.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoader.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoader.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoaderFactory.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoaderFactory.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoaderFactory.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/loader/ResourceLoaderFactory.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/CacheResourceStorage.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/CacheResourceStorage.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/CacheResourceStorage.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/CacheResourceStorage.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/DefaultResourceStorage.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/DefaultResourceStorage.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/DefaultResourceStorage.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/DefaultResourceStorage.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ResourceStorage.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ResourceStorage.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ResourceStorage.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ResourceStorage.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/SameRootResourceStorage.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/SameRootResourceStorage.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/SameRootResourceStorage.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/SameRootResourceStorage.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ShareResourceStorage.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ShareResourceStorage.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ShareResourceStorage.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/classloader/resource/storage/ShareResourceStorage.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/AbstractJarFile.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/AbstractJarFile.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/AbstractJarFile.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/AbstractJarFile.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/AsciiBytes.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/AsciiBytes.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/AsciiBytes.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/AsciiBytes.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/Bytes.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/Bytes.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/Bytes.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/Bytes.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryEndRecord.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryEndRecord.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryEndRecord.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryEndRecord.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryFileHeader.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryFileHeader.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryFileHeader.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryFileHeader.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryParser.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryParser.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryParser.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryParser.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryVisitor.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryVisitor.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryVisitor.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/CentralDirectoryVisitor.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/FileHeader.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/FileHeader.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/FileHeader.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/FileHeader.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/Handler.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/Handler.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/Handler.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/Handler.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntry.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntry.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntry.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntry.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryCertification.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryCertification.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryCertification.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryCertification.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryFilter.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryFilter.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryFilter.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarEntryFilter.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarFile.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarFile.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarFile.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarFile.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileEntries.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileEntries.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileEntries.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileEntries.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileWrapper.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileWrapper.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileWrapper.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarFileWrapper.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarURLConnection.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarURLConnection.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/JarURLConnection.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/JarURLConnection.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessData.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessData.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessData.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessData.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessDataFile.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessDataFile.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessDataFile.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/RandomAccessDataFile.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/StringSequence.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/StringSequence.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/StringSequence.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/StringSequence.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/ZipInflaterInputStream.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/ZipInflaterInputStream.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/jar/ZipInflaterInputStream.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/jar/ZipInflaterInputStream.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/AbstractLauncher.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/AbstractLauncher.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/AbstractLauncher.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/AbstractLauncher.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/Launcher.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/Launcher.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/Launcher.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/Launcher.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/MainJarProgramLauncher.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/MainJarProgramLauncher.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/MainJarProgramLauncher.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/MainJarProgramLauncher.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/MainProgramLauncher.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/MainProgramLauncher.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/MainProgramLauncher.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/MainProgramLauncher.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/ResourceLoaderFactoryGetter.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/ResourceLoaderFactoryGetter.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/ResourceLoaderFactoryGetter.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/ResourceLoaderFactoryGetter.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringBootstrap.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringBootstrap.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringBootstrap.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringBootstrap.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainBootstrap.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainBootstrap.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainBootstrap.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainBootstrap.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainProdBootstrap.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainProdBootstrap.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainProdBootstrap.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/SpringMainProdBootstrap.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MainMethodRunner.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MainMethodRunner.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MainMethodRunner.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MainMethodRunner.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MethodRunner.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MethodRunner.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MethodRunner.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/launcher/runner/MethodRunner.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/Assert.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/Assert.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/Assert.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/Assert.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/CompareClassTypeUtils.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/CompareClassTypeUtils.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/CompareClassTypeUtils.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/CompareClassTypeUtils.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/IOUtils.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/IOUtils.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/IOUtils.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/IOUtils.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/ObjectUtils.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/ObjectUtils.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/ObjectUtils.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/ObjectUtils.java diff --git a/springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/ResourceUtils.java b/spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/ResourceUtils.java similarity index 100% rename from springboot-plugin-framework-loader/src/main/java/com/gitee/starblues/loader/utils/ResourceUtils.java rename to spring-brick-loader/src/main/java/com/gitee/starblues/loader/utils/ResourceUtils.java diff --git a/springboot-plugin-maven-packager/pom.xml b/spring-brick-maven-packager/pom.xml similarity index 77% rename from springboot-plugin-maven-packager/pom.xml rename to spring-brick-maven-packager/pom.xml index 0ee35f82c6e74c5289a28d66b1033843895aad78..0aebe4dc57a63dfc15963cc40a36572a9faae75c 100644 --- a/springboot-plugin-maven-packager/pom.xml +++ b/spring-brick-maven-packager/pom.xml @@ -4,9 +4,16 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - com.gitee.starblues - springboot-plugin-maven-packager - 3.0.0-alpha + + spring-brick-parent + com.gitee.starblues + 3.0.0 + + + spring-brick-maven-packager + jar + + 打包插件 8 @@ -31,7 +38,7 @@ com.gitee.starblues - spring-plugin-framework-common + spring-brick-common ${project.version} @@ -81,25 +88,6 @@ maven-plugin-plugin ${maven-plugin-plugin.version} - - org.apache.maven.plugins - maven-shade-plugin - - - - com.gitee.starblues:spring-plugin-framework-common - - - - - - package - - shade - - - - \ No newline at end of file diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractDependencyFilterMojo.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractDependencyFilterMojo.java similarity index 96% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractDependencyFilterMojo.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractDependencyFilterMojo.java index 8342027b0e5f77920793d8374f9bc73c863fb3a6..42e0e14658cb59a5baa57a439cdc78572813f02d 100644 --- a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractDependencyFilterMojo.java +++ b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractDependencyFilterMojo.java @@ -47,10 +47,10 @@ import java.util.Set; public abstract class AbstractDependencyFilterMojo extends AbstractMojo { - @Parameter(property = "springboot-plugin.includes") + @Parameter(property = "spring-brick-packager.includes") private List includes; - @Parameter(property = "springboot-plugin.excludes") + @Parameter(property = "spring-brick-packager.excludes") private List excludes; diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractPackagerMojo.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractPackagerMojo.java similarity index 88% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractPackagerMojo.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractPackagerMojo.java index 5b8b2f083888952ef660de2b13cc76788dfc45ca..f169726e23a54ab8a0ac626da84f0588b15f66e3 100644 --- a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractPackagerMojo.java +++ b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/AbstractPackagerMojo.java @@ -42,16 +42,16 @@ public abstract class AbstractPackagerMojo extends AbstractDependencyFilterMojo{ @Parameter(defaultValue = "${project.build.directory}", required = true) private File outputDirectory; - @Parameter(property = "springboot-plugin.mode", defaultValue = "dev", required = true) + @Parameter(property = "spring-brick-packager.mode", defaultValue = "dev", required = true) private String mode; - @Parameter(property = "springboot-plugin.skip", defaultValue = "false") + @Parameter(property = "spring-brick-packager.skip", defaultValue = "false") private boolean skip; - @Parameter(property = "springboot-plugin.pluginInfo") + @Parameter(property = "spring-brick-packager.pluginInfo") private PluginInfo pluginInfo; - @Parameter(property = "springboot-plugin.loadMainResourcePattern", required = false) + @Parameter(property = "spring-brick-packager.loadMainResourcePattern", required = false) private LoadMainResourcePattern loadMainResourcePattern; @Override diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/BasicRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/BasicRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/BasicRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/BasicRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Constant.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Dependency.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Dependency.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Dependency.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Dependency.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/DependencyPlugin.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/DependencyPlugin.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/DependencyPlugin.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/DependencyPlugin.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadMainResourcePattern.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadMainResourcePattern.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadMainResourcePattern.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadMainResourcePattern.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadToMain.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadToMain.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadToMain.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/LoadToMain.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/PluginInfo.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/PluginInfo.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/PluginInfo.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/PluginInfo.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java similarity index 93% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java index 806bf5e0221125719459dfaffa1a3db62f783447..5166f795aba89e0c76abddd61a208bba275a9d68 100644 --- a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java +++ b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/RepackageMojo.java @@ -49,16 +49,16 @@ import java.util.Set; public class RepackageMojo extends AbstractPackagerMojo { - @Parameter(property = "springboot-plugin.devConfig") + @Parameter(property = "spring-brick-packager.devConfig") private DevConfig devConfig; - @Parameter(property = "springboot-plugin.prodConfig") + @Parameter(property = "spring-brick-packager.prodConfig") private ProdConfig prodConfig; - @Parameter(property = "springboot-plugin.mainConfig") + @Parameter(property = "spring-brick-packager.mainConfig") private MainConfig mainConfig; - @Parameter(property = "springboot-plugin.mainLoad") + @Parameter(property = "spring-brick-packager.mainLoad") private LoadToMain loadToMain; private final Set loadToMainSet = new HashSet<>(); diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Repackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Repackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Repackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/Repackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/Dependency.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/Dependency.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/Dependency.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/Dependency.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevConfig.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevConfig.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevConfig.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevConfig.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/dev/DevRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/DependencyFilter.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/DependencyFilter.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/DependencyFilter.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/DependencyFilter.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Exclude.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Exclude.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Exclude.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Exclude.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/ExcludeFilter.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/ExcludeFilter.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/ExcludeFilter.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/ExcludeFilter.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/FilterableDependency.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/FilterableDependency.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/FilterableDependency.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/FilterableDependency.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Include.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Include.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Include.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/Include.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/IncludeFilter.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/IncludeFilter.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/IncludeFilter.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/filter/IncludeFilter.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarNestPackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarNestPackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarNestPackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarNestPackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarOuterPackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarOuterPackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarOuterPackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/JarOuterPackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainConfig.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainConfig.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainConfig.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainConfig.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/main/MainRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/DirProdRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/DirProdRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/DirProdRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/DirProdRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarNestedProdRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarNestedProdRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarNestedProdRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarNestedProdRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarOuterProdRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarOuterProdRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarOuterProdRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/JarOuterProdRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdConfig.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdConfig.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdConfig.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdConfig.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ProdRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipOuterProdRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipOuterProdRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipOuterProdRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipOuterProdRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipProdRepackager.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipProdRepackager.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipProdRepackager.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/prod/ZipProdRepackager.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/CommonUtils.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageJar.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageJar.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageJar.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageJar.java diff --git a/springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageZip.java b/spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageZip.java similarity index 100% rename from springboot-plugin-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageZip.java rename to spring-brick-maven-packager/src/main/java/com/gitee/starblues/plugin/pack/utils/PackageZip.java diff --git a/springboot-plugin-maven-packager/src/main/resources/META-INF/maven/com.gitee.starblues.springboot-plugin-maven-packager/plugin-help.xml b/spring-brick-maven-packager/src/main/resources/META-INF/maven/com.gitee.starblues.springboot-plugin-maven-packager/plugin-help.xml similarity index 98% rename from springboot-plugin-maven-packager/src/main/resources/META-INF/maven/com.gitee.starblues.springboot-plugin-maven-packager/plugin-help.xml rename to spring-brick-maven-packager/src/main/resources/META-INF/maven/com.gitee.starblues.springboot-plugin-maven-packager/plugin-help.xml index 9a06007dea7d45872f2d82b569888d5d52dc5f2e..b3fd6271d4fe96579d2303ea62cfdea7e0deda74 100644 --- a/springboot-plugin-maven-packager/src/main/resources/META-INF/maven/com.gitee.starblues.springboot-plugin-maven-packager/plugin-help.xml +++ b/spring-brick-maven-packager/src/main/resources/META-INF/maven/com.gitee.starblues.springboot-plugin-maven-packager/plugin-help.xml @@ -5,9 +5,9 @@ Spring Boot Plugin Maven Packager com.gitee.starblues - springboot-plugin-maven-packager - 3.0.0-alpha - springboot-plugin + spring-brick-maven-packager + 3.0.0 + spring-brick-packager false true diff --git a/springboot-plugin-maven-packager/src/main/resources/META-INF/maven/plugin.xml b/spring-brick-maven-packager/src/main/resources/META-INF/maven/plugin.xml similarity index 98% rename from springboot-plugin-maven-packager/src/main/resources/META-INF/maven/plugin.xml rename to spring-brick-maven-packager/src/main/resources/META-INF/maven/plugin.xml index 9a06007dea7d45872f2d82b569888d5d52dc5f2e..b3fd6271d4fe96579d2303ea62cfdea7e0deda74 100644 --- a/springboot-plugin-maven-packager/src/main/resources/META-INF/maven/plugin.xml +++ b/spring-brick-maven-packager/src/main/resources/META-INF/maven/plugin.xml @@ -5,9 +5,9 @@ Spring Boot Plugin Maven Packager com.gitee.starblues - springboot-plugin-maven-packager - 3.0.0-alpha - springboot-plugin + spring-brick-maven-packager + 3.0.0 + spring-brick-packager false true diff --git a/springboot-plugin-framework/pom.xml b/spring-brick/pom.xml similarity index 38% rename from springboot-plugin-framework/pom.xml rename to spring-brick/pom.xml index 4c832fe19391cfc09e2222d47d3aa0ca8554103e..e32cc26352fabe264d35cac840b23bc2f085fef3 100644 --- a/springboot-plugin-framework/pom.xml +++ b/spring-brick/pom.xml @@ -5,66 +5,24 @@ 4.0.0 - springboot-plugin-framework-parent + spring-brick-parent com.gitee.starblues - 3.0.0-alpha + 3.0.0 - springboot-plugin-framework + spring-brick jar - 3.0.0-alpha spring boot 插件式开发集成包 - - - - The Apache Software License, Version 2.0 - http://www.apache.org/licenses/LICENSE-2.0.txt - repo - - - - - https://gitee.com/starblues/springboot-plugin-framework-parent - scm:https://gitee.com/starblues/springboot-plugin-framework-parent.git - scm:https://gitee.com/starblues/springboot-plugin-framework-parent.git - 1.0 - - - - - sonatype-nexus-snapshots - oss Snapshots Repository - https://oss.sonatype.org/content/repositories/snapshots - - - sonatype-nexus-staging - oss Staging Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - - - - - - StarBlues - starblues@foxmail.com - https://gitee.com/starblues/ - - - - 3.1.0 - 3.1.0 - 3.1.0 - 1.6 - 2.10.1 1.7.7 2.11.0 5.3.12 2.5.6 + 3.0.12.RELEASE 2.10.5 1.5.2 4.0.1 @@ -74,6 +32,16 @@ + + com.gitee.starblues + spring-brick-common + ${project.version} + + + com.gitee.starblues + spring-brick-loader + ${project.version} + org.slf4j slf4j-api @@ -89,16 +57,6 @@ java-semver ${java-semver.version} - - com.gitee.starblues - spring-plugin-framework-common - ${project.version} - - - com.gitee.starblues - springboot-plugin-framework-loader - ${project.version} - org.springframework.boot spring-boot @@ -116,7 +74,7 @@ org.thymeleaf thymeleaf-spring5 - 3.0.12.RELEASE + ${thymeleaf-spring5.version} provided true @@ -156,127 +114,4 @@ - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - com.gitee.starblues:spring-plugin-framework-common - - - - - - package - - shade - - - - - - - org.apache.maven.plugins - maven-assembly-plugin - ${maven-assembly-plugin.version} - - - jar-with-dependencies - - ${project.artifactId}-${project.version} - false - false - - - true - true - - - - - - make-assembly - package - - single - - - - - - - org.apache.maven.plugins - maven-source-plugin - ${maven-source-plugin.version} - - - package - - jar-no-fork - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - ${maven-javadoc-plugin.version} - - ${plugin.skip} - - - - package - - jar - - - - - - - org.apache.maven.plugins - maven-gpg-plugin - ${maven-gpg-plugin.version} - - ${plugin.skip} - - - - sign-artifacts - verify - - sign - - - - - - - - - - dev - - true - - - true - - - - - release - - false - - - - - \ No newline at end of file diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/annotation/Caller.java b/spring-brick/src/main/java/com/gitee/starblues/annotation/Caller.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/annotation/Caller.java rename to spring-brick/src/main/java/com/gitee/starblues/annotation/Caller.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/annotation/Extract.java b/spring-brick/src/main/java/com/gitee/starblues/annotation/Extract.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/annotation/Extract.java rename to spring-brick/src/main/java/com/gitee/starblues/annotation/Extract.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/annotation/Supplier.java b/spring-brick/src/main/java/com/gitee/starblues/annotation/Supplier.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/annotation/Supplier.java rename to spring-brick/src/main/java/com/gitee/starblues/annotation/Supplier.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/DefaultPluginInsideInfo.java b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginInsideInfo.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/DefaultPluginInsideInfo.java rename to spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginInsideInfo.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java similarity index 99% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java rename to spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java index 580378ece11d5cb444d5c205445ade8891df2e4f..50b3e555289776fdd2ffbb45608fa352a85e0b6e 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultPluginManager.java @@ -131,6 +131,7 @@ public class DefaultPluginManager implements PluginManager{ warn.append(i + 1).append(". ").append(pluginRootDirs.get(i)).append("\n"); } warn.append("请检查路径是否合适.\n"); + warn.append("请检查配置[plugin.runMode]是否合适.\n"); if(provider.getRuntimeMode() == RuntimeMode.DEV){ warn.append("请检查插件包是否编译.\n"); } else { diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java b/spring-brick/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java rename to spring-brick/src/main/java/com/gitee/starblues/core/DefaultRealizeProvider.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginInfo.java b/spring-brick/src/main/java/com/gitee/starblues/core/PluginInfo.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginInfo.java rename to spring-brick/src/main/java/com/gitee/starblues/core/PluginInfo.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginInfoFace.java b/spring-brick/src/main/java/com/gitee/starblues/core/PluginInfoFace.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginInfoFace.java rename to spring-brick/src/main/java/com/gitee/starblues/core/PluginInfoFace.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginInsideInfo.java b/spring-brick/src/main/java/com/gitee/starblues/core/PluginInsideInfo.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginInsideInfo.java rename to spring-brick/src/main/java/com/gitee/starblues/core/PluginInsideInfo.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java b/spring-brick/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java similarity index 98% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java rename to spring-brick/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java index d825433d2acdcd2c2bad65cc0a0936d8d945c1cb..432fcf62d4c2491517c7f42f5ffe67eea0441b3d 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/PluginLauncherManager.java @@ -60,9 +60,7 @@ public class PluginLauncherManager extends DefaultPluginManager{ GenericApplicationContext applicationContext, IntegrationConfiguration configuration) { super(realizeProvider, configuration); - this.mainApplicationContext = new MainApplicationContextProxy( - applicationContext.getBeanFactory(), - applicationContext); + this.mainApplicationContext = new MainApplicationContextProxy(applicationContext, applicationContext); this.mainGenericApplicationContext = applicationContext; this.configuration = configuration; this.invokeSupperCache = new DefaultInvokeSupperCache(); diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginManager.java b/spring-brick/src/main/java/com/gitee/starblues/core/PluginManager.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginManager.java rename to spring-brick/src/main/java/com/gitee/starblues/core/PluginManager.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginState.java b/spring-brick/src/main/java/com/gitee/starblues/core/PluginState.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/PluginState.java rename to spring-brick/src/main/java/com/gitee/starblues/core/PluginState.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/RealizeProvider.java b/spring-brick/src/main/java/com/gitee/starblues/core/RealizeProvider.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/RealizeProvider.java rename to spring-brick/src/main/java/com/gitee/starblues/core/RealizeProvider.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/RuntimeMode.java b/spring-brick/src/main/java/com/gitee/starblues/core/RuntimeMode.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/RuntimeMode.java rename to spring-brick/src/main/java/com/gitee/starblues/core/RuntimeMode.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/ComposePluginBasicChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/ComposePluginBasicChecker.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/ComposePluginBasicChecker.java rename to spring-brick/src/main/java/com/gitee/starblues/core/checker/ComposePluginBasicChecker.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/ComposePluginLauncherChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/ComposePluginLauncherChecker.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/ComposePluginLauncherChecker.java rename to spring-brick/src/main/java/com/gitee/starblues/core/checker/ComposePluginLauncherChecker.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/DefaultPluginBasicChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginBasicChecker.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/DefaultPluginBasicChecker.java rename to spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginBasicChecker.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java rename to spring-brick/src/main/java/com/gitee/starblues/core/checker/DefaultPluginLauncherChecker.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/DependencyPluginLauncherChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/DependencyPluginLauncherChecker.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/DependencyPluginLauncherChecker.java rename to spring-brick/src/main/java/com/gitee/starblues/core/checker/DependencyPluginLauncherChecker.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/PluginBasicChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/PluginBasicChecker.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/PluginBasicChecker.java rename to spring-brick/src/main/java/com/gitee/starblues/core/checker/PluginBasicChecker.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/PluginLauncherChecker.java b/spring-brick/src/main/java/com/gitee/starblues/core/checker/PluginLauncherChecker.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/checker/PluginLauncherChecker.java rename to spring-brick/src/main/java/com/gitee/starblues/core/checker/PluginLauncherChecker.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/CacheMainResourceMatcher.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/CacheMainResourceMatcher.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/CacheMainResourceMatcher.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/CacheMainResourceMatcher.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/DefaultMainResourceMatcher.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/DefaultMainResourceMatcher.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/DefaultMainResourceMatcher.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/DefaultMainResourceMatcher.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/EmptyMainResourcePatternDefiner.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/EmptyMainResourcePatternDefiner.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/EmptyMainResourcePatternDefiner.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/EmptyMainResourcePatternDefiner.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/MainResourceMatcher.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/MainResourceMatcher.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/MainResourceMatcher.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/MainResourceMatcher.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/MainResourcePatternDefiner.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/MainResourcePatternDefiner.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/MainResourcePatternDefiner.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/MainResourcePatternDefiner.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/NestedPluginJarResourceLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/NestedPluginJarResourceLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/NestedPluginJarResourceLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/NestedPluginJarResourceLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/PluginClassLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/PluginClassLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/PluginClassLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/PluginClassLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/ProhibitMainResourceMatcher.java b/spring-brick/src/main/java/com/gitee/starblues/core/classloader/ProhibitMainResourceMatcher.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/classloader/ProhibitMainResourceMatcher.java rename to spring-brick/src/main/java/com/gitee/starblues/core/classloader/ProhibitMainResourceMatcher.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/AbstractPluginDescriptorLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ComposeDescriptorLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DefaultDependencyPlugin.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DefaultDependencyPlugin.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DefaultDependencyPlugin.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DefaultDependencyPlugin.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DefaultInsidePluginDescriptor.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DefaultInsidePluginDescriptor.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DefaultInsidePluginDescriptor.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DefaultInsidePluginDescriptor.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DefaultPluginDescriptor.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DefaultPluginDescriptor.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DefaultPluginDescriptor.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DefaultPluginDescriptor.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/DevPluginDescriptorLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/InsidePluginDescriptor.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/InsidePluginDescriptor.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/InsidePluginDescriptor.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/InsidePluginDescriptor.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptor.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptor.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptor.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptor.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptorLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptorLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginDescriptorLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginLibInfo.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginLibInfo.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginLibInfo.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginLibInfo.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginResourcesConfig.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginResourcesConfig.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginResourcesConfig.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginResourcesConfig.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginType.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginType.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/PluginType.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/PluginType.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ProdDirPluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdDirPluginDescriptorLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ProdDirPluginDescriptorLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdDirPluginDescriptorLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPackagePluginDescriptorLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java b/spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java rename to spring-brick/src/main/java/com/gitee/starblues/core/descriptor/ProdPluginDescriptorLoader.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/exception/PluginDisabledException.java b/spring-brick/src/main/java/com/gitee/starblues/core/exception/PluginDisabledException.java similarity index 94% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/exception/PluginDisabledException.java rename to spring-brick/src/main/java/com/gitee/starblues/core/exception/PluginDisabledException.java index 70251b7298e5b95a75125bf98140005966330a73..25a6bb52e5bb84984f9f1e2dca14d63162e75893 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/exception/PluginDisabledException.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/exception/PluginDisabledException.java @@ -39,9 +39,12 @@ public class PluginDisabledException extends PluginException { + (!ObjectUtils.isEmpty(opType) ? opType : "操作")); } + /** * 检查插件是否被禁用 - * @param pluginInsideInfo PluginInfo + * @param pluginInsideInfo 插件信息 + * @param configuration 集成配置 + * @param opType 操作类型 */ public static void checkDisabled(PluginInfo pluginInsideInfo, IntegrationConfiguration configuration, String opType){ if(pluginInsideInfo.getPluginState() == PluginState.DISABLED diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/exception/PluginException.java b/spring-brick/src/main/java/com/gitee/starblues/core/exception/PluginException.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/exception/PluginException.java rename to spring-brick/src/main/java/com/gitee/starblues/core/exception/PluginException.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/exception/PluginProhibitStopException.java b/spring-brick/src/main/java/com/gitee/starblues/core/exception/PluginProhibitStopException.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/exception/PluginProhibitStopException.java rename to spring-brick/src/main/java/com/gitee/starblues/core/exception/PluginProhibitStopException.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/JavaMainResourcePatternDefiner.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/JavaMainResourcePatternDefiner.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/JavaMainResourcePatternDefiner.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/JavaMainResourcePatternDefiner.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/BasicMainResourcePatternDefiner.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/BasicMainResourcePatternDefiner.java similarity index 89% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/BasicMainResourcePatternDefiner.java rename to spring-brick/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/spring-brick/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/CacheRegistryInfo.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/CacheRegistryInfo.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/CacheRegistryInfo.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/CacheRegistryInfo.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/DefaultPluginInteractive.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/DefaultPluginInteractive.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/DefaultPluginInteractive.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/DefaultPluginInteractive.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginInteractive.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginInteractive.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginInteractive.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginInteractive.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginLauncher.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMainResourcePatternDefiner.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMainResourcePatternDefiner.java similarity index 97% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMainResourcePatternDefiner.java rename to spring-brick/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/spring-brick/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 } } + + } diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMethodRunner.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMethodRunner.java similarity index 93% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMethodRunner.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMethodRunner.java index 9515cdfdcb87353c71a2baac2f88796e637c3dc8..c5d12d4add3ba48709865563d5d1712f5b81e9eb 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMethodRunner.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/PluginMethodRunner.java @@ -79,8 +79,14 @@ public class PluginMethodRunner extends MethodRunner { } catch (Exception e){ String error = "Invoke failure: " + ReflectionUtils.methodToString(runClass, runMethodName, runMethod.getParameterTypes()) - + ". " + e.getMessage(); - logger.error(error, e); + + ". "; + String message = e.getMessage(); + if(message != null){ + error = error + message; + logger.error(error, e); + } else { + logger.error(error); + } throw new Exception(error); } } diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/RegistryInfo.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/RegistryInfo.java similarity index 95% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/RegistryInfo.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/RegistryInfo.java index 6673077fca293be3258e03116c99dad561015e88..b604517822509eaa6335d5c05bea3ed97efb0c1d 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/RegistryInfo.java +++ b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/RegistryInfo.java @@ -35,6 +35,7 @@ public interface RegistryInfo { /** * 得到注册信息 * @param key 注册信息key + * @param 返回类型泛型 * @return 注册信息的值 */ T getRegistryInfo(String key); @@ -43,6 +44,7 @@ public interface RegistryInfo { * 得到注册信息 * @param key 注册信息key * @param notExistCreate 不存在的话, 进行创建操作 + * @param 返回类型泛型 * @return 注册信息的值 */ T getRegistryInfo(String key, Supplier notExistCreate); diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/SpringPluginHookWrapper.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/SpringPluginHookWrapper.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/SpringPluginHookWrapper.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/SpringPluginHookWrapper.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/DefaultPluginLaunchInvolved.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/DefaultPluginLaunchInvolved.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/DefaultPluginLaunchInvolved.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/DefaultPluginLaunchInvolved.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginApplicationContextGetter.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginApplicationContextGetter.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginApplicationContextGetter.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginApplicationContextGetter.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolved.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolved.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolved.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolved.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolvedFactory.java b/spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolvedFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolvedFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/core/launcher/plugin/involved/PluginLaunchInvolvedFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/BasePluginScanner.java b/spring-brick/src/main/java/com/gitee/starblues/core/scanner/BasePluginScanner.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/BasePluginScanner.java rename to spring-brick/src/main/java/com/gitee/starblues/core/scanner/BasePluginScanner.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/ComposePathResolve.java b/spring-brick/src/main/java/com/gitee/starblues/core/scanner/ComposePathResolve.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/ComposePathResolve.java rename to spring-brick/src/main/java/com/gitee/starblues/core/scanner/ComposePathResolve.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/DevPathResolve.java b/spring-brick/src/main/java/com/gitee/starblues/core/scanner/DevPathResolve.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/DevPathResolve.java rename to spring-brick/src/main/java/com/gitee/starblues/core/scanner/DevPathResolve.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/PathResolve.java b/spring-brick/src/main/java/com/gitee/starblues/core/scanner/PathResolve.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/PathResolve.java rename to spring-brick/src/main/java/com/gitee/starblues/core/scanner/PathResolve.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/PluginScanner.java b/spring-brick/src/main/java/com/gitee/starblues/core/scanner/PluginScanner.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/PluginScanner.java rename to spring-brick/src/main/java/com/gitee/starblues/core/scanner/PluginScanner.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/ProdPathResolve.java b/spring-brick/src/main/java/com/gitee/starblues/core/scanner/ProdPathResolve.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/scanner/ProdPathResolve.java rename to spring-brick/src/main/java/com/gitee/starblues/core/scanner/ProdPathResolve.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java b/spring-brick/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java rename to spring-brick/src/main/java/com/gitee/starblues/core/version/SemverVersionInspector.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/core/version/VersionInspector.java b/spring-brick/src/main/java/com/gitee/starblues/core/version/VersionInspector.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/core/version/VersionInspector.java rename to spring-brick/src/main/java/com/gitee/starblues/core/version/VersionInspector.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/AutoIntegrationConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/AutoIntegrationConfiguration.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/AutoIntegrationConfiguration.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/AutoIntegrationConfiguration.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/DefaultIntegrationConfiguration.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointConfiguration.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/ExtendPointWebConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointWebConfiguration.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/ExtendPointWebConfiguration.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/ExtendPointWebConfiguration.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java b/spring-brick/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/IntegrationConfiguration.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/SpringBootPluginStarter.java b/spring-brick/src/main/java/com/gitee/starblues/integration/SpringBootPluginStarter.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/SpringBootPluginStarter.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/SpringBootPluginStarter.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/AbstractPluginApplication.java b/spring-brick/src/main/java/com/gitee/starblues/integration/application/AbstractPluginApplication.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/AbstractPluginApplication.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/application/AbstractPluginApplication.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/AutoPluginApplication.java b/spring-brick/src/main/java/com/gitee/starblues/integration/application/AutoPluginApplication.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/AutoPluginApplication.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/application/AutoPluginApplication.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/DefaultPluginApplication.java b/spring-brick/src/main/java/com/gitee/starblues/integration/application/DefaultPluginApplication.java similarity index 99% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/DefaultPluginApplication.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/application/DefaultPluginApplication.java index 0f069eb62a367a2e00bdc05e933f9c2235f4f6cd..c193dcee4c69e65fb4a56ddf772663826009c8c8 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/DefaultPluginApplication.java +++ b/spring-brick/src/main/java/com/gitee/starblues/integration/application/DefaultPluginApplication.java @@ -87,6 +87,7 @@ public class DefaultPluginApplication extends AbstractPluginApplication { /** * 创建插件使用者。子类可扩展 * @param applicationContext Spring ApplicationContext + * @return pluginUser */ protected synchronized PluginUser createPluginUser(ApplicationContext applicationContext){ if(pluginUser == null){ @@ -98,6 +99,7 @@ public class DefaultPluginApplication extends AbstractPluginApplication { /** * 创建插件操作者。子类可扩展 * @param applicationContext Spring ApplicationContext + * @return pluginOperator */ protected synchronized PluginOperator createPluginOperator(ApplicationContext applicationContext){ if(pluginOperator == null){ diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/PluginApplication.java b/spring-brick/src/main/java/com/gitee/starblues/integration/application/PluginApplication.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/application/PluginApplication.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/application/PluginApplication.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/DefaultInitializerListener.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultInitializerListener.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/DefaultInitializerListener.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultInitializerListener.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/listener/DefaultPluginListenerFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListener.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListener.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListener.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListener.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListenerFactory.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListenerFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListenerFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginInitializerListenerFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginListener.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginListener.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginListener.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginListener.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginListenerFactory.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginListenerFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/PluginListenerFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/listener/PluginListenerFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java b/spring-brick/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/listener/SwaggerListener.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/operator/DefaultPluginOperator.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperator.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/PluginOperatorWrapper.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperatorWrapper.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/PluginOperatorWrapper.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/operator/PluginOperatorWrapper.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByInputStreamParam.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByInputStreamParam.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByInputStreamParam.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByInputStreamParam.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByMultipartFileParam.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByMultipartFileParam.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByMultipartFileParam.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadByMultipartFileParam.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java b/spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/operator/upload/UploadParam.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/user/BeanWrapper.java b/spring-brick/src/main/java/com/gitee/starblues/integration/user/BeanWrapper.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/user/BeanWrapper.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/user/BeanWrapper.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/user/DefaultPluginUser.java b/spring-brick/src/main/java/com/gitee/starblues/integration/user/DefaultPluginUser.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/user/DefaultPluginUser.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/user/DefaultPluginUser.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/user/PluginUser.java b/spring-brick/src/main/java/com/gitee/starblues/integration/user/PluginUser.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/integration/user/PluginUser.java rename to spring-brick/src/main/java/com/gitee/starblues/integration/user/PluginUser.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/ApplicationContext.java b/spring-brick/src/main/java/com/gitee/starblues/spring/ApplicationContext.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/ApplicationContext.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/ApplicationContext.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/ApplicationContextProxy.java b/spring-brick/src/main/java/com/gitee/starblues/spring/ApplicationContextProxy.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/ApplicationContextProxy.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/ApplicationContextProxy.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/CacheJdkSameTypeParamProxyFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/CacheJdkSameTypeParamProxyFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/CacheJdkSameTypeParamProxyFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/CacheJdkSameTypeParamProxyFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/GenericApplicationContext.java b/spring-brick/src/main/java/com/gitee/starblues/spring/GenericApplicationContext.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/GenericApplicationContext.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/GenericApplicationContext.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/JdkSameTypeParamProxyFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/JdkSameTypeParamProxyFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/JdkSameTypeParamProxyFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/JdkSameTypeParamProxyFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java similarity index 80% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java index 9e4f1a4a0ebfb3ff597dfbfc36d6dc950ebfe60d..070e04a6b4f0d567069f32925f772b48cad0eb1e 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java +++ b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContext.java @@ -16,6 +16,8 @@ package com.gitee.starblues.spring; +import java.util.Map; + /** * 主程序 ApplicationContext 接口 * @author starBlues @@ -23,4 +25,11 @@ package com.gitee.starblues.spring; */ public interface MainApplicationContext extends ApplicationContext { + /** + * 得到主程序所有配置的 env + * + * @return 主程序配置的 env 集合 + */ + Map> getConfigurableEnvironment(); + } diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java similarity index 30% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java index 11dfb1819200c558bdd94df79c1ca2437ab6a97b..a430ae8a831491cd595ffc4b39d603bfee909f97 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java +++ b/spring-brick/src/main/java/com/gitee/starblues/spring/MainApplicationContextProxy.java @@ -16,6 +16,17 @@ package com.gitee.starblues.spring; +import org.springframework.context.support.GenericApplicationContext; +import org.springframework.core.env.ConfigurableEnvironment; +import org.springframework.core.env.EnumerablePropertySource; +import org.springframework.core.env.MutablePropertySources; +import org.springframework.core.env.PropertySource; + +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.Map; + /** * 主程序 ApplicationContext 的实现 * @author starBlues @@ -23,11 +34,37 @@ package com.gitee.starblues.spring; */ public class MainApplicationContextProxy extends ApplicationContextProxy implements MainApplicationContext{ - public MainApplicationContextProxy(Object targetBeanFactory) { - super(targetBeanFactory); + private final GenericApplicationContext applicationContext; + + public MainApplicationContextProxy(GenericApplicationContext applicationContext) { + super(applicationContext.getBeanFactory()); + this.applicationContext = applicationContext; + } + + public MainApplicationContextProxy(GenericApplicationContext applicationContext, AutoCloseable autoCloseable) { + super(applicationContext.getBeanFactory(), autoCloseable); + this.applicationContext = applicationContext; } - public MainApplicationContextProxy(Object targetBeanFactory, AutoCloseable autoCloseable) { - super(targetBeanFactory, autoCloseable); + @Override + public Map> getConfigurableEnvironment() { + ConfigurableEnvironment environment = applicationContext.getEnvironment(); + MutablePropertySources propertySources = environment.getPropertySources(); + Map> environmentMap = new LinkedHashMap<>(propertySources.size()); + for (PropertySource propertySource : propertySources) { + if (!(propertySource instanceof EnumerablePropertySource)) { + continue; + } + EnumerablePropertySource enumerablePropertySource = (EnumerablePropertySource) propertySource; + String[] propertyNames = enumerablePropertySource.getPropertyNames(); + Map values = new HashMap<>(propertyNames.length); + for (String propertyName : propertyNames) { + values.put(propertyName, enumerablePropertySource.getProperty(propertyName)); + } + if (!values.isEmpty()) { + environmentMap.put(propertySource.getName(), values); + } + } + return environmentMap; } } diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/ProxyFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/ProxyFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/ProxyFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/ProxyFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/SpringBeanFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/SpringBeanFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/SpringBeanFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/SpringBeanFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/SpringPluginHook.java b/spring-brick/src/main/java/com/gitee/starblues/spring/SpringPluginHook.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/SpringPluginHook.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/SpringPluginHook.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/WebConfig.java b/spring-brick/src/main/java/com/gitee/starblues/spring/WebConfig.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/WebConfig.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/WebConfig.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/DefaultExtractFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/extract/DefaultExtractFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/DefaultExtractFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/extract/DefaultExtractFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/DefaultOpExtractFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/extract/DefaultOpExtractFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/DefaultOpExtractFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/extract/DefaultOpExtractFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/ExtractCoordinate.java b/spring-brick/src/main/java/com/gitee/starblues/spring/extract/ExtractCoordinate.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/ExtractCoordinate.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/extract/ExtractCoordinate.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/ExtractFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/extract/ExtractFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/ExtractFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/extract/ExtractFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/OpExtractFactory.java b/spring-brick/src/main/java/com/gitee/starblues/spring/extract/OpExtractFactory.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/extract/OpExtractFactory.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/extract/OpExtractFactory.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/invoke/DefaultInvokeSupperCache.java b/spring-brick/src/main/java/com/gitee/starblues/spring/invoke/DefaultInvokeSupperCache.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/invoke/DefaultInvokeSupperCache.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/invoke/DefaultInvokeSupperCache.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/invoke/InvokeSupperCache.java b/spring-brick/src/main/java/com/gitee/starblues/spring/invoke/InvokeSupperCache.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/invoke/InvokeSupperCache.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/invoke/InvokeSupperCache.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/invoke/SupperCache.java b/spring-brick/src/main/java/com/gitee/starblues/spring/invoke/SupperCache.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/invoke/SupperCache.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/invoke/SupperCache.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginResource.java b/spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginResource.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginResource.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginResource.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceConfig.java b/spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceConfig.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceConfig.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceConfig.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceResolver.java b/spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceResolver.java similarity index 99% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceResolver.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceResolver.java index 58e0e852c7954b3c0cd5758a20ec263761ac2953..ea2a84cb7a1394ca7ac7fe743fdaa1df8c11ee3d 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceResolver.java +++ b/spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceResolver.java @@ -231,6 +231,7 @@ public class PluginStaticResourceResolver extends AbstractResourceResolver { /** * 每新增一个插件, 都需要调用该方法，来解析该插件的 StaticResourceConfig 配置。并将其保存到 StaticResourceConfig bean 中。 * @param pluginDescriptor 插件信息 + * @param pluginClassLoader 插件classloader * @param webConfig web配置 */ public static synchronized void parse(PluginDescriptor pluginDescriptor, diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceWebMvcConfigurer.java b/spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceWebMvcConfigurer.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceWebMvcConfigurer.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/web/PluginStaticResourceWebMvcConfigurer.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/thymeleaf/PluginThymeleafInvolved.java b/spring-brick/src/main/java/com/gitee/starblues/spring/web/thymeleaf/PluginThymeleafInvolved.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/thymeleaf/PluginThymeleafInvolved.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/web/thymeleaf/PluginThymeleafInvolved.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/thymeleaf/ThymeleafConfig.java b/spring-brick/src/main/java/com/gitee/starblues/spring/web/thymeleaf/ThymeleafConfig.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/spring/web/thymeleaf/ThymeleafConfig.java rename to spring-brick/src/main/java/com/gitee/starblues/spring/web/thymeleaf/ThymeleafConfig.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/AnnotationsUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/AnnotationsUtils.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/AnnotationsUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/AnnotationsUtils.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/ClassUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/ClassUtils.java similarity index 99% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/ClassUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/ClassUtils.java index a1fe7a1c62ee20d974e1237ba75ad1cadb8dec11..4ca552718d4e1f74c5a205ad3317caed9b5b6a16 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/ClassUtils.java +++ b/spring-brick/src/main/java/com/gitee/starblues/utils/ClassUtils.java @@ -92,6 +92,7 @@ public class ClassUtils { * @return 字段值 * @throws IllegalAccessException 异常信息 */ + @SuppressWarnings("unchecked") public static T getReflectionField(Field field, Object o) throws IllegalAccessException { if (field == null) { return null; diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/LogUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/LogUtils.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/LogUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/LogUtils.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/MsgUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/MsgUtils.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/MsgUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/MsgUtils.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/Order.java b/spring-brick/src/main/java/com/gitee/starblues/utils/Order.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/Order.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/Order.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/OrderPriority.java b/spring-brick/src/main/java/com/gitee/starblues/utils/OrderPriority.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/OrderPriority.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/OrderPriority.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/OrderUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/OrderUtils.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/OrderUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/OrderUtils.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/PluginConfigUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/PluginConfigUtils.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/PluginConfigUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/PluginConfigUtils.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/PluginFileUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/PluginFileUtils.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/PluginFileUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/PluginFileUtils.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/ScanUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/ScanUtils.java similarity index 100% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/ScanUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/ScanUtils.java diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/SpringBeanCustomUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/SpringBeanCustomUtils.java similarity index 99% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/SpringBeanCustomUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/SpringBeanCustomUtils.java index 43dabc07e9cbbadd12cb7a75dec9d1241bc831fa..f44d7455d3dce7f3750a43aa9fa12a2bf260fc7a 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/SpringBeanCustomUtils.java +++ b/spring-brick/src/main/java/com/gitee/starblues/utils/SpringBeanCustomUtils.java @@ -98,7 +98,7 @@ public class SpringBeanCustomUtils { * 通过注解获取bean * @param applicationContext applicationContext * @param annotationType 注解类型 - * @return List + * @return List */ public static List getBeansWithAnnotation(ApplicationContext applicationContext, Class annotationType){ diff --git a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/SpringBeanUtils.java b/spring-brick/src/main/java/com/gitee/starblues/utils/SpringBeanUtils.java similarity index 99% rename from springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/SpringBeanUtils.java rename to spring-brick/src/main/java/com/gitee/starblues/utils/SpringBeanUtils.java index 0380495ba67bdd4f583957e6fdb5225a260a69e9..8a971c90a7660d0c9007273215a3a3ff01cd53c5 100644 --- a/springboot-plugin-framework/src/main/java/com/gitee/starblues/utils/SpringBeanUtils.java +++ b/spring-brick/src/main/java/com/gitee/starblues/utils/SpringBeanUtils.java @@ -92,7 +92,7 @@ public class SpringBeanUtils { * 通过注解获取bean * @param applicationContext applicationContext * @param annotationType 注解类型 - * @return List + * @return List */ public static List getBeansWithAnnotation(ApplicationContext applicationContext, Class annotationType){ diff --git a/springboot-plugin-framework/src/main/resources/META-INF/spring-configuration-metadata.json b/spring-brick/src/main/resources/META-INF/spring-configuration-metadata.json similarity index 100% rename from springboot-plugin-framework/src/main/resources/META-INF/spring-configuration-metadata.json rename to spring-brick/src/main/resources/META-INF/spring-configuration-metadata.json diff --git a/springboot-plugin-framework/src/main/resources/META-INF/spring.factories b/spring-brick/src/main/resources/META-INF/spring.factories similarity index 100% rename from springboot-plugin-framework/src/main/resources/META-INF/spring.factories rename to spring-brick/src/main/resources/META-INF/spring.factories