From dadc566748e5f52cc435b40ffa2646e7875dc1c6 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sat, 30 Jul 2022 11:59:09 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E9=9A=94?= =?UTF-8?q?=E7=A6=BB=E5=BC=8F=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/gitee/starblues/example/Application.java | 6 ++++++ .../starblues/example/rest/HelloController.java | 2 +- example-main/src/main/resources/application-dev.yml | 4 ++-- .../{AutowiredTypeDefiner.xml => MainUserMapper.xml} | 0 .../gitee/starblues/example/basic1/Basic1Plugin.java | 2 ++ .../example/basic1/rest/HelloController.java | 4 ++++ .../example/basic1/service/BasicService.java | 2 ++ .../example/basic1/service/listener/MyListener.java | 5 +++++ .../gitee/starblues/example/basic2/Basic2Plugin.java | 5 ++++- example-plugins-basic/pom.xml | 10 +++++----- .../com/gitee/starblues/example/jpa/JpaPlugin.java | 3 ++- .../example/mp/MybatisPlusExamplePlugin.java | 1 + .../example/mp/rest/MpPluginUserController.java | 9 ++++++++- .../example/mp/service/MpPluginUserService.java | 4 ++++ .../mp/service/impl/MpPluginUserServiceImpl.java | 12 ++++++++++++ pom.xml | 2 +- 16 files changed, 59 insertions(+), 12 deletions(-) rename example-main/src/main/resources/mapper/{AutowiredTypeDefiner.xml => MainUserMapper.xml} (100%) 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 47d27e9..c45e564 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,5 +1,6 @@ package com.gitee.starblues.example; +import com.gitee.starblues.loader.DevelopmentMode; import com.gitee.starblues.loader.launcher.SpringMainBootstrap; import com.gitee.starblues.loader.launcher.SpringBootstrap; import org.mybatis.spring.annotation.MapperScan; @@ -22,4 +23,9 @@ public class Application implements SpringBootstrap { public void run(String[] args) { SpringApplication.run(Application.class, args); } + + @Override + public DevelopmentMode developmentMode() { + return DevelopmentMode.ISOLATION; + } } 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 index 5175f62..cf1c62e 100644 --- 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 @@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController; * @author starBlues * @version 1.0 */ -@RestController +@RestController("mainHello") @RequestMapping("/main/hello") @Api(tags = "main-hello") public class HelloController { diff --git a/example-main/src/main/resources/application-dev.yml b/example-main/src/main/resources/application-dev.yml index af2aa5e..6393ca4 100644 --- a/example-main/src/main/resources/application-dev.yml +++ b/example-main/src/main/resources/application-dev.yml @@ -27,7 +27,7 @@ plugin: # 如果配置是 windows 下路径, mac、linux 自行修改 pluginPath: - ~\example-plugins-basic - #- ~\example-plugins-db + - ~\example-plugins-db #- ~\example-plugins-cloud sortInitPluginIds: - example-basic-2 @@ -38,4 +38,4 @@ plugin: plugins: - pluginId: example-basic-1 props: - secretKey: mmfvXes1XckCi8F/y9i0uQ== + secretKey: mmfvXes1XckCi8F/y9i0uQ== \ No newline at end of file diff --git a/example-main/src/main/resources/mapper/AutowiredTypeDefiner.xml b/example-main/src/main/resources/mapper/MainUserMapper.xml similarity index 100% rename from example-main/src/main/resources/mapper/AutowiredTypeDefiner.xml rename to example-main/src/main/resources/mapper/MainUserMapper.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 9709ee2..8dd5e71 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 @@ -7,6 +7,7 @@ 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; +import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.PropertySource; import java.net.URL; @@ -19,6 +20,7 @@ import java.net.URL; */ @SpringBootApplication @OneselfConfig(mainConfigFileName = {"application.yml", "application-dev.yml"}) +@EnableConfigurationProperties 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/HelloController.java b/example-plugins-basic/example-basic-1/src/main/java/com/gitee/starblues/example/basic1/rest/HelloController.java index 2d093ae..624c789 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 @@ -7,6 +7,8 @@ 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 org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; import javax.annotation.Resource; @@ -30,6 +32,8 @@ public class HelloController { @GetMapping() public PluginDescriptor hello(){ + ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); + System.out.println(attributes.getRequest().getRequestURI()); return pluginDescriptor; } 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 1e51eb3..ca46be8 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 @@ -5,6 +5,7 @@ import com.gitee.starblues.core.descriptor.PluginDescriptor; import com.gitee.starblues.example.service.MainUserService; import com.gitee.starblues.example.service.TestAnnotation; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Component; import org.springframework.stereotype.Service; @@ -15,6 +16,7 @@ import org.springframework.stereotype.Service; */ @Service @TestAnnotation +@Scope("prototype") public class BasicService { @Autowired 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 index e9a9d2e..ed1e162 100644 --- 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 @@ -1,6 +1,7 @@ package com.gitee.starblues.example.basic1.service.listener; +import lombok.extern.slf4j.Slf4j; import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent; import org.springframework.boot.context.event.ApplicationPreparedEvent; import org.springframework.boot.context.event.ApplicationReadyEvent; @@ -10,16 +11,20 @@ import org.springframework.context.event.ContextClosedEvent; import org.springframework.context.event.ContextRefreshedEvent; import org.springframework.context.event.ContextStartedEvent; import org.springframework.context.event.ContextStoppedEvent; +import org.springframework.stereotype.Component; /** * 启动后监听 * @author starBlues * @version 1.0 */ +@Slf4j +@Component public class MyListener implements ApplicationListener{ @Override public void onApplicationEvent(ApplicationEvent event) { + log.info("插件==================================== ： {}" , event.getClass().getName()); if (event instanceof ApplicationEnvironmentPreparedEvent) { System.out.println("初始化环境变量"); } else if (event instanceof ApplicationPreparedEvent) { 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 c08b5dc..bbd816b 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,6 +1,8 @@ package com.gitee.starblues.example.basic2; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; +import com.gitee.starblues.bootstrap.annotation.OneselfConfig; +import com.gitee.starblues.example.Application; import org.springframework.boot.autoconfigure.SpringBootApplication; /** @@ -10,10 +12,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @since 2021-08-01 */ @SpringBootApplication +@OneselfConfig(mainConfigFileName = {"application.yml", "application-dev.yml"}) public class Basic2Plugin extends SpringPluginBootstrap { public static void main(String[] args) { - new Basic2Plugin().run(args); + new Basic2Plugin().run(Application.class, args); } } diff --git a/example-plugins-basic/pom.xml b/example-plugins-basic/pom.xml index 068a1da..f76940a 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -33,15 +33,15 @@ com.gitee.starblues - spring-brick-bootstrap - ${spring-brick.version} + example-main + ${project.version} + provided com.gitee.starblues - example-main - ${project.version} - provided + spring-brick-bootstrap + ${spring-brick.version} diff --git a/example-plugins-db/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 index 2b6b58d..12aa1ed 100644 --- a/example-plugins-db/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 @@ -1,6 +1,7 @@ package com.gitee.starblues.example.jpa; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; +import com.gitee.starblues.bootstrap.coexist.CoexistAllowAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.context.annotation.Import; @@ -15,5 +16,5 @@ public class JpaPlugin extends SpringPluginBootstrap{ public static void main(String[] args) { new JpaPlugin().run(JpaPlugin.class, args); } - + } diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java index 5df193f..f84547b 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java @@ -1,6 +1,7 @@ package com.gitee.starblues.example.mp; import com.gitee.starblues.bootstrap.SpringPluginBootstrap; +import com.gitee.starblues.bootstrap.coexist.CoexistAllowAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; /** 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 08936e3..4db21ca 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 @@ -7,6 +7,8 @@ import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * user 接口 @@ -23,12 +25,17 @@ public class MpPluginUserController { private final MpPluginUserService mpPluginUserService; @GetMapping - public Page getPage(@RequestParam("currentPage") Integer currentPage, + public Page getPage(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize){ Page plugin2UserPage = new Page<>(currentPage, pageSize); return mpPluginUserService.page(plugin2UserPage); } + @GetMapping("/wrapper") + public List getPage(){ + return mpPluginUserService.testWrapper(); + } + @GetMapping("/{id}") public MpPluginUser getById(@PathVariable("id") String id){ diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java index f983771..e7ed136 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/MpPluginUserService.java @@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.gitee.starblues.example.mp.entity.MpPluginUser; import com.gitee.starblues.example.mp.mapper.MpPluginUserMapper; +import java.util.List; + /** *

* 插件1-用户表 服务类 @@ -14,6 +16,8 @@ import com.gitee.starblues.example.mp.mapper.MpPluginUserMapper; */ public interface MpPluginUserService extends IService { + List testWrapper(); + @Override MpPluginUserMapper getBaseMapper(); } diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java index 42e1c98..4b2b918 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/service/impl/MpPluginUserServiceImpl.java @@ -1,11 +1,16 @@ package com.gitee.starblues.example.mp.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gitee.starblues.bootstrap.annotation.ResolveClassLoader; 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; +import java.util.List; + /** *

* 插件1-用户表 服务实现类 @@ -17,4 +22,11 @@ import org.springframework.stereotype.Service; @Service public class MpPluginUserServiceImpl extends ServiceImpl implements MpPluginUserService { + @ResolveClassLoader + @Override + public List testWrapper() { + LambdaQueryWrapper wrapper = Wrappers.lambdaQuery(MpPluginUser.class) + .eq(MpPluginUser::getDeleted, 0); + return list(wrapper); + } } diff --git a/pom.xml b/pom.xml index 37cb55d..3ac600c 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 1.8 - 3.0.3 + 3.0.4 2.5.6 -- Gitee From f749260706212113d8a34d1be8629e96337dfef9 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sat, 30 Jul 2022 20:04:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=A4=E7=A7=8D?= =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=A1=88=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example-main/pom.xml | 13 +++++++++++++ .../gitee/starblues/example/Application.java | 4 ++-- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application.yml | 2 +- example-plugins-basic/pom.xml | 12 ------------ .../example-plugin-cloud-nacos/pom.xml | 16 ---------------- example-plugins-cloud/pom.xml | 18 ------------------ example-plugins-db/example-jpa/pom.xml | 11 ----------- .../gitee/starblues/example/jpa/JpaPlugin.java | 9 ++++++++- .../example-mybatis-plus/pom.xml | 9 --------- .../example/mp/MybatisPlusExamplePlugin.java | 6 +++++- example-plugins-db/pom.xml | 12 ------------ 12 files changed, 30 insertions(+), 84 deletions(-) diff --git a/example-main/pom.xml b/example-main/pom.xml index 510a032..a589393 100644 --- a/example-main/pom.xml +++ b/example-main/pom.xml @@ -42,11 +42,24 @@ ${spring-brick.version} + + com.gitee.starblues + spring-brick-bootstrap + ${spring-brick.version} + + + + org.springframework.boot spring-boot-starter-web + + org.springframework.boot + spring-boot-starter-data-jpa + + mysql mysql-connector-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 c45e564..aec515d 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 @@ -25,7 +25,7 @@ public class Application implements SpringBootstrap { } @Override - public DevelopmentMode developmentMode() { - return DevelopmentMode.ISOLATION; + public String developmentMode() { + return DevelopmentMode.COEXIST; } } diff --git a/example-main/src/main/resources/application-prod.yml b/example-main/src/main/resources/application-prod.yml index 4781f15..73653a7 100644 --- a/example-main/src/main/resources/application-prod.yml +++ b/example-main/src/main/resources/application-prod.yml @@ -23,7 +23,7 @@ mybatis-plus: plugin: runMode: prod mainPackage: com.gitee.starblues.example - pluginPath: ~\plugins + pluginPath: D:\etc\kitte\ksm\springboot-plugin-framework-parent\springboot-plugin-framework-example\dist\plugins sortInitPluginIds: - example-basic-2 - example-basic-1 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/pom.xml b/example-plugins-basic/pom.xml index f76940a..a197b47 100644 --- a/example-plugins-basic/pom.xml +++ b/example-plugins-basic/pom.xml @@ -25,12 +25,6 @@ - - org.springframework.boot - spring-boot-starter - ${spring-boot.version} - - com.gitee.starblues example-main @@ -38,12 +32,6 @@ provided - - com.gitee.starblues - spring-brick-bootstrap - ${spring-brick.version} - - junit junit diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml index 5c6cb2c..369ffee 100644 --- a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml +++ b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml @@ -16,22 +16,6 @@ - - - org.springframework.boot - spring-boot-starter - - - - org.springframework.boot - spring-boot-starter-aop - - - - com.gitee.starblues - spring-brick-bootstrap - - com.gitee.starblues example-main diff --git a/example-plugins-cloud/pom.xml b/example-plugins-cloud/pom.xml index 6cf7a45..3261026 100644 --- a/example-plugins-cloud/pom.xml +++ b/example-plugins-cloud/pom.xml @@ -27,24 +27,6 @@ - - org.springframework.boot - spring-boot-starter - ${spring-boot.version} - - - - org.springframework.boot - spring-boot-starter-aop - ${spring-boot.version} - - - - com.gitee.starblues - spring-brick-bootstrap - ${spring-brick.version} - - com.gitee.starblues example-main diff --git a/example-plugins-db/example-jpa/pom.xml b/example-plugins-db/example-jpa/pom.xml index 211433f..2bde5d9 100644 --- a/example-plugins-db/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -15,17 +15,6 @@ - - org.springframework.boot - spring-boot-starter-quartz - ${spring-boot.version} - - - org.springframework.boot - spring-boot-starter-data-jpa - ${spring-boot.version} - - javax.xml.bind diff --git a/example-plugins-db/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 index 12aa1ed..5f33b17 100644 --- a/example-plugins-db/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 @@ -16,5 +16,12 @@ public class JpaPlugin extends SpringPluginBootstrap{ public static void main(String[] args) { new JpaPlugin().run(JpaPlugin.class, args); } - + + @Override + protected void configCoexistAllowAutoConfiguration(CoexistAllowAutoConfiguration configuration) { + configuration.add("org.springframework.boot.autoconfigure.jdbc"); + configuration.add("org.springframework.boot.autoconfigure.data.jpa"); + configuration.add("org.springframework.boot.autoconfigure.orm.jpa"); + configuration.add("org.springframework.boot.autoconfigure.quartz.QuartzAutoConfiguration"); + } } diff --git a/example-plugins-db/example-mybatis-plus/pom.xml b/example-plugins-db/example-mybatis-plus/pom.xml index 79fc694..3d99911 100644 --- a/example-plugins-db/example-mybatis-plus/pom.xml +++ b/example-plugins-db/example-mybatis-plus/pom.xml @@ -12,15 +12,6 @@ example-mybatis-plus - - - com.baomidou - mybatis-plus-boot-starter - 3.5.0 - - - - diff --git a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java index f84547b..9cfcc2a 100644 --- a/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java +++ b/example-plugins-db/example-mybatis-plus/src/main/java/com/gitee/starblues/example/mp/MybatisPlusExamplePlugin.java @@ -14,5 +14,9 @@ public class MybatisPlusExamplePlugin extends SpringPluginBootstrap { public static void main(String[] args) { new MybatisPlusExamplePlugin().run(args); } - + + @Override + protected void configCoexistAllowAutoConfiguration(CoexistAllowAutoConfiguration configuration) { + configuration.add("com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration"); + } } diff --git a/example-plugins-db/pom.xml b/example-plugins-db/pom.xml index 7a85873..1e2eebe 100644 --- a/example-plugins-db/pom.xml +++ b/example-plugins-db/pom.xml @@ -25,18 +25,6 @@ - - org.springframework.boot - spring-boot-starter - ${spring-boot.version} - - - - com.gitee.starblues - spring-brick-bootstrap - ${spring-brick.version} - - com.gitee.starblues example-main -- Gitee From 81fbedea1b8dec3de372299b965ab600e11fe652 Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sat, 27 Aug 2022 14:28:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E5=88=B03.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- example-plugins-basic/example-basic-1/pom.xml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/example-plugins-basic/example-basic-1/pom.xml b/example-plugins-basic/example-basic-1/pom.xml index 02b3d8d..8581773 100644 --- a/example-plugins-basic/example-basic-1/pom.xml +++ b/example-plugins-basic/example-basic-1/pom.xml @@ -29,7 +29,7 @@ basic1-config.yaml - jar-outer + jar diff --git a/pom.xml b/pom.xml index 3ac600c..0ce493f 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ 1.8 - 3.0.4 + 3.1.0 2.5.6 -- Gitee