From 14e012928b735ea0ef2b39c804b593f2673a02da Mon Sep 17 00:00:00 2001 From: zhangzhuo Date: Sun, 25 Sep 2022 12:08:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85=E6=96=B9?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-prod.yml | 2 +- .../src/main/resources/application.yml | 2 +- .../example/codegenerator/CodeGenerator.java | 138 ------------------ .../codegenerator/CodeGeneratorTest.java | 46 ------ example-plugins-basic/example-basic-2/pom.xml | 2 +- .../example-plugin-cloud-nacos/pom.xml | 73 --------- .../cloud/nacos/CloudNacosPlugin.java | 20 --- .../starblues/cloud/nacos/MainConfig.java | 8 - .../starblues/cloud/nacos/NacosRegister.java | 23 --- .../cloud/nacos/TestFeignService.java | 23 --- .../nacos/config/NacosConfigExample.java | 25 ---- .../controller/NacosConfigController.java | 40 ----- .../src/main/resources/cloud-nacos.yaml | 14 -- example-plugins-cloud/pom.xml | 67 --------- example-plugins-db/example-jpa/pom.xml | 2 +- .../example-mybatis-plus/pom.xml | 2 +- package.bat | 6 +- pom.xml | 1 - 18 files changed, 8 insertions(+), 486 deletions(-) delete mode 100644 example-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGenerator.java delete mode 100644 example-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGeneratorTest.java delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/pom.xml delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/MainConfig.java delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/NacosRegister.java delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/TestFeignService.java delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/config/NacosConfigExample.java delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java delete mode 100644 example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml delete mode 100644 example-plugins-cloud/pom.xml diff --git a/example-main/src/main/resources/application-prod.yml b/example-main/src/main/resources/application-prod.yml index b28061e..667c035 100644 --- a/example-main/src/main/resources/application-prod.yml +++ b/example-main/src/main/resources/application-prod.yml @@ -3,7 +3,7 @@ server: spring: datasource: - 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 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-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGenerator.java b/example-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGenerator.java deleted file mode 100644 index 20df4d3..0000000 --- a/example-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGenerator.java +++ /dev/null @@ -1,138 +0,0 @@ -package com.gitee.starblues.example.codegenerator; - -import com.baomidou.mybatisplus.annotation.DbType; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.generator.AutoGenerator; -import com.baomidou.mybatisplus.generator.config.DataSourceConfig; -import com.baomidou.mybatisplus.generator.config.GlobalConfig; -import com.baomidou.mybatisplus.generator.config.PackageConfig; -import com.baomidou.mybatisplus.generator.config.StrategyConfig; -import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy; - -/** - * mybatis plus代码生成 - * @author starBlues - * @version 1.0 - */ -public class CodeGenerator { - - - /** - * 启动名称 - */ - private String driverName; - - /** - * 数据库 url - */ - private String dbUrl; - - /** - * 数据库用户名 - */ - private String dbUsername; - - /** - * 数据库密码 - */ - private String dbPassword; - - /** - * 数据库类型 - */ - private DbType dbType; - - /** - * 作者名 - */ - private String author; - - /** - * 代码输出路径 - */ - private String outputDir; - - /** - * 构造器 - * @param driverName 驱动名称 - * @param dbUrl 数据库 url - * @param dbUsername 数据库用户名 - * @param dbPassword 数据库密码 - * @param author 作者名 - * @param outputDir 代码输出路径 - */ - public CodeGenerator(String driverName, String dbUrl, String dbUsername, String dbPassword, DbType dbType, - String author, String outputDir) { - this.driverName = driverName; - this.dbUrl = dbUrl; - this.dbUsername = dbUsername; - this.dbPassword = dbPassword; - this.dbType = dbType; - this.author = author; - this.outputDir = outputDir; - } - - /** - * 通过表名生成代码 - * @param packageName 包名 - * @param isOpen 是否打开文件夹 - * @param tableNames 表名 - */ - public void generateByTables(String packageName, boolean isOpen, String... tableNames) { - generateByTables(true, packageName, isOpen, tableNames); - } - - /** - * 通过表名生成代码 - * @param packageName 包名 - * @param isOpen 是否打开文件夹 - */ - public void generateAll(String packageName, boolean isOpen) { - generateByTables(true, packageName, isOpen); - } - - private void generateByTables(boolean serviceNameStartWithI, String packageName, boolean isOpen, String... tableNames) { - GlobalConfig config = new GlobalConfig(); - DataSourceConfig dataSourceConfig = new DataSourceConfig(); - dataSourceConfig.setDbType(dbType) - .setUrl(dbUrl) - .setUsername(dbUsername) - .setPassword(dbPassword) - .setDriverName(driverName); - StrategyConfig strategyConfig = new StrategyConfig(); - strategyConfig - .setCapitalMode(true) - .setEntityLombokModel(true) - .setEntityBuilderModel(true) - .setNaming(NamingStrategy.underline_to_camel) - .setColumnNaming(NamingStrategy.underline_to_camel) - .setRestControllerStyle(true); - if(tableNames != null){ - strategyConfig.setInclude(tableNames); - } - config.setActiveRecord(false) - .setAuthor(author) - .setOutputDir(outputDir) - .setFileOverride(true) - .setBaseResultMap(true) - .setIdType(IdType.ASSIGN_UUID) - .setEnableCache(false) - .setBaseColumnList(true) - .setOpen(isOpen); - if (serviceNameStartWithI) { - config.setServiceName("%sService") - .setServiceImplName("%sServiceImpl"); - } - new AutoGenerator().setGlobalConfig(config) - .setDataSource(dataSourceConfig) - .setStrategy(strategyConfig) - .setPackageInfo( - new PackageConfig() - .setParent(packageName) - .setController("controller") - .setEntity("entity") - ).execute(); - } - - -} diff --git a/example-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGeneratorTest.java b/example-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGeneratorTest.java deleted file mode 100644 index bab6d64..0000000 --- a/example-main/src/test/java/com/gitee/starblues/example/codegenerator/CodeGeneratorTest.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.gitee.starblues.example.codegenerator; - -import com.baomidou.mybatisplus.annotation.DbType; -import org.junit.jupiter.api.Test; - -/** - * mybatis plus代码生成 - * @author starBlues - * @version 1.0 - */ -public class CodeGeneratorTest { - - private String driverName = "com.mysql.cj.jdbc.Driver"; - private String dbUrl = "jdbc:mysql://127.0.0.1:3306/plugin-test-example?" + - "useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=UTC"; - - private String dbUsername = "root"; - private String dbPassword = "123456"; - private DbType dbType = DbType.MYSQL; - private String author = "starBlues"; - private String outputDir = "D:\\example"; - - - private CodeGenerator generate = new CodeGenerator(driverName, dbUrl, - dbUsername, dbPassword, dbType, - author, outputDir); - - - @Test - public void generateMain(){ - generate.generateByTables("com.gitee.starblues.example", true, - "main_role", "main_user", "main_user_role"); - } - - @Test - public void generatePlugin1(){ - generate.generateByTables("com.gitee.starblues.example.plugin1", true, - "plugin1_role", "plugin1_user", "plugin1_user_role"); - } - - @Test - public void generatePlugin2(){ - generate.generateByTables("com.gitee.starblues.example.plugin2", true, - "plugin2_role", "plugin2_user", "plugin2_user_role"); - } -} diff --git a/example-plugins-basic/example-basic-2/pom.xml b/example-plugins-basic/example-basic-2/pom.xml index 23d80a5..5129e0e 100644 --- a/example-plugins-basic/example-basic-2/pom.xml +++ b/example-plugins-basic/example-basic-2/pom.xml @@ -28,7 +28,7 @@ basic2-config.yaml - jar + jar-outer diff --git a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml b/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml deleted file mode 100644 index 369ffee..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/pom.xml +++ /dev/null @@ -1,73 +0,0 @@ - - - - example-plugins-cloud - com.gitee.starblues - 1.0.0-SNAPSHOT - - 4.0.0 - - example-plugin-cloud-nacos - - - 0.2.7 - - - - - com.gitee.starblues - example-main - - - - com.alibaba.boot - nacos-discovery-spring-boot-starter - ${nacos.version} - - - - com.alibaba.boot - nacos-config-spring-boot-starter - ${nacos.version} - - - - org.springframework.cloud - spring-cloud-starter-openfeign - 2.1.3.RELEASE - - - - - - - com.gitee.starblues - spring-brick-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 deleted file mode 100644 index 6a3fab1..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/CloudNacosPlugin.java +++ /dev/null @@ -1,20 +0,0 @@ -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) { - new CloudNacosPlugin().run(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 deleted file mode 100644 index 69f81a7..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/MainConfig.java +++ /dev/null @@ -1,8 +0,0 @@ -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/NacosRegister.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/NacosRegister.java deleted file mode 100644 index f6a5529..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/NacosRegister.java +++ /dev/null @@ -1,23 +0,0 @@ -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/TestFeignService.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/TestFeignService.java deleted file mode 100644 index 1b90456..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/TestFeignService.java +++ /dev/null @@ -1,23 +0,0 @@ -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/config/NacosConfigExample.java b/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/config/NacosConfigExample.java deleted file mode 100644 index 8a12e5c..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/config/NacosConfigExample.java +++ /dev/null @@ -1,25 +0,0 @@ -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 deleted file mode 100644 index cea554b..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/java/com/gitee/starblues/cloud/nacos/controller/NacosConfigController.java +++ /dev/null @@ -1,40 +0,0 @@ -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 - */ -@RestController -@RequestMapping("nacos-config") -@Api(tags = "nacos-plugin-config") -public class NacosConfigController { - - @Autowired - private NacosConfigExample configExample; - - @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 deleted file mode 100644 index 8a07697..0000000 --- a/example-plugins-cloud/example-plugin-cloud-nacos/src/main/resources/cloud-nacos.yaml +++ /dev/null @@ -1,14 +0,0 @@ -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 -spring: - application: - name: nacos \ No newline at end of file diff --git a/example-plugins-cloud/pom.xml b/example-plugins-cloud/pom.xml deleted file mode 100644 index 3261026..0000000 --- a/example-plugins-cloud/pom.xml +++ /dev/null @@ -1,67 +0,0 @@ - - - - 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.24 - 4.13 - - 2.3.12.RELEASE - - 3.1.1 - - - - - - com.gitee.starblues - example-main - ${project.version} - provided - - - - - - - junit - junit - ${junit.version} - test - - - - org.projectlombok - lombok - ${lombok.version} - provided - - - - - - - - com.gitee.starblues - 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 2bde5d9..37df9d5 100644 --- a/example-plugins-db/example-jpa/pom.xml +++ b/example-plugins-db/example-jpa/pom.xml @@ -63,7 +63,7 @@ - jar + dir diff --git a/example-plugins-db/example-mybatis-plus/pom.xml b/example-plugins-db/example-mybatis-plus/pom.xml index 3d99911..caf9954 100644 --- a/example-plugins-db/example-mybatis-plus/pom.xml +++ b/example-plugins-db/example-mybatis-plus/pom.xml @@ -28,7 +28,7 @@ mp-config.yaml - jar + zip diff --git a/package.bat b/package.bat index 3700534..9274f95 100644 --- a/package.bat +++ b/package.bat @@ -19,10 +19,10 @@ xcopy example-main\target\lib\* dist\lib /y /e /i /q REM copy plugin and config 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-basic\example-basic-2\target\example-basic-2-1.0.0-SNAPSHOT-repackage dist\plugins\example-basic-2-1.0.0-SNAPSHOT-repackage /e /i /q -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-db\example-jpa\target\jpa-example-plugin-1.0.0-repackage dist\plugins\jpa-example-plugin-1.0.0-repackage /e /i /q +xcopy example-plugins-db\example-mybatis-plus\target\*-repackage.zip dist\plugins /s ::xcopy example-plugins-cloud\example-plugin-cloud-nacos\target\*-repackage.jar dist\plugins /s diff --git a/pom.xml b/pom.xml index 0ce493f..0f564f6 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,6 @@ example-main example-plugins-basic example-plugins-db - example-plugins-cloud -- Gitee