From 64eb2b106a3860c9c78fb2bba130317bdf13007b Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 26 Jan 2021 15:50:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E9=87=87=E9=9B=86=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-analysis/epdc-analysis-server/pom.xml        | 11 +++++++++--
 .../src/main/resources/application-dev.yml            |  6 ------
 .../src/main/resources/application-prod.yml           |  6 ------
 .../src/main/resources/application-test.yml           |  6 ------
 .../src/main/resources/application.yml                |  6 ++++++
 5 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
index 064f13f5..df40ed07 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
@@ -137,6 +137,9 @@
                 <nacos.ip></nacos.ip>
                 <nacos.namespace>1da17390-6495-4e16-9ec6-0b8ece18a4a0</nacos.namespace>
                 <epmet.url>https://epmet-dev.elinkservice.cn/api</epmet.url>
+                <epmet.secret>0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e</epmet.secret>
+                <epmet.appId>d44a6daaea58be408bb74fe93714710f</epmet.appId>
+                <epmet.customerId>f5ff0770f409981c73adda6ae35143ef</epmet.customerId>
 
             </properties>
         </profile>
@@ -161,7 +164,9 @@
                 <nacos.ip>47.105.119.155</nacos.ip>
                 <nacos.namespace>1da17390-6495-4e16-9ec6-0b8ece18a4a0</nacos.namespace>
                 <epmet.url>https://epmet-dev.elinkservice.cn/api</epmet.url>
-
+                <epmet.secret>0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e</epmet.secret>
+                <epmet.appId>d44a6daaea58be408bb74fe93714710f</epmet.appId>
+                <epmet.customerId>f5ff0770f409981c73adda6ae35143ef</epmet.customerId>
             </properties>
         </profile>
 
@@ -184,7 +189,9 @@
                 <nacos.ip>172.16.0.8</nacos.ip>
                 <nacos.namespace></nacos.namespace>
                 <epmet.url>https://epmet-open.elinkservice.cn/api</epmet.url>
-
+                <epmet.secret>0f2ad2929f1e4f778dc1e90a64d154e572af864ea0eb4d73be56480f0af34ba1</epmet.secret>
+                <epmet.appId>f257a3497224ae078af12966b068a81c</epmet.appId>
+                <epmet.customerId>44876154d10d7cb7affd92000f84f833</epmet.customerId>
             </properties>
         </profile>
     </profiles>
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml
index 16cef330..c97c5f19 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-dev.yml
@@ -73,9 +73,3 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-epmet:
-  config:
-    secret: 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e
-    appId: d44a6daaea58be408bb74fe93714710f
-    customerId: f5ff0770f409981c73adda6ae35143ef
-    url: @epmet.url@
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml
index d6e0c72f..e1d18b33 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-prod.yml
@@ -72,9 +72,3 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-epmet:
-  config:
-    secret: 0f2ad2929f1e4f778dc1e90a64d154e572af864ea0eb4d73be56480f0af34ba1
-    appId: f257a3497224ae078af12966b068a81c
-    customerId: 44876154d10d7cb7affd92000f84f833
-    url: @epmet.url@
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml
index f8d89f67..ddb63045 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application-test.yml
@@ -73,9 +73,3 @@ spring:
         wall:
           config:
             multi-statement-allow: true
-epmet:
-  config:
-    secret: 0398b33f845c4768a102d2ab6ebdd00b5fec222e437540428f55d1df53e6be1e
-    appId: d44a6daaea58be408bb74fe93714710f
-    customerId: f5ff0770f409981c73adda6ae35143ef
-    url: @epmet.url@
\ No newline at end of file
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml
index f324f2cc..f3d3c20c 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/application.yml
@@ -63,3 +63,9 @@ mybatis-plus:
     cache-enabled: false
     call-setters-on-nulls: true
 
+epmet:
+  config:
+    secret: @epmet.secret@
+    appId: @epmet.appId@
+    customerId: @epmet.customerId@
+    url: @epmet.url@
\ No newline at end of file