Merge branch 'uat' into dev

# Conflicts:
#	src/main/java/com/chinaunicom/mall/ebtp/extend/BizServiceEbtpExtendApplication.java
#	src/main/java/com/chinaunicom/mall/ebtp/extend/export/service/impl/ZjcnExportServiceImpl.java
#	src/main/resources/application.yml

src/main/resources/application-uat.yml

@@ -6,12 +6,11 @@ server:
 seata:
   service:
     vgroup-mapping:
-      biz-service-ebtp-extend-service-group: default
-      
-  #registry:
-  #  type: eureka
-  # eureka:
-  #    serviceUrl: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
+      biz-service-ebtp-extend-service-group: seata-server-jl
+  registry:
+    type: eureka
+    eureka:
+      serviceUrl: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka
       
 # 对应 apollo 配置中心的应用名
 app:
@@ -19,7 +18,7 @@ app:
   
 # Apollo 配置信息
 apollo:
-  meta: http://10.242.31.158:6001/
+  meta: http://apollo-configservice:8080
   bootstrap:
     namespace: application
     enabled: true
@@ -102,12 +101,10 @@ spring:
 eureka:
   client:
     service-url:
-      defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
+      defaultZone: http://eureka-1:8080/eureka,http://eureka-2:8080/eureka,http://eureka-3:8080/eureka
   instance:
     prefer-ip-address: true
-    instance-id: http://10.242.31.158:${server.port}
-    # 这是客户端的注册地址， eureka 会通过这个地址建立管道
-    ip-address: 10.242.31.158
+    instance-ip: ${spring.cloud.client.ip-address}:${server.port}
 
 mybatis-plus:
   configuration: