from:"wangxin"

[dubbo] branch lovepoem-patch-1 created (now 1ee821d)

2019-05-24 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch lovepoem-patch-1
in repository https://gitbox.apache.org/repos/asf/dubbo.git.


  at 1ee821d  reverse url of python

No new revisions were added by this update.

[incubator-dubbo] branch master updated: [Dubbo-3886] Integrate with SOFARegistry. (#3886)

2019-05-01 Thread wangxin

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/incubator-dubbo.git


The following commit(s) were added to refs/heads/master by this push:
 new 667f227  [Dubbo-3886] Integrate with SOFARegistry. (#3886)
667f227 is described below

commit 667f2271b3c93f0c4f321368e32eb37a62d1fe0c
Author: Geng Zhang 
AuthorDate: Thu May 2 10:07:05 2019 +0800

[Dubbo-3886] Integrate with SOFARegistry. (#3886)

* Integrate with SOFARegistry.
---
 dubbo-all/pom.xml  |   8 +
 dubbo-bom/pom.xml  |   5 +
 dubbo-dependencies-bom/pom.xml |  15 +-
 dubbo-distribution/pom.xml |   5 +
 dubbo-registry/dubbo-registry-sofa/pom.xml | 141 ++
 .../apache/dubbo/registry/sofa/SofaRegistry.java   | 292 +
 .../dubbo/registry/sofa/SofaRegistryConstants.java |  43 +++
 .../dubbo/registry/sofa/SofaRegistryFactory.java   |  41 +++
 .../org.apache.dubbo.registry.RegistryFactory  |   1 +
 .../apache/dubbo/registry/sofa/HelloService.java   |  24 ++
 .../dubbo/registry/sofa/HelloServiceImpl.java  |  44 
 .../dubbo/registry/sofa/SofaRegistryTest.java  | 148 +++
 .../src/test/resources/log4j.properties|   7 +
 dubbo-registry/pom.xml |   1 +
 .../dubbo/rpc/protocol/thrift/ThriftCodec.java |   3 +-
 15 files changed, 775 insertions(+), 3 deletions(-)

diff --git a/dubbo-all/pom.xml b/dubbo-all/pom.xml
index e0e2366..08621e4 100644
--- a/dubbo-all/pom.xml
+++ b/dubbo-all/pom.xml
@@ -256,6 +256,13 @@
 
 
 org.apache.dubbo
+dubbo-registry-sofa
+${project.version}
+compile
+true
+
+
+org.apache.dubbo
 dubbo-monitor-api
 ${project.version}
 compile
@@ -530,6 +537,7 @@
 
org.apache.dubbo:dubbo-registry-redis
 
org.apache.dubbo:dubbo-registry-consul
 
org.apache.dubbo:dubbo-registry-etcd3
+
org.apache.dubbo:dubbo-registry-sofa
 
org.apache.dubbo:dubbo-monitor-api
 
org.apache.dubbo:dubbo-monitor-default
 
org.apache.dubbo:dubbo-config-api
diff --git a/dubbo-bom/pom.xml b/dubbo-bom/pom.xml
index e894f8b..148b49a 100644
--- a/dubbo-bom/pom.xml
+++ b/dubbo-bom/pom.xml
@@ -254,6 +254,11 @@
 
 
 org.apache.dubbo
+dubbo-registry-sofa
+${project.version}
+
+
+org.apache.dubbo
 dubbo-monitor-api
 ${project.version}
 
diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 2d8be67..6d68457 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -145,6 +145,7 @@
 4.3.16.RELEASE
 
 2.0.1
+5.2.0
 2.8.5
 1.2.0
 2.0
@@ -458,7 +459,6 @@
 ${commons_lang3_version}
 
 
-
 
 
 javax.xml.bind
@@ -519,6 +519,19 @@
 metrics-rest
 ${metrics_version}
 
+
+
+
+com.alipay.sofa
+registry-client-all
+${sofa_registry_version}
+
+
+com.alipay.sofa
+registry-test
+${sofa_registry_version}
+test
+
 
 
 
diff --git a/dubbo-distribution/pom.xml b/dubbo-distribution/pom.xml
index 50fd855..e92363d 100644
--- a/dubbo-distribution/pom.xml
+++ b/dubbo-distribution/pom.xml
@@ -182,6 +182,11 @@
 
 
 org.apache.dubbo
+dubbo-registry-sofa
+${project.version}
+
+
+org.apache.dubbo
 dubbo-monitor-api
 ${project.version}
 
diff --git a/dubbo-registry/dubbo-registry-sofa/pom.xml 
b/dubbo-registry/dubbo-registry-sofa/pom.xml
new file mode 100644
index 000..7a2415f
--- /dev/null
+++ b/dubbo-registry/dubbo-registry-sofa/pom.xml
@@ -0,0 +1,141 @@
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+
+org.apache.dubbo
+dubbo-registry
+${revision}
+../pom.xml
+
+4.0.0
+
+dubbo-registry-sofa
+${project.artifactId}
+The SOFARegistry module of Dubbo project
+
+
+2.1
+-Dnetwork_inter

[incubator-dubbo] branch master updated (b30bddb -> c98abb2)

2019-05-05 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git.


from b30bddb  switch from CopyOnWriteArrayList to regular list in order to 
avoid potential UnsupportedOperationException (#3978)
 add c98abb2  use revision in pom.xml (#3980)

No new revisions were added by this update.

Summary of changes:
 dubbo-metadata-report/dubbo-metadata-report-etcd/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[dubbo-website] branch rd_sources deleted (was 84f58b6)

2019-06-27 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch rd_sources
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git.


 was 84f58b6  修改导航菜单链接错误的问题

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[dubbo-website] branch gh-pages deleted (was 09163c0)

2019-06-27 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch gh-pages
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git.


 was 09163c0  initial cut for new github pages for dubbo project

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[dubbo-website] branch asf-site-legacy deleted (was f55ba05)

2019-06-27 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch asf-site-legacy
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git.


 was f55ba05  Add download button.

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[dubbo] branch master updated: Remove oracle jdk (#4448)

2019-07-02 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new 5b7d2a39 Remove oracle jdk (#4448)
5b7d2a39 is described below

commit 5b7d2a3965dcba9639a78b15e0de96926cbe1167
Author: Huxing Zhang 
AuthorDate: Tue Jul 2 20:01:58 2019 +0800

Remove oracle jdk (#4448)
---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index e3821cb..a0bacc7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,7 @@ sudo: false # faster builds
 
 jdk:
   - openjdk11
-  - oraclejdk11
   - openjdk8
-  - oraclejdk8
 
 cache:
   directories:

[dubbo-hessian-lite] branch master updated: Update README.md

2019-07-01 Thread wangxin

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-hessian-lite.git


The following commit(s) were added to refs/heads/master by this push:
 new dc65495  Update README.md
dc65495 is described below

commit dc654950fc6402f5464991cee49a1bf9c82ea100
Author: Xin Wang 
AuthorDate: Mon Jul 1 14:26:05 2019 +0800

Update README.md
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5b9c40b..4743bcf 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## Hessian Lite(Alibaba embed version)
 
-[![Build 
Status](https://travis-ci.org/dubbo/hessian-lite.svg?branch=master)](https://travis-ci.org/dubbo/hessian-lite)
+[![Build 
Status](https://travis-ci.org/dubbo/hessian-lite.svg?branch=master)](https://travis-ci.org/apache/dubbo-hessian-lite)
 
[![codecov](https://codecov.io/gh/dubbo/hessian-lite/branch/master/graph/badge.svg)](https://codecov.io/gh/dubbo/hessian-lite)
 
[![Gitter](https://badges.gitter.im/alibaba/dubbo.svg)](https://gitter.im/alibaba/dubbo?utm_source=badge_medium=badge_campaign=pr-badge)
 ![license](https://img.shields.io/github/license/alibaba/dubbo.svg)

[dubbo-spring-boot-project] branch master updated: Update README.md

2019-07-29 Thread wangxin

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-spring-boot-project.git


The following commit(s) were added to refs/heads/master by this push:
 new 209b856  Update README.md
209b856 is described below

commit 209b856520d0262881842af3b5977cc21c818f11
Author: Xin Wang 
AuthorDate: Tue Jul 30 10:37:00 2019 +0800

Update README.md
---
 README.md | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index c9a61f5..b0d0a77 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,10 @@
 # Apache Dubbo Spring Boot Project 
 
-[![Build 
Status](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project)
 
-[![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project)
-![license](https://img.shields.io/github/license/apache/incubator-dubbo-spring-boot-project.svg)
+[![Build 
Status](https://travis-ci.org/apache/dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/dubbo-spring-boot-project)
 
+[![codecov](https://codecov.io/gh/apache/dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/ubbo-spring-boot-project)
+![license](https://img.shields.io/github/license/apache/dubbo-spring-boot-project.svg)
 
-[Apache Dubbo](https://github.com/apache/incubator-dubbo) Spring Boot Project 
makes it easy to create [Spring 
Boot](https://github.com/spring-projects/spring-boot/) application using Dubbo 
as RPC Framework. What's more, it also provides 
+[Apache Dubbo](https://github.com/apache/dubbo) Spring Boot Project makes it 
easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) 
application using Dubbo as RPC Framework. What's more, it also provides 
 
 * [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., 
annotation-driven, auto configuration, externalized configuration).
 * [production-ready features](dubbo-spring-boot-actuator) (e.g., security, 
health checks, externalized configuration).
@@ -104,8 +104,8 @@ If you still use the legacy Dubbo whose version is less 
than 2.7.0, please use t
 
 | Dubbo Spring Boot | Dubbo  | Spring Boot |
 | - | -- | --- |
-| 
[0.2.1.RELEASE](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.2.x)
 | 2.6.5+ | 2.x |
-| 
[0.1.2.RELEASE](https://github.com/apache/incubator-dubbo-spring-boot-project/tree/0.1.x)
 | 2.6.5+ | 1.x |
+| 
[0.2.1.RELEASE](https://github.com/apache/dubbo-spring-boot-project/tree/0.2.x) 
| 2.6.5+ | 2.x |
+| 
[0.1.2.RELEASE](https://github.com/apache/dubbo-spring-boot-project/tree/0.1.x) 
| 2.6.5+ | 1.x |

[dubbo-website] branch ecology-page deleted (was b659fa5)

2019-08-16 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch ecology-page
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git.


 was b659fa5  feat: 优化移动端适配及窗口尺寸变化

The revisions that were on this branch are still contained in
other references; therefore, this change does not discard any commits
from the repository.

[dubbo-website] branch master updated: fix style (#450)

2019-08-17 Thread wangxin

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 7895eec  fix style (#450)
7895eec is described below

commit 7895eec315fc4255d4b218691708f1328afdc741
Author: Xin Wang 
AuthorDate: Sat Aug 17 15:43:44 2019 +0800

fix style (#450)
---
 site_config/ecology.js | 70 ++
 1 file changed, 59 insertions(+), 11 deletions(-)

diff --git a/site_config/ecology.js b/site_config/ecology.js
index 91bae6a..5a857c1 100644
--- a/site_config/ecology.js
+++ b/site_config/ecology.js
@@ -525,6 +525,7 @@ export default {
   {
 name: 'Fst',
 img: '/img/ecology/java.png',
+hiddenImg: true,
 desc: 'FST: fast java serialization drop in-replacement',
 tags: [
   {
@@ -903,11 +904,11 @@ export default {
 desc: 'A lightweight powerful flow control component enabling 
reliability and monitoring for microservices',
 tags: [
   {
-text: 'Registry',
+text: 'Microservice Components',
 bgColor: '#835BE3',
   },
   {
-text: 'Config',
+text: 'Reliability',
 bgColor: '#00D0D9',
   },
 ],
@@ -920,11 +921,11 @@ export default {
 desc: 'Hystrix: Latency and Fault Tolerance for Distributed 
Systems',
 tags: [
   {
-text: 'Registry',
+text: 'Microservice Components',
 bgColor: '#835BE3',
   },
   {
-text: 'Config',
+text: 'Reliability',
 bgColor: '#00D0D9',
   },
 ],
@@ -937,11 +938,11 @@ export default {
 desc: 'Resilience4j is a fault tolerance library designed for 
Java8 and functional programming',
 tags: [
   {
-text: 'Registry',
+text: 'Microservice Components',
 bgColor: '#835BE3',
   },
   {
-text: 'Config',
+text: 'Reliability',
 bgColor: '#00D0D9',
   },
 ],
@@ -959,11 +960,11 @@ export default {
 desc: 'An open protocol to allow secure authorization in a 
simple and standard method from web, mobile and desktop applications.',
 tags: [
   {
-text: 'Registry',
+text: 'Microservice Components',
 bgColor: '#835BE3',
   },
   {
-text: 'Config',
+text: 'Authorization',
 bgColor: '#00D0D9',
   },
 ],
@@ -981,11 +982,11 @@ export default {
 desc: 'Apache RocketMQ is a distributed messaging and 
streaming platform with low latency, high performance and reliability, 
trillion-level capacity and flexible scalability.',
 tags: [
   {
-text: 'Registry',
+text: 'Microservice Components',
 bgColor: '#835BE3',
   },
   {
-text: 'Config',
+text: 'Event',
 bgColor: '#00D0D9',
   },
 ],
@@ -1003,7 +1004,7 @@ export default {
 desc: 'Simplify API development for users, teams, and 
enterprises with the Swagger open source and professional toolset. ',
 tags: [
   {
-text: 'Registry',
+text: 'Microservice Components',
 bgColor: '#835BE3',
   },
   {
@@ -1016,6 +1017,29 @@ export default {
   },
 ],
   },
+  {
+title: 'Scheduling',
+children: [
+  {
+name: 'SchedulerX',
+img: '/img/ecology/java.png',
+hiddenImg: true,
+desc: 'A distributed task scheduling componenent',
+tags: [
+  {
+text: 'Microservice Components',
+bgColor: '#835BE3',
+  },
+  {
+text: 'Scheduling',
+bgColor: '#00D0D9',
+  },
+],
+website: 'https://www.aliyun.com/aliware/schedulerx',
+repository: 'https

[dubbo-hessian-lite] branch master updated: Update .travis.yml

2019-08-17 Thread wangxin

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-hessian-lite.git


The following commit(s) were added to refs/heads/master by this push:
 new fe80eda  Update .travis.yml
fe80eda is described below

commit fe80eda57723859e527fee68da666afb5807
Author: Xin Wang 
AuthorDate: Sat Aug 17 16:11:12 2019 +0800

Update .travis.yml
---
 .travis.yml | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4d36f7e..9ea7035 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,14 +2,14 @@ language: java
 sudo: false # faster builds
 
 jdk:
-- oraclejdk11
+- openjdk11
 - openjdk10
-- oraclejdk9
-- oraclejdk8
+- openjdk9
+- openjdk8
 - openjdk7
 
 script:
 - mvn clean package
 
 after_success:
-- bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
+- bash <(curl -s https://codecov.io/bash)

[dubbo-hessian-lite] branch master updated: Update README.md

2019-08-17 Thread wangxin

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-hessian-lite.git


The following commit(s) were added to refs/heads/master by this push:
 new 3acc5eb  Update README.md
3acc5eb is described below

commit 3acc5eb70d4816f745a1002d13642b64842c93ca
Author: Xin Wang 
AuthorDate: Sat Aug 17 16:10:35 2019 +0800

Update README.md
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4743bcf..c66e222 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## Hessian Lite(Alibaba embed version)
+## Hessian Lite(Apache Dubbo private version)
 
 [![Build 
Status](https://travis-ci.org/dubbo/hessian-lite.svg?branch=master)](https://travis-ci.org/apache/dubbo-hessian-lite)
 
[![codecov](https://codecov.io/gh/dubbo/hessian-lite/branch/master/graph/badge.svg)](https://codecov.io/gh/dubbo/hessian-lite)

[dubbo-hessian-lite] branch master updated: Update .travis.yml

2019-08-17 Thread wangxin

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-hessian-lite.git


The following commit(s) were added to refs/heads/master by this push:
 new f990b96  Update .travis.yml
f990b96 is described below

commit f990b96f517a444a0cbf11eeaf20573e8770fdb0
Author: Xin Wang 
AuthorDate: Sat Aug 17 16:29:27 2019 +0800

Update .travis.yml
---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 9ea7035..1790f51 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ jdk:
 - openjdk10
 - openjdk9
 - openjdk8
-- openjdk7
+   #   - openjdk7
 
 script:
 - mvn clean package

[dubbo-hessian-lite] branch master updated: Add hessian group info (#18)

2019-08-17 Thread wangxin

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-hessian-lite.git


The following commit(s) were added to refs/heads/master by this push:
 new 6a0cd3c  Add hessian group info (#18)
6a0cd3c is described below

commit 6a0cd3c6014f5fa242a93a29c77ede7080e38a9e
Author: Xin Wang 
AuthorDate: Sat Aug 17 17:07:34 2019 +0800

Add hessian group info (#18)
---
 README.md | 10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index c66e222..fe8a126 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,18 @@
 ## Hessian Lite(Apache Dubbo private version)
 
-[![Build 
Status](https://travis-ci.org/dubbo/hessian-lite.svg?branch=master)](https://travis-ci.org/apache/dubbo-hessian-lite)
-[![codecov](https://codecov.io/gh/dubbo/hessian-lite/branch/master/graph/badge.svg)](https://codecov.io/gh/dubbo/hessian-lite)
+[![Build 
Status](https://travis-ci.org/apache/dubbo-hessian-lite.svg?branch=master)](https://travis-ci.org/apache/dubbo-hessian-lite)
+[![codecov](https://codecov.io/gh/apache/dubbo-hessian-lite/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/dubbo-hessian-lite)
 
[![Gitter](https://badges.gitter.im/alibaba/dubbo.svg)](https://gitter.im/alibaba/dubbo?utm_source=badge_medium=badge_campaign=pr-badge)
 ![license](https://img.shields.io/github/license/alibaba/dubbo.svg)
 ![maven](https://img.shields.io/maven-central/v/com.alibaba/hessian-lite.svg)
 
-Hessian-lite is a Alibaba dubbo embed version of [official 
hessian](https://github.com/ebourg/hessian) initially.  Then this module is 
separated from Dubbo. All branches of 
[Dubbo](https://github.com/apache/incubator-dubbo) : 2.5.x, 2.6.x(since 2.6.3) 
and 2.7.x  are dependent on it , please see the details：
+Hessian-lite is a Alibaba dubbo embed version of [official 
hessian](https://github.com/ebourg/hessian) initially.  Then this module is 
separated from Dubbo. All branches of [Dubbo](https://github.com/apache/dubbo) 
: 2.5.x, 2.6.x(since 2.6.3) and 2.7.x  are dependent on it , please see the 
details：
 
-- [2018-07-13 Delete the code of dubbo/hessian-lite module of the 2.6.x and 
2.5.x 
branches](https://lists.apache.org/thread.html/72f7bbca340e96fb7da6a7ada014312953cfccd19271fad8e60cbf39@%3Cdev.dubbo.apache.org%3E)
 
+- [2018-07-13 Delete the code of apache/dubbo-hessian-lite module of the 2.6.x 
and 2.5.x 
branches](https://lists.apache.org/thread.html/72f7bbca340e96fb7da6a7ada014312953cfccd19271fad8e60cbf39@%3Cdev.dubbo.apache.org%3E)
 
 - [2018-06-04 Moving hessian-lite from Dubbo codebase to 
eco-system](https://lists.apache.org/thread.html/872bbcada2db0f04145f853dd7c7f8abef589807b8089a5016478ec8@%3Cdev.dubbo.apache.org%3E)
 
 
+Now we are trying to build a hessian group https://github.com/hessian-group to 
make maintainers of Hessian community work more closely together .
+
 ## Maven dependency
 
 ```xml

[dubbo-website] branch ecology-page updated: revert gitignore

2019-08-13 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a commit to branch ecology-page
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git


The following commit(s) were added to refs/heads/ecology-page by this push:
 new 61fb366  revert gitignore
61fb366 is described below

commit 61fb366c9e146a4b0b2f208ee7eb902913148b21
Author: Xin Wang 
AuthorDate: Tue Aug 13 21:41:31 2019 +0800

revert gitignore
---
 .gitignore | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b1b1567..8b7e577 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@ npm-debug.log
 *.orig
 package-lock.json
 *.iml
-#/en-us/
-#/zh-cn/
-#build/
-#index.html
-#md_json/
+/en-us/
+/zh-cn/
+build/
+index.html
+md_json/

[dubbo-website] branch ecology-page updated (61fb366 -> b659fa5)

2019-08-13 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch ecology-page
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git.


omit 61fb366  revert gitignore
omit e592751  delete static files
omit 962cefd  update gitignore
omit 6631510  add ecology-page
omit cf9f34c  Fix typo (#429)
omit 9c5ca0e  Fix classpath didn't update#409 (#431)
omit c7cbfe5  Fix a typo in architecture page(#428)
omit a6b4934  Separate the tables of maturity.md (#426)
omit c2f9412  fix a typo and reformat the format (#425)
omit e6e439a  覆盖规则需要添加版本 (#420)
omit 3dd4933  Addd new docs (#424)
omit 2f99615  add config center dev doc (#423)
omit 7927661  Fix typos in maturity.md (#419)
omit 4895708  Fix typo in sidebar title for Serialization (#418)
omit ef991ad  [Doc] Dubbo's Config Center model corresponding to different 
thirdparty products (#388)
omit f1df26c  Correct word separator to '-' (#417)
omit d5b2314  Fix registry protocol description (#407)
omit 0dc1740  fix Eco System some item url (#413)
omit bb7f4b7  [Doc] update rest.md (#412)
omit 9e420ce  Fix typo for Maturity in menu list(#411)
omit 5bc58d5  Update requirements.md (#406)
omit bb39ed8  fix typos and make some changes on readme (#404)
omit 5bec06c  remove md_json folder
omit 5b2a221  remove build folder
omit 9709cb8  remove genereated htmls from source branch
omit f3b7ed6  Fix dead links and typo (#400)
omit 3ca0682  Website updated
omit 43731b8  Update home.jsx (#394)
omit 8496a46  Avoid global install for docsite (#378)
omit e24be04  modify 2.7.2-release
omit 81f61c0  Fix typo (#397)
omit ae41535  fix wrong word (#396)
omit bb941e7  'fix#389' (#390)
omit bab5988  htmls generated from e03ad801d7ccd3df3e3918ea518390f013ca667f
omit e03ad80  update stub-mock (#385)
omit 72c4883  Add dubbo-erlang user doc (#382)
omit 87f6b8f  fixed service test blog link #379 (#383)
omit c90ef9f  add a committer (#384)
omit cc5a045  nacos registry
omit ff36d3f  Feature nacos registry center (#381)
omit 0dccd17  add nacos registry
omit 9416627  Add Nacos registry center page. (#380)
omit 1a57773  build htmls
omit 07c8518  remove incubator (#377)
omit 9b409db  update README
omit 03be83b  rebuild website
omit 1a3a85c  Blog & Docs translation plan (#375)
omit 627292e  Fix some issues of Blog (#374)
omit bebf6f8  add new page for docker image build (#373)
omit 574428a  new acticle: study dubbo network interfaces seletion (#363)
omit 0d2f3c5  Update README.md (#366)
omit d4e6dd9  fix 404 link (#372)
omit 5fd8a83  [UPDATE] zkclient has remove in 2.7.x(#370)
omit 5e66b18  Remove incubating word
omit b02e30d  fix doc issue, protocolconfig does not support specifying of 
token  (#369)
omit bd0881d  Add title, keywords, descriptions to blogs (#362)
omit 21c544f  Fix typos in architecture.md & xml.md (#364)

This update removed existing revisions from the reference, leaving the
reference pointing at a previous point in the repository history.

 * -- * -- N   refs/heads/ecology-page (b659fa5)
\
 O -- O -- O   (61fb366)

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

No new revisions were added by this update.

Summary of changes:
 .gitignore |7 +-
 PULL_REQUEST_TEMPLATE.md   |4 +-
 README.md  |   15 +-
 blog/en-us/apachecon-na-2018.md|8 +-
 blog/en-us/download.md |   32 +-
 blog/en-us/dubbo-101.md|4 +-
 blog/en-us/dubbo-new-async.md  |6 +-
 blog/en-us/dubbo2-js.md|4 +-
 blog/en-us/gsoc-2018.md|8 +-
 blog/en-us/prepare-an-apache-release.md|   50 +-
 blog/en-us/qcon-beijing-2018.md|7 -
 .../en-us/spring-boot-dubbo-start-stop-analysis.md |   12 +-
 blog/en-us/tracing-with-skywalking.md  |2 +-
 blog/zh-cn/apachecon-na-2018.md|6 -
 blog/zh-cn/build-new-docker-image-in-dockerhub.md  |   58 -
 blog/zh-cn/download.md |   24 +-
 blog/zh-cn/dubbo-27-features.md|2 +-
 blog/zh-cn/dubbo-admin.md  |2 +-
 ...nsource.md => dubbo-contribue-to-opensource.md} |   18 +-
 blog/zh-cn/dubbo-integrate-with-hystrix.md |6 +-
 blog/zh-cn/dubbo-local-call.md |2 +-
 blog/zh-cn/dubbo-meet-arthas.md|6 +-
 blog/zh-cn/dubbo-network-interfaces.md |  526 -
 blog/zh-cn/dubbo-new-async.md

[dubbo-website] branch master updated: fix some issue (#449)

2019-08-16 Thread wangxin

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 62e24b4  fix some issue (#449)
62e24b4 is described below

commit 62e24b4eb148cb82dbd1ad756898ea91918bea7b
Author: Xin Wang 
AuthorDate: Sat Aug 17 12:12:26 2019 +0800

fix some issue (#449)
---
 site_config/ecology.js | 188 ++---
 1 file changed, 4 insertions(+), 184 deletions(-)

diff --git a/site_config/ecology.js b/site_config/ecology.js
index 509bb35..91bae6a 100644
--- a/site_config/ecology.js
+++ b/site_config/ecology.js
@@ -733,7 +733,7 @@ export default {
 ],
   },
   {
-title: 'Circuit braker',
+title: 'Circuit breaker',
 children: [
   {
 name: 'Sentinel',
@@ -745,7 +745,7 @@ export default {
 bgColor: '#835BE3',
   },
   {
-text: 'Circuit braker',
+text: 'Circuit breaker',
 bgColor: '#00D0D9',
   },
 ],
@@ -762,7 +762,7 @@ export default {
 bgColor: '#835BE3',
   },
   {
-text: 'Circuit braker',
+text: 'Circuit breaker',
 bgColor: '#00D0D9',
   },
 ],
@@ -779,7 +779,7 @@ export default {
 bgColor: '#835BE3',
   },
   {
-text: 'Circuit braker',
+text: 'Circuit breaker',
 bgColor: '#00D0D9',
   },
 ],
@@ -854,23 +854,6 @@ export default {
 repository: 'https://github.com/Netflix/zuul',
   },
   {
-name: 'Nacos',
-img: '/img/ecology/nacos.svg',
-desc: 'an easy-to-use dynamic service discovery, configuration 
and service management platform for building cloud native applications.',
-tags: [
-  {
-text: 'Microservice Components',
-bgColor: '#835BE3',
-  },
-  {
-text: 'API Gateway',
-bgColor: '#00D0D9',
-  },
-],
-website: 'https://nacos.io/',
-repository: 'https://github.com/alibaba/nacos',
-  },
-  {
 name: 'Dubbo proxy',
 img: '/img/ecology/dubbo.svg',
 desc: 'Dubbo Proxy, a gateway of Apache Dubbo',
@@ -890,79 +873,6 @@ export default {
 ]
   },
   {
-title: 'Tracing',
-children: [
-  {
-name: 'OpenTracing (TODO)',
-img: '/img/ecology/opentracing.png',
-desc: 'Consistent, expressive, vendor-neutral APIs for 
distributed tracing and context propagation',
-tags: [
-  {
-text: 'Microservice Components',
-bgColor: '#835BE3',
-  },
-  {
-text: 'Tracing',
-bgColor: '#00D0D9',
-  },
-],
-website: 'https://opentracing.io/',
-repository: 'https://github.com/opentracing',
-  },
-  {
-name: 'SkyWalking',
-img: '/img/ecology/sky-walking.svg',
-desc: 'APM, Application Performance Monitoring System',
-tags: [
-  {
-text: 'Registry',
-bgColor: '#835BE3',
-  },
-  {
-text: 'Config',
-bgColor: '#00D0D9',
-  },
-],
-website: 'https://skywalking.apache.org/',
-repository: 'https://github.com/apache/skywalking',
-  },
-  {
-name: 'Zipkin',
-img: '/img/ecology/zipkin.svg',
-desc: 'Zipkin is a distributed tracing system',
-tags: [
-  {
-text: 'Registry',
-bgColor: '#835BE3',
-  },
-  {
-text: 'Config',
-bgColor: '#00D0D9',
-  },
-],
-website: 'https://zipkin.io/',
-repository: 'https://github.com/openzipkin/zipkin',
-  },
-  {
-name: 'Pinpoint',
-img: '/img/ecology/pinpoint.svg',
-desc: 'APM, (Application

[dubbo-website] branch master updated: remove schedulerX (#453)

2019-08-22 Thread wangxin

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 6ff86d9  remove schedulerX (#453)
6ff86d9 is described below

commit 6ff86d94f67daeca51acac5f625b4c477577e5e1
Author: Xin Wang 
AuthorDate: Thu Aug 22 15:45:22 2019 +0800

remove schedulerX (#453)
---
 site_config/ecology.js | 42 ++
 1 file changed, 2 insertions(+), 40 deletions(-)

diff --git a/site_config/ecology.js b/site_config/ecology.js
index 5a857c1..f1dade2 100644
--- a/site_config/ecology.js
+++ b/site_config/ecology.js
@@ -1019,26 +1019,7 @@ export default {
   },
   {
 title: 'Scheduling',
-children: [
-  {
-name: 'SchedulerX',
-img: '/img/ecology/java.png',
-hiddenImg: true,
-desc: 'A distributed task scheduling componenent',
-tags: [
-  {
-text: 'Microservice Components',
-bgColor: '#835BE3',
-  },
-  {
-text: 'Scheduling',
-bgColor: '#00D0D9',
-  },
-],
-website: 'https://www.aliyun.com/aliware/schedulerx',
-repository: 'https://www.aliyun.com/aliware/schedulerx',
-  },
-],
+children: [],
   },
 ],
   },
@@ -2483,26 +2464,7 @@ export default {
   },
   {
 title: '调度',
-children: [
-  {
-name: 'SchedulerX',
-img: '/img/ecology/java.png',
-hiddenImg: true,
-desc: '分布式调度系统',
-tags: [
-  {
-text: '微服务组件',
-bgColor: '#835BE3',
-  },
-  {
-text: '调度',
-bgColor: '#00D0D9',
-  },
-],
-website: 'https://www.aliyun.com/aliware/schedulerx',
-repository: 'https://www.aliyun.com/aliware/schedulerx',
-  },
-],
+children: [],
   },
 ],
   },

[dubbo-website] branch master updated: add travis support (#468)

2019-09-01 Thread wangxin

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 86373db  add travis support (#468)
86373db is described below

commit 86373db0df905fae594bc9853e5dc12b359850a3
Author: Huang YunKun 
AuthorDate: Mon Sep 2 06:39:43 2019 +0800

add travis support (#468)
---
 .travis.yml | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000..19329cf
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,10 @@
+language: node_js
+
+node_js:
+  - 8
+
+install:
+  - npm install
+
+script:
+  - npm run build
\ No newline at end of file

[dubbo-website] branch master updated: fix typos (#455)

2019-08-23 Thread wangxin

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 4047b26  fix typos (#455)
4047b26 is described below

commit 4047b264984b97c1c86332b1f1965df3ea1a001f
Author: Junjian Peng 
AuthorDate: Fri Aug 23 18:07:35 2019 +0800

fix typos (#455)
---
 docs/zh-cn/dev/impls/config-center.md | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/docs/zh-cn/dev/impls/config-center.md 
b/docs/zh-cn/dev/impls/config-center.md
index 430d891..ac1d658 100644
--- a/docs/zh-cn/dev/impls/config-center.md
+++ b/docs/zh-cn/dev/impls/config-center.md
@@ -9,7 +9,7 @@
 - 存储单个配置项，如各种开关项、常量值等。
 - 存储服务治理规则，此时key通常按照"服务名+规则类型"的格式来组织，而value则为具体的治理规则。
 
-为了进一步实现对key-value的分组管理，Dubbo的配置中心还加入了namespace、group的概念，这些概念在很多专业的第三方配置中心中都有体现，通常情况下，namespace用来隔离不同的租户，group用来对统一租户的key集合做分组。
+为了进一步实现对key-value的分组管理，Dubbo的配置中心还加入了namespace、group的概念，这些概念在很多专业的第三方配置中心中都有体现，通常情况下，namespace用来隔离不同的租户，group用来对同一租户的key集合做分组。
 
 
当前，Dubbo配置中心实现了对Zookeeper、Nacos、Etcd、Consul、Apollo的对接，接下来我们具体看一下Dubbo抽象的配置中心是怎么映射到具体的第三方实现中的。
 
@@ -42,7 +42,7 @@ namespace, group, key等分别对应不同层级的ZNode节点，而value则作

上图展示了两个不同作用域的dubbo.properties文件在zookeeper中的存储结构：
- 命名空间namespace都为：dubbo
-   - 分组group：全局级别为dubbo，所有应用共享；应用级别为应用名demo-provider，只对改应用生效
+   - 分组group：全局级别为dubbo，所有应用共享；应用级别为应用名demo-provider，只对该应用生效
- key：dubbo.properties

 2. 单个配置项
@@ -52,7 +52,8 @@ namespace, group, key等分别对应不同层级的ZNode节点，而value则作
设置优雅停机事件为15000：
- 命名空间namespace：dubbo
- 分组group：dubbo
-   - key：dubbo.service.shutdown.wait=15000
+   - key：dubbo.service.shutdown.wait
+   - value：15000
  
 3. 服务治理规则

[dubbo] branch master updated: Security issue: upgrade fastjson version to 1.2.60 (#5018)

2019-09-05 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new 087e8cc  Security issue: upgrade fastjson version to 1.2.60 (#5018)
087e8cc is described below

commit 087e8ccc9d8ad219849adb0337c53a60e8565198
Author: Xin Wang 
AuthorDate: Fri Sep 6 12:11:03 2019 +0800

Security issue: upgrade fastjson version to 1.2.60 (#5018)
---
 dubbo-dependencies-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 168678d..57eb4be 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -97,7 +97,7 @@
 2.1.4
 4.5.3
 4.4.6
-1.2.58
+1.2.60
 3.4.13
 4.0.1
 2.12.0

[dubbo] branch 2.6.x updated: upgrade fastjson to 1.2.60 (#5038)

2019-09-09 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a commit to branch 2.6.x
in repository https://gitbox.apache.org/repos/asf/dubbo.git


The following commit(s) were added to refs/heads/2.6.x by this push:
 new 5d6baa5  upgrade fastjson to 1.2.60 (#5038)
5d6baa5 is described below

commit 5d6baa548997bb2eb98169d160c5d94e61b3cf85
Author: 祁晓波 
AuthorDate: Mon Sep 9 20:35:31 2019 +0800

upgrade fastjson to 1.2.60 (#5038)
---
 dependencies-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dependencies-bom/pom.xml b/dependencies-bom/pom.xml
index 141ac5b..bc3476d 100644
--- a/dependencies-bom/pom.xml
+++ b/dependencies-bom/pom.xml
@@ -94,7 +94,7 @@
 1.1.7
 2.1.4
 4.5.3
-1.2.58
+1.2.60
 3.4.9
 0.2
 2.12.0

[dubbo-spring-boot-project] branch master updated: Update .travis.yml

2019-07-30 Thread wangxin

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-spring-boot-project.git


The following commit(s) were added to refs/heads/master by this push:
 new 6332c98  Update .travis.yml
6332c98 is described below

commit 6332c98b1787cc3376afdd9ce5a000164b677c9d
Author: Xin Wang 
AuthorDate: Tue Jul 30 16:24:05 2019 +0800

Update .travis.yml
---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 041395b..af79f19 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,9 +3,9 @@ sudo: false # faster builds
 
 jdk:
 - openjdk11
-- oraclejdk8
+- openjdk8
 
 script: "mvn clean package"
 
 after_success:
-  - bash <(curl -s https://codecov.io/bash)
\ No newline at end of file
+  - bash <(curl -s https://codecov.io/bash)

[dubbo-spring-boot-project] branch master updated: Update pom.xml (#536)

2019-07-30 Thread wangxin

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-spring-boot-project.git


The following commit(s) were added to refs/heads/master by this push:
 new c585d2d  Update pom.xml (#536)
c585d2d is described below

commit c585d2df619c26da29e6a29f9ae7c27576c593b0
Author: weichengzhaoyu2012 
<38155753+weichengzhaoyu2...@users.noreply.github.com>
AuthorDate: Wed Jul 31 11:13:56 2019 +0800

Update pom.xml (#536)
---
 dubbo-spring-boot-parent/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml
index adf51e9..905d89c 100644
--- a/dubbo-spring-boot-parent/pom.xml
+++ b/dubbo-spring-boot-parent/pom.xml
@@ -67,7 +67,7 @@
 import
 
 
-
+
 
 org.apache.dubbo
 dubbo-dependencies-bom

[dubbo-spring-boot-project] branch master updated: Update README.md

2019-08-09 Thread wangxin

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-spring-boot-project.git


The following commit(s) were added to refs/heads/master by this push:
 new 28e73a8  Update README.md
28e73a8 is described below

commit 28e73a892dd15dbbab12645cd33ae292233f0bd5
Author: Xin Wang 
AuthorDate: Sat Aug 10 09:41:40 2019 +0800

Update README.md
---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 7930db2..6796a55 100644
--- a/README.md
+++ b/README.md
@@ -5,9 +5,6 @@
 
![license](https://img.shields.io/github/license/apache/dubbo-spring-boot-project.svg)
 
 [Apache Dubbo](https://github.com/apache/dubbo) Spring Boot Project makes it 
easy to create [Spring Boot](https://github.com/spring-projects/spring-boot/) 
application using Dubbo as RPC Framework. What's more, it also provides 
-[![codecov](https://codecov.io/gh/apache/dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/ubbo-spring-boot-project)
-![license](https://img.shields.io/github/license/apache/dubbo-spring-boot-project.svg)
-
 
 * [auto-configure features](dubbo-spring-boot-autoconfigure) (e.g., 
annotation-driven, auto configuration, externalized configuration).
 * [production-ready features](dubbo-spring-boot-actuator) (e.g., security, 
health checks, externalized configuration).

[dubbo-proxy] branch master updated: update dubbo version

2019-07-24 Thread wangxin

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-proxy.git


The following commit(s) were added to refs/heads/master by this push:
 new 31cbc85  update dubbo  version
 new 6072531  Merge pull request #8 from qixiaobo/update-dubbo-version
31cbc85 is described below

commit 31cbc85c41ba123b091fc7ad77e1ab4dc73c1428
Author: qixiaobo 
AuthorDate: Wed Jul 24 19:27:17 2019 +0800

update dubbo  version
---
 pom.xml  | 2 +-
 src/main/java/org/apache/dubbo/proxy/Config.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7169ce4..e5a9933 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
1.7.26
1.2.17
2.12.0
-   2.7.1
+   2.7.3

 

diff --git a/src/main/java/org/apache/dubbo/proxy/Config.java 
b/src/main/java/org/apache/dubbo/proxy/Config.java
index b25c949..46bd136 100644
--- a/src/main/java/org/apache/dubbo/proxy/Config.java
+++ b/src/main/java/org/apache/dubbo/proxy/Config.java
@@ -50,7 +50,7 @@ public class Config {
 Registry getRegistry() {
 URL url = URL.valueOf(registryAddress);
 if (StringUtils.isNotEmpty(group)) {
-url = 
url.addParameter(org.apache.dubbo.common.Constants.GROUP_KEY, group);
+url = 
url.addParameter(org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY, 
group);
 }
 RegistryFactory registryFactory = 
ExtensionLoader.getExtensionLoader(RegistryFactory.class).getAdaptiveExtension();
 Registry registry = registryFactory.getRegistry(url);

[dubbo] branch master updated: Fixes a bug in gson's deserialization feature (#5099)

2019-09-23 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new 600f0db  Fixes a bug in gson's deserialization feature (#5099)
600f0db is described below

commit 600f0db5fa3516fcee5e9b70e4bf100e49741840
Author: 张志勇 
AuthorDate: Tue Sep 24 08:32:29 2019 +0800

Fixes a bug in gson's deserialization feature (#5099)
---
 .../java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java   | 2 +-
 .../org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
index 9515a1b..0b53dc5 100644
--- 
a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
+++ 
b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java
@@ -141,7 +141,7 @@ public class DecodeableRpcResult extends AppResponse 
implements Codec, Decodeabl
 
 private void handleException(ObjectInput in) throws IOException {
 try {
-Object obj = in.readObject();
+Object obj = in.readObject(Throwable.class);
 if (!(obj instanceof Throwable)) {
 throw new IOException("Response data error, expect Throwable, 
but get " + obj);
 }
diff --git 
a/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
 
b/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
index 056d719..239841a 100644
--- 
a/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
+++ 
b/dubbo-serialization/dubbo-serialization-gson/src/main/java/org/apache/dubbo/common/serialize/gson/GsonJsonObjectInput.java
@@ -90,7 +90,7 @@ public class GsonJsonObjectInput implements ObjectInput {
 @Override
 public Object readObject() throws IOException, ClassNotFoundException {
 String json = readLine();
-return gson.fromJson(json, String.class);
+return gson.fromJson(json, Object.class);
 }
 
 @Override

[dubbo-website] branch master updated: Fix URL to other documents (#507)

2019-10-31 Thread wangxin

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-php-framework] 24/31: update

2019-12-11 Thread wangxin

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-php-framework.git

commit c418f0b24a16868083cd71c1d25351ea13a413aa
Author: wangjinxi 
AuthorDate: Wed Jul 17 10:17:08 2019 +0800

update
---
 common/file/FSOFRedis.php | 10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/common/file/FSOFRedis.php b/common/file/FSOFRedis.php
index 914e0a9..42a162b 100644
--- a/common/file/FSOFRedis.php
+++ b/common/file/FSOFRedis.php
@@ -169,7 +169,15 @@ class FSOFRedis
 {
 if (!empty($key) && isset($this->m_redis))
 {
-return $this->getlRange($key);
+try{
+return $this->getlRange($key);
+}catch (\Exception $e){
+$this->logger->warn('redis current connect excepiton'.' 
|errcode:'.$e->getCode().' |errmsg:'.$e->getMessage());
+$this->close();
+//重试一次防止连接成功后，连接断开
+$this->get_redis();
+return $this->getlRange($key);
+}
 }
 else
 {

[dubbo-php-framework] 23/31: update

2019-12-11 Thread wangxin

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-php-framework.git

commit d8e174b75b897ba211856cbe172acab8f8c8756f
Author: wangjinxi 
AuthorDate: Tue Jul 16 13:37:23 2019 +0800

update
---
 composer.json   | 3 ++-
 consumer/fsof/FSOFProcessor.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index ef301f0..dff3f4e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,6 @@
 {
 "require": {
-"apache/log4php": "^2.3"
+"apache/log4php": "^2.3",
+"crazyxman/hessian-parser": "dev-master"
 }
 }
diff --git a/consumer/fsof/FSOFProcessor.php b/consumer/fsof/FSOFProcessor.php
index 642..e3ec2f2 100644
--- a/consumer/fsof/FSOFProcessor.php
+++ b/consumer/fsof/FSOFProcessor.php
@@ -320,7 +320,7 @@ class FSOFProcessor
 }
 $_data .= $tmp_data;
 $resv_len -= strlen($tmp_data);
-} while (($resv_len > 0) && ( (microtime(true) - $start_time) > 
$this->iotimeout)); //读取数据不能超过设置的io时长
+} while (($resv_len > 0) && ( (microtime(true) - $start_time) < 
$this->iotimeout)); //读取数据不能超过设置的io时长
 
 if ($resv_len > 0)
 {

[dubbo-php-framework] 25/31: update

2019-12-11 Thread wangxin

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-php-framework.git

commit 4f59f46d29f67d6400bcd2f2abd139d5cb2975bb
Author: wangjinxi 
AuthorDate: Wed Jul 17 13:36:45 2019 +0800

update
---
 common/protocol/fsof/DubboParser.php | 11 ++-
 consumer/Type.php| 32 +++-
 2 files changed, 37 insertions(+), 6 deletions(-)

diff --git a/common/protocol/fsof/DubboParser.php 
b/common/protocol/fsof/DubboParser.php
index b812fae..921e912 100644
--- a/common/protocol/fsof/DubboParser.php
+++ b/common/protocol/fsof/DubboParser.php
@@ -4,6 +4,7 @@ namespace com\fenqile\fsof\common\protocol\fsof;
 use com\fenqile\fsof\consumer\Type;
 use Icecave\Flax\Serialization\Encoder;
 use Icecave\Flax\DubboParser as Decoder;
+use com\fenqile\fsof\consumer\ConsumerException;
 
 /**
  *
@@ -185,10 +186,10 @@ class DubboParser
 } else if (self::DUBBO_PROTOCOL_SERIALIZE_HESSIAN2 == 
$response->getSerialization()) {
 $this->parseResponseBodyForHessian2($response);
 } else {
-throw new \Exception(sprintf('返回的序列化类型:(%s), 不支持解析!', 
$response->getSerialization()));
+throw new ConsumerException(sprintf('返回的序列化类型:(%s), 不支持解析!', 
$response->getSerialization()));
 }
 } else {
-throw new \Exception($response->getFullData());
+throw new ConsumerException($response->getFullData());
 }
 return $response;
 }
@@ -210,11 +211,11 @@ class DubboParser
 case self::RESPONSE_WITH_EXCEPTION:
 $exception = json_decode($content, true);
 if (is_array($exception) && array_key_exists('message', 
$exception)) {
-throw new \Exception($exception['message']);
+throw new ConsumerException($exception['message']);
 } else if (is_string($exception)) {
-throw new \Exception($exception);
+throw new ConsumerException($exception);
 } else {
-throw new \Exception("provider occur error");
+throw new ConsumerException("provider occur error");
 }
 break;
 default:
diff --git a/consumer/Type.php b/consumer/Type.php
index 3000d5b..673d507 100644
--- a/consumer/Type.php
+++ b/consumer/Type.php
@@ -13,6 +13,8 @@ class Type
 const STRING = 6;
 const BOOL = 7;
 const BOOLEAN = 7;
+const ARRAYLIST = 8;
+const MAP = 9;
 
 const adapter = [
 Type::SHORT => 'S',
@@ -21,7 +23,9 @@ class Type
 Type::FLOAT => 'F',
 Type::DOUBLE => 'D',
 Type::BOOLEAN => 'Z',
-Type::STRING => 'Ljava/lang/String;'
+Type::STRING => 'Ljava/lang/String;',
+Type::ARRAYLIST => 'Ljava/util/ArrayList;',
+Type::MAP => 'Ljava/util/Map;'
 ];
 
 public function __construct($type, $value)
@@ -130,6 +134,28 @@ class Type
 }
 
 /**
+ * Arraylist type
+ *
+ * @param  arraylist $value
+ * @return Type
+ */
+public static function arrayList($value)
+{
+return new self(self::ARRAYLIST, $value);
+}
+
+/**
+ * Map type
+ *
+ * @param  map $value
+ * @return Type
+ */
+public static function map($value)
+{
+return new self(self::MAP, $value);
+}
+
+/**
  * Object type
  *
  * @param  integer $value
@@ -176,6 +202,10 @@ class Type
 case Type::BOOLEAN:
 $value = (bool)$type->value;
 break;
+case Type::ARRAYLIST:
+case Type::MAP:
+$value = (array)$type->value;
+break;
 case Type::STRING:
 default:
 $value = (string)$type->value;

[dubbo-php-framework] 27/31: update

2019-12-11 Thread wangxin

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-php-framework.git

commit 9f5b5eb8804e27940fdac1cf4aabf0d968a0dcd8
Author: wangjinxi 
AuthorDate: Wed Jul 24 16:43:37 2019 +0800

update
---
 common/protocol/fsof/DubboRequest.php | 12 +---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/common/protocol/fsof/DubboRequest.php 
b/common/protocol/fsof/DubboRequest.php
index 8ec2c8e..2d64f8c 100644
--- a/common/protocol/fsof/DubboRequest.php
+++ b/common/protocol/fsof/DubboRequest.php
@@ -15,6 +15,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+
 namespace com\fenqile\fsof\common\protocol\fsof;
 
 use com\fenqile\fsof\consumer\Type;
@@ -267,9 +268,14 @@ class DubboRequest
 public function setParams($params)
 {
 $this->params = $params;
-foreach ($this->params as &$val) {
-if ($val instanceof Type) {
-$val = $val->object;
+foreach ($this->params as &$value) {
+if ($value instanceof Type) {
+$value = $value->object;
+} elseif (is_object($value)) {
+$value = new \stdClass();
+foreach ($value as $property => $val) {
+$value->$property = $val;
+}
 }
 }
 }

[dubbo-php-framework] 18/31: update

2019-12-11 Thread wangxin

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-php-framework.git

commit 07c8555cdc4e7b06d7047bfe370d70c533bd3ff8
Author: wangjinxi 
AuthorDate: Thu Jun 20 16:03:33 2019 +0800

update
---
 common/protocol/fsof/DubboParser.php | 79 ++--
 1 file changed, 49 insertions(+), 30 deletions(-)

diff --git a/common/protocol/fsof/DubboParser.php 
b/common/protocol/fsof/DubboParser.php
index f820851..7dbba4f 100644
--- a/common/protocol/fsof/DubboParser.php
+++ b/common/protocol/fsof/DubboParser.php
@@ -191,45 +191,64 @@ class DubboParser
 
 public function parseResponseBody(DubboResponse $response)
 {
-$_data = substr($response->getFullData(), self::PACKAGE_HEDA_LEN);
-$response->setResponseBody($_data);
 if (DubboResponse::OK == $response->getStatus()) {
 if (self::DUBBO_PROTOCOL_SERIALIZE_FAST_JSON == 
$response->getSerialization()) {
-list($status, $content) = explode(PHP_EOL, $_data);
-switch ($status) {
-case self::RESPONSE_NULL_VALUE:
-break;
-case self::RESPONSE_VALUE:
-$response->setResult(json_decode($content, true));
-break;
-case self::RESPONSE_WITH_EXCEPTION:
-$exception = json_decode($content, true);
-if (is_array($exception) && 
array_key_exists('message', $exception)) {
-throw new \Exception($exception['message']);
-} else if (is_string($exception)) {
-throw new \Exception($exception);
-} else {
-throw new \Exception("provider occur error");
-}
-break;
-default:
-return false;
-}
+$this->parseResponseBodyForFastjson($response);
 } else if (self::DUBBO_PROTOCOL_SERIALIZE_HESSIAN2 == 
$response->getSerialization()) {
-$_data = substr($_data, 1);
-$hess_stream = new \HessianStream($_data);
-$hess_options = new \HessianOptions();
-$hess_factory = new \HessianFactory();
-$parser = $hess_factory->getParser($hess_stream, 
$hess_options);
-$content = $parser->parseReply();
-$response->setResult($content);
+$this->parseResponseBodyForHessian2($response);
+} else {
+throw new \Exception(sprintf('返回的序列化类型:(%s), 不支持解析!', 
$response->getSerialization()));
 }
 } else {
-throw new \Exception($_data);
+throw new \Exception($response->getFullData());
+}
+return $response;
+}
+
+private function parseResponseBodyForFastjson(DubboResponse $response)
+{
+$_data = substr($response->getFullData(), self::PACKAGE_HEDA_LEN);
+$response->setResponseBody($_data);
+list($status, $content) = explode(PHP_EOL, $_data);
+if ($response->isHeartbeatEvent()) {
+$response->setResult(json_decode($status, true));
+} else {
+switch ($status) {
+case self::RESPONSE_NULL_VALUE:
+break;
+case self::RESPONSE_VALUE:
+$response->setResult(json_decode($content, true));
+break;
+case self::RESPONSE_WITH_EXCEPTION:
+$exception = json_decode($content, true);
+if (is_array($exception) && array_key_exists('message', 
$exception)) {
+throw new \Exception($exception['message']);
+} else if (is_string($exception)) {
+throw new \Exception($exception);
+} else {
+throw new \Exception("provider occur error");
+}
+break;
+default:
+return false;
+}
 }
 return $response;
 }
 
+private function parseResponseBodyForHessian2(DubboResponse $response)
+{
+$_data = substr($response->getFullData(), self::PACKAGE_HEDA_LEN + 1);
+$response->setResponseBody($_data);
+$hess_stream = new \HessianStream($_data);
+$hess_options = new \HessianOptions();
+$hess_factory = new \HessianFactory();
+$parser = $hess_factory->getParser($hess_stream, $hess_options);
+$content = $parser->parseReply();
+$response->setResult($content);
+return $response;
+}
+
 
 public function parseRequestHeader(DubboRequest &$request)
 {

[dubbo-php-framework] 30/31: Update README.md

2019-12-11 Thread wangxin

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-php-framework.git

commit 9f827c46c91d0794a8200f60f0a1ded821bdc626
Author: Jinxi Wang <1054636...@qq.com>
AuthorDate: Tue Aug 27 13:46:19 2019 +0800

Update README.md
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 83d4a33..02b7f20 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 ## php framework for apache dubbo
 
 
-php-for-apache-dubbo is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson and hessian 
for Serialization.
+dubbo-php-framework is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson and hessian 
for Serialization.
 
 ![image](https://github.com/apache/dubbo-php-framework/blob/master/arch.png)

[dubbo-php-framework] 28/31: Merge pull request #22 from crazyxman/dev

2019-12-11 Thread wangxin

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-php-framework.git

commit 45b1c225d5931dedc4ad3176d2b332abf1d138e1
Merge: 17d9666 9f5b5eb
Author: Huxing Zhang 
AuthorDate: Mon Jul 29 16:02:25 2019 +0800

Merge pull request #22 from crazyxman/dev

新增hessian序列化及其他功能，功能点已列到评论处

 agent/src/c/Makefile  |   2 +-
 agent/src/c/release/agent | Bin 0 -> 476132 bytes
 agent/src/c/release/agent_server  | Bin 0 -> 476132 bytes
 common/config/FSOFConstants.php   |   9 +-
 common/file/FSOFRedis.php | 128 +++--
 common/protocol/fsof/DubboParser.php  | 257 +-
 common/protocol/fsof/DubboRequest.php |  18 ++-
 common/url/FSOFUrl.php|  26 
 composer.json |   3 +-
 consumer/ConsumerException.php|  16 +++
 consumer/Type.php | 112 +++
 consumer/fsof/FSOFProcessor.php   |  52 +++
 consumer/proxy/Proxy.php  |  16 +--
 consumer/proxy/ProxyFactory.php   |  18 ++-
 registry/automatic/ConsumerProxy.php  |  10 +-
 15 files changed, 483 insertions(+), 184 deletions(-)

[dubbo-php-framework] 26/31: add Automatic identification of parameter types

2019-12-11 Thread wangxin

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-php-framework.git

commit 56045c060c25faf206de0be47ed1ae57b970c7f2
Author: wangjinxi 
AuthorDate: Wed Jul 24 16:26:50 2019 +0800

add Automatic identification of parameter types
---
 common/protocol/fsof/DubboParser.php  |   4 +-
 common/protocol/fsof/DubboRequest.php |  12 +-
 consumer/Type.php | 228 +-
 consumer/proxy/Proxy.php  |  13 +-
 4 files changed, 75 insertions(+), 182 deletions(-)

diff --git a/common/protocol/fsof/DubboParser.php 
b/common/protocol/fsof/DubboParser.php
index 921e912..0497f5f 100644
--- a/common/protocol/fsof/DubboParser.php
+++ b/common/protocol/fsof/DubboParser.php
@@ -106,7 +106,7 @@ class DubboParser
 }
 $reqData .= json_encode($request->getMethod()) . PHP_EOL;
 $reqData .= json_encode($this->typeRefs($request)) . PHP_EOL;
-foreach (Type::getDataForSafed($request->getParams()) as $value) {
+foreach ($request->getParams() as $value) {
 $reqData .= json_encode($value) . PHP_EOL;
 }
 $attach = array();
@@ -138,7 +138,7 @@ class DubboParser
 }
 $reqData .= $encode->encode($request->getMethod());
 $reqData .= $encode->encode($this->typeRefs($request));
-foreach (Type::getDataForSafed($request->getParams()) as $value) {
+foreach ($request->getParams() as $value) {
 $reqData .= $encode->encode($value);
 }
 $attach = ['path' => $request->getService(), 'interface' => 
$request->getService(), 'timeout' => $request->getTimeout()];
diff --git a/common/protocol/fsof/DubboRequest.php 
b/common/protocol/fsof/DubboRequest.php
index cb30cb7..8ec2c8e 100644
--- a/common/protocol/fsof/DubboRequest.php
+++ b/common/protocol/fsof/DubboRequest.php
@@ -17,6 +17,8 @@
  */
 namespace com\fenqile\fsof\common\protocol\fsof;
 
+use com\fenqile\fsof\consumer\Type;
+
 class DubboRequest
 {
 //包头字段
@@ -89,7 +91,6 @@ class DubboRequest
 }
 
 
-
 /**
  * @return boolean
  */
@@ -107,8 +108,6 @@ class DubboRequest
 }
 
 
-
-
 /**
  * @return mixed
  */
@@ -142,7 +141,6 @@ class DubboRequest
 }
 
 
-
 /**
  * @return mixed
  */
@@ -269,6 +267,11 @@ class DubboRequest
 public function setParams($params)
 {
 $this->params = $params;
+foreach ($this->params as &$val) {
+if ($val instanceof Type) {
+$val = $val->object;
+}
+}
 }
 
 /**
@@ -320,7 +323,6 @@ class DubboRequest
 }
 
 
-
 //用于监控service中各方法的性能
 public $startTime;//开始处理请求的时间
 public $endTime;//请求处理结束的时间
diff --git a/consumer/Type.php b/consumer/Type.php
index 673d507..20c8123 100644
--- a/consumer/Type.php
+++ b/consumer/Type.php
@@ -2,8 +2,12 @@
 
 namespace com\fenqile\fsof\consumer;
 
+use com\fenqile\fsof\consumer\ConsumerException;
+use Icecave\Collections\Collection;
+
 class Type
 {
+/*
 const SHORT = 1;
 const INT = 2;
 const INTEGER = 2;
@@ -13,10 +17,13 @@ class Type
 const STRING = 6;
 const BOOL = 7;
 const BOOLEAN = 7;
-const ARRAYLIST = 8;
-const MAP = 9;
+const MAP = 8;
+*/
+const ARRAYLIST = 9;
+const DEFAULT_TYPE = 10;
 
 const adapter = [
+/*
 Type::SHORT => 'S',
 Type::INT => 'I',
 Type::LONG => 'J',
@@ -24,193 +31,82 @@ class Type
 Type::DOUBLE => 'D',
 Type::BOOLEAN => 'Z',
 Type::STRING => 'Ljava/lang/String;',
+Type::MAP => 'Ljava/util/Map;',
+*/
 Type::ARRAYLIST => 'Ljava/util/ArrayList;',
-Type::MAP => 'Ljava/util/Map;'
+Type::DEFAULT_TYPE => 'Ljava/lang/Object;'
 ];
 
-public function __construct($type, $value)
-{
-$this->type = $type;
-$this->value = $value;
-}
-
-/**
- * Short type
- *
- * @param  integer $value
- * @return Type
- */
-public static function short($value)
-{
-return new self(self::SHORT, $value);
-}
-
-/**
- * Int type
- *
- * @param  integer $value
- * @return Type
- */
-public static function int($value)
-{
-return new self(self::INT, $value);
-}
-
-/**
- * Integer type
- *
- * @param  integer $value
- * @return Type
- */
-public static function integer($value)
-{
-return new self(self::INTEGER, $value);
-}
-
-/**
- * Long type
- *
- * @param  integer $value
- * @return Type
- */
-public static function long($value)
-{
-return new self(self::LONG, $value);
-}
-
-/**
- * Float type
- *
- * @param  integer $

[dubbo-php-framework] 29/31: Update README.md

2019-12-11 Thread wangxin

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-php-framework.git

commit 2ddfc965f947c287d01ce781e995b826ecc76562
Author: Jinxi Wang <1054636...@qq.com>
AuthorDate: Tue Aug 27 13:43:33 2019 +0800

Update README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index aa4361b..83d4a33 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 ## php framework for apache dubbo
 
 
-php-for-apache-dubbo is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson for 
Serialization.
+php-for-apache-dubbo is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson and hessian 
for Serialization.
 
-![image](https://github.com/lexin-fintech/dubbo-php-framework/blob/master/arch.png)
+![image](https://github.com/apache/dubbo-php-framework/blob/master/arch.png)
 
 ## Introduction
 - php provider runs in multiple processes. The 
worker process is used to process specific business, the manager process 
controls the lifecycle of the worker process, and the master process processes 
the network IO.

[dubbo-php-framework] 31/31: Merge pull request #24 from crazyxman/master

2019-12-11 Thread wangxin

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-php-framework.git

commit f4686225a92b921848ead62cc89ed85a565bbf00
Merge: 45b1c22 9f827c4
Author: Xin Wang 
AuthorDate: Wed Dec 11 22:39:04 2019 +0800

Merge pull request #24 from crazyxman/master

Update README.md

 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[dubbo-php-framework] 08/31: Merge pull request #4 from comdeng/patch-1

2019-12-11 Thread wangxin

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-php-framework.git

commit b50e99707187383501c7d21b90b8f2192ddf327d
Merge: fbff595 481c096
Author: lexinfintech <39553873+lexin-a...@users.noreply.github.com>
AuthorDate: Wed Jul 18 16:20:31 2018 +0800

Merge pull request #4 from comdeng/patch-1

correct wrong word

 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[dubbo-php-framework] 07/31: correct wrong word

2019-12-11 Thread wangxin

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-php-framework.git

commit 481c09667ceda00be4498cbefc330b2abc05dbb6
Author: comdeng 
AuthorDate: Thu Jul 12 16:51:03 2018 +0800

correct wrong word
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 7e0c38e..e5e4308 100644
--- a/README.md
+++ b/README.md
@@ -6,8 +6,8 @@ dubbo-php-framework是一个用于php语言的RPC通讯框架，与dubbo在协
 ## 说明
 * php 
provider以多进程方式运行，其中worker进程用于处理具体业务，manager进程控制worker进程的生命周期，master进程处理网络IO.
 * agent监听registry中provider地址信息的变更并同步到本地redis，供本机上所有php consumer共享.
-* php consumer、redis、angent三者部署在所有consumer机器上，并且彼此以unix socket通信.
+* php consumer、redis、agent三者部署在所有consumer机器上，并且彼此以unix socket通信.
 * provider_admin部署在所有provider机器上，用于控制该机器上所有php provider的生命周期.
 
 
-[Quick 
start](https://github.com/lexin-fintech/dubbo-php-framework/wiki/Quick-Start)
\ No newline at end of file
+[Quick 
start](https://github.com/lexin-fintech/dubbo-php-framework/wiki/Quick-Start)

[dubbo-php-framework] 04/31: Fix

2019-12-11 Thread wangxin

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-php-framework.git

commit 30c9b5ef3f4a1273deaf483dfc10f7ff43a74607
Author: pengmingming 
AuthorDate: Thu Jul 5 15:17:54 2018 +0800

Fix
---
 bin/app_admin.php | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/bin/app_admin.php b/bin/app_admin.php
index 13e6dc2..131ca6b 100644
--- a/bin/app_admin.php
+++ b/bin/app_admin.php
@@ -92,11 +92,14 @@ else
 echo "app_admin.php $cmd".PHP_EOL;
 }
 
-$config = FSOFConfigManager::getProviderAppDeploy($name);
-if(isset($config['server']['log_cfg_file_path']) && 
!empty($config['server']['log_cfg_file_path']))
+if (!empty($name))
 {
-\Logger::configure($config['server']['log_cfg_file_path']);
-date_default_timezone_set('PRC');
+   $config = FSOFConfigManager::getProviderAppDeploy($name);
+   if(isset($config['server']['log_cfg_file_path']) && 
!empty($config['server']['log_cfg_file_path']))
+   {
+   \Logger::configure($config['server']['log_cfg_file_path']);
+   date_default_timezone_set('PRC');
+   }
 }
 
 //执行所有的控制命令

[dubbo-php-framework] 06/31: Merge pull request #1 from kilmas/mytest

2019-12-11 Thread wangxin

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-php-framework.git

commit fbff59558ae2926302b291e3df2f62a8980c14e6
Merge: 7fa8f97 07fae4a
Author: lexinfintech <39553873+lexin-a...@users.noreply.github.com>
AuthorDate: Thu Jul 5 15:31:00 2018 +0800

Merge pull request #1 from kilmas/mytest

add composer.json and apache/log4php replace log4php/Logger.php

 bin/app_admin.php  |  6 +-
 composer.json  |  5 +
 provider/shell/StartUp.php | 10 --
 3 files changed, 18 insertions(+), 3 deletions(-)

[dubbo-php-framework] 10/31: Update README.md

2019-12-11 Thread wangxin

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-php-framework.git

commit 3453a128cdbd8b3e1852b26fe0aa51d0cdf7063c
Author: Heluwe 
AuthorDate: Tue Aug 28 12:04:30 2018 +0800

Update README.md
---
 README.md | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/README.md b/README.md
index 4d04984..07977e3 100644
--- a/README.md
+++ b/README.md
@@ -12,12 +12,5 @@
 - provider_admin is deployed on all provider 
machines to control the lifecycle of all php providers on that machine.
 
 http://www.w3school.com.cn;>Quick start
-a {text-decoration:none}
-
-
-
-[img1]:data:image/png;base64,iVBORw0KGgoNSUhEUgAAA/8AAAGCCAYAAAC2IXNgAXNSR0IArs4c6QRnQU1BAACxjwv8YQUJcEhZcwAAEnQAABJ0Ad5mH3gAAMuRSURBVHhe7N0FnBxF2gbwN+uSlWyy2bi7hwgxJIHgfriGww9L4MPd4eAIcOihweHww0MSiJAQhbi7bzZZybp9/dR0zdbM9szOblZnn39+lelp756e2X6rqqualFqEiIiIiIiIiIJWiP1KREREREREREGKwT8RERERERFRkGPwT0RERERERBTkGPwTERERERERBTkG/0RERERERERBjsE/ERERERERUZBj8E9EREREREQU5Bj8ExEREREREQU5Bv9EREREREREQY7BPxEREREREVGQY/BPREREREREFOQY/BMREREREREFOQb/REREREREREGOwT8RERERERFRkGPwT0RERER
 [...]
-
-
-
 
+![image](https://github.com/lexin-fintech/dubbo-php-framework/blob/master/arch.png)

[dubbo-php-framework] 22/31: update

2019-12-11 Thread wangxin

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-php-framework.git

commit af3df5c02176b4c598ea55b147b2f7e27af60cd8
Author: wangjinxi 
AuthorDate: Thu Jul 4 18:26:45 2019 +0800

update
---
 common/file/FSOFRedis.php  | 64 ++
 common/protocol/fsof/DubboParser.php   | 52 ++
 common/url/FSOFUrl.php |  2 +
 config/global/conf/fsof.ini| 10 ++--
 consumer/ConsumerException.php | 16 ++
 consumer/Type.php  | 38 -
 consumer/fsof/FSOFProcessor.php| 47 
 consumer/proxy/Proxy.php   |  5 +-
 consumer/proxy/ProxyFactory.php|  4 +-
 demo/demo-consumer/config/log4php.xml  |  6 +-
 demo/demo-consumer/consumer/demo-consumer.consumer | 10 +---
 11 files changed, 143 insertions(+), 111 deletions(-)

diff --git a/common/file/FSOFRedis.php b/common/file/FSOFRedis.php
index e61a8e3..914e0a9 100644
--- a/common/file/FSOFRedis.php
+++ b/common/file/FSOFRedis.php
@@ -22,7 +22,6 @@ use com\fenqile\fsof\common\config\FSOFConstants;
 
 class FSOFRedis
 {
-const REDIS_TIME_OUT = 1;
 
 private static $_instance;
 
@@ -30,7 +29,9 @@ class FSOFRedis
 
 private $logger;
 
-private $timeout = self::REDIS_TIME_OUT;
+private $connect_timeout = 1;
+
+private $read_timeout = 2;
 
 private $retry_count = 1;
 
@@ -40,13 +41,14 @@ class FSOFRedis
 [FSOFConstants::FSOF_SERVICE_REDIS_HOST, 
FSOFConstants::FSOF_SERVICE_REDIS_PORT],
 ];
 
-public static function instance($config)
+public static function instance($config = [])
 {
 if (extension_loaded('redis'))
 {
 if (!isset(FSOFRedis::$_instance))
 {
 FSOFRedis::$_instance = new FSOFRedis($config);
+FSOFRedis::$_instance->get_redis();
 }
 return FSOFRedis::$_instance;
 }
@@ -57,10 +59,10 @@ class FSOFRedis
 return NULL;
 }
 
-public function  __construct($config)
+public function  __construct($config = [])
 {
 $this->logger = \Logger::getLogger(__CLASS__);
-if($config['redis_hosts'])
+if(isset($config['redis_hosts']))
 {
 $this->hosts = [];
 $address = explode(',', $config['redis_hosts']);
@@ -69,20 +71,22 @@ class FSOFRedis
 $this->hosts[] = [$host, 
$port??FSOFConstants::FSOF_SERVICE_REDIS_PORT];
 }
 }
-if($config['redis_connect_timeout'])
+if(isset($config['redis_connect_timeout']))
+{
+$this->connect_timeout = $config['redis_connect_timeout'];
+}
+if(isset($config['redis_read_timeout']))
 {
-$this->timeout = $config['redis_connect_timeout'];
+$this->read_timeout = $config['redis_read_timeout'];
 }
-if($config['redis_connect_type'])
+if(isset($config['redis_connect_type']))
 {
 $this->connect_type = $config['redis_connect_type'];
 }
-if($config['redis_retry_count'])
+if(isset($config['redis_retry_count']))
 {
 $this->retry = min($config['redis_retry_count'], 1);
 }
-
-$this->get_redis();
 }
 
 public function get_redis()
@@ -92,24 +96,25 @@ class FSOFRedis
 $hosts_count = count($this->hosts);
 $retry = $this->retry_count;
 $rand_num = rand() % $hosts_count;
+$ret = false;
 do{
 try{
 $redis_cli = new \Redis();
-if($this->connect_type == 
FSOFConstants::FSOF_SERVICE_REDIS_CONNECT_TYPE_SOCK)
+if($this->connect_type == 
FSOFConstants::FSOF_SERVICE_REDIS_CONNECT_TYPE_TCP)
 {
 $node = $this->hosts[$rand_num];
-$ret = 
$redis_cli->connect($node[0],$node[1],$this->timeout);
+$ret = 
$redis_cli->connect($node[0],$node[1],$this->connect_timeout);
+$redis_cli->setOption(\Redis::OPT_READ_TIMEOUT, 
$this->read_timeout);
 $rand_num = ($rand_num + 1)%$hosts_count;
 if (!$ret)
 {
 $this->logger->warn("connect redis 
failed[{$node[0]}:{$node[1]}]");
 }
 }else{
-$ret = 
$redis_cli->connect("/var/fsof/redis.sock",-1,FSOFConstants::FSOF_SERVICE_REDIS_PORT,$this->timeout);
+$ret = 
$redis_cli-&

[dubbo-php-framework] 21/31: update

2019-12-11 Thread wangxin

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-php-framework.git

commit 7e4b9ad7c4466c5894b789a81be1929e42b94f1e
Author: wangjinxi 
AuthorDate: Mon Jun 24 17:18:35 2019 +0800

update
---
 demo/demo-consumer/config/log4php.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/demo/demo-consumer/config/log4php.xml 
b/demo/demo-consumer/config/log4php.xml
index 1161a1e..0b8828f 100644
--- a/demo/demo-consumer/config/log4php.xml
+++ b/demo/demo-consumer/config/log4php.xml
@@ -1,9 +1,9 @@
 http://logging.apache.org/log4php/;>
-
-
+
 
-
+
 
+

[dubbo-php-framework] 14/31: Update README.md

2019-12-11 Thread wangxin

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-php-framework.git

commit d7a40a1a0fb44237ed772e5b310d0552df868594
Author: Ian Luo 
AuthorDate: Thu Apr 25 10:44:40 2019 +0800

Update README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index b3d647e..0f2fd25 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
-## dubbo-php-framework
+## php framework for apache dubbo
 
 
-dubbo-php-framework is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson for 
Serialization.
+php-for-apache-dubbo is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson for 
Serialization.
 
 
![image](https://github.com/lexin-fintech/dubbo-php-framework/blob/master/arch.png)

[dubbo-php-framework] 09/31: translate readme.md to english

2019-12-11 Thread wangxin

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-php-framework.git

commit 69ef01bfb7b6d2eae2765d750e30bba9d2fc1212
Author: xly 
AuthorDate: Tue Aug 28 12:00:49 2018 +0800

translate readme.md to english
---
 README.md | 28 +++-
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index e5e4308..4d04984 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,23 @@
-# dubbo-php-framework
-dubbo-php-framework是一个用于php语言的RPC通讯框架，与dubbo在协议上完全兼容，可同时作为provider端和consumer端,使用zookeeper用于服务注册发现,序列化使用fastjson.
+## dubbo-php-framework
+
+
+dubbo-php-framework is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson for 
Serialization.
+
+![alt][img1]
+
+## Introduction
+- php provider runs in multiple processes. The 
worker process is used to process specific business, the manager process 
controls the lifecycle of the worker process, and the master process processes 
the network IO.
+- Agent monitors the change of provider address 
information in registry and synchronizes them to local redis for all php 
consumers on the machine to share.
+- php consumer、redis and agent are deployed on 
all consumer machines and communicate with each other on unix socket.
+- provider_admin is deployed on all provider 
machines to control the lifecycle of all php providers on that machine.
+
+http://www.w3school.com.cn;>Quick start
+a {text-decoration:none}
+
+
+
+[img1]:data:image/png;base64,iVBORw0KGgoNSUhEUgAAA/8AAAGCCAYAAAC2IXNgAXNSR0IArs4c6QRnQU1BAACxjwv8YQUJcEhZcwAAEnQAABJ0Ad5mH3gAAMuRSURBVHhe7N0FnBxF2gbwN+uSlWyy2bi7hwgxJIHgfriGww9L4MPd4eAIcOihweHww0MSiJAQhbi7bzZZybp9/dR0zdbM9szOblZnn39+lelp756e2X6rqqualFqEiIiIiIiIiIJWiP1KREREREREREGKwT8RERERERFRkGPwT0RERERERBTkGPwTERERERERBTkG/0RERERERERBjsE/ERERERERUZBj8E9EREREREQU5Bj8ExEREREREQU5Bv9EREREREREQY7BPxEREREREVGQY/BPREREREREFOQY/BMREREREREFOQb/REREREREREGOwT8RERERERFRkGPwT0RERER
 [...]
 
-![image](https://github.com/lexin-fintech/dubbo-php-framework/blob/master/arch.png)
 
-## 说明
-* php 
provider以多进程方式运行，其中worker进程用于处理具体业务，manager进程控制worker进程的生命周期，master进程处理网络IO.
-* agent监听registry中provider地址信息的变更并同步到本地redis，供本机上所有php consumer共享.
-* php consumer、redis、agent三者部署在所有consumer机器上，并且彼此以unix socket通信.
-* provider_admin部署在所有provider机器上，用于控制该机器上所有php provider的生命周期.
 
 
-[Quick 
start](https://github.com/lexin-fintech/dubbo-php-framework/wiki/Quick-Start)

[dubbo-php-framework] 05/31: Merge pull request #2 from pengmingming/master

2019-12-11 Thread wangxin

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-php-framework.git

commit 7fa8f974cb6ce0bd2719463de098a998d11b2e05
Merge: e8ad247 30c9b5e
Author: lexinfintech <39553873+lexin-a...@users.noreply.github.com>
AuthorDate: Thu Jul 5 15:27:31 2018 +0800

Merge pull request #2 from pengmingming/master

Fix

 bin/app_admin.php | 11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

[dubbo-php-framework] 03/31: add composer.json and apache/log4php replace log4php/Logger.php

2019-12-11 Thread wangxin

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-php-framework.git

commit 07fae4a1cbee26307c36f27a62ac9bac694c63ff
Author: kilmas 
AuthorDate: Fri Jun 29 13:24:05 2018 +0800

add composer.json and apache/log4php replace log4php/Logger.php
---
 bin/app_admin.php  |  6 +-
 composer.json  |  5 +
 provider/shell/StartUp.php | 10 --
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/bin/app_admin.php b/bin/app_admin.php
index 13e6dc2..57b27bd 100644
--- a/bin/app_admin.php
+++ b/bin/app_admin.php
@@ -17,7 +17,11 @@
  *  limitations under the License.
  */
 
-require_once('log4php/Logger.php');
+define("BIN_DIR", __DIR__);
+define('MYROOT',BIN_DIR."/..");
+
+require_once MYROOT . '/vendor/autoload.php';
+require_once MYROOT . '/vendor/apache/log4php/src/main/php/Logger.php';
 
 use com\fenqile\fsof\common\config\FSOFConfigManager;
 
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..ef301f0
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,5 @@
+{
+"require": {
+"apache/log4php": "^2.3"
+}
+}
diff --git a/provider/shell/StartUp.php b/provider/shell/StartUp.php
index fe9618c..65c9b93 100644
--- a/provider/shell/StartUp.php
+++ b/provider/shell/StartUp.php
@@ -17,8 +17,14 @@
  */
 namespace com\fenqile\fsof\provider\shell;
 
-require_once('log4php/Logger.php');
 use com\fenqile\fsof\common\config\FSOFConfigManager;
+use com\fenqile\fsof\provider\core\server\TcpServer;
+
+define("BIN_DIR", __DIR__);
+define('MYROOT',BIN_DIR."/../..");
+
+require_once MYROOT . '/vendor/autoload.php';
+require_once MYROOT . '/vendor/apache/log4php/src/main/php/Logger.php';
 
 // 定义provider shell目录
 define('FSOF_PROVIDER_SHELL_PATH', __DIR__);
@@ -56,7 +62,7 @@ if(isset($config['server']['log_cfg_file_path']) && 
!empty($config['server']['lo
 }
 
 \Logger::getLogger(__CLASS__)->info("input {$cmd} {$name}");
-$server = new \com\fenqile\fsof\provider\core\server\TcpServer($name);
+$server = new TcpServer($name);
 //加载app root目录下的bootstrap.php和provider/$name.provider文件
 $server->setRequire(FSOFConfigManager::getProviderAppRoot($name));

[dubbo-php-framework] branch master updated (45b1c22 -> f468622)

2019-12-11 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-php-framework.git.


from 45b1c22  Merge pull request #22 from crazyxman/dev
 new 2ddfc96  Update README.md
 new 9f827c4  Update README.md
 new f468622  Merge pull request #24 from crazyxman/master

The 31 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

[dubbo-php-framework] 11/31: Update README.md

2019-12-11 Thread wangxin

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-php-framework.git

commit 30ffe33ec3c2e660c58980d1dfee1022dcfc1080
Author: Heluwe 
AuthorDate: Tue Aug 28 12:05:12 2018 +0800

Update README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 07977e3..5e53b45 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 dubbo-php-framework is a RPC communication 
framework for PHP language. It is fully compatible with Dubbo protocol, and can 
be used as provider terminal and consumer terminal simultaneously. Using 
zookeeper for service registration discovery, and using fastjson for 
Serialization.
 
-![alt][img1]
+![image](https://github.com/lexin-fintech/dubbo-php-framework/blob/master/arch.png)
 
 ## Introduction
 - php provider runs in multiple processes. The 
worker process is used to process specific business, the manager process 
controls the lifecycle of the worker process, and the master process processes 
the network IO.
@@ -13,4 +13,4 @@
 
 http://www.w3school.com.cn;>Quick start
 
-![image](https://github.com/lexin-fintech/dubbo-php-framework/blob/master/arch.png)
+

[dubbo-php-framework] 13/31: Add correct link to quick start, installation guide and configuration guide.

2019-12-11 Thread wangxin

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-php-framework.git

commit 7da982c05a4df099b1656154bb1f690f1919b34f
Author: Huxing Zhang 
AuthorDate: Fri Jan 4 16:40:00 2019 +0800

Add correct link to quick start, installation guide and configuration guide.
---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 5e53b45..b3d647e 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,8 @@
 - php consumer、redis and agent are deployed on 
all consumer machines and communicate with each other on unix socket.
 - provider_admin is deployed on all provider 
machines to control the lifecycle of all php providers on that machine.
 
-http://www.w3school.com.cn;>Quick start
+https://github.com/dubbo/dubbo-php-framework/wiki/%E5%BF%AB%E9%80%9F%E5%BC%80%E5%A7%8B;>Quick
 start (Chinese)
+https://github.com/dubbo/dubbo-php-framework/wiki/%E5%AE%89%E8%A3%85%E5%90%91%E5%AF%BC;>Installation
 guide (Chinese)
+https://github.com/dubbo/dubbo-php-framework/wiki/%E9%85%8D%E7%BD%AE%E5%8F%82%E8%80%83%E6%89%8B%E5%86%8C;>Configuration
 guide (Chinese)

[dubbo-php-framework] 12/31: Merge pull request #7 from Heluwe/baiji_team8_dubo-php

2019-12-11 Thread wangxin

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-php-framework.git

commit 757558f266fb0507ade53905e452fc977b284712
Merge: b50e997 30ffe33
Author: ken.lj 
AuthorDate: Mon Sep 3 10:45:36 2018 +0800

Merge pull request #7 from Heluwe/baiji_team8_dubo-php

 README.md | 19 +++
 1 file changed, 11 insertions(+), 8 deletions(-)

[dubbo-php-framework] 01/31: Initial commit

2019-12-11 Thread wangxin

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-php-framework.git

commit f12765b8da6e56b590f09efe56ad88adb286b70d
Author: lexinfintech <39553873+lexin-a...@users.noreply.github.com>
AuthorDate: Thu Jun 28 16:25:17 2018 +0800

Initial commit
---
 LICENSE | 201 
 1 file changed, 201 insertions(+)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 000..261eeb9
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,201 @@
+ Apache License
+   Version 2.0, January 2004
+http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) p

[dubbo-website] branch master updated: fix incorrect file name (#538)

2019-12-09 Thread wangxin

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 23c4d94  fix incorrect file name (#538)
23c4d94 is described below

commit 23c4d94ba39402755161343cecd06769ab97f670
Author: zhenyifang <1582524...@qq.com>
AuthorDate: Tue Dec 10 11:26:01 2019 +0800

fix incorrect file name (#538)

LGTM
---
 ...nslate configuration-load-process.md => configuration-load-process.md} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/docs/en-us/user/configuration/translate 
configuration-load-process.md 
b/docs/en-us/user/configuration/configuration-load-process.md
similarity index 100%
rename from docs/en-us/user/configuration/translate 
configuration-load-process.md
rename to docs/en-us/user/configuration/configuration-load-process.md

[dubbo] branch master updated: fix-typo-5466 (#5467)

2019-12-11 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new 0f7e07f  fix-typo-5466 (#5467)
0f7e07f is described below

commit 0f7e07fb174d204cf4b3ef05cd27f40cef2faea0
Author: LiosWong 
AuthorDate: Thu Dec 12 14:08:42 2019 +0800

fix-typo-5466 (#5467)
---
 .../org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java
 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java
index f2bb163..682a7d8 100644
--- 
a/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java
+++ 
b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java
@@ -25,7 +25,7 @@ import org.apache.dubbo.rpc.proxy.AbstractProxyInvoker;
 import org.apache.dubbo.rpc.proxy.InvokerInvocationHandler;
 
 /**
- * JavaassistRpcProxyFactory
+ * JavassistRpcProxyFactory
  */
 public class JavassistProxyFactory extends AbstractProxyFactory {

[dubbo-benchmark] branch master updated: Update README.md

2019-11-28 Thread wangxin

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-benchmark.git


The following commit(s) were added to refs/heads/master by this push:
 new 6c12d53  Update README.md
6c12d53 is described below

commit 6c12d531d8d95d024e8b7f7bb0e48013d1c1b9e7
Author: Xin Wang 
AuthorDate: Thu Nov 28 21:07:31 2019 +0800

Update README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index df209f7..4aad488 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 This project focuses on benchmarking and profiling dubbo framework with the 
combination of different serialization and transporter options. The code and 
the idea behinds it is inspired by [RPC 
Benchmark](https://github.com/hank-whu/rpc-benchmark). 
 
-## How To Run Benchmark
+## How To Run Benchmark 
 
 Clone this project onto your desktop, then
 
@@ -34,4 +34,4 @@ Clone this project onto your desktop, then
 
 ```bash
 ./benchmark.sh -s [hostname|ip address] -p port -f output
-```
\ No newline at end of file
+```

[dubbo-website] branch master updated: 修正一些文档中的错误 (#475)

2019-09-22 Thread wangxin

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 2db949f  修正一些文档中的错误 (#475)
2db949f is described below

commit 2db949facde1bb4bd4b9d48fb67aad8f751d4f24
Author: maslke 
AuthorDate: Mon Sep 23 10:36:42 2019 +0800

修正一些文档中的错误 (#475)

1. version-28.md 中对 ConsumerConfig 和 ProviderConfig 翻译错误的问题。
2. dubbo-service.md 中 文字拼写 “缺省” 漏掉“省”的问题。
3. recommend.md 中 dubbo:service 配置retries 写成 retry 的问题。
---
 docs/zh-cn/user/recommend.md| 6 +++---
 docs/zh-cn/user/references/xml/dubbo-service.md | 2 +-
 docs/zh-cn/user/versions/version-270.md | 6 ++
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/docs/zh-cn/user/recommend.md b/docs/zh-cn/user/recommend.md
index a27c93b..017a2c5 100644
--- a/docs/zh-cn/user/recommend.md
+++ b/docs/zh-cn/user/recommend.md
@@ -19,10 +19,10 @@ Provider 端尽量多配置 Consumer 端的属性，让 Provider 的实现者一
 
 ```xml
 
+timeout="300" retries="2" loadbalance="random" actives="0" />
  
 
+timeout="300" retries="2" loadbalance="random" actives="0" >
 
 
 ```
@@ -123,7 +123,7 @@ Dubbo 中所有的配置项都可以配置在 Spring 配置文件中，并且可
 ```
 
 2. 注册中心地址 `dubbo.registry.address`
-
+   
 ```xml
 
 ```
diff --git a/docs/zh-cn/user/references/xml/dubbo-service.md 
b/docs/zh-cn/user/references/xml/dubbo-service.md
index 38222bd..adbf0b4 100644
--- a/docs/zh-cn/user/references/xml/dubbo-service.md
+++ b/docs/zh-cn/user/references/xml/dubbo-service.md
@@ -20,7 +20,7 @@
 | mock | mock | class/boolean | 可选 | false | 服务治理 | 设为true，表示使用缺省Mock类名，即：接口名 
+ 
Mock后缀，服务接口调用失败Mock实现类，该Mock类必须有一个无参构造函数，与Local的区别在于，Local总是被执行，而Mock只在出现非业务异常(比如超时，网络异常等)时执行，Local在远程调用之前执行，Mock在远程调用后执行。
 | 2.0.0以上版本 |
 | token | token | string/boolean | 可选 | false | 服务治理 | 
令牌验证，为空表示不开启，如果为true，表示随机生成动态令牌，否则使用静态令牌，令牌的作用是防止消费者绕过注册中心直接访问，保证注册中心的授权功能有效，如果使用点对点调用，需关闭令牌功能
 | 2.0.0以上版本 |
 | registry | | string | 可选 | 缺省向所有registry注册 | 配置关联 | 
向指定注册中心注册，在多个注册中心时使用，值为dubbo:registry的id属性，多个注册中心ID用逗号分隔，如果不想将该服务注册到任何registry，可将值设为N/A
 | 2.0.0以上版本 |
-| provider | | string | 可选 | 缺使用第一个provider配置 | 配置关联 | 
指定provider，值为dubbo:provider的id属性 | 2.0.0以上版本 |
+| provider | | string | 可选 | 缺省使用第一个provider配置 | 配置关联 | 
指定provider，值为dubbo:provider的id属性 | 2.0.0以上版本 |
 | deprecated | deprecated | boolean | 可选 | false | 服务治理 | 
服务是否过时，如果设为true，消费方引用时将打印服务过时警告error日志 | 2.0.5以上版本 |
 | dynamic | dynamic | boolean | 可选 | true | 服务治理 | 
服务是否动态注册，如果设为false，注册后将显示后disable状态，需人工启用，并且服务提供者停止时，也不会自动取消册，需人工禁用。 | 
2.0.5以上版本 |
 | accesslog | accesslog | string/boolean | 可选 | false | 服务治理 | 
设为true，将向logger中输出访问日志，也可填写访问日志文件路径，直接把访问日志输出到指定文件 | 2.0.5以上版本 |
diff --git a/docs/zh-cn/user/versions/version-270.md 
b/docs/zh-cn/user/versions/version-270.md
index bba14c6..7daa938 100644
--- a/docs/zh-cn/user/versions/version-270.md
+++ b/docs/zh-cn/user/versions/version-270.md
@@ -92,7 +92,6 @@ dubbo.metadataReport.address=redis://127.0.0.1:6379
 
 
 使用外部化配置
-
 
需要在项目启动前，使用[最新版本Dubbo-OPS](https://github.com/apache/dubbo-ops)完成外部化配置迁移，理论上配置中心支持所有本地dubbo.properties所支持的配置项。
 
 以XML开发形式为例，假设我们本地有如下配置：
@@ -217,7 +216,6 @@ dubbo.protocol.port=20880
 
 
 包名改造
-
 1. Maven坐标
 
 **groupId 由 `com.alibaba` 改为 `org.apache.dubbo`**
@@ -251,8 +249,8 @@ Maven坐标升级比较直观，只需要修改相应的pom文件就可以了；
 | ServiceConfig | Service配置采集和暴露编程接口 |
 | ApplicationConfig | Application配置采集API|
 | RegistryConfig| 注册中心配置采集API   |
-| ConsumerConfig| 提供端默认配置采集API |
-| ProviderConfig| 消费端默认配置采集API |
+| ConsumerConfig| 消费端默认配置采集API |
+| ProviderConfig| 提供端默认配置采集API |
 | ProtocolConfig| RPC协议配置采集API|
 | ArcumentConfig| 服务参数级配置采集API |
 | MethodConfig  | 服务方法级配置采集API |

[dubbo-website] branch master updated: Delete a repeat program statement. (#473)

2019-09-22 Thread wangxin

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 76ce22e  Delete a repeat program statement. (#473)
76ce22e is described below

commit 76ce22e73df6d150338a097c9075c74c4046bf86
Author: zimingsir <42287049+ouyangnen...@users.noreply.github.com>
AuthorDate: Mon Sep 23 10:37:37 2019 +0800

Delete a repeat program statement. (#473)
---
 blog/zh-cn/dubbo-generic-invoke.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blog/zh-cn/dubbo-generic-invoke.md 
b/blog/zh-cn/dubbo-generic-invoke.md
index 508c8d4..d70072a 100644
--- a/blog/zh-cn/dubbo-generic-invoke.md
+++ b/blog/zh-cn/dubbo-generic-invoke.md
@@ -43,7 +43,7 @@ System.out.println(name);
 ## 通过 API 编程进行泛化调用
 
 ```
-ApplicationConfig application = new ApplicationConfig()ApplicationConfig 
application = new ApplicationConfig();
+ApplicationConfig application = new ApplicationConfig();
 application.setName("api-generic-consumer");
 
 RegistryConfig registry = new RegistryConfig();

[dubbo-website] branch master updated: fix typo. Fixes https://github.com/apache/dubbo/issues/5096 (#476)

2019-09-22 Thread wangxin

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 a2a572a  fix typo. Fixes https://github.com/apache/dubbo/issues/5096 
(#476)
a2a572a is described below

commit a2a572a833e2f1ea6818b7dec1bac248b3be5f6e
Author: bailei 
AuthorDate: Mon Sep 23 10:56:06 2019 +0800

fix typo. Fixes https://github.com/apache/dubbo/issues/5096 (#476)
---
 docs/en-us/dev/impls/router.md | 2 +-
 docs/zh-cn/dev/impls/router.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/en-us/dev/impls/router.md b/docs/en-us/dev/impls/router.md
index 49502f3..94c8708 100644
--- a/docs/en-us/dev/impls/router.md
+++ b/docs/en-us/dev/impls/router.md
@@ -24,7 +24,7 @@ src
 |-java
 |-com
 |-xxx
-|-XxxRouterFactory.java (LoadBalance implementation)
+|-XxxRouterFactory.java (RouterFactory implementation)
 |-resources
 |-META-INF
 |-dubbo
diff --git a/docs/zh-cn/dev/impls/router.md b/docs/zh-cn/dev/impls/router.md
index ad7f549..db5a865 100644
--- a/docs/zh-cn/dev/impls/router.md
+++ b/docs/zh-cn/dev/impls/router.md
@@ -24,7 +24,7 @@ src
 |-java
 |-com
 |-xxx
-|-XxxRouterFactory.java (实现LoadBalance接口)
+|-XxxRouterFactory.java (实现RouterFactory接口)
 |-resources
 |-META-INF
 |-dubbo

[dubbo] branch master updated: README: Fix typo in example code (#5136)

2019-10-04 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new 041aa39  README: Fix typo in example code (#5136)
041aa39 is described below

commit 041aa39c825cc21bf16fd380890c4fea2e509caa
Author: Dinesh Bolkensteyn 
AuthorDate: Fri Oct 4 14:49:36 2019 +0200

README: Fix typo in example code (#5136)
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 8a855eb..e75a264 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ There's a 
[README](https://github.com/apache/dubbo-samples/tree/master/dubbo-sam
 package org.apache.dubbo.samples.api;
 
 public interface GreetingService {
-String sayHello(String name);
+String sayHi(String name);
 }
 ```

[dubbo-website] branch master updated: Add badge.svg (#487)

2019-10-04 Thread wangxin

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 d45bb13  Add badge.svg (#487)
d45bb13 is described below

commit d45bb13da844cb31291a626eb251e34d31bf1382
Author: Xin Wang 
AuthorDate: Fri Oct 4 19:37:15 2019 +0800

Add badge.svg (#487)
---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index f76e032..572f772 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Dubbo Official Website
 
+[![CI 
Status](https://github.com/apache/dubbo-website/workflows/CI/badge.svg?branch=master)](https://github.com/apache/dubbo-website/actions)
+
 This project keeps all sources used for building up dubbo official website 
which's served at https://dubbo.apache.org.

[dubbo-awesome] branch master updated: Update README.md

2019-12-23 Thread wangxin

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-awesome.git


The following commit(s) were added to refs/heads/master by this push:
 new 1363bd0  Update README.md
1363bd0 is described below

commit 1363bd02516cfbc1752b8e33af54805ac2868c0f
Author: Xin Wang 
AuthorDate: Mon Dec 23 22:28:04 2019 +0800

Update README.md
---
 README.md | 20 
 1 file changed, 20 insertions(+)

diff --git a/README.md b/README.md
index 43f77e0..f1b2b3c 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,23 @@
 # dubbo-awesome
 
 Collections of Apache dubbo relevant informations
+
+
+
+Video playing address:
+
+slides/meetup 
+
+| meetup   | Video address 
   |
+|  | -- |
+| 201805@Beijing   | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2176/mUid/0.html#dingbu |
+| 201806@Shanghai  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2281/mUid/0.html#dingbu |
+| 201807@shenzhen  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2354/mUid/0.html#dingbu |
+| 201809@chengdu   | https://yq.aliyun.com/live/500 |
+| 201812@hangzhou  | https://yq.aliyun.com/live/652 |
+| 201901@guangzhou | https://yq.aliyun.com/live/795 |
+| 201903@nanjing   | https://yq.aliyun.com/live/908 |
+| 201905@beijing   | https://yq.aliyun.com/live/1081|
+| 201907@shenzhen  | https://developer.aliyun.com/live/1222 |
+| 201908@shanghai  | https://developer.aliyun.com/live/1280 |
+| 201910@chengdu   | https://developer.aliyun.com/live/1522 |

[dubbo-awesome] branch master updated: Delete video-playing-address.md

2019-12-23 Thread wangxin

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-awesome.git


The following commit(s) were added to refs/heads/master by this push:
 new 1810f2c  Delete video-playing-address.md
1810f2c is described below

commit 1810f2c31b273769eedbbe033ec66ff54f8689f0
Author: Xin Wang 
AuthorDate: Mon Dec 23 22:28:48 2019 +0800

Delete video-playing-address.md
---
 slides/meetup/video-playing-address.md | 17 -
 1 file changed, 17 deletions(-)

diff --git a/slides/meetup/video-playing-address.md 
b/slides/meetup/video-playing-address.md
deleted file mode 100644
index 2c979ec..000
--- a/slides/meetup/video-playing-address.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Video playing address:
-
- 
-
-| meetup   | Video address 
   |
-|  | -- |
-| 201805@Beijing   | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2176/mUid/0.html#dingbu |
-| 201806@Shanghai  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2281/mUid/0.html#dingbu |
-| 201807@shenzhen  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2354/mUid/0.html#dingbu |
-| 201809@chengdu   | https://yq.aliyun.com/live/500 |
-| 201812@hangzhou  | https://yq.aliyun.com/live/652 |
-| 201901@guangzhou | https://yq.aliyun.com/live/795 |
-| 201903@nanjing   | https://yq.aliyun.com/live/908 |
-| 201905@beijing   | https://yq.aliyun.com/live/1081|
-| 201907@shenzhen  | https://developer.aliyun.com/live/1222 |
-| 201908@shanghai  | https://developer.aliyun.com/live/1280 |
-| 201910@chengdu   | https://developer.aliyun.com/live/1522 |
\ No newline at end of file

[dubbo-awesome] branch master updated: Update README.md

2019-12-23 Thread wangxin

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-awesome.git


The following commit(s) were added to refs/heads/master by this push:
 new 44f9119  Update README.md
44f9119 is described below

commit 44f91198230e5fec105f0267df63bf95b367d28b
Author: Xin Wang 
AuthorDate: Mon Dec 23 22:29:25 2019 +0800

Update README.md
---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index f1b2b3c..567e540 100644
--- a/README.md
+++ b/README.md
@@ -6,9 +6,9 @@ Collections of Apache dubbo relevant informations
 
 Video playing address:
 
-slides/meetup 
+ 
 
-| meetup   | Video address 
   |
+| slides/meetup| Video address 
   |
 |  | -- |
 | 201805@Beijing   | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2176/mUid/0.html#dingbu |
 | 201806@Shanghai  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2281/mUid/0.html#dingbu |

[dubbo-awesome] branch master updated: Update README.md

2019-12-23 Thread wangxin

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-awesome.git


The following commit(s) were added to refs/heads/master by this push:
 new ffad280  Update README.md
ffad280 is described below

commit ffad280e5ebe6679a74e528e724b0dbd2ed59f07
Author: Xin Wang 
AuthorDate: Mon Dec 23 22:44:52 2019 +0800

Update README.md
---
 README.md | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 9659ed0..b8707cc 100644
--- a/README.md
+++ b/README.md
@@ -8,9 +8,7 @@ Video playing address:
 
  
 
-| slides/meetup| Video address 
   |
-|  | -- |
-| meetup   | Video address  |
+| slides/meetup| Video address  |
 |  | -- |
 | 201910@chengdu   | https://developer.aliyun.com/live/1522 |
 | 201908@shanghai  | https://developer.aliyun.com/live/1280 |

[dubbo-awesome] branch master updated: Update README.md

2019-12-23 Thread wangxin

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-awesome.git


The following commit(s) were added to refs/heads/master by this push:
 new 129802c  Update README.md
129802c is described below

commit 129802caca6db672b86f5ffdebe015deb6dcc003
Author: Xin Wang 
AuthorDate: Mon Dec 23 22:44:23 2019 +0800

Update README.md
---
 README.md | 22 --
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 567e540..9659ed0 100644
--- a/README.md
+++ b/README.md
@@ -10,14 +10,16 @@ Video playing address:
 
 | slides/meetup| Video address 
   |
 |  | -- |
-| 201805@Beijing   | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2176/mUid/0.html#dingbu |
-| 201806@Shanghai  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2281/mUid/0.html#dingbu |
-| 201807@shenzhen  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2354/mUid/0.html#dingbu |
-| 201809@chengdu   | https://yq.aliyun.com/live/500 |
-| 201812@hangzhou  | https://yq.aliyun.com/live/652 |
-| 201901@guangzhou | https://yq.aliyun.com/live/795 |
-| 201903@nanjing   | https://yq.aliyun.com/live/908 |
-| 201905@beijing   | https://yq.aliyun.com/live/1081|
-| 201907@shenzhen  | https://developer.aliyun.com/live/1222 |
-| 201908@shanghai  | https://developer.aliyun.com/live/1280 |
+| meetup   | Video address  |
+|  | -- |
 | 201910@chengdu   | https://developer.aliyun.com/live/1522 |
+| 201908@shanghai  | https://developer.aliyun.com/live/1280 |
+| 201907@shenzhen  | https://developer.aliyun.com/live/1222 |
+| 201905@beijing   | https://yq.aliyun.com/live/1081|
+| 201903@nanjing   | https://yq.aliyun.com/live/908 |
+| 201901@guangzhou | https://yq.aliyun.com/live/795 |
+| 201812@hangzhou  | https://yq.aliyun.com/live/652 |
+| 201809@chendu| https://yq.aliyun.com/live/500 |
+| 201807@shenzhen  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2354/mUid/0.html#dingbu |
+| 201806@Shanghai  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2281/mUid/0.html#dingbu |
+| 201805@Beijing   | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2176/mUid/0.html#dingbu |

[dubbo-awesome] branch master updated: add video-playing-address.md

2019-12-23 Thread wangxin

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-awesome.git


The following commit(s) were added to refs/heads/master by this push:
 new 0d5d135  add video-playing-address.md
0d5d135 is described below

commit 0d5d1352a9df4113451e7a87aa63e2d4bee798f2
Author: Xin Wang 
AuthorDate: Mon Dec 23 22:08:51 2019 +0800

add video-playing-address.md

video-playing-address.md
---
 slides/meetup/video-playing-address.md | 17 +
 1 file changed, 17 insertions(+)

diff --git a/slides/meetup/video-playing-address.md 
b/slides/meetup/video-playing-address.md
new file mode 100644
index 000..2c979ec
--- /dev/null
+++ b/slides/meetup/video-playing-address.md
@@ -0,0 +1,17 @@
+Video playing address:
+
+ 
+
+| meetup   | Video address 
   |
+|  | -- |
+| 201805@Beijing   | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2176/mUid/0.html#dingbu |
+| 201806@Shanghai  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2281/mUid/0.html#dingbu |
+| 201807@shenzhen  | 
http://www.itdks.com/index.php/Act/apply_upgrade/id/2354/mUid/0.html#dingbu |
+| 201809@chengdu   | https://yq.aliyun.com/live/500 |
+| 201812@hangzhou  | https://yq.aliyun.com/live/652 |
+| 201901@guangzhou | https://yq.aliyun.com/live/795 |
+| 201903@nanjing   | https://yq.aliyun.com/live/908 |
+| 201905@beijing   | https://yq.aliyun.com/live/1081|
+| 201907@shenzhen  | https://developer.aliyun.com/live/1222 |
+| 201908@shanghai  | https://developer.aliyun.com/live/1280 |
+| 201910@chengdu   | https://developer.aliyun.com/live/1522 |
\ No newline at end of file

[dubbo-website] branch master updated: Update source_code_guide (#560)

2020-01-25 Thread wangxin

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 5fb6d4e  Update source_code_guide (#560)
5fb6d4e is described below

commit 5fb6d4e8c7c64f6b851f8c9301e6c8adca7e3cb1
Author: 兰染 
AuthorDate: Sun Jan 26 12:52:26 2020 +0800

Update source_code_guide (#560)
---
 docs/zh-cn/source_code_guide/adaptive-extension.md | 4 ++--
 docs/zh-cn/source_code_guide/cluster.md| 4 ++--
 docs/zh-cn/source_code_guide/directory.md  | 4 ++--
 docs/zh-cn/source_code_guide/refer-service.md  | 2 +-
 docs/zh-cn/source_code_guide/router.md | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/docs/zh-cn/source_code_guide/adaptive-extension.md 
b/docs/zh-cn/source_code_guide/adaptive-extension.md
index 24d4627..cd1e727 100644
--- a/docs/zh-cn/source_code_guide/adaptive-extension.md
+++ b/docs/zh-cn/source_code_guide/adaptive-extension.md
@@ -165,7 +165,7 @@ getAdaptiveExtensionClass 方法同样包含了三个逻辑，如下：
 2. 检查缓存，若缓存不为空，则返回缓存
 3. 若缓存为空，则调用 createAdaptiveExtensionClass 创建自适应拓展类
 
-这三个逻辑看起来平淡无奇，似乎没有多讲的必要。但是这些平淡无奇的代码中隐藏了着一些细节，需要说明一下。首先从第一个逻辑说起，getExtensionClasses
 这个方法用于获取某个接口的所有实现类。比如该方法可以获取 Protocol 接口的 
DubboProtocol、HttpProtocol、InjvmProtocol 等实现类。在获取实现类的过程中，如果某个某个实现类被 Adaptive 
注解修饰了，那么该类就会被赋值给 cachedAdaptiveClass 变量。此时，上面步骤中的第二步条件成立（缓存不为空），直接返回 
cachedAdaptiveClass 即可。如果所有的实现类均未被 Adaptive 注解修饰，那么执行第三步逻辑，创建自适应拓展类。相关代码如下：
+这三个逻辑看起来平淡无奇，似乎没有多讲的必要。但是这些平淡无奇的代码中隐藏了着一些细节，需要说明一下。首先从第一个逻辑说起，getExtensionClasses
 这个方法用于获取某个接口的所有实现类。比如该方法可以获取 Protocol 接口的 
DubboProtocol、HttpProtocol、InjvmProtocol 等实现类。在获取实现类的过程中，如果某个实现类被 Adaptive 
注解修饰了，那么该类就会被赋值给 cachedAdaptiveClass 变量。此时，上面步骤中的第二步条件成立（缓存不为空），直接返回 
cachedAdaptiveClass 即可。如果所有的实现类均未被 Adaptive 注解修饰，那么执行第三步逻辑，创建自适应拓展类。相关代码如下：
 
 ```java
 private Class createAdaptiveExtensionClass() {
@@ -493,7 +493,7 @@ for (Method method : methods) {
 
 # 2.2.3.5 生成拓展名获取逻辑
 
-本段逻辑用于根据 SPI 和 Adaptive 注解值生成“获取拓展名逻辑”，同时生成逻辑也受 Invocation 
类型参数影响，综合因素导致本段逻辑相对复杂。本段逻辑可以会生成但不限于下面的代码：
+本段逻辑用于根据 SPI 和 Adaptive 注解值生成“获取拓展名逻辑”，同时生成逻辑也受 Invocation 
类型参数影响，综合因素导致本段逻辑相对复杂。本段逻辑可能会生成但不限于下面的代码：
 
 ```java
 String extName = (url.getProtocol() == null ? "dubbo" : url.getProtocol());
diff --git a/docs/zh-cn/source_code_guide/cluster.md 
b/docs/zh-cn/source_code_guide/cluster.md
index 6fe7a95..4a8961c 100644
--- a/docs/zh-cn/source_code_guide/cluster.md
+++ b/docs/zh-cn/source_code_guide/cluster.md
@@ -16,7 +16,7 @@ Dubbo 提供了多种集群实现，包含但不限于 Failover Cluster、Failfa
 
 ![](./sources/images/cluster.jpg)
 
-集群工作过程可分为两个阶段，第一个阶段是在服务消费者初始化期间，集群 Cluster 实现类为服务消费者创建 Cluster Invoker 
实例，即上图中的 merge 操作。第二个阶段是在服务消费者进行远程调用时。以 FailoverClusterInvoker 为例，该类型 Cluster 
Invoker 首先会调用 Directory 的 list 方法列举 Invoker 列表（可将 Invoker 简单理解为服务提供者）。Directory 
的用途是保存 Invoker，可简单类比为 List\。其实现类 RegistryDirectory 
是一个动态服务目录，可感知注册中心配置的变化，它所持有的 Invoker 列表会随着注册中心内容的变化而变化。每次变化后，RegistryDirectory 
会动态增删 Invoker，并调用 Router 的 route 方法进行路由，过滤掉不符合路由规则的 Invoker。当 
FailoverClusterInvoker 拿到 Directory 返回的 Invoker 列表后，它会通过 Load [...]
+集群工作过程可分为两个阶段，第一个阶段是在服务消费者初始化期间，集群 Cluster 实现类为服务消费者创建 Cluster Invoker 
实例，即上图中的 merge 操作。第二个阶段是在服务消费者进行远程调用时。以 FailoverClusterInvoker 为例，该类型 Cluster 
Invoker 首先会调用 Directory 的 list 方法列举 Invoker 列表（可将 Invoker 简单理解为服务提供者）。Directory 
的用途是保存 Invoker，可简单类比为 List\。其实现类 RegistryDirectory 
是一个动态服务目录，可感知注册中心配置的变化，它所持有的 Invoker 列表会随着注册中心内容的变化而变化。每次变化后，RegistryDirectory 
会动态增删 Invoker，并调用 Router 的 route 方法进行路由，过滤掉不符合路由规则的 Invoker。当 
FailoverClusterInvoker 拿到 Directory 返回的 Invoker 列表后，它会通过 Load [...]
 
 以上就是集群工作的整个流程，这里并没介绍集群是如何容错的。Dubbo 主要提供了这样几种容错方式：
 
@@ -112,7 +112,7 @@ protected List> list(Invocation invocation) 
throws RpcException {
 
  3.2.1 FailoverClusterInvoker
 
-FailoverClusterInvoker 在调用失败时，会自动切换 Invoker 进行重试。默认确配置下，Dubbo 会使用这个类作为缺省 
Cluster Invoker。下面来看一下该类的逻辑。
+FailoverClusterInvoker 在调用失败时，会自动切换 Invoker 进行重试。默认配置下，Dubbo 会使用这个类作为缺省 
Cluster Invoker。下面来看一下该类的逻辑。
 
 ```java
 public class FailoverClusterInvoker extends AbstractClusterInvoker {
diff --git a/docs/zh-cn/source_code_guide/directory.md 
b/docs/zh-cn/source_code_guide/directory.md
index 9c71e76..5e9caf7 100644
--- a/docs/zh-cn/source_code_guide/directory.md
+++ b/docs/zh-cn/source_code_guide/directory.md
@@ -476,7 +476,7 @@ private Map>> 
toMergeMethodInvokerMap(Map T getProxy(Invoker invoker, Class[] 
interfaces) {
 }
 ```
 
-上面代码并不多，首先是通过 Proxy 的 getProxy 方法获取 Proxy 子类，然后创建 InvokerInvocationHandler 
对象，并将该对象传给 newInstance 生成 Proxy 实例。InvokerInvocationHandler 实现自 JDK 的 
InvocationHandler 接口，具体的用途是拦截接口类调用。该类逻辑比较简单，这里就不分析了。下面我们重点关注一下 Proxy 的 getProxy 
方法，如下。
+上面代码并不多，首先是通过 Proxy 的 getProxy 方法获取 Proxy 子类，然后创建 InvokerInvocationHandler 
对象，并将该对象传给 newInstance 生成 Proxy 实例。InvokerInvocationHandler 实现 JDK 的 
InvocationHandler 接口，具体的用途是拦截接口类调用。该类逻辑比较简单，这里就不分析了。下面我们重点关注一下 Proxy 的 getProxy 
方法，如下。
 
 ```java

[dubbo] branch master updated: optimize : update README.md DubboSamples url (#5605)

2020-01-08 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new f264dac  optimize : update README.md DubboSamples url (#5605)
f264dac is described below

commit f264dac97307abe08992b71caf5912a741c21cd8
Author: Huangxuny1 
AuthorDate: Thu Jan 9 10:40:59 2020 +0800

optimize : update README.md DubboSamples url (#5605)
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 94a4090..9559fb6 100644
--- a/README.md
+++ b/README.md
@@ -29,14 +29,14 @@ We are now collecting dubbo user info in order to help us 
to improve Dubbo bette
 
 ## Getting started
 
-The following code snippet comes from [Dubbo 
Samples](https://github.com/apache/dubbo-samples/tree/master/dubbo-samples-api).
 You may clone the sample project and step into `dubbo-samples-api` sub 
directory before read on.
+The following code snippet comes from [Dubbo 
Samples](https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-api).
 You may clone the sample project and step into `dubbo-samples-api` sub 
directory before read on.
 
 ```bash
 # git clone https://github.com/apache/dubbo-samples.git
-# cd dubbo-samples/dubbo-samples-api
+# cd dubbo-samples/java/dubbo-samples-api
 ```
 
-There's a 
[README](https://github.com/apache/dubbo-samples/tree/master/dubbo-samples-api/README.md)
 file under `dubbo-samples-api` directory. Read it and try this sample out by 
following the instructions.
+There's a 
[README](https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-api/README.md)
 file under `dubbo-samples-api` directory. Read it and try this sample out by 
following the instructions.
 
 ### Maven dependency

[dubbo] branch master updated (1e6aa57 -> 8acd17c)

2019-12-23 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git.


from 1e6aa57  Rename onReponse in ClusterInterceptor to onMessage (#5528)
 add 8acd17c  Add dubbo awesome in readme (#5530)

No new revisions were added by this update.

Summary of changes:
 README.md | 1 +
 1 file changed, 1 insertion(+)

[dubbo-admin] branch develop updated (c69cfe0 -> fdc6567)

2019-12-26 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git.


from c69cfe0  provide a simple login module (#521)
 add fdc6567  Bump checkstyle from 8.9 to 8.18 (#556)

No new revisions were added by this update.

Summary of changes:
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

[dubbo] branch master updated: fix ThreadlessExecutor doc comment (#5549)

2019-12-27 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new 4c0c825  fix ThreadlessExecutor doc comment (#5549)
4c0c825 is described below

commit 4c0c82548c3975c3f84af682d64d4f68581d0dfa
Author: GrayWind33 <34977857+graywin...@users.noreply.github.com>
AuthorDate: Sat Dec 28 00:44:24 2019 +0800

fix ThreadlessExecutor doc comment (#5549)
---
 .../java/org/apache/dubbo/common/threadpool/ThreadlessExecutor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git 
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadlessExecutor.java
 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadlessExecutor.java
index e816764..fa3303f 100644
--- 
a/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadlessExecutor.java
+++ 
b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadlessExecutor.java
@@ -32,7 +32,7 @@ import java.util.concurrent.TimeoutException;
  * any thread.
  *
  * Tasks submitted to this executor through {@link #execute(Runnable)} will 
not get scheduled to a specific thread, though normal executors always do the 
schedule.
- * Those tasks are stored in a blocking queue and will only be executed when a 
thead calls {@link #waitAndDrain()}, the thead executing the task
+ * Those tasks are stored in a blocking queue and will only be executed when a 
thread calls {@link #waitAndDrain()}, the thread executing the task
  * is exactly the same as the one calling waitAndDrain.
  */
 public class ThreadlessExecutor extends AbstractExecutorService {

[dubbo-website] branch master updated: 增加新版本线程池可用配置项 (#543)

2020-01-06 Thread wangxin

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 f97105b  增加新版本线程池可用配置项 (#543)
f97105b is described below

commit f97105be83020938158bd4f3eaeadf6fa6886f90
Author: Joe <736777...@qq.com>
AuthorDate: Tue Jan 7 01:58:46 2020 -0600

增加新版本线程池可用配置项 (#543)

增加新版本线程池可用配置项
---
 docs/zh-cn/user/references/xml/dubbo-provider.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/zh-cn/user/references/xml/dubbo-provider.md 
b/docs/zh-cn/user/references/xml/dubbo-provider.md
index 86028b7..8d0f4f0 100644
--- a/docs/zh-cn/user/references/xml/dubbo-provider.md
+++ b/docs/zh-cn/user/references/xml/dubbo-provider.md
@@ -17,7 +17,7 @@
 | default | | boolean | 可选 | false | 配置关联 | 是否为缺省协议，用于多协议 | 1.0.16以上版本 |
 | filter | service.filter | string | 可选 | | 性能调优 | 服务提供方远程调用过程拦截器名称，多个名称用逗号分隔 
| 2.0.5以上版本 |
 | listener | exporter.listener | string | 可选 | | 性能调优 | 
服务提供方导出服务监听器名称，多个名称用逗号分隔 | 2.0.5以上版本 |
-| threadpool | threadpool | string | 可选 | fixed | 性能调优 | 线程池类型，可选：fixed/cached 
| 2.0.5以上版本 |
+| threadpool | threadpool | string | 可选 | fixed | 性能调优 | 
线程池类型，可选：fixed/cached/limit(2.5.3以上)/eager(2.6.x以上) | 2.0.5以上版本 |
 | accepts | accepts | int | 可选 | 0 | 性能调优 | 服务提供者最大可接受连接数 | 2.0.5以上版本 |
 | version | version | string | 可选 | 0.0.0 | 服务发现 | 
服务版本，建议使用两位数字版本，如：1.0，通常在接口不兼容时版本号才需要升级 | 2.0.5以上版本 |
 | group | group | string | 可选 |   | 服务发现 | 服务分组，当一个接口有多个实现，可以用分组区分 | 2.0.5以上版本 
|

[dubbo-website] branch master updated: update: (en-us)download.md (#546)

2020-01-06 Thread wangxin

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 4a4f6b9  update: (en-us)download.md (#546)
4a4f6b9 is described below

commit 4a4f6b9f360ddeb742b7ae1f6a62fdd8cc428876
Author: withthewind 
AuthorDate: Tue Jan 7 15:55:36 2020 +0800

update: (en-us)download.md (#546)
---
 blog/en-us/download.md | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/blog/en-us/download.md b/blog/en-us/download.md
index e149a6f..04afcd3 100644
--- a/blog/en-us/download.md
+++ b/blog/en-us/download.md
@@ -16,6 +16,12 @@ you can follow these 
[procedures](https://www.apache.org/info/verification) and
 > GitHub: https://github.com/apache/dubbo \
 > Release Notes: https://github.com/apache/dubbo/releases
 
+### 2.7.5 (2019-12-29)
+
+* 
[source](https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.5/apache-dubbo-2.7.5-src.zip)
 |
+[asc](https://www.apache.org/dist/dubbo/2.7.5/apache-dubbo-2.7.5-src.zip.asc) |
+[sha512](https://www.apache.org/dist/dubbo/2.7.5/apache-dubbo-2.7.5-src.zip.sha512)
+
 ### 2.7.4.1 (2019-10-27)
 
 * 
[source](https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.4.1/apache-dubbo-2.7.4.1-src.zip)
 |

[dubbo-website] branch master updated: fix: (en-us) dubbo-generic-invoke.md simple code link failed (#552)

2020-01-06 Thread wangxin

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 22672f8  fix: (en-us) dubbo-generic-invoke.md simple code link failed 
(#552)
22672f8 is described below

commit 22672f86da6153634d09e969745f7942d89ee10b
Author: withthewind 
AuthorDate: Tue Jan 7 15:58:12 2020 +0800

fix: (en-us) dubbo-generic-invoke.md simple code link failed (#552)
---
 blog/en-us/dubbo-generic-invoke.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blog/en-us/dubbo-generic-invoke.md 
b/blog/en-us/dubbo-generic-invoke.md
index 5d8f0b1..4377ba1 100644
--- a/blog/en-us/dubbo-generic-invoke.md
+++ b/blog/en-us/dubbo-generic-invoke.md
@@ -183,4 +183,4 @@ So far, a simple service Mock platform has been 
successfully launched!
 ## Others
 
 -  The generic invoke and generic interface implementations introduced in 
this article are all based on the native Dubbo protocol. Prior to version 
2.6.2, other protocols such as http/hessian don't support generic invoke. 
Version 2.6.3 will support the generic invoke of these two protocols.
--  The relevant sample codes mentioned in this article can be found in 
dubbo-samples: 
https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-generic
+-  The relevant sample codes mentioned in this article can be found in 
dubbo-samples: 
https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-generic

[dubbo-website] branch master updated: fix: (zh-cn) dubbo-generic-invoke.md simple code link failed (#551)

2020-01-06 Thread wangxin

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 cb45200  fix: (zh-cn) dubbo-generic-invoke.md simple code link failed 
(#551)
cb45200 is described below

commit cb4520042e8eb8341e5a0b8993150446c1ada255
Author: withthewind 
AuthorDate: Tue Jan 7 15:57:57 2020 +0800

fix: (zh-cn) dubbo-generic-invoke.md simple code link failed (#551)
---
 blog/zh-cn/dubbo-generic-invoke.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/blog/zh-cn/dubbo-generic-invoke.md 
b/blog/zh-cn/dubbo-generic-invoke.md
index d70072a..81e6273 100644
--- a/blog/zh-cn/dubbo-generic-invoke.md
+++ b/blog/zh-cn/dubbo-generic-invoke.md
@@ -175,4 +175,4 @@ System.out.println(helloService.hello("community"));
 ## 其他
 
 * 本文介绍的泛化调用和泛接口实现，都是在原生的 `Dubbo` 协议之上的。在 2.6.2 版本之前，其他协议如 http/hessian 
等是不支持泛化调用的，2.6.3 版本将会对这两个协议的泛化调用做支持。
-* 本文中提到的相关示例代码可以在 
dubbo-samples中找到：https://github.com/dubbo/dubbo-samples/tree/master/dubbo-samples-generic
\ No newline at end of file
+* 本文中提到的相关示例代码可以在 
dubbo-samples中找到：https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-generic
\ No newline at end of file

[dubbo-website] branch master updated: update: (zh-cn)adaptive-extension.md (#547)

2020-01-06 Thread wangxin

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 221e2dc  update: (zh-cn)adaptive-extension.md (#547)
221e2dc is described below

commit 221e2dc75d5650b315bf2b195708e2c4db1c1390
Author: withthewind 
AuthorDate: Tue Jan 7 15:57:08 2020 +0800

update: (zh-cn)adaptive-extension.md (#547)
---
 docs/zh-cn/source_code_guide/adaptive-extension.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/zh-cn/source_code_guide/adaptive-extension.md 
b/docs/zh-cn/source_code_guide/adaptive-extension.md
index 97bfe4e..24d4627 100644
--- a/docs/zh-cn/source_code_guide/adaptive-extension.md
+++ b/docs/zh-cn/source_code_guide/adaptive-extension.md
@@ -35,7 +35,7 @@ public class AdaptiveWheelMaker implements WheelMaker {
 .getExtensionLoader(WheelMaker.class).getExtension(wheelMakerName);
 
 // 3.调用目标方法
-return wheelMaker.makeWheel(URL url);
+return wheelMaker.makeWheel(url);
 }
 }
 ```
@@ -785,4 +785,4 @@ public com.alibaba.dubbo.rpc.Invoker refer(java.lang.Class 
arg0, com.alibaba.dub
 
 ## 3.总结
 
-到此，关于自适应拓展的原理，实现就分析完了。总的来说自适应拓展整个逻辑还是很复杂的，并不是很容易弄懂。因此，大家在阅读该部分源码时，耐心一些。同时多进行调试，也可以通过生成好的代码思考代码的生成逻辑。好了，本篇文章就分析到这里。
\ No newline at end of file
+到此，关于自适应拓展的原理，实现就分析完了。总的来说自适应拓展整个逻辑还是很复杂的，并不是很容易弄懂。因此，大家在阅读该部分源码时，耐心一些。同时多进行调试，也可以通过生成好的代码思考代码的生成逻辑。好了，本篇文章就分析到这里。

[dubbo-website] branch master updated: update: (zh-cn)download.md (#545)

2020-01-06 Thread wangxin

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 10ca85f  update: (zh-cn)download.md (#545)
10ca85f is described below

commit 10ca85fec745f376e6269c474567db94ac257a73
Author: withthewind 
AuthorDate: Tue Jan 7 15:56:02 2020 +0800

update: (zh-cn)download.md (#545)
---
 blog/zh-cn/download.md | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/blog/zh-cn/download.md b/blog/zh-cn/download.md
index d08127d..1ecadbf 100644
--- a/blog/zh-cn/download.md
+++ b/blog/zh-cn/download.md
@@ -17,6 +17,12 @@ description: 本文将向你介绍如何点击了解各版本详情和升级注
 > GitHub: https://github.com/apache/incubator-dubbo \
 > 发布说明：https://github.com/apache/incubator-dubbo/releases
 
+### 2.7.5 (2019-12-29)
+
+* 
[source](https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.5/apache-dubbo-2.7.5-src.zip)
 |
+[asc](https://www.apache.org/dist/dubbo/2.7.5/apache-dubbo-2.7.5-src.zip.asc) |
+[sha512](https://www.apache.org/dist/dubbo/2.7.5/apache-dubbo-2.7.5-src.zip.sha512)
+
 ### 2.7.4.1 (2019-10-27)
 
 * 
[source](https://www.apache.org/dyn/closer.cgi?path=dubbo/2.7.4.1/apache-dubbo-2.7.4.1-src.zip)
 |

[dubbo-website] branch master updated: post a blog about dubbo consistent hash implementation (#553)

2020-03-07 Thread wangxin

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 1c41196  post a blog about dubbo consistent hash implementation (#553)
1c41196 is described below

commit 1c41196ff38c31a49f925910510849921386112a
Author: Kyle 
AuthorDate: Sun Mar 8 00:21:49 2020 +0800

post a blog about dubbo consistent hash implementation (#553)
---
 blog/zh-cn/dubbo-consistent-hash-implementation.md | 128 +
 .../consistent-hash-balance-model.jpg  | Bin 0 -> 29205 bytes
 .../consistent-hash-delete-node-model.jpg  | Bin 0 -> 32314 bytes
 .../consistenthash/consistent-hash-init-model.jpg  | Bin 0 -> 29515 bytes
 .../consistent-hash-new-node-model.jpg | Bin 0 -> 35015 bytes
 .../consistent-hash-request-model.jpg  | Bin 0 -> 34165 bytes
 .../consistent-hash-virtual-node-model.jpg | Bin 0 -> 33019 bytes
 site_config/blog.js|   9 +-
 8 files changed, 136 insertions(+), 1 deletion(-)

diff --git a/blog/zh-cn/dubbo-consistent-hash-implementation.md 
b/blog/zh-cn/dubbo-consistent-hash-implementation.md
new file mode 100644
index 000..29ffb67
--- /dev/null
+++ b/blog/zh-cn/dubbo-consistent-hash-implementation.md
@@ -0,0 +1,128 @@
+---
+title: Dubbo一致性Hash负载均衡实现剖析
+keywords: Dubbo, Consistent Hash，一致性Hash，一致性哈希
+description: 本文以一般的一致性Hash实现作为引子，详细剖析了Dubbo一致性Hash负载均衡算法的实现
+---
+
+需要强调的是，Dubbo的Hash映射模型与大部分网上资料描述的**环形队列Hash映射模型**是存在一些区别的。于我而言，环形队列Hash映射模型，不足以让我对一致性Hash有足够彻底的了解。直到看懂了Dubbo的一致性Hash的实现，才觉得豁然开朗。
+
+
+
+### 一、环形队列Hash映射模型
+
+这种方案，其基础还是基于取模运算。对2^32取模，那么，Hash值的区间为[0, 2^32-1]。接下来要做的，就包括两部分：  
+
+ **a、映射服务**
+
+将服务地址（ip+端口）按照一定规则构造出特定的识别码（如md5码），再用识别码对2^32取模，确定服务在Hash值区间对应的位置。假设有Node1、Node2、Node3三个服务，其映射关系如下：
+
+![Init](../../img/blog/consistenthash/consistent-hash-init-model.jpg) 
+
+
+
+ **b、映射请求、定位服务**
+
+在发起请求时，我们往往会带上参数，而这些参数，就可以被我们用来确定具体调用哪一个服务。假设有请求R1、R2、R3，对它们的参数也经过计算特定识别码、取余的一系列运算之后，有如下映射关系：
+
+![Request](../../img/blog/consistenthash/consistent-hash-request-model.jpg) 
+
+从图中，我们可以看到，R1请求映射在0-Node1中间，R2请求映射在Node1-Node2中间，R3请求映射在Node2-Node3中间。我们取**服务Hash值大于请求Hash值**的**第一个服务**作为实际的调用服务。也就是说，R1请求将调用Node1服务，R2请求将调用Node2服务，R3请求将调用Node3服务。
+
+
+
+ **c、新增服务节点**
+
+假设新增服务Node4，映射在Node3之前，恰巧破坏了原来的一个映射关系：
+
+![New Node](../../img/blog/consistenthash/consistent-hash-new-node-model.jpg) 
+
+这样，请求R3将会实际调用服务Node4，但请求R1、R2不受影响。
+
+
+
+ **d、删除服务节点**
+
+假设服务Node2宕机，那么R2请求将会映射到Node3：
+
+![Delete 
Node](../../img/blog/consistenthash/consistent-hash-delete-node-model.jpg) 
+
+原本的R1、R3请求不受影响。
+
+
+
+> 可以看出，当新增、删除服务时，受影响的请求是有限的。不至于像简单取模映射一般，服务发生变化时，需要调整全局的映射关系。
+
+
+
+ **e、平衡性与虚拟节点**
+
+在我们上面的假设中，我们假设Node1、Node2、Node3三个服务在经过Hash映射后所分布的位置恰巧把环切成了均等的三分，请求的分布也基本是平衡的。但是实际上计算服务Hash值的时候，是很难这么巧的。也许一不小心就映射成了这个样子：
+
+![Balance](../../img/blog/consistenthash/consistent-hash-balance-model.jpg) 
+
+这样，就会导致大部分请求都会被映射到Node1上。因此，引出了虚拟节点。  
+
+所谓虚拟节点，就是除了对服务本身地址进行Hash映射外，还通过在它地址上做些处理（比如Dubbo中，在ip+port的字符串后加上计数符1、2、3..，分别代表虚拟节点1、2、3），以达到同一服务映射多个节点的目的。通过引入虚拟节点，我们可以把上图中映射给Node1的请求进一步拆分：
+
+![Virtual 
Node](../../img/blog/consistenthash/consistent-hash-virtual-node-model.jpg) 
+
+如上图所示，若有请求落在Node3-Node1'区间，该请求应该是调用Node1'服务，但是因为Node1'是Node1的虚拟节点，所以实际调用的是Node1服务。通过引入虚拟节点，请求的分布就会比较平衡了。
+
+
+
+### **二、Dubbo一致性Hash的使用与负载均衡策略的引入阶段**
+
+ **a、如何使用一致性Hash作为Dubbo的负载均衡策略？**
+
+dubbo:service、dubbo:reference、dubbo:provider、dubbo:consumer、dubbo:method这几个配置项都可以配置Dubbo的负载均衡策略，其中一致性Hash的属性值是：**consistenthash**。
+
+以dubbo:reference为例：
+
+**XML配置：**
+
+> 
+
+
+
+**Properties配置：**
+
+> dubbo.reference.loadbalance=consistenthash
+
+
+
+**注解：**
+
+> @Reference(loadbalance = "consistenthash")
+
+
+
+ **b、Dubbo负载均衡策略的引入阶段**
+
+Dubbo实现的是客户端负载均衡。关于服务接口代理类的实现，这里不做详细描述，可以参考官网：
+
+> 
服务引入：http://dubbo.apache.org/zh-cn/docs/source_code_guide/refer-service.html。  
+
+在接口代理类生成、并且装配好后，服务的调用基本是这样一个流程：proxy -> MockClusterInvoker -> 
集群策略（如：FailoverClusterInvoker） -> 根据选定的负载均衡策略确定选定的远程调用对象Invoker。  
+
+**负载均衡策略的初始化**是在AbstractClusterInvoker中的initLoadBalance方法中初始化的：
+
+```java
+protected LoadBalance initLoadBalance(List> invokers, Invocation 
invocation) {
+if (CollectionUtils.isNotEmpty(invokers)) {
+return 
ExtensionLoader.getExtensionLoader(LoadBalance.class).getExtension(invokers.get(0).getUrl()
+.getMethodParameter(RpcUtils.getMethodName(invocation), 
LOADBALANCE_KEY, DEFAULT_LOADBALANCE));
+} else {
+return 
ExtensionLoader.getExtensionLoader(LoadBalance.class).getExtension(DEFAULT_LOADBALANCE);
+}
+}
+```
+
+这部分代码逻辑分为两部分：  
+
+1、获取调用方法所配置的LOADBALANCE_KEY属性的值，LOADBALANCE_KEY这个常量的实际值为：loadbalance，即为我们的所配置的属性；
  
+
+2、利用SPI机制来初始化并加载该值所代表的负载均衡策略。
+
+
+
+所有的负载均衡策略都会继承LoadBalance接口。在各种集群策略中，最终都会调用AbstractClusterInvoker的select方法，而AbstractClusterInvoker会在doSelect中，*

[dubbo] branch master updated: upgrade fastjson to 1.2.70 (#6254)

2020-06-01 Thread wangxin

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


The following commit(s) were added to refs/heads/master by this push:
 new fbe4d7e  upgrade fastjson to 1.2.70 (#6254)
fbe4d7e is described below

commit fbe4d7e3badf3a9ee7464a5a0e11459699fbbddd
Author: 祁晓波 
AuthorDate: Mon Jun 1 14:10:03 2020 +0800

upgrade fastjson to 1.2.70 (#6254)


https://help.aliyun.com/noticelist/articleid/1060343604.html?spm=a2c4g.789004748.n2.6.3f576141SGmGhG

漏洞描述


fastjson采用黑白名单的方法来防御反序列化漏洞，导致当黑客不断发掘新的反序列化Gadgets类时，在autoType关闭的情况下仍然可能可以绕过黑白名单防御机制，造成远程命令执行漏洞。经研究，该漏洞利用门槛较低，可绕过autoType限制，风险影响较大。阿里云应急响应中心提醒fastjson用户尽快采取安全措施阻止漏洞攻击。

影响版本

fastjson <=1.2.68

fastjson sec版本 <= sec9

安全版本

fastjson >=1.2.69

fastjson sec版本 >= sec10
---
 dubbo-dependencies-bom/pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dubbo-dependencies-bom/pom.xml b/dubbo-dependencies-bom/pom.xml
index 8c4215d..eae1bc8 100644
--- a/dubbo-dependencies-bom/pom.xml
+++ b/dubbo-dependencies-bom/pom.xml
@@ -97,7 +97,7 @@
 2.1.4
 4.5.3
 4.4.6
-1.2.68
+1.2.70
 3.4.13
 4.0.1
 2.12.0

[dubbo-website] branch master updated: add developer (#591)

2020-05-19 Thread wangxin

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 545732d  add developer (#591)
545732d is described below

commit 545732d045dbbf268ac753d0f84eb62356a74c90
Author: Patrick Jiang(白泽) 
AuthorDate: Tue May 19 23:40:07 2020 -0500

add developer (#591)
---
 docs/en-us/developers/developers_dev.md | 1 +
 docs/zh-cn/developers/developers_dev.md | 1 +
 2 files changed, 2 insertions(+)

diff --git a/docs/en-us/developers/developers_dev.md 
b/docs/en-us/developers/developers_dev.md
index c485517..41ac51d 100644
--- a/docs/en-us/developers/developers_dev.md
+++ b/docs/en-us/developers/developers_dev.md
@@ -45,6 +45,7 @@ This page shows Dubbo developers. Please file PR to add or 
change items.
 | xxz | Xiaoxiang Zhai  | Souche   | Committer | +8
   |
 | codingsinger| Zechao Zheng| iQIYI| Committer | +8
   |
 | zouyx   | Yixian Zou  | Shein| Committer | +8
   |
+| baze| Chao Jiang  | Biosan   | Committer | +8
   |
 
 ### Contributors
 
diff --git a/docs/zh-cn/developers/developers_dev.md 
b/docs/zh-cn/developers/developers_dev.md
index 1f3785d..76fda17 100644
--- a/docs/zh-cn/developers/developers_dev.md
+++ b/docs/zh-cn/developers/developers_dev.md
@@ -45,6 +45,7 @@
 | xxz | Xiaoxiang Zhai  | Souche   | Committer | +8
   |
 | codingsinger| Zechao Zheng| iQIYI| Committer | +8
   |
 | zouyx   | Yixian Zou  | Shein| Committer | +8
   |
+| baze| Chao Jiang  | Biosan   | Committer | +8
   |
 
 ### 贡献者

[dubbo-hessian-lite] branch master updated: Bump junit from 4.12 to 4.13.1 (#40)

2021-01-18 Thread wangxin

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-hessian-lite.git


The following commit(s) were added to refs/heads/master by this push:
 new 6192ec7  Bump junit from 4.12 to 4.13.1 (#40)
6192ec7 is described below

commit 6192ec7faf09b938387d106e58da15acb0fe0593
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Mon Jan 18 20:33:40 2021 +0800

Bump junit from 4.12 to 4.13.1 (#40)

Bumps [junit](https://github.com/junit-team/junit4) from 4.12 to 4.13.1.
- [Release notes](https://github.com/junit-team/junit4/releases)
- 
[Changelog](https://github.com/junit-team/junit4/blob/main/doc/ReleaseNotes4.12.md)
- [Commits](https://github.com/junit-team/junit4/compare/r4.12...r4.13.1)

Signed-off-by: dependabot[bot] 

Co-authored-by: dependabot[bot] 
<49699333+dependabot[bot]@users.noreply.github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index b09383a..592089b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
 Hessian Lite(Dubbo embed version)
 
 
-4.12
+4.13.1
 2.18.3
 1.3
 0.8.2

[dubbo-hessian-lite] branch master updated: Update README.md (#39)

2021-01-18 Thread wangxin

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-hessian-lite.git


The following commit(s) were added to refs/heads/master by this push:
 new f8f425b  Update README.md (#39)
f8f425b is described below

commit f8f425b63ef2517779b2e8d1dfba7185eb8497b9
Author: penggy 
AuthorDate: Mon Jan 18 20:34:09 2021 +0800

Update README.md (#39)

fix dependency mistake
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4feeffe..b519451 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Now we are trying to build a hessian group 
https://github.com/hessian-group to m
 com.alibaba
 hessian-lite
 3.2.6
-
+
 ```
 ## Release
 Deploy to maven repo:

[dubbo-website] branch master updated: Update recommend.md (#769)

2021-04-07 Thread wangxin

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 d2355aa  Update recommend.md (#769)
d2355aa is described below

commit d2355aaea7ddcc152ec6f04b799d5357e9f3a6d5
Author: youngfor9 <30340350+youngf...@users.noreply.github.com>
AuthorDate: Thu Apr 8 10:07:50 2021 +0800

Update recommend.md (#769)
---
 content/zh/docs/v2.7/user/recommend.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/zh/docs/v2.7/user/recommend.md 
b/content/zh/docs/v2.7/user/recommend.md
index d487456..8f81c56 100644
--- a/content/zh/docs/v2.7/user/recommend.md
+++ b/content/zh/docs/v2.7/user/recommend.md
@@ -10,7 +10,7 @@ description: "Dubbo 推荐用法举例"
 
 原因如下：
 
-* 作服务的提供方，比服务消费方更清楚服务的性能参数，如调用的超时时间、合理的重试次数等
+* 作为服务的提供方，比服务消费方更清楚服务的性能参数，如调用的超时时间、合理的重试次数等
 * 在 Provider 端配置后，Consumer 端不配置则会使用 Provider 端的配置，即 Provider 端的配置可以作为 Consumer 
的缺省值 [^1]。否则，Consumer 会使用 Consumer 端的全局设置，这对于 Provider 是不可控的，并且往往是不合理的
 
 Provider 端尽量多配置 Consumer 端的属性，让 Provider 的实现者一开始就思考 Provider 端的服务特点和服务质量等问题。

[dubbo] 35/36: Merge branch 'master' of https://github.com/lovepoem/dubbo

2023-05-30 Thread wangxin

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 96292bc07b45acce266a240e213c307ac47c6471
Merge: a3a578f9ba d8e7b53f01
Author: Xin Wang 
AuthorDate: Tue May 16 17:12:53 2023 +0800

Merge branch 'master' of https://github.com/lovepoem/dubbo

[dubbo] 31/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 6eaa230fa2f96629ebb810e9460381ea89d981ad
Merge: 857056034b 4c8a54ecff
Author: Xin Wang 
AuthorDate: Thu Aug 26 09:11:23 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 .github/workflows/build-and-test.yml   |  34 +-
 .travis.yml|  20 +-
 CONTRIBUTING.md|  19 +-
 Jenkinsfile|  30 +-
 NOTICE |   8 -
 PULL_REQUEST_TEMPLATE.md   |  15 +-
 README.md  |  17 +-
 SECURITY.md|   6 +-
 dubbo-all/pom.xml  |  40 +-
 dubbo-bom/pom.xml  |  64 +++
 dubbo-cluster/pom.xml  |  12 +
 .../java/org/apache/dubbo/rpc/cluster/Cluster.java |   6 +-
 .../apache/dubbo/rpc/cluster/ClusterInvoker.java   |   2 +-
 .../org/apache/dubbo/rpc/cluster/Constants.java|   4 +
 .../{support => }/ProviderURLMergeProcessor.java   |  18 +-
 .../org/apache/dubbo/rpc/cluster/RouterChain.java  |   4 +-
 .../cluster/configurator/AbstractConfigurator.java |  39 +-
 .../cluster/configurator/parser/ConfigParser.java  |  45 +-
 .../rpc/cluster/directory/AbstractDirectory.java   |   8 +-
 .../ConsumerContextClusterInterceptor.java |   5 +-
 .../interceptor/ZoneAwareClusterInterceptor.java   |   7 +-
 .../loadbalance/ShortestResponseLoadBalance.java   |   2 +-
 .../dubbo/rpc/cluster/router/address/Address.java  |  24 +-
 .../router/address/AddressInvokersSelector.java|  58 +++
 .../AddressRouterFactory.java} |  73 +--
 .../cluster/router/condition/ConditionRouter.java  |  65 ++-
 .../router/condition/ConditionRouterFactory.java   |   2 +-
 .../config/model/ConditionRuleParser.java  |  14 +-
 .../rpc/cluster/router/script/ScriptRouter.java|  47 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java|  14 +-
 .../cluster/router/tag/model/TagRuleParser.java|  19 +-
 ...{ForkingCluster.java => BroadcastCluster2.java} |   8 +-
 .../cluster/support/BroadcastCluster2Invoker.java  | 180 +++
 .../cluster/support/BroadcastClusterInvoker.java   |   2 +-
 .../dubbo/rpc/cluster/support/BroadcastResult.java |  99 
 .../dubbo/rpc/cluster/support/ClusterUtils.java| 110 +---
 .../dubbo/rpc/cluster/support/FailbackCluster.java |   2 +-
 .../dubbo/rpc/cluster/support/FailfastCluster.java |   2 +-
 .../dubbo/rpc/cluster/support/FailoverCluster.java |   2 +-
 .../cluster/support/FailoverClusterInvoker.java|  20 +-
 .../dubbo/rpc/cluster/support/FailsafeCluster.java |   2 +-
 .../dubbo/rpc/cluster/support/ForkingCluster.java  |   2 +-
 .../cluster/support/MergeableClusterInvoker.java   |   8 +-
 .../DefaultProviderURLMergeProcessor.java} | 264 +-
 .../support/migration/MigrationClusterInvoker.java |   4 +-
 .../cluster/support/migration/MigrationRule.java   |  37 +-
 .../cluster/support/registry/ZoneAwareCluster.java |   2 +-
 .../support/registry/ZoneAwareClusterInvoker.java  | 105 ++--
 .../internal/org.apache.dubbo.rpc.cluster.Cluster  |   1 +
 ...che.dubbo.rpc.cluster.ProviderURLMergeProcessor |   1 +
 .../org.apache.dubbo.rpc.cluster.RouterFactory |   2 +-
 .../configurator/parser/ConfigParserTest.java  |  12 +-
 .../ConsumerContextClusterInterceptorTest.java | 107 
 .../ZoneAwareClusterInterceptorTest.java   |  97 
 .../loadbalance/RoundRobinLoadBalanceTest.java |   3 +-
 .../dubbo/rpc/cluster/router/MockInvoker.java  |   6 +
 .../dubbo/rpc/cluster/router/TagRouterTest.java|   2 +-
 .../cluster/router/address/AddressRouterTest.java  |  50 ++
 .../router/condition/ConditionRouterTest.java  |  35 +-
 .../rpc/cluster/support/ClusterUtilsTest.java  |   4 +
 .../support/FailoverClusterInvokerTest.java|  28 ++
 .../support/MergeableClusterInvokerTest.java   |   3 +-
 .../internal/org.apache.dubbo.rpc.ZoneDetector |   1 +
 .../org.apache.dubbo.rpc.cluster.RouterFactory |   1 +
 .../cluster/router/file/availablerule.javascript   |  17 +-
 .../rpc/cluster/router/file/methodrule.javascript  |  17 +-
 .../router/file/notAvailablerule.javascript|  17 +-
 .../alibaba/dubbo/config/annotation/Reference.java |   7 +-
 .../alibaba/dubbo/config/annotation/Service.java   |   7 +-
 .../apache/dubbo/common/BaseServiceMetadata.java   |  17 +-
 .../java/org/apache/dubbo/common/Parameters.java   |   8 +-
 .../src/main/java/org/apache/dubbo/common/URL.java |  47 +-
 .../java/org/apache/dubbo/common/URLBuilder.java   |   4 +-
 .../java/org/apache/dubbo/common/URLStrParser.java |  36 +-
 .../main/java/org/apache/dubbo/common/Version.java |   7 +-
 .../common/be

[dubbo] 28/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 d89027f21677937ac29cbf41ca3bb76efca83930
Merge: 2f9115f1e4 ca794b627c
Author: Xin Wang 
AuthorDate: Fri Jul 30 19:48:48 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 .../cluster/support/BroadcastClusterInvoker.java   |  2 +-
 .../cluster/support/migration/MigrationRule.java   | 27 ++
 .../ReferenceAnnotationBeanPostProcessor.java  |  2 ++
 dubbo-dependencies-bom/pom.xml |  2 +-
 .../registry/nacos/NacosServiceDiscovery.java  |  3 ++-
 .../dubbo/remoting/transport/CodecSupport.java |  5 +---
 6 files changed, 30 insertions(+), 11 deletions(-)

[dubbo] 30/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 d4cd7537501c219062bc0f98ba6d18a4d0c31112
Merge: e9d73729cf 6acd5a2a93
Author: Xin Wang 
AuthorDate: Wed Aug 18 19:56:46 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 .../dubbo/config/AbstractMethodConfigTest.java | 41 --
 .../factory/annotation/ReferenceBeanBuilder.java   | 19 ++-
 .../annotation/ServiceClassPostProcessor.java  | 23 +---
 .../config/spring/util/DubboAnnotationUtils.java   | 64 +-
 .../factory/annotation/ParameterConvertTest.java   | 60 
 .../dubbo-remoting-zookeeper-curator5/pom.xml  |  2 +-
 6 files changed, 156 insertions(+), 53 deletions(-)

[dubbo] 21/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 35bc823c905f23c67e181152e0d10fc6aa1d9043
Merge: 153a67b716 b194bb0ea7
Author: Xin Wang 
AuthorDate: Thu Jun 24 09:04:29 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 .../src/main/java/org/apache/dubbo/common/URL.java |   2 +-
 .../java/org/apache/dubbo/common/URLStrParser.java |  36 +-
 .../org/apache/dubbo/common/utils/ClassHelper.java | 153 --
 .../org/apache/dubbo/common/utils/PojoUtils.java   |  24 +-
 .../org/apache/dubbo/config/ReferenceConfig.java   |  24 +-
 .../org/apache/dubbo/config/ServiceConfig.java |  32 +-
 .../dubbo/config/bootstrap/DubboBootstrap.java |   2 +-
 .../bootstrap/builders/MetadataReportBuilder.java  |  11 +
 .../dubbo/config/utils/ConfigValidationUtils.java  |   3 +
 .../apache/dubbo/config/AbstractConfigTest.java|   2 +
 .../builders/MetadataReportBuilderTest.java|  10 +-
 .../DubboClassPathBeanDefinitionScanner.java   |  23 +-
 .../org/apache/dubbo/config/spring/ConfigTest.java |   9 +-
 .../ReferenceAnnotationBeanPostProcessorTest.java  |  23 +-
 .../apache/dubbo/config/spring/init-reference.xml  |   2 +-
 dubbo-dependencies-bom/pom.xml |   2 +-
 .../dubbo-dependencies-zookeeper/pom.xml   |   2 +-
 .../client/EventPublishingServiceDiscovery.java|   1 +
 .../apache/dubbo/registry/redis/RedisRegistry.java |  27 +-
 .../dubbo/registry/redis/RedisRegistryTest.java| 104 +++-
 .../support/command/StatusTelnetHandler.java   |   5 +-
 .../org/apache/dubbo/rpc/filter/GenericFilter.java |   7 +-
 .../dubbo/rpc/protocol/AbstractProtocol.java   | 232 -
 .../dubbo/rpc/protocol/AbstractProxyProtocol.java  |   7 +-
 .../dubbo/rpc/protocol/DelegateExporterMap.java|  86 
 .../dubbo/rpc/protocol/dubbo/DubboExporter.java|  13 +-
 .../dubbo/rpc/protocol/dubbo/DubboProtocol.java|  11 +-
 .../dubbo/status/ThreadPoolStatusCheckerTest.java  |  28 +-
 .../dubbo/rpc/protocol/injvm/InjvmExporter.java|  15 +-
 .../dubbo/rpc/protocol/injvm/InjvmInvoker.java |  12 +-
 .../dubbo/rpc/protocol/injvm/InjvmProtocol.java|  17 +-
 .../rpc/protocol/injvm/InjvmProtocolTest.java  |  29 +-
 .../dubbo/rpc/protocol/thrift/ThriftProtocol.java  | 544 ++---
 pom.xml|   2 +-
 34 files changed, 792 insertions(+), 708 deletions(-)

[dubbo] 17/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 d036b01248f019190eacbd2dc3e757830267670f
Merge: f63a8bb665 0f5040b19f
Author: Xin Wang 
AuthorDate: Mon Apr 12 14:57:23 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 .github/workflows/build-and-test.yml   |  28 +-
 CONTRIBUTING.md|   2 +-
 PULL_REQUEST_TEMPLATE.md   |   8 +-
 README.md  |  14 +-
 SECURITY.md|   6 +-
 dubbo-bom/pom.xml  |  26 ++
 .../apache/dubbo/rpc/cluster/ClusterInvoker.java   |   2 +-
 .../cluster/configurator/AbstractConfigurator.java |  21 +-
 .../cluster/configurator/parser/ConfigParser.java  |  44 +-
 .../config/model/ConditionRuleParser.java  |  14 +-
 .../rpc/cluster/router/script/ScriptRouter.java|  47 +-
 .../cluster/router/tag/model/TagRuleParser.java|  19 +-
 .../support/migration/MigrationClusterInvoker.java |   4 +-
 .../cluster/support/migration/MigrationRule.java   |  10 +-
 .../support/registry/ZoneAwareClusterInvoker.java  | 104 ++---
 .../org.apache.dubbo.rpc.cluster.RouterFactory |   1 -
 .../configurator/parser/ConfigParserTest.java  |  12 +-
 .../dubbo/rpc/cluster/router/TagRouterTest.java|   2 +-
 .../org.apache.dubbo.rpc.cluster.RouterFactory |   1 +
 .../java/org/apache/dubbo/common/Parameters.java   |   8 +-
 .../main/java/org/apache/dubbo/common/Version.java |   7 +-
 .../common/beanutil/JavaBeanSerializeUtil.java |   4 +-
 .../org/apache/dubbo/common/bytecode/Mixin.java|   2 +-
 .../org/apache/dubbo/common/bytecode/Wrapper.java  |  16 +-
 .../dubbo/common/compiler/support/ClassUtils.java  |  12 +-
 .../common/compiler/support/CtClassBuilder.java|  14 +-
 .../dubbo/common/constants/CommonConstants.java|  21 +-
 .../dubbo/common/constants/RegistryConstants.java  |   2 +-
 .../extension/AdaptiveClassCodeGenerator.java  |   2 +-
 .../dubbo/common/extension/ExtensionLoader.java|  11 +-
 .../extension/support/ActivateComparator.java  |  16 +-
 .../java/org/apache/dubbo/common/json/JSON.java|  20 +-
 .../common/threadpool/ThreadlessExecutor.java  |   8 +-
 .../dubbo/common/utils/CompatibleTypeUtils.java|   8 +-
 .../org/apache/dubbo/common/utils/MethodUtils.java |   8 +-
 .../org/apache/dubbo/common/utils/PojoUtils.java   | 155 +--
 .../apache/dubbo/common/utils/ReflectUtils.java|   2 +-
 .../dubbo/common/utils/SerializeClassChecker.java  | 150 +++
 .../org/apache/dubbo/common/utils/StringUtils.java |   4 +-
 .../java/org/apache/dubbo/config/Constants.java|   2 +
 .../dubbo/config/annotation/DubboReference.java|   7 +
 .../dubbo/rpc/support/GroupServiceKeyCache.java|   2 +-
 .../main/resources/security/serialize.blockedlist  | 167 +++
 .../apache/dubbo/common/bytecode/WrapperTest.java  |  52 ++-
 .../common/extension/ExtensionLoaderTest.java  |   9 +
 .../extension/activate/ActivateWrapperExt1.java|  25 +-
 .../activate/impl/ActivateWrapperExt1Impl1.java|  28 +-
 .../activate/impl/ActivateWrapperExt1Impl2.java|  28 +-
 .../activate/impl/ActivateWrapperExt1Wrapper.java  |  32 +-
 .../extension/support/ActivateComparatorTest.java  |  22 +-
 .../threadlocal/InternalThreadLocalTest.java   |   1 +
 .../apache/dubbo/common/utils/NetUtilsTest.java|  11 +-
 .../apache/dubbo/common/utils/PojoUtilsTest.java   |  50 +++
 .../common/utils/SerializeClassCheckerTest.java| 105 +
 ...o.common.extension.activate.ActivateWrapperExt1 |   3 +
 .../org/apache/dubbo/config/ReferenceConfig.java   |  40 +-
 .../org/apache/dubbo/config/ServiceConfig.java |   5 +-
 .../dubbo/config/bootstrap/DubboBootstrap.java |   8 +-
 .../dubbo/config/utils/ConfigValidationUtils.java  |  14 +-
 .../apache/dubbo/config/AbstractConfigTest.java|  15 +-
 .../ReferenceAnnotationBeanPostProcessor.java  |  73 ++-
 .../annotation/ServiceClassPostProcessor.java  |   4 +-
 .../context/DubboBootstrapApplicationListener.java |   7 +
 ...bboBootstrapStartStopListenerSpringAdapter.java |   2 +-
 ...DubboLifecycleComponentApplicationListener.java |   4 +-
 .../properties/DefaultDubboConfigBinder.java   |  22 +
 .../spring/schema/DubboBeanDefinitionParser.java   |   4 +-
 .../config/spring/util/DubboAnnotationUtils.java   |   2 +-
 .../ReferenceAnnotationBeanPostProcessorTest.java  |  32 +-
 .../annotation/ReferenceBeanBuilderTest.java   |   4 +-
 .../META-INF/spring/dubbo-generic-consumer.xml |   4 +-
 .../spring/dubbo-nacos-consumer-context.xml|  12 +-
 .../spring/dubbo-nacos-provider-context.xml|   6 +-
 .../apollo/ApolloDynamicConfigurationTest.java |  17 +-
 .../support/apollo/EmbeddedApolloJunit5.java   | 194 
 .../support/nacos

[dubbo] 19/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 6bdea3fe0f8b12973331fb351188c9771606beb0
Merge: 22f0dc273d ff50f916a8
Author: Xin Wang 
AuthorDate: Fri May 21 11:35:55 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 dubbo-all/pom.xml  |   8 +
 dubbo-cluster/pom.xml  |   6 +
 .../org/apache/dubbo/rpc/cluster/RouterChain.java  |   4 +-
 .../rpc/cluster/directory/AbstractDirectory.java   |   4 +-
 .../dubbo/rpc/cluster/router/address/Address.java  |  35 +-
 .../router/address/AddressInvokersSelector.java|  58 +++
 .../router/address/AddressRouterFactory.java   |  21 +-
 .../cluster/router/condition/ConditionRouter.java  |   8 +-
 .../rpc/cluster/support/BroadcastCluster2.java |  66 +--
 .../cluster/support/BroadcastCluster2Invoker.java  | 180 +++
 .../dubbo/rpc/cluster/support/BroadcastResult.java |  99 
 .../internal/org.apache.dubbo.rpc.cluster.Cluster  |   1 +
 .../org.apache.dubbo.rpc.cluster.RouterFactory |   1 +
 .../dubbo/rpc/cluster/router/MockInvoker.java  |   6 +
 .../cluster/router/address/AddressRouterTest.java  |  50 ++
 .../src/main/java/org/apache/dubbo/common/URL.java |  12 +-
 .../java/org/apache/dubbo/common/URLBuilder.java   |   4 +-
 .../dubbo/common/constants/CommonConstants.java|   2 +
 .../dubbo/common/constants/RegistryConstants.java  |   2 -
 .../extension/support/ActivateComparator.java  |  15 +-
 .../org/apache/dubbo/config/AbstractConfig.java|   2 +
 .../apache/dubbo/config/MetadataReportConfig.java  |  14 +
 .../java/org/apache/dubbo/config/MethodConfig.java |  26 +-
 .../apache/dubbo/rpc/support/ProtocolUtils.java|   7 +
 .../org/apache/dubbo/common/URLBuilderTest.java|  44 ++
 .../test/java/org/apache/dubbo/common/URLTest.java |  21 +-
 .../extension/support/ActivateComparatorTest.java  |  26 +
 .../common/extension/support/Order0Filter0.java|  30 +-
 .../common/extension/support/Order0Filter1.java|  30 +-
 .../common/extension/support/Order0Filter2.java|  30 +-
 .../java/com/alibaba/dubbo/rpc/RpcInvocation.java  |   7 +-
 .../org/apache/dubbo/config/ServiceConfig.java |  82 ++-
 .../dubbo/config/MetadataReportConfigTest.java |  28 +-
 .../org/apache/dubbo/config/MethodConfigTest.java  |  15 +-
 .../apache/dubbo/config/ReferenceConfigTest.java   |  11 +-
 .../AnnotatedInterfaceConfigBeanBuilder.java   |   7 +
 .../ReferenceAnnotationBeanPostProcessor.java  |  14 +-
 .../factory/annotation/ReferenceBeanBuilder.java   |  18 +
 .../context/DubboBootstrapApplicationListener.java |   3 +-
 ...DubboLifecycleComponentApplicationListener.java |   1 -
 .../annotation/DubboComponentScanRegistrar.java|  12 +-
 .../spring/extension/SpringExtensionFactory.java   |   3 +
 .../spring/schema/DubboNamespaceHandler.java   |   2 +-
 .../src/main/resources/META-INF/dubbo.xsd  |   5 +
 .../dubbo/config/spring/api/MethodCallback.java|  75 ++-
 ...eferencePostProcessAfterInitializationTest.java |  96 
 .../annotation/MethodConfigCallbackTest.java   |  81 +++
 .../config/spring/impl/MethodCallbackImpl.java | 115 ++---
 .../support/nacos/NacosDynamicConfiguration.java   |   6 -
 .../nacos/NacosDynamicConfigurationFactory.java|   6 +-
 .../support/zookeeper/CacheListener.java   |   7 +-
 dubbo-dependencies-bom/pom.xml |  15 +-
 .../dubbo-dependencies-zookeeper/pom.xml   |   2 +-
 .../dubbo/cache/support/AbstractCacheFactory.java  |  25 +-
 .../metadata/definition/TypeDefinitionBuilder.java |   5 -
 .../definition/builder/DefaultTypeBuilder.java |  18 +-
 .../report/support/AbstractMetadataReport.java |  34 +-
 .../metadata/store/nacos/NacosMetadataReport.java  |  70 ++-
 .../store/nacos/NacosMetadataReportFactory.java|  10 +-
 .../zookeeper/ZookeeperMetadataReportTest.java | 556 +++--
 .../registry/client/AbstractServiceDiscovery.java  |   4 +-
 .../registry/client/DefaultServiceInstance.java|   4 +-
 .../client/EventPublishingServiceDiscovery.java|  10 +-
 .../dubbo/registry/client/InstanceAddressURL.java  |   4 +
 .../registry/client/ServiceDiscoveryRegistry.java  |   3 +
 .../client/ServiceDiscoveryRegistryDirectory.java  |   3 +-
 .../listener/ServiceInstancesChangedListener.java  |  10 +-
 .../client/migration/MigrationInvoker.java |   7 +-
 .../client/migration/MigrationRuleHandler.java |   2 -
 .../registry/integration/DynamicDirectory.java |   7 +-
 .../registry/integration/RegistryDirectory.java|  72 +--
 .../registry/integration/RegistryProtocol.java |  19 +-
 .../dubbo/registry/nacos/NacosRegistryFactory.java |  11 +-
 .../nacos/util/NacosNamingServiceUtils.java|   3 +
 .../zookeeper/ZookeeperServiceDiscovery.java   |  10

[dubbo] 20/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 153a67b7161308a9737198d8611fe2e5d7920828
Merge: 6bdea3fe0f 149d1f68e5
Author: Xin Wang 
AuthorDate: Thu Jun 10 11:49:31 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 NOTICE |   8 -
 PULL_REQUEST_TEMPLATE.md   |   7 +-
 dubbo-all/pom.xml  |  24 +-
 dubbo-bom/pom.xml  |  33 +++
 .../org/apache/dubbo/rpc/cluster/Constants.java|   1 +
 .../{support => }/ProviderURLMergeProcessor.java   |  18 +-
 .../cluster/configurator/AbstractConfigurator.java |  44 +--
 .../ConsumerContextClusterInterceptor.java |   5 +-
 .../interceptor/ZoneAwareClusterInterceptor.java   |   7 +-
 .../dubbo/rpc/cluster/support/ClusterUtils.java| 116 +---
 .../dubbo/rpc/cluster/support/FailbackCluster.java |   2 +-
 .../dubbo/rpc/cluster/support/FailfastCluster.java |   2 +-
 .../dubbo/rpc/cluster/support/FailoverCluster.java |   2 +-
 .../cluster/support/FailoverClusterInvoker.java|  20 +-
 .../dubbo/rpc/cluster/support/FailsafeCluster.java |   2 +-
 .../dubbo/rpc/cluster/support/ForkingCluster.java  |   2 +-
 .../DefaultProviderURLMergeProcessor.java} | 270 -
 .../cluster/support/registry/ZoneAwareCluster.java |   2 +-
 .../support/registry/ZoneAwareClusterInvoker.java  |   6 +-
 ...che.dubbo.rpc.cluster.ProviderURLMergeProcessor |   1 +
 .../ConsumerContextClusterInterceptorTest.java | 107 +++
 .../ZoneAwareClusterInterceptorTest.java   |  97 ++
 .../rpc/cluster/support/ClusterUtilsTest.java  |   4 +
 .../support/FailoverClusterInvokerTest.java|  28 ++
 .../internal/org.apache.dubbo.rpc.ZoneDetector |   1 +
 .../cluster/router/file/availablerule.javascript   |  17 +-
 .../rpc/cluster/router/file/methodrule.javascript  |  17 +-
 .../router/file/notAvailablerule.javascript|  17 +-
 .../apache/dubbo/common/BaseServiceMetadata.java   |  13 +-
 .../src/main/java/org/apache/dubbo/common/URL.java |  12 +-
 .../dubbo/common/bytecode/ClassGenerator.java  |   2 +-
 .../common/bytecode/CustomizedLoaderClassPath.java |  10 +-
 .../org/apache/dubbo/common/compiler/Compiler.java |   3 +-
 .../common/compiler/support/JavassistCompiler.java |   2 +
 .../dubbo/common/compiler/support/JdkCompiler.java |   2 +
 .../dubbo/common/config/ConfigurationUtils.java|   4 +-
 .../dubbo/common/constants/CommonConstants.java|  13 +
 .../dubbo/common/extension/ExtensionLoader.java|  87 --
 .../apache/dubbo/common/threadpool/ThreadPool.java |   3 +-
 .../manager/DefaultExecutorRepository.java |   5 +-
 .../support/cached/CachedThreadPool.java   |   2 +
 .../threadpool/support/eager/EagerThreadPool.java  |   2 +
 .../threadpool/support/fixed/FixedThreadPool.java  |   2 +
 .../support/limited/LimitedThreadPool.java |   2 +
 .../dubbo/common/utils/CharSequenceComparator.java |   2 +-
 .../org/apache/dubbo/common/utils/LFUCache.java| 214 +++---
 .../org/apache/dubbo/common/utils/LRUCache.java|  46 ++-
 .../dubbo/common/utils/MethodComparator.java   |   2 +-
 .../org/apache/dubbo/common/utils/NetUtils.java|  65 ++--
 .../org/apache/dubbo/common/utils/UrlUtils.java|   2 +-
 .../apache/dubbo/config/ConfigCenterConfig.java|   4 +
 .../java/org/apache/dubbo/config/Constants.java|  12 +-
 .../org/apache/dubbo/config/ConsumerConfig.java|  19 ++
 .../org/apache/dubbo/config/ProtocolConfig.java|   4 +-
 .../org/apache/dubbo/config/ProviderConfig.java|   2 +-
 .../org/apache/dubbo/config/RegistryConfig.java|   8 +-
 .../java/org/apache/dubbo/config/SslConfig.java|  29 ++
 .../apache/dubbo/config/context/ConfigManager.java |  24 +-
 .../dubbo/common/BaseServiceMetadataTest.java  |   6 +-
 .../test/java/org/apache/dubbo/common/URLTest.java |  98 ++
 .../common/compiler/support/JavaCodeTest.java  |   2 +-
 .../config/EnvironmentConfigurationTest.java   |   2 +-
 .../common/extension/ExtensionLoaderTest.java  | 158 --
 .../duplicated/DuplicatedOverriddenExt.java|  13 +-
 .../duplicated/DuplicatedWithoutOverriddenExt.java |  14 +-
 .../duplicated/impl/DuplicatedOverriddenExt1.java  |  16 +-
 .../duplicated/impl/DuplicatedOverriddenExt2.java  |  16 +-
 .../impl/DuplicatedWithoutOverriddenExt1.java  |  16 +-
 .../impl/DuplicatedWithoutOverriddenExt2.java  |  16 +-
 .../dubbo/common/infra/InfraAdapterTest.java   |  67 +
 .../concurrent/ScheduledCompletableFutureTest.java |  53 
 .../threadpool/manager/ExecutorRepositoryTest.java |  58 
 .../apache/dubbo/common/utils/ConfigUtilsTest.java |   8 +-
 .../org/apache/dubbo/common/utils/JVMUtilTest.java |  10 +
 .../apache/dubbo/common/utils/LFUCacheTest.java|

[dubbo] branch master updated (e1a7991ab8 -> 1f84cdcfed)

2023-05-30 Thread wangxin

This is an automated email from the ASF dual-hosted git repository.

wangxin pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git


from e1a7991ab8 Fix When serialization fails, the code value in 
org.apache.dubbo.rpc.RpcException is set incorrectly. (#12279) (#12280)
 add a6247c5247 remove not used import
 add e989044c82 Merge remote-tracking branch 'dubbo_remote/master'
 add 5e3da9f28c remove unused import
 add 14ec387cf4 Merge remote-tracking branch 'dubbo_remote/master'
 add 954353153f Merge remote-tracking branch 'dubbo_remote/master'
 add 8a7eb600d3 Merge remote-tracking branch 'dubbo_remote/master'
 add d8f5e9bdb8 Merge remote-tracking branch 'dubbo_remote/master'
 add eb7058935e Merge remote-tracking branch 'dubbo_remote/master'
 add 87467a6021 Merge remote-tracking branch 'dubbo_remote/master'
 add de5712cbf0 Merge remote-tracking branch 'dubbo_remote/master'
 add 735a9ff02d Merge remote-tracking branch 'dubbo_remote/master'
 add a78b635311 Merge remote-tracking branch 'dubbo_remote/master'
 add 5e2dc174f0 Merge remote-tracking branch 'dubbo_remote/master'
 add 93dde74847 Merge remote-tracking branch 'dubbo_remote/master'
 add 3d82a07a58 Merge remote-tracking branch 'dubbo_remote/master'
 add 00392e2c55 Merge remote-tracking branch 'dubbo_remote/master'
 add d3a76eb426 Merge remote-tracking branch 'dubbo_remote/master'
 add 005f1772ef Merge remote-tracking branch 'dubbo_remote/master'
 add a5c04b465e Merge remote-tracking branch 'dubbo_remote/master'
 add 478c8c504a Merge remote-tracking branch 'dubbo_remote/master'
 add dbf6502f75 Merge remote-tracking branch 'dubbo_remote/master'
 add b6ec0df7ec Merge remote-tracking branch 'dubbo_remote/master'
 add 957e7db01b Merge remote-tracking branch 'dubbo_remote/master'
 add 6986afbc4b Merge remote-tracking branch 'dubbo_remote/master'
 add 258857a879 Merge remote-tracking branch 'dubbo_remote/master'
 add 6ebc6853ca Merge remote-tracking branch 'dubbo_remote/master'
 add b24140df7a Merge remote-tracking branch 'dubbo_remote/master'
 add ed5fd8aa15 Merge remote-tracking branch 'dubbo_remote/master'
 add 507400abf6 Merge remote-tracking branch 'dubbo_remote/master'
 add 443e1507df Merge remote-tracking branch 'dubbo_remote/master'
 add affc976120 fix-3678
 add 9bd5e1a789 Merge remote-tracking branch 'dubbo_remote/master'
 add c4f6f6533b Merge remote-tracking branch 'dubbo_remote/master'
 add ecbc6a2ed9 Merge remote-tracking branch 'dubbo_remote/master'
 add 32f26321eb Merge remote-tracking branch 'dubbo_remote/master'
 add 0811095867 Merge branch 'master' of https://github.com/lovepoem/dubbo
 add 3f68772879 Merge remote-tracking branch 'dubbo_remote/master'
 add ca96d234c0 Merge remote-tracking branch 'dubbo_remote/master'
 add df368b045a Merge remote-tracking branch 'dubbo_remote/master'
 add c8f237fa40 Merge remote-tracking branch 'dubbo_remote/master'
 add cd8b1ec516 Merge remote-tracking branch 'dubbo_remote/master'
 add 8bd4d05ce7 Merge remote-tracking branch 'dubbo_remote/master'
 add ded4e0dbc8 Merge remote-tracking branch 'dubbo_remote/master'
 add b2baa2f36a Merge remote-tracking branch 'dubbo_remote/master'
 add ba575cb803 Merge remote-tracking branch 'dubbo_remote/master'
 add ff6e927cd9 Merge remote-tracking branch 'dubbo_remote/master'
 add 8353c376a9 Merge remote-tracking branch 'dubbo_remote/master'
 add 83875b0b98 Merge remote-tracking branch 'dubbo_remote/master'
 add e29abc9124 Merge remote-tracking branch 'dubbo_remote/master'
 add 1a12dd7c16 Merge remote-tracking branch 'dubbo_remote/master'
 add 54b32eac4c Merge remote-tracking branch 'dubbo_remote/master'
 add de80a65da1 Merge remote-tracking branch 'dubbo_remote/master'
 add be696db047 Merge remote-tracking branch 'dubbo_remote/master'
 add 2ad6ccfe62 Merge remote-tracking branch 'dubbo_remote/master'
 add f60d1ac6fe Merge remote-tracking branch 'dubbo_remote/master'
 add d465534dcf Merge remote-tracking branch 'dubbo_remote/master'
 add de3a7ff623 Merge remote-tracking branch 'dubbo_remote/master'
 add e805d4ffd5 Merge remote-tracking branch 'dubbo_remote/master'
 add 383a3ce4a2 Merge remote-tracking branch 'dubbo_remote/master'
 add 6737549980 Merge remote-tracking branch 'dubbo_remote/master'
 add d82764ab85 Merge remote-tracking branch 'dubbo_remote/master'
 add 8600c53afe Merge remote-tracking branch 'dubbo_remote/master'
 add 8848769aea Merge remote-tracking branch 'dubbo_remote/master'
 add c1bb5d32c2 Merge remote-tracking branch 'dubbo_remote/master'
 add ea323f73af Merge remote-tracking branch 'dubbo_remote/master'
 add 6906b0d528 Merge remote-tracking branch 'dubbo_remote/master'
 add f5ebbe29fa Merge remote-tracking branch 'dubbo_remote/master'
 add 2a7319c618

[dubbo] 01/36: Merge remote-tracking branch 'dubbo_rem/master' into master

2023-05-30 Thread wangxin

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 537682b8cf0fd4ed1f7493478b54047ea3aa40f3
Merge: da504f6462 f9f10ba522
Author: Xin Wang 
AuthorDate: Tue Oct 13 11:19:45 2020 +0800

Merge remote-tracking branch 'dubbo_rem/master' into master

 .../org/apache/dubbo/config/ProtocolConfig.java| 55 +
 .../org/apache/dubbo/config/ProviderConfig.java| 44 ++
 dubbo-config/dubbo-config-spring/pom.xml   |  6 --
 .../src/main/resources/META-INF/compat/dubbo.xsd   | 10 +++
 .../src/main/resources/META-INF/dubbo.xsd  | 10 +++
 .../org/apache/dubbo/config/spring/ConfigTest.java | 32 
 .../AnnotationPropertyValuesAdapterTest.java   | 80 +-
 .../annotation/DubboReferenceGenericTest.java  | 11 ++-
 .../factory/annotation/MergedAnnotationTest.java   | 20 ++---
 .../ReferenceAnnotationBeanPostProcessorTest.java  | 73 
 .../annotation/ReferenceBeanBuilderTest.java   | 96 +++---
 .../ServiceAnnotationBeanPostProcessorTest.java| 33 
 .../annotation/ServiceBeanNameBuilderTest.java | 16 ++--
 .../annotation/ServiceClassPostProcessorTest.java  | 32 
 .../MultipleServicesWithMethodConfigsTest.java |  8 +-
 .../config/YamlPropertySourceFactoryTest.java  | 22 ++---
 .../context/annotation/EnableDubboConfigTest.java  |  3 +-
 .../properties/DefaultDubboConfigBinderTest.java   | 17 ++--
 .../registry/nacos/nacos/NacosServiceNameTest.java |  4 +-
 .../config/spring/schema/GenericServiceTest.java   | 20 ++---
 .../spring/status/SpringStatusCheckerTest.java |  4 +-
 dubbo-dependencies-bom/pom.xml |  3 +-
 .../main/java/org/apache/dubbo/rpc/RpcStatus.java  | 17 +++-
 .../org/apache/dubbo/rpc/filter/TokenFilter.java   |  4 +-
 pom.xml|  2 +-
 25 files changed, 369 insertions(+), 253 deletions(-)

[dubbo] 07/36: Merge remote-tracking branch 'dubbo_rem/master' into master

2023-05-30 Thread wangxin

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 61407ac34229fe82384f482e5d773cfb677a4b8c
Merge: 339d23453e 594a68fd71
Author: Xin Wang 
AuthorDate: Tue Jan 19 18:17:23 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master' into master

 .github/workflows/unit-test.yml|  67 
 README.md  |  34 ++--
 .../cluster/support/wrapper/AbstractCluster.java   |   2 +-
 .../apache/dubbo/common/BaseServiceMetadata.java   |   6 +-
 .../java/org/apache/dubbo/common/URLStrParser.java |   2 +-
 .../org/apache/dubbo/common/bytecode/Wrapper.java  |   6 +-
 .../common/threadpool/ThreadlessExecutor.java  |  27 ++-
 .../org/apache/dubbo/common/utils/LFUCache.java|   6 +-
 .../org/apache/dubbo/common/utils/PojoUtils.java   |   8 +-
 .../dubbo/common/BaseServiceMetadataTest.java  |  65 
 .../org/apache/dubbo/common/URLStrParserTest.java  |  58 ++-
 .../dubbo/common/model/SerializablePerson.java |   5 +-
 .../common/threadpool/ThreadlessExecutorTest.java  |  58 +++
 .../threadpool/manager/ExecutorRepositoryTest.java |  79 +
 .../dubbo/common/timer/HashedWheelTimerTest.java   | 181 +
 .../apache/dubbo/common/utils/DefaultPageTest.java |   9 +-
 .../org/apache/dubbo/common/utils/LogTest.java |  55 +--
 .../apache/dubbo/common/utils/MemberUtilsTest.java |  12 ++
 .../apache/dubbo/common/utils/MethodUtilsTest.java |  54 ++
 .../apache/dubbo/common/utils/PojoUtilsTest.java   |  91 ++-
 .../dubbo/config/utils/ConfigValidationUtils.java  |  24 ++-
 .../PublishingServiceDefinitionListenerTest.java   |   1 +
 .../metadata/MetadataServiceExporterTest.java  |   1 +
 .../org/apache/dubbo/config/spring/ConfigTest.java |   8 +-
 .../dubbo/config/spring/ServiceBeanTest.java   |   2 +
 .../AnnotationPropertyValuesAdapterTest.java   |   2 +
 .../annotation/DubboReferenceGenericTest.java  |   3 +
 .../factory/annotation/MergedAnnotationTest.java   |   2 +
 .../ReferenceAnnotationBeanPostProcessorTest.java  |   3 +
 .../annotation/ReferenceBeanBuilderTest.java   |   3 +
 .../ServiceAnnotationBeanPostProcessorTest.java|   3 +
 .../annotation/ServiceBeanNameBuilderTest.java |   4 +-
 .../annotation/ServiceClassPostProcessorTest.java  |   3 +
 .../MultipleServicesWithMethodConfigsTest.java |   2 +
 .../config/YamlPropertySourceFactoryTest.java  |   2 +
 .../DubboComponentScanRegistrarTest.java   |   2 +
 .../annotation/DubboConfigConfigurationTest.java   |   2 +
 .../context/annotation/EnableDubboConfigTest.java  |   6 +
 .../spring/context/annotation/EnableDubboTest.java |   2 +
 .../annotation/consumer/ConsumerConfiguration.java |   2 +-
 .../annotation/provider/ProviderConfiguration.java |   6 +-
 .../properties/DefaultDubboConfigBinderTest.java   |   3 +
 .../extension/SpringExtensionFactoryTest.java  |   2 +
 .../dubbo/config/spring/issues/Issue6252Test.java  |   2 +
 .../registry/nacos/nacos/NacosServiceNameTest.java |   4 +-
 .../spring/schema/DubboNamespaceHandlerTest.java   |  12 ++
 .../config/spring/schema/GenericServiceTest.java   |   3 +
 .../spring/status/DataSourceStatusCheckerTest.java |   2 +
 .../spring/status/SpringStatusCheckerTest.java |   2 +
 .../src/main/resources/spring/dubbo-provider.xml   |   2 +-
 .../annotation/processing/util/TypeUtilsTest.java  |   2 +
 .../dubbo/monitor/dubbo/MetricsFilterTest.java |  60 ---
 .../apache/dubbo/registry/nacos/NacosRegistry.java |   6 +-
 .../apache/dubbo/registry/redis/RedisRegistry.java |  43 +
 .../support/command/StatusTelnetHandler.java   |   4 +-
 .../org/apache/dubbo/remoting/MockTransporter.java |  27 ++-
 .../apache/dubbo/remoting/TransportersTest.java|  46 ++
 .../dubbo/remoting/exchange/ExchangersTest.java|  58 +++
 .../dubbo/remoting/exchange/MockExchanger.java |  31 ++--
 .../dubbo/remoting/telnet/TelnetUtilsTest.java |  72 
 .../telnet/support/ClearTelnetHandlerTest.java |  46 ++
 .../telnet/support/ExitTelnetHandlerTest.java  |  27 +--
 .../telnet/support/HelpTelnetHandlerTest.java  |  48 ++
 .../telnet/support/StatusTelnetHandlerTest.java|  44 +
 .../dubbo/remoting/utils/PayloadDropperTest.java   |  43 +
 .../apache/dubbo/remoting/utils/UrlUtilsTest.java  |  40 +
 .../internal/org.apache.dubbo.remoting.Transporter |   1 +
 .../org.apache.dubbo.remoting.exchange.Exchanger   |   1 +
 .../rpc/protocol/dubbo/ArgumentCallbackTest.java   |  14 +-
 69 files changed, 1323 insertions(+), 230 deletions(-)

[dubbo] 03/36: merge

2023-05-30 Thread wangxin

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 2ddacd6f4f8d9755c74c3403e742c2bcfd72ad82
Merge: 39b274e475 4a8da59573
Author: wangxin813 
AuthorDate: Fri Oct 16 14:11:48 2020 +0800

merge

 CONTRIBUTING.md| 42 ++--
 README.md  | 26 
 .../dubbo/remoting/transport/AbstractClient.java   | 74 ++
 3 files changed, 81 insertions(+), 61 deletions(-)

[dubbo] 08/36: Merge branch 'master' of https://github.com/lovepoem/dubbo into master

2023-05-30 Thread wangxin

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 fe15c3e9bf54dca1607d01e8cce35878b3b4120d
Merge: 61407ac342 443876c66b
Author: Xin Wang 
AuthorDate: Tue Jan 19 18:17:43 2021 +0800

Merge branch 'master' of https://github.com/lovepoem/dubbo into master

[dubbo] 16/36: Merge remote-tracking branch 'dubbo_rem/master'

2023-05-30 Thread wangxin

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 f63a8bb665fba108ffe32bdbaa24cf6571b1bdc1
Merge: 155cf61226 b5c81d8558
Author: Xin Wang 
AuthorDate: Sat Mar 20 13:51:55 2021 +0800

Merge remote-tracking branch 'dubbo_rem/master'

 .travis.yml| 22 --
 Jenkinsfile| 30 
 README.md  |  2 +-
 .../java/org/apache/dubbo/rpc/cluster/Cluster.java |  6 +-
 .../dubbo/rpc/cluster/router/tag/TagRouter.java| 14 +---
 .../cluster/support/MergeableClusterInvoker.java   |  8 +--
 .../loadbalance/RoundRobinLoadBalanceTest.java |  3 +-
 .../src/main/java/org/apache/dubbo/common/URL.java | 21 --
 .../common/beanutil/JavaBeanSerializeUtil.java |  4 +-
 .../org/apache/dubbo/common/bytecode/Proxy.java| 53 +++---
 .../dubbo/common/constants/CommonConstants.java|  5 ++
 .../org/apache/dubbo/common/json/J2oVisitor.java   |  5 +-
 .../common/threadlocal/InternalThreadLocal.java|  2 +-
 .../apache/dubbo/common/utils/CollectionUtils.java | 39 +-
 .../org/apache/dubbo/common/utils/FieldUtils.java  | 14 ++--
 .../org/apache/dubbo/common/utils/IOUtils.java | 38 ++
 .../org/apache/dubbo/common/utils/LFUCache.java| 15 ++--
 .../org/apache/dubbo/common/utils/MethodUtils.java |  7 +-
 .../org/apache/dubbo/common/utils/NetUtils.java|  6 +-
 .../org/apache/dubbo/common/utils/PojoUtils.java   | 13 ++--
 .../apache/dubbo/common/utils/ReflectUtils.java| 84 ++
 .../org/apache/dubbo/common/utils/UrlUtils.java| 18 +
 .../apache/dubbo/config/ConfigCenterConfig.java|  2 +-
 .../java/org/apache/dubbo/config/SslConfig.java| 28 
 .../org/apache/dubbo/rpc/model/ProviderModel.java  |  3 +-
 .../apache/dubbo/rpc/model/ServiceDescriptor.java  |  3 +-
 .../common/PojoUtilsForNonPublicStaticTest.java| 35 -
 .../test/java/org/apache/dubbo/common/URLTest.java | 82 +
 .../dubbo/common/bytecode/ClassGeneratorTest.java  |  8 ++-
 .../config/EnvironmentConfigurationTest.java   | 12 ++--
 .../configcenter/ConfigChangedEventTest.java   | 30 
 .../support/AbortPolicyWithReportTest.java |  7 +-
 .../support/cached/CachedThreadPoolTest.java   | 13 ++--
 .../support/eager/EagerThreadPoolExecutorTest.java | 17 ++---
 .../support/eager/EagerThreadPoolTest.java | 13 ++--
 .../dubbo/common/utils/CollectionUtilsTest.java|  2 +-
 .../apache/dubbo/common/utils/ConfigUtilsTest.java |  2 +-
 .../apache/dubbo/common/utils/LFUCacheTest.java| 21 --
 .../dubbo/common/utils/ReflectUtilsTest.java   | 37 +++---
 .../org/apache/dubbo/echo/EchoServiceTest.java |  2 +-
 .../org/apache/dubbo/config/ServiceConfig.java |  1 +
 .../dubbo/config/bootstrap/DubboBootstrap.java | 36 +-
 .../apache/dubbo/config/AbstractConfigTest.java|  7 +-
 .../dubbo/config/mock/MockServiceDiscovery.java| 19 ++---
 .../config/spring/status/SpringStatusChecker.java  |  5 +-
 .../dubbo/config/spring/SimpleRegistryService.java |  5 +-
 .../spring/registry/MockRegistryFactory.java   |  8 +--
 .../spring/registry/MockServiceDiscovery.java  | 19 ++---
 .../support/nacos/NacosDynamicConfiguration.java   |  3 +-
 .../metadata/test/JTestMetadataReport4Test.java|  5 --
 .../store/consul/ConsulMetadataReport.java |  3 -
 .../metadata/store/etcd/EtcdMetadataReport.java|  4 --
 .../store/failover/FailoverMetadataReportTest.java |  5 +-
 .../metadata/store/nacos/NacosMetadataReport.java  |  6 +-
 .../metadata/store/redis/RedisMetadataReport.java  |  3 -
 .../store/zookeeper/ZookeeperMetadataReport.java   |  4 --
 .../org/apache/dubbo/qos/command/impl/Ready.java   | 67 -
 .../registry/client/AbstractServiceDiscovery.java  | 23 +-
 .../client/DefaultRegistryClusterIdentifier.java   |  3 +-
 .../client/FileSystemServiceDiscovery.java | 15 ++--
 .../dubbo/registry/client/ServiceDiscovery.java| 12 ++--
 .../registry/client/ServiceDiscoveryRegistry.java  |  8 +--
 .../event/listener/LoggingEventListener.java   |  4 +-
 .../metadata/MetadataServiceNameMapping.java   |  5 +-
 .../metadata/ServiceInstanceMetadataUtils.java |  4 ++
 .../registry/client/InMemoryServiceDiscovery.java  | 14 +---
 .../registry/consul/ConsulServiceDiscovery.java|  4 +-
 .../apache/dubbo/registry/dubbo/DubboRegistry.java |  4 --
 .../registry/dubbo/RegistryDirectoryTest.java  |  3 +-
 .../registry/dubbo/SimpleRegistryService.java  |  5 +-
 .../apache/dubbo/registry/etcd/EtcdRegistry.java   |  4 --
 .../dubbo/registry/etcd/EtcdServiceDiscovery.java  |  6 +-
 .../registry/eureka/EurekaServiceDiscovery.java|  4 +-
 .../registry/multicast/MulticastRegistry.java  |  5 --
 .../multicast

< 1 2 3 >

101 - 200 of 223 matches

Mail list logo