From ad69400a0a8a7c639295afa2f3e007b41c687e8f Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 21 Sep 2020 11:17:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E7=9B=B8=E5=85=B3-=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E8=83=BD=E5=8A=9BV0.2epmetHeart?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-statistical-server/pom.xml           | 32 +++++++++----------
 .../src/main/resources/bootstrap.yml          |  5 +++
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 18ef4bc7f6..9c12e8d5e5 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -210,11 +210,11 @@
                 <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
-                <datasource.druid.url>
+                <datasource.druid.epmetHeart.url>
                     <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.url>
-                <datasource.druid.username>epmet_heart_user</datasource.druid.username>
-                <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
+                </datasource.druid.epmetHeart.url>
+                <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
+                <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -320,11 +320,11 @@
                 <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
-                <datasource.druid.url>
+                <datasource.druid.epmetHeart.url>
                     <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.url>
-                <datasource.druid.username>epmet_heart_user</datasource.druid.username>
-                <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
+                </datasource.druid.epmetHeart.url>
+                <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
+                <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -430,11 +430,11 @@
                 <datasource.druid.partyMember.username>epmet</datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>elink@833066</datasource.druid.partyMember.password>
 
-                <datasource.druid.url>
+                <datasource.druid.epmetHeart.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.url>
-                <datasource.druid.username>epmet</datasource.druid.username>
-                <datasource.druid.password>elink@833066</datasource.druid.password>
+                </datasource.druid.epmetHeart.url>
+                <datasource.druid.epmetHeart.username>epmet</datasource.druid.epmetHeart.username>
+                <datasource.druid.epmetHeart.password>elink@833066</datasource.druid.epmetHeart.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
@@ -536,11 +536,11 @@
                 <datasource.druid.partyMember.username>epmet_resi_partymember_user</datasource.druid.partyMember.username>
                 <datasource.druid.partyMember.password>EpmEt-db-UsEr</datasource.druid.partyMember.password>
 
-                <datasource.druid.url>
+                <datasource.druid.epmetHeart.url>
                     <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_heart?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.url>
-                <datasource.druid.username>epmet_heart_user</datasource.druid.username>
-                <datasource.druid.password>EpmEt-db-UsEr</datasource.druid.password>
+                </datasource.druid.epmetHeart.url>
+                <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
+                <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
index 7e0ac4e99d..ccb02b714f 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
@@ -175,6 +175,11 @@ dynamic:
       url: @datasource.druid.partyMember.url@
       username: @datasource.druid.partyMember.username@
       password: @datasource.druid.partyMember.password@
+    epmetHeart:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.epmetHeart.url@
+      username: @datasource.druid.epmetHeart.username@
+      password: @datasource.druid.epmetHeart.password@
 
 thread:
   # 线程池配置