[dubbo-website] branch master updated: Fix URL to other documents (#507)
This is an automated email from the ASF dual-hosted git repository. wangxin pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git The following commit(s) were added to refs/heads/master by this push: new 277b32c Fix URL to other documents (#507) 277b32c is described below commit 277b32ca4acec0e5bfd02e52e1b85527defad416 Author: trivia AuthorDate: Thu Oct 31 23:21:14 2019 +0800 Fix URL to other documents (#507) --- docs/zh-cn/user/configuration/properties.md | 2 +- docs/zh-cn/user/demos/concurrency-control.md | 2 +- docs/zh-cn/user/recommend.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/zh-cn/user/configuration/properties.md b/docs/zh-cn/user/configuration/properties.md index 0313a56..b825edb 100644 --- a/docs/zh-cn/user/configuration/properties.md +++ b/docs/zh-cn/user/configuration/properties.md @@ -24,7 +24,7 @@ dubbo.registry.address=10.20.153.10:9090 ``` ## 重写与优先级 -![properties-override](https://github.com/apache/dubbo-website/blob/master/docs/en-us/user/sources/images/dubbo-properties-override.jpg) +![properties-override](../sources/images/dubbo-properties-override.jpg) 优先级从高到低: diff --git a/docs/zh-cn/user/demos/concurrency-control.md b/docs/zh-cn/user/demos/concurrency-control.md index 8367be7..b7a9b9e 100644 --- a/docs/zh-cn/user/demos/concurrency-control.md +++ b/docs/zh-cn/user/demos/concurrency-control.md @@ -51,7 +51,7 @@ ``` -如果 `` 和 `` 都配了actives,`` 优先,参见:[配置的覆盖策略](../configuration/xml.md#配置覆盖关系)。 +如果 `` 和 `` 都配了actives,`` 优先,参见:[配置的覆盖策略](../configuration/xml.md)。 ## Load Balance 均衡 diff --git a/docs/zh-cn/user/recommend.md b/docs/zh-cn/user/recommend.md index 017a2c5..5673a46 100644 --- a/docs/zh-cn/user/recommend.md +++ b/docs/zh-cn/user/recommend.md @@ -164,7 +164,7 @@ Dubbo 中所有的配置项都可以配置在 Spring 配置文件中,并且可 ``` -[^1]: 配置的覆盖规则:1) 方法级别配置优于接口级别,即小 Scope 优先 2) Consumer 端配置优于 Provider 端配置,优于全局配置,最后是 Dubbo 硬编码的配置值([Dubbo 配置参考手册](./configuration/properties.md#覆盖策略)) +[^1]: 配置的覆盖规则:1) 方法级别配置优于接口级别,即小 Scope 优先 2) Consumer 端配置优于 Provider 端配置,优于全局配置,最后是 Dubbo 硬编码的配置值([Dubbo 配置参考手册](./configuration/properties.md)) [^2]: 表示加上第一次调用,会调用 3 次 [^3]: 有多个 Provider 时,如何挑选 Provider 调用 [^4]: 指从 Consumer 端并发调用最好的 Provider,可以减少对响应慢的 Provider 的调用,因为响应慢更容易累积并发调用
[dubbo] branch master updated: Refactor, revert ReferenceConfigCache package change
This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo.git The following commit(s) were added to refs/heads/master by this push: new cea3de7 Refactor, revert ReferenceConfigCache package change cea3de7 is described below commit cea3de7b3804323badef97008632e6d83e3a1177 Author: ken.lj AuthorDate: Thu Oct 31 16:23:11 2019 +0800 Refactor, revert ReferenceConfigCache package change --- compiler/.gradle/4.9/fileContent/fileContent.lock | Bin 17 -> 17 bytes compiler/.gradle/4.9/fileContent/parsedCSource.bin | Bin 4543839 -> 4544531 bytes compiler/.gradle/4.9/fileHashes/fileHashes.bin | Bin 883035 -> 883135 bytes compiler/.gradle/4.9/fileHashes/fileHashes.lock| Bin 17 -> 17 bytes .../.gradle/4.9/nativeCompile/nativeCompile.bin| Bin 62218 -> 62218 bytes .../.gradle/4.9/nativeCompile/nativeCompile.lock | Bin 17 -> 17 bytes compiler/.gradle/4.9/taskHistory/taskHistory.bin | Bin 12084605 -> 12084605 bytes compiler/.gradle/4.9/taskHistory/taskHistory.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/buildOutputCleanup.lock | Bin 17 -> 17 bytes .../.gradle/buildOutputCleanup/outputFiles.bin | Bin 57803 -> 57857 bytes .../org/apache/dubbo/bootstrap/DubboBootstrap.java | 1 + .../utils}/ReferenceConfigCache.java | 3 +- .../apache/dubbo/config/spring/ReferenceBean.java | 2 +- .../ReferenceAnnotationBeanPostProcessorTest.java | 2 +- .../remoting/{Transporter.java => Server.java} | 5 +- .../com/alibaba/dubbo/remoting/Transporter.java| 60 + .../apache/dubbo/demo/consumer/Application.java| 2 +- .../legacy/service/generic/GenericServiceTest.java | 2 +- 18 files changed, 70 insertions(+), 7 deletions(-) diff --git a/compiler/.gradle/4.9/fileContent/fileContent.lock b/compiler/.gradle/4.9/fileContent/fileContent.lock index 30f4129..e67948a 100644 Binary files a/compiler/.gradle/4.9/fileContent/fileContent.lock and b/compiler/.gradle/4.9/fileContent/fileContent.lock differ diff --git a/compiler/.gradle/4.9/fileContent/parsedCSource.bin b/compiler/.gradle/4.9/fileContent/parsedCSource.bin index d520ea6..75425a8 100644 Binary files a/compiler/.gradle/4.9/fileContent/parsedCSource.bin and b/compiler/.gradle/4.9/fileContent/parsedCSource.bin differ diff --git a/compiler/.gradle/4.9/fileHashes/fileHashes.bin b/compiler/.gradle/4.9/fileHashes/fileHashes.bin index 9c85376..bc281ac 100644 Binary files a/compiler/.gradle/4.9/fileHashes/fileHashes.bin and b/compiler/.gradle/4.9/fileHashes/fileHashes.bin differ diff --git a/compiler/.gradle/4.9/fileHashes/fileHashes.lock b/compiler/.gradle/4.9/fileHashes/fileHashes.lock index a6f3649..fb42e88 100644 Binary files a/compiler/.gradle/4.9/fileHashes/fileHashes.lock and b/compiler/.gradle/4.9/fileHashes/fileHashes.lock differ diff --git a/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin b/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin index 72cf47a..52fa87c 100644 Binary files a/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin and b/compiler/.gradle/4.9/nativeCompile/nativeCompile.bin differ diff --git a/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock b/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock index f3aa1b3..44cae06 100644 Binary files a/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock and b/compiler/.gradle/4.9/nativeCompile/nativeCompile.lock differ diff --git a/compiler/.gradle/4.9/taskHistory/taskHistory.bin b/compiler/.gradle/4.9/taskHistory/taskHistory.bin index 51c48d0..55bc23c 100644 Binary files a/compiler/.gradle/4.9/taskHistory/taskHistory.bin and b/compiler/.gradle/4.9/taskHistory/taskHistory.bin differ diff --git a/compiler/.gradle/4.9/taskHistory/taskHistory.lock b/compiler/.gradle/4.9/taskHistory/taskHistory.lock index b52f3b6..5f31fc0 100644 Binary files a/compiler/.gradle/4.9/taskHistory/taskHistory.lock and b/compiler/.gradle/4.9/taskHistory/taskHistory.lock differ diff --git a/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock index b9c10e9..009acc6 100644 Binary files a/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock and b/compiler/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/compiler/.gradle/buildOutputCleanup/outputFiles.bin b/compiler/.gradle/buildOutputCleanup/outputFiles.bin index a82673e..8bd6f36 100644 Binary files a/compiler/.gradle/buildOutputCleanup/outputFiles.bin and b/compiler/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java b/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java index a9c31f3..6281366 100644 --- a/dubbo-bootstrap/dubbo-bootstrap-api/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java +++