From 7b784b0526ea6db963a93b2c7e8471061ae20a41 Mon Sep 17 00:00:00 2001 From: ruyaxie <648179520@qq.comgit> Date: Tue, 8 Oct 2024 19:48:57 +0800 Subject: [PATCH] =?UTF-8?q?feat():parse=E5=A4=9A=E4=BD=99=E7=9A=84?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=EF=BC=8C=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E7=9A=84=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99=EF=BC=8C=E4=BB=A5?= =?UTF-8?q?=E5=8F=8AXXLJob=E4=BE=9D=E8=B5=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 2 +- .../enterpise-cache/pom.xml | 2 ++ .../enterpise-common/pom.xml | 7 ++--- .../enterpise-service/pom.xml | 1 + .../src/main/resources/bootstrap.yml | 2 -- cloud-modules/cloud-modules-parse/pom.xml | 11 +------ .../src/main/resources/bootstrap.yml | 3 +- pom.xml | 31 +++++++++++++++---- 8 files changed, 35 insertions(+), 24 deletions(-) diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index 2de50cd..ccac39c 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: wx + namespace: xyr # Spring spring: diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml index db9c66f..cc43740 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml @@ -30,6 +30,8 @@ cloud-common-cache + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml index 8d98d66..f3b908e 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml @@ -41,10 +41,9 @@ swagger-annotations-jakarta - - com.muyu - cloud-common-system - + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index d686058..6df377a 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -101,6 +101,7 @@ cloud-common-saas + com.muyu enterpise-cache diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml index 7f2f29b..fa6d8c2 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml @@ -49,8 +49,6 @@ spring: shared-configs: # 系统共享配置 - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # xxl-job 配置文件 - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-modules-parse/pom.xml b/cloud-modules/cloud-modules-parse/pom.xml index d95bbc5..2df78f0 100644 --- a/cloud-modules/cloud-modules-parse/pom.xml +++ b/cloud-modules/cloud-modules-parse/pom.xml @@ -74,11 +74,6 @@ cloud-common-api-doc - - - com.muyu - cloud-common-xxl - @@ -91,11 +86,7 @@ lombok - - - com.muyu - enterpise-remote - + com.muyu diff --git a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml index 259b200..6afb30b 100644 --- a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 29705 + port: 9705 # nacos线上地址 nacos: @@ -55,6 +55,7 @@ spring: - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} #kafka共享配置 #application-kafka-config-dev.yml + #kafka共享配置 application-kafka-config-dev.yml - application-kafka-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: diff --git a/pom.xml b/pom.xml index caa95f5..3012f9c 100644 --- a/pom.xml +++ b/pom.xml @@ -283,11 +283,31 @@ ${muyu.version} - - - - - + + com.muyu + enterpise-remote + ${muyu.version} + + + + com.muyu + enterpise-common + ${muyu.version} + + + + com.muyu + enterprise-cache + ${muyu.version} + + + + + com.muyu + cloud-common-kafka + ${muyu.version} + + @@ -355,7 +375,6 @@ cloud-common-saas ${muyu.version} -