From 807f660b28a8cecafb12d6911cd7aead93548350 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 5 Jun 2022 12:44:08 +0800 Subject: [PATCH] update 3.0.3 --- example-main/pom.xml | 5 +++++ .../mapper/{AutowiredType.xml => AutowiredTypeDefiner.xml} | 0 .../com/gitee/starblues/example/basic1/Basic1Plugin.java | 3 ++- .../starblues/example/basic1/rest/CallerController.java | 2 ++ .../starblues/example/basic1/rest/MainUserController.java | 2 ++ .../starblues/example/basic1/service/BasicService.java | 2 +- example-plugins-db/example-jpa/pom.xml | 4 ++-- .../java/com/gitee/starblues/example/mp/config/Config.java | 6 ++++-- .../mapper/{AutowiredType.xml => MpPluginUserMapper.xml} | 0 9 files changed, 18 insertions(+), 6 deletions(-) rename example-main/src/main/resources/mapper/{AutowiredType.xml => AutowiredTypeDefiner.xml} (100%) rename example-plugins-db/example-mybatis-plus/src/main/resources/mapper/{AutowiredType.xml => MpPluginUserMapper.xml} (100%) diff --git a/example-main/pom.xml b/example-main/pom.xml index 2cde56d..510a032 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -74,6 +74,11 @@ ${knife4j.version} + + org.springframework.boot + spring-boot-starter-quartz + + com.baomidou diff --git a/example-main/src/main/resources/mapper/AutowiredType.xml b/example-main/src/main/resources/mapper/AutowiredTypeDefiner.xml similarity index 100% rename from example-main/src/main/resources/mapper/AutowiredType.xml rename to example-main/src/main/resources/mapper/AutowiredTypeDefiner.xml 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 86e313b..9709ee2 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.bootstrap.SpringPluginBootstrap; import com.gitee.starblues.bootstrap.annotation.DisablePluginWeb; import com.gitee.starblues.bootstrap.annotation.OneselfConfig; +import com.gitee.starblues.bootstrap.realize.AutowiredTypeDefiner; import com.gitee.starblues.example.Application; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.admin.SpringApplicationAdminJmxAutoConfiguration; @@ -17,10 +18,10 @@ 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) { new Basic1Plugin().run(Application.class, args); } - } 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 df9a8b0..5a62dbb 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 @@ -1,5 +1,6 @@ package com.gitee.starblues.example.basic1.rest; +import com.gitee.starblues.bootstrap.annotation.AutowiredType; import com.gitee.starblues.example.basic1.config.BasicConfig; import com.gitee.starblues.example.basic1.service.ServiceCaller; import io.swagger.annotations.Api; @@ -29,6 +30,7 @@ public class CallerController { private ServiceCaller serviceCaller; @Autowired + @AutowiredType(value = AutowiredType.Type.MAIN) private DataSource dataSource; @GetMapping("/test") 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 9ebc02a..cea0d47 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 @@ -1,5 +1,6 @@ package com.gitee.starblues.example.basic1.rest; +import com.gitee.starblues.bootstrap.annotation.AutowiredType; import com.gitee.starblues.example.entity.MainUser; import com.gitee.starblues.example.service.MainUserService; import io.swagger.annotations.Api; @@ -21,6 +22,7 @@ import java.util.List; public class MainUserController { @Autowired + @AutowiredType(value = AutowiredType.Type.MAIN) private MainUserService mainUserService; 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 5569043..1e51eb3 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 @@ -21,7 +21,7 @@ public class BasicService { private PluginDescriptor pluginDescriptor; @Autowired - @AutowiredType(AutowiredType.Type.PLUGIN_MAIN) + @AutowiredType(value = AutowiredType.Type.MAIN) private MainUserService mainUserService; public String getName(){ diff --git a/example-plugins-db/example-jpa/pom.xml b/example-plugins-db/example-jpa/pom.xml index 7bb0509..211433f 100644 --- a/example-plugins-db/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -18,12 +18,12 @@ org.springframework.boot spring-boot-starter-quartz - 2.5.0 + ${spring-boot.version} org.springframework.boot spring-boot-starter-data-jpa - 2.5.0 + ${spring-boot.version} 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 72d94db..b267f4a 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 @@ -1,6 +1,7 @@ package com.gitee.starblues.example.mp.config; -import com.gitee.starblues.bootstrap.realize.MainEnvironmentProvider; +import com.gitee.starblues.bootstrap.PluginContextHolder; +import com.gitee.starblues.spring.environment.EnvironmentProvider; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import org.springframework.context.annotation.Bean; @@ -14,7 +15,8 @@ import org.springframework.context.annotation.Configuration; public class Config { @Bean - public HikariDataSource dataSource(MainEnvironmentProvider environmentProvider){ + public HikariDataSource dataSource(){ + EnvironmentProvider environmentProvider = PluginContextHolder.getEnvironmentProvider(); // 从主程序获取配置 String url = environmentProvider.getString("spring.datasource.url"); String username = environmentProvider.getString("spring.datasource.username"); diff --git a/example-plugins-db/example-mybatis-plus/src/main/resources/mapper/AutowiredType.xml b/example-plugins-db/example-mybatis-plus/src/main/resources/mapper/MpPluginUserMapper.xml similarity index 100% rename from example-plugins-db/example-mybatis-plus/src/main/resources/mapper/AutowiredType.xml rename to example-plugins-db/example-mybatis-plus/src/main/resources/mapper/MpPluginUserMapper.xml -- Gitee