From d20b25a702e5e89e901738dc346f07d7f9350bea Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Sat, 23 Jul 2022 00:10:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E5=BC=82=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../open-data-worker/open-data-worker-server/pom.xml      | 8 ++++----
 .../src/main/resources/bootstrap.yml                      | 7 ++++---
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/epmet-module/open-data-worker/open-data-worker-server/pom.xml b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
index 8909b49154..194210540b 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/pom.xml
+++ b/epmet-module/open-data-worker/open-data-worker-server/pom.xml
@@ -285,11 +285,11 @@
                 <spring.datasource.druid.password>EpmEtOpEndAtArw_)$</spring.datasource.druid.password>
 
                 <!--JN datanbase-->
-                <spring.datasource.jinan.druid.url>
+                <datasource.druid.jinan.url>
                     <![CDATA[jdbc:mysql://172.20.92.220:3306/district_grid_record?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
-                </spring.datasource.jinan.druid.url>
-                <spring.datasource.jinan.druid.username>sync_gridinfo_pingyin</spring.datasource.jinan.druid.username>
-                <spring.datasource.jinan.druid.password>xvfuz2lz</spring.datasource.jinan.druid.password>
+                </datasource.druid.jinan.url>
+                <datasource.druid.jinan.username>sync_gridinfo_pingyin</datasource.druid.jinan.username>
+                <datasource.druid.jinan.password>xvfuz2lz</datasource.druid.jinan.password>
 
                 <!-- redis配置 -->
                 <spring.redis.index>0</spring.redis.index>
diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
index 0143616653..b8195e9611 100644
--- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml
@@ -76,9 +76,10 @@ dynamic:
   datasource:
     jinan:
       driver-class-name: com.mysql.cj.jdbc.Driver
-      url: @datasource.jinan.druid.org.url@
-      username: @datasource.jinan.druid.org.username@
-      password: @datasource.jinan.druid.org.password@
+      url: @datasource.druid.jinan.url@
+      username: @datasource.druid.jinan.username@
+      password: @datasource.druid.jinan.password@
+
 
 management:
   endpoints: