refactor: 重构配置管理,移除.env依赖,使用docker-compose环境变量+Nacos配置中心
- 更新所有application-prod.yaml,将环境变量占位符替换为硬编码默认值 - 重写docker-compose.core.yml,使用Spring Boot环境变量命名规范 - 修复Jenkins pipeline中的getContainerName方法调用错误 - 配置优先级:Nacos配置中心 > Docker环境变量 > application-prod.yaml 变更文件: - viewsh-gateway/src/main/resources/application-prod.yaml - viewsh-module-system-server/src/main/resources/application-prod.yaml - viewsh-module-infra-server/src/main/resources/application-prod.yaml - viewsh-module-iot-server/src/main/resources/application-prod.yaml - viewsh-module-iot-gateway/src/main/resources/application-prod.yaml - docker-compose.core.yml - Jenkinsfile
This commit is contained in:
@@ -3,17 +3,20 @@
|
||||
spring:
|
||||
cloud:
|
||||
nacos:
|
||||
server-addr: ${NACOS_SERVER_ADDR:127.0.0.1:8848} # Nacos 服务器地址,支持环境变量
|
||||
username: ${NACOS_USERNAME:} # Nacos 账号
|
||||
password: ${NACOS_PASSWORD:} # Nacos 密码
|
||||
discovery: # 【服务发现】配置项
|
||||
namespace: ${NACOS_NAMESPACE:} # 命名空间,生产环境
|
||||
group: ${NACOS_GROUP:DEFAULT_GROUP} # 使用的 Nacos 配置分组
|
||||
server-addr: 127.0.0.1:8848
|
||||
username: nacos
|
||||
password: nacos
|
||||
discovery:
|
||||
namespace: ""
|
||||
group: DEFAULT_GROUP
|
||||
ip: 127.0.0.1
|
||||
metadata:
|
||||
version: 1.0.0 # 服务实例的版本号
|
||||
config: # 【配置中心】配置项
|
||||
namespace: ${NACOS_NAMESPACE:} # 命名空间,生产环境
|
||||
group: ${NACOS_GROUP:DEFAULT_GROUP} # 使用的 Nacos 配置分组
|
||||
version: 1.0.0
|
||||
config:
|
||||
namespace: ""
|
||||
group: DEFAULT_GROUP
|
||||
file-extension: yaml
|
||||
refresh-enabled: true
|
||||
|
||||
--- #################### 数据库相关配置 ####################
|
||||
spring:
|
||||
@@ -54,22 +57,22 @@ spring:
|
||||
primary: master
|
||||
datasource:
|
||||
master:
|
||||
url: jdbc:mysql://${MYSQL_HOST:127.0.0.1}:${MYSQL_PORT:3306}/${MYSQL_DATABASE:aiot_platform}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
||||
username: ${MYSQL_USER:root}
|
||||
password: ${MYSQL_PASSWORD:}
|
||||
url: jdbc:mysql://127.0.0.1:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
||||
username: root
|
||||
password: root
|
||||
slave: # 从库配置(可选)
|
||||
lazy: true
|
||||
url: jdbc:mysql://${MYSQL_SLAVE_HOST:${MYSQL_HOST:127.0.0.1}}:${MYSQL_SLAVE_PORT:${MYSQL_PORT:3306}}/${MYSQL_DATABASE:aiot_platform}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
||||
username: ${MYSQL_SLAVE_USER:${MYSQL_USER:root}}
|
||||
password: ${MYSQL_SLAVE_PASSWORD:${MYSQL_PASSWORD:}}
|
||||
url: jdbc:mysql://127.0.0.1:3306/aiot_platform?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true
|
||||
username: root
|
||||
password: root
|
||||
|
||||
# Redis 配置
|
||||
data:
|
||||
redis:
|
||||
host: ${REDIS_HOST:127.0.0.1}
|
||||
port: ${REDIS_PORT:6379}
|
||||
database: ${REDIS_DATABASE:0}
|
||||
password: ${REDIS_PASSWORD:}
|
||||
host: 127.0.0.1
|
||||
port: 6379
|
||||
database: 0
|
||||
password: ""
|
||||
timeout: 5000ms
|
||||
lettuce:
|
||||
pool:
|
||||
|
||||
Reference in New Issue
Block a user