From 3aae139b2844f250dbd62d010327851e995dc5d4 Mon Sep 17 00:00:00 2001 From: odboy Date: Tue, 3 Dec 2024 23:16:19 +0800 Subject: [PATCH] upd --- kenaito-config-common/pom.xml | 38 +++++++++++++++ kenaito-config-core/pom.xml | 36 +-------------- .../src/main/java/cn/odboy/GenCode.java | 46 ------------------- .../java/cn/odboy/KenaitoConfigDemoRun.java | 12 +---- .../src/main/resources/banner.txt | 8 ---- 5 files changed, 41 insertions(+), 99 deletions(-) delete mode 100644 kenaito-config-demo/src/main/java/cn/odboy/GenCode.java delete mode 100644 kenaito-config-demo/src/main/resources/banner.txt diff --git a/kenaito-config-common/pom.xml b/kenaito-config-common/pom.xml index 68d2bcd..a07e37e 100644 --- a/kenaito-config-common/pom.xml +++ b/kenaito-config-common/pom.xml @@ -10,4 +10,42 @@ 4.0.0 kenaito-config-common 子模块-配置中心-公共依赖 + + + 4.1.115.Final + 1.3.0 + 5.8.33 + + + + + io.netty + netty-all + ${netty.version} + + + + + com.dyuproject.protostuff + protostuff-api + ${protostuff.version} + + + com.dyuproject.protostuff + protostuff-core + ${protostuff.version} + + + com.dyuproject.protostuff + protostuff-runtime + ${protostuff.version} + + + + + cn.hutool + hutool-all + ${hutool.version} + + diff --git a/kenaito-config-core/pom.xml b/kenaito-config-core/pom.xml index 4912d9c..c709a2f 100644 --- a/kenaito-config-core/pom.xml +++ b/kenaito-config-core/pom.xml @@ -8,11 +8,7 @@ 1.0 4.0.0 - - 4.1.115.Final - 1.3.0 - 5.8.33 - + kenaito-config-core 子模块-配置中心sdk @@ -23,35 +19,5 @@ kenaito-config-common 1.0 - - - io.netty - netty-all - ${netty.version} - - - - - com.dyuproject.protostuff - protostuff-api - ${protostuff.version} - - - com.dyuproject.protostuff - protostuff-core - ${protostuff.version} - - - com.dyuproject.protostuff - protostuff-runtime - ${protostuff.version} - - - - - cn.hutool - hutool-all - ${hutool.version} - diff --git a/kenaito-config-demo/src/main/java/cn/odboy/GenCode.java b/kenaito-config-demo/src/main/java/cn/odboy/GenCode.java deleted file mode 100644 index df3e230..0000000 --- a/kenaito-config-demo/src/main/java/cn/odboy/GenCode.java +++ /dev/null @@ -1,46 +0,0 @@ -package cn.odboy; - - -import cn.odboy.util.GenCmdHelper; - -import java.util.List; - -/** - * 代码生成入口 - * - * @date 2024-04-27 - */ -public class GenCode { - public static void main(String[] args) { - GenCmdHelper generator = new GenCmdHelper(); - generator.setDatabaseUrl(String.format("jdbc:mysql://%s:%s/%s", "kenaito-mysql.odboy.local", 13306, "kenaito_devops")); - generator.setDatabaseUsername("root"); - generator.setDatabasePassword("root"); - genCareer(generator); - } - - private static void genCareer(GenCmdHelper generator) { - generator.gen("devops_", List.of( - // 应用 -// "devops_app", -// "devops_app_user", -// "devops_product_line", - // 应用迭代 -// "devops_app_iteration", -// "devops_app_iteration_change", - // 容器 -// "devops_containerd_cluster_config", -// "devops_containerd_cluster_node", -// "devops_ops_config", -// "devops_containerd_spec_config", - // 网络 -// "devops_network_service", -// "devops_network_ingress", - // 流水线 - "devops_pipeline_template_type", - "devops_pipeline_template_language", - "devops_pipeline_template_language_config", - "devops_pipeline_template_app" - )); - } -} diff --git a/kenaito-config-demo/src/main/java/cn/odboy/KenaitoConfigDemoRun.java b/kenaito-config-demo/src/main/java/cn/odboy/KenaitoConfigDemoRun.java index f8092dd..a216ee6 100644 --- a/kenaito-config-demo/src/main/java/cn/odboy/KenaitoConfigDemoRun.java +++ b/kenaito-config-demo/src/main/java/cn/odboy/KenaitoConfigDemoRun.java @@ -1,24 +1,16 @@ package cn.odboy; -import cn.odboy.infra.context.EasyBootApplication; -import cn.odboy.infra.context.SpringContextHolder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.Bean; import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.transaction.annotation.EnableTransactionManagement; @EnableAsync @SpringBootApplication @EnableTransactionManagement -public class KenaitoConfigDemoRun extends EasyBootApplication { - @Bean - public SpringContextHolder springContextHolder() { - return new SpringContextHolder(); - } - +public class KenaitoConfigDemoRun { public static void main(String[] args) { SpringApplication springApplication = new SpringApplication(KenaitoConfigDemoRun.class); - initd(springApplication.run(args)); + springApplication.run(args); } } diff --git a/kenaito-config-demo/src/main/resources/banner.txt b/kenaito-config-demo/src/main/resources/banner.txt deleted file mode 100644 index 6f82049..0000000 --- a/kenaito-config-demo/src/main/resources/banner.txt +++ /dev/null @@ -1,8 +0,0 @@ - _ _ _____ __ _ ___ _ _____ _____ _____ _____ __ _ _____ _ _____ -| | / / | ____| | \ | | / | | | |_ _| / _ \ / ___| / _ \ | \ | | | ___| | | / ___| -| |/ / | |__ | \| | / /| | | | | | | | | | | | | | | | | \| | | |__ | | | | -| |\ \ | __| | |\ | / / | | | | | | | | | | | | | | | | | |\ | | __| | | | | _ -| | \ \ | |___ | | \ | / / | | | | | | | |_| | | |___ | |_| | | | \ | | | | | | |_| | -|_| \_\ |_____| |_| \_| /_/ |_| |_| |_| \_____/ \_____| \_____/ |_| \_| |_| |_| \_____/ - - :: Spring Boot :: (v2.7.18)