diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
index 4b6996b4..9bb47c3b 100644
--- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/resources/application.yml
@@ -10,7 +10,7 @@ spring:
name: epdc-api-server
# 环境 dev|test|prod
profiles:
- active: dev
+ active: @spring.profiles.active@
messages:
encoding: UTF-8
basename: i18n/messages,i18n/messages_common
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
index 93877481..55819a13 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/pom.xml
@@ -157,15 +157,13 @@
-
+
- epdc
- elink833066
+ jinshui
+ jinshui@833066
true
47.104.224.45:8848
-
- http://localhost:9411
@@ -182,7 +180,7 @@
epdc!redis@master1405
-
+
jinshui
jinshui@833066
@@ -214,7 +212,7 @@
-
+
epdc
Elink@833066
diff --git a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
index d07da259..b8e4d01f 100644
--- a/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-heart/epdc-heart-server/src/main/resources/application.yml
@@ -39,13 +39,6 @@ spring:
url: @spring.datasource.druid.url@
username: @spring.datasource.druid.username@
password: @spring.datasource.druid.password@
- zipkin:
- # 指定了 zipkin 服务器的地址
- base-url: @spring.zipkin.base-url@
- sleuth:
- sampler:
- # 将采样比例设置为 1.0,也就是全部都需要。默认是 0.1
- probability: 1.0
feign:
hystrix: