From d769ad00d8dd2ead9abbac5d6fbf2d7f62fd6934 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Mon, 29 Nov 2021 17:33:16 +0800 Subject: [PATCH 01/35] commit code --- example-main/pom.xml | 2 +- .../example/config/PluginConfig.java | 28 +++++++++---------- .../src/main/resources/application-dev.yml | 5 +++- .../starblues/example/basic/BasicPlugin.java | 9 ++---- 4 files changed, 22 insertions(+), 22 deletions(-) diff --git a/example-main/pom.xml b/example-main/pom.xml index c648ea1..08480f1 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -16,7 +16,7 @@ 1.8 - 2.4.5-RELEASE + 3.0.0-RELEASE 2.5.0 diff --git a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java index 0bd5438..6da61b1 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java +++ b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java @@ -17,25 +17,25 @@ import org.springframework.context.annotation.Import; * @version 1.0 */ @Configuration -@Import(AutoIntegrationConfiguration.class) +//@Import(AutoIntegrationConfiguration.class) public class PluginConfig { /** * 定义插件应用。使用可以注入它操作插件。 * @return PluginApplication */ - @Bean - public PluginApplication pluginApplication(){ - // 实例化自动初始化插件的PluginApplication - PluginApplication pluginApplication = new AutoPluginApplication(); - pluginApplication.addPf4jStateListener(Pf4jPluginListener.class); - // 新增mybatis-plus扩展 - pluginApplication - .addExtension(new SpringBootMybatisExtension(SpringBootMybatisExtension.Type.MYBATIS_PLUS)) - .addExtension(new SpringBootLogExtension(SpringBootLogExtension.Type.LOGBACK)) - .addExtension(new StaticResourceExtension(StaticResourceExtension.Include.THYMELEAF)); - - return pluginApplication; - } +// @Bean +// public PluginApplication pluginApplication(){ +// // 实例化自动初始化插件的PluginApplication +// PluginApplication pluginApplication = new AutoPluginApplication(); +// pluginApplication.addPf4jStateListener(Pf4jPluginListener.class); +// // 新增mybatis-plus扩展 +// pluginApplication +// .addExtension(new SpringBootMybatisExtension(SpringBootMybatisExtension.Type.MYBATIS_PLUS)) +// .addExtension(new SpringBootLogExtension(SpringBootLogExtension.Type.LOGBACK)) +// .addExtension(new StaticResourceExtension(StaticResourceExtension.Include.THYMELEAF)); +// +// return pluginApplication; +// } } diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 5643ca7..6dabedd 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -16,11 +16,14 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl plugin: + enable: true + mainPackage: com.gitee.starblues.example runMode: dev pluginPath: - - ./example-plugins-dir1/ + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-dir1 - ./example-plugins-dir2/ sortInitPluginIds: - example-plugin1 - example-plugin2 - example-jpa + diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java index 654eab1..06677f1 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java +++ b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java @@ -1,7 +1,6 @@ package com.gitee.starblues.example.basic; -import com.gitee.starblues.realize.BasePlugin; -import org.pf4j.PluginWrapper; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 基本插件 @@ -9,8 +8,6 @@ import org.pf4j.PluginWrapper; * @version 1.0 * @since 2021-08-01 */ -public class BasicPlugin extends BasePlugin { - public BasicPlugin(PluginWrapper wrapper) { - super(wrapper); - } +@SpringBootApplication +public class BasicPlugin { } -- Gitee From 8dbd66f21a21b16b28d38c73d12983c557f52e98 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Mon, 29 Nov 2021 18:43:46 +0800 Subject: [PATCH 02/35] commit code --- .../java/com/gitee/starblues/example/basic/BasicPlugin.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java index 06677f1..c8c4cf0 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java +++ b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java @@ -8,6 +8,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication +@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic") public class BasicPlugin { } -- Gitee From d1552d9bf362f8f47911c2bd7dac2b2a983ae795 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 30 Nov 2021 16:55:25 +0800 Subject: [PATCH 03/35] commit code --- .../com/gitee/starblues/example/basic/BasicPlugin.java | 8 ++++++++ .../starblues/example/basic/service/BasicService.java | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java index c8c4cf0..65c03a7 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java +++ b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java @@ -1,7 +1,10 @@ package com.gitee.starblues.example.basic; +import com.gitee.starblues.spring.oneself.OneselfPluginSpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import java.io.IOException; + /** * 基本插件 * @author starBlues @@ -10,4 +13,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic") public class BasicPlugin { + + public static void main(String[] args) throws IOException { + OneselfPluginSpringApplication.run(BasicPlugin.class); + } + } diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/BasicService.java b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/BasicService.java index 685e510..9af4779 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/BasicService.java +++ b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/BasicService.java @@ -1,5 +1,7 @@ package com.gitee.starblues.example.basic.service; +import com.gitee.starblues.core.descriptor.PluginDescriptor; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; /** @@ -10,6 +12,9 @@ import org.springframework.stereotype.Component; @Component public class BasicService { + @Autowired + private PluginDescriptor pluginDescriptor; + public String getName(){ return BasicService.class.getName(); } -- Gitee From f5430774685ad95a95dd9f45696a44ceb19871a9 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Thu, 2 Dec 2021 15:59:50 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=89=A9=E5=B1=95?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gitee/starblues/example/config/PluginConfig.java | 5 +++++ example-main/src/main/resources/application-dev.yml | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java index 6da61b1..33a8c96 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java +++ b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java @@ -1,12 +1,17 @@ package com.gitee.starblues.example.config; +import com.gitee.starblues.core.classloader.DefaultMainResourcePatternDefiner; +import com.gitee.starblues.core.classloader.EmptyMainResourcePatternDefiner; +import com.gitee.starblues.core.classloader.MainResourcePatternDefiner; import com.gitee.starblues.example.listener.Pf4jPluginListener; import com.gitee.starblues.extension.log.SpringBootLogExtension; import com.gitee.starblues.extension.mybatis.SpringBootMybatisExtension; import com.gitee.starblues.extension.resources.StaticResourceExtension; import com.gitee.starblues.integration.AutoIntegrationConfiguration; +import com.gitee.starblues.integration.IntegrationConfiguration; import com.gitee.starblues.integration.application.AutoPluginApplication; import com.gitee.starblues.integration.application.PluginApplication; +import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Import; diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 6dabedd..f8d7987 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -16,7 +16,8 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl plugin: - enable: true + enable: false + enable-starter: true mainPackage: com.gitee.starblues.example runMode: dev pluginPath: -- Gitee From bb1fab7cf398b1e97afab23852141295f5dd6fad Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Thu, 2 Dec 2021 17:06:31 +0800 Subject: [PATCH 05/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../example/basic/config/BasicConfig.java | 37 +++++++++++++++++++ .../example/basic/rest/HelloResource.java | 31 ++++++++-------- .../example/basic/rest/MainUserResource.java | 35 ++++++++++++++++++ .../src/main/resources/basic-config-dev.yaml | 3 ++ .../src/main/resources/basic-config.yaml | 3 ++ .../src/main/resources/plugin.properties | 3 +- 7 files changed, 97 insertions(+), 17 deletions(-) create mode 100644 example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/BasicConfig.java create mode 100644 example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java create mode 100644 example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml create mode 100644 example-plugins-dir1/example-basic/src/main/resources/basic-config.yaml diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index f8d7987..dddba14 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -16,7 +16,7 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl plugin: - enable: false + enable: true enable-starter: true mainPackage: com.gitee.starblues.example runMode: dev diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/BasicConfig.java b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/BasicConfig.java new file mode 100644 index 0000000..391ec1d --- /dev/null +++ b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/BasicConfig.java @@ -0,0 +1,37 @@ +package com.gitee.starblues.example.basic.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +@ConfigurationProperties(prefix = "basic") +public class BasicConfig { + + @Value("${name:basic}") + private String name; + + @Value("${age:12}") + private Integer age; + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } +} diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java index 566fd8c..95fa403 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java +++ b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java @@ -1,5 +1,7 @@ package com.gitee.starblues.example.basic.rest; +import com.gitee.starblues.core.descriptor.PluginDescriptor; +import com.gitee.starblues.example.basic.config.BasicConfig; import com.gitee.starblues.example.basic.service.BasicService; import com.gitee.starblues.example.entity.MainUser; import com.gitee.starblues.example.service.MainUserService; @@ -10,6 +12,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.annotation.Resource; import java.util.List; /** @@ -22,30 +25,28 @@ import java.util.List; @Api public class HelloResource { - @Autowired + @Resource private BasicService basicService; + @Resource + private BasicConfig basicConfig; + @Resource + private PluginDescriptor pluginDescriptor; - @Autowired - private PluginUtils pluginUtils; + + @GetMapping() + public PluginDescriptor hello(){ + return pluginDescriptor; + } @GetMapping("/name") public String getName(){ return basicService.getName(); } - @GetMapping("/main-user") - public List mainUser(){ - MainUserService mainBean = pluginUtils.getMainBean(MainUserService.class); - return mainBean.list(); - } - - @GetMapping() - public String hello(){ - return "hello, my name is basic plugin."; + @GetMapping("/config") + public BasicConfig getConfig(){ + return basicConfig; } - - - } diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java new file mode 100644 index 0000000..b8118ed --- /dev/null +++ b/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java @@ -0,0 +1,35 @@ +package com.gitee.starblues.example.basic.rest; + +import com.gitee.starblues.example.basic.config.BasicConfig; +import com.gitee.starblues.example.basic.service.BasicService; +import com.gitee.starblues.example.entity.MainUser; +import com.gitee.starblues.example.service.MainUserService; +import com.gitee.starblues.realize.PluginUtils; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @author starBlues + * @version 1.0 + * @since 2021-08-01 + */ +@RestController +@RequestMapping("/main") +@Api +public class MainUserResource { + + @Autowired + private MainUserService mainUserService; + + + @GetMapping("/main-user") + public List mainUser(){ + return mainUserService.list(); + } + +} diff --git a/example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml b/example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml new file mode 100644 index 0000000..bd41b36 --- /dev/null +++ b/example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml @@ -0,0 +1,3 @@ +basic: + name: config-basic + age: 16 \ No newline at end of file diff --git a/example-plugins-dir1/example-basic/src/main/resources/basic-config.yaml b/example-plugins-dir1/example-basic/src/main/resources/basic-config.yaml new file mode 100644 index 0000000..caf4dfc --- /dev/null +++ b/example-plugins-dir1/example-basic/src/main/resources/basic-config.yaml @@ -0,0 +1,3 @@ +spring: + profiles: + active: dev \ No newline at end of file diff --git a/example-plugins-dir1/example-basic/src/main/resources/plugin.properties b/example-plugins-dir1/example-basic/src/main/resources/plugin.properties index 532942b..cc7c831 100644 --- a/example-plugins-dir1/example-basic/src/main/resources/plugin.properties +++ b/example-plugins-dir1/example-basic/src/main/resources/plugin.properties @@ -2,4 +2,5 @@ plugin.id=example-basic plugin.class=com.gitee.starblues.example.basic.BasicPlugin plugin.version=1.0.0-SNAPSHOT plugin.provider=starblues -plugin.description=基本插件 \ No newline at end of file +plugin.description=基本插件 +plugin.configFileName=basic-config.yaml \ No newline at end of file -- Gitee From e2f2ad946c20e93bac6283e0f65f0702a26215ed Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Thu, 2 Dec 2021 17:57:39 +0800 Subject: [PATCH 06/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9jar=20loader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example-main/pom.xml | 40 ++++----- .../example/config/PluginConfig.java | 90 +++++++++---------- .../src/main/resources/application-dev.yml | 1 + 3 files changed, 66 insertions(+), 65 deletions(-) diff --git a/example-main/pom.xml b/example-main/pom.xml index 08480f1..227b447 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -45,26 +45,26 @@ ${springboot-plugin-framework.version} - - - com.gitee.starblues - springboot-plugin-framework-extension-mybatis - ${springboot-plugin-framework.version} - - - - - com.gitee.starblues - springboot-plugin-framework-extension-resources - ${springboot-plugin-framework.version} - - - - - com.gitee.starblues - springboot-plugin-framework-extension-log - ${springboot-plugin-framework.version} - + + + + + + + + + + + + + + + + + + + + org.springframework.boot diff --git a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java index 33a8c96..9b32414 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java +++ b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java @@ -1,46 +1,46 @@ -package com.gitee.starblues.example.config; - -import com.gitee.starblues.core.classloader.DefaultMainResourcePatternDefiner; -import com.gitee.starblues.core.classloader.EmptyMainResourcePatternDefiner; -import com.gitee.starblues.core.classloader.MainResourcePatternDefiner; -import com.gitee.starblues.example.listener.Pf4jPluginListener; -import com.gitee.starblues.extension.log.SpringBootLogExtension; -import com.gitee.starblues.extension.mybatis.SpringBootMybatisExtension; -import com.gitee.starblues.extension.resources.StaticResourceExtension; -import com.gitee.starblues.integration.AutoIntegrationConfiguration; -import com.gitee.starblues.integration.IntegrationConfiguration; -import com.gitee.starblues.integration.application.AutoPluginApplication; -import com.gitee.starblues.integration.application.PluginApplication; -import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; - -/** - * 插件配置 - * @author starBlues - * @version 1.0 - */ -@Configuration -//@Import(AutoIntegrationConfiguration.class) -public class PluginConfig { - - /** - * 定义插件应用。使用可以注入它操作插件。 - * @return PluginApplication - */ -// @Bean -// public PluginApplication pluginApplication(){ -// // 实例化自动初始化插件的PluginApplication -// PluginApplication pluginApplication = new AutoPluginApplication(); -// pluginApplication.addPf4jStateListener(Pf4jPluginListener.class); -// // 新增mybatis-plus扩展 -// pluginApplication -// .addExtension(new SpringBootMybatisExtension(SpringBootMybatisExtension.Type.MYBATIS_PLUS)) -// .addExtension(new SpringBootLogExtension(SpringBootLogExtension.Type.LOGBACK)) -// .addExtension(new StaticResourceExtension(StaticResourceExtension.Include.THYMELEAF)); +//package com.gitee.starblues.example.config; // -// return pluginApplication; -// } - -} +//import com.gitee.starblues.core.classloader.DefaultMainResourcePatternDefiner; +//import com.gitee.starblues.core.classloader.EmptyMainResourcePatternDefiner; +//import com.gitee.starblues.core.classloader.MainResourcePatternDefiner; +//import com.gitee.starblues.example.listener.Pf4jPluginListener; +//import com.gitee.starblues.extension.log.SpringBootLogExtension; +//import com.gitee.starblues.extension.mybatis.SpringBootMybatisExtension; +//import com.gitee.starblues.extension.resources.StaticResourceExtension; +//import com.gitee.starblues.integration.AutoIntegrationConfiguration; +//import com.gitee.starblues.integration.IntegrationConfiguration; +//import com.gitee.starblues.integration.application.AutoPluginApplication; +//import com.gitee.starblues.integration.application.PluginApplication; +//import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import org.springframework.context.annotation.Import; +// +///** +// * 插件配置 +// * @author starBlues +// * @version 1.0 +// */ +//@Configuration +////@Import(AutoIntegrationConfiguration.class) +//public class PluginConfig { +// +// /** +// * 定义插件应用。使用可以注入它操作插件。 +// * @return PluginApplication +// */ +//// @Bean +//// public PluginApplication pluginApplication(){ +//// // 实例化自动初始化插件的PluginApplication +//// PluginApplication pluginApplication = new AutoPluginApplication(); +//// pluginApplication.addPf4jStateListener(Pf4jPluginListener.class); +//// // 新增mybatis-plus扩展 +//// pluginApplication +//// .addExtension(new SpringBootMybatisExtension(SpringBootMybatisExtension.Type.MYBATIS_PLUS)) +//// .addExtension(new SpringBootLogExtension(SpringBootLogExtension.Type.LOGBACK)) +//// .addExtension(new StaticResourceExtension(StaticResourceExtension.Include.THYMELEAF)); +//// +//// return pluginApplication; +//// } +// +//} diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index dddba14..6e9046c 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -23,6 +23,7 @@ plugin: pluginPath: - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-dir1 - ./example-plugins-dir2/ + - D:\claas sortInitPluginIds: - example-plugin1 - example-plugin2 -- Gitee From ba3cd50a2dc90514f37cc1f20f4d55f6ae940f17 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 7 Dec 2021 18:00:21 +0800 Subject: [PATCH 07/35] 3.0.0-v2 --- .../src/main/resources/application-dev.yml | 4 +- .../example-basic-1}/pom.xml | 2 +- .../example/basic1/Basic1Plugin.java | 20 +++++++++ .../example/basic1}/aop/TestAdvice.java | 2 +- .../example/basic1}/config/BasicConfig.java | 2 +- .../example/basic1}/config/EnableAop.java | 2 +- .../example/basic1/rest/CallerController.java | 31 +++++++++++++ .../example/basic1/rest/HelloController.java | 13 ++---- .../basic1/rest/MainUserController.java | 7 +-- .../example/basic1}/service/BasicService.java | 2 +- .../basic1}/service/ExtractExample1.java | 2 +- .../example/basic1/service/ServiceCaller.java | 19 ++++++++ .../src/main/resources/basic-config-dev.yaml | 3 ++ .../src/main/resources/basic-config.yaml | 0 .../src/main/resources/plugin.properties | 6 +-- example-plugins-basic/example-basic-2/pom.xml | 15 +++++++ .../example/basic2/Basic2Plugin.java | 8 ++-- .../example/basic2/config/Basic2Config.java | 38 ++++++++++++++++ .../example/basic2/service/ServiceSupper.java | 40 +++++++++++++++++ .../src/main/resources/basic2-config-dev.yaml | 2 +- .../src/main/resources/basic2-config.yaml | 3 ++ .../src/main/resources/plugin.properties | 6 +++ example-plugins-basic/pom.xml | 45 +++++++++++++++++++ example-plugins-dir1/pom.xml | 1 - pom.xml | 1 + 25 files changed, 242 insertions(+), 32 deletions(-) rename {example-plugins-dir1/example-basic => example-plugins-basic/example-basic-1}/pom.xml (91%) create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java rename {example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic => example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1}/aop/TestAdvice.java (97%) rename {example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic => example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1}/config/BasicConfig.java (92%) rename {example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic => example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1}/config/EnableAop.java (83%) create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java rename example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java => example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java (66%) rename example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java => example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java (73%) rename {example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic => example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1}/service/BasicService.java (89%) rename {example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic => example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1}/service/ExtractExample1.java (88%) create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml rename {example-plugins-dir1/example-basic => example-plugins-basic/example-basic-1}/src/main/resources/basic-config.yaml (100%) rename {example-plugins-dir1/example-basic => example-plugins-basic/example-basic-1}/src/main/resources/plugin.properties (44%) create mode 100644 example-plugins-basic/example-basic-2/pom.xml rename example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java => example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java (72%) create mode 100644 example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/config/Basic2Config.java create mode 100644 example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java rename example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml => example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml (41%) create mode 100644 example-plugins-basic/example-basic-2/src/main/resources/basic2-config.yaml create mode 100644 example-plugins-basic/example-basic-2/src/main/resources/plugin.properties create mode 100644 example-plugins-basic/pom.xml diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 6e9046c..2853b28 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -21,9 +21,7 @@ plugin: mainPackage: com.gitee.starblues.example runMode: dev pluginPath: - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-dir1 - - ./example-plugins-dir2/ - - D:\claas + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic sortInitPluginIds: - example-plugin1 - example-plugin2 diff --git a/example-plugins-dir1/example-basic/pom.xml b/example-plugins-basic/example-basic-1/pom.xml similarity index 91% rename from example-plugins-dir1/example-basic/pom.xml rename to example-plugins-basic/example-basic-1/pom.xml index cd112a2..28f850d 100644 --- a/example-plugins-dir1/example-basic/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -9,7 +9,7 @@ 4.0.0 - example-basic + example-basic-1 jar \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java new file mode 100644 index 0000000..10a83d8 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -0,0 +1,20 @@ +package com.gitee.starblues.example.basic1; + +import com.gitee.starblues.example.Application; +import com.gitee.starblues.spring.oneself.OneselfPluginSpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * 基本插件 + * @author starBlues + * @version 1.0 + * @since 2021-08-01 + */ +@SpringBootApplication() +public class Basic1Plugin { + + public static void main(String[] args) { + OneselfPluginSpringApplication.run(Application.class, Basic1Plugin.class); + } + +} diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/aop/TestAdvice.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/aop/TestAdvice.java similarity index 97% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/aop/TestAdvice.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/aop/TestAdvice.java index 4d8cb54..7e07d8d 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/aop/TestAdvice.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/aop/TestAdvice.java @@ -1,4 +1,4 @@ -package com.gitee.starblues.example.basic.aop; +package com.gitee.starblues.example.basic1.aop; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/BasicConfig.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/BasicConfig.java similarity index 92% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/BasicConfig.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/BasicConfig.java index 391ec1d..6de824b 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/BasicConfig.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/BasicConfig.java @@ -1,4 +1,4 @@ -package com.gitee.starblues.example.basic.config; +package com.gitee.starblues.example.basic1.config; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/EnableAop.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/EnableAop.java similarity index 83% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/EnableAop.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/EnableAop.java index 0065f48..5b49d67 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/config/EnableAop.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/EnableAop.java @@ -1,4 +1,4 @@ -package com.gitee.starblues.example.basic.config; +package com.gitee.starblues.example.basic1.config; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.EnableAspectJAutoProxy; diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java new file mode 100644 index 0000000..46f8cf5 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java @@ -0,0 +1,31 @@ +package com.gitee.starblues.example.basic1.rest; + +import com.gitee.starblues.example.basic1.config.BasicConfig; +import com.gitee.starblues.example.basic1.service.ServiceCaller; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author starBlues + * @version 1.0 + */ +@RestController +@RequestMapping("/caller") +@Api +public class CallerController { + + @Resource + private ServiceCaller serviceCaller; + + @GetMapping("/test") + public BasicConfig caller(){ + String hello = serviceCaller.hello("hello, i am basic"); + System.out.println(hello); + return serviceCaller.getConfig("hi, i am basic1"); + } + +} diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java similarity index 66% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java index 95fa403..613662e 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/HelloResource.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java @@ -1,19 +1,14 @@ -package com.gitee.starblues.example.basic.rest; +package com.gitee.starblues.example.basic1.rest; import com.gitee.starblues.core.descriptor.PluginDescriptor; -import com.gitee.starblues.example.basic.config.BasicConfig; -import com.gitee.starblues.example.basic.service.BasicService; -import com.gitee.starblues.example.entity.MainUser; -import com.gitee.starblues.example.service.MainUserService; -import com.gitee.starblues.realize.PluginUtils; +import com.gitee.starblues.example.basic1.config.BasicConfig; +import com.gitee.starblues.example.basic1.service.BasicService; import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; -import java.util.List; /** * @author starBlues @@ -23,7 +18,7 @@ import java.util.List; @RestController @RequestMapping("/hello") @Api -public class HelloResource { +public class HelloController { @Resource private BasicService basicService; diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java similarity index 73% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java index b8118ed..4444a26 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/rest/MainUserResource.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java @@ -1,10 +1,7 @@ -package com.gitee.starblues.example.basic.rest; +package com.gitee.starblues.example.basic1.rest; -import com.gitee.starblues.example.basic.config.BasicConfig; -import com.gitee.starblues.example.basic.service.BasicService; import com.gitee.starblues.example.entity.MainUser; import com.gitee.starblues.example.service.MainUserService; -import com.gitee.starblues.realize.PluginUtils; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -21,7 +18,7 @@ import java.util.List; @RestController @RequestMapping("/main") @Api -public class MainUserResource { +public class MainUserController { @Autowired private MainUserService mainUserService; diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/BasicService.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/BasicService.java similarity index 89% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/BasicService.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/BasicService.java index 9af4779..2c26c8f 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/BasicService.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/BasicService.java @@ -1,4 +1,4 @@ -package com.gitee.starblues.example.basic.service; +package com.gitee.starblues.example.basic1.service; import com.gitee.starblues.core.descriptor.PluginDescriptor; import org.springframework.beans.factory.annotation.Autowired; diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/ExtractExample1.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractExample1.java similarity index 88% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/ExtractExample1.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractExample1.java index 06aa953..8a4f938 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/service/ExtractExample1.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractExample1.java @@ -1,4 +1,4 @@ -package com.gitee.starblues.example.basic.service; +package com.gitee.starblues.example.basic1.service; import com.gitee.starblues.annotation.Extract; import com.gitee.starblues.example.plugin.ExtractExample; diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java new file mode 100644 index 0000000..d6fb60c --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java @@ -0,0 +1,19 @@ +package com.gitee.starblues.example.basic1.service; + +import com.gitee.starblues.annotation.Caller; +import com.gitee.starblues.example.basic1.config.BasicConfig; + +/** + * @author starBlues + * @version 1.0 + */ +@Caller("service-supper") +public interface ServiceCaller { + + + String hello(String s); + + @Caller.Method("getConfig") + BasicConfig getConfig(String name); + +} diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml new file mode 100644 index 0000000..f8d0e88 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml @@ -0,0 +1,3 @@ +basic: + name: I am is basic1 + age: 20 \ No newline at end of file diff --git a/example-plugins-dir1/example-basic/src/main/resources/basic-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml similarity index 100% rename from example-plugins-dir1/example-basic/src/main/resources/basic-config.yaml rename to example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml diff --git a/example-plugins-dir1/example-basic/src/main/resources/plugin.properties b/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties similarity index 44% rename from example-plugins-dir1/example-basic/src/main/resources/plugin.properties rename to example-plugins-basic/example-basic-1/src/main/resources/plugin.properties index cc7c831..918204c 100644 --- a/example-plugins-dir1/example-basic/src/main/resources/plugin.properties +++ b/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties @@ -1,6 +1,6 @@ -plugin.id=example-basic -plugin.class=com.gitee.starblues.example.basic.BasicPlugin +plugin.id=example-basic-1 +plugin.class=com.gitee.starblues.example.basic1.Basic1Plugin plugin.version=1.0.0-SNAPSHOT plugin.provider=starblues -plugin.description=基本插件 +plugin.description=基本插件1 plugin.configFileName=basic-config.yaml \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml new file mode 100644 index 0000000..aba3395 --- /dev/null +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -0,0 +1,15 @@ + + + + example-plugins-dir1 + com.gitee.starblues + 1.0.0-SNAPSHOT + + 4.0.0 + + example-basic-2 + jar + + \ No newline at end of file diff --git a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java similarity index 72% rename from example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java rename to example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java index 65c03a7..5072f1d 100644 --- a/example-plugins-dir1/example-basic/src/main/java/com/gitee/starblues/example/basic/BasicPlugin.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java @@ -1,4 +1,4 @@ -package com.gitee.starblues.example.basic; +package com.gitee.starblues.example.basic2; import com.gitee.starblues.spring.oneself.OneselfPluginSpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -11,11 +11,11 @@ import java.io.IOException; * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic") -public class BasicPlugin { +@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic2") +public class Basic2Plugin { public static void main(String[] args) throws IOException { - OneselfPluginSpringApplication.run(BasicPlugin.class); + OneselfPluginSpringApplication.run(Basic2Plugin.class); } } diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/config/Basic2Config.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/config/Basic2Config.java new file mode 100644 index 0000000..b0b9ce5 --- /dev/null +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/config/Basic2Config.java @@ -0,0 +1,38 @@ +package com.gitee.starblues.example.basic2.config; + +import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +@ConfigurationProperties("basic") +public class Basic2Config { + + @Value("${name:basic}") + private String name; + + @Value("${age:12}") + private Integer age; + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public Integer getAge() { + return age; + } + + public void setAge(Integer age) { + this.age = age; + } + +} diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java new file mode 100644 index 0000000..8c50763 --- /dev/null +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java @@ -0,0 +1,40 @@ +package com.gitee.starblues.example.basic2.service; + +import com.gitee.starblues.annotation.Supplier; +import com.gitee.starblues.example.basic2.config.Basic2Config; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author starBlues + * @version 1.0 + */ +@Service +@Supplier("service-supper") +public class ServiceSupper { + + @Autowired + private Basic2Config config; + + public String hello(String s){ + System.out.println(s); + return s; + } + + @Supplier.Method("getConfig") + public Basic2Config getConfig(String name){ + Basic2Config newConfig = new Basic2Config(); + BeanUtils.copyProperties(config, newConfig); + newConfig.setName(name); + return newConfig; + } + + + private static class Hello{ + private String name; + private Integer age; + } + + +} diff --git a/example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml b/example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml similarity index 41% rename from example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml rename to example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml index bd41b36..f0f6987 100644 --- a/example-plugins-dir1/example-basic/src/main/resources/basic-config-dev.yaml +++ b/example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml @@ -1,3 +1,3 @@ basic: - name: config-basic + name: I am is basic2 age: 16 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/src/main/resources/basic2-config.yaml b/example-plugins-basic/example-basic-2/src/main/resources/basic2-config.yaml new file mode 100644 index 0000000..caf4dfc --- /dev/null +++ b/example-plugins-basic/example-basic-2/src/main/resources/basic2-config.yaml @@ -0,0 +1,3 @@ +spring: + profiles: + active: dev \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties b/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties new file mode 100644 index 0000000..57e351a --- /dev/null +++ b/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties @@ -0,0 +1,6 @@ +plugin.id=example-basic-2 +plugin.class=com.gitee.starblues.example.basic2.Basic2Plugin +plugin.version=1.0.0-SNAPSHOT +plugin.provider=starblues +plugin.description=基本插件2 +plugin.configFileName=basic2-config.yaml \ No newline at end of file diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml new file mode 100644 index 0000000..03d138b --- /dev/null +++ b/example-plugins-basic/pom.xml @@ -0,0 +1,45 @@ + + + + springboot-plugin-framework-example + com.gitee.starblues + 1.0.0-SNAPSHOT + ../pom.xml + + 4.0.0 + + example-plugins-basic + pom + + + example-basic-1 + example-basic-2 + + + 1.18.10 + 4.13 + + 3.1.1 + + + + + + com.gitee.starblues + example-main + ${project.version} + provided + + + + junit + junit + ${junit.version} + test + + + + + \ No newline at end of file diff --git a/example-plugins-dir1/pom.xml b/example-plugins-dir1/pom.xml index 48c588d..fc1dd0c 100644 --- a/example-plugins-dir1/pom.xml +++ b/example-plugins-dir1/pom.xml @@ -14,7 +14,6 @@ pom - example-basic example-jpa diff --git a/pom.xml b/pom.xml index 107a7e2..0a8bef0 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,7 @@ example-main example-plugin-dependency + example-plugins-basic example-plugins-dir1 example-plugins-dir2 -- Gitee From 9c9efe695fa9ad30fb92ce5cfbee7af26e99052a Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 8 Dec 2021 13:38:49 +0800 Subject: [PATCH 08/35] 3.0.0-v3-add-extract --- .../example/plugin/ExtractExample.java | 48 ------------------ .../example/rest/ExtractController.java | 49 ++++++++++++++----- .../example/service/extract/ExtractDemo.java | 16 ++++++ .../service/extract/MainExtractImpl.java | 15 ++++++ ...xtractExample1.java => ExtractBasic1.java} | 11 ++--- .../example/basic2/service/ExtractBasic2.java | 17 +++++++ .../example/basic2/service/ServiceSupper.java | 1 - 7 files changed, 90 insertions(+), 67 deletions(-) delete mode 100644 example-main/src/main/java/com/gitee/starblues/example/plugin/ExtractExample.java create mode 100644 example-main/src/main/java/com/gitee/starblues/example/service/extract/ExtractDemo.java create mode 100644 example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java rename example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/{ExtractExample1.java => ExtractBasic1.java} (42%) create mode 100644 example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ExtractBasic2.java diff --git a/example-main/src/main/java/com/gitee/starblues/example/plugin/ExtractExample.java b/example-main/src/main/java/com/gitee/starblues/example/plugin/ExtractExample.java deleted file mode 100644 index 9d37440..0000000 --- a/example-main/src/main/java/com/gitee/starblues/example/plugin/ExtractExample.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.gitee.starblues.example.plugin; - -/** - * 扩展功能案例 - * @author starBlues - * @version 1.0 - * @since 2021-07-24 - */ -public interface ExtractExample { - - /** - * 扩展实现 - * @param info info - * @return info - */ - Info exeInfo(Info info); - - class Info{ - private String name; - private Integer age; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Integer getAge() { - return age; - } - - public void setAge(Integer age) { - this.age = age; - } - - @Override - public String toString() { - return "Info{" + - "name='" + name + '\'' + - ", age=" + age + - '}'; - } - } - - -} diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java b/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java index f6940cf..cfea73b 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java @@ -1,11 +1,16 @@ package com.gitee.starblues.example.rest; -import com.gitee.starblues.example.plugin.ExtractExample; -import com.gitee.starblues.factory.process.pipe.extract.ExtractCoordinate; -import com.gitee.starblues.factory.process.pipe.extract.ExtractFactory; +import com.gitee.starblues.example.service.extract.ExtractDemo; +import com.gitee.starblues.spring.processor.extract.ExtractCoordinate; +import com.gitee.starblues.spring.processor.extract.ExtractFactory; +import com.gitee.starblues.utils.ObjectUtils; import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import java.util.List; +import java.util.stream.Collectors; + /** * @author starBlues * @version 1.0 @@ -16,17 +21,37 @@ import org.springframework.web.bind.annotation.*; @Api public class ExtractController { - private final ExtractFactory extractFactory = ExtractFactory.getInstant(); + @Autowired + private ExtractFactory extractFactory; + + @GetMapping("/getExtractByCoordinate") + public String getExtractImpl(@RequestParam("bus") String bus, + @RequestParam(value = "scene", required = false) String scene, + @RequestParam(value = "useCase", required = false) String useCase){ + ExtractDemo extract = extractFactory.getExtractByCoordinate(ExtractCoordinate.build(bus, scene, useCase)); + return extract.getName(); + } + + @GetMapping("/getExtractByInterClass") + public List getExtractByInterClass(@RequestParam(value = "pluginId", required = false) String pluginId){ + List extractByInterClass = null; + if(ObjectUtils.isEmpty(pluginId)){ + extractByInterClass = extractFactory.getExtractByInterClass(ExtractDemo.class); + } else { + extractByInterClass = extractFactory.getExtractByInterClass(pluginId, ExtractDemo.class); + } + return extractByInterClass.stream() + .map(ExtractDemo::getName) + .collect(Collectors.toList()); + } - @GetMapping() - public ExtractExample.Info getExtractImpl(@RequestParam("bus") String bus, - @RequestParam(value = "scene", required = false) String scene, - @RequestParam(value = "useCase", required = false) String useCase){ - ExtractExample extractExample = extractFactory.getExtractByCoordinate( - ExtractCoordinate.build(bus, scene, useCase)); - ExtractExample.Info info = new ExtractExample.Info(); - return extractExample.exeInfo(info); + @GetMapping("/getExtractByInterClassOfMain") + public List getExtractByInterClassOfMain(){ + List extractByInterClass = extractFactory.getExtractByInterClassOfMain(ExtractDemo.class); + return extractByInterClass.stream() + .map(ExtractDemo::getName) + .collect(Collectors.toList()); } diff --git a/example-main/src/main/java/com/gitee/starblues/example/service/extract/ExtractDemo.java b/example-main/src/main/java/com/gitee/starblues/example/service/extract/ExtractDemo.java new file mode 100644 index 0000000..7ef10dc --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/service/extract/ExtractDemo.java @@ -0,0 +1,16 @@ +package com.gitee.starblues.example.service.extract; + +/** + * 扩展接口 + * @author starBlues + * @version 1.0 + */ +public interface ExtractDemo { + + /** + * getName + * @return String + */ + String getName(); + +} diff --git a/example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java b/example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java new file mode 100644 index 0000000..f7a4d70 --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java @@ -0,0 +1,15 @@ +package com.gitee.starblues.example.service.extract; + +import com.gitee.starblues.annotation.Extract; + +/** + * @author starBlues + * @version 1.0 + */ +@Extract(bus = "extract", scene = "demo", useCase = "main", order = Integer.MAX_VALUE) +public class MainExtractImpl implements ExtractDemo{ + @Override + public String getName() { + return "mainExtractImpl"; + } +} diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractExample1.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractBasic1.java similarity index 42% rename from example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractExample1.java rename to example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractBasic1.java index 8a4f938..63f4e75 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractExample1.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractBasic1.java @@ -1,18 +1,17 @@ package com.gitee.starblues.example.basic1.service; import com.gitee.starblues.annotation.Extract; -import com.gitee.starblues.example.plugin.ExtractExample; +import com.gitee.starblues.example.service.extract.ExtractDemo; /** * @author starBlues * @version 1.0 * @since 2021-08-01 */ -@Extract(bus = "PluginExtract1", order = 0) -public class ExtractExample1 implements ExtractExample { +@Extract(bus = "extract", scene = "demo", order = 10) +public class ExtractBasic1 implements ExtractDemo { @Override - public Info exeInfo(Info info) { - info.setName("ExtractExample1"); - return info; + public String getName() { + return "extractBasic1"; } } diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ExtractBasic2.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ExtractBasic2.java new file mode 100644 index 0000000..319df99 --- /dev/null +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ExtractBasic2.java @@ -0,0 +1,17 @@ +package com.gitee.starblues.example.basic2.service; + +import com.gitee.starblues.annotation.Extract; +import com.gitee.starblues.example.service.extract.ExtractDemo; + +/** + * @author starBlues + * @version 1.0 + * @since 2021-08-01 + */ +@Extract(bus = "extract", scene = "demo", order = 0) +public class ExtractBasic2 implements ExtractDemo { + @Override + public String getName() { + return "extractBasic2"; + } +} diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java index 8c50763..d6f9c0c 100644 --- a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java @@ -10,7 +10,6 @@ import org.springframework.stereotype.Service; * @author starBlues * @version 1.0 */ -@Service @Supplier("service-supper") public class ServiceSupper { -- Gitee From b2e38d4f9b8a26c76bd6bef32ea3ff892f43c0b1 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 8 Dec 2021 14:20:17 +0800 Subject: [PATCH 09/35] add Interceptors --- .../interceptor/Basic1HandlerInterceptor.java | 21 +++++++++++++++++ .../Basic1InterceptorRegister.java | 23 +++++++++++++++++++ 2 files changed, 44 insertions(+) create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1HandlerInterceptor.java create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1HandlerInterceptor.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1HandlerInterceptor.java new file mode 100644 index 0000000..edc850d --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1HandlerInterceptor.java @@ -0,0 +1,21 @@ +package com.gitee.starblues.example.basic1.interceptor; + +import org.springframework.stereotype.Component; +import org.springframework.web.servlet.HandlerInterceptor; +import org.springframework.web.servlet.ModelAndView; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +public class Basic1HandlerInterceptor implements HandlerInterceptor { + + @Override + public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception { + System.out.println("进入插件Basic1HandlerInterceptor拦截器"); + } +} diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java new file mode 100644 index 0000000..34a00d6 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java @@ -0,0 +1,23 @@ +package com.gitee.starblues.example.basic1.interceptor; + +import com.gitee.starblues.spring.processor.interceptor.PluginInterceptorRegister; +import com.gitee.starblues.spring.processor.interceptor.PluginInterceptorRegistry; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +public class Basic1InterceptorRegister implements PluginInterceptorRegister { + + @Autowired + private Basic1HandlerInterceptor basic1HandlerInterceptor; + + @Override + public void registry(PluginInterceptorRegistry registry) { + registry.addInterceptor(basic1HandlerInterceptor, PluginInterceptorRegistry.Type.PLUGIN) + .addPathPatterns("/**"); + } +} -- Gitee From b5eac6fce0047fa7b0af23b73ce6a61665deddfe Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 26 Dec 2021 18:21:28 +0800 Subject: [PATCH 10/35] 3.0.0 version2 --- example-main/pom.xml | 13 +++-- .../gitee/starblues/example/Application.java | 11 ++-- .../src/main/resources/application-dev.yml | 2 +- .../example/basic1/Basic1Plugin.java | 3 +- example-plugins-dir1/example-jpa/pom.xml | 50 +++++++++++++++++++ .../starblues/example/jpa/JpaPlugin.java | 18 ++++--- .../example/jpa/config/PluginJpaConfig.java | 16 ++---- .../jpa/extract/ExtractExampleImp1.java | 19 ------- .../src/main/resources/jpa-dev.yml | 5 ++ .../example-jpa/src/main/resources/jpa.yml | 3 ++ .../src/main/resources/plugin.properties | 5 +- example-plugins-dir1/pom.xml | 6 +++ pom.xml | 4 -- 13 files changed, 102 insertions(+), 53 deletions(-) delete mode 100644 example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/extract/ExtractExampleImp1.java create mode 100644 example-plugins-dir1/example-jpa/src/main/resources/jpa.yml diff --git a/example-main/pom.xml b/example-main/pom.xml index 227b447..57efa82 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -114,13 +114,18 @@ test - - com.gitee.starblues - example-plugin-dependency - ${project.version} + org.springframework.boot + spring-boot-starter-aop + + + + + + + org.springframework.boot spring-boot-starter-test diff --git a/example-main/src/main/java/com/gitee/starblues/example/Application.java b/example-main/src/main/java/com/gitee/starblues/example/Application.java index 0c4ca24..845fb95 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/Application.java +++ b/example-main/src/main/java/com/gitee/starblues/example/Application.java @@ -1,9 +1,10 @@ package com.gitee.starblues.example; +import com.gitee.starblues.core.launcher.SpringMainBootstrap; +import com.gitee.starblues.core.launcher.SpringBootstrap; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.ConfigurableApplicationContext; /** * @author starBlues @@ -11,10 +12,14 @@ import org.springframework.context.ConfigurableApplicationContext; */ @SpringBootApplication @MapperScan("com.gitee.starblues.example.mapper") -public class Application { +public class Application implements SpringBootstrap { public static void main(String[] args) { - SpringApplication.run(Application.class, args); + SpringMainBootstrap.launch(Application.class, args); } + @Override + public void run(String[] args) throws Exception { + SpringApplication.run(Application.class, args); + } } diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 2853b28..53ba705 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -21,7 +21,7 @@ plugin: mainPackage: com.gitee.starblues.example runMode: dev pluginPath: - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-dir1 sortInitPluginIds: - example-plugin1 - example-plugin2 diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java index 10a83d8..3fd226f 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -3,6 +3,7 @@ package com.gitee.starblues.example.basic1; import com.gitee.starblues.example.Application; import com.gitee.starblues.spring.oneself.OneselfPluginSpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.ComponentScan; /** * 基本插件 @@ -10,7 +11,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication() +@SpringBootApplication public class Basic1Plugin { public static void main(String[] args) { diff --git a/example-plugins-dir1/example-jpa/pom.xml b/example-plugins-dir1/example-jpa/pom.xml index 77ea0f8..a1e7ae3 100644 --- a/example-plugins-dir1/example-jpa/pom.xml +++ b/example-plugins-dir1/example-jpa/pom.xml @@ -13,4 +13,54 @@ example-jpa jar + + + + org.springframework.boot + spring-boot-starter-quartz + 2.5.0 + + + org.springframework.boot + spring-boot-starter-data-jpa + 2.5.0 + + + mysql + mysql-connector-java + 8.0.25 + + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + copy + package + + copy-dependencies + + + ${project.build.directory}/lib + + false + + false + + true + provided + + + + + + + \ No newline at end of file diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java b/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java index cdf11f9..ff05007 100644 --- a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java +++ b/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java @@ -1,18 +1,20 @@ package com.gitee.starblues.example.jpa; -import com.gitee.starblues.annotation.ConfigDefinition; -import com.gitee.starblues.realize.BasePlugin; -import org.pf4j.PluginWrapper; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; +import com.gitee.starblues.bootstrap.SpringPluginBootstrap; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Import; /** * jpa 插件 * @author starBlues * @version 2.4.3 */ -@ConfigDefinition(fileName = "jpa.yml", devSuffix = "-dev", prodSuffix = "-prod") -public class JpaPlugin extends BasePlugin { - public JpaPlugin(PluginWrapper wrapper) { - super(wrapper); +@SpringBootApplication() +@Import(ImportBean.class) +public class JpaPlugin extends SpringPluginBootstrap{ + + public static void main(String[] args) { + new JpaPlugin().run(JpaPlugin.class, args); } + } diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java b/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java index 25f4953..c1c6787 100644 --- a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java +++ b/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java @@ -1,12 +1,11 @@ package com.gitee.starblues.example.jpa.config; -import com.alibaba.druid.pool.DruidDataSource; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.context.annotation.Bean; + +import com.gitee.starblues.example.jpa.ImportBean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Import; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; - -import javax.sql.DataSource; +import org.springframework.orm.jpa.LocalEntityManagerFactoryBean; /** * 设置DataSource @@ -16,12 +15,5 @@ import javax.sql.DataSource; * @since 2021-05-25 */ @Configuration -@EnableJpaRepositories(basePackages = "com.gitee.starblues.example.jpa") public class PluginJpaConfig { - - @ConfigurationProperties(prefix = "spring.datasource") - @Bean - public DataSource dataSource(){ - return new DruidDataSource(); - } } diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/extract/ExtractExampleImp1.java b/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/extract/ExtractExampleImp1.java deleted file mode 100644 index 99b9074..0000000 --- a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/extract/ExtractExampleImp1.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gitee.starblues.example.jpa.extract; - -import com.gitee.starblues.annotation.Extract; -import com.gitee.starblues.example.plugin.ExtractExample; - -/** - * ExtractExample 实现1 - * @author starBlues - * @version 1.0 - * @since 2021-07-24 - */ -@Extract(bus = "example", scene = "jpa", order = 1) -public class ExtractExampleImp1 implements ExtractExample { - @Override - public Info exeInfo(Info info) { - info.setName("My is ExtractExampleImp1 of jpa-plugin"); - return info; - } -} diff --git a/example-plugins-dir1/example-jpa/src/main/resources/jpa-dev.yml b/example-plugins-dir1/example-jpa/src/main/resources/jpa-dev.yml index 02692ab..eb53406 100644 --- a/example-plugins-dir1/example-jpa/src/main/resources/jpa-dev.yml +++ b/example-plugins-dir1/example-jpa/src/main/resources/jpa-dev.yml @@ -1,4 +1,6 @@ spring: + application: + name: jpa-plugin1 datasource: # druid 数据库连接池配置 driver-class-name: com.mysql.cj.jdbc.Driver @@ -20,6 +22,9 @@ spring: # 配置指明在程序启动的时候要删除并且创建实体类对应的表。 hibernate: ddl-auto: create #update + jmx: + default-domain: jpa-plugin1 + enabled: false plugin: auto-config-class: diff --git a/example-plugins-dir1/example-jpa/src/main/resources/jpa.yml b/example-plugins-dir1/example-jpa/src/main/resources/jpa.yml new file mode 100644 index 0000000..caf4dfc --- /dev/null +++ b/example-plugins-dir1/example-jpa/src/main/resources/jpa.yml @@ -0,0 +1,3 @@ +spring: + profiles: + active: dev \ No newline at end of file diff --git a/example-plugins-dir1/example-jpa/src/main/resources/plugin.properties b/example-plugins-dir1/example-jpa/src/main/resources/plugin.properties index 7ff0931..f5d2566 100644 --- a/example-plugins-dir1/example-jpa/src/main/resources/plugin.properties +++ b/example-plugins-dir1/example-jpa/src/main/resources/plugin.properties @@ -2,4 +2,7 @@ plugin.id=example-jpa plugin.class=com.gitee.starblues.example.jpa.JpaPlugin plugin.version=2.4.3-SNAPSHOT plugin.provider=starblues -plugin.description=集成jpa插件 \ No newline at end of file +plugin.description=集成jpa插件 +plugin.configFileName=jpa.yml +plugin.libDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-framework-example//example-plugins-dir1//example-jpa//target//lib +plugin.externalDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-loader//target//classes \ No newline at end of file diff --git a/example-plugins-dir1/pom.xml b/example-plugins-dir1/pom.xml index fc1dd0c..cca7246 100644 --- a/example-plugins-dir1/pom.xml +++ b/example-plugins-dir1/pom.xml @@ -32,6 +32,12 @@ provided + + com.gitee.starblues + springboot-plugin-bootstrap + 3.0.0-RELEASE + + junit junit diff --git a/pom.xml b/pom.xml index 0a8bef0..af3792f 100644 --- a/pom.xml +++ b/pom.xml @@ -22,10 +22,6 @@ - - org.springframework.boot - spring-boot-maven-plugin - maven-compiler-plugin -- Gitee From 8b39c07b37b37137720074c789a35940b408b643 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 29 Dec 2021 14:07:39 +0800 Subject: [PATCH 11/35] submit invoke --- .../src/main/resources/application-dev.yml | 2 +- example-plugins-basic/example-basic-1/pom.xml | 49 +++++++++++++++++++ .../example/basic1/Basic1Plugin.java | 8 +-- .../basic1/rest/MainUserController.java | 1 + .../src/main/resources/plugin.properties | 4 +- example-plugins-basic/example-basic-2/pom.xml | 48 ++++++++++++++++++ .../example/basic2/Basic2Plugin.java | 13 +++-- .../src/main/resources/plugin.properties | 4 +- example-plugins-basic/pom.xml | 3 ++ 9 files changed, 119 insertions(+), 13 deletions(-) diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 53ba705..5bcc3ee 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -21,7 +21,7 @@ plugin: mainPackage: com.gitee.starblues.example runMode: dev pluginPath: - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-dir1 + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic sortInitPluginIds: - example-plugin1 - example-plugin2 diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 28f850d..f283c4f 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -12,4 +12,53 @@ example-basic-1 jar + + + org.springframework.boot + spring-boot-starter + 2.5.0 + + + org.springframework.boot + spring-boot-starter-aop + 2.5.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.11.3 + + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + copy + package + + copy-dependencies + + + ${project.build.directory}/lib + + false + + false + + true + provided + + + + + + + + \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java index 3fd226f..2e3dcee 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -1,8 +1,10 @@ package com.gitee.starblues.example.basic1; +import com.gitee.starblues.bootstrap.SpringPluginBootstrap; import com.gitee.starblues.example.Application; import com.gitee.starblues.spring.oneself.OneselfPluginSpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration; import org.springframework.context.annotation.ComponentScan; /** @@ -11,11 +13,11 @@ import org.springframework.context.annotation.ComponentScan; * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication -public class Basic1Plugin { +@SpringBootApplication(exclude = { SpringApplicationAdminJmxAutoConfiguration.class }) +public class Basic1Plugin extends SpringPluginBootstrap { public static void main(String[] args) { - OneselfPluginSpringApplication.run(Application.class, Basic1Plugin.class); + new Basic1Plugin().run(args); } } diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java index 4444a26..0fa9834 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java @@ -21,6 +21,7 @@ import java.util.List; public class MainUserController { @Autowired + @InjectMain("mainUserServiceImpl") private MainUserService mainUserService; diff --git a/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties b/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties index 918204c..f9dd073 100644 --- a/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties +++ b/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties @@ -3,4 +3,6 @@ plugin.class=com.gitee.starblues.example.basic1.Basic1Plugin plugin.version=1.0.0-SNAPSHOT plugin.provider=starblues plugin.description=基本插件1 -plugin.configFileName=basic-config.yaml \ No newline at end of file +plugin.configFileName=basic-config.yaml +plugin.libDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-framework-example//example-plugins-basic//example-basic-1//target//lib +plugin.externalDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-loader//target//classes \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml index aba3395..3225917 100644 --- a/example-plugins-basic/example-basic-2/pom.xml +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -9,7 +9,55 @@ 4.0.0 + + + org.springframework.boot + spring-boot-starter + 2.5.0 + + + org.springframework.boot + spring-boot-starter-aop + 2.5.0 + + + com.fasterxml.jackson.core + jackson-databind + 2.11.3 + + + example-basic-2 jar + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + copy + package + + copy-dependencies + + + ${project.build.directory}/lib + + false + + false + + true + provided + + + + + + + \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java index 5072f1d..0f565c3 100644 --- a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java @@ -1,9 +1,8 @@ package com.gitee.starblues.example.basic2; -import com.gitee.starblues.spring.oneself.OneselfPluginSpringApplication; +import com.gitee.starblues.bootstrap.SpringPluginBootstrap; import org.springframework.boot.autoconfigure.SpringBootApplication; - -import java.io.IOException; +import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration; /** * 基本插件 @@ -11,11 +10,11 @@ import java.io.IOException; * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic2") -public class Basic2Plugin { +@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic2", exclude = { SpringApplicationAdminJmxAutoConfiguration.class }) +public class Basic2Plugin extends SpringPluginBootstrap { - public static void main(String[] args) throws IOException { - OneselfPluginSpringApplication.run(Basic2Plugin.class); + public static void main(String[] args) { + new Basic2Plugin().run(args); } } diff --git a/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties b/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties index 57e351a..412c561 100644 --- a/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties +++ b/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties @@ -3,4 +3,6 @@ plugin.class=com.gitee.starblues.example.basic2.Basic2Plugin plugin.version=1.0.0-SNAPSHOT plugin.provider=starblues plugin.description=基本插件2 -plugin.configFileName=basic2-config.yaml \ No newline at end of file +plugin.configFileName=basic2-config.yaml +plugin.libDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-framework-example//example-plugins-basic//example-basic-2//target//lib +plugin.externalDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-loader//target//classes \ No newline at end of file diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 03d138b..7179dfd 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -42,4 +42,7 @@ + + + \ No newline at end of file -- Gitee From 05a7327b93923bbd27846eb9a544c9984380e898 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 29 Dec 2021 14:08:32 +0800 Subject: [PATCH 12/35] update compile error --- .../gitee/starblues/example/basic1/rest/MainUserController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java index 0fa9834..4444a26 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java @@ -21,7 +21,6 @@ import java.util.List; public class MainUserController { @Autowired - @InjectMain("mainUserServiceImpl") private MainUserService mainUserService; -- Gitee From 2ac831857a1fad60ac0e40b342ad329575c78ba0 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Thu, 30 Dec 2021 21:45:56 +0800 Subject: [PATCH 13/35] remove old version code --- .../com/gitee/starblues/example/rest/ExtractController.java | 4 ++-- .../example/basic1/interceptor/Basic1InterceptorRegister.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java b/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java index cfea73b..9a47954 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java @@ -1,8 +1,8 @@ package com.gitee.starblues.example.rest; import com.gitee.starblues.example.service.extract.ExtractDemo; -import com.gitee.starblues.spring.processor.extract.ExtractCoordinate; -import com.gitee.starblues.spring.processor.extract.ExtractFactory; +import com.gitee.starblues.spring.extract.ExtractCoordinate; +import com.gitee.starblues.spring.extract.ExtractFactory; import com.gitee.starblues.utils.ObjectUtils; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java index 34a00d6..e15d0dd 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/interceptor/Basic1InterceptorRegister.java @@ -1,7 +1,7 @@ package com.gitee.starblues.example.basic1.interceptor; -import com.gitee.starblues.spring.processor.interceptor.PluginInterceptorRegister; -import com.gitee.starblues.spring.processor.interceptor.PluginInterceptorRegistry; +import com.gitee.starblues.bootstrap.processor.interceptor.PluginInterceptorRegister; +import com.gitee.starblues.bootstrap.processor.interceptor.PluginInterceptorRegistry; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -- Gitee From 4a198c6142ef96c6fa1bf99179cd073eb2d14825 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 11 Jan 2022 15:12:04 +0800 Subject: [PATCH 14/35] add package --- example-main/pom.xml | 35 +++---------- .../example/listener/Pf4jPluginListener.java | 21 -------- .../src/main/resources/application-dev.yml | 5 +- example-plugins-basic/example-basic-1/pom.xml | 47 +++++++++++------ .../example/basic1/Basic1Plugin.java | 4 +- .../src/main/resources/plugin.properties | 8 --- .../example/basic2/Basic2Plugin.java | 3 +- example-plugins-basic/pom.xml | 11 ++++ example-plugins-dir2/example-plugin1/pom.xml | 51 +++++++++++++++++++ .../example/plugin1/ExamplePlugin1.java | 15 +++--- .../plugin1/config/MybatisPlusConfig.java | 36 ++++--------- .../plugin1/extract/ExtractExampleImp2.java | 19 ------- .../listener/ClearUserDataListener.java | 21 +++----- .../plugin1/service/impl/ExtractExample2.java | 19 ------- .../service/quartz/DatabaseInsertJob.java | 1 - .../Plugin1UserMapper.xml | 1 + .../src/main/resources/plugin.properties | 3 +- .../src/main/resources/plugin1-dev.yml | 26 +++++----- .../src/main/resources/plugin1.yml | 3 ++ example-plugins-dir2/pom.xml | 7 +++ 20 files changed, 155 insertions(+), 181 deletions(-) delete mode 100644 example-main/src/main/java/com/gitee/starblues/example/listener/Pf4jPluginListener.java delete mode 100644 example-plugins-basic/example-basic-1/src/main/resources/plugin.properties delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/extract/ExtractExampleImp2.java delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/ExtractExample2.java rename example-plugins-dir2/example-plugin1/src/main/resources/{plugin1-mapper => mapper}/Plugin1UserMapper.xml (99%) create mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml diff --git a/example-main/pom.xml b/example-main/pom.xml index 57efa82..9fad4ac 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -20,7 +20,7 @@ 2.5.0 - 3.4.2 + 3.5.0 2.2 @@ -136,38 +136,17 @@ - org.apache.maven.plugins - maven-jar-plugin - 3.2.0 - - - - true - lib/ - false - com.gitee.starblues.example.Application - - - ./ - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 + org.springframework.boot + spring-boot-maven-plugin + ${spring-boot.version} - copy - package + repackage - copy-dependencies + repackage - - ${project.build.directory}/lib - + exec diff --git a/example-main/src/main/java/com/gitee/starblues/example/listener/Pf4jPluginListener.java b/example-main/src/main/java/com/gitee/starblues/example/listener/Pf4jPluginListener.java deleted file mode 100644 index 97602b6..0000000 --- a/example-main/src/main/java/com/gitee/starblues/example/listener/Pf4jPluginListener.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gitee.starblues.example.listener; - -import lombok.extern.slf4j.Slf4j; -import org.pf4j.PluginState; -import org.pf4j.PluginStateEvent; -import org.pf4j.PluginStateListener; - -/** - * pf4j 插件监听器 - * @author starBlues - * @version 1.0 - * @since 2021-07-24 - */ -@Slf4j -public class Pf4jPluginListener implements PluginStateListener { - @Override - public void pluginStateChanged(PluginStateEvent event) { - PluginState pluginState = event.getPluginState(); - log.info("Plugin {} {}", event.getPlugin().getPluginId(), pluginState.toString()); - } -} diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 5bcc3ee..b32cae2 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -19,9 +19,10 @@ plugin: enable: true enable-starter: true mainPackage: com.gitee.starblues.example - runMode: dev + runMode: prod pluginPath: - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic + #- D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic\example-basic-1 + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\plugin sortInitPluginIds: - example-plugin1 - example-plugin2 diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index f283c4f..0a36204 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -28,32 +28,47 @@ jackson-databind 2.11.3 + + com.gitee.starblues + spring-plugin-framework-common + 3.0.0-RELEASE + - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 + com.gitee.starblues + springboot-plugin-maven-pack + + prod + + example-basic-1 + com.gitee.starblues.example.basic1.Basic1Plugin + 1.0.0-SNAPSHOT + starBlues + 基本插件1 + basic-config.yaml + + + + + com.gitee.starblues + spring-plugin-framework-common + D:\etc\kitte\ksm\springboot-plugin-framework-parent\spring-plugin-framework-common\target\classes + + + + + jar + + - copy - package - copy-dependencies + repackage - - ${project.build.directory}/lib - - false - - false - - true - provided - diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java index 2e3dcee..fadcf2d 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -1,11 +1,9 @@ package com.gitee.starblues.example.basic1; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; -import com.gitee.starblues.example.Application; -import com.gitee.starblues.spring.oneself.OneselfPluginSpringApplication; +import com.gitee.starblues.bootstrap.annotation.DisablePluginWeb; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration; -import org.springframework.context.annotation.ComponentScan; /** * 基本插件 diff --git a/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties b/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties deleted file mode 100644 index f9dd073..0000000 --- a/example-plugins-basic/example-basic-1/src/main/resources/plugin.properties +++ /dev/null @@ -1,8 +0,0 @@ -plugin.id=example-basic-1 -plugin.class=com.gitee.starblues.example.basic1.Basic1Plugin -plugin.version=1.0.0-SNAPSHOT -plugin.provider=starblues -plugin.description=基本插件1 -plugin.configFileName=basic-config.yaml -plugin.libDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-framework-example//example-plugins-basic//example-basic-1//target//lib -plugin.externalDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-loader//target//classes \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java index 0f565c3..3647661 100644 --- a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java @@ -2,7 +2,6 @@ package com.gitee.starblues.example.basic2; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration; /** * 基本插件 @@ -10,7 +9,7 @@ import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAut * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic2", exclude = { SpringApplicationAdminJmxAutoConfiguration.class }) +@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic2") public class Basic2Plugin extends SpringPluginBootstrap { public static void main(String[] args) { diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 7179dfd..d330f6d 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -42,6 +42,17 @@ + + + + + com.gitee.starblues + springboot-plugin-maven-pack + 3.0.0-RELEASE + + + + diff --git a/example-plugins-dir2/example-plugin1/pom.xml b/example-plugins-dir2/example-plugin1/pom.xml index 3a46d9d..5ab2115 100644 --- a/example-plugins-dir2/example-plugin1/pom.xml +++ b/example-plugins-dir2/example-plugin1/pom.xml @@ -12,6 +12,57 @@ example-plugin1 jar + + + org.springframework.boot + spring-boot-starter + 2.5.0 + + + com.baomidou + mybatis-plus-boot-starter + 3.5.0 + + + mysql + mysql-connector-java + 8.0.25 + + + org.springframework.boot + spring-boot-starter-quartz + 2.5.0 + + + + + + + org.apache.maven.plugins + maven-dependency-plugin + 3.2.0 + + + copy + package + + copy-dependencies + + + ${project.build.directory}/lib + + false + + false + + true + provided + + + + + + \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java index 778d7eb..ea9f464 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java +++ b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java @@ -1,16 +1,19 @@ package com.gitee.starblues.example.plugin1; -import com.gitee.starblues.annotation.ConfigDefinition; -import com.gitee.starblues.realize.BasePlugin; -import org.pf4j.PluginWrapper; +import com.gitee.starblues.bootstrap.SpringPluginBootstrap; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.boot.autoconfigure.SpringBootApplication; /** * 案例插件1 * @author starBlues * @version 2.4.3 */ -public class ExamplePlugin1 extends BasePlugin { - public ExamplePlugin1(PluginWrapper wrapper) { - super(wrapper); +@SpringBootApplication +public class ExamplePlugin1 extends SpringPluginBootstrap { + + public static void main(String[] args) { + new ExamplePlugin1().run(args); } + } diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java index 9a0862d..5468694 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java +++ b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java @@ -1,42 +1,26 @@ package com.gitee.starblues.example.plugin1.config; -import com.baomidou.mybatisplus.core.MybatisConfiguration; -import com.baomidou.mybatisplus.core.config.GlobalConfig; import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import com.gitee.starblues.annotation.ConfigDefinition; -import com.gitee.starblues.extension.mybatis.mybatisplus.SpringBootMybatisPlusConfig; import org.apache.ibatis.reflection.MetaObject; +import org.mybatis.spring.annotation.MapperScan; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import java.util.HashSet; -import java.util.Set; /** * 插件中mybatis-plus配置 * @author starBlues - * @version 2.4.3 + * @version 3.0.0 */ -@ConfigDefinition -public class MybatisPlusConfig implements SpringBootMybatisPlusConfig { +@Configuration +@MapperScan("com.gitee.starblues.example.plugin1.mapper") +public class MybatisPlusConfig { - @Override - public void reSetMainConfig(MybatisConfiguration configuration, GlobalConfig globalConfig) { - globalConfig.setMetaObjectHandler(new GmtTimeHandler()); - } - - @Override - public Set entityPackage() { - Set typeAliasesPackage = new HashSet<>(); - typeAliasesPackage.add("com.gitee.starblues.example.plugin1.entity"); - return typeAliasesPackage; - } - - @Override - public Set xmlLocationsMatch() { - Set xmlLocationsMatch = new HashSet<>(); - xmlLocationsMatch.add("classpath:plugin1-mapper/*Mapper.xml"); - return xmlLocationsMatch; + @Bean + public GmtTimeHandler gmtTimeHandler(){ + return new GmtTimeHandler(); } public static class GmtTimeHandler implements MetaObjectHandler { diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/extract/ExtractExampleImp2.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/extract/ExtractExampleImp2.java deleted file mode 100644 index 2431ad9..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/extract/ExtractExampleImp2.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gitee.starblues.example.plugin1.extract; - -import com.gitee.starblues.annotation.Extract; -import com.gitee.starblues.example.plugin.ExtractExample; - -/** - * ExtractExample 实现1 - * @author starBlues - * @version 1.0 - * @since 2021-07-24 - */ -@Extract(bus = "example", scene = "plugin", order = 1) -public class ExtractExampleImp2 implements ExtractExample { - @Override - public Info exeInfo(Info info) { - info.setName("My is ExtractExampleImp2 of example-plugin1"); - return info; - } -} diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java index 2b71919..62223cf 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java +++ b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java @@ -1,12 +1,12 @@ package com.gitee.starblues.example.plugin1.listener; import com.gitee.starblues.example.plugin1.service.Plugin1UserService; -import com.gitee.starblues.realize.BasePlugin; -import com.gitee.starblues.realize.OneselfListener; -import com.gitee.starblues.utils.OrderPriority; import lombok.AllArgsConstructor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import org.springframework.boot.context.event.ApplicationStartedEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; /** * 清除user表数据的监听器 @@ -15,8 +15,9 @@ import org.slf4j.LoggerFactory; * @version 1.0 * @since 2021-05-25 */ +@Component @AllArgsConstructor -public class ClearUserDataListener implements OneselfListener { +public class ClearUserDataListener implements ApplicationListener { private final static Logger LOG = LoggerFactory.getLogger(ClearUserDataListener.class); @@ -24,18 +25,8 @@ public class ClearUserDataListener implements OneselfListener { private final Plugin1UserService plugin1UserService; @Override - public OrderPriority order() { - return OrderPriority.getHighPriority(); - } - - @Override - public void startEvent(BasePlugin basePlugin) { + public void onApplicationEvent(ApplicationStartedEvent event) { plugin1UserService.remove(null); LOG.info("清除用户表数据成功"); } - - @Override - public void stopEvent(BasePlugin basePlugin) { - - } } diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/ExtractExample2.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/ExtractExample2.java deleted file mode 100644 index 6555211..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/ExtractExample2.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gitee.starblues.example.plugin1.service.impl; - -import com.gitee.starblues.annotation.Extract; -import com.gitee.starblues.example.plugin.ExtractExample; - -/** - * @author zhangzhuo@acoinfo.com - * @version 1.0 - * @since 2021-07-23 - */ -@Extract(bus = "PluginExtract2", order = 0) -public class ExtractExample2 implements ExtractExample { - - @Override - public Info exeInfo(Info info) { - info.setName("ExtractExample2"); - return info; - } -} diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java index 1a384b8..c892347 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java +++ b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java @@ -10,7 +10,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.ApplicationContext; -import java.util.Date; import java.util.concurrent.atomic.AtomicInteger; /** diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-mapper/Plugin1UserMapper.xml b/example-plugins-dir2/example-plugin1/src/main/resources/mapper/Plugin1UserMapper.xml similarity index 99% rename from example-plugins-dir2/example-plugin1/src/main/resources/plugin1-mapper/Plugin1UserMapper.xml rename to example-plugins-dir2/example-plugin1/src/main/resources/mapper/Plugin1UserMapper.xml index 6ac88ec..6ce83ff 100644 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-mapper/Plugin1UserMapper.xml +++ b/example-plugins-dir2/example-plugin1/src/main/resources/mapper/Plugin1UserMapper.xml @@ -26,6 +26,7 @@ user_id, name, phone, email, username, password, status, deleted, locked, create_user, gmt_created, modified_user, gmt_modified, avatar, last_login_ip, last_gmt_login_time + diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties b/example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties index 4470656..20f8234 100644 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties +++ b/example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties @@ -4,4 +4,5 @@ plugin.version=2.4.3-SNAPSHOT plugin.provider=starblues plugin.description=案例插件1 plugin.configFileName=plugin1.yml -plugin.configFileProfile=dev \ No newline at end of file +plugin.configFileProfile=dev +plugin.libDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-framework-example//example-plugins-dir2//example-plugin1//target//lib \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml index 7bd4545..8c5972d 100644 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml +++ b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml @@ -1,16 +1,14 @@ spring: - profiles: - include: thymeleaf + datasource: + # druid 数据库连接池配置 + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC + username: root + password: 123456 -plugin: - log-config-location: classpath:plugin1-log.xml - # 静态资源配置 - static: - # 静态资源位置 - locations: - - classpath:static - # - file:D:\aa - # log-config-location: classpath:plugin1-log.xml - # 配置当前插件需要自动装载的类。用于集成 xxx-starter - auto-config-class: - - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration +mybatis-plus: + typeAliasesPackage: com.gitee.starblues.example.plugin1.entity + mapperLocations: classpath*:mapper/*.xml + configuration: + mapUnderscoreToCamelCase: true + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml new file mode 100644 index 0000000..3d7808a --- /dev/null +++ b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml @@ -0,0 +1,3 @@ +spring: + profiles: + active: dev diff --git a/example-plugins-dir2/pom.xml b/example-plugins-dir2/pom.xml index 2c7e167..9c8fe26 100644 --- a/example-plugins-dir2/pom.xml +++ b/example-plugins-dir2/pom.xml @@ -33,6 +33,13 @@ provided + + com.gitee.starblues + springboot-plugin-bootstrap + 3.0.0-RELEASE + provided + + junit junit -- Gitee From c5e07ddd0362662cd311f5305394eb99aaae68aa Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 18 Jan 2022 17:55:44 +0800 Subject: [PATCH 15/35] add plugin update --- .../example/rest/PluginResource.java | 65 +++++-------------- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application.yml | 8 ++- example-plugins-basic/example-basic-1/pom.xml | 13 ++-- example-plugins-basic/pom.xml | 6 ++ pom.xml | 2 +- 6 files changed, 40 insertions(+), 56 deletions(-) diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java index c22a55c..90dd3b3 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java @@ -1,13 +1,15 @@ package com.gitee.starblues.example.rest; +import com.gitee.starblues.core.PluginInfo; import com.gitee.starblues.integration.application.PluginApplication; import com.gitee.starblues.integration.operator.PluginOperator; -import com.gitee.starblues.integration.operator.module.PluginInfo; +import com.gitee.starblues.integration.operator.upload.UploadParam; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; +import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; import java.util.Set; @@ -39,20 +41,6 @@ public class PluginResource { return pluginOperator.getPluginInfo(); } - /** - * 获取插件jar文件名 - * @return 获取插件文件名。只在生产环境显示 - */ - @GetMapping("/files") - public Set getPluginFilePaths(){ - try { - return pluginOperator.getPluginFilePaths(); - } catch (Exception e) { - e.printStackTrace(); - return null; - } - } - /** * 根据插件id停止插件 @@ -101,11 +89,8 @@ public class PluginResource { @PostMapping("/uninstall/{id}") public String uninstall(@PathVariable("id") String id){ try { - if(pluginOperator.uninstall(id, true)){ - return "plugin '" + id +"' uninstall success"; - } else { - return "plugin '" + id +"' uninstall failure"; - } + pluginOperator.uninstall(id, true, true); + return "plugin '" + id +"' uninstall success"; } catch (Exception e) { e.printStackTrace(); return "plugin '" + id +"' uninstall failure. " + e.getMessage(); @@ -119,9 +104,10 @@ public class PluginResource { * @return 操作结果 */ @PostMapping("/installByPath") - public String install(@RequestParam("path") String path){ + public String install(@RequestParam("path") String path, + @RequestParam(value = "unpackPlugin", defaultValue = "false", required = false) Boolean unpackPlugin){ try { - PluginInfo pluginInfo = pluginOperator.install(Paths.get(path)); + PluginInfo pluginInfo = pluginOperator.install(Paths.get(path), unpackPlugin); if(pluginInfo != null){ return "installByPath success"; } else { @@ -139,10 +125,14 @@ public class PluginResource { * @param multipartFile 上传文件 multipartFile * @return 操作结果 */ - @PostMapping("/uploadInstallPluginJar") - public String install(@RequestParam("jarFile") MultipartFile multipartFile){ + @PostMapping("/upload") + public String upload(@RequestParam("jarFile") MultipartFile multipartFile){ try { - PluginInfo pluginInfo = pluginOperator.uploadPluginAndStart(multipartFile); + UploadParam uploadParam = UploadParam.byMultipartFile(multipartFile) + .setBackOldPlugin(true) + .setStartPlugin(true) + .setUnpackPlugin(false); + PluginInfo pluginInfo = pluginOperator.uploadPlugin(uploadParam); if(pluginInfo != null){ return "install success"; } else { @@ -155,26 +145,6 @@ public class PluginResource { } - /** - * 上传插件的配置文件。注意: 该操作只适用于生产环境 - * @param multipartFile 上传文件 multipartFile - * @return 操作结果 - */ - @PostMapping("/uploadPluginConfigFile") - public String uploadConfig(@RequestParam("configFile") MultipartFile multipartFile){ - try { - if(pluginOperator.uploadConfigFile(multipartFile)){ - return "uploadConfig success"; - } else { - return "uploadConfig failure"; - } - } catch (Exception e) { - e.printStackTrace(); - return "uploadConfig failure : " + e.getMessage(); - } - } - - /** * 备份插件。注意: 该操作只适用于生产环境 * @param pluginId 插件id @@ -183,8 +153,9 @@ public class PluginResource { @PostMapping("/back/{pluginId}") public String backupPlugin(@PathVariable("pluginId") String pluginId){ try { - if(pluginOperator.backupPlugin(pluginId, "testBack")){ - return "backupPlugin success"; + Path path = pluginOperator.backupPlugin(pluginId, "testBack"); + if(path != null){ + return "backupPlugin success: " + path; } else { return "backupPlugin failure"; } diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index b32cae2..68e7c66 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -24,7 +24,7 @@ plugin: #- D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic\example-basic-1 - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\plugin sortInitPluginIds: + - example-basic-1 - example-plugin1 - example-plugin2 - example-jpa - diff --git a/example-main/src/main/resources/application.yml b/example-main/src/main/resources/application.yml index caf4dfc..42f7853 100644 --- a/example-main/src/main/resources/application.yml +++ b/example-main/src/main/resources/application.yml @@ -1,3 +1,9 @@ spring: profiles: - active: dev \ No newline at end of file + active: dev + servlet: + multipart: + enabled: true + max-request-size: 100MB + max-file-size: 100MB + file-size-threshold: 20MB #当文件达到多少时进行磁盘写入 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 0a36204..0d92b43 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -3,7 +3,7 @@ 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"> - example-plugins-dir1 + example-plugins-basic com.gitee.starblues 1.0.0-SNAPSHOT @@ -28,11 +28,6 @@ jackson-databind 2.11.3 - - com.gitee.starblues - spring-plugin-framework-common - 3.0.0-RELEASE - @@ -63,6 +58,12 @@ jar + + + com.gitee.starblues + springboot-plugin-bootstrap + + diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index d330f6d..2fad3a0 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -33,6 +33,12 @@ provided + + com.gitee.starblues + springboot-plugin-bootstrap + 3.0.0-RELEASE + + junit junit diff --git a/pom.xml b/pom.xml index af3792f..116ac7e 100644 --- a/pom.xml +++ b/pom.xml @@ -17,7 +17,7 @@ example-plugin-dependency example-plugins-basic example-plugins-dir1 - example-plugins-dir2 + -- Gitee From 7819a52dc113e02461293da6a1a90665cee4f301 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Wed, 19 Jan 2022 17:29:19 +0800 Subject: [PATCH 16/35] add plugin patterns --- example-plugins-basic/example-basic-1/pom.xml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 0d92b43..dc20178 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -64,6 +64,16 @@ springboot-plugin-bootstrap + + + com.sta.includes1.** + com.sta.includes12.** + + + com.sta.excludes1.** + com.sta.excludes2.** + + -- Gitee From f5e353dceec3a8635c628b52801821e3d18fe578 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 23 Jan 2022 11:20:23 +0800 Subject: [PATCH 17/35] add static resource and thymeleaf --- .../src/main/resources/application-dev.yml | 6 +- .../example/basic1/Basic1Plugin.java | 2 +- .../basic1/rest/ThymeleafController.java | 32 ++++++ .../src/main/resources/basic-config.yaml | 9 +- .../resources/plugin1-template/index.html | 24 ++++ .../src/main/resources/static/css/all.css | 104 ++++++++++++++++++ .../src/main/resources/static/image/image.png | Bin 0 -> 5719 bytes .../src/main/resources/static/index.html | 22 ++++ 8 files changed, 194 insertions(+), 5 deletions(-) create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/plugin1-template/index.html create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/static/css/all.css create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/static/image/image.png create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/static/index.html diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 68e7c66..96bedb0 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -19,10 +19,10 @@ plugin: enable: true enable-starter: true mainPackage: com.gitee.starblues.example - runMode: prod + runMode: dev pluginPath: - #- D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic\example-basic-1 - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\plugin + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic\example-basic-1 + #- D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\plugin sortInitPluginIds: - example-basic-1 - example-plugin1 diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java index fadcf2d..eb5569a 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -11,7 +11,7 @@ import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAut * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication(exclude = { SpringApplicationAdminJmxAutoConfiguration.class }) +@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic1") public class Basic1Plugin extends SpringPluginBootstrap { public static void main(String[] args) { diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java new file mode 100644 index 0000000..9d39f8e --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java @@ -0,0 +1,32 @@ +package com.gitee.starblues.example.basic1.rest; + +import com.gitee.starblues.realize.ConfigDefinitionTip; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; + +import java.util.UUID; + +/** + * Thymeleaf 模板引擎接口 + * @author starBlues + * @version 2.3.0 + */ +@Controller() +@RequestMapping("/thy") +@Api +public class ThymeleafController { + + @GetMapping() + public String show(Model model){ + model.addAttribute("uid", UUID.randomUUID().toString()); + model.addAttribute("name","uuid"); + return "index"; + } + + +} diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml index caf4dfc..4d3bb90 100644 --- a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml +++ b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml @@ -1,3 +1,10 @@ spring: profiles: - active: dev \ No newline at end of file + active: dev + resources: + static-locations: classpath:static + thymeleaf: + prefix: plugin1-template + suffix: .html + mode: html + encoding: utf-8 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/src/main/resources/plugin1-template/index.html b/example-plugins-basic/example-basic-1/src/main/resources/plugin1-template/index.html new file mode 100644 index 0000000..5f403ef --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/resources/plugin1-template/index.html @@ -0,0 +1,24 @@ + + + integration-mybatis-plugin1 + + + + +
+ +
+
+
+
+
+

hello. 显示插件静态资源正常

+

+

+
+
+
+
+
+ + \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/src/main/resources/static/css/all.css b/example-plugins-basic/example-basic-1/src/main/resources/static/css/all.css new file mode 100644 index 0000000..3315976 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/resources/static/css/all.css @@ -0,0 +1,104 @@ +body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, textarea, select, optgroup, option, fieldset, legend, p, blockquote, th, td { + margin:0; + padding:0 +} +fieldset, img { + border:0 +} +ul, li, ol { + list-style:none +} +h1, h2, h3, h4, h5, h6 { + font-size:100% +} +legend { + color:#000 +} +input, button, textarea, select, optgroup, option { + font-family:inherit; + font-size:inherit; + font-style:inherit; + font-weight:inherit +} +input, button, select { + margin:0; +*font-size:100%; + line-height:1.2 +} +a img, img { + -ms-interpolation-mode:bicubic +} +body { + background:#FFF +} +a { + color:#06c; + text-decoration:none +} +a:hover, a:active, a:focus { + color:#06c; + text-decoration:underline +} +table { + border-collapse:collapse; + border-spacing:0 +} +header, aside, section { + display:block +} +body, button, input, select, textarea { + font:12px/1.5 tahoma, arial, "隶书"; + color:#666 +} +.center { + text-align:center +} +.clear:after, .clearfix:after { + content:"."; + display:block; + clear:both; + visibility:hidden; + font-size:0; + height:0; + line-height:0 +} +.clear, .clearfix { + zoom:1 +} +.b-panel { + position:absolute +} +.b-fr { + float:right +} +.b-fl { + float:left +} +.error-404 { + background-color:#EDEDF0 +} +.module-error { + margin-top:182px +} +.module-error .error-main { + margin:0 auto; + width:420px +} +.module-error .label { + float:left; + width:160px; + height:151px; + background:url('../image/image.png') 0 0 no-repeat +} +.module-error .info { + margin-left:182px; + line-height:1.8 +} +.module-error .title { + color:#666; + font-size:14px +} +.module-error .reason { + margin:8px 0 18px 0; + color:#666 +} diff --git a/example-plugins-basic/example-basic-1/src/main/resources/static/image/image.png b/example-plugins-basic/example-basic-1/src/main/resources/static/image/image.png new file mode 100644 index 0000000000000000000000000000000000000000..bebc1e79986616fa484d186b40d80c77cf9385e0 GIT binary patch literal 5719 zcmds5)mIb_u-*lvQ@RxC4oT^jl@94nX=Le^7C|JWyFpTxuEk{mk*=jXq?d-JuD|;q z+}Atjd^6{p`5tCo=A4<&S{iQ&aA|M>0003vkx4vq1NYlX0*v z$5er2%8#DoQN}?J=G)P%&6At11>|6w_*6}azpl*A+VV8ivnp81MfO!qieFxk$^KGg zUybAS66C86<7F9Wekda^P_A@%|L-JtXL+b|{$ym+4E!|snU?HDaYn`F(g!hI;wrM%!zHG-DGDvXlKN2q$}B0>{YO#;Oa;KVr;l9 zG4hj{O5NmPN%Y&5rG@G*pzg}d+w-QI$URpAArz9cZ0;;^SciQL0 z-kN9hr#0kfcIJr!;S;%kT2a>HEv+aY~+bR#V;eW}uq_h(>Lq3KxR)v@Rgl8kk!Mi;BD zGw{-E_->Ttn_Y-}cWvn^%(f?lySXGg!Gfc+#OAWb;A*>|B+m07M;Y9-^4-sA6)~0I zD1I`|-I1xD;;G=O$Y(A5Vz|k=BwA;<E@&~|D$-YnZoI; zN=bxOdvQora#VVt&OqbWX(Lz_^z$l-Ank&X_OVH7`8m(_NqETdu7n` zx+iG73yc`qBKH8~n;;^Rbg07h`)mL3rSu=xOTZoLjNTZXLh@-zdHRFd(GsnoCnt?{w zrtdnp!)bN#fon5Gs1sO4lviW4Oi!s{q$&SZqxDZ4#`2MagA}3bHuv-1&dYWGi8r%6 z000o+rK6$yuciNQ2Kc`WglS3j^WU1l@lY`W0|0o>{{wJxIpqFdlEO>L&`ZJ7&dSTt z-Hk!d(bWzhAi&2j!Y3d&;Xmd2PeJ#eLf75i%h$@&4j^aiZf(b)?C5Fd>+b0cW>C-- z{@AoB0sxR?fE4BQ{BpW-h)i{N+Xhx)f6e9zz7lj=Hs~1C6B~0{w~mtP$EI)>MfT7u z6;6Cz)PI~ySmG&zQpWwU3l{0kSe*9mG%LDRdHo(xOUB$ zcY;se+~$Kd&hk>AC+FH{yHdMB=aMJqonv=-qQK~92pavGUP*2KA6NW8cJPR9h60;h zviKy|vI<1!ge?4^@8zn4I+0;R1=s&eVRCXV8-D9RUyNr`mJ>niKm=yP*=acXET-JD zoO{n&SRgi(UaGF3*}?-VAx9B>1Nb~C8Wv2mRVF3p!$GnD#uD;z=5=gW+F|ST>>(>D zez)4VUek2hCv^@G)2@9M2`M!3eGci8U7X!LtyqBhoYOZG{XXXYP43}jUDak>Qxi)y z48U@a#TUet!>qWngiAOd1(g!k)p_em`^{jfvOYV%V%#{!_X;C8a0NhM6-P){B~MEX zNcQMd&4yxE+&81I#SorAhhc{{byLGEu6Upd!YO5F&rz4#!t9FnaXmnMp?aY0EsAQ~ zL!W>r22T@7SoW(Y6RNagua$tqTnW zufSu05--NHCa{=5#Xi(>&Gf_1L#x_La!Hrnh~_pWV-Fjc^NAd5{?c3iCiqUnE=w;* z0j%=S0ePbpWO053Q(ZXzI07Zwx%kVzWH$$ja88r6Iq1@A5S#w;St=_etb~YvI&EEO zYW}QSBMiw@CglUvAt7e=#R<5eKkJ03x)f>#w!FP@;n}!x>1KYofG;%DQ;y|W`3IqQ z*a{#zg2)85n3o5mP%QJub%17$lKxpbmAhpA{wYTl^7iE8Uyndz98tk->e?`aA@WLZ zGjeh>Zyv1I)Fi4zO%cu1V-68}*_B%x*z7vM0>by?NKAm3z(N05=@aWW6tz_DG5JpK zSEjXDo@%hg33Gle+JMP!!6oI`f*vwUyy&n)KX)2YvoUykQ5d zB@FYNj+que4*rfPERqD_FSHR95AR3Y8?bH|XL`vTsXQ$L?uesIVSRt|ykRaSqQ-4h z1_yU3A%t-Mil88BtT6&qGc*=zs&(wIuQWJ6Z3i^;!nm#V$)~DvX!>Bh_ zN4Aaei@eXhzenv|@U0kDx?TkB>;|FzEtg_Y_V$=;`=dLvkok*NwMQJCRWkQY_rbL^ zUALrcX|JlyKglZPa}*Yjxd~vBYdn&g-)Q5lbNx^-7&zg zutV^!rq6v9NuyOFE)c!H1|B8dPAyI3%D~apsDqW~d-G1T0#Km0@K} zU~rZ+yZSjFqJ*nr-o6Y)_r@;6%`@}15z9r{7rD>>M}WnOCV}-;_nT}{KoVa8L7xN5l4J-qX?Aa5> z#N*@jNOp^4VhYUjk+K7?n(f}IDq_Z9P_WhyYf$iQ>^YTArot?TaELALpU0*9{oT|0 zO~(y9y_dvZCr|ee`l{zTDmODelixL~bG-Mt)EyVi^nDD`Si{iu(DkcwWV|=uoNdpC zSN0!%3MW!&A9%bRxI)MNbrG)`&8E>l+)}pPlHP8b#KMpZB-(EEgReO>uWK!*Dj>6TSIr-=E4qGTMJQ z!?nE0@_wSH0c8HM|1zr@FveMdNmtJb;S$X1mtT<`-T&T*kGN(oHO)I!bq6HGiN^tT zM|9~nfq01TaNZiEc*2@#>64=ck$<@r%y@j zoQ5#9lxm6{TAu$lY;5#^zD{#pkH=DAc5QJ^wt6OpZqI>9R~7yKoz17Xa0B6NO8@=o zN}B;zEF#+?bq$N;)yLQkE0M4eTqo+r?NEQonRJTX<^}T?Qr;(fPeGZ}559@r)Hk3n zyRDgNe|*bzDPI}_qJ6Z7G7zFBmne#uZpz!8hjfd_W%w8O;Fxg}%BQFNe8T&!Ff6G0 zS&?8Wl|4EYW?Cx^QUGtsrsk``^A~~X{L3b*EqfA_J^r`L1fNKb2{L@79w=7;B3u=A zzbGp75vswiKF377k3?ibtD-Ut`A>(9feLN}8NSgpj4l8y&hedn$F$MiYKJtLt*Z)0 z|D|KEb~uYIl#2n)mD4u?*Y7D%#=j57=KRk2CU!LJZVh z?&m#yiUD`&!6$A29_{!})<*G|skhL|%(-T+CpiC?nix;$2S;&r>_#B>OT}~K#e~CX zeow%vOUIAhRsXn&fReMowa}rm7>)9$w2)kSa{gz1Me5N}h&*ZcDT%wKU5X-9Or(0! zCx=NhJh`;69p2cVrjVPx6QkR!2iw~-$#-Ta%wlk7*DCfb7l(z3a9lqTbnmXCQfJy( z(teX3_tmF|^=z3SOk>Fm{-+u5gJY*mH;E#&Gfpkwsb(FIMbBg9<%wxms4L7Nzw6fF zy5_Ud*^kh`Ztek9StSxw@@+Y78lT1Ej=+sOY(i7Y$HY21eN`9dultuGv{3-XH61dY z;$@fehmSP!dY9iK{m{p_pt+X#GcbD`oI+t1putGEn>)ar{aXh^-p~e^n3E+q9&a=N zy|oE=Sv&Z%Ry-}to^&H3cLiWxOBLanKj~34zPdWzn>L1)f$`x);T2l+b5e~`&v|7l zyUFB<`Qf3V!if@2vH6N2wW{IxLAtou50$is`&lE0$QurJMwl&mo?J)kSM0g@jp=7m zpl==@(w3UWUyEfJr_&^X!V{Dz8g>M;>&fbhF9jG2d?+}S_3?lD^1EGrWWg?Odrf1B zE88yIx#1UGUc(7t+@ux`L~z`^#Y@6Q7zXl{$G3MPwR`RlzZg) z)yf(1bS1USFsR#M8x9Q2ITHf!>CZA9LfN_Y>c7(O!oca0y1ooNTd>Yp1-xgN`7 z9MYF$Pm?V39j&;!-|8p5VkEPjLJ<>YBw4; zEAm*1mXh+ID-iTvnEiPMZ#=Fa(^6-?S|wdd`NJE}v%=Qa%}izac6Vuy{lp)8!UM~aYqKE(^=}PW%y1yen-6 zXL^3Q@P&^a7yvo0y&R1#CSMQ7`MZ=lsvPm85--iXU>ipWntetTNbn&;%c7oC11v`t zB1yd>p%kfH)ZIxMk*tEUdw6&*9W?k-6t2Z?1dPMfa3KRL>v8gJJ&UF!7IpCgciePz z|8NcLwXj_tV?RUexnJ5C_HZOgFnFnUFuf8l(qdon^L?Fj&-2N0YNabQE~K!vgN~i7 zaNlV_k7;uI_!sJuu!G;o&Ers4jFfTdg)V2gRpVw-II=k#iO<*B<;z#XG>sY1m`&?T zK`G$?OL`Ok(iJScC{=Bg%f=gP*5{}Cdl+-?3~lDk2poxAZ@GTtXq&6%cGb{m*={&j ziY~srx77%H1kZ)WM6Y_YM0Wc`L4JM~?N^d-4}JQ9v56S?dv!cRX)+^1%*O+f^hroq zH?3aDmn!($!_{voiMNohMdF%D?7Dy&N-lapYud+btJnw_^@G!R>wl!+gWgAq zZzZVQFu4HL=jd)hq?nL98%Gj)?{!|G+yd7jE6H<&Sp#|%F7^=3Icb)AE)n9~`w+0p z@7%+Wfgcvw!Vx@Cme8O?tTEzTrhg{V&CT&!L;-;{@?7aOVji&a%ZqSK2;GU8%80Dv z7u==67wdWzkLZN^!)VbHZ})@~)Tu*&+KFbORWXvV!goXP{!w(1;$b_32Hy+`_<=uw|TnzWInmlftUTWK$oiXog?yN5yBEEGA7#Z6$+?SK}of6{Zw-eH#tXN{y<&}$}^hzyM$tBASwvz@83Yt`F2Je{|_`+I&fw0u4mWvk6Jy>N5wgZeiAUms^w$XFX#WGKMNRMmNHH+JR3QZ|W% zA|U=u1vh)aAGGTyMFb49udRZrpVHc7KYsh5_!2(A%vz2x8u=1)&=9cC4l{1^2oSSQ z?mg3ZE$#3+ig+l2X7!nBH|m>ZdOvr%w521(b^vaS@4%juFy-x^>SAYWH5Iq6Y74X( znHS%GASP~eFGV3KEQX=jxzulCUF`6rSwG9)BwLCgHj!LFCUAZ6@ZQ@)lFd52N;YxL zqF1diJGL>kF=X;SFSm{ywMZ+gZPsI*vb>&eRbzcM3p%)@;EmO)D|S$c-?0I^-0@#q z9G)UrVlq6zV0BamN%;k-;MddQWHVHX3gvR*sruo7DqqNXtkL7E&Azzvn!j7NxfKr+%H2x3k$$tC0Gh!ZALq{e4EE + + example-plugin1 + + + + +
+ +
+
+
+
+
+

hello. 显示插件静态资源正常

+
+
+
+
+
+ + -- Gitee From 16e6b86db07dd177fe40143c6e9b4c7037e98bfa Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Tue, 25 Jan 2022 15:16:23 +0800 Subject: [PATCH 18/35] clear config --- example-main/pom.xml | 2 +- .../src/main/resources/application-dev.yml | 10 ++---- example-plugins-basic/example-basic-1/pom.xml | 32 ++++++++----------- .../basic1/rest/ThymeleafController.java | 3 -- example-plugins-basic/pom.xml | 15 ++++++++- 5 files changed, 32 insertions(+), 30 deletions(-) diff --git a/example-main/pom.xml b/example-main/pom.xml index 9fad4ac..fabd21c 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -18,7 +18,7 @@ 3.0.0-RELEASE - 2.5.0 + 2.5.6 3.5.0 2.2 diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 96bedb0..78e9cd0 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -16,15 +16,11 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl plugin: - enable: true - enable-starter: true mainPackage: com.gitee.starblues.example runMode: dev pluginPath: - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic\example-basic-1 #- D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\plugin - sortInitPluginIds: - - example-basic-1 - - example-plugin1 - - example-plugin2 - - example-jpa + version: 2.0.9 + exactVersion: true + diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index dc20178..4ccaf46 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -12,39 +12,35 @@ example-basic-1 jar - - - org.springframework.boot - spring-boot-starter - 2.5.0 - - - org.springframework.boot - spring-boot-starter-aop - 2.5.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.11.3 - - com.gitee.starblues - springboot-plugin-maven-pack + springboot-plugin-maven-packager prod example-basic-1 com.gitee.starblues.example.basic1.Basic1Plugin 1.0.0-SNAPSHOT + 2.0.0 starBlues 基本插件1 basic-config.yaml + + + 1 + 2.0.0 + false + + + 2 + 3.0.0 + true + + diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java index 9d39f8e..1f6bf29 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java @@ -1,9 +1,6 @@ package com.gitee.starblues.example.basic1.rest; -import com.gitee.starblues.realize.ConfigDefinitionTip; import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; import org.springframework.web.bind.annotation.GetMapping; diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 2fad3a0..43e78b7 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -26,6 +26,12 @@ + + org.springframework.boot + spring-boot-starter + 2.5.6 + + com.gitee.starblues example-main @@ -46,6 +52,13 @@ test + + org.projectlombok + lombok + 1.18.20 + provided + + @@ -53,7 +66,7 @@ com.gitee.starblues - springboot-plugin-maven-pack + springboot-plugin-maven-packager 3.0.0-RELEASE -- Gitee From e2d9c9756616e598d889372c3dffa52ae3ea289a Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Thu, 27 Jan 2022 16:36:06 +0800 Subject: [PATCH 19/35] add plugin-user --- .../listener/MyPluginInitializerListener.java | 26 +++++++ .../example/listener/MyPluginListener.java | 61 +++++++++++++++++ .../example/rest/PluginResource.java | 40 +++++++++-- .../example/rest/PluginUserController.java | 67 ++++++++++++++----- .../starblues/example/service/MainSender.java | 16 +++++ .../starblues/example/service/Sender.java | 22 ++++++ .../example/service/TestAnnotation.java | 16 +++++ .../service/extract/MainExtractImpl.java | 2 + .../src/main/resources/application-dev.yml | 4 +- example-plugins-basic/example-basic-1/pom.xml | 14 +--- .../example/basic1/service/BasicService.java | 4 ++ .../basic1/service/Example1Sender.java | 16 +++++ .../example/basic1/service/ExtractBasic1.java | 2 + .../basic1/service/listener/MyListener.java | 35 ++++++++++ .../src/main/resources/basic-config.yaml | 5 +- example-plugins-basic/example-basic-2/pom.xml | 32 +++++---- .../basic2/service/Example2Sender.java | 16 +++++ .../example/basic2/service/ServiceSupper.java | 9 +-- 18 files changed, 326 insertions(+), 61 deletions(-) create mode 100644 example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginInitializerListener.java create mode 100644 example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginListener.java create mode 100644 example-main/src/main/java/com/gitee/starblues/example/service/MainSender.java create mode 100644 example-main/src/main/java/com/gitee/starblues/example/service/Sender.java create mode 100644 example-main/src/main/java/com/gitee/starblues/example/service/TestAnnotation.java create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/Example1Sender.java create mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/listener/MyListener.java create mode 100644 example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/Example2Sender.java diff --git a/example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginInitializerListener.java b/example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginInitializerListener.java new file mode 100644 index 0000000..5a9719c --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginInitializerListener.java @@ -0,0 +1,26 @@ +package com.gitee.starblues.example.listener; + +import com.gitee.starblues.integration.listener.PluginInitializerListener; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +public class MyPluginInitializerListener implements PluginInitializerListener { + @Override + public void before() { + System.out.println("初始化之前"); + } + + @Override + public void complete() { + System.out.println("初始化完成"); + } + + @Override + public void failure(Throwable throwable) { + System.out.println("初始化失败:"+throwable.getMessage()); + } +} diff --git a/example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginListener.java b/example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginListener.java new file mode 100644 index 0000000..2091536 --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/listener/MyPluginListener.java @@ -0,0 +1,61 @@ +package com.gitee.starblues.example.listener; + +import com.gitee.starblues.core.PluginInfo; +import com.gitee.starblues.example.service.TestAnnotation; +import com.gitee.starblues.integration.listener.PluginListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; + +import java.nio.file.Path; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +@TestAnnotation +public class MyPluginListener implements PluginListener { + + private static final Logger log = LoggerFactory.getLogger(MyPluginListener.class); + + @Override + public void loadSuccess(PluginInfo pluginInfo) { + log.info("插件[{}]加载成功.", pluginInfo.getPluginId()); + } + + @Override + public void loadFailure(Path path, Throwable throwable) { + log.info("插件[{}]加载失败. {}", path, throwable.getMessage()); + } + + @Override + public void unLoadSuccess(PluginInfo pluginInfo) { + log.info("插件[{}]卸载成功", pluginInfo.getPluginId()); + } + + @Override + public void unLoadFailure(PluginInfo pluginInfo, Throwable throwable) { + log.info("插件[{}]卸载失败. {}", pluginInfo.getPluginId(), throwable.getMessage()); + } + + @Override + public void startSuccess(PluginInfo pluginInfo) { + log.info("插件[{}]启动成功", pluginInfo.getPluginId()); + } + + @Override + public void startFailure(PluginInfo pluginInfo, Throwable throwable) { + log.info("插件[{}]启动失败. {}", pluginInfo.getPluginId(), throwable.getMessage()); + } + + @Override + public void stopSuccess(PluginInfo pluginInfo) { + log.info("插件[{}]停止成功", pluginInfo.getPluginId()); + } + + @Override + public void stopFailure(PluginInfo pluginInfo, Throwable throwable) { + log.info("插件[{}]停止失败. {}", pluginInfo.getPluginId(), throwable.getMessage()); + } +} diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java index 90dd3b3..87b3b78 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java @@ -25,12 +25,8 @@ import java.util.Set; public class PluginResource { - private final PluginOperator pluginOperator; - @Autowired - public PluginResource(PluginApplication pluginApplication) { - this.pluginOperator = pluginApplication.getPluginOperator(); - } + private PluginOperator pluginOperator; /** * 获取插件信息 @@ -41,6 +37,40 @@ public class PluginResource { return pluginOperator.getPluginInfo(); } + /** + * 校验插件包 + * @param pluginPath 插件路径 + * @return 返回操作结果 + */ + @PostMapping("/verify") + public String verify(@RequestParam("pluginPath") String pluginPath){ + try { + if(pluginOperator.verify(Paths.get(pluginPath))){ + return "verify success"; + } else { + return "verify failure"; + } + } catch (Exception e) { + e.printStackTrace(); + return "verify failure." + e.getMessage(); + } + } + + + /** + * 解析插件包 + * @param pluginPath 插件路径 + * @return 返回操作结果 + */ + @PostMapping("/parse") + public PluginInfo parse(@RequestParam("pluginPath") String pluginPath){ + try { + return pluginOperator.parse(Paths.get(pluginPath)); + } catch (Exception e) { + e.printStackTrace(); + return null; + } + } /** * 根据插件id停止插件 diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java index b09afe6..cca025d 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java @@ -1,15 +1,19 @@ package com.gitee.starblues.example.rest; +import com.gitee.starblues.example.service.MainSender; +import com.gitee.starblues.example.service.Sender; +import com.gitee.starblues.example.service.TestAnnotation; import com.gitee.starblues.integration.application.PluginApplication; +import com.gitee.starblues.integration.user.BeanWrapper; import com.gitee.starblues.integration.user.PluginUser; import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; import java.util.List; +import java.util.Set; import java.util.stream.Collectors; /** @@ -22,24 +26,57 @@ import java.util.stream.Collectors; @Api public class PluginUserController { - private final PluginApplication pluginApplication; + @Autowired + private PluginUser pluginUser; - public PluginUserController(PluginApplication pluginApplication) { - this.pluginApplication = pluginApplication; + @GetMapping("/bean-names") + public BeanWrapper> getBeanName(){ + return pluginUser.getBeanName(true); } + @GetMapping("/name") + public Object getBean(@RequestParam("name") String name, + @RequestParam("includeMainBeans") Boolean includeMainBeans){ + return pluginUser.getBean(name, includeMainBeans); + } + + @GetMapping("/name-by-plugin") + public Object getBean(@RequestParam("pluginId") String pluginId, + @RequestParam("name") String name){ + return pluginUser.getBean(pluginId, name); + } + + @GetMapping("/by-interface") + public BeanWrapper> getBeanByInterface(@RequestParam("includeMainBeans") Boolean includeMainBeans){ + return pluginUser.getBeanByInterface(Sender.class, includeMainBeans); + } + + @GetMapping("/by-interface-error") + public String getBeanByInterfaceError(){ + try { + pluginUser.getBeanByInterface(MainSender.class, true); + return "ok"; + } catch (Exception e){ + return e.getMessage(); + } + } + + @GetMapping("/interface-of-plugin") + public List getBeanByInterface(@RequestParam("pluginId") String pluginId){ + List senders = pluginUser.getBeanByInterface(pluginId, Sender.class); + return senders.stream().map(o -> o.getName().getName()).collect(Collectors.toList()); + } + + @GetMapping("/with-annotation") - public List getObjectWithAnnotation(){ - PluginUser pluginUser = pluginApplication.getPluginUser(); - List objects = pluginUser.getPluginBeansWithAnnotation(Component.class); - return objects.stream().map(o -> o.getClass().getName()).collect(Collectors.toList()); + public BeanWrapper> getObjectWithAnnotation(@RequestParam("includeMainBeans") Boolean includeMainBeans){ + return pluginUser.getBeansWithAnnotation(TestAnnotation.class, includeMainBeans); } - @GetMapping("/with-annotation/{pluginId}") - public List getObjectWithAnnotationByPluginId(@PathVariable("pluginId") String pluginId){ - PluginUser pluginUser = pluginApplication.getPluginUser(); - List objects = pluginUser.getPluginBeansWithAnnotation(pluginId, Component.class); + @GetMapping("/with-annotation-of-plugin") + public List getObjectWithAnnotationByPluginId(@RequestParam("pluginId") String pluginId){ + List objects = pluginUser.getBeansWithAnnotation(pluginId, TestAnnotation.class); return objects.stream().map(o -> o.getClass().getName()).collect(Collectors.toList()); } diff --git a/example-main/src/main/java/com/gitee/starblues/example/service/MainSender.java b/example-main/src/main/java/com/gitee/starblues/example/service/MainSender.java new file mode 100644 index 0000000..1199525 --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/service/MainSender.java @@ -0,0 +1,16 @@ +package com.gitee.starblues.example.service; + +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +@TestAnnotation +public class MainSender implements Sender{ + @Override + public Name getName() { + return new Name(this.getClass().getName()); + } +} diff --git a/example-main/src/main/java/com/gitee/starblues/example/service/Sender.java b/example-main/src/main/java/com/gitee/starblues/example/service/Sender.java new file mode 100644 index 0000000..d7052f3 --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/service/Sender.java @@ -0,0 +1,22 @@ +package com.gitee.starblues.example.service; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.Getter; + +/** + * @author starBlues + * @version 1.0 + */ +public interface Sender { + + Name getName(); + + @AllArgsConstructor + @Getter + class Name{ + private String name; + } + + +} diff --git a/example-main/src/main/java/com/gitee/starblues/example/service/TestAnnotation.java b/example-main/src/main/java/com/gitee/starblues/example/service/TestAnnotation.java new file mode 100644 index 0000000..8b46c8e --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/service/TestAnnotation.java @@ -0,0 +1,16 @@ +package com.gitee.starblues.example.service; + +import java.lang.annotation.*; + +/** + * 测试注解 + * @author starBlues + */ +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface TestAnnotation { + + + +} diff --git a/example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java b/example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java index f7a4d70..7c0c66a 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java +++ b/example-main/src/main/java/com/gitee/starblues/example/service/extract/MainExtractImpl.java @@ -1,12 +1,14 @@ package com.gitee.starblues.example.service.extract; import com.gitee.starblues.annotation.Extract; +import com.gitee.starblues.example.service.TestAnnotation; /** * @author starBlues * @version 1.0 */ @Extract(bus = "extract", scene = "demo", useCase = "main", order = Integer.MAX_VALUE) +@TestAnnotation public class MainExtractImpl implements ExtractDemo{ @Override public String getName() { diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 78e9cd0..2630137 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -19,8 +19,6 @@ plugin: mainPackage: com.gitee.starblues.example runMode: dev pluginPath: - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic\example-basic-1 + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic #- D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\plugin - version: 2.0.9 - exactVersion: true diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 4ccaf46..5da5d40 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -20,7 +20,7 @@ com.gitee.starblues springboot-plugin-maven-packager - prod + dev example-basic-1 com.gitee.starblues.example.basic1.Basic1Plugin @@ -29,18 +29,6 @@ starBlues 基本插件1 basic-config.yaml - - - 1 - 2.0.0 - false - - - 2 - 3.0.0 - true - - diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/BasicService.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/BasicService.java index 2c26c8f..23c63fb 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/BasicService.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/BasicService.java @@ -1,8 +1,10 @@ package com.gitee.starblues.example.basic1.service; import com.gitee.starblues.core.descriptor.PluginDescriptor; +import com.gitee.starblues.example.service.TestAnnotation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; /** * @author starBlues @@ -10,6 +12,8 @@ import org.springframework.stereotype.Component; * @since 2021-08-01 */ @Component +@Service +@TestAnnotation public class BasicService { @Autowired diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/Example1Sender.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/Example1Sender.java new file mode 100644 index 0000000..6ef5c91 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/Example1Sender.java @@ -0,0 +1,16 @@ +package com.gitee.starblues.example.basic1.service; + +import com.gitee.starblues.example.service.Sender; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +public class Example1Sender implements Sender { + @Override + public Name getName() { + return new Name(Example1Sender.class.getName()); + } +} diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractBasic1.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractBasic1.java index 63f4e75..508c1d8 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractBasic1.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ExtractBasic1.java @@ -1,6 +1,7 @@ package com.gitee.starblues.example.basic1.service; import com.gitee.starblues.annotation.Extract; +import com.gitee.starblues.example.service.TestAnnotation; import com.gitee.starblues.example.service.extract.ExtractDemo; /** @@ -9,6 +10,7 @@ import com.gitee.starblues.example.service.extract.ExtractDemo; * @since 2021-08-01 */ @Extract(bus = "extract", scene = "demo", order = 10) +@TestAnnotation public class ExtractBasic1 implements ExtractDemo { @Override public String getName() { diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/listener/MyListener.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/listener/MyListener.java new file mode 100644 index 0000000..e9a9d2e --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/listener/MyListener.java @@ -0,0 +1,35 @@ +package com.gitee.starblues.example.basic1.service.listener; + + +import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; +import org.springframework.boot.context.event.ApplicationPreparedEvent; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.ApplicationEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextClosedEvent; +import org.springframework.context.event.ContextRefreshedEvent; +import org.springframework.context.event.ContextStartedEvent; +import org.springframework.context.event.ContextStoppedEvent; + +/** + * 启动后监听 + * @author starBlues + * @version 1.0 + */ +public class MyListener implements ApplicationListener{ + + @Override + public void onApplicationEvent(ApplicationEvent event) { + if (event instanceof ApplicationEnvironmentPreparedEvent) { + System.out.println("初始化环境变量"); + } else if (event instanceof ApplicationPreparedEvent) { + System.out.println("环境初始化完成"); + } else if (event instanceof ContextRefreshedEvent) { + System.out.println("ApplicationContext被刷新"); + } else if (event instanceof ApplicationReadyEvent) { + System.out.println("插件已经启动完成"); + } else if (event instanceof ContextClosedEvent) { + System.out.println("插件停止"); + } + } +} diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml index 4d3bb90..6fe3da2 100644 --- a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml +++ b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml @@ -7,4 +7,7 @@ spring: prefix: plugin1-template suffix: .html mode: html - encoding: utf-8 \ No newline at end of file + encoding: utf-8 +context: + listener: + #classes: com.gitee.starblues.example.basic1.service.listener.MyListener \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml index 3225917..1da5514 100644 --- a/example-plugins-basic/example-basic-2/pom.xml +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -3,7 +3,7 @@ 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"> - example-plugins-dir1 + example-plugins-basic com.gitee.starblues 1.0.0-SNAPSHOT @@ -34,26 +34,24 @@ - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 + com.gitee.starblues + springboot-plugin-maven-packager + + dev + + example-basic-2 + com.gitee.starblues.example.basic2.Basic2Plugin + 1.0.0-SNAPSHOT + starBlues + 基本插件2 + basic2-config.yaml + + - copy - package - copy-dependencies + repackage - - ${project.build.directory}/lib - - false - - false - - true - provided - diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/Example2Sender.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/Example2Sender.java new file mode 100644 index 0000000..1a5a745 --- /dev/null +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/Example2Sender.java @@ -0,0 +1,16 @@ +package com.gitee.starblues.example.basic2.service; + +import com.gitee.starblues.example.service.Sender; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +public class Example2Sender implements Sender { + @Override + public Sender.Name getName() { + return new Sender.Name(Example2Sender.class.getName()); + } +} diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java index d6f9c0c..512ec1f 100644 --- a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java @@ -2,6 +2,7 @@ package com.gitee.starblues.example.basic2.service; import com.gitee.starblues.annotation.Supplier; import com.gitee.starblues.example.basic2.config.Basic2Config; +import com.gitee.starblues.example.service.TestAnnotation; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,6 +12,7 @@ import org.springframework.stereotype.Service; * @version 1.0 */ @Supplier("service-supper") +@TestAnnotation public class ServiceSupper { @Autowired @@ -29,11 +31,4 @@ public class ServiceSupper { return newConfig; } - - private static class Hello{ - private String name; - private Integer age; - } - - } -- Gitee From 8ad7bb68326eba402a3cb56e8318c4aaab29035d Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Fri, 28 Jan 2022 20:36:36 +0800 Subject: [PATCH 20/35] update Oneself --- .../gitee/starblues/example/config/Swagger2Config.java | 5 +---- .../com/gitee/starblues/example/rest/PluginResource.java | 1 - example-main/src/main/resources/application-dev.yml | 5 ++++- example-plugins-basic/example-basic-1/pom.xml | 7 +++++++ .../com/gitee/starblues/example/basic1/Basic1Plugin.java | 8 +++++++- .../example-basic-1/src/main/resources/basic-config.yaml | 5 +++++ 6 files changed, 24 insertions(+), 7 deletions(-) diff --git a/example-main/src/main/java/com/gitee/starblues/example/config/Swagger2Config.java b/example-main/src/main/java/com/gitee/starblues/example/config/Swagger2Config.java index 8e18b85..974aae8 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/config/Swagger2Config.java +++ b/example-main/src/main/java/com/gitee/starblues/example/config/Swagger2Config.java @@ -29,17 +29,14 @@ public class Swagger2Config { @Bean(value = "defaultApi2") public Docket defaultApi2() { - Predicate predicate = PathSelectors.any(); - - Docket docket = new Docket(DocumentationType.SWAGGER_2) + return new Docket(DocumentationType.SWAGGER_2) .apiInfo(apiInfo()) .groupName("dev") .select() .apis(RequestHandlerSelectors.withClassAnnotation(Api.class)) .paths(predicate) .build(); - return docket; } private ApiInfo apiInfo() { diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java index 87b3b78..d85c34c 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java @@ -12,7 +12,6 @@ import org.springframework.web.multipart.MultipartFile; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import java.util.Set; /** * 插件jar 包测试功能 diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 2630137..3cfd4a8 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -14,7 +14,10 @@ mybatis-plus: configuration: mapUnderscoreToCamelCase: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl - +springdoc: + api-docs: + enabled: true + packages-to-scan: com.gitee.starblues.example.rest plugin: mainPackage: com.gitee.starblues.example runMode: dev diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 5da5d40..aff7e5a 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -12,6 +12,13 @@ example-basic-1 jar + + + org.springframework.boot + spring-boot-starter-web + 2.5.6 + + diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java index eb5569a..8f262ac 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -2,8 +2,13 @@ package com.gitee.starblues.example.basic1; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; import com.gitee.starblues.bootstrap.annotation.DisablePluginWeb; +import com.gitee.starblues.bootstrap.annotation.OneselfConfig; +import com.gitee.starblues.example.Application; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration; +import org.springframework.context.annotation.PropertySource; + +import java.net.URL; /** * 基本插件 @@ -12,10 +17,11 @@ import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAut * @since 2021-08-01 */ @SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic1") +@OneselfConfig(mainConfigFileName = {"application.yml", "application-dev.yml"}) public class Basic1Plugin extends SpringPluginBootstrap { public static void main(String[] args) { - new Basic1Plugin().run(args); + new Basic1Plugin().run(Application.class, args); } } diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml index 6fe3da2..479b9e6 100644 --- a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml +++ b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml @@ -1,4 +1,9 @@ spring: + datasource: + url: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC&allowPublicKeyRetrieval=true + username: root + password: 123456 + driver-class-name: com.mysql.cj.jdbc.Driver profiles: active: dev resources: -- Gitee From 3ebdc77b69f41228804c400c1b8d1a1d748f4786 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sat, 29 Jan 2022 14:39:19 +0800 Subject: [PATCH 21/35] update version --- example-main/pom.xml | 23 +--- .../src/main/resources/application-dev.yml | 7 +- example-plugin-dependency/pom.xml | 55 --------- example-plugins-basic/example-basic-1/pom.xml | 25 ---- example-plugins-basic/pom.xml | 6 +- .../example-jpa/pom.xml | 33 +++--- .../starblues/example/jpa/JpaPlugin.java | 1 - .../example/jpa/config/QuartzJobConfig.java | 0 .../jpa/config/prop/QuartzJobProp.java | 0 .../example/jpa/dao/PluginJpaUserDao.java | 0 .../example/jpa/entity/PluginJpaUser.java | 0 .../jpa/rest/JpaPluginUserResource.java | 0 .../example/jpa/service/package-info.java | 0 .../jpa/service/quartz/DatabaseInsertJob.java | 0 .../src/main/resources/jpa-dev.yml | 0 .../src/main/resources/jpa-prod.yml | 0 .../example-jpa/src/main/resources/jpa.yml | 0 .../src/main/resources/plugin.properties | 0 .../example/mp/MybatisPlusExamplePlugin.java | 10 +- .../example/mp/entity/MpPluginUser.java | 7 +- .../example/mp/mapper/MpPluginUserMapper.java | 8 +- .../mp/rest/MpPluginUserController.java | 28 +++-- .../mp/service/MpPluginUserService.java | 10 +- .../service/impl/MpPluginUserServiceImpl.java | 10 +- .../resources/mapper/MpPluginUserMapper.xml | 8 +- .../src/main/resources/mp-config.yaml | 7 +- .../pom.xml | 20 +++- .../example/jpa/config/PluginJpaConfig.java | 19 ---- example-plugins-dir2/example-plugin1/pom.xml | 68 ----------- .../plugin1/config/MybatisPlusConfig.java | 56 --------- .../plugin1/config/QuartzJobConfig.java | 49 -------- .../plugin1/config/prop/QuartzJobProp.java | 25 ---- .../listener/ClearUserDataListener.java | 32 ------ .../plugin1/rest/ThymeleafController.java | 32 ------ .../service/quartz/DatabaseInsertJob.java | 53 --------- .../src/main/resources/plugin.properties | 8 -- .../src/main/resources/plugin1-log.xml | 11 -- .../src/main/resources/plugin1-prod.yml | 18 --- .../resources/plugin1-template/index.html | 24 ---- .../src/main/resources/plugin1-thymeleaf.yml | 8 -- .../src/main/resources/plugin1.yml | 3 - .../src/main/resources/static/css/all.css | 104 ----------------- .../src/main/resources/static/image/image.png | Bin 5719 -> 0 bytes .../src/main/resources/static/index.html | 22 ---- example-plugins-dir2/example-plugin2/pom.xml | 16 --- .../example/plugin2/ExamplePlugin2.java | 16 --- .../plugin2/config/MybatisPlusConfig.java | 60 ---------- .../example/plugin2/entity/Plugin2User.java | 107 ------------------ .../plugin2/extract/ExtractExampleImp3.java | 19 ---- .../plugin2/mapper/Plugin2UserMapper.java | 20 ---- .../plugin2/rest/Plugin2UserResource.java | 40 ------- .../plugin2/service/Plugin2UserService.java | 17 --- .../plugin2/service/impl/ExtractExample3.java | 19 ---- .../service/impl/Plugin2UserServiceImpl.java | 20 ---- .../src/main/resources/plugin.properties | 7 -- .../src/main/resources/plugin2-dev.yml | 6 - .../plugin2-mapper/Plugin2UserMapper.xml | 30 ----- .../src/main/resources/plugin2-prod.yml | 6 - example-plugins-dir2/pom.xml | 51 --------- pom.xml | 4 +- sql/plugin-test-example.sql | 36 +----- 61 files changed, 87 insertions(+), 1177 deletions(-) delete mode 100644 example-plugin-dependency/pom.xml rename {example-plugins-dir1 => example-plugins-db}/example-jpa/pom.xml (56%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java (94%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/QuartzJobConfig.java (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/prop/QuartzJobProp.java (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/dao/PluginJpaUserDao.java (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/entity/PluginJpaUser.java (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/package-info.java (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/quartz/DatabaseInsertJob.java (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/resources/jpa-dev.yml (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/resources/jpa-prod.yml (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/resources/jpa.yml (100%) rename {example-plugins-dir1 => example-plugins-db}/example-jpa/src/main/resources/plugin.properties (100%) rename example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java => example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java (50%) rename example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/entity/Plugin1User.java => example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/entity/MpPluginUser.java (94%) rename example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/mapper/Plugin1UserMapper.java => example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/mapper/MpPluginUserMapper.java (49%) rename example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/Plugin1UserResource.java => example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java (33%) rename example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/Plugin1UserService.java => example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java (37%) rename example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/Plugin1UserServiceImpl.java => example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java (38%) rename example-plugins-dir2/example-plugin1/src/main/resources/mapper/Plugin1UserMapper.xml => example-plugins-db/example-mybatis-plus/src/main/resources/mapper/MpPluginUserMapper.xml (88%) rename example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml => example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml (67%) rename {example-plugins-dir1 => example-plugins-db}/pom.xml (70%) delete mode 100644 example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java delete mode 100644 example-plugins-dir2/example-plugin1/pom.xml delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/QuartzJobConfig.java delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/prop/QuartzJobProp.java delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/ThymeleafController.java delete mode 100644 example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/plugin1-log.xml delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/plugin1-prod.yml delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/plugin1-template/index.html delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/plugin1-thymeleaf.yml delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/static/css/all.css delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/static/image/image.png delete mode 100644 example-plugins-dir2/example-plugin1/src/main/resources/static/index.html delete mode 100644 example-plugins-dir2/example-plugin2/pom.xml delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/ExamplePlugin2.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/config/MybatisPlusConfig.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/entity/Plugin2User.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/extract/ExtractExampleImp3.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/mapper/Plugin2UserMapper.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/rest/Plugin2UserResource.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/Plugin2UserService.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/ExtractExample3.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/Plugin2UserServiceImpl.java delete mode 100644 example-plugins-dir2/example-plugin2/src/main/resources/plugin.properties delete mode 100644 example-plugins-dir2/example-plugin2/src/main/resources/plugin2-dev.yml delete mode 100644 example-plugins-dir2/example-plugin2/src/main/resources/plugin2-mapper/Plugin2UserMapper.xml delete mode 100644 example-plugins-dir2/example-plugin2/src/main/resources/plugin2-prod.yml delete mode 100644 example-plugins-dir2/pom.xml diff --git a/example-main/pom.xml b/example-main/pom.xml index fabd21c..5a2b9ac 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -16,7 +16,7 @@ 1.8 - 3.0.0-RELEASE + 3.0.0-alpha 2.5.6 @@ -45,27 +45,6 @@ ${springboot-plugin-framework.version} - - - - - - - - - - - - - - - - - - - - - org.springframework.boot spring-boot-starter-web diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 3cfd4a8..009062e 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -14,14 +14,11 @@ mybatis-plus: configuration: mapUnderscoreToCamelCase: true log-impl: org.apache.ibatis.logging.stdout.StdOutImpl -springdoc: - api-docs: - enabled: true - packages-to-scan: com.gitee.starblues.example.rest + plugin: mainPackage: com.gitee.starblues.example runMode: dev pluginPath: - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic - #- D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\plugin + - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-db diff --git a/example-plugin-dependency/pom.xml b/example-plugin-dependency/pom.xml deleted file mode 100644 index 3601010..0000000 --- a/example-plugin-dependency/pom.xml +++ /dev/null @@ -1,55 +0,0 @@ - - - - springboot-plugin-framework-example - com.gitee.starblues - 1.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - example-plugin-dependency - 定义插件中所需的依赖 - - - 2.5.0 - - 2.4.5 - 1.1.9 - - - - - - - org.springframework.boot - spring-boot-dependencies - ${spring-boot.version} - pom - import - - - - - - - - org.springframework.boot - spring-boot-starter-quartz - - - - - org.springframework.boot - spring-boot-starter-data-jpa - - - com.alibaba - druid - ${druid.version} - - - - \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index aff7e5a..b65df9e 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -37,34 +37,9 @@ 基本插件1 basic-config.yaml - - - - com.gitee.starblues - spring-plugin-framework-common - D:\etc\kitte\ksm\springboot-plugin-framework-parent\spring-plugin-framework-common\target\classes - - - jar - - - com.gitee.starblues - springboot-plugin-bootstrap - - - - - com.sta.includes1.** - com.sta.includes12.** - - - com.sta.excludes1.** - com.sta.excludes2.** - - diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 43e78b7..ff44981 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -21,6 +21,8 @@ 1.18.10 4.13 + 3.0.0-alpha + 3.1.1 @@ -42,7 +44,7 @@ com.gitee.starblues springboot-plugin-bootstrap - 3.0.0-RELEASE + ${springboot-plugin.version} @@ -67,7 +69,7 @@ com.gitee.starblues springboot-plugin-maven-packager - 3.0.0-RELEASE + ${springboot-plugin.version} diff --git a/example-plugins-dir1/example-jpa/pom.xml b/example-plugins-db/example-jpa/pom.xml similarity index 56% rename from example-plugins-dir1/example-jpa/pom.xml rename to example-plugins-db/example-jpa/pom.xml index a1e7ae3..28a6974 100644 --- a/example-plugins-dir1/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -3,7 +3,7 @@ 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"> - example-plugins-dir1 + example-plugins-db com.gitee.starblues 1.0.0-SNAPSHOT ../pom.xml @@ -35,28 +35,25 @@ - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 + com.gitee.starblues + springboot-plugin-maven-packager + + dev + + jpa-example-plugin + com.gitee.starblues.example.jpa.JpaPlugin + 1.0.0 + starBlues + spring-jpa案例插件 + jpa.yml + + - copy - package - copy-dependencies + repackage - - ${project.build.directory}/lib - - false - - false - - true - provided - diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java similarity index 94% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java index ff05007..2b6b58d 100644 --- a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java +++ b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/JpaPlugin.java @@ -10,7 +10,6 @@ import org.springframework.context.annotation.Import; * @version 2.4.3 */ @SpringBootApplication() -@Import(ImportBean.class) public class JpaPlugin extends SpringPluginBootstrap{ public static void main(String[] args) { diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/QuartzJobConfig.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/QuartzJobConfig.java similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/QuartzJobConfig.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/QuartzJobConfig.java diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/prop/QuartzJobProp.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/prop/QuartzJobProp.java similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/prop/QuartzJobProp.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/prop/QuartzJobProp.java diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/dao/PluginJpaUserDao.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/dao/PluginJpaUserDao.java similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/dao/PluginJpaUserDao.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/dao/PluginJpaUserDao.java diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/entity/PluginJpaUser.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/entity/PluginJpaUser.java similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/entity/PluginJpaUser.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/entity/PluginJpaUser.java diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/package-info.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/package-info.java similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/package-info.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/package-info.java diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/quartz/DatabaseInsertJob.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/quartz/DatabaseInsertJob.java similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/quartz/DatabaseInsertJob.java rename to example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/service/quartz/DatabaseInsertJob.java diff --git a/example-plugins-dir1/example-jpa/src/main/resources/jpa-dev.yml b/example-plugins-db/example-jpa/src/main/resources/jpa-dev.yml similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/resources/jpa-dev.yml rename to example-plugins-db/example-jpa/src/main/resources/jpa-dev.yml diff --git a/example-plugins-dir1/example-jpa/src/main/resources/jpa-prod.yml b/example-plugins-db/example-jpa/src/main/resources/jpa-prod.yml similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/resources/jpa-prod.yml rename to example-plugins-db/example-jpa/src/main/resources/jpa-prod.yml diff --git a/example-plugins-dir1/example-jpa/src/main/resources/jpa.yml b/example-plugins-db/example-jpa/src/main/resources/jpa.yml similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/resources/jpa.yml rename to example-plugins-db/example-jpa/src/main/resources/jpa.yml diff --git a/example-plugins-dir1/example-jpa/src/main/resources/plugin.properties b/example-plugins-db/example-jpa/src/main/resources/plugin.properties similarity index 100% rename from example-plugins-dir1/example-jpa/src/main/resources/plugin.properties rename to example-plugins-db/example-jpa/src/main/resources/plugin.properties diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java similarity index 50% rename from example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java rename to example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java index ea9f464..5df193f 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/ExamplePlugin1.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java @@ -1,19 +1,17 @@ -package com.gitee.starblues.example.plugin1; +package com.gitee.starblues.example.mp; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; -import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.autoconfigure.SpringBootApplication; /** - * 案例插件1 * @author starBlues - * @version 2.4.3 + * @version 1.0 */ @SpringBootApplication -public class ExamplePlugin1 extends SpringPluginBootstrap { +public class MybatisPlusExamplePlugin extends SpringPluginBootstrap { public static void main(String[] args) { - new ExamplePlugin1().run(args); + new MybatisPlusExamplePlugin().run(args); } } diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/entity/Plugin1User.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/entity/MpPluginUser.java similarity index 94% rename from example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/entity/Plugin1User.java rename to example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/entity/MpPluginUser.java index 5eef08d..b602176 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/entity/Plugin1User.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/entity/MpPluginUser.java @@ -1,14 +1,15 @@ -package com.gitee.starblues.example.plugin1.entity; +package com.gitee.starblues.example.mp.entity; import com.baomidou.mybatisplus.annotation.FieldFill; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import java.io.Serializable; + /** *

* 插件1-用户表 @@ -20,7 +21,7 @@ import lombok.experimental.Accessors; @Data @EqualsAndHashCode(callSuper = false) @Accessors(chain = true) -public class Plugin1User implements Serializable { +public class MpPluginUser implements Serializable { private static final long serialVersionUID = 1L; diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/mapper/Plugin1UserMapper.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/mapper/MpPluginUserMapper.java similarity index 49% rename from example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/mapper/Plugin1UserMapper.java rename to example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/mapper/MpPluginUserMapper.java index 407c016..9826d20 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/mapper/Plugin1UserMapper.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/mapper/MpPluginUserMapper.java @@ -1,7 +1,7 @@ -package com.gitee.starblues.example.plugin1.mapper; +package com.gitee.starblues.example.mp.mapper; -import com.gitee.starblues.example.plugin1.entity.Plugin1User; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gitee.starblues.example.mp.entity.MpPluginUser; import org.apache.ibatis.annotations.Mapper; /** @@ -13,8 +13,8 @@ import org.apache.ibatis.annotations.Mapper; * @since 2021-05-21 */ @Mapper -public interface Plugin1UserMapper extends BaseMapper { +public interface MpPluginUserMapper extends BaseMapper { - Plugin1User getPluginById(String id); + MpPluginUser getPluginById(String id); } diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/Plugin1UserResource.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java similarity index 33% rename from example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/Plugin1UserResource.java rename to example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java index 29d76b7..567df39 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/Plugin1UserResource.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java @@ -1,12 +1,10 @@ -package com.gitee.starblues.example.plugin1.rest; +package com.gitee.starblues.example.mp.rest; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gitee.starblues.example.plugin1.entity.Plugin1User; -import com.gitee.starblues.example.plugin1.service.Plugin1UserService; +import com.gitee.starblues.example.mp.entity.MpPluginUser; +import com.gitee.starblues.example.mp.service.MpPluginUserService; import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; import org.springframework.web.bind.annotation.*; @@ -20,27 +18,27 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/user") @Api @RequiredArgsConstructor -public class Plugin1UserResource { +public class MpPluginUserController { - private final Plugin1UserService plugin1UserService; + private final MpPluginUserService mpPluginUserService; @GetMapping - public Page getPage(@RequestParam("currentPage") Integer currentPage, - @RequestParam("pageSize") Integer pageSize){ - Page plugin2UserPage = new Page<>(currentPage, pageSize); - return plugin1UserService.page(plugin2UserPage); + public Page getPage(@RequestParam("currentPage") Integer currentPage, + @RequestParam("pageSize") Integer pageSize){ + Page plugin2UserPage = new Page<>(currentPage, pageSize); + return mpPluginUserService.page(plugin2UserPage); } @GetMapping("/{id}") - public Plugin1User getById(@PathVariable("id") String id){ - return plugin1UserService.getBaseMapper().getPluginById(id); + public MpPluginUser getById(@PathVariable("id") String id){ + return mpPluginUserService.getBaseMapper().getPluginById(id); } @PostMapping - public Plugin1User addUser(@RequestBody Plugin1User plugin2User){ - plugin1UserService.save(plugin2User); + public MpPluginUser addUser(@RequestBody MpPluginUser plugin2User){ + mpPluginUserService.save(plugin2User); return plugin2User; } diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/Plugin1UserService.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java similarity index 37% rename from example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/Plugin1UserService.java rename to example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java index 0eeec4e..f983771 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/Plugin1UserService.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java @@ -1,8 +1,8 @@ -package com.gitee.starblues.example.plugin1.service; +package com.gitee.starblues.example.mp.service; -import com.gitee.starblues.example.plugin1.entity.Plugin1User; import com.baomidou.mybatisplus.extension.service.IService; -import com.gitee.starblues.example.plugin1.mapper.Plugin1UserMapper; +import com.gitee.starblues.example.mp.entity.MpPluginUser; +import com.gitee.starblues.example.mp.mapper.MpPluginUserMapper; /** *

@@ -12,8 +12,8 @@ import com.gitee.starblues.example.plugin1.mapper.Plugin1UserMapper; * @author starBlues * @since 2021-05-21 */ -public interface Plugin1UserService extends IService { +public interface MpPluginUserService extends IService { @Override - Plugin1UserMapper getBaseMapper(); + MpPluginUserMapper getBaseMapper(); } diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/Plugin1UserServiceImpl.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java similarity index 38% rename from example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/Plugin1UserServiceImpl.java rename to example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java index 3bb00c3..42e1c98 100644 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/impl/Plugin1UserServiceImpl.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java @@ -1,9 +1,9 @@ -package com.gitee.starblues.example.plugin1.service.impl; +package com.gitee.starblues.example.mp.service.impl; -import com.gitee.starblues.example.plugin1.entity.Plugin1User; -import com.gitee.starblues.example.plugin1.mapper.Plugin1UserMapper; -import com.gitee.starblues.example.plugin1.service.Plugin1UserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gitee.starblues.example.mp.entity.MpPluginUser; +import com.gitee.starblues.example.mp.mapper.MpPluginUserMapper; +import com.gitee.starblues.example.mp.service.MpPluginUserService; import org.springframework.stereotype.Service; /** @@ -15,6 +15,6 @@ import org.springframework.stereotype.Service; * @since 2021-05-21 */ @Service -public class Plugin1UserServiceImpl extends ServiceImpl implements Plugin1UserService { +public class MpPluginUserServiceImpl extends ServiceImpl implements MpPluginUserService { } diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/mapper/Plugin1UserMapper.xml b/example-plugins-db/example-mybatis-plus/src/main/resources/mapper/MpPluginUserMapper.xml similarity index 88% rename from example-plugins-dir2/example-plugin1/src/main/resources/mapper/Plugin1UserMapper.xml rename to example-plugins-db/example-mybatis-plus/src/main/resources/mapper/MpPluginUserMapper.xml index 6ce83ff..32f8249 100644 --- a/example-plugins-dir2/example-plugin1/src/main/resources/mapper/Plugin1UserMapper.xml +++ b/example-plugins-db/example-mybatis-plus/src/main/resources/mapper/MpPluginUserMapper.xml @@ -1,9 +1,9 @@ - + - + @@ -27,8 +27,8 @@ user_id, name, phone, email, username, password, status, deleted, locked, create_user, gmt_created, modified_user, gmt_modified, avatar, last_login_ip, last_gmt_login_time - + select * from mp_plugin_user where user_id = #{id} diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml b/example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml similarity index 67% rename from example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml rename to example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml index 8c5972d..782a8c2 100644 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-dev.yml +++ b/example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml @@ -1,13 +1,12 @@ spring: datasource: - # druid 数据库连接池配置 - driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC + url: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC&allowPublicKeyRetrieval=true username: root password: 123456 + driver-class-name: com.mysql.cj.jdbc.Driver mybatis-plus: - typeAliasesPackage: com.gitee.starblues.example.plugin1.entity + typeAliasesPackage: com.gitee.starblues.example.mp.entity mapperLocations: classpath*:mapper/*.xml configuration: mapUnderscoreToCamelCase: true diff --git a/example-plugins-dir1/pom.xml b/example-plugins-db/pom.xml similarity index 70% rename from example-plugins-dir1/pom.xml rename to example-plugins-db/pom.xml index cca7246..ad0841b 100644 --- a/example-plugins-dir1/pom.xml +++ b/example-plugins-db/pom.xml @@ -10,16 +10,19 @@ 4.0.0 - example-plugins-dir1 + example-plugins-db pom example-jpa + example-mybatis-plus 1.18.10 4.13 + 3.0.0-alpha + 3.1.1 @@ -35,7 +38,7 @@ com.gitee.starblues springboot-plugin-bootstrap - 3.0.0-RELEASE + ${springboot-plugin.version} @@ -47,4 +50,17 @@ + + + + + + com.gitee.starblues + springboot-plugin-maven-packager + ${springboot-plugin.version} + + + + + \ No newline at end of file diff --git a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java b/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java deleted file mode 100644 index c1c6787..0000000 --- a/example-plugins-dir1/example-jpa/src/main/java/com/gitee/starblues/example/jpa/config/PluginJpaConfig.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gitee.starblues.example.jpa.config; - - -import com.gitee.starblues.example.jpa.ImportBean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.data.jpa.repository.config.EnableJpaRepositories; -import org.springframework.orm.jpa.LocalEntityManagerFactoryBean; - -/** - * 设置DataSource - * 注意: 使用集成jpa并用 druid 连接池(或者其他连接池)时, 必须手动定义 DataSource Bean - * @author starBlues - * @version 1.0 - * @since 2021-05-25 - */ -@Configuration -public class PluginJpaConfig { -} diff --git a/example-plugins-dir2/example-plugin1/pom.xml b/example-plugins-dir2/example-plugin1/pom.xml deleted file mode 100644 index 5ab2115..0000000 --- a/example-plugins-dir2/example-plugin1/pom.xml +++ /dev/null @@ -1,68 +0,0 @@ - - - - example-plugins-dir2 - com.gitee.starblues - 1.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - example-plugin1 - jar - - - org.springframework.boot - spring-boot-starter - 2.5.0 - - - com.baomidou - mybatis-plus-boot-starter - 3.5.0 - - - mysql - mysql-connector-java - 8.0.25 - - - org.springframework.boot - spring-boot-starter-quartz - 2.5.0 - - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 3.2.0 - - - copy - package - - copy-dependencies - - - ${project.build.directory}/lib - - false - - false - - true - provided - - - - - - - - \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java deleted file mode 100644 index 5468694..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/MybatisPlusConfig.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.gitee.starblues.example.plugin1.config; - -import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler; -import org.apache.ibatis.reflection.MetaObject; -import org.mybatis.spring.annotation.MapperScan; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; - -/** - * 插件中mybatis-plus配置 - * @author starBlues - * @version 3.0.0 - */ -@Configuration -@MapperScan("com.gitee.starblues.example.plugin1.mapper") -public class MybatisPlusConfig { - - @Bean - public GmtTimeHandler gmtTimeHandler(){ - return new GmtTimeHandler(); - } - - public static class GmtTimeHandler implements MetaObjectHandler { - - private static final String FORMAT_SECONDS = "yyyy-MM-dd HH:mm:ss"; - - @Override - public void insertFill(MetaObject metaObject) { - String data = getData(); - this.strictInsertFill(metaObject, "gmtCreated", String.class, data); - this.strictInsertFill(metaObject, "gmtModified", String.class, data); - String currentUsername = "admin"; - this.strictInsertFill(metaObject, "createUser", String.class, currentUsername); - this.strictInsertFill(metaObject, "modifiedUser", String.class, currentUsername); - } - - @Override - public void updateFill(MetaObject metaObject) { - this.strictUpdateFill(metaObject, "gmtModified", String.class, getData()); - this.strictUpdateFill(metaObject, "modifiedUser", - ()-> "admin", - String.class); - } - - - private String getData(){ - LocalDateTime localDateTime = LocalDateTime.now(); - DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern(FORMAT_SECONDS); - return dateTimeFormatter.format(localDateTime); - } - - } -} diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/QuartzJobConfig.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/QuartzJobConfig.java deleted file mode 100644 index 3ab7f9a..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/QuartzJobConfig.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.gitee.starblues.example.plugin1.config; - -import com.gitee.starblues.example.plugin1.config.prop.QuartzJobProp; -import com.gitee.starblues.example.plugin1.service.quartz.DatabaseInsertJob; -import lombok.AllArgsConstructor; -import org.quartz.*; -import org.springframework.context.ApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -import javax.annotation.Resource; -import java.util.Date; - -/** - * quartz 配置 - * @author starBlues - * @version 2.4.3 - */ -@Configuration -@AllArgsConstructor -public class QuartzJobConfig { - - private final QuartzJobProp quartzJobProp; - private final ApplicationContext applicationContext; - - - @Bean - public JobDetail databaseInsertJob(){ - JobDataMap jobDataMap = new JobDataMap(); - jobDataMap.put(DatabaseInsertJob.APPLICATION_CONTEXT, applicationContext); - return JobBuilder.newJob(DatabaseInsertJob.class) - .storeDurably() - .setJobData(jobDataMap) - .build(); - } - - @Bean - public Trigger trigger1(){ - CronScheduleBuilder cronScheduleBuilder = - CronScheduleBuilder.cronSchedule(quartzJobProp.getDatabaseInsertJobCron()); - Long databaseInsertJobDelaySec = quartzJobProp.getDatabaseInsertJobDelaySec(); - return TriggerBuilder.newTrigger() - .forJob(databaseInsertJob()) - .withSchedule(cronScheduleBuilder) - .startAt(new Date(System.currentTimeMillis() + (databaseInsertJobDelaySec * 1000))) - .build(); - } - -} diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/prop/QuartzJobProp.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/prop/QuartzJobProp.java deleted file mode 100644 index a7245de..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/config/prop/QuartzJobProp.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.gitee.starblues.example.plugin1.config.prop; - -import lombok.Data; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.boot.context.properties.ConfigurationProperties; -import org.springframework.stereotype.Component; - -/** - * quartz 的job配置 - * @author starBlues - * @version 2.4.3 - */ -@Component -@ConfigurationProperties(prefix = "job") -@Data -public class QuartzJobProp { - - @Value("${databaseInsertJobCron:*/20 * * * * ?}") - private String databaseInsertJobCron; - - @Value("${databaseInsertJobDelaySec:0}") - private Long databaseInsertJobDelaySec; - -} diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java deleted file mode 100644 index 62223cf..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/listener/ClearUserDataListener.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gitee.starblues.example.plugin1.listener; - -import com.gitee.starblues.example.plugin1.service.Plugin1UserService; -import lombok.AllArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.context.event.ApplicationStartedEvent; -import org.springframework.context.ApplicationListener; -import org.springframework.stereotype.Component; - -/** - * 清除user表数据的监听器 - * - * @author starBlues - * @version 1.0 - * @since 2021-05-25 - */ -@Component -@AllArgsConstructor -public class ClearUserDataListener implements ApplicationListener { - - - private final static Logger LOG = LoggerFactory.getLogger(ClearUserDataListener.class); - - private final Plugin1UserService plugin1UserService; - - @Override - public void onApplicationEvent(ApplicationStartedEvent event) { - plugin1UserService.remove(null); - LOG.info("清除用户表数据成功"); - } -} diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/ThymeleafController.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/ThymeleafController.java deleted file mode 100644 index c4df75a..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/rest/ThymeleafController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.gitee.starblues.example.plugin1.rest; - -import com.gitee.starblues.realize.ConfigDefinitionTip; -import io.swagger.annotations.Api; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; - -import java.util.UUID; - -/** - * Thymeleaf 模板引擎接口 - * @author starBlues - * @version 2.3.0 - */ -@Controller() -@RequestMapping("/thy") -@Api -public class ThymeleafController { - - @GetMapping() - public String show(Model model){ - model.addAttribute("uid", UUID.randomUUID().toString()); - model.addAttribute("name","uuid"); - return "index"; - } - - -} diff --git a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java b/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java deleted file mode 100644 index c892347..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/java/com/gitee/starblues/example/plugin1/service/quartz/DatabaseInsertJob.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.gitee.starblues.example.plugin1.service.quartz; - -import com.gitee.starblues.example.plugin1.entity.Plugin1User; -import com.gitee.starblues.example.plugin1.service.Plugin1UserService; -import org.quartz.Job; -import org.quartz.JobDataMap; -import org.quartz.JobExecutionContext; -import org.quartz.JobExecutionException; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.context.ApplicationContext; - -import java.util.concurrent.atomic.AtomicInteger; - -/** - * 数据库插入者启动的job - * @author starBlues - * @version 2.4.3 - */ -public class DatabaseInsertJob implements Job { - - private static final Logger LOG = LoggerFactory.getLogger(DatabaseInsertJob.class); - - public static final String APPLICATION_CONTEXT = "applicationContext"; - - private ApplicationContext applicationContext; - private Plugin1UserService plugin1UserService; - - private AtomicInteger count = new AtomicInteger(0); - - @Override - public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { - JobDataMap mergedJobDataMap = jobExecutionContext.getMergedJobDataMap(); - applicationContext = (ApplicationContext) mergedJobDataMap.get(APPLICATION_CONTEXT); - plugin1UserService = applicationContext.getBean(Plugin1UserService.class); - insertUserData(); - } - - private void insertUserData() { - LOG.info("开始插入用户数据"); - Plugin1User plugin1User = new Plugin1User(); - int i = count.incrementAndGet(); - plugin1User.setUsername("plugin1-" + i); - plugin1User.setPassword("" + i); - plugin1User.setDeleted(0); - plugin1User.setName("name-" + i); - plugin1User.setStatus(1); - plugin1User.setLocked(2); - plugin1UserService.save(plugin1User); - } - - -} diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties b/example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties deleted file mode 100644 index 20f8234..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin.properties +++ /dev/null @@ -1,8 +0,0 @@ -plugin.id=example-plugin1 -plugin.class=com.gitee.starblues.example.plugin1.ExamplePlugin1 -plugin.version=2.4.3-SNAPSHOT -plugin.provider=starblues -plugin.description=案例插件1 -plugin.configFileName=plugin1.yml -plugin.configFileProfile=dev -plugin.libDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-framework-example//example-plugins-dir2//example-plugin1//target//lib \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-log.xml b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-log.xml deleted file mode 100644 index 879e8f3..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-log.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - ~\logs\ - current - INFO - 10MB - 10GB - 30 - %d{yyyy-MM-dd HH:mm:ss.SSS} -%5p --- [%t] %-40.40logger{39} : %m%n - \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-prod.yml b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-prod.yml deleted file mode 100644 index b1220f5..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-prod.yml +++ /dev/null @@ -1,18 +0,0 @@ -plugin: - # 日志文件配置 - log-config-location: file:~/plugin-configs/plugin1-log.xml - # 静态资源配置 - static: - # 静态资源位置 - locations: - - classpath:static - # 插件thymeleaf配置 - thymeleaf: - prefix: plugin1-template - suffix: .html - mode: html - encoding: utf-8 - # log-config-location: classpath:plugin1-log.xml - # 配置当前插件需要自动装载的类。用于集成 xxx-starter - auto-config-class: - - org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-template/index.html b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-template/index.html deleted file mode 100644 index 5f403ef..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-template/index.html +++ /dev/null @@ -1,24 +0,0 @@ - - - integration-mybatis-plugin1 - - - - -

- -
-
-
-
-
-

hello. 显示插件静态资源正常

-

-

-
-
-
-
-
- - \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-thymeleaf.yml b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-thymeleaf.yml deleted file mode 100644 index 82f459c..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1-thymeleaf.yml +++ /dev/null @@ -1,8 +0,0 @@ -plugin: - # 插件thymeleaf配置 - thymeleaf: - prefix: plugin1-template - suffix: .html - mode: html - encoding: utf-8 - diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml b/example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml deleted file mode 100644 index 3d7808a..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/resources/plugin1.yml +++ /dev/null @@ -1,3 +0,0 @@ -spring: - profiles: - active: dev diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/static/css/all.css b/example-plugins-dir2/example-plugin1/src/main/resources/static/css/all.css deleted file mode 100644 index 3315976..0000000 --- a/example-plugins-dir2/example-plugin1/src/main/resources/static/css/all.css +++ /dev/null @@ -1,104 +0,0 @@ -body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, code, form, textarea, select, optgroup, option, fieldset, legend, p, blockquote, th, td { - margin:0; - padding:0 -} -fieldset, img { - border:0 -} -ul, li, ol { - list-style:none -} -h1, h2, h3, h4, h5, h6 { - font-size:100% -} -legend { - color:#000 -} -input, button, textarea, select, optgroup, option { - font-family:inherit; - font-size:inherit; - font-style:inherit; - font-weight:inherit -} -input, button, select { - margin:0; -*font-size:100%; - line-height:1.2 -} -a img, img { - -ms-interpolation-mode:bicubic -} -body { - background:#FFF -} -a { - color:#06c; - text-decoration:none -} -a:hover, a:active, a:focus { - color:#06c; - text-decoration:underline -} -table { - border-collapse:collapse; - border-spacing:0 -} -header, aside, section { - display:block -} -body, button, input, select, textarea { - font:12px/1.5 tahoma, arial, "隶书"; - color:#666 -} -.center { - text-align:center -} -.clear:after, .clearfix:after { - content:"."; - display:block; - clear:both; - visibility:hidden; - font-size:0; - height:0; - line-height:0 -} -.clear, .clearfix { - zoom:1 -} -.b-panel { - position:absolute -} -.b-fr { - float:right -} -.b-fl { - float:left -} -.error-404 { - background-color:#EDEDF0 -} -.module-error { - margin-top:182px -} -.module-error .error-main { - margin:0 auto; - width:420px -} -.module-error .label { - float:left; - width:160px; - height:151px; - background:url('../image/image.png') 0 0 no-repeat -} -.module-error .info { - margin-left:182px; - line-height:1.8 -} -.module-error .title { - color:#666; - font-size:14px -} -.module-error .reason { - margin:8px 0 18px 0; - color:#666 -} diff --git a/example-plugins-dir2/example-plugin1/src/main/resources/static/image/image.png b/example-plugins-dir2/example-plugin1/src/main/resources/static/image/image.png deleted file mode 100644 index bebc1e79986616fa484d186b40d80c77cf9385e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5719 zcmds5)mIb_u-*lvQ@RxC4oT^jl@94nX=Le^7C|JWyFpTxuEk{mk*=jXq?d-JuD|;q z+}Atjd^6{p`5tCo=A4<&S{iQ&aA|M>0003vkx4vq1NYlX0*v z$5er2%8#DoQN}?J=G)P%&6At11>|6w_*6}azpl*A+VV8ivnp81MfO!qieFxk$^KGg zUybAS66C86<7F9Wekda^P_A@%|L-JtXL+b|{$ym+4E!|snU?HDaYn`F(g!hI;wrM%!zHG-DGDvXlKN2q$}B0>{YO#;Oa;KVr;l9 zG4hj{O5NmPN%Y&5rG@G*pzg}d+w-QI$URpAArz9cZ0;;^SciQL0 z-kN9hr#0kfcIJr!;S;%kT2a>HEv+aY~+bR#V;eW}uq_h(>Lq3KxR)v@Rgl8kk!Mi;BD zGw{-E_->Ttn_Y-}cWvn^%(f?lySXGg!Gfc+#OAWb;A*>|B+m07M;Y9-^4-sA6)~0I zD1I`|-I1xD;;G=O$Y(A5Vz|k=BwA;<E@&~|D$-YnZoI; zN=bxOdvQora#VVt&OqbWX(Lz_^z$l-Ank&X_OVH7`8m(_NqETdu7n` zx+iG73yc`qBKH8~n;;^Rbg07h`)mL3rSu=xOTZoLjNTZXLh@-zdHRFd(GsnoCnt?{w zrtdnp!)bN#fon5Gs1sO4lviW4Oi!s{q$&SZqxDZ4#`2MagA}3bHuv-1&dYWGi8r%6 z000o+rK6$yuciNQ2Kc`WglS3j^WU1l@lY`W0|0o>{{wJxIpqFdlEO>L&`ZJ7&dSTt z-Hk!d(bWzhAi&2j!Y3d&;Xmd2PeJ#eLf75i%h$@&4j^aiZf(b)?C5Fd>+b0cW>C-- z{@AoB0sxR?fE4BQ{BpW-h)i{N+Xhx)f6e9zz7lj=Hs~1C6B~0{w~mtP$EI)>MfT7u z6;6Cz)PI~ySmG&zQpWwU3l{0kSe*9mG%LDRdHo(xOUB$ zcY;se+~$Kd&hk>AC+FH{yHdMB=aMJqonv=-qQK~92pavGUP*2KA6NW8cJPR9h60;h zviKy|vI<1!ge?4^@8zn4I+0;R1=s&eVRCXV8-D9RUyNr`mJ>niKm=yP*=acXET-JD zoO{n&SRgi(UaGF3*}?-VAx9B>1Nb~C8Wv2mRVF3p!$GnD#uD;z=5=gW+F|ST>>(>D zez)4VUek2hCv^@G)2@9M2`M!3eGci8U7X!LtyqBhoYOZG{XXXYP43}jUDak>Qxi)y z48U@a#TUet!>qWngiAOd1(g!k)p_em`^{jfvOYV%V%#{!_X;C8a0NhM6-P){B~MEX zNcQMd&4yxE+&81I#SorAhhc{{byLGEu6Upd!YO5F&rz4#!t9FnaXmnMp?aY0EsAQ~ zL!W>r22T@7SoW(Y6RNagua$tqTnW zufSu05--NHCa{=5#Xi(>&Gf_1L#x_La!Hrnh~_pWV-Fjc^NAd5{?c3iCiqUnE=w;* z0j%=S0ePbpWO053Q(ZXzI07Zwx%kVzWH$$ja88r6Iq1@A5S#w;St=_etb~YvI&EEO zYW}QSBMiw@CglUvAt7e=#R<5eKkJ03x)f>#w!FP@;n}!x>1KYofG;%DQ;y|W`3IqQ z*a{#zg2)85n3o5mP%QJub%17$lKxpbmAhpA{wYTl^7iE8Uyndz98tk->e?`aA@WLZ zGjeh>Zyv1I)Fi4zO%cu1V-68}*_B%x*z7vM0>by?NKAm3z(N05=@aWW6tz_DG5JpK zSEjXDo@%hg33Gle+JMP!!6oI`f*vwUyy&n)KX)2YvoUykQ5d zB@FYNj+que4*rfPERqD_FSHR95AR3Y8?bH|XL`vTsXQ$L?uesIVSRt|ykRaSqQ-4h z1_yU3A%t-Mil88BtT6&qGc*=zs&(wIuQWJ6Z3i^;!nm#V$)~DvX!>Bh_ zN4Aaei@eXhzenv|@U0kDx?TkB>;|FzEtg_Y_V$=;`=dLvkok*NwMQJCRWkQY_rbL^ zUALrcX|JlyKglZPa}*Yjxd~vBYdn&g-)Q5lbNx^-7&zg zutV^!rq6v9NuyOFE)c!H1|B8dPAyI3%D~apsDqW~d-G1T0#Km0@K} zU~rZ+yZSjFqJ*nr-o6Y)_r@;6%`@}15z9r{7rD>>M}WnOCV}-;_nT}{KoVa8L7xN5l4J-qX?Aa5> z#N*@jNOp^4VhYUjk+K7?n(f}IDq_Z9P_WhyYf$iQ>^YTArot?TaELALpU0*9{oT|0 zO~(y9y_dvZCr|ee`l{zTDmODelixL~bG-Mt)EyVi^nDD`Si{iu(DkcwWV|=uoNdpC zSN0!%3MW!&A9%bRxI)MNbrG)`&8E>l+)}pPlHP8b#KMpZB-(EEgReO>uWK!*Dj>6TSIr-=E4qGTMJQ z!?nE0@_wSH0c8HM|1zr@FveMdNmtJb;S$X1mtT<`-T&T*kGN(oHO)I!bq6HGiN^tT zM|9~nfq01TaNZiEc*2@#>64=ck$<@r%y@j zoQ5#9lxm6{TAu$lY;5#^zD{#pkH=DAc5QJ^wt6OpZqI>9R~7yKoz17Xa0B6NO8@=o zN}B;zEF#+?bq$N;)yLQkE0M4eTqo+r?NEQonRJTX<^}T?Qr;(fPeGZ}559@r)Hk3n zyRDgNe|*bzDPI}_qJ6Z7G7zFBmne#uZpz!8hjfd_W%w8O;Fxg}%BQFNe8T&!Ff6G0 zS&?8Wl|4EYW?Cx^QUGtsrsk``^A~~X{L3b*EqfA_J^r`L1fNKb2{L@79w=7;B3u=A zzbGp75vswiKF377k3?ibtD-Ut`A>(9feLN}8NSgpj4l8y&hedn$F$MiYKJtLt*Z)0 z|D|KEb~uYIl#2n)mD4u?*Y7D%#=j57=KRk2CU!LJZVh z?&m#yiUD`&!6$A29_{!})<*G|skhL|%(-T+CpiC?nix;$2S;&r>_#B>OT}~K#e~CX zeow%vOUIAhRsXn&fReMowa}rm7>)9$w2)kSa{gz1Me5N}h&*ZcDT%wKU5X-9Or(0! zCx=NhJh`;69p2cVrjVPx6QkR!2iw~-$#-Ta%wlk7*DCfb7l(z3a9lqTbnmXCQfJy( z(teX3_tmF|^=z3SOk>Fm{-+u5gJY*mH;E#&Gfpkwsb(FIMbBg9<%wxms4L7Nzw6fF zy5_Ud*^kh`Ztek9StSxw@@+Y78lT1Ej=+sOY(i7Y$HY21eN`9dultuGv{3-XH61dY z;$@fehmSP!dY9iK{m{p_pt+X#GcbD`oI+t1putGEn>)ar{aXh^-p~e^n3E+q9&a=N zy|oE=Sv&Z%Ry-}to^&H3cLiWxOBLanKj~34zPdWzn>L1)f$`x);T2l+b5e~`&v|7l zyUFB<`Qf3V!if@2vH6N2wW{IxLAtou50$is`&lE0$QurJMwl&mo?J)kSM0g@jp=7m zpl==@(w3UWUyEfJr_&^X!V{Dz8g>M;>&fbhF9jG2d?+}S_3?lD^1EGrWWg?Odrf1B zE88yIx#1UGUc(7t+@ux`L~z`^#Y@6Q7zXl{$G3MPwR`RlzZg) z)yf(1bS1USFsR#M8x9Q2ITHf!>CZA9LfN_Y>c7(O!oca0y1ooNTd>Yp1-xgN`7 z9MYF$Pm?V39j&;!-|8p5VkEPjLJ<>YBw4; zEAm*1mXh+ID-iTvnEiPMZ#=Fa(^6-?S|wdd`NJE}v%=Qa%}izac6Vuy{lp)8!UM~aYqKE(^=}PW%y1yen-6 zXL^3Q@P&^a7yvo0y&R1#CSMQ7`MZ=lsvPm85--iXU>ipWntetTNbn&;%c7oC11v`t zB1yd>p%kfH)ZIxMk*tEUdw6&*9W?k-6t2Z?1dPMfa3KRL>v8gJJ&UF!7IpCgciePz z|8NcLwXj_tV?RUexnJ5C_HZOgFnFnUFuf8l(qdon^L?Fj&-2N0YNabQE~K!vgN~i7 zaNlV_k7;uI_!sJuu!G;o&Ers4jFfTdg)V2gRpVw-II=k#iO<*B<;z#XG>sY1m`&?T zK`G$?OL`Ok(iJScC{=Bg%f=gP*5{}Cdl+-?3~lDk2poxAZ@GTtXq&6%cGb{m*={&j ziY~srx77%H1kZ)WM6Y_YM0Wc`L4JM~?N^d-4}JQ9v56S?dv!cRX)+^1%*O+f^hroq zH?3aDmn!($!_{voiMNohMdF%D?7Dy&N-lapYud+btJnw_^@G!R>wl!+gWgAq zZzZVQFu4HL=jd)hq?nL98%Gj)?{!|G+yd7jE6H<&Sp#|%F7^=3Icb)AE)n9~`w+0p z@7%+Wfgcvw!Vx@Cme8O?tTEzTrhg{V&CT&!L;-;{@?7aOVji&a%ZqSK2;GU8%80Dv z7u==67wdWzkLZN^!)VbHZ})@~)Tu*&+KFbORWXvV!goXP{!w(1;$b_32Hy+`_<=uw|TnzWInmlftUTWK$oiXog?yN5yBEEGA7#Z6$+?SK}of6{Zw-eH#tXN{y<&}$}^hzyM$tBASwvz@83Yt`F2Je{|_`+I&fw0u4mWvk6Jy>N5wgZeiAUms^w$XFX#WGKMNRMmNHH+JR3QZ|W% zA|U=u1vh)aAGGTyMFb49udRZrpVHc7KYsh5_!2(A%vz2x8u=1)&=9cC4l{1^2oSSQ z?mg3ZE$#3+ig+l2X7!nBH|m>ZdOvr%w521(b^vaS@4%juFy-x^>SAYWH5Iq6Y74X( znHS%GASP~eFGV3KEQX=jxzulCUF`6rSwG9)BwLCgHj!LFCUAZ6@ZQ@)lFd52N;YxL zqF1diJGL>kF=X;SFSm{ywMZ+gZPsI*vb>&eRbzcM3p%)@;EmO)D|S$c-?0I^-0@#q z9G)UrVlq6zV0BamN%;k-;MddQWHVHX3gvR*sruo7DqqNXtkL7E&Azzvn!j7NxfKr+%H2x3k$$tC0Gh!ZALq{e4EE - - example-plugin1 - - - - -
- -
-
-
-
-
-

hello. 显示插件静态资源正常

-
-
-
-
-
- - diff --git a/example-plugins-dir2/example-plugin2/pom.xml b/example-plugins-dir2/example-plugin2/pom.xml deleted file mode 100644 index 97b45e3..0000000 --- a/example-plugins-dir2/example-plugin2/pom.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - example-plugins-dir2 - com.gitee.starblues - 1.0.0-SNAPSHOT - ../pom.xml - - 4.0.0 - - example-plugin2 - jar - - \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/ExamplePlugin2.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/ExamplePlugin2.java deleted file mode 100644 index 8782987..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/ExamplePlugin2.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.gitee.starblues.example.plugin2; - -import com.gitee.starblues.annotation.ConfigDefinition; -import com.gitee.starblues.realize.BasePlugin; -import org.pf4j.PluginWrapper; - -/** - * 案例插件2 - * @author starBlues - * @version 2.4.3 - */ -public class ExamplePlugin2 extends BasePlugin { - public ExamplePlugin2(PluginWrapper wrapper) { - super(wrapper); - } -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/config/MybatisPlusConfig.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/config/MybatisPlusConfig.java deleted file mode 100644 index 732d785..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/config/MybatisPlusConfig.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.gitee.starblues.example.plugin2.config; - -import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean; -import com.gitee.starblues.annotation.ConfigDefinition; -import com.gitee.starblues.extension.mybatis.mybatisplus.SpringBootMybatisPlusConfig; -import com.gitee.starblues.realize.ConfigDefinitionTip; -import com.zaxxer.hikari.HikariConfig; -import com.zaxxer.hikari.HikariDataSource; -import lombok.Data; - -import java.util.HashSet; -import java.util.Set; - -/** - * 插件中mybatis-plus配置 - * @author starBlues - * @version 2.4.3 - */ -@ConfigDefinition -public class MybatisPlusConfig implements SpringBootMybatisPlusConfig { - - private ConfigDefinitionTip configDefinitionTip; - - @Override - public boolean enableOneselfConfig() { - return true; - } - - @Override - public void oneselfConfig(MybatisSqlSessionFactoryBean sqlSessionFactoryBean) { - // 插件自定义数据库数据源, 为了方便测试, 还是连接主程序的配置 - // 直接从plugin2.yml配置文件中的plugin.datasource配置项中获取配置 - HikariConfig hikariConfig = configDefinitionTip.getConfigOfBean("plugin.datasource", - HikariConfig.class); - HikariDataSource hikariDataSource = new HikariDataSource(hikariConfig); - sqlSessionFactoryBean.setDataSource(hikariDataSource); - } - - @Override - public Set entityPackage() { - Set typeAliasesPackage = new HashSet<>(); - typeAliasesPackage.add("com.gitee.starblues.example.plugin1.entity"); - return typeAliasesPackage; - } - - @Override - public Set xmlLocationsMatch() { - Set xmlLocationsMatch = new HashSet<>(); - xmlLocationsMatch.add("classpath:plugin2-mapper/*Mapper.xml"); - return xmlLocationsMatch; - } - - @Data - public static class DataSourceConfig{ - private String driverClassName; - private String url; - private String username; - private String password; - } -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/entity/Plugin2User.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/entity/Plugin2User.java deleted file mode 100644 index 13656ab..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/entity/Plugin2User.java +++ /dev/null @@ -1,107 +0,0 @@ -package com.gitee.starblues.example.plugin2.entity; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import java.io.Serializable; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.experimental.Accessors; - -/** - *

- * 插件2-用户表 - *

- * - * @author starBlues - * @since 2021-05-21 - */ -@Data -@EqualsAndHashCode(callSuper = false) -@Accessors(chain = true) -public class Plugin2User implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 用户id - */ - @TableId(value = "user_id", type = IdType.ASSIGN_UUID) - private String userId; - - /** - * 用户名称 - */ - private String name; - - /** - * 手机号 - */ - private String phone; - - /** - * 邮箱 - */ - private String email; - - /** - * 用户名 - */ - private String username; - - /** - * 密码(加密后) - */ - private String password; - - /** - * 帐号状态（1启用, 0停用） - */ - private Integer status; - - /** - * 删除标记（1删除, 0 正常） - */ - private Integer deleted; - - /** - * 是否被锁(小于等于5表示未被锁, 大于5表示被锁) - */ - private Integer locked; - - /** - * 创建用户 - */ - private String createUser; - - /** - * 创建时间 - */ - private String gmtCreated; - - /** - * 修改用户 - */ - private String modifiedUser; - - /** - * 修改时间 - */ - private String gmtModified; - - /** - * 头像地址 - */ - private String avatar; - - /** - * 上一次登录的ip地址 - */ - private String lastLoginIp; - - /** - * 上一次登录的时间 - */ - private String lastGmtLoginTime; - - -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/extract/ExtractExampleImp3.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/extract/ExtractExampleImp3.java deleted file mode 100644 index 23910aa..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/extract/ExtractExampleImp3.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gitee.starblues.example.plugin2.extract; - -import com.gitee.starblues.annotation.Extract; -import com.gitee.starblues.example.plugin.ExtractExample; - -/** - * ExtractExample 实现1 - * @author starBlues - * @version 1.0 - * @since 2021-07-24 - */ -@Extract(bus = "example", scene = "plugin", order = 2) -public class ExtractExampleImp3 implements ExtractExample { - @Override - public Info exeInfo(Info info) { - info.setName("My is ExtractExampleImp3 of example-plugin2"); - return info; - } -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/mapper/Plugin2UserMapper.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/mapper/Plugin2UserMapper.java deleted file mode 100644 index b009a27..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/mapper/Plugin2UserMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.gitee.starblues.example.plugin2.mapper; - -import com.gitee.starblues.example.plugin2.entity.Plugin2User; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - *

- * 插件2-用户表 Mapper 接口 - *

- * - * @author starBlues - * @since 2021-05-21 - */ -@Mapper -public interface Plugin2UserMapper extends BaseMapper { - - - -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/rest/Plugin2UserResource.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/rest/Plugin2UserResource.java deleted file mode 100644 index df61b8c..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/rest/Plugin2UserResource.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.gitee.starblues.example.plugin2.rest; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.gitee.starblues.example.plugin2.entity.Plugin2User; -import com.gitee.starblues.example.plugin2.mapper.Plugin2UserMapper; -import com.gitee.starblues.example.plugin2.service.Plugin2UserService; -import io.swagger.annotations.Api; -import lombok.AllArgsConstructor; -import org.springframework.web.bind.annotation.*; - - -/** - * user 接口 - * @author starBlues - * @version 1.0 - * @since 2021-05-25 - */ -@RestController -@RequestMapping("/user") -@Api -@AllArgsConstructor -public class Plugin2UserResource { - - private final Plugin2UserService plugin2UserService; - - @GetMapping - public Page getPage(@RequestParam("currentPage") Integer currentPage, - @RequestParam("pageSize") Integer pageSize){ - Page plugin2UserPage = new Page<>(currentPage, pageSize); - return plugin2UserService.page(plugin2UserPage); - } - - - @PostMapping - public Plugin2User addUser(@RequestBody Plugin2User plugin2User){ - plugin2UserService.save(plugin2User); - return plugin2User; - } - -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/Plugin2UserService.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/Plugin2UserService.java deleted file mode 100644 index 3b8aa71..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/Plugin2UserService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.gitee.starblues.example.plugin2.service; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.gitee.starblues.example.plugin2.entity.Plugin2User; -import com.baomidou.mybatisplus.extension.service.IService; -import com.gitee.starblues.example.plugin2.mapper.Plugin2UserMapper; - -/** - *

- * 插件2-用户表 服务类 - *

- * - * @author starBlues - * @since 2021-05-21 - */ -public interface Plugin2UserService extends IService { -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/ExtractExample3.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/ExtractExample3.java deleted file mode 100644 index 9f1386b..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/ExtractExample3.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gitee.starblues.example.plugin2.service.impl; - -import com.gitee.starblues.annotation.Extract; -import com.gitee.starblues.example.plugin.ExtractExample; - -/** - * @author zhangzhuo@acoinfo.com - * @version 1.0 - * @since 2021-07-23 - */ -@Extract(bus = "PluginExtract2", order = 1) -public class ExtractExample3 implements ExtractExample { - - @Override - public Info exeInfo(Info info) { - info.setName("ExtractExample3"); - return info; - } -} diff --git a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/Plugin2UserServiceImpl.java b/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/Plugin2UserServiceImpl.java deleted file mode 100644 index dff8e54..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/java/com/gitee/starblues/example/plugin2/service/impl/Plugin2UserServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.gitee.starblues.example.plugin2.service.impl; - -import com.gitee.starblues.example.plugin2.entity.Plugin2User; -import com.gitee.starblues.example.plugin2.mapper.Plugin2UserMapper; -import com.gitee.starblues.example.plugin2.service.Plugin2UserService; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.stereotype.Service; - -/** - *

- * 插件2-用户表 服务实现类 - *

- * - * @author starBlues - * @since 2021-05-21 - */ -@Service -public class Plugin2UserServiceImpl extends ServiceImpl implements Plugin2UserService { - -} diff --git a/example-plugins-dir2/example-plugin2/src/main/resources/plugin.properties b/example-plugins-dir2/example-plugin2/src/main/resources/plugin.properties deleted file mode 100644 index 33e6613..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/resources/plugin.properties +++ /dev/null @@ -1,7 +0,0 @@ -plugin.id=example-plugin2 -plugin.class=com.gitee.starblues.example.plugin2.ExamplePlugin2 -plugin.version=2.4.3-SNAPSHOT -plugin.provider=starblues -plugin.description=案例插件2 -plugin.configFileName=plugin2.yml -plugin.configFileProfile=dev \ No newline at end of file diff --git a/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-dev.yml b/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-dev.yml deleted file mode 100644 index d455387..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-dev.yml +++ /dev/null @@ -1,6 +0,0 @@ -plugin: - datasource: - driverClassName: com.mysql.cj.jdbc.Driver - jdbcUrl: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC - username: root - password: 123456 diff --git a/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-mapper/Plugin2UserMapper.xml b/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-mapper/Plugin2UserMapper.xml deleted file mode 100644 index 7f7b1f0..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-mapper/Plugin2UserMapper.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - user_id, name, phone, email, username, password, status, deleted, locked, create_user, gmt_created, modified_user, gmt_modified, avatar, last_login_ip, last_gmt_login_time - - - diff --git a/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-prod.yml b/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-prod.yml deleted file mode 100644 index d455387..0000000 --- a/example-plugins-dir2/example-plugin2/src/main/resources/plugin2-prod.yml +++ /dev/null @@ -1,6 +0,0 @@ -plugin: - datasource: - driverClassName: com.mysql.cj.jdbc.Driver - jdbcUrl: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC - username: root - password: 123456 diff --git a/example-plugins-dir2/pom.xml b/example-plugins-dir2/pom.xml deleted file mode 100644 index 9c8fe26..0000000 --- a/example-plugins-dir2/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - - springboot-plugin-framework-example - com.gitee.starblues - 1.0.0-SNAPSHOT - - 4.0.0 - - example-plugins-dir2 - pom - - - example-plugin1 - example-plugin2 - - - - 1.18.10 - 4.13 - - 3.1.1 - - - - - - com.gitee.starblues - example-main - ${project.version} - provided - - - - com.gitee.starblues - springboot-plugin-bootstrap - 3.0.0-RELEASE - provided - - - - junit - junit - ${junit.version} - test - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 116ac7e..7d643a7 100644 --- a/pom.xml +++ b/pom.xml @@ -14,10 +14,8 @@ example-main - example-plugin-dependency example-plugins-basic - example-plugins-dir1 - + example-plugins-db diff --git a/sql/plugin-test-example.sql b/sql/plugin-test-example.sql index aa60bc8..27ab0d1 100644 --- a/sql/plugin-test-example.sql +++ b/sql/plugin-test-example.sql @@ -47,8 +47,8 @@ INSERT INTO `main_user` VALUES ('1', 'admin', '16666666666', '123@qq.com', 'admi -- ---------------------------- -- Table structure for plugin1_user -- ---------------------------- -DROP TABLE IF EXISTS `plugin1_user`; -CREATE TABLE `plugin1_user` ( +DROP TABLE IF EXISTS `mp_plugin_user`; +CREATE TABLE `mp_plugin_user` ( `user_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户id', `name` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名称', `phone` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '手机号', @@ -71,38 +71,10 @@ CREATE TABLE `plugin1_user` ( -- ---------------------------- -- Records of plugin1_user -- ---------------------------- -INSERT INTO `plugin1_user` VALUES ('1', '1', '1', '1', '1', '1', '1', '0', '0', '1', '1', '1', '1', '1', '1', '1'); -INSERT INTO `plugin1_user` VALUES ('ca49e3f196c428723f31e06b77731e6b', 'name-1', null, null, 'plugin1-1', '1', '1', '0', '2', 'admin', '2021-07-24 08:38:40', 'admin', '2021-07-24 08:38:40', null, null, null); +INSERT INTO `mp_plugin_user` VALUES ('1', '1', '1', '1', '1', '1', '1', '0', '0', '1', '1', '1', '1', '1', '1', '1'); +INSERT INTO `mp_plugin_user` VALUES ('ca49e3f196c428723f31e06b77731e6b', 'name-1', null, null, 'plugin1-1', '1', '1', '0', '2', 'admin', '2021-07-24 08:38:40', 'admin', '2021-07-24 08:38:40', null, null, null); -- ---------------------------- --- Table structure for plugin2_user --- ---------------------------- -DROP TABLE IF EXISTS `plugin2_user`; -CREATE TABLE `plugin2_user` ( - `user_id` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户id', - `name` varchar(16) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名称', - `phone` varchar(11) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '手机号', - `email` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '邮箱', - `username` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '用户名', - `password` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '密码(加密后)', - `status` int(1) NOT NULL DEFAULT '1' COMMENT '帐号状态（1启用, 0停用）', - `deleted` int(1) NOT NULL DEFAULT '0' COMMENT '删除标记（1删除, 0 正常）', - `locked` int(6) NOT NULL DEFAULT '0' COMMENT '是否被锁(小于等于5表示未被锁, 大于5表示被锁)', - `create_user` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建用户', - `gmt_created` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '创建时间', - `modified_user` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '修改用户', - `gmt_modified` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '修改时间', - `avatar` varchar(128) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '头像地址', - `last_login_ip` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '上一次登录的ip地址', - `last_gmt_login_time` varchar(32) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '上一次登录的时间', - PRIMARY KEY (`user_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8 ROW_FORMAT=COMPACT COMMENT='插件2-用户表'; - --- ---------------------------- --- Records of plugin2_user --- ---------------------------- -INSERT INTO `plugin2_user` VALUES ('1', 'admin', '16666666666', '123@qq.com', 'admin', '$2a$10$IqjSzOzTpMX79DnxS7aBz.A1.uqR.DvuvMtx9TaGmwpsxgJDFW8wS', '1', '0', '0', 'admin', '2021-01-01 08:08:08', 'admin', 'admin', '2e418339355940a9b83f72d597a6da2c.jpg', '127.0.0.1', '2021-02-02 20:14:21'); - -- ---------------------------- -- Table structure for plugin_jpa_user -- ---------------------------- -- Gitee From ce4eddeadb244268f9cd167b906066e05fb57b7b Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sat, 19 Feb 2022 15:03:33 +0800 Subject: [PATCH 22/35] main jar in jar --- example-main/pom.xml | 77 +++++++++++++++---- .../gitee/starblues/example/Application.java | 4 +- .../example/config/PluginConfig.java | 2 +- .../src/main/resources/application-dev.yml | 2 +- .../src/main/resources/application-prod.yml | 8 +- example-plugins-basic/example-basic-1/pom.xml | 5 +- .../example/basic1/Basic1Plugin.java | 2 +- example-plugins-basic/example-basic-2/pom.xml | 2 +- .../example/basic2/Basic2Plugin.java | 2 +- example-plugins-db/example-jpa/pom.xml | 25 +++++- package.bat | 25 +++--- pom.xml | 19 +++++ 12 files changed, 122 insertions(+), 51 deletions(-) diff --git a/example-main/pom.xml b/example-main/pom.xml index 5a2b9ac..8a0d315 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -98,13 +98,6 @@ spring-boot-starter-aop - - - - - - - org.springframework.boot spring-boot-starter-test @@ -114,22 +107,78 @@ + - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} + com.gitee.starblues + springboot-plugin-maven-packager + ${springboot-plugin-framework.version} + + main + + com.gitee.starblues.example.Application + + - repackage repackage - - exec - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example-main/src/main/java/com/gitee/starblues/example/Application.java b/example-main/src/main/java/com/gitee/starblues/example/Application.java index 845fb95..c486222 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/Application.java +++ b/example-main/src/main/java/com/gitee/starblues/example/Application.java @@ -1,7 +1,7 @@ package com.gitee.starblues.example; -import com.gitee.starblues.core.launcher.SpringMainBootstrap; -import com.gitee.starblues.core.launcher.SpringBootstrap; +import com.gitee.starblues.loader.launcher.SpringMainBootstrap; +import com.gitee.starblues.loader.launcher.SpringBootstrap; import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java index 9b32414..1953b61 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java +++ b/example-main/src/main/java/com/gitee/starblues/example/config/PluginConfig.java @@ -1,6 +1,6 @@ //package com.gitee.starblues.example.config; // -//import com.gitee.starblues.core.classloader.DefaultMainResourcePatternDefiner; +//import com.gitee.starblues.loader.classloader.DefaultMainResourcePatternDefiner; //import com.gitee.starblues.core.classloader.EmptyMainResourcePatternDefiner; //import com.gitee.starblues.core.classloader.MainResourcePatternDefiner; //import com.gitee.starblues.example.listener.Pf4jPluginListener; diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 009062e..fe21fcd 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -16,8 +16,8 @@ mybatis-plus: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl plugin: - mainPackage: com.gitee.starblues.example runMode: dev + mainPackage: com.gitee.starblues.example pluginPath: - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-db diff --git a/example-main/src/main/resources/application-prod.yml b/example-main/src/main/resources/application-prod.yml index affa867..c5bca4d 100644 --- a/example-main/src/main/resources/application-prod.yml +++ b/example-main/src/main/resources/application-prod.yml @@ -17,9 +17,5 @@ mybatis-plus: plugin: runMode: prod - pluginPath: plugins - pluginConfigFilePath: plugin-configs - sortInitPluginIds: - - example-plugin1 - - example-plugin2 - - example-jpa + mainPackage: com.gitee.starblues.example + pluginPath: D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\dist\plugins diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index b65df9e..8e5634e 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -27,7 +27,7 @@ com.gitee.starblues springboot-plugin-maven-packager - dev + ${plugin.build.mode} example-basic-1 com.gitee.starblues.example.basic1.Basic1Plugin @@ -37,9 +37,6 @@ 基本插件1 basic-config.yaml - - jar - diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java index 8f262ac..24038bf 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -16,7 +16,7 @@ import java.net.URL; * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic1") +@SpringBootApplication @OneselfConfig(mainConfigFileName = {"application.yml", "application-dev.yml"}) public class Basic1Plugin extends SpringPluginBootstrap { diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml index 1da5514..56ec5f4 100644 --- a/example-plugins-basic/example-basic-2/pom.xml +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -37,7 +37,7 @@ com.gitee.starblues springboot-plugin-maven-packager - dev + ${plugin.build.mode} example-basic-2 com.gitee.starblues.example.basic2.Basic2Plugin diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java index 3647661..c08b5dc 100644 --- a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/Basic2Plugin.java @@ -9,7 +9,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @version 1.0 * @since 2021-08-01 */ -@SpringBootApplication(scanBasePackages = "com.gitee.starblues.example.basic2") +@SpringBootApplication public class Basic2Plugin extends SpringPluginBootstrap { public static void main(String[] args) { diff --git a/example-plugins-db/example-jpa/pom.xml b/example-plugins-db/example-jpa/pom.xml index 28a6974..1cd59e2 100644 --- a/example-plugins-db/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -25,10 +25,27 @@ spring-boot-starter-data-jpa 2.5.0 + + + + javax.xml.bind + jaxb-api + 2.3.0 + + + com.sun.xml.bind + jaxb-impl + 2.3.0 + + + com.sun.xml.bind + jaxb-core + 2.3.0 + - mysql - mysql-connector-java - 8.0.25 + javax.activation + activation + 1.1.1 @@ -39,7 +56,7 @@ com.gitee.starblues springboot-plugin-maven-packager - dev + ${plugin.build.mode} jpa-example-plugin com.gitee.starblues.example.jpa.JpaPlugin diff --git a/package.bat b/package.bat index eced6c3..c9c14d7 100644 --- a/package.bat +++ b/package.bat @@ -2,7 +2,7 @@ REM windows package REM package ::如果不需要进行maven打包, 则使用 REM 注释掉该行 -call mvn clean install -Dmaven.test.skip=true +call mvn clean install -Dmaven.test.skip=true -P prod REM del dist rmdir dist /s /q @@ -10,28 +10,19 @@ rmdir dist /s /q REM create dist mkdir dist mkdir dist\plugins -mkdir dist\plugin-configs -mkdir dist\lib REM copy main program and config -xcopy example-main\target\example-main-*.jar dist /s /i +xcopy example-main\target\example-main-*-exec.jar dist /s /i xcopy example-main\src\main\resources\application-prod.yml dist /s xcopy example-main\target\lib\* dist\lib /y /e /i /q REM copy plugin and config -xcopy example-plugins-dir1\example-jpa\target\*.jar dist\plugins /s -xcopy example-plugins-dir1\example-jpa\src\main\resources\*-prod.yml dist\plugin-configs /s +xcopy example-plugins-basic\example-basic-1\target\*-repackage.jar dist\plugins /s +xcopy example-plugins-basic\example-basic-2\target\*-repackage.jar dist\plugins /s -xcopy example-plugins-dir1\example-basic\target\*.jar dist\plugins /s -xcopy example-plugins-dir1\example-basic\src\main\resources\*-prod.yml dist\plugin-configs /s - -xcopy example-plugins-dir2\example-plugin1\target\*.jar dist\plugins /s -xcopy example-plugins-dir2\example-plugin1\src\main\resources\*-prod.yml dist\plugin-configs /s -xcopy example-plugins-dir2\example-plugin1\src\main\resources\plugin1-log.xml dist\plugin-configs /s - -xcopy example-plugins-dir2\example-plugin2\target\*.jar dist\plugins /s -xcopy example-plugins-dir2\example-plugin2\src\main\resources\*-prod.yml dist\plugin-configs /s +xcopy example-plugins-db\example-jpa\target\*-repackage.jar dist\plugins /s +xcopy example-plugins-db\example-mybatis-plus\target\*-repackage.jar dist\plugins /s REM copy bin xcopy bin\* dist\ /s @@ -39,7 +30,9 @@ xcopy bin\* dist\ /s cd dist REM run main -rename example-main-*.jar example.jar +rename example-main-*-exec.jar example.jar rename application-prod.yml application.yml +start explorer . + :: 运行命令为: java -jar example.jar --spring.config.location=application.yml \ No newline at end of file diff --git a/pom.xml b/pom.xml index 7d643a7..2797bcd 100644 --- a/pom.xml +++ b/pom.xml @@ -18,6 +18,25 @@ example-plugins-db + + + dev + + true + + + dev + + + + + prod + + prod + + + + -- Gitee From bf297171297f5414745cb87fd409873e3b5b0bb5 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sat, 19 Feb 2022 17:33:52 +0800 Subject: [PATCH 23/35] main jar in jar --- package.bat | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.bat b/package.bat index c9c14d7..a581a52 100644 --- a/package.bat +++ b/package.bat @@ -12,7 +12,7 @@ mkdir dist mkdir dist\plugins REM copy main program and config -xcopy example-main\target\example-main-*-exec.jar dist /s /i +xcopy example-main\target\example-main-*-repackage.jar dist /s /i xcopy example-main\src\main\resources\application-prod.yml dist /s xcopy example-main\target\lib\* dist\lib /y /e /i /q @@ -30,7 +30,7 @@ xcopy bin\* dist\ /s cd dist REM run main -rename example-main-*-exec.jar example.jar +rename example-main-*-repackage.jar example.jar rename application-prod.yml application.yml start explorer . -- Gitee From 230c9890dd3c6c1867ccd5e401d48f5bd27dc858 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 27 Feb 2022 07:38:29 +0800 Subject: [PATCH 24/35] main jar in jar --- example-main/pom.xml | 1 + .../src/main/resources/application-dev.yml | 6 +++++ .../src/main/resources/application-prod.yml | 7 +++++- .../src/main/resources/application.yml | 8 +----- example-plugins-basic/example-basic-1/pom.xml | 3 +++ .../src/main/resources/basic-config-dev.yaml | 3 --- .../src/main/resources/basic-config.yaml | 18 ------------- example-plugins-db/example-jpa/pom.xml | 8 ++++++ .../gitee/starblues/example/mp/DbStop.java | 25 +++++++++++++++++++ example-plugins-db/pom.xml | 6 +++++ 10 files changed, 56 insertions(+), 29 deletions(-) delete mode 100644 example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml delete mode 100644 example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml create mode 100644 example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java diff --git a/example-main/pom.xml b/example-main/pom.xml index 8a0d315..844c56e 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -115,6 +115,7 @@ main + com.gitee.starblues.example.Application diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index fe21fcd..197d06f 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -7,6 +7,12 @@ spring: username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver + servlet: + multipart: + enabled: true + max-request-size: 100MB + max-file-size: 100MB + file-size-threshold: 20MB mybatis-plus: typeAliasesPackage: com.gitee.starblues.example.entity diff --git a/example-main/src/main/resources/application-prod.yml b/example-main/src/main/resources/application-prod.yml index c5bca4d..4706ded 100644 --- a/example-main/src/main/resources/application-prod.yml +++ b/example-main/src/main/resources/application-prod.yml @@ -7,7 +7,12 @@ spring: username: root password: 123456 driver-class-name: com.mysql.cj.jdbc.Driver - + servlet: + multipart: + enabled: true + max-request-size: 100MB + max-file-size: 100MB + file-size-threshold: 20MB mybatis-plus: typeAliasesPackage: com.gitee.starblues.example.entity mapperLocations: classpath*:mapper/*.xml diff --git a/example-main/src/main/resources/application.yml b/example-main/src/main/resources/application.yml index 42f7853..caf4dfc 100644 --- a/example-main/src/main/resources/application.yml +++ b/example-main/src/main/resources/application.yml @@ -1,9 +1,3 @@ spring: profiles: - active: dev - servlet: - multipart: - enabled: true - max-request-size: 100MB - max-file-size: 100MB - file-size-threshold: 20MB #当文件达到多少时进行磁盘写入 \ No newline at end of file + active: dev \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 8e5634e..9cc688b 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -37,6 +37,9 @@ 基本插件1 basic-config.yaml + + jar-outer + diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml deleted file mode 100644 index f8d0e88..0000000 --- a/example-plugins-basic/example-basic-1/src/main/resources/basic-config-dev.yaml +++ /dev/null @@ -1,3 +0,0 @@ -basic: - name: I am is basic1 - age: 20 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml deleted file mode 100644 index 479b9e6..0000000 --- a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml +++ /dev/null @@ -1,18 +0,0 @@ -spring: - datasource: - url: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC&allowPublicKeyRetrieval=true - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver - profiles: - active: dev - resources: - static-locations: classpath:static - thymeleaf: - prefix: plugin1-template - suffix: .html - mode: html - encoding: utf-8 -context: - listener: - #classes: com.gitee.starblues.example.basic1.service.listener.MyListener \ No newline at end of file diff --git a/example-plugins-db/example-jpa/pom.xml b/example-plugins-db/example-jpa/pom.xml index 1cd59e2..3f78be1 100644 --- a/example-plugins-db/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -65,6 +65,14 @@ spring-jpa案例插件 jpa.yml + + + + mysql + mysql-connector-java + + + diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java new file mode 100644 index 0000000..a4d64ee --- /dev/null +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java @@ -0,0 +1,25 @@ +package com.gitee.starblues.example.mp; + +import com.gitee.starblues.bootstrap.realize.PluginCloseListener; +import com.gitee.starblues.core.descriptor.PluginDescriptor; +import com.zaxxer.hikari.HikariDataSource; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +import javax.sql.DataSource; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +public class DbStop implements PluginCloseListener { + + @Autowired + private HikariDataSource dataSource; + + @Override + public void close(PluginDescriptor descriptor) { + dataSource.close(); + } +} diff --git a/example-plugins-db/pom.xml b/example-plugins-db/pom.xml index ad0841b..bac6bdb 100644 --- a/example-plugins-db/pom.xml +++ b/example-plugins-db/pom.xml @@ -41,6 +41,12 @@ ${springboot-plugin.version} + + mysql + mysql-connector-java + 8.0.27 + + junit junit -- Gitee From 52d01f353a93dee2129b6dc44f512d6961fd6b28 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 27 Feb 2022 19:07:14 +0800 Subject: [PATCH 25/35] add resource loader --- .../src/main/resources/application.yml | 2 +- example-plugins-basic/example-basic-1/pom.xml | 2 +- example-plugins-basic/example-basic-2/pom.xml | 3 + example-plugins-db/example-jpa/pom.xml | 3 + .../example-mybatis-plus/pom.xml | 59 +++++++++++++++++++ 5 files changed, 67 insertions(+), 2 deletions(-) create mode 100644 example-plugins-db/example-mybatis-plus/pom.xml diff --git a/example-main/src/main/resources/application.yml b/example-main/src/main/resources/application.yml index caf4dfc..90385b2 100644 --- a/example-main/src/main/resources/application.yml +++ b/example-main/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: dev \ No newline at end of file + active: prod \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 9cc688b..c798370 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -38,7 +38,7 @@ basic-config.yaml - jar-outer + jar diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml index 56ec5f4..8b9e243 100644 --- a/example-plugins-basic/example-basic-2/pom.xml +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -46,6 +46,9 @@ 基本插件2 basic2-config.yaml + + jar + diff --git a/example-plugins-db/example-jpa/pom.xml b/example-plugins-db/example-jpa/pom.xml index 3f78be1..034191b 100644 --- a/example-plugins-db/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -73,6 +73,9 @@ + + jar + diff --git a/example-plugins-db/example-mybatis-plus/pom.xml b/example-plugins-db/example-mybatis-plus/pom.xml new file mode 100644 index 0000000..a2677f2 --- /dev/null +++ b/example-plugins-db/example-mybatis-plus/pom.xml @@ -0,0 +1,59 @@ + + + + example-plugins-db + com.gitee.starblues + 1.0.0-SNAPSHOT + ../pom.xml + + 4.0.0 + + example-mybatis-plus + + + + org.springframework.boot + spring-boot-starter + 2.5.6 + + + com.baomidou + mybatis-plus-boot-starter + 3.5.0 + + + + + + + + com.gitee.starblues + springboot-plugin-maven-packager + + ${plugin.build.mode} + + mybatis-plus-example-plugin + com.gitee.starblues.example.mp.MybatisPlusExamplePlugin + 1.0.0 + starBlues + mybatis-plus案例插件 + mp-config.yaml + + + jar + + + + + + repackage + + + + + + + + \ No newline at end of file -- Gitee From ca79d3ec2a1af5b91a39dc96dc260892489a785e Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Thu, 3 Mar 2022 18:20:24 +0800 Subject: [PATCH 26/35] update readme --- .../src/main/resources/application-dev.yml | 5 +- .../src/main/resources/application.yml | 2 +- example-plugins-basic/example-basic-1/pom.xml | 7 -- .../example/basic1/rest/CallerController.java | 47 ++++++++++ .../example/basic1/service/ServiceCaller.java | 32 ++++++- example-plugins-basic/example-basic-2/pom.xml | 18 ---- .../example/basic2/service/ServiceSupper.java | 49 ++++++++++ .../example-basic-common/pom.xml | 39 ++++++++ .../starblues/example/common/InvokeParam.java | 42 +++++++++ .../example/common/InvokeReturn.java | 21 +++++ example-plugins-basic/pom.xml | 33 +++++-- .../example-plugin-cloud-nacos/pom.xml | 79 ++++++++++++++++ .../cloud/nacos/CloudNacosPlugin.java | 18 ++++ .../starblues/cloud/nacos/NacosRegister.java | 23 +++++ .../nacos/config/NacosConfigExample.java | 25 +++++ .../controller/NacosConfigController.java | 27 ++++++ .../src/main/resources/cloud-nacos.yaml | 11 +++ example-plugins-cloud/pom.xml | 94 +++++++++++++++++++ .../example-mybatis-plus/pom.xml | 5 - .../gitee/starblues/example/mp/DbStop.java | 2 - example-plugins-db/pom.xml | 20 ++-- package.bat | 2 + pom.xml | 1 + 23 files changed, 546 insertions(+), 56 deletions(-) create mode 100644 example-plugins-basic/example-basic-common/pom.xml create mode 100644 example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java create mode 100644 example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/pom.xml create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/NacosRegister.java create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/config/NacosConfigExample.java create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml create mode 100644 example-plugins-cloud/pom.xml diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 197d06f..2b9b19e 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -25,6 +25,7 @@ plugin: runMode: dev mainPackage: com.gitee.starblues.example pluginPath: - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-basic - - D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\example-plugins-db + - ~\springboot-plugin-framework-example\example-plugins-basic + #- ~\springboot-plugin-framework-example\example-plugins-db + #- ~\springboot-plugin-framework-example\example-plugins-cloud diff --git a/example-main/src/main/resources/application.yml b/example-main/src/main/resources/application.yml index 90385b2..caf4dfc 100644 --- a/example-main/src/main/resources/application.yml +++ b/example-main/src/main/resources/application.yml @@ -1,3 +1,3 @@ spring: profiles: - active: prod \ No newline at end of file + active: dev \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index c798370..86eb4c6 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -12,13 +12,6 @@ example-basic-1 jar - - - org.springframework.boot - spring-boot-starter-web - 2.5.6 - - diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java index 46f8cf5..6cf4a9f 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java @@ -2,12 +2,18 @@ package com.gitee.starblues.example.basic1.rest; import com.gitee.starblues.example.basic1.config.BasicConfig; import com.gitee.starblues.example.basic1.service.ServiceCaller; +import com.gitee.starblues.example.common.InvokeParam; +import com.gitee.starblues.example.common.InvokeReturn; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * @author starBlues @@ -28,4 +34,45 @@ public class CallerController { return serviceCaller.getConfig("hi, i am basic1"); } + @GetMapping("/test-param") + public ServiceCaller.R testParam(){ + List params = new ArrayList<>(); + params.add(get("1", 1, null)); + params.add(get("2", 2, null)); + ServiceCaller.Param param = get("name", 16, params); + return serviceCaller.param(param); + } + + @GetMapping("/test-param-list") + public ServiceCaller.R testParamList(){ + List params = new ArrayList<>(); + params.add(get("1", 1, null)); + params.add(get("2", 2, null)); + return serviceCaller.paramList(params); + } + + @GetMapping("/test-param-map") + public ServiceCaller.R testParamMap(){ + Map params = new HashMap<>(); + params.put("1", get("1", 1, null)); + params.put("2", get("2", 2, null)); + return serviceCaller.paramMap(params); + } + + @GetMapping("/test-common-param") + public InvokeReturn testCommonParam(){ + InvokeParam invokeParam = new InvokeParam(); + invokeParam.setName("name"); + invokeParam.setAge("age"); + return serviceCaller.commonParam(invokeParam); + } + + private ServiceCaller.Param get(String name, Integer age, List params){ + ServiceCaller.Param param = new ServiceCaller.Param(); + param.setName("123"); + param.setAge(16); + param.setParams(params); + return param; + } + } diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java index d6fb60c..ade0792 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java @@ -1,7 +1,14 @@ package com.gitee.starblues.example.basic1.service; import com.gitee.starblues.annotation.Caller; +import com.gitee.starblues.annotation.Supplier; import com.gitee.starblues.example.basic1.config.BasicConfig; +import com.gitee.starblues.example.common.InvokeParam; +import com.gitee.starblues.example.common.InvokeReturn; +import lombok.Data; + +import java.util.List; +import java.util.Map; /** * @author starBlues @@ -10,10 +17,33 @@ import com.gitee.starblues.example.basic1.config.BasicConfig; @Caller("service-supper") public interface ServiceCaller { - + @Caller.Method("hello") String hello(String s); @Caller.Method("getConfig") BasicConfig getConfig(String name); + R param(Param param); + + R paramList(List params); + + R paramMap(Map params); + + + InvokeReturn commonParam(InvokeParam invokeParam); + + + @Data + class Param{ + private String name; + private Integer age; + private List params; + } + + @Data + class R{ + String name; + } + + } diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml index 8b9e243..dbdad7a 100644 --- a/example-plugins-basic/example-basic-2/pom.xml +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -9,24 +9,6 @@ 4.0.0 - - - org.springframework.boot - spring-boot-starter - 2.5.0 - - - org.springframework.boot - spring-boot-starter-aop - 2.5.0 - - - com.fasterxml.jackson.core - jackson-databind - 2.11.3 - - - example-basic-2 jar diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java index 512ec1f..c007086 100644 --- a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java @@ -2,11 +2,17 @@ package com.gitee.starblues.example.basic2.service; import com.gitee.starblues.annotation.Supplier; import com.gitee.starblues.example.basic2.config.Basic2Config; +import com.gitee.starblues.example.common.InvokeParam; +import com.gitee.starblues.example.common.InvokeReturn; import com.gitee.starblues.example.service.TestAnnotation; +import lombok.Data; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + /** * @author starBlues * @version 1.0 @@ -18,6 +24,7 @@ public class ServiceSupper { @Autowired private Basic2Config config; + @Supplier.Method("hello") public String hello(String s){ System.out.println(s); return s; @@ -31,4 +38,46 @@ public class ServiceSupper { return newConfig; } + public R param(Param param){ + System.out.println(param); + R r = new R(); + r.setName("bean"); + return r; + } + + public R paramList(List params){ + System.out.println(params.toString()); + R r = new R(); + r.setName("list"); + return r; + } + + public R paramMap(Map params){ + System.out.println(params.toString()); + R r = new R(); + r.setName("map"); + return r; + } + + public InvokeReturn commonParam(InvokeParam invokeParam){ + System.out.println(invokeParam.toString()); + InvokeReturn invokeReturn = new InvokeReturn(); + invokeReturn.setName("commonParam"); + return invokeReturn; + } + + @Data + public static class Param{ + private String name; + private Integer age; + private List params; + } + + @Data + public static class R{ + String name; + } + + + } diff --git a/example-plugins-basic/example-basic-common/pom.xml b/example-plugins-basic/example-basic-common/pom.xml new file mode 100644 index 0000000..5f41b28 --- /dev/null +++ b/example-plugins-basic/example-basic-common/pom.xml @@ -0,0 +1,39 @@ + + + + 4.0.0 + com.gitee.starblues + 1.0.0-SNAPSHOT + example-basic-common + jar + + + + 1.8 + + + + + + maven-compiler-plugin + + ${java.version} + ${java.version} + UTF-8 + + + + org.apache.maven.plugins + maven-jar-plugin + + + false + + + + + + + \ No newline at end of file diff --git a/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java b/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java new file mode 100644 index 0000000..d185dbf --- /dev/null +++ b/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java @@ -0,0 +1,42 @@ +package com.gitee.starblues.example.common; + + +import java.util.List; + +/** + * 插件互相调用参数 + * + * @author starBlues + * @version 1.0 + */ +public class InvokeParam { + + private String name; + private String age; + private List list; + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getAge() { + return age; + } + + public void setAge(String age) { + this.age = age; + } + + public List getList() { + return list; + } + + public void setList(List list) { + this.list = list; + } +} diff --git a/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java b/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java new file mode 100644 index 0000000..eb5cc29 --- /dev/null +++ b/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java @@ -0,0 +1,21 @@ +package com.gitee.starblues.example.common; + + +/** + * 插件互相调用返回值 + * + * @author starBlues + * @version 1.0 + */ +public class InvokeReturn { + + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index ff44981..32cc4fd 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -16,35 +16,42 @@ example-basic-1 example-basic-2 + example-basic-common 1.18.10 4.13 + 2.5.6 3.0.0-alpha 3.1.1 - org.springframework.boot spring-boot-starter - 2.5.6 + ${spring-boot.version} com.gitee.starblues - example-main + springboot-plugin-bootstrap + ${springboot-plugin.version} + + + + com.gitee.starblues + example-basic-common ${project.version} - provided com.gitee.starblues - springboot-plugin-bootstrap - ${springboot-plugin.version} + example-main + ${project.version} + provided @@ -57,10 +64,9 @@ org.projectlombok lombok - 1.18.20 + ${lombok.version} provided - @@ -70,6 +76,17 @@ com.gitee.starblues springboot-plugin-maven-packager ${springboot-plugin.version} + + + + + com.gitee.starblues + example-basic-common + ~\springboot-plugin-framework-example\example-plugins-basic\example-basic-common\target\classes + + + + diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml new file mode 100644 index 0000000..1df7f8f --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml @@ -0,0 +1,79 @@ + + + + example-plugins-cloud + com.gitee.starblues + 1.0.0-SNAPSHOT + + 4.0.0 + + example-plugin-cloud-nacos + + + + + org.springframework.boot + spring-boot-starter + + + + org.springframework.boot + spring-boot-starter-aop + + + + com.gitee.starblues + springboot-plugin-bootstrap + + + + com.gitee.starblues + example-main + + + + com.alibaba.boot + nacos-discovery-spring-boot-starter + 0.2.7 + + + + com.alibaba.boot + nacos-config-spring-boot-starter + 0.2.7 + + + + + + + com.gitee.starblues + springboot-plugin-maven-packager + + ${plugin.build.mode} + + cloud-nacos + com.gitee.starblues.cloud.nacos.CloudNacosPlugin + 1.0.0-SNAPSHOT + starBlues + 微服务nacos案例插件 + cloud-nacos.yaml + + + jar + + + + + + repackage + + + + + + + + \ No newline at end of file diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java new file mode 100644 index 0000000..af31781 --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java @@ -0,0 +1,18 @@ +package com.gitee.starblues.cloud.nacos; + +import com.gitee.starblues.bootstrap.SpringPluginBootstrap; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; + +/** + * @author starBlues + * @version 1.0 + */ +@SpringBootApplication(exclude = JacksonAutoConfiguration.class) +public class CloudNacosPlugin extends SpringPluginBootstrap { + + public static void main(String[] args) { + new CloudNacosPlugin().run(args); + } + +} diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/NacosRegister.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/NacosRegister.java new file mode 100644 index 0000000..f6a5529 --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/NacosRegister.java @@ -0,0 +1,23 @@ +package com.gitee.starblues.cloud.nacos; + +import com.alibaba.boot.nacos.discovery.autoconfigure.NacosDiscoveryAutoRegister; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.context.event.ApplicationReadyEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Component +public class NacosRegister implements ApplicationListener { + + @Autowired + private NacosDiscoveryAutoRegister register; + + @Override + public void onApplicationEvent(ApplicationReadyEvent event) { + register.onApplicationEvent(null); + } +} diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/config/NacosConfigExample.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/config/NacosConfigExample.java new file mode 100644 index 0000000..8a12e5c --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/config/NacosConfigExample.java @@ -0,0 +1,25 @@ +package com.gitee.starblues.cloud.nacos.config; + +import com.alibaba.nacos.api.config.ConfigType; +import com.alibaba.nacos.api.config.annotation.NacosConfigurationProperties; +import com.alibaba.nacos.api.config.annotation.NacosValue; +import com.alibaba.nacos.spring.context.annotation.config.NacosPropertySource; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.stereotype.Component; + +/** + * @author starBlues + * @version 1.0 + */ +@Data +@Component +@NacosConfigurationProperties(prefix = "nacos-config", dataId = "example.yaml", type = ConfigType.YAML, autoRefreshed = true) +public class NacosConfigExample { + + private String name; + + private Integer age; + +} diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java new file mode 100644 index 0000000..852ec4e --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java @@ -0,0 +1,27 @@ +package com.gitee.starblues.cloud.nacos.controller; + +import com.gitee.starblues.cloud.nacos.config.NacosConfigExample; +import io.swagger.annotations.Api; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author starBlues + * @version 1.0 + */ +@RestController +@RequestMapping("nacos-config") +@Api +public class NacosConfigController { + + @Autowired + private NacosConfigExample configExample; + + @GetMapping + public NacosConfigExample getConfig() { + return configExample; + } + +} diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml new file mode 100644 index 0000000..118f8f2 --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml @@ -0,0 +1,11 @@ +nacos: + discovery: + autoRegister: true + server-addr: 127.0.0.1:8848 + register: + # 主程序端口号 + port: 8080 + # 服务名称 + serviceName: cloud-nacos-plugin + config: + server-addr: 127.0.0.1:8848 \ No newline at end of file diff --git a/example-plugins-cloud/pom.xml b/example-plugins-cloud/pom.xml new file mode 100644 index 0000000..c367599 --- /dev/null +++ b/example-plugins-cloud/pom.xml @@ -0,0 +1,94 @@ + + + + springboot-plugin-framework-example + com.gitee.starblues + 1.0.0-SNAPSHOT + ../pom.xml + + 4.0.0 + + example-plugins-cloud + pom + + example-plugin-cloud-nacos + + + + 1.18.10 + 4.13 + + 2.3.12.RELEASE + 3.0.0-alpha + + 3.1.1 + + + + + + org.springframework.boot + spring-boot-starter + ${spring-boot.version} + + + + org.springframework.boot + spring-boot-starter-aop + ${spring-boot.version} + + + + com.gitee.starblues + springboot-plugin-bootstrap + ${springboot-plugin.version} + + + + com.gitee.starblues + example-main + ${project.version} + provided + + + org.springframework.boot + spring-boot-starter + + + + + + + + + junit + junit + ${junit.version} + test + + + + org.projectlombok + lombok + ${lombok.version} + provided + + + + + + + + com.gitee.starblues + springboot-plugin-maven-packager + ${springboot-plugin.version} + + + + + + + + \ No newline at end of file diff --git a/example-plugins-db/example-mybatis-plus/pom.xml b/example-plugins-db/example-mybatis-plus/pom.xml index a2677f2..2e44f45 100644 --- a/example-plugins-db/example-mybatis-plus/pom.xml +++ b/example-plugins-db/example-mybatis-plus/pom.xml @@ -13,11 +13,6 @@ example-mybatis-plus - - org.springframework.boot - spring-boot-starter - 2.5.6 - com.baomidou mybatis-plus-boot-starter diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java index a4d64ee..72ed393 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/DbStop.java @@ -6,8 +6,6 @@ import com.zaxxer.hikari.HikariDataSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import javax.sql.DataSource; - /** * @author starBlues * @version 1.0 diff --git a/example-plugins-db/pom.xml b/example-plugins-db/pom.xml index bac6bdb..cbf3902 100644 --- a/example-plugins-db/pom.xml +++ b/example-plugins-db/pom.xml @@ -22,38 +22,34 @@ 4.13 3.0.0-alpha + 2.5.6 3.1.1 - - com.gitee.starblues - example-main - ${project.version} - provided + org.springframework.boot + spring-boot-starter + ${spring-boot.version} - com.gitee.starblues springboot-plugin-bootstrap ${springboot-plugin.version} - - mysql - mysql-connector-java - 8.0.27 + com.gitee.starblues + example-main + ${project.version} + provided - junit junit ${junit.version} test - diff --git a/package.bat b/package.bat index a581a52..2678a85 100644 --- a/package.bat +++ b/package.bat @@ -24,6 +24,8 @@ xcopy example-plugins-basic\example-basic-2\target\*-repackage.jar dist\plugins xcopy example-plugins-db\example-jpa\target\*-repackage.jar dist\plugins /s xcopy example-plugins-db\example-mybatis-plus\target\*-repackage.jar dist\plugins /s +xcopy example-plugins-cloud\example-plugin-cloud-nacos\target\*-repackage.jar dist\plugins /s + REM copy bin xcopy bin\* dist\ /s diff --git a/pom.xml b/pom.xml index 2797bcd..1079527 100644 --- a/pom.xml +++ b/pom.xml @@ -16,6 +16,7 @@ example-main example-plugins-basic example-plugins-db + example-plugins-cloud -- Gitee From 27ae1ef6b2c0bd59fe68e096708e10c888147791 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Fri, 4 Mar 2022 21:50:47 +0800 Subject: [PATCH 27/35] update package type --- example-main/src/main/resources/application-dev.yml | 4 ++-- example-main/src/main/resources/application-prod.yml | 2 +- example-plugins-basic/example-basic-1/pom.xml | 3 ++- .../com/gitee/starblues/example/basic1/Basic1Plugin.java | 1 - .../example-basic-1/src/main/resources/basic-config.yaml | 3 +++ .../example-basic-2/src/main/resources/plugin.properties | 8 -------- 6 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml delete mode 100644 example-plugins-basic/example-basic-2/src/main/resources/plugin.properties diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 2b9b19e..645226b 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -26,6 +26,6 @@ plugin: mainPackage: com.gitee.starblues.example pluginPath: - ~\springboot-plugin-framework-example\example-plugins-basic - #- ~\springboot-plugin-framework-example\example-plugins-db - #- ~\springboot-plugin-framework-example\example-plugins-cloud + - ~\springboot-plugin-framework-example\example-plugins-db + # ~\springboot-plugin-framework-example\example-plugins-cloud diff --git a/example-main/src/main/resources/application-prod.yml b/example-main/src/main/resources/application-prod.yml index 4706ded..5aa290d 100644 --- a/example-main/src/main/resources/application-prod.yml +++ b/example-main/src/main/resources/application-prod.yml @@ -23,4 +23,4 @@ mybatis-plus: plugin: runMode: prod mainPackage: com.gitee.starblues.example - pluginPath: D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\dist\plugins + pluginPath: ~\plugins diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 86eb4c6..9c65b41 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -29,9 +29,10 @@ starBlues 基本插件1 basic-config.yaml + a b c - jar + zip-outer diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java index 24038bf..86e313b 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/Basic1Plugin.java @@ -17,7 +17,6 @@ import java.net.URL; * @since 2021-08-01 */ @SpringBootApplication -@OneselfConfig(mainConfigFileName = {"application.yml", "application-dev.yml"}) public class Basic1Plugin extends SpringPluginBootstrap { public static void main(String[] args) { diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml new file mode 100644 index 0000000..f0f6987 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml @@ -0,0 +1,3 @@ +basic: + name: I am is basic2 + age: 16 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties b/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties deleted file mode 100644 index 412c561..0000000 --- a/example-plugins-basic/example-basic-2/src/main/resources/plugin.properties +++ /dev/null @@ -1,8 +0,0 @@ -plugin.id=example-basic-2 -plugin.class=com.gitee.starblues.example.basic2.Basic2Plugin -plugin.version=1.0.0-SNAPSHOT -plugin.provider=starblues -plugin.description=基本插件2 -plugin.configFileName=basic2-config.yaml -plugin.libDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-framework-example//example-plugins-basic//example-basic-2//target//lib -plugin.externalDir=D://etc//kitte//ksm//springboot-plugin-framework-parent//springboot-plugin-loader//target//classes \ No newline at end of file -- Gitee From e947cf7aac030296cd15d8a5b0721a269b674106 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Fri, 4 Mar 2022 21:53:49 +0800 Subject: [PATCH 28/35] update pom --- example-plugins-basic/example-basic-1/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 9c65b41..c5f0945 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -32,7 +32,7 @@ a b c - zip-outer + jar -- Gitee From ca7a6a1ffd346ac7abbfa9f687de47fb0b32bda2 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 6 Mar 2022 20:58:27 +0800 Subject: [PATCH 29/35] =?UTF-8?q?=E6=8F=90=E4=BA=A43.0.0=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 36 ++-------------- .../example/rest/ExtractController.java | 2 +- .../example/rest/PluginResource.java | 2 +- .../example/rest/PluginUserController.java | 2 +- .../src/main/resources/application-dev.yml | 7 ++-- example-plugins-basic/example-basic-1/pom.xml | 4 +- .../example/basic1/rest/CallerController.java | 12 +----- .../example/basic1/rest/HelloController.java | 2 +- .../basic1/rest/MainUserController.java | 2 +- .../basic1/rest/ThymeleafController.java | 4 +- .../example/basic1/service/ServiceCaller.java | 6 --- .../src/main/resources/basic-config.yaml | 3 -- .../src/main/resources/basic1-config-dev.yaml | 3 ++ .../src/main/resources/basic1-config.yaml | 10 +++++ .../example/basic2/HelloController.java | 38 +++++++++++++++++ .../example/basic2/service/ServiceSupper.java | 10 ----- .../src/main/resources/basic2-config-dev.yaml | 4 +- .../example-basic-common/pom.xml | 39 ----------------- .../starblues/example/common/InvokeParam.java | 42 ------------------- .../example/common/InvokeReturn.java | 21 ---------- example-plugins-basic/pom.xml | 7 ---- .../example-plugin-cloud-nacos/pom.xml | 8 +++- .../controller/NacosConfigController.java | 2 +- example-plugins-cloud/pom.xml | 6 --- .../jpa/rest/JpaPluginUserResource.java | 2 +- .../mp/rest/MpPluginUserController.java | 2 +- example-plugins-db/pom.xml | 3 ++ 27 files changed, 81 insertions(+), 198 deletions(-) delete mode 100644 example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/basic1-config-dev.yaml create mode 100644 example-plugins-basic/example-basic-1/src/main/resources/basic1-config.yaml create mode 100644 example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/HelloController.java delete mode 100644 example-plugins-basic/example-basic-common/pom.xml delete mode 100644 example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java delete mode 100644 example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java diff --git a/README.md b/README.md index c37772f..9578a38 100644 --- a/README.md +++ b/README.md @@ -1,37 +1,7 @@ # springboot-plugin-framework-example #### 介绍 -springboot-plugin-framework 功能测试+案例 +`springboot-plugin-framework` 功能测试+案例 -#### 软件架构 -软件架构说明 - - -#### 安装教程 - -1. xxxx -2. xxxx -3. xxxx - -#### 使用说明 - -1. xxxx -2. xxxx -3. xxxx - -#### 参与贡献 - -1. Fork 本仓库 -2. 新建 Feat_xxx 分支 -3. 提交代码 -4. 新建 Pull Request - - -#### 特技 - -1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md -2. Gitee 官方博客 [blog.gitee.com](https://blog.gitee.com) -3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解 Gitee 上的优秀开源项目 -4. [GVP](https://gitee.com/gvp) 全称是 Gitee 最有价值开源项目，是综合评定出的优秀开源项目 -5. Gitee 官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help) -6. Gitee 封面人物是一档用来展示 Gitee 会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/) +#### 对应版本号 +`3.0.0-alpha` \ No newline at end of file diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java b/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java index 9a47954..8512bb8 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/ExtractController.java @@ -18,7 +18,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("/extract") -@Api +@Api(tags = "main-extract") public class ExtractController { @Autowired diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java index d85c34c..c8c68b3 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginResource.java @@ -20,7 +20,7 @@ import java.util.List; */ @RestController @RequestMapping("/plugin") -@Api +@Api(tags = "main-plugin-operator") public class PluginResource { diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java index cca025d..d892c6d 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/PluginUserController.java @@ -23,7 +23,7 @@ import java.util.stream.Collectors; */ @RestController @RequestMapping("/plugin-user") -@Api +@Api(tags = "main-plugin-user") public class PluginUserController { @Autowired diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 645226b..f0aa6b8 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -24,8 +24,9 @@ mybatis-plus: plugin: runMode: dev mainPackage: com.gitee.starblues.example + # 如果配置是 windows 下路径, mac、linux 自行修改 pluginPath: - - ~\springboot-plugin-framework-example\example-plugins-basic - - ~\springboot-plugin-framework-example\example-plugins-db - # ~\springboot-plugin-framework-example\example-plugins-cloud + - ~\example-plugins-basic + - ~\example-plugins-db + # ~\example-plugins-cloud diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index c5f0945..c47d0f7 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -25,11 +25,9 @@ example-basic-1 com.gitee.starblues.example.basic1.Basic1Plugin 1.0.0-SNAPSHOT - 2.0.0 starBlues 基本插件1 - basic-config.yaml - a b c + basic1-config.yaml jar diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java index 6cf4a9f..df35f5b 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/CallerController.java @@ -2,8 +2,6 @@ package com.gitee.starblues.example.basic1.rest; import com.gitee.starblues.example.basic1.config.BasicConfig; import com.gitee.starblues.example.basic1.service.ServiceCaller; -import com.gitee.starblues.example.common.InvokeParam; -import com.gitee.starblues.example.common.InvokeReturn; import io.swagger.annotations.Api; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -21,7 +19,7 @@ import java.util.Map; */ @RestController @RequestMapping("/caller") -@Api +@Api(tags = "basic1-plugin-caller") public class CallerController { @Resource @@ -59,14 +57,6 @@ public class CallerController { return serviceCaller.paramMap(params); } - @GetMapping("/test-common-param") - public InvokeReturn testCommonParam(){ - InvokeParam invokeParam = new InvokeParam(); - invokeParam.setName("name"); - invokeParam.setAge("age"); - return serviceCaller.commonParam(invokeParam); - } - private ServiceCaller.Param get(String name, Integer age, List params){ ServiceCaller.Param param = new ServiceCaller.Param(); param.setName("123"); diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java index 613662e..2d093ae 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java @@ -17,7 +17,7 @@ import javax.annotation.Resource; */ @RestController @RequestMapping("/hello") -@Api +@Api(tags = "basic1-plugin-hello") public class HelloController { @Resource diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java index 4444a26..9ebc02a 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/MainUserController.java @@ -17,7 +17,7 @@ import java.util.List; */ @RestController @RequestMapping("/main") -@Api +@Api(tags = "basic1-plugin-caller-main") public class MainUserController { @Autowired diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java index 1f6bf29..a0762b7 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/ThymeleafController.java @@ -13,9 +13,9 @@ import java.util.UUID; * @author starBlues * @version 2.3.0 */ -@Controller() +@Controller @RequestMapping("/thy") -@Api +@Api(tags = "basic1-olugin-thymeleaf") public class ThymeleafController { @GetMapping() diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java index ade0792..a6c8f32 100644 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java +++ b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/service/ServiceCaller.java @@ -1,10 +1,7 @@ package com.gitee.starblues.example.basic1.service; import com.gitee.starblues.annotation.Caller; -import com.gitee.starblues.annotation.Supplier; import com.gitee.starblues.example.basic1.config.BasicConfig; -import com.gitee.starblues.example.common.InvokeParam; -import com.gitee.starblues.example.common.InvokeReturn; import lombok.Data; import java.util.List; @@ -30,9 +27,6 @@ public interface ServiceCaller { R paramMap(Map params); - InvokeReturn commonParam(InvokeParam invokeParam); - - @Data class Param{ private String name; diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml deleted file mode 100644 index f0f6987..0000000 --- a/example-plugins-basic/example-basic-1/src/main/resources/basic-config.yaml +++ /dev/null @@ -1,3 +0,0 @@ -basic: - name: I am is basic2 - age: 16 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic1-config-dev.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic1-config-dev.yaml new file mode 100644 index 0000000..9132294 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/resources/basic1-config-dev.yaml @@ -0,0 +1,3 @@ +basic: + name: I'm the plugin example basic1 + age: 16 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-1/src/main/resources/basic1-config.yaml b/example-plugins-basic/example-basic-1/src/main/resources/basic1-config.yaml new file mode 100644 index 0000000..fb8dd33 --- /dev/null +++ b/example-plugins-basic/example-basic-1/src/main/resources/basic1-config.yaml @@ -0,0 +1,10 @@ +spring: + profiles: + active: dev + resources: + static-locations: classpath:static + thymeleaf: + prefix: plugin1-template + suffix: .html + mode: html + encoding: utf-8 diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/HelloController.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/HelloController.java new file mode 100644 index 0000000..61b398d --- /dev/null +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/HelloController.java @@ -0,0 +1,38 @@ +package com.gitee.starblues.example.basic2; + +import com.gitee.starblues.core.descriptor.PluginDescriptor; +import com.gitee.starblues.example.basic2.config.Basic2Config; +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * @author starBlues + * @version 1.0 + * @since 2021-08-01 + */ +@RestController +@RequestMapping("/hello") +@Api(tags = "basic2-plugin-hello-example") +public class HelloController { + + @Resource + private Basic2Config basicConfig; + @Resource + private PluginDescriptor pluginDescriptor; + + + @GetMapping() + public PluginDescriptor hello(){ + return pluginDescriptor; + } + + @GetMapping("/config") + public Basic2Config getConfig(){ + return basicConfig; + } + +} diff --git a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java index c007086..1116116 100644 --- a/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java +++ b/example-plugins-basic/example-basic-2/src/main/java/com/gitee/starblues/example/basic2/service/ServiceSupper.java @@ -2,13 +2,10 @@ package com.gitee.starblues.example.basic2.service; import com.gitee.starblues.annotation.Supplier; import com.gitee.starblues.example.basic2.config.Basic2Config; -import com.gitee.starblues.example.common.InvokeParam; -import com.gitee.starblues.example.common.InvokeReturn; import com.gitee.starblues.example.service.TestAnnotation; import lombok.Data; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; import java.util.List; import java.util.Map; @@ -59,13 +56,6 @@ public class ServiceSupper { return r; } - public InvokeReturn commonParam(InvokeParam invokeParam){ - System.out.println(invokeParam.toString()); - InvokeReturn invokeReturn = new InvokeReturn(); - invokeReturn.setName("commonParam"); - return invokeReturn; - } - @Data public static class Param{ private String name; diff --git a/example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml b/example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml index f0f6987..8e0a8eb 100644 --- a/example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml +++ b/example-plugins-basic/example-basic-2/src/main/resources/basic2-config-dev.yaml @@ -1,3 +1,3 @@ basic: - name: I am is basic2 - age: 16 \ No newline at end of file + name: I'm the plugin example basic2 + age: 20 \ No newline at end of file diff --git a/example-plugins-basic/example-basic-common/pom.xml b/example-plugins-basic/example-basic-common/pom.xml deleted file mode 100644 index 5f41b28..0000000 --- a/example-plugins-basic/example-basic-common/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - 4.0.0 - com.gitee.starblues - 1.0.0-SNAPSHOT - example-basic-common - jar - - - - 1.8 - - - - - - maven-compiler-plugin - - ${java.version} - ${java.version} - UTF-8 - - - - org.apache.maven.plugins - maven-jar-plugin - - - false - - - - - - - \ No newline at end of file diff --git a/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java b/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java deleted file mode 100644 index d185dbf..0000000 --- a/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeParam.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.gitee.starblues.example.common; - - -import java.util.List; - -/** - * 插件互相调用参数 - * - * @author starBlues - * @version 1.0 - */ -public class InvokeParam { - - private String name; - private String age; - private List list; - - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getAge() { - return age; - } - - public void setAge(String age) { - this.age = age; - } - - public List getList() { - return list; - } - - public void setList(List list) { - this.list = list; - } -} diff --git a/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java b/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java deleted file mode 100644 index eb5cc29..0000000 --- a/example-plugins-basic/example-basic-common/src/main/java/com/gitee/starblues/example/common/InvokeReturn.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gitee.starblues.example.common; - - -/** - * 插件互相调用返回值 - * - * @author starBlues - * @version 1.0 - */ -public class InvokeReturn { - - private String name; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 32cc4fd..3943847 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -16,7 +16,6 @@ example-basic-1 example-basic-2 - example-basic-common 1.18.10 @@ -41,12 +40,6 @@ ${springboot-plugin.version} - - com.gitee.starblues - example-basic-common - ${project.version} - - com.gitee.starblues example-main diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml index 1df7f8f..0fbc68a 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml +++ b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml @@ -11,6 +11,10 @@ example-plugin-cloud-nacos + + 0.2.7 + + @@ -36,13 +40,13 @@ com.alibaba.boot nacos-discovery-spring-boot-starter - 0.2.7 + ${nacos.version} com.alibaba.boot nacos-config-spring-boot-starter - 0.2.7 + ${nacos.version} diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java index 852ec4e..4daccc2 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("nacos-config") -@Api +@Api(tags = "nacos-plugin-config") public class NacosConfigController { @Autowired diff --git a/example-plugins-cloud/pom.xml b/example-plugins-cloud/pom.xml index c367599..85ff533 100644 --- a/example-plugins-cloud/pom.xml +++ b/example-plugins-cloud/pom.xml @@ -51,12 +51,6 @@ example-main ${project.version} provided - - - org.springframework.boot - spring-boot-starter - - diff --git a/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java index 971439f..4eb03c2 100644 --- a/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java +++ b/example-plugins-db/example-jpa/src/main/java/com/gitee/starblues/example/jpa/rest/JpaPluginUserResource.java @@ -18,7 +18,7 @@ import java.util.List; */ @RestController @RequestMapping("/jpa") -@Api(value = "jpa插件接口") +@Api(tags = "jap-plugin") public class JpaPluginUserResource { @Resource diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java index 567df39..08936e3 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/rest/MpPluginUserController.java @@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.*; */ @RestController @RequestMapping("/user") -@Api +@Api(tags = "mybatis-plus-plugin") @RequiredArgsConstructor public class MpPluginUserController { diff --git a/example-plugins-db/pom.xml b/example-plugins-db/pom.xml index cbf3902..57377af 100644 --- a/example-plugins-db/pom.xml +++ b/example-plugins-db/pom.xml @@ -33,17 +33,20 @@ spring-boot-starter ${spring-boot.version} + com.gitee.starblues springboot-plugin-bootstrap ${springboot-plugin.version} + com.gitee.starblues example-main ${project.version} provided + junit junit -- Gitee From 79efd42f93b2d5f8e588c3b8025b107607489981 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 6 Mar 2022 20:58:59 +0800 Subject: [PATCH 30/35] =?UTF-8?q?=E6=8F=90=E4=BA=A43.0.0=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.bat b/package.bat index 2678a85..3700534 100644 --- a/package.bat +++ b/package.bat @@ -24,7 +24,7 @@ xcopy example-plugins-basic\example-basic-2\target\*-repackage.jar dist\plugins xcopy example-plugins-db\example-jpa\target\*-repackage.jar dist\plugins /s xcopy example-plugins-db\example-mybatis-plus\target\*-repackage.jar dist\plugins /s -xcopy example-plugins-cloud\example-plugin-cloud-nacos\target\*-repackage.jar dist\plugins /s +::xcopy example-plugins-cloud\example-plugin-cloud-nacos\target\*-repackage.jar dist\plugins /s REM copy bin xcopy bin\* dist\ /s -- Gitee From 595c518ef402ba23132b5d410a49958cb983827d Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Mon, 14 Mar 2022 14:28:10 +0800 Subject: [PATCH 31/35] =?UTF-8?q?=E6=96=B0=E5=A2=9Efeign=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gitee/starblues/example/Application.java | 1 + .../example/rest/HelloController.java | 24 +++++++++++++++++++ .../src/main/resources/application-dev.yml | 2 +- .../example-plugin-cloud-nacos/pom.xml | 6 +++++ .../cloud/nacos/CloudNacosPlugin.java | 2 ++ .../starblues/cloud/nacos/MainConfig.java | 8 +++++++ .../cloud/nacos/TestFeignService.java | 23 ++++++++++++++++++ .../controller/NacosConfigController.java | 15 +++++++++++- .../src/main/resources/cloud-nacos.yaml | 5 +++- 9 files changed, 83 insertions(+), 3 deletions(-) create mode 100644 example-main/src/main/java/com/gitee/starblues/example/rest/HelloController.java create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/MainConfig.java create mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/TestFeignService.java diff --git a/example-main/src/main/java/com/gitee/starblues/example/Application.java b/example-main/src/main/java/com/gitee/starblues/example/Application.java index c486222..e5ff739 100644 --- a/example-main/src/main/java/com/gitee/starblues/example/Application.java +++ b/example-main/src/main/java/com/gitee/starblues/example/Application.java @@ -15,6 +15,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; public class Application implements SpringBootstrap { public static void main(String[] args) { + //System.setProperty("org.graalvm.nativeimage.imagecode", "111"); SpringMainBootstrap.launch(Application.class, args); } diff --git a/example-main/src/main/java/com/gitee/starblues/example/rest/HelloController.java b/example-main/src/main/java/com/gitee/starblues/example/rest/HelloController.java new file mode 100644 index 0000000..5175f62 --- /dev/null +++ b/example-main/src/main/java/com/gitee/starblues/example/rest/HelloController.java @@ -0,0 +1,24 @@ +package com.gitee.starblues.example.rest; + +import io.swagger.annotations.Api; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author starBlues + * @version 1.0 + */ +@RestController +@RequestMapping("/main/hello") +@Api(tags = "main-hello") +public class HelloController { + + + @GetMapping + public String hello(@RequestParam(value = "name", required = false) String name){ + return "hello:" + name; + } + +} diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index f0aa6b8..8203fd7 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -28,5 +28,5 @@ plugin: pluginPath: - ~\example-plugins-basic - ~\example-plugins-db - # ~\example-plugins-cloud + #- ~\example-plugins-cloud diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml index 0fbc68a..525bf9f 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml +++ b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml @@ -48,6 +48,12 @@ nacos-config-spring-boot-starter ${nacos.version} + + + org.springframework.cloud + spring-cloud-starter-openfeign + 2.1.3.RELEASE + diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java index af31781..6a3fab1 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java @@ -3,12 +3,14 @@ package com.gitee.starblues.cloud.nacos; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jackson.JacksonAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; /** * @author starBlues * @version 1.0 */ @SpringBootApplication(exclude = JacksonAutoConfiguration.class) +@EnableFeignClients public class CloudNacosPlugin extends SpringPluginBootstrap { public static void main(String[] args) { diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/MainConfig.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/MainConfig.java new file mode 100644 index 0000000..69f81a7 --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/MainConfig.java @@ -0,0 +1,8 @@ +package com.gitee.starblues.cloud.nacos; + +/** + * @author starBlues + * @version 1.0 + */ +public class MainConfig { +} diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/TestFeignService.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/TestFeignService.java new file mode 100644 index 0000000..1b90456 --- /dev/null +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/TestFeignService.java @@ -0,0 +1,23 @@ +package com.gitee.starblues.cloud.nacos; + +import com.gitee.starblues.core.PluginInfo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import java.util.List; + +/** + * @author starBlues + * @version 1.0 + */ +@FeignClient( + name = "main-service", + url = "http://localhost:8080/main/hello" +) +public interface TestFeignService { + + @GetMapping + String hello(@RequestParam("name") String name); + +} diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java index 4daccc2..cea554b 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java @@ -1,12 +1,17 @@ package com.gitee.starblues.cloud.nacos.controller; +import com.gitee.starblues.cloud.nacos.TestFeignService; import com.gitee.starblues.cloud.nacos.config.NacosConfigExample; +import com.gitee.starblues.core.PluginInfo; import io.swagger.annotations.Api; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * @author starBlues * @version 1.0 @@ -19,9 +24,17 @@ public class NacosConfigController { @Autowired private NacosConfigExample configExample; - @GetMapping + @Autowired + private TestFeignService testFeignService; + + @GetMapping("/config") public NacosConfigExample getConfig() { return configExample; } + @GetMapping("/feign") + public String getFeign(@RequestParam("name") String name) { + return testFeignService.hello(name); + } + } diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml index 118f8f2..8a07697 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml +++ b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml @@ -8,4 +8,7 @@ nacos: # 服务名称 serviceName: cloud-nacos-plugin config: - server-addr: 127.0.0.1:8848 \ No newline at end of file + server-addr: 127.0.0.1:8848 +spring: + application: + name: nacos \ No newline at end of file -- Gitee From d8cd76e4592bb4158f003cf6d737419dd74892c1 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Fri, 18 Mar 2022 16:23:44 +0800 Subject: [PATCH 32/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-dev.yml | 2 +- .../example/basic1/config/EnableAop.java | 14 ------- .../starblues/example/mp/config/Config.java | 39 +++++++++++++++++++ .../src/main/resources/mp-config.yaml | 7 ---- 4 files changed, 40 insertions(+), 22 deletions(-) delete mode 100644 example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/EnableAop.java create mode 100644 example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index 8203fd7..6782242 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -26,7 +26,7 @@ plugin: mainPackage: com.gitee.starblues.example # 如果配置是 windows 下路径, mac、linux 自行修改 pluginPath: - - ~\example-plugins-basic + #- ~\example-plugins-basic - ~\example-plugins-db #- ~\example-plugins-cloud diff --git a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/EnableAop.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/EnableAop.java deleted file mode 100644 index 5b49d67..0000000 --- a/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/config/EnableAop.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.gitee.starblues.example.basic1.config; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.EnableAspectJAutoProxy; - -/** - * @author starBlues - * @version 1.0 - * @since 2021-08-01 - */ -@Configuration -@EnableAspectJAutoProxy -public class EnableAop { -} diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java new file mode 100644 index 0000000..ba35f39 --- /dev/null +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java @@ -0,0 +1,39 @@ +package com.gitee.starblues.example.mp.config; + +import com.gitee.starblues.bootstrap.realize.MainEnvironmentProvider; +import com.zaxxer.hikari.HikariConfig; +import com.zaxxer.hikari.HikariDataSource; +import com.zaxxer.hikari.util.DriverDataSource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import javax.sql.DataSource; +import java.util.Properties; + +/** + * @author starBlues + * @version 1.0 + */ +@Configuration +public class Config { + + @Bean + public HikariDataSource dataSource(MainEnvironmentProvider environmentProvider){ + // 从主程序获取配置 + String url = environmentProvider.getString("spring.datasource.url"); + String username = environmentProvider.getString("spring.datasource.username"); + String password = environmentProvider.getString("spring.datasource.password"); + String driverClassName = environmentProvider.getString("spring.datasource.driver-class-name"); + + HikariConfig hikariConfig = new HikariConfig(); + hikariConfig.setJdbcUrl(url); + hikariConfig.setUsername(username); + hikariConfig.setPassword(password); + hikariConfig.setDriverClassName(driverClassName); + + return new HikariDataSource(hikariConfig); + } + + + +} diff --git a/example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml b/example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml index 782a8c2..3cd4e54 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml +++ b/example-plugins-db/example-mybatis-plus/src/main/resources/mp-config.yaml @@ -1,10 +1,3 @@ -spring: - datasource: - url: jdbc:mysql://127.0.0.1:3306/plugin-test-example?useUnicode=true&useSSL=false&characterEncoding=utf8&serverTimezone=UTC&allowPublicKeyRetrieval=true - username: root - password: 123456 - driver-class-name: com.mysql.cj.jdbc.Driver - mybatis-plus: typeAliasesPackage: com.gitee.starblues.example.mp.entity mapperLocations: classpath*:mapper/*.xml -- Gitee From f1c4934d5430851c9017ed1e0a9a7bc627bb9e8c Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Fri, 18 Mar 2022 16:24:55 +0800 Subject: [PATCH 33/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gitee/starblues/example/mp/config/Config.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java index ba35f39..72d94db 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/config/Config.java @@ -3,13 +3,9 @@ package com.gitee.starblues.example.mp.config; import com.gitee.starblues.bootstrap.realize.MainEnvironmentProvider; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; -import com.zaxxer.hikari.util.DriverDataSource; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import javax.sql.DataSource; -import java.util.Properties; - /** * @author starBlues * @version 1.0 -- Gitee From 3ee130699b62212cd6c2297673dc35150bdc89bc Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sat, 19 Mar 2022 11:35:44 +0800 Subject: [PATCH 34/35] update to 3.0.0 --- README.md | 2 +- example-main/pom.xml | 2 +- example-plugins-basic/pom.xml | 2 +- example-plugins-cloud/pom.xml | 2 +- example-plugins-db/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 9578a38..9d29f4d 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,4 @@ `springboot-plugin-framework` 功能测试+案例 #### 对应版本号 -`3.0.0-alpha` \ No newline at end of file +`3.0.0` \ No newline at end of file diff --git a/example-main/pom.xml b/example-main/pom.xml index 844c56e..1ddb585 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -16,7 +16,7 @@ 1.8 - 3.0.0-alpha + 3.0.0 2.5.6 diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 3943847..55b6928 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -22,7 +22,7 @@ 4.13 2.5.6 - 3.0.0-alpha + 3.0.0 3.1.1 diff --git a/example-plugins-cloud/pom.xml b/example-plugins-cloud/pom.xml index 85ff533..f56132a 100644 --- a/example-plugins-cloud/pom.xml +++ b/example-plugins-cloud/pom.xml @@ -21,7 +21,7 @@ 4.13 2.3.12.RELEASE - 3.0.0-alpha + 3.0.0 3.1.1 diff --git a/example-plugins-db/pom.xml b/example-plugins-db/pom.xml index 57377af..8bd3006 100644 --- a/example-plugins-db/pom.xml +++ b/example-plugins-db/pom.xml @@ -21,7 +21,7 @@ 1.18.10 4.13 - 3.0.0-alpha + 3.0.0 2.5.6 3.1.1 -- Gitee From 529b3ab4aa157f3b7e33aaa8dd96f1c4374719ef Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 20 Mar 2022 10:53:53 +0800 Subject: [PATCH 35/35] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example-main/pom.xml | 10 ++++---- example-plugins-basic/example-basic-1/pom.xml | 2 +- example-plugins-basic/example-basic-2/pom.xml | 2 +- example-plugins-basic/pom.xml | 23 ++++--------------- .../example-plugin-cloud-nacos/pom.xml | 4 ++-- example-plugins-cloud/pom.xml | 12 ++++------ example-plugins-db/example-jpa/pom.xml | 2 +- .../example-mybatis-plus/pom.xml | 2 +- example-plugins-db/pom.xml | 10 ++++---- 9 files changed, 26 insertions(+), 41 deletions(-) diff --git a/example-main/pom.xml b/example-main/pom.xml index 1ddb585..418ab1c 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -16,7 +16,7 @@ 1.8 - 3.0.0 + 3.0.0 2.5.6 @@ -41,8 +41,8 @@ com.gitee.starblues - springboot-plugin-framework - ${springboot-plugin-framework.version} + spring-brick + ${spring-brick.version} @@ -110,8 +110,8 @@ com.gitee.starblues - springboot-plugin-maven-packager - ${springboot-plugin-framework.version} + spring-brick-maven-packager + ${spring-brick.version} main diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index c47d0f7..a61ff2a 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -18,7 +18,7 @@ com.gitee.starblues - springboot-plugin-maven-packager + spring-brick-maven-packager ${plugin.build.mode} diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml index dbdad7a..5536f26 100644 --- a/example-plugins-basic/example-basic-2/pom.xml +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -17,7 +17,7 @@ com.gitee.starblues - springboot-plugin-maven-packager + spring-brick-maven-packager ${plugin.build.mode} diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 55b6928..af8d7d5 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -22,7 +22,7 @@ 4.13 2.5.6 - 3.0.0 + 3.0.0 3.1.1 @@ -36,8 +36,8 @@ com.gitee.starblues - springboot-plugin-bootstrap - ${springboot-plugin.version} + spring-brick-bootstrap + ${spring-brick.version} @@ -67,24 +67,11 @@ com.gitee.starblues - springboot-plugin-maven-packager - ${springboot-plugin.version} - - - - - com.gitee.starblues - example-basic-common - ~\springboot-plugin-framework-example\example-plugins-basic\example-basic-common\target\classes - - - - + spring-brick-maven-packager + ${spring-brick.version} - - \ No newline at end of file diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml index 525bf9f..5c6cb2c 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml +++ b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml @@ -29,7 +29,7 @@ com.gitee.starblues - springboot-plugin-bootstrap + spring-brick-bootstrap @@ -60,7 +60,7 @@ com.gitee.starblues - springboot-plugin-maven-packager + spring-brick-maven-packager ${plugin.build.mode} diff --git a/example-plugins-cloud/pom.xml b/example-plugins-cloud/pom.xml index f56132a..8bde0d9 100644 --- a/example-plugins-cloud/pom.xml +++ b/example-plugins-cloud/pom.xml @@ -21,7 +21,7 @@ 4.13 2.3.12.RELEASE - 3.0.0 + 3.0.0 3.1.1 @@ -42,8 +42,8 @@ com.gitee.starblues - springboot-plugin-bootstrap - ${springboot-plugin.version} + spring-brick-bootstrap + ${spring-brick.version} @@ -76,13 +76,11 @@ com.gitee.starblues - springboot-plugin-maven-packager - ${springboot-plugin.version} + spring-brick-maven-packager + ${spring-brick.version} - - \ No newline at end of file diff --git a/example-plugins-db/example-jpa/pom.xml b/example-plugins-db/example-jpa/pom.xml index 034191b..7bb0509 100644 --- a/example-plugins-db/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -54,7 +54,7 @@ com.gitee.starblues - springboot-plugin-maven-packager + spring-brick-maven-packager ${plugin.build.mode} diff --git a/example-plugins-db/example-mybatis-plus/pom.xml b/example-plugins-db/example-mybatis-plus/pom.xml index 2e44f45..79fc694 100644 --- a/example-plugins-db/example-mybatis-plus/pom.xml +++ b/example-plugins-db/example-mybatis-plus/pom.xml @@ -25,7 +25,7 @@ com.gitee.starblues - springboot-plugin-maven-packager + spring-brick-maven-packager ${plugin.build.mode} diff --git a/example-plugins-db/pom.xml b/example-plugins-db/pom.xml index 8bd3006..60e0d7d 100644 --- a/example-plugins-db/pom.xml +++ b/example-plugins-db/pom.xml @@ -21,7 +21,7 @@ 1.18.10 4.13 - 3.0.0 + 3.0.0 2.5.6 3.1.1 @@ -36,8 +36,8 @@ com.gitee.starblues - springboot-plugin-bootstrap - ${springboot-plugin.version} + spring-brick-bootstrap + ${spring-brick.version} @@ -61,8 +61,8 @@ com.gitee.starblues - springboot-plugin-maven-packager - ${springboot-plugin.version} + spring-brick-maven-packager + ${spring-brick.version} -- Gitee