From b22e3f54ef833d849297442ef14dda40284e0555 Mon Sep 17 00:00:00 2001
From: chentaisen <14615430+chentaisen@user.noreply.gitee.com>
Date: Tue, 8 Oct 2024 09:17:10 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=90=88=E5=B9=B6w?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/resources/bootstrap.yml | 58 -------------------
.../cloud-modules-data-processing/pom.xml | 2 +
.../src/main/resources/bootstrap.yml | 48 ---------------
cloud-modules/pom.xml | 1 -
4 files changed, 2 insertions(+), 107 deletions(-)
delete mode 100644 cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
delete mode 100644 cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
diff --git a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
deleted file mode 100644
index c5229d5..0000000
--- a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Tomcat
-server:
- port: 10011
-
-# nacos线上地址
-nacos:
- addr: 47.116.173.119:8848
- user-name: nacos
- password: nacos
- namespace: public
-# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
-# Spring
-spring:
- amqp:
- deserialization:
- trust:
- all: true
- main:
- allow-bean-definition-overriding: true
- application:
- # 应用名称
- name: cloud-car
- profiles:
- # 环境配置
- active: dev
- cloud:
- nacos:
- discovery:
- # 服务注册地址
- server-addr: ${nacos.addr}
- # nacos用户名
- username: ${nacos.user-name}
- # nacos密码
- password: ${nacos.password}
- # 命名空间
- namespace: ${nacos.namespace}
- config:
- # 服务注册地址
- server-addr: ${nacos.addr}
- # nacos用户名
- username: ${nacos.user-name}
- # nacos密码
- password: ${nacos.password}
- # 命名空间
- namespace: ${nacos.namespace}
- # 配置文件格式
- file-extension: yml
- # 共享配置
- shared-configs:
- # 系统共享配置
- - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
- # 系统环境Config共享配置
- - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-
-logging:
- level:
- com.muyu.carrail.mapper: DEBUG
-
diff --git a/cloud-modules/cloud-modules-data-processing/pom.xml b/cloud-modules/cloud-modules-data-processing/pom.xml
index 9e3122d..cd399dd 100644
--- a/cloud-modules/cloud-modules-data-processing/pom.xml
+++ b/cloud-modules/cloud-modules-data-processing/pom.xml
@@ -25,11 +25,13 @@
com.muyu
cloud-common-kafka
+ 3.6.3
com.muyu
cloud-common-caffeine
+ 3.6.3
diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
deleted file mode 100644
index a12bfd9..0000000
--- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml
+++ /dev/null
@@ -1,48 +0,0 @@
-# Tomcat
-server:
- port: 10003
-
-# nacos线上地址
-nacos:
- addr: 47.116.173.119:8848
- user-name: nacos
- password: nacos
- namespace: one
-
-# Spring
-spring:
- main:
- allow-bean-definition-overriding: true
- application:
- # 应用名称
- name: cloud-warn
- profiles:
- # 环境配置
- active: dev
- cloud:
- nacos:
- discovery:
- # 服务注册地址
- server-addr: ${nacos.addr}
- # 命名空间
- namespace: ${nacos.namespace}
- config:
- # 服务注册地址
- server-addr: ${nacos.addr}
- # 命名空间
- namespace: ${nacos.namespace}
- # 配置文件格式
- file-extension: yml
- # 共享配置
- 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}
- # engine配置
- - engine-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-logging:
- level:
- com.muyu.system.mapper: DEBUG
diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml
index 53595e2..20a7f40 100644
--- a/cloud-modules/pom.xml
+++ b/cloud-modules/pom.xml
@@ -15,7 +15,6 @@
cloud-modules-openbusiness
cloud-modules-data-processing
cloud-modules-parsing
- cloud-modules-carmanage
cloud-modules-car-gateway