From ed9a6494914de628dea064f332e252123c5eb231 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 | 3 +-
.../enterpise-common/pom.xml | 7 ++---
.../enterpise-service/pom.xml | 13 +-------
.../src/main/resources/bootstrap.yml | 5 +---
.../src/main/resources/bootstrap.yml | 8 ++---
pom.xml | 30 +++++++++++++++----
7 files changed, 35 insertions(+), 33 deletions(-)
diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml
index f8816d9..dfefd86 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 ae47445..cc43740 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml
@@ -22,7 +22,6 @@
com.muyu
enterpise-common
- ${muyu.version}
@@ -31,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 422f454..fb0f530 100644
--- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
+++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml
@@ -90,18 +90,7 @@
com.muyu
cloud-common-api-doc
-
-
-
- com.muyu
- cloud-common-xxl
-
-
-
- com.muyu
- cloud-common-saas
-
-
+
com.muyu
enterpise-cache
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 e4b6ba5..db1f32d 100644
--- a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml
@@ -51,10 +51,7 @@ spring:
- 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}
- #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/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
index 9357e59..08feddf 100644
--- a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
+++ b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml
@@ -1,13 +1,13 @@
# Tomcat
server:
- port: 9902
+ port: 9703
# nacos线上地址
nacos:
addr: 123.57.152.124:8848
user-name: nacos
password: nacos
- namespace: yan1
+ namespace: lhd
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring
spring:
@@ -51,10 +51,6 @@ spring:
- 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}
- # rabbit 配置文件
- - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
logging:
level:
com.muyu.system.mapper: DEBUG
diff --git a/pom.xml b/pom.xml
index 8dc93a6..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}
+
+