From 64439bd4e8f62775604f2abe178288bb459ea121 Mon Sep 17 00:00:00 2001
From: ajaxfan <909938737@qq.com>
Date: Tue, 23 Feb 2021 15:09:07 +0800
Subject: [PATCH] update

---
 src/main/resources/application-dev.yml | 38 ++++++--------------------
 1 file changed, 8 insertions(+), 30 deletions(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 0d0009f..15922e6 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -3,6 +3,11 @@ server:
   servlet:
     context-path: /
     
+seata:
+  service:
+    vgroup-mapping:
+      biz-service-ebtp-project-service-group: default
+    
 # 对应 apollo 配置中心的应用名
 app:
   id: biz-service-ebtp-project
@@ -87,35 +92,6 @@ spring:
       master: eshop-redis
       nodes: 10.125.164.124:32718, 10.125.164.118:32716, 10.125.164.121:32716
     password: Unicom#135
-    
-    lettuce:
-      #    jedis:
-      pool:
-        maxTotal: 50
-        minIdle: 1
-        maxWaitMillis: 5000
-        maxIdle: 5
-        testOnBorrow: true
-        testOnReturn:  true
-        testWhileIdle:  true
-    token:
-      database: 0
-      host: 125.32.114.204
-      port: 16379
-      password: redis@CC1234
-      timeout: 6000
-    uuid:
-      database: 1
-      host: 125.32.114.204
-      port: 16379
-      password: redis@CC1234
-      timeout: 6000
-    cache:
-      database: 2
-      host: 125.32.114.204
-      port: 16379
-      password: redis@CC1234
-      timeout: 6000
 
 # 天宫Eureka配置
 eureka:
@@ -124,7 +100,9 @@ eureka:
       defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
   instance:
     prefer-ip-address: true
-    instance-ip: ${spring.cloud.client.ip-address}:${server.port}
+    hostname: http://10.242.31.158
+    # instance-ip: ${spring.cloud.client.ip-address}:${server.port}
+    instance-ip: http://10.242.31.158:${server.port}
 
 mybatis-plus:
   configuration: