Commit fc64951bb87d0f2287384576702c927334b404d7
1 parent
25e3f274
Merge branch 'pudong' into pudong_jdk8
# Conflicts: # src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java # src/main/java/com/bsth/service/impl/LineVersionsServiceImpl.java
Showing
1 changed file
with
16 additions
and
16 deletions
src/main/resources/dubbo/config-prodtest.properties renamed to src/main/resources/dubbo/config-test.properties
| 1 | -# application名字 | ||
| 2 | -spring.dubbo.application.name=bsth_control_v2 | ||
| 3 | -# zookeeper注册中心地址 | ||
| 4 | -spring.dubbo.registry=zookeeper://127.0.0.1:2181 | ||
| 5 | -# protocol配置 | ||
| 6 | -spring.dubbo.protocol.name=dubbo | ||
| 7 | -spring.dubbo.protocol.port=30881 | ||
| 8 | - | ||
| 9 | -#----------- dubbo:consumer 性能调优选项 -------------# | ||
| 10 | -# 远程服务调用超时时间，单位毫秒，这里设置30分钟 | ||
| 11 | -spring.dubbo.consumer.timeout=1800000 | ||
| 12 | -# 远程服务调用重试次数，0表示不需要重试 | ||
| 13 | -spring.dubbo.consumer.retries=0 | ||
| 14 | -#----------- dubbo:consumer 服务治理选项 -------------# | ||
| 15 | -# 启动不检查提供者是否存在 | ||
| 16 | -spring.dubbo.consumer.check=false | 1 | +# application名字 |
| 2 | +spring.dubbo.application.name=bsth_control_v2 | ||
| 3 | +# zookeeper注册中心地址 | ||
| 4 | +spring.dubbo.registry=zookeeper://127.0.0.1:2181 | ||
| 5 | +# protocol配置 | ||
| 6 | +spring.dubbo.protocol.name=dubbo | ||
| 7 | +spring.dubbo.protocol.port=30881 | ||
| 8 | + | ||
| 9 | +#----------- dubbo:consumer 性能调优选项 -------------# | ||
| 10 | +# 远程服务调用超时时间，单位毫秒，这里设置30分钟 | ||
| 11 | +spring.dubbo.consumer.timeout=1800000 | ||
| 12 | +# 远程服务调用重试次数，0表示不需要重试 | ||
| 13 | +spring.dubbo.consumer.retries=0 | ||
| 14 | +#----------- dubbo:consumer 服务治理选项 -------------# | ||
| 15 | +# 启动不检查提供者是否存在 | ||
| 16 | +spring.dubbo.consumer.check=false |