diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 8b1a038..563c0a9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -7,24 +7,6 @@ server: app: id: biz-service-ebtp-project -# --------------seata ------------ -seata: - enabled: true - application-id: ${spring.application.name} - tx-service-group: ${spring.application.name}-group - enable-auto-data-source-proxy: true - use-jdk-proxy: false - service: - vgroup-mapping: - default: default - enable-degrade: false - disable-global-transaction: false - registry: - type: eureka - eureka: - weight: 1 - service-url: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka - # Apollo 配置信息 apollo: meta: http://10.242.31.158:6001/ @@ -137,15 +119,12 @@ spring: # 天宫Eureka配置 eureka: - instance: - # eureka 注册路径地址 - prefer-ip-address: true - hostname: 125.32.114.204 - ip-address: ${eureka.instance.hostname} - instance-id: ${eureka.instance.hostname}:${server.port} client: - serviceUrl: - defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka + service-url: + 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} mybatis-plus: configuration: @@ -176,6 +155,7 @@ hystrix: circuitBreaker: sleepWindowInMilliseconds: 20000 forceClosed: true + ribbon: ReadTimeout: 20000 #请求处理的超时时间 ConnectTimeout: 20000 #请求连接超时时间