From 95f1a7591627ebd61d4537a7407754efb594a869 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Fri, 25 Sep 2020 11:17:36 +0800
Subject: [PATCH] =?UTF-8?q?data-stats=E6=9C=8D=E5=8A=A1=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=95=B0=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/constant/DataSourceConstant.java    |  1 +
 .../data-statistical-server/pom.xml           | 24 +++++++++++++++++++
 .../src/main/resources/bootstrap.yml          |  5 ++++
 3 files changed, 30 insertions(+)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java
index b20619837c..064104b9b2 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/constant/DataSourceConstant.java
@@ -14,4 +14,5 @@ public interface DataSourceConstant {
     String EVALUATION_INDEX = "evaluationIndex";
     String PARTY_MEMBER = "partyMember";
     String EPMET_HEART="epmetHeart";
+    String EPMET_POINT = "epmetPoint";
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml
index 9c12e8d5e5..e40e69ed9f 100644
--- a/epmet-module/data-statistical/data-statistical-server/pom.xml
+++ b/epmet-module/data-statistical/data-statistical-server/pom.xml
@@ -216,6 +216,12 @@
                 <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
                 <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
+                <datasource.druid.epmetPoint.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetPoint.url>
+                <datasource.druid.epmetPoint.username>epmet_point_user</datasource.druid.epmetPoint.username>
+                <datasource.druid.epmetPoint.password>EpmEt-db-UsEr</datasource.druid.epmetPoint.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -326,6 +332,12 @@
                 <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
                 <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
+                <datasource.druid.epmetPoint.url>
+                    <![CDATA[jdbc:mysql://192.168.1.130:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetPoint.url>
+                <datasource.druid.epmetPoint.username>epmet_point_user</datasource.druid.epmetPoint.username>
+                <datasource.druid.epmetPoint.password>EpmEt-db-UsEr</datasource.druid.epmetPoint.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>192.168.1.130</spring.redis.host>
@@ -436,6 +448,12 @@
                 <datasource.druid.epmetHeart.username>epmet</datasource.druid.epmetHeart.username>
                 <datasource.druid.epmetHeart.password>elink@833066</datasource.druid.epmetHeart.password>
 
+                <datasource.druid.epmetPoint.url>
+                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetPoint.url>
+                <datasource.druid.epmetPoint.username>epmet</datasource.druid.epmetPoint.username>
+                <datasource.druid.epmetPoint.password>elink@833066</datasource.druid.epmetPoint.password>
+
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
                 <spring.redis.host>r-m5eoz5b6tkx09y6bpz.redis.rds.aliyuncs.com</spring.redis.host>
@@ -542,6 +560,12 @@
                 <datasource.druid.epmetHeart.username>epmet_heart_user</datasource.druid.epmetHeart.username>
                 <datasource.druid.epmetHeart.password>EpmEt-db-UsEr</datasource.druid.epmetHeart.password>
 
+                <datasource.druid.epmetPoint.url>
+                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_point?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                </datasource.druid.epmetPoint.url>
+                <datasource.druid.epmetPoint.username>epmet_point_user</datasource.druid.epmetPoint.username>
+                <datasource.druid.epmetPoint.password>EpmEt-db-UsEr</datasource.druid.epmetPoint.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-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml
index ccb02b714f..8f22922df8 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
@@ -180,6 +180,11 @@ dynamic:
       url: @datasource.druid.epmetHeart.url@
       username: @datasource.druid.epmetHeart.username@
       password: @datasource.druid.epmetHeart.password@
+    epmetPoint:
+      driver-class-name: com.mysql.cj.jdbc.Driver
+      url: @datasource.druid.epmetPoint.url@
+      username: @datasource.druid.epmetPoint.username@
+      password: @datasource.druid.epmetPoint.password@
 
 thread:
   # 线程池配置