From 07b58171827f51f496732235f96c808a77fd7ed9 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Thu, 12 Jan 2023 09:35:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E6=8E=89evaluationIndex1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data-aggregator-server/pom.xml            | 26 +++----------------
 .../src/main/resources/bootstrap.yml          |  5 ----
 2 files changed, 4 insertions(+), 27 deletions(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
index 333a287b4c..33b3dcea12 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml
+++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml
@@ -245,11 +245,11 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
+                <datasource.druid..url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>root</datasource.druid.evaluationIndex1.password>
+                </datasource.druid..url>
+                <datasource.druid..username>root</datasource.druid..username>
+                <datasource.druid..password>root</datasource.druid..password>
 
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
@@ -390,12 +390,6 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>root</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>root</datasource.druid.evaluationIndex1.password>
-
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://192.168.1.140:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
@@ -534,12 +528,6 @@
                 <datasource.druid.evaluationIndex.username>epmet</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>elink@833066</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>epmet</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>elink@833066</datasource.druid.evaluationIndex1.password>
-
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://rm-m5ef9t617j6o5eup7.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
@@ -679,12 +667,6 @@
                 <datasource.druid.evaluationIndex.username>epmet_evaluation_index_user</datasource.druid.evaluationIndex.username>
                 <datasource.druid.evaluationIndex.password>EpmEt-db-UsEr</datasource.druid.evaluationIndex.password>
 
-                <datasource.druid.evaluationIndex1.url>
-                    <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_evaluation_index?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </datasource.druid.evaluationIndex1.url>
-                <datasource.druid.evaluationIndex1.username>epmet_cloud_viewer</datasource.druid.evaluationIndex1.username>
-                <datasource.druid.evaluationIndex1.password>EpmEtclOUdvIEwEr@w</datasource.druid.evaluationIndex1.password>
-
                 <datasource.druid.opercustomize.url>
                     <![CDATA[jdbc:mysql://rm-m5e3vzs2637224wj9.mysql.rds.aliyuncs.com:3306/epmet_oper_customize?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </datasource.druid.opercustomize.url>
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 e800647308..0237f7f5d7 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
@@ -166,11 +166,6 @@ dynamic:
       url: @datasource.druid.partymember.url@
       username: @datasource.druid.partymember.username@
       password: @datasource.druid.partymember.password@
-    evaluationIndexRead:
-      driver-class-name: com.mysql.cj.jdbc.Driver
-      url: @datasource.druid.evaluationIndex1.url@
-      username: @datasource.druid.evaluationIndex1.username@
-      password: @datasource.druid.evaluationIndex1.password@
 feign:
   hystrix:
     enabled: true