From ecea8849ad29ccc204d4994f6eeef5cd5064d0cc Mon Sep 17 00:00:00 2001
From: luliqiang <kidgrow>
Date: Fri, 14 Aug 2020 14:03:33 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-platform into dev

---
 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/resources/application.yml |   19 ++++++++++---------
 1 files changed, 10 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..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:

--
Gitblit v1.8.0