From b65e2e4814c690aaab93804b8f5e5561f6610e40 Mon Sep 17 00:00:00 2001
From: 吴学文 <wuxuewen@wuxuewendeMacBook-Pro.local>
Date: 星期二, 25 六月 2019 18:08:38 +0800
Subject: [PATCH] springcloud2.0修改为spring.cloud.client.ip-address

---
 WebService/src/main/resources/application-dev.yml |   22 +---------------------
 1 files changed, 1 insertions(+), 21 deletions(-)

diff --git a/WebService/src/main/resources/application-dev.yml b/WebService/src/main/resources/application-dev.yml
index 7204ecc..6c3e0c5 100644
--- a/WebService/src/main/resources/application-dev.yml
+++ b/WebService/src/main/resources/application-dev.yml
@@ -15,7 +15,7 @@
     leaseRenewalIntervalInSeconds: 10
     leaseExpirationDurationInSeconds: 30
     preferIpAddress: true
-    instanceId: ${spring.cloud.client.ipAddress}:${server.port}
+    instanceId: ${spring.cloud.client.ip-address}:${server.port}
   client:
     serviceUrl:
       defaultZone: http://dev.java110.com:8761/eureka/
@@ -51,26 +51,6 @@
       max-idle: 100
       min-idle: 0
       timeout: 0
-  datasource:
-    connectionProperties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
-    minIdle: 5
-    validationQuery: SELECT 1 FROM DUAL
-    initialSize: 5
-    maxWait: 60000
-    filters: stat,wall,log4j
-    poolPreparedStatements: true
-    type: com.alibaba.druid.pool.DruidDataSource
-    url: jdbc:mysql://dev.db.java110.com:3306/TT?useUnicode=true&characterEncoding=utf-8
-    maxPoolPreparedStatementPerConnectionSize: 20
-    password: TT@12345678
-    testOnBorrow: false
-    testWhileIdle: true
-    minEvictableIdleTimeMillis: 300000
-    timeBetweenEvictionRunsMillis: 60000
-    testOnReturn: false
-    driverClassName: com.mysql.jdbc.Driver
-    maxActive: 20
-    username: TT
 
   thymeleaf:
     mode: LEGACYHTML5

--
Gitblit v1.8.0