From 892657c0b4e376c903b5065fe97b9d199145b17b Mon Sep 17 00:00:00 2001
From: 克 刘 <4345453@qq.com>
Date: Fri, 14 Aug 2020 13:23:55 +0800
Subject: [PATCH] 规范YML文件中数据库链接，采用环境配置方式，支持一个数据库创建多套环境
---
kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml | 2 +-
kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml | 2 +-
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml | 19 ++++++++++---------
kidgrow-config/src/main/resources/bootstrap.properties | 2 +-
kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml | 12 ++++++------
kidgrow-config/src/main/resources/application-dev.properties | 19 ++++++++++++++++++-
6 files changed, 37 insertions(+), 19 deletions(-)
diff --git a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
index 9ce6fd3..9f1d5ad 100644
--- a/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-filecenter/kidgrow-filecenter-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
application:
name: filecenter-server
datasource:
- url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://${kidgrow.datasource.ip}:3306/file_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
# driver-class-name: com.mysql.jdbc.Driver
@@ -63,14 +63,14 @@
# domain: http://123.kidgrow.cloud/
## domain: https://kidgrow.oss-accelerate.aliyuncs.com/
# folder: kidgrow/
- access-key: LTAI4FennfcwZupz3B6hkK3N
- accessKeySecret: NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
+ access-key: ${kidgrow.oss.access-key}
+ accessKeySecret: ${kidgrow.oss.accessKeySecret}
# endpoint: kidgrow.oss-cn-beijing-internal.aliyuncs.com
- endpoint: 123.kidgrow.cloud
+ endpoint: ${kidgrow.oss.endpoint}
# endpoint: oss-accelerate.aliyuncs.com
- bucketName: kidgrow
+ bucketName: ${kidgrow.oss.bucketName}
#注意加上/
- domain: http://123.kidgrow.cloud/
+ domain: ${kidgrow.oss.domain}
# domain: https://kidgrow.oss-accelerate.aliyuncs.com/
folder: kidgrow/
diff --git a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
index 2a725ea..42d89c8 100644
--- a/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
application:
name: oprationcenter-server
datasource:
- url: jdbc:mysql://${kidgrow.datasource.ip}:3306/opration_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://${kidgrow.datasource.ip}:3306/opration_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
# driver-class-name: com.mysql.jdbc.Driver
@@ -19,17 +19,18 @@
aop-patterns: com.kidgrow.oprationcenter.controller.*,com.kidgrow.oprationcenter.mapper.*
# rabbitMQ
rabbitmq:
- host: 182.92.99.224
- port: 5672
- username: liuke
- password: kidgrow2020
+ host: ${kidgrow.rabbitmq.host}
+ port: ${kidgrow.rabbitmq.port}
+ username: ${kidgrow.rabbitmq.username}
+ password: ${kidgrow.rabbitmq.password}
#交换机名称
- exchangeName: BoneAgeEvaluation
+ exchangeName: ${kidgrow.rabbitmq.exchangeName}
#队列名称
- queueName: test_queue #AdvancedEvaluation # AIEvaluation #,AdvancedEvaluationResult
+ queueName: ${kidgrow.rabbitmq.queueName} #AdvancedEvaluation # AIEvaluation #,AdvancedEvaluationResult
#routingKeyName
- routingKeyName: Kidgrow2020
- virtual-host: kidgrow
+ routingKeyName: ${kidgrow.rabbitmq.routingKeyName}
+ virtual-host: ${kidgrow.rabbitmq.virtual-host}
+ AIEvaluationResults: AIEvaluationResults_${spring.profiles.active}
#开启重试机制
listener:
simple:
diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
index 944f1a9..1a52ffd 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@
application:
name: usercenter-server
datasource:
- url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://${kidgrow.datasource.ip}:3306/user_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
# driver-class-name: com.mysql.jdbc.Driver
diff --git a/kidgrow-config/src/main/resources/application-dev.properties b/kidgrow-config/src/main/resources/application-dev.properties
index d95fee5..2e67eb5 100644
--- a/kidgrow-config/src/main/resources/application-dev.properties
+++ b/kidgrow-config/src/main/resources/application-dev.properties
@@ -14,6 +14,16 @@
spring.redis.password=kidgrow
spring.redis.timeout=5000
+#rabbitmq\u914D\u7F6E
+kidgrow.rabbitmq.host=182.92.99.224
+kidgrow.rabbitmq.port=5672
+kidgrow.rabbitmq.username=liuke
+kidgrow.rabbitmq.password=kidgrow2020
+kidgrow.rabbitmq.exchangeName=BoneAgeEvaluation
+kidgrow.rabbitmq.queueName=test_queue
+kidgrow.rabbitmq.routingKeyName=Kidgrow2020
+kidgrow.rabbitmq.virtual-host=kidgrow
+
#\u963F\u91CCDruid\u914D\u7F6E
kidgrow.druid.loginname=admin
kidgrow.druid.loginpwd=123456
@@ -37,6 +47,13 @@
kidgrow.fdfs.web-url=127.0.0.1
kidgrow.fdfs.trackerList=${kidgrow.fdfs.web-url}:22122
+####\u963F\u91CCOSS\u914D\u7F6E
+kidgrow.oss.access-key=LTAI4FennfcwZupz3B6hkK3N
+kidgrow.oss.accessKeySecret=NzBBGe8SS41qJlp0nA3tlJ3t74lBZM
+kidgrow.oss.endpoint=123.kidgrow.cloud
+kidgrow.oss.bucketName=kidgrow
+kidgrow.oss.domain=http://123.kidgrow.cloud/
+
##### \u65E5\u5FD7\u94FE\u8DEF\u8FFD\u8E2A
kidgrow.trace.enable=true
@@ -50,7 +67,7 @@
kidgrow.audit-log.enabled=true
kidgrow.audit-log.log-type=db
kidgrow.audit-log.datasource.driver-class-name=com.mysql.jdbc.Driver
-kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+kidgrow.audit-log.datasource.jdbc-url=jdbc:mysql://${kidgrow.datasource.ip}:3306/logger_center_${spring.profiles.active}?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
kidgrow.audit-log.datasource.username=${kidgrow.datasource.username}
kidgrow.audit-log.datasource.password=${kidgrow.datasource.password}
diff --git a/kidgrow-config/src/main/resources/bootstrap.properties b/kidgrow-config/src/main/resources/bootstrap.properties
index 4062430..3c1bf26 100644
--- a/kidgrow-config/src/main/resources/bootstrap.properties
+++ b/kidgrow-config/src/main/resources/bootstrap.properties
@@ -1,6 +1,6 @@
########################## bootstrap\u7EA7\u522B\u901A\u7528\u914D\u7F6E ##########################
# \u9ED8\u8BA4\u5F00\u53D1\u73AF\u5883
-spring.profiles.active=dev
+spring.profiles.active=uat
##### spring-boot-actuator\u914D\u7F6E
management.endpoints.web.exposure.include=*
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml b/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
index 929f9dd..30f4715 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/resources/application.yml
@@ -14,7 +14,7 @@
application:
name: uaa-server
datasource:
- url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
+ url: jdbc:mysql://${kidgrow.datasource.ip}:3306/oauth_center_${spring.profiles.active}?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai
username: ${kidgrow.datasource.username}
password: ${kidgrow.datasource.password}
# driver-class-name: com.mysql.jdbc.Driver
--
Gitblit v1.8.0