You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/01/10 12:27:36 UTC
[dubbo-go-samples] branch master updated (329248b -> f7e2f53)
This is an automated email from the ASF dual-hosted git repository.
alexstocks pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git.
from 329248b Merge pull request #32 from LaurenceLiZhixin/fix/grpcStreamBug
add 061030c test
add dd4be5b add java for general
add 7f02dae resolve conflicts
add ac5b159 resolve conflicts
add 49609b5 refact generic/java
add 86a6f7b Merge pull request #24 from fangyincheng/fix-2.7
add f7e2f53 merge master
No new revisions were added by this update.
Summary of changes:
general/dubbo/go-client/cmd/client.go | 15 +-
general/dubbo/go-client/conf/client.yml | 23 +--
general/dubbo/go-client/conf/log.yml | 2 +-
general/dubbo/go-server/conf/log.yml | 2 +-
general/dubbo/java-client/2.6/pom.xml | 79 +++++++++
.../src/main/java/org/apache/dubbo}/Consumer.java | 114 ++++++------
.../src/main/java/org/apache/dubbo}/Gender.java | 2 +-
.../2.6/src/main/java/org/apache/dubbo}/User.java | 2 +-
.../main/java/org/apache/dubbo}/UserProvider.java | 6 +-
.../resources/META-INF/spring/dubbo.consumer.xml | 10 +-
.../2.6}/src/main/resources/log4j.properties | 0
general/dubbo/java-client/2.7/pom.xml | 126 +++++++++++++
.../src/main/java/org/apache/dubbo}/Consumer.java | 114 ++++++------
.../src/main/java/org/apache/dubbo}/Gender.java | 2 +-
.../2.7/src/main/java/org/apache/dubbo}/User.java | 2 +-
.../main/java/org/apache/dubbo}/UserProvider.java | 6 +-
.../resources/META-INF/spring/dubbo.consumer.xml | 10 +-
.../2.7}/src/main/resources/log4j.properties | 0
general/dubbo/java-server/2.6/pom.xml | 79 +++++++++
.../src/main/java/org/apache/dubbo}/Gender.java | 2 +-
.../src/main/java/org/apache/dubbo}/Provider.java | 3 +-
.../src/main/java/org/apache/dubbo}/Response.java | 4 +-
.../2.6/src/main/java/org/apache/dubbo}/User.java | 4 +-
.../main/java/org/apache/dubbo}/UserProvider.java | 6 +-
.../org/apache/dubbo}/UserProviderAnotherImpl.java | 26 +--
.../java/org/apache/dubbo}/UserProviderImpl.java | 26 +--
.../resources/META-INF/spring/dubbo.provider.xml | 16 +-
.../2.6}/src/main/resources/log4j.properties | 0
general/dubbo/java-server/2.7/pom.xml | 126 +++++++++++++
.../src/main/java/org/apache/dubbo}/Gender.java | 2 +-
.../src/main/java/org/apache/dubbo}/Provider.java | 2 +-
.../src/main/java/org/apache/dubbo}/Response.java | 4 +-
.../2.7/src/main/java/org/apache/dubbo}/User.java | 4 +-
.../main/java/org/apache/dubbo}/UserProvider.java | 6 +-
.../org/apache/dubbo}/UserProviderAnotherImpl.java | 21 ++-
.../java/org/apache/dubbo}/UserProviderImpl.java | 26 +--
.../resources/META-INF/spring/dubbo.provider.xml | 11 +-
.../2.7/src/main/resources}/log4j.properties | 0
generic/go-client/conf/log.yml | 2 +-
generic/java-client/2.6/pom.xml | 79 +++++++++
.../src/main/java/org/apache/dubbo}/Consumer.java | 2 +-
.../src/main/java/org/apache/dubbo}/User.java | 2 +-
.../2.6}/src/main/resources/log4j.properties | 0
generic/java-client/2.7/pom.xml | 126 +++++++++++++
.../src/main/java/org/apache/dubbo}/Consumer.java | 2 +-
.../src/main/java/org/apache/dubbo}/User.java | 2 +-
.../2.7}/src/main/resources/log4j.properties | 0
generic/java-client/build.sh | 21 ---
generic/java-client/pom.xml | 80 ---------
generic/java-server/2.6/pom.xml | 79 +++++++++
.../src/main/java/org/apache/dubbo}/Gender.java | 2 +-
.../src/main/java/org/apache/dubbo}/Provider.java | 2 +-
.../src/main/java/org/apache/dubbo}/Response.java | 4 +-
.../src/main/java/org/apache/dubbo}/User.java | 4 +-
.../main/java/org/apache/dubbo}/UserProvider.java | 6 +-
.../org/apache/dubbo}/UserProviderAnotherImpl.java | 21 ++-
.../java/org/apache/dubbo}/UserProviderImpl.java | 26 +--
.../resources/META-INF/spring/dubbo.provider.xml | 11 +-
.../2.6}/src/main/resources/log4j.properties | 0
generic/java-server/2.7/pom.xml | 126 +++++++++++++
.../src/main/java/org/apache/dubbo}/Gender.java | 2 +-
.../src/main/java/org/apache/dubbo}/Provider.java | 2 +-
.../src/main/java/org/apache/dubbo}/Response.java | 4 +-
.../src/main/java/org/apache/dubbo}/User.java | 4 +-
.../main/java/org/apache/dubbo}/UserProvider.java | 6 +-
.../org/apache/dubbo}/UserProviderAnotherImpl.java | 21 ++-
.../java/org/apache/dubbo}/UserProviderImpl.java | 26 +--
.../resources/META-INF/spring/dubbo.provider.xml | 11 +-
.../2.7}/src/main/resources/log4j.properties | 0
generic/java-server/build.sh | 20 ---
generic/java-server/pom.xml | 195 ---------------------
generic/java-server/script/debug.sh | 23 ---
generic/java-server/src/main/assembly/assembly.xml | 45 -----
.../src/main/assembly/conf/dubbo.properties | 14 --
go.mod | 9 +-
go.sum | 4 +-
76 files changed, 1193 insertions(+), 673 deletions(-)
create mode 100644 general/dubbo/java-client/2.6/pom.xml
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-client/2.6/src/main/java/org/apache/dubbo}/Consumer.java (71%)
rename {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-client/2.6/src/main/java/org/apache/dubbo}/Gender.java (94%)
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-client/2.6/src/main/java/org/apache/dubbo}/User.java (94%)
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-client/2.6/src/main/java/org/apache/dubbo}/UserProvider.java (80%)
copy {tracing/dubbo/java-client => general/dubbo/java-client/2.6}/src/main/resources/META-INF/spring/dubbo.consumer.xml (73%)
copy {tracing/dubbo/java-client => general/dubbo/java-client/2.6}/src/main/resources/log4j.properties (100%)
create mode 100644 general/dubbo/java-client/2.7/pom.xml
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-client/2.7/src/main/java/org/apache/dubbo}/Consumer.java (71%)
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-client/2.7/src/main/java/org/apache/dubbo}/Gender.java (94%)
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-client/2.7/src/main/java/org/apache/dubbo}/User.java (94%)
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-client/2.7/src/main/java/org/apache/dubbo}/UserProvider.java (80%)
copy {tracing/dubbo/java-client => general/dubbo/java-client/2.7}/src/main/resources/META-INF/spring/dubbo.consumer.xml (73%)
copy {tracing/dubbo/java-client => general/dubbo/java-client/2.7}/src/main/resources/log4j.properties (100%)
create mode 100644 general/dubbo/java-server/2.6/pom.xml
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-server/2.6/src/main/java/org/apache/dubbo}/Gender.java (94%)
rename {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.6/src/main/java/org/apache/dubbo}/Provider.java (98%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.6/src/main/java/org/apache/dubbo}/Response.java (97%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.6/src/main/java/org/apache/dubbo}/User.java (94%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.6/src/main/java/org/apache/dubbo}/UserProvider.java (90%)
rename {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.6/src/main/java/org/apache/dubbo}/UserProviderAnotherImpl.java (84%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.6/src/main/java/org/apache/dubbo}/UserProviderImpl.java (84%)
rename {generic/java-server => general/dubbo/java-server/2.6}/src/main/resources/META-INF/spring/dubbo.provider.xml (59%)
rename {generic/java-server => general/dubbo/java-server/2.6}/src/main/resources/log4j.properties (100%)
create mode 100644 general/dubbo/java-server/2.7/pom.xml
copy general/{jsonrpc/java-client/src/main/java/com/ikurento/user => dubbo/java-server/2.7/src/main/java/org/apache/dubbo}/Gender.java (94%)
copy general/{grpc/unary/java-server/src/main/java/com/ikurento/user => dubbo/java-server/2.7/src/main/java/org/apache/dubbo}/Provider.java (98%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.7/src/main/java/org/apache/dubbo}/Response.java (97%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.7/src/main/java/org/apache/dubbo}/User.java (94%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.7/src/main/java/org/apache/dubbo}/UserProvider.java (90%)
copy general/{jsonrpc/java-server/src/main/java/com/ikurento/user => dubbo/java-server/2.7/src/main/java/org/apache/dubbo}/UserProviderAnotherImpl.java (84%)
copy {generic/java-server/src/main/java/com/ikurento/user => general/dubbo/java-server/2.7/src/main/java/org/apache/dubbo}/UserProviderImpl.java (84%)
copy {tracing/dubbo/java-server => general/dubbo/java-server/2.7}/src/main/resources/META-INF/spring/dubbo.provider.xml (66%)
rename {generic/java-server/src/main/assembly/conf => general/dubbo/java-server/2.7/src/main/resources}/log4j.properties (100%)
create mode 100644 generic/java-client/2.6/pom.xml
copy generic/java-client/{src/main/java/com/ikurento/user => 2.6/src/main/java/org/apache/dubbo}/Consumer.java (98%)
copy generic/java-client/{src/main/java/com/ikurento/user => 2.6/src/main/java/org/apache/dubbo}/User.java (98%)
copy {tracing/dubbo/java-client => generic/java-client/2.6}/src/main/resources/log4j.properties (100%)
create mode 100644 generic/java-client/2.7/pom.xml
rename generic/java-client/{src/main/java/com/ikurento/user => 2.7/src/main/java/org/apache/dubbo}/Consumer.java (98%)
rename generic/java-client/{src/main/java/com/ikurento/user => 2.7/src/main/java/org/apache/dubbo}/User.java (98%)
copy {tracing/dubbo/java-client => generic/java-client/2.7}/src/main/resources/log4j.properties (100%)
delete mode 100644 generic/java-client/build.sh
delete mode 100644 generic/java-client/pom.xml
create mode 100644 generic/java-server/2.6/pom.xml
copy {general/jsonrpc/java-client/src/main/java/com/ikurento/user => generic/java-server/2.6/src/main/java/org/apache/dubbo}/Gender.java (94%)
copy {general/grpc/unary/java-server/src/main/java/com/ikurento/user => generic/java-server/2.6/src/main/java/org/apache/dubbo}/Provider.java (98%)
copy generic/java-server/{src/main/java/com/ikurento/user => 2.6/src/main/java/org/apache/dubbo}/Response.java (97%)
copy generic/java-server/{src/main/java/com/ikurento/user => 2.6/src/main/java/org/apache/dubbo}/User.java (94%)
copy generic/java-server/{src/main/java/com/ikurento/user => 2.6/src/main/java/org/apache/dubbo}/UserProvider.java (90%)
copy {general/jsonrpc/java-server/src/main/java/com/ikurento/user => generic/java-server/2.6/src/main/java/org/apache/dubbo}/UserProviderAnotherImpl.java (84%)
copy generic/java-server/{src/main/java/com/ikurento/user => 2.6/src/main/java/org/apache/dubbo}/UserProviderImpl.java (84%)
copy {tracing/dubbo/java-server => generic/java-server/2.6}/src/main/resources/META-INF/spring/dubbo.provider.xml (66%)
rename generic/{java-client => java-server/2.6}/src/main/resources/log4j.properties (100%)
create mode 100644 generic/java-server/2.7/pom.xml
copy {general/jsonrpc/java-client/src/main/java/com/ikurento/user => generic/java-server/2.7/src/main/java/org/apache/dubbo}/Gender.java (94%)
copy {general/grpc/unary/java-server/src/main/java/com/ikurento/user => generic/java-server/2.7/src/main/java/org/apache/dubbo}/Provider.java (98%)
rename generic/java-server/{src/main/java/com/ikurento/user => 2.7/src/main/java/org/apache/dubbo}/Response.java (97%)
rename generic/java-server/{src/main/java/com/ikurento/user => 2.7/src/main/java/org/apache/dubbo}/User.java (94%)
rename generic/java-server/{src/main/java/com/ikurento/user => 2.7/src/main/java/org/apache/dubbo}/UserProvider.java (90%)
copy {general/jsonrpc/java-server/src/main/java/com/ikurento/user => generic/java-server/2.7/src/main/java/org/apache/dubbo}/UserProviderAnotherImpl.java (84%)
rename generic/java-server/{src/main/java/com/ikurento/user => 2.7/src/main/java/org/apache/dubbo}/UserProviderImpl.java (84%)
copy {tracing/dubbo/java-server => generic/java-server/2.7}/src/main/resources/META-INF/spring/dubbo.provider.xml (66%)
copy {tracing/dubbo/java-server => generic/java-server/2.7}/src/main/resources/log4j.properties (100%)
delete mode 100644 generic/java-server/build.sh
delete mode 100644 generic/java-server/pom.xml
delete mode 100644 generic/java-server/script/debug.sh
delete mode 100644 generic/java-server/src/main/assembly/assembly.xml
delete mode 100644 generic/java-server/src/main/assembly/conf/dubbo.properties