feat 合并分支

This commit is contained in:
yinglong zhang
2021-07-04 16:41:37 +08:00
parent a6442d5b8d
commit 531bb9e7ce
6 changed files with 14 additions and 13 deletions
@@ -28,19 +28,19 @@ logging.level.org.springframework=info
# 请求前缀
restPath=/api
#server.servlet.context-path=/api
#Eruept
eureka.client.allow-redirects=true
eureka.client.register-with-eureka=true
eureka.client.service-url.defaultZone=http://101.36.227.25:8050/eureka/
#是否将自己注册到Eureka Server上,默认为true
#eureka.client.register-with-eureka=false
eureka.client.register-with-eureka=true
##是否从Eureka Server上获取注册信息,默认为true
#eureka.client.fetch-registry=false
eureka.client.fetch-registry=true
#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
#eureka.client.service-url.defaultZone=http://127.0.0.1:8671/eureka/
#eureka.client.service-url.defaultZone=http://10.5.116.172:8672/eureka/
#eureka.client.service-url.defaultZone=http://127.0.0.1:8761/eureka/
eureka.client.service-url.defaultZone=http://192.168.10.47:8761/eureka/
# 请求连接的超时时间 默认的时间为 1 秒
ribbon.ConnectTimeout=500000
# 请求处理的超时时间