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.git
commit 9f650712bdf37f9448d9643a5febd7860c6c61aa
Merge: 35bc823c90 21b08f0320
Author: wangxin813 <wangxin...@jd.com>
AuthorDate: Fri Jul 2 11:48:22 2021 +0800
Merge remote-tracking branch 'dubbo_rem/master'
.../org/apache/dubbo/config/ServiceConfig.java | 9 +-
.../dubbo/config/utils/ReferenceConfigCache.java | 3 +-
.../dubbo/config/spring/api/MethodCallback.java | 62 ++++----
.../annotation/MethodConfigCallbackTest.java | 42 +++---
.../annotation/provider/ProviderConfiguration.java | 27 +++-
.../config/spring/impl/MethodCallbackImpl.java | 162 ++++++++++++++-------
.../definition/ServiceDefinitionBuilder.java | 21 ++-
.../definition/model/MethodDefinition.java | 15 +-
.../definition/model/ServiceDefinition.java | 7 +-
.../main/java/org/apache/dubbo/auth/Constants.java | 2 +
.../apache/dubbo/auth/DefaultAccessKeyStorage.java | 2 +-
.../org/apache/dubbo/rpc/support/RpcUtils.java | 19 ++-
12 files changed, 238 insertions(+), 133 deletions(-)
