From b5118a47f805690d5cfc67ffd9468e336715135d Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 15 Sep 2021 14:36:08 +0800
Subject: [PATCH] =?UTF-8?q?data-agg=E6=B7=BB=E5=8A=A0epmet-tduck=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator-server/pom.xml            | 28 +++++++++++++++++++
 .../src/main/resources/bootstrap.yml          |  5 ++++
 2 files changed, 33 insertions(+)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index a08ce28aea..b9835924ff 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -200,6 +200,13 @@
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -307,6 +314,13 @@
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet_tduck_user</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.140</spring.redis.host>
@@ -414,6 +428,13 @@
                 <datasource.druid.epmetmessage.username>epmet</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>elink@833066</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>elink@833066</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -521,6 +542,13 @@
                 <datasource.druid.epmetmessage.username>epmet_message_user</datasource.druid.epmetmessage.username>
                 <datasource.druid.epmetmessage.password>EpmEt-db-UsEr</datasource.druid.epmetmessage.password>
 
+                <!-- 问卷调查 -->
+                <datasource.druid.epmettduck.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_tduck?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmettduck.url>
+                <datasource.druid.epmettduck.username>epmet_tduck</datasource.druid.epmettduck.username>
+                <datasource.druid.epmettduck.password>EpmEt-db-UsEr</datasource.druid.epmettduck.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com</spring.redis.host>
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
index f84136b69a..102666f3d7 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml
@@ -149,6 +149,11 @@ dynamic:
       url: @datasource.druid.epmetmessage.url@
       username: @datasource.druid.epmetmessage.username@
       password: @datasource.druid.epmetmessage.password@
+    epmettduck:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.epmettduck.url@
+      username: @datasource.druid.epmettduck.username@
+      password: @datasource.druid.epmettduck.password@
 feign:
   hystrix:
     enabled: true