This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 3afc0625ac50ff9ce0e7dbfdc973aacb0c49fe8c
Merge: a05ad516 58eb5c34
Author: chickenlj <ken.lj...@gmail.com>
AuthorDate: Tue Nov 21 10:18:42 2023 +0800
Merge branch 'feature-triple'
# Conflicts:
# .github/workflows/github-actions.yml
.github/workflows/github-actions.yml | 7 +-
.licenserc.yaml | 88 ++
.run/dubbo-go-server.run.xml | 14 -
.run/helloworld-go-client.run.xml | 14 -
.run/helloworld-go-server.run.xml | 14 -
.run/rpc/dubbo/rpc-dubbo-go-client.run.xml | 14 -
.../apache/dubbo/samples/UserProviderTriple.java | 17 +
go.mod | 5 +-
go.sum | 168 ++-
helloworld/README.md | 101 +-
helloworld/README_zh.md | 22 -
.../{go-client/cmd/client.go => client/main.go} | 32 +-
helloworld/go-client/conf/dubbogo.yml | 11 -
helloworld/go-server/cmd/server.go | 88 --
helloworld/go-server/conf/dubbogo.yml | 13 -
.../org/apache/dubbo/sample/hello/Helloworld.java | 1432 --------------------
helloworld/java-client/pom.xml | 162 ---
helloworld/java-client/run.sh | 1 -
.../com/apache/dubbo/sample/basic/ApiConsumer.java | 57 -
.../com/apache/dubbo/sample/basic/IGreeter.java | 31 -
.../java-client/src/main/proto/helloworld.proto | 28 -
.../src/main/resources/log4j.properties | 26 -
.../com/apache/dubbo/sample/TestHelloWorld.java | 68 -
.../org/apache/dubbo/sample/hello/Helloworld.java | 1432 --------------------
helloworld/java-server/pom.xml | 166 ---
helloworld/java-server/run.sh | 1 -
.../com/apache/dubbo/sample/basic/ApiProvider.java | 46 -
.../com/apache/dubbo/sample/basic/IGreeter.java | 30 -
.../apache/dubbo/sample/basic/IGreeter1Impl.java | 34 -
.../java-server/src/main/proto/helloworld.proto | 28 -
.../src/main/resources/log4j.properties | 26 -
helloworld/proto/greet.pb.go | 213 +++
helloworld/proto/greet.proto | 17 +
helloworld/proto/greettriple/greet.triple.go | 115 ++
.../{go-client/cmd/client.go => server/main.go} | 38 +-
.../dubbo/sample/WrapperArrayClassProvider.java | 17 +
.../java/org/apache/dubbo/sample/ComplexData.java | 17 +
.../dubbo/sample/WrapperArrayClassProvider.java | 17 +
.../sample/WrapperArrayClassProviderImpl.java | 17 +
.../com/apache/dubbo/sample/basic/ComplexData.java | 17 +
.../apache/dubbo/sample/basic/ComplexProvider.java | 17 +
.../java/com/apache/dubbo/sample/basic/User.java | 17 +
start_integrate_test.sh | 3 -
43 files changed, 845 insertions(+), 3836 deletions(-)
