From 5d3b07a294a1bd3d6e01f3f2f9e0ec8b80f7cc0f Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <913652501@qq.com>
Date: Fri, 14 Aug 2020 15:54:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
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..8a63c4e 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,21 @@
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}
+ BoneAgeEvaluationData: BoneAgeEvaluationData_${spring.profiles.active}
+ ChildRecordData: ChildRecordData_${spring.profiles.active}
+ ReportData: ReportData_${spring.profiles.active}
#开启重试机制
listener:
simple:
--
Gitblit v1.8.0