[dubbo-go-samples] branch makefile updated: make IT works for generic samples
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new b3fdafb make IT works for generic samples
b3fdafb is described below
commit b3fdafba36dee8613ff4cb3cf60fa378de296b45
Author: Ian Luo
AuthorDate: Thu Oct 29 19:08:14 2020 +0800
make IT works for generic samples
---
generic/go-client/assembly/bin/load.sh | 203 -
generic/go-client/assembly/common/app.properties | 23 ---
generic/go-client/assembly/common/build.sh | 83 -
generic/go-client/assembly/linux/dev.sh| 36
generic/go-client/assembly/linux/release.sh| 35
generic/go-client/assembly/linux/test.sh | 35
generic/go-client/assembly/mac/dev.sh | 36
generic/go-client/assembly/mac/release.sh | 34
generic/go-client/assembly/mac/test.sh | 34
generic/go-client/assembly/windows/dev.sh | 34
generic/go-client/assembly/windows/release.sh | 34
generic/go-client/assembly/windows/test.sh | 34
generic/go-client/{app => cmd}/client.go | 87 -
.../go-client/{profiles/dev => conf}/client.yml| 28 +--
.../profiles/dev => go-client/conf}/log.yml| 2 +-
.../app/version.go => go-client/pkg/user.go} | 17 +-
generic/go-client/profiles/release/log.yml | 28 ---
generic/go-client/profiles/test/client.yml | 55 --
generic/go-client/profiles/test/log.yml| 28 ---
generic/go-server/assembly/bin/load.sh | 151 ---
generic/go-server/assembly/common/app.properties | 23 ---
generic/go-server/assembly/common/build.sh | 80
generic/go-server/assembly/linux/dev.sh| 36
generic/go-server/assembly/linux/release.sh| 36
generic/go-server/assembly/linux/test.sh | 36
generic/go-server/assembly/mac/dev.sh | 36
generic/go-server/assembly/mac/release.sh | 36
generic/go-server/assembly/mac/test.sh | 36
generic/go-server/assembly/windows/dev.sh | 36
generic/go-server/assembly/windows/release.sh | 36
generic/go-server/assembly/windows/test.sh | 36
generic/go-server/{app => cmd}/server.go | 20 +-
.../profiles/release => go-server/conf}/client.yml | 30 +--
.../profiles/dev => go-server/conf}/log.yml| 56 +++---
.../go-server/{profiles/dev => conf}/server.yml| 23 +--
generic/go-server/docker/docker-compose.yml| 9 +
generic/go-server/{app => pkg}/user.go | 4 +-
generic/go-server/profiles/release/log.yml | 28 ---
generic/go-server/profiles/release/server.yml | 64 ---
generic/go-server/profiles/test/log.yml| 28 ---
generic/go-server/profiles/test/server.yml | 65 ---
.../tests/integration/main_test.go}| 63 +++
.../integration/userprovider_test.go} | 93 +-
43 files changed, 218 insertions(+), 1709 deletions(-)
diff --git a/generic/go-client/assembly/bin/load.sh
b/generic/go-client/assembly/bin/load.sh
deleted file mode 100644
index ffa240b..000
--- a/generic/go-client/assembly/bin/load.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-APP_NAME="APPLICATION_NAME"
-APP_ARGS=""
-SLEEP_INTERVAL=5
-MAX_LIFETIME=4000
-
-PROJECT_HOME=""
-OS_NAME=`uname`
-if [[ ${OS_NAME} != "Windows" ]]; then
-PROJECT_HOME=`pwd`
-PROJECT_HOME=${PROJECT_HOME}"/"
-else
-APP_NAME="APPLICATION_NAME.exe"
-fi
-
-export CONF_CONSUMER_FILE_PATH=${PROJECT_HOME}"TARGET_CONF_FILE"
-export APP_LOG_CONF_FILE=${PROJECT_HOME}"TARGET_LOG_CONF_FILE"
-# export GOTRACEBACK=system
-# export GODEBUG=gctrace=1
-
-usage() {
-echo "Usage: $0 start [conf suffix]"
-echo " $0 stop"
-echo " $0 term"
-echo " $0 restart"
-echo " $0 list"
-echo " $0 monitor"
-echo "
[dubbo-docs] branch master updated: 换照->按照
This is an automated email from the ASF dual-hosted git repository. alexstocks pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-docs.git The following commit(s) were added to refs/heads/master by this push: new d0a1170 换照->按照 new 4bb02fe Merge pull request #54 from Hen1ng/fix_spell_error d0a1170 is described below commit d0a1170d8435bcce5f0534e92bf2892d278898a9 Author: hening1 AuthorDate: Thu Oct 29 19:23:33 2020 +0800 换照->按照 --- dubbo-user-book/dependencies.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dubbo-user-book/dependencies.md b/dubbo-user-book/dependencies.md index 684ae49..6fc56c1 100644 --- a/dubbo-user-book/dependencies.md +++ b/dubbo-user-book/dependencies.md @@ -13,7 +13,7 @@ JDK 1.6+ [^1] [INFO] | \- org.jboss.netty:netty:jar:3.2.5.Final:compile ``` -这里所有依赖都是换照 Dubbo 缺省配置选的，这些缺省值是基于稳定性和性能考虑的。 +这里所有依赖都是按照 Dubbo 缺省配置选的，这些缺省值是基于稳定性和性能考虑的。 * javassist.jar [^3]: 如果 `` 或 ``，以及 ``，则不需要。 * spring-context.jar [^4]: 如果用 `ServiceConfig` 和 `ReferenceConfig` 的 API 调用，则不需要。
[dubbo-go-samples] branch makefile updated: make integration test works for direct
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new b1fa2c6 make integration test works for direct
b1fa2c6 is described below
commit b1fa2c6fefab80d57e89bd381a4fbf3e981a7f82
Author: Ian Luo
AuthorDate: Thu Oct 29 23:51:14 2020 +0800
make integration test works for direct
---
direct/README.md | 3 -
direct/dubbo/.travis.yml | 16 --
direct/dubbo/go-client/assembly/bin/load.sh| 205 -
.../dubbo/go-client/assembly/common/app.properties | 23 ---
direct/dubbo/go-client/assembly/common/build.sh| 79
direct/dubbo/go-client/assembly/linux/dev.sh | 36
direct/dubbo/go-client/assembly/linux/release.sh | 35
direct/dubbo/go-client/assembly/linux/test.sh | 35
direct/dubbo/go-client/assembly/mac/dev.sh | 36
direct/dubbo/go-client/assembly/mac/release.sh | 34
direct/dubbo/go-client/assembly/mac/test.sh| 34
direct/dubbo/go-client/assembly/windows/dev.sh | 34
direct/dubbo/go-client/assembly/windows/release.sh | 34
direct/dubbo/go-client/assembly/windows/test.sh| 34
direct/dubbo/go-client/integration_testing.sh | 31
direct/dubbo/go-client/profiles/release/client.yml | 51 -
direct/dubbo/go-client/profiles/release/log.yml| 28 ---
direct/dubbo/go-client/profiles/test/client.yml| 50 -
direct/dubbo/go-client/profiles/test/log.yml | 28 ---
direct/dubbo/go-server/app/version.go | 22 ---
direct/dubbo/go-server/assembly/bin/load.sh| 151 ---
.../dubbo/go-server/assembly/common/app.properties | 23 ---
direct/dubbo/go-server/assembly/common/build.sh| 80
direct/dubbo/go-server/assembly/linux/dev.sh | 36
direct/dubbo/go-server/assembly/linux/release.sh | 36
direct/dubbo/go-server/assembly/linux/test.sh | 36
direct/dubbo/go-server/assembly/mac/dev.sh | 36
direct/dubbo/go-server/assembly/mac/release.sh | 36
direct/dubbo/go-server/assembly/mac/test.sh| 36
direct/dubbo/go-server/assembly/windows/dev.sh | 36
direct/dubbo/go-server/assembly/windows/release.sh | 36
direct/dubbo/go-server/assembly/windows/test.sh| 36
direct/dubbo/go-server/integration_testing.sh | 31
direct/dubbo/go-server/profiles/release/log.yml| 28 ---
direct/dubbo/go-server/profiles/release/server.yml | 60 --
direct/dubbo/go-server/profiles/test/log.yml | 28 ---
direct/dubbo/go-server/profiles/test/server.yml| 58 --
.../go-client/app => go-client/cmd}/client.go | 32 ++--
direct/go-client/conf/client.yml | 61 ++
.../profiles/dev => go-client/conf}/log.yml| 56 +++---
.../app/version.go => go-client/pkg/user.go} | 26 ++-
.../go-server/app => go-server/cmd}/server.go | 20 +-
.../profiles/dev => go-server/conf}/client.yml | 34 ++--
.../profiles/dev => go-server/conf}/log.yml| 56 +++---
.../profiles/dev => go-server/conf}/server.yml | 32 ++--
direct/go-server/docker/docker-compose.yml | 9 +
.../{dubbo/go-server/app => go-server/pkg}/user.go | 4 +-
.../tests/integration/main_test.go}| 24 ++-
.../tests/integration/userprovider_test.go}| 49 ++---
49 files changed, 247 insertions(+), 1787 deletions(-)
diff --git a/direct/README.md b/direct/README.md
deleted file mode 100644
index 0ef5746..000
--- a/direct/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### User Direct Feature
-
-Set url of server in `client.yml/references/ServiceId/url`, and then you will
enjoy the direct feature not registry.
diff --git a/direct/dubbo/.travis.yml b/direct/dubbo/.travis.yml
deleted file mode 100644
index b1d86d7..000
--- a/direct/dubbo/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-stages:
- - Test direct
-jobs:
- include:
-- stage: Test direct
- script:
-- PROJECT_HOME=$(pwd)
-- CASE_HOME=/direct/dubbo
-- GO_SERVER=/go-server
-- GO_CLIENT=/go-client
-- docker run -d --network host zookeeper
-- echo "zookeeper listen in [:]2181"
-- cd ${PROJECT_HOME}${CASE_HOME}${GO_SERVER}
-- ./integration_testing.sh ${PROJECT_HOME} ${GO_SERVER} true
-- cd ${PROJECT_HOME}${CASE_HOME}${GO_CLIENT}
-- ./integration_testing.sh ${PROJECT_HOME} ${GO_CLIENT}
\ No newline at end of file
diff --git a/direct/dubbo/go-client/assembly/bin/load.sh
b/direct/dubbo/go-client/assembly/bin/load.sh
deleted file mode 100644
index 6d41032..000
--- a/direct/dubbo/go-client/assembly/bin/load.sh
+++ /dev/null
@@ -1,205 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the A
[dubbo-go-samples] branch makefile updated: make integration test works for async
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new e42f3d2 make integration test works for async
e42f3d2 is described below
commit e42f3d28e79570ac1567194f8c28bd07b769
Author: Ian Luo
AuthorDate: Fri Oct 30 00:47:16 2020 +0800
make integration test works for async
---
async/go-client/assembly/bin/load.sh | 203 -
async/go-client/assembly/common/app.properties | 23 ---
async/go-client/assembly/common/build.sh | 83 -
async/go-client/assembly/linux/dev.sh | 36
async/go-client/assembly/linux/release.sh | 35
async/go-client/assembly/linux/test.sh | 35
async/go-client/assembly/mac/dev.sh| 36
async/go-client/assembly/mac/release.sh| 34
async/go-client/assembly/mac/test.sh | 34
async/go-client/assembly/windows/dev.sh| 34
async/go-client/assembly/windows/release.sh| 34
async/go-client/assembly/windows/test.sh | 34
async/go-client/{app => cmd}/client.go | 94 ++
async/go-client/{profiles/dev => conf}/client.yml | 30 +--
async/go-client/{profiles/dev => conf}/log.yml | 2 +-
async/go-client/integration_testing.sh | 31
{helloworld => async}/go-client/pkg/user.go| 0
async/go-server/assembly/bin/load.sh | 151 ---
async/go-server/assembly/common/app.properties | 23 ---
async/go-server/assembly/common/build.sh | 80
async/go-server/assembly/linux/dev.sh | 36
async/go-server/assembly/linux/release.sh | 36
async/go-server/assembly/linux/test.sh | 36
async/go-server/assembly/mac/dev.sh| 36
async/go-server/assembly/mac/release.sh| 36
async/go-server/assembly/mac/test.sh | 36
async/go-server/assembly/windows/dev.sh| 36
async/go-server/assembly/windows/release.sh| 36
async/go-server/assembly/windows/test.sh | 36
async/go-server/{app => cmd}/server.go | 11 +-
.../profiles/dev => go-server/conf}/client.yml | 28 +--
async/go-server/{profiles/dev => conf}/log.yml | 2 +-
async/go-server/{profiles/dev => conf}/server.yml | 26 +--
async/go-server/docker/docker-compose.yml | 9 +
async/go-server/integration_testing.sh | 31
async/go-server/{app => pkg}/user.go | 4 +-
.../go-server/tests/integration/main_test.go | 46 -
.../integration/userprovider_test.go} | 67 +++
helloworld/go-client/pkg/user.go | 22 +++
39 files changed, 170 insertions(+), 1432 deletions(-)
diff --git a/async/go-client/assembly/bin/load.sh
b/async/go-client/assembly/bin/load.sh
deleted file mode 100644
index ffa240b..000
--- a/async/go-client/assembly/bin/load.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-APP_NAME="APPLICATION_NAME"
-APP_ARGS=""
-SLEEP_INTERVAL=5
-MAX_LIFETIME=4000
-
-PROJECT_HOME=""
-OS_NAME=`uname`
-if [[ ${OS_NAME} != "Windows" ]]; then
-PROJECT_HOME=`pwd`
-PROJECT_HOME=${PROJECT_HOME}"/"
-else
-APP_NAME="APPLICATION_NAME.exe"
-fi
-
-export CONF_CONSUMER_FILE_PATH=${PROJECT_HOME}"TARGET_CONF_FILE"
-export APP_LOG_CONF_FILE=${PROJECT_HOME}"TARGET_LOG_CONF_FILE"
-# export GOTRACEBACK=system
-# export GODEBUG=gctrace=1
-
-usage() {
-echo "Usage: $0 start [conf suffix]"
-echo " $0 stop"
-echo " $0 term"
-echo " $0 restart"
-echo " $0 list"
-echo " $0 monitor"
-echo " $0 crontab"
-exit
-}
-
-start() {
-arg=$1
-if [ "$arg" = "" ];then
-echo "No registry type! Default client.yml!"
-else
-export
CONF_CONSUMER_FILE_PATH=${CONF_CONSUMER_FILE_PATH//\.yml/\_$arg\.yml}
-fi
-if [ ! -f "${CONF_CONS
[dubbo-go-samples] branch makefile updated: make integration test works for async
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new e42f3d2 make integration test works for async
e42f3d2 is described below
commit e42f3d28e79570ac1567194f8c28bd07b769
Author: Ian Luo
AuthorDate: Fri Oct 30 00:47:16 2020 +0800
make integration test works for async
---
async/go-client/assembly/bin/load.sh | 203 -
async/go-client/assembly/common/app.properties | 23 ---
async/go-client/assembly/common/build.sh | 83 -
async/go-client/assembly/linux/dev.sh | 36
async/go-client/assembly/linux/release.sh | 35
async/go-client/assembly/linux/test.sh | 35
async/go-client/assembly/mac/dev.sh| 36
async/go-client/assembly/mac/release.sh| 34
async/go-client/assembly/mac/test.sh | 34
async/go-client/assembly/windows/dev.sh| 34
async/go-client/assembly/windows/release.sh| 34
async/go-client/assembly/windows/test.sh | 34
async/go-client/{app => cmd}/client.go | 94 ++
async/go-client/{profiles/dev => conf}/client.yml | 30 +--
async/go-client/{profiles/dev => conf}/log.yml | 2 +-
async/go-client/integration_testing.sh | 31
{helloworld => async}/go-client/pkg/user.go| 0
async/go-server/assembly/bin/load.sh | 151 ---
async/go-server/assembly/common/app.properties | 23 ---
async/go-server/assembly/common/build.sh | 80
async/go-server/assembly/linux/dev.sh | 36
async/go-server/assembly/linux/release.sh | 36
async/go-server/assembly/linux/test.sh | 36
async/go-server/assembly/mac/dev.sh| 36
async/go-server/assembly/mac/release.sh| 36
async/go-server/assembly/mac/test.sh | 36
async/go-server/assembly/windows/dev.sh| 36
async/go-server/assembly/windows/release.sh| 36
async/go-server/assembly/windows/test.sh | 36
async/go-server/{app => cmd}/server.go | 11 +-
.../profiles/dev => go-server/conf}/client.yml | 28 +--
async/go-server/{profiles/dev => conf}/log.yml | 2 +-
async/go-server/{profiles/dev => conf}/server.yml | 26 +--
async/go-server/docker/docker-compose.yml | 9 +
async/go-server/integration_testing.sh | 31
async/go-server/{app => pkg}/user.go | 4 +-
.../go-server/tests/integration/main_test.go | 46 -
.../integration/userprovider_test.go} | 67 +++
helloworld/go-client/pkg/user.go | 22 +++
39 files changed, 170 insertions(+), 1432 deletions(-)
diff --git a/async/go-client/assembly/bin/load.sh
b/async/go-client/assembly/bin/load.sh
deleted file mode 100644
index ffa240b..000
--- a/async/go-client/assembly/bin/load.sh
+++ /dev/null
@@ -1,203 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-APP_NAME="APPLICATION_NAME"
-APP_ARGS=""
-SLEEP_INTERVAL=5
-MAX_LIFETIME=4000
-
-PROJECT_HOME=""
-OS_NAME=`uname`
-if [[ ${OS_NAME} != "Windows" ]]; then
-PROJECT_HOME=`pwd`
-PROJECT_HOME=${PROJECT_HOME}"/"
-else
-APP_NAME="APPLICATION_NAME.exe"
-fi
-
-export CONF_CONSUMER_FILE_PATH=${PROJECT_HOME}"TARGET_CONF_FILE"
-export APP_LOG_CONF_FILE=${PROJECT_HOME}"TARGET_LOG_CONF_FILE"
-# export GOTRACEBACK=system
-# export GODEBUG=gctrace=1
-
-usage() {
-echo "Usage: $0 start [conf suffix]"
-echo " $0 stop"
-echo " $0 term"
-echo " $0 restart"
-echo " $0 list"
-echo " $0 monitor"
-echo " $0 crontab"
-exit
-}
-
-start() {
-arg=$1
-if [ "$arg" = "" ];then
-echo "No registry type! Default client.yml!"
-else
-export
CONF_CONSUMER_FILE_PATH=${CONF_CONSUMER_FILE_PATH//\.yml/\_$arg\.yml}
-fi
-if [ ! -f "${CONF_CONS
[dubbo-website] branch master updated: fix 404 link for xml.md (#629)
This is an automated email from the ASF dual-hosted git repository. hyunkun 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 9cda714 fix 404 link for xml.md (#629) 9cda714 is described below commit 9cda7145fc50621ee261bd022584f7b5ac21628d Author: wjjiang <48505670+spongecapt...@users.noreply.github.com> AuthorDate: Fri Oct 30 10:46:43 2020 +0800 fix 404 link for xml.md (#629) --- docs/zh-cn/user/configuration/annotation.md | 2 +- docs/zh-cn/user/configuration/xml.md| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/zh-cn/user/configuration/annotation.md b/docs/zh-cn/user/configuration/annotation.md index cbfb72a..c8a43cc 100644 --- a/docs/zh-cn/user/configuration/annotation.md +++ b/docs/zh-cn/user/configuration/annotation.md @@ -7,7 +7,7 @@ description: 注解配置 # 注解配置 需要 `2.6.3` 及以上版本支持 -点此查看[完整示例](https://github.com/apache/dubbo-samples/tree/master/dubbo-samples-annotation) +点此查看[完整示例](https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-annotation) ## 服务提供方 diff --git a/docs/zh-cn/user/configuration/xml.md b/docs/zh-cn/user/configuration/xml.md index 797b64f..01911b2 100644 --- a/docs/zh-cn/user/configuration/xml.md +++ b/docs/zh-cn/user/configuration/xml.md @@ -2,7 +2,7 @@ 有关 XML 的详细配置项，请参见：[配置参考手册](../references/xml/introduction.md)。如果不想使用 Spring 配置，而希望通过 API 的方式进行调用，请参见：[API配置](./api.md)。想知道如何使用配置，请参见：[快速启动](../quick-start.md)。 -请在此查看文档描述的[完整示例](https://github.com/apache/dubbo-samples/tree/master/dubbo-samples-basic) +请在此查看文档描述的[完整示例](https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-basic) ## provider.xml 示例
[dubbo-website] branch asf-site updated: Automated deployment: Fri Oct 30 02:41:59 UTC 2020 313405bdb39c1a248a80dd8aa15b3bba139f8cfe
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 5d7a4f9 Automated deployment: Fri Oct 30 02:41:59 UTC 2020
313405bdb39c1a248a80dd8aa15b3bba139f8cfe
5d7a4f9 is described below
commit 5d7a4f9263bc0f0479a7e8d9ecde65b207c788e8
Author: htynkn
AuthorDate: Fri Oct 30 02:42:00 2020 +
Automated deployment: Fri Oct 30 02:41:59 UTC 2020
313405bdb39c1a248a80dd8aa15b3bba139f8cfe
---
build/ecology.js | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/build/ecology.js b/build/ecology.js
index 85e8c12..eb3ca5a 100644
--- a/build/ecology.js
+++ b/build/ecology.js
@@ -1,6 +1,6 @@
-!function(e){function t(r){if(n[r])return n[r].exports;var
a=n[r]={i:r,l:!1,exports:{}};return
e[r].call(a.exports,a,a.exports,t),a.l=!0,a.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=329 [...]
+!function(e){function t(r){if(n[r])return n[r].exports;var
a=n[r]={i:r,l:!1,exports:{}};return
e[r].call(a.exports,a,a.exports,t),a.l=!0,a.exports}var
n={};t.m=e,t.c=n,t.i=function(e){return
e},t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{configurable:!1,enumerable:!0,get:r})},t.n=function(e){var
n=e&&e.__esModule?function(){return e.default}:function(){return e};return
t.d(n,"a",n),n},t.o=function(e,t){return
Object.prototype.hasOwnProperty.call(e,t)},t.p="/build/",t(t.s=329 [...]
//! moment.js
-return
sc.isValid=Vt,sc.abs=xr,sc.add=Pr,sc.subtract=Er,sc.as=Rr,sc.asMilliseconds=Io,sc.asSeconds=Bo,sc.asMinutes=Uo,sc.asHours=qo,sc.asDays=Jo,sc.asWeeks=Go,sc.asMonths=Ko,sc.asQuarters=Zo,sc.asYears=Xo,sc.valueOf=Ir,sc._bubble=Fr,sc.clone=Ur,sc.get=qr,sc.milliseconds=$o,sc.seconds=Qo,sc.minutes=ec,sc.hours=tc,sc.days=nc,sc.weeks=Gr,sc.months=rc,sc.years=ac,sc.humanize=Qr,sc.toISOString=ta,sc.toString=ta,sc.toJSON=ta,sc.locale=Cn,sc.localeData=On,sc.toIsoString=L("toIsoString()
is depr [...]
+return
sc.isValid=Vt,sc.abs=xr,sc.add=Pr,sc.subtract=Er,sc.as=Rr,sc.asMilliseconds=Io,sc.asSeconds=Bo,sc.asMinutes=Uo,sc.asHours=qo,sc.asDays=Jo,sc.asWeeks=Go,sc.asMonths=Ko,sc.asQuarters=Zo,sc.asYears=Xo,sc.valueOf=Ir,sc._bubble=Fr,sc.clone=Ur,sc.get=qr,sc.milliseconds=$o,sc.seconds=Qo,sc.minutes=ec,sc.hours=tc,sc.days=nc,sc.weeks=Gr,sc.months=rc,sc.years=ac,sc.humanize=Qr,sc.toISOString=ta,sc.toString=ta,sc.toJSON=ta,sc.locale=Cn,sc.localeData=On,sc.toIsoString=L("toIsoString()
is depr [...]
Copyright (c) 2017 Jed Watson.
Licensed under the MIT License (MIT), see
http://jedwatson.github.io/classnames
@@ -69,7 +69,7 @@ function t(e,t,n,r){var a={s:["thoddea sekondamni","thodde
sekond"],ss:[e+" seko
//! moment.js locale configuration
var
t={1:"૧",2:"૨",3:"૩",4:"૪",5:"૫",6:"૬",7:"૭",8:"૮",9:"૯",0:"૦"},n={"૧":"1","૨":"2","૩":"3","૪":"4","૫":"5","૬":"6","૭":"7","૮":"8","૯":"9","૦":"0"};return
e.defineLocale("gu",{months:"જાન્યુઆરી_ફેબ્રુઆરી_માર્ચ_એપ્રિલ_મે_જૂન_જુલાઈ_ઑગસ્ટ_સપ્ટેમ્બર_ઑક્ટ્બર_નવેમ્બર_ડિસેમ્બર".split("_"),monthsShort:"જાન્યુ._ફેબ્રુ._માર્ચ_એપ્રિ._મે_જૂન_જુલા._ઑગ._સપ્ટે._ઑક્ટ્._નવે._ડિસે.".split("_"),monthsParseExact:!0,weekdays:"રવિવાર_સોમવાર_મંગળવાર_બુધ્વાર_ગુરુવાર_શુક્રવાર_શનિવાર".split("_"),weekdaysShort
[...]
//! moment.js locale configuration
-var
t={1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"},n={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"};return
e.defineLocale("hi",{months:"जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर".split("_"),monthsShort:"जन._फ़र._मार्च_अप्रै._मई_जून_जुल._अग._सित._अक्टू._नव._दिस.".split("_"),monthsParseExact:!0,weekdays:"रविवार_सोमवार_मंगलवार_बुधवार_गुरूवार_शुक्रवार_शनिवार".split("_"),weekdaysShort:"रवि_सोम_मंगल_बुध_गुरू_
[...]
+var
t={1:"१",2:"२",3:"३",4:"४",5:"५",6:"६",7:"७",8:"८",9:"९",0:"०"},n={"१":"1","२":"2","३":"3","४":"4","५":"5","६":"6","७":"7","८":"8","९":"9","०":"0"},r=[/^जन/i,/^फ़र|फर/i,/^मार्च/i,/^अप्रै/i,/^मई/i,/^जून/i,/^जुल/i,/^अग/i,/^सितं|सित/i,/^अक्टू/i,/^नव|नवं/i,/^दिसं|दिस/i],a=[/^जन/i,/^फ़र/i,/^मार्च/i,/^अप्रै/i,/^मई/i,/^जून/i,/^जुल/i,/^अग/i,/^सित/i,/^अक्टू/i,/^नव/i,/^दिस/i];return
e.defineLocale("hi",{months:{format:"जनवरी_फ़रवरी_मार्च_अप्रैल_मई_जून_जुलाई_अगस्त_सितम्बर_अक्टूबर_नवम्बर_दिसम्बर
[...]
//! moment.js locale configuration
function t(e,t,n){var r=e+" ";switch(n){case"ss":return
r+=1===e?"sekunda":2===e||3===e||4===e?"sekunde":"sekundi";case"m":return
t?"jedna minuta":"jedne minute";case"mm":return
r+=1===e?"minuta":2===e||3===e||4===e?"minute":"minuta";case"h":return t?"jedan
sat":"jednog sata";case"hh":return
r+
[dubbo-website] branch asf-site updated: Automated deployment: Fri Oct 30 02:48:04 UTC 2020 9dd5d39343adcc274a25044d5216962c7f69a089
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new dc8cc11 Automated deployment: Fri Oct 30 02:48:04 UTC 2020
9dd5d39343adcc274a25044d5216962c7f69a089
dc8cc11 is described below
commit dc8cc11952a799cd4b667dae315dca3ae2047014
Author: htynkn
AuthorDate: Fri Oct 30 02:48:04 2020 +
Automated deployment: Fri Oct 30 02:48:04 UTC 2020
9dd5d39343adcc274a25044d5216962c7f69a089
---
zh-cn/docs/user/new-features-in-a-glance.html | 1 -
zh-cn/docs/user/new-features-in-a-glance.json | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/zh-cn/docs/user/new-features-in-a-glance.html
b/zh-cn/docs/user/new-features-in-a-glance.html
index dc3c2e1..e8ec9d1 100644
--- a/zh-cn/docs/user/new-features-in-a-glance.html
+++ b/zh-cn/docs/user/new-features-in-a-glance.html
@@ -13,7 +13,6 @@
En[TOC]
版本速览
Dubbo 社区目前主力维护的有 2.6.x 和 2.7.x 两大版本，其中，
diff --git a/zh-cn/docs/user/new-features-in-a-glance.json
b/zh-cn/docs/user/new-features-in-a-glance.json
index 7e8e0cc..bdd26a9 100644
--- a/zh-cn/docs/user/new-features-in-a-glance.json
+++ b/zh-cn/docs/user/new-features-in-a-glance.json
@@ -1,6 +1,6 @@
{
"filename": "new-features-in-a-glance.md",
- "__html": "Dubbo 版本发布及新特性速览\n[TOC]\n版本速览\nDubbo
社区目前主力维护的有 2.6.x 和 2.7.x 两大版本，其中，\n\n2.6.x 主要以 bugfix 和少量
enhancements 为主，因此能完全保证稳定性\n2.7.x 作为社区的主要开发版本，得到持续更新并增加了大量新 feature
和优化，同时也带来了一些稳定性挑战\n\n2.7.x
版本\n\n\n\n\n版本\n重要功能\n升级建议\n\n\n\n\n1\n2.7.6\nbugfix
of 2.7.5 服务鉴权\n推荐生产使用\n\n< [...]
+ "__html": "Dubbo 版本发布及新特性速览\n版本速览\nDubbo 社区目前主力维护的有
2.6.x 和 2.7.x 两大版本，其中，\n\n2.6.x 主要以 bugfix 和少量 enhancements
为主，因此能完全保证稳定性\n2.7.x 作为社区的主要开发版本，得到持续更新并增加了大量新 feature
和优化，同时也带来了一些稳定性挑战\n\n2.7.x
版本\n\n\n\n\n版本\n重要功能\n升级建议\n\n\n\n\n1\n2.7.6\nbugfix
of 2.7.5
服务鉴权\n推荐生产使用\n\n\n2
[dubbo-website] branch master updated (9a5b024 -> 313405b)
This is an automated email from the ASF dual-hosted git repository. hyunkun pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-website.git. from 9a5b024 Update consumer-threadpool.md (#620) add 313405b Update README.md (#623) No new revisions were added by this update. Summary of changes: README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[dubbo-go] branch develop updated: upgrade sentinel go to v0.6.2 to degrade system module in windows OS.
This is an automated email from the ASF dual-hosted git repository. baze pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/develop by this push: new a548cc4 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. new 9eb7c01 Merge pull request #821 from louyuting/20201029-fix-sentinel-windows-issue a548cc4 is described below commit a548cc45067865a6a6317b64a2ae505b8a7a8d33 Author: louyuting <1849491...@qq.com> AuthorDate: Thu Oct 29 20:16:17 2020 +0800 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6e06e03..8b5b7dd 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/Workiva/go-datastructures v1.0.50 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 - github.com/alibaba/sentinel-golang v0.6.1 + github.com/alibaba/sentinel-golang v0.6.2 github.com/apache/dubbo-getty v1.3.10 github.com/apache/dubbo-go-hessian2 v1.7.0 github.com/coreos/etcd v3.3.25+incompatible diff --git a/go.sum b/go.sum index f35b6c5..684df9b 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alibaba/sentinel-golang v0.6.1 h1:Pxyw2X7ryklvToF40KG9l4uuO90jRZA2MWb8Z3d1wPo= github.com/alibaba/sentinel-golang v0.6.1/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= +github.com/alibaba/sentinel-golang v0.6.2 h1:1OjjpljJbNKWp9p5RJKxOqS1gHGZPUWPlCcokv5xYJs= +github.com/alibaba/sentinel-golang v0.6.2/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFmb7mUnp8nH9fQBA= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk=
[dubbo-website] branch master updated: remove toc tag for new-features-in-a-glance doc (#628)
This is an automated email from the ASF dual-hosted git repository. hyunkun 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 9dd5d39 remove toc tag for new-features-in-a-glance doc (#628) 9dd5d39 is described below commit 9dd5d39343adcc274a25044d5216962c7f69a089 Author: wjjiang <48505670+spongecapt...@users.noreply.github.com> AuthorDate: Fri Oct 30 10:46:07 2020 +0800 remove toc tag for new-features-in-a-glance doc (#628) --- docs/zh-cn/user/new-features-in-a-glance.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/docs/zh-cn/user/new-features-in-a-glance.md b/docs/zh-cn/user/new-features-in-a-glance.md index b5f2523..98a1557 100644 --- a/docs/zh-cn/user/new-features-in-a-glance.md +++ b/docs/zh-cn/user/new-features-in-a-glance.md @@ -1,7 +1,5 @@ # Dubbo 版本发布及新特性速览 -[TOC] - ## 版本速览 Dubbo 社区目前主力维护的有 2.6.x 和 2.7.x 两大版本，其中， * 2.6.x 主要以 bugfix 和少量 enhancements 为主，因此能完全保证稳定性
[dubbo-website] branch asf-site updated: Automated deployment: Fri Oct 30 02:48:26 UTC 2020 9cda7145fc50621ee261bd022584f7b5ac21628d
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 80ade0c Automated deployment: Fri Oct 30 02:48:26 UTC 2020
9cda7145fc50621ee261bd022584f7b5ac21628d
80ade0c is described below
commit 80ade0c0919c0ca4fa695e71b0ebe4713e0ee027
Author: htynkn
AuthorDate: Fri Oct 30 02:48:26 2020 +
Automated deployment: Fri Oct 30 02:48:26 UTC 2020
9cda7145fc50621ee261bd022584f7b5ac21628d
---
zh-cn/docs/user/configuration/annotation.html | 2 +-
zh-cn/docs/user/configuration/annotation.json | 2 +-
zh-cn/docs/user/configuration/xml.html| 2 +-
zh-cn/docs/user/configuration/xml.json| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/zh-cn/docs/user/configuration/annotation.html
b/zh-cn/docs/user/configuration/annotation.html
index f7bbd6f..c8bdee9 100644
--- a/zh-cn/docs/user/configuration/annotation.html
+++ b/zh-cn/docs/user/configuration/annotation.html
@@ -14,7 +14,7 @@
En需要 2.6.3 及以上版本支持
-点此查看https://github.com/apache/dubbo-samples/tree/master/dubbo-samples-annotation";>完整示例
+点此查看https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-annotation";>完整示例
服务提供方
Service注解暴露服务
@Service
diff --git a/zh-cn/docs/user/configuration/annotation.json
b/zh-cn/docs/user/configuration/annotation.json
index c831563..1fc0913 100644
--- a/zh-cn/docs/user/configuration/annotation.json
+++ b/zh-cn/docs/user/configuration/annotation.json
@@ -1,6 +1,6 @@
{
"filename": "annotation.md",
- "__html": "注解配置\n需要 2.6.3 及以上版本支持\n点此查看https://github.com/apache/dubbo-samples/tree/master/dubbo-samples-annotation\";>完整示例\n服务提供方\nService注解暴露服务\n@Service\npublic class AnnotationServiceImpl 注解配置\n需要 2.6.3 及以上版本支持\n点此查看https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-annotation\";>完整示例\n服务提供方\nService注解暴露服务\n@Service\npublic class AnnotationServiceImpl
En有关 XML 的详细配置项，请参见：配置参考手册。如果不想使用 Spring 配置，而希望通过 API
的方式进行调用，请参见：API配置。想知道如何使用配置，请参见：快速启动。
-请在此查看文档描述的https://github.com/apache/dubbo-samples/tree/master/dubbo-samples-basic";>完整示例
+请在此查看文档描述的https://github.com/apache/dubbo-samples/tree/master/java/dubbo-samples-basic";>完整示例
provider.xml 示例
完整示例\nprovider.xml
示例\n完整示例\nprovider.xml
示例\n
[dubbo-go] branch develop updated: upgrade sentinel go to v0.6.2 to degrade system module in windows OS.
This is an automated email from the ASF dual-hosted git repository. baze pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/develop by this push: new a548cc4 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. new 9eb7c01 Merge pull request #821 from louyuting/20201029-fix-sentinel-windows-issue a548cc4 is described below commit a548cc45067865a6a6317b64a2ae505b8a7a8d33 Author: louyuting <1849491...@qq.com> AuthorDate: Thu Oct 29 20:16:17 2020 +0800 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6e06e03..8b5b7dd 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/Workiva/go-datastructures v1.0.50 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 - github.com/alibaba/sentinel-golang v0.6.1 + github.com/alibaba/sentinel-golang v0.6.2 github.com/apache/dubbo-getty v1.3.10 github.com/apache/dubbo-go-hessian2 v1.7.0 github.com/coreos/etcd v3.3.25+incompatible diff --git a/go.sum b/go.sum index f35b6c5..684df9b 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alibaba/sentinel-golang v0.6.1 h1:Pxyw2X7ryklvToF40KG9l4uuO90jRZA2MWb8Z3d1wPo= github.com/alibaba/sentinel-golang v0.6.1/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= +github.com/alibaba/sentinel-golang v0.6.2 h1:1OjjpljJbNKWp9p5RJKxOqS1gHGZPUWPlCcokv5xYJs= +github.com/alibaba/sentinel-golang v0.6.2/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFmb7mUnp8nH9fQBA= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk=
[dubbo-go] branch develop updated: upgrade sentinel go to v0.6.2 to degrade system module in windows OS.
This is an automated email from the ASF dual-hosted git repository. baze pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/develop by this push: new a548cc4 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. new 9eb7c01 Merge pull request #821 from louyuting/20201029-fix-sentinel-windows-issue a548cc4 is described below commit a548cc45067865a6a6317b64a2ae505b8a7a8d33 Author: louyuting <1849491...@qq.com> AuthorDate: Thu Oct 29 20:16:17 2020 +0800 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6e06e03..8b5b7dd 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/Workiva/go-datastructures v1.0.50 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 - github.com/alibaba/sentinel-golang v0.6.1 + github.com/alibaba/sentinel-golang v0.6.2 github.com/apache/dubbo-getty v1.3.10 github.com/apache/dubbo-go-hessian2 v1.7.0 github.com/coreos/etcd v3.3.25+incompatible diff --git a/go.sum b/go.sum index f35b6c5..684df9b 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alibaba/sentinel-golang v0.6.1 h1:Pxyw2X7ryklvToF40KG9l4uuO90jRZA2MWb8Z3d1wPo= github.com/alibaba/sentinel-golang v0.6.1/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= +github.com/alibaba/sentinel-golang v0.6.2 h1:1OjjpljJbNKWp9p5RJKxOqS1gHGZPUWPlCcokv5xYJs= +github.com/alibaba/sentinel-golang v0.6.2/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFmb7mUnp8nH9fQBA= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk=
[dubbo-go-samples] branch makefile updated: clean up imports
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new cdbddd8 clean up imports
cdbddd8 is described below
commit cdbddd8a7047648c8d645d17cbdb8fad5b1f7aab
Author: Ian Luo
AuthorDate: Fri Oct 30 11:27:58 2020 +0800
clean up imports
---
direct/go-client/conf/client.yml| 2 +-
direct/go-server/tests/integration/main_test.go | 10 +-
direct/go-server/tests/integration/userprovider_test.go | 8
generic/go-server/tests/integration/main_test.go| 7 +++
generic/go-server/tests/integration/userprovider_test.go| 7 ---
helloworld/go-client/conf/client.yml| 2 +-
helloworld/go-client/pkg/user.go| 6 +-
helloworld/go-server/cmd/server.go | 3 +--
helloworld/go-server/conf/client.yml| 2 +-
helloworld/go-server/tests/integration/main_test.go | 8
helloworld/go-server/tests/integration/userprovider_test.go | 8
11 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/direct/go-client/conf/client.yml b/direct/go-client/conf/client.yml
index 6fb0977..3822e1f 100644
--- a/direct/go-client/conf/client.yml
+++ b/direct/go-client/conf/client.yml
@@ -9,7 +9,7 @@ connect_timeout: "3s"
# application config
application:
organization: "dubbo.io"
- name: "UserInfoServer"
+ name: "UserInfoClient"
module: "dubbo-go user-info client"
version: "0.0.1"
environment: "dev"
diff --git a/direct/go-server/tests/integration/main_test.go
b/direct/go-server/tests/integration/main_test.go
index 1c10dec..0f824e6 100644
--- a/direct/go-server/tests/integration/main_test.go
+++ b/direct/go-server/tests/integration/main_test.go
@@ -22,6 +22,14 @@ package integration
import (
hessian "github.com/apache/dubbo-go-hessian2"
"github.com/apache/dubbo-go/config"
+
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ _ "github.com/apache/dubbo-go/filter/filter_impl"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
import (
@@ -59,4 +67,4 @@ func (u *UserProvider) Reference() string {
func (User) JavaClassName() string {
return "org.apache.dubbo.User"
-}
\ No newline at end of file
+}
diff --git a/direct/go-server/tests/integration/userprovider_test.go
b/direct/go-server/tests/integration/userprovider_test.go
index f3cf65b..e5da5e0 100644
--- a/direct/go-server/tests/integration/userprovider_test.go
+++ b/direct/go-server/tests/integration/userprovider_test.go
@@ -24,14 +24,6 @@ import (
"testing"
)
import (
- _ "github.com/apache/dubbo-go/cluster/cluster_impl"
- _ "github.com/apache/dubbo-go/cluster/loadbalance"
- _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
- _ "github.com/apache/dubbo-go/filter/filter_impl"
- _ "github.com/apache/dubbo-go/protocol/dubbo"
- _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/apache/dubbo-go/registry/zookeeper"
-
"github.com/stretchr/testify/assert"
)
diff --git a/generic/go-server/tests/integration/main_test.go
b/generic/go-server/tests/integration/main_test.go
index b22fff2..1cf9287 100644
--- a/generic/go-server/tests/integration/main_test.go
+++ b/generic/go-server/tests/integration/main_test.go
@@ -20,8 +20,15 @@
package integration
import (
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/filter/filter_impl"
"github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
import (
diff --git a/generic/go-server/tests/integration/userprovider_test.go
b/generic/go-server/tests/integration/userprovider_test.go
index 0c9a6cb..d7c0880 100644
--- a/generic/go-server/tests/integration/userprovider_test.go
+++ b/generic/go-server/tests/integration/userprovider_test.go
@@ -26,14 +26,7 @@ import (
"time"
)
import (
- _ "github.com/apache/dubbo-go/cluster/cluster_impl"
- _ "github.com/apache/dubbo-go/cluster/loadbalance"
- _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
- _ "github.com/apache/dubbo-go/filter/filter_impl"
-
[dubbo-go] branch develop updated: upgrade sentinel go to v0.6.2 to degrade system module in windows OS.
This is an automated email from the ASF dual-hosted git repository. baze pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/dubbo-go.git The following commit(s) were added to refs/heads/develop by this push: new a548cc4 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. new 9eb7c01 Merge pull request #821 from louyuting/20201029-fix-sentinel-windows-issue a548cc4 is described below commit a548cc45067865a6a6317b64a2ae505b8a7a8d33 Author: louyuting <1849491...@qq.com> AuthorDate: Thu Oct 29 20:16:17 2020 +0800 upgrade sentinel go to v0.6.2 to degrade system module in windows OS. --- go.mod | 2 +- go.sum | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 6e06e03..8b5b7dd 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ require ( github.com/RoaringBitmap/roaring v0.4.23 github.com/Workiva/go-datastructures v1.0.50 github.com/afex/hystrix-go v0.0.0-20180502004556-fa1af6a1f4f5 - github.com/alibaba/sentinel-golang v0.6.1 + github.com/alibaba/sentinel-golang v0.6.2 github.com/apache/dubbo-getty v1.3.10 github.com/apache/dubbo-go-hessian2 v1.7.0 github.com/coreos/etcd v3.3.25+incompatible diff --git a/go.sum b/go.sum index f35b6c5..684df9b 100644 --- a/go.sum +++ b/go.sum @@ -95,6 +95,8 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alibaba/sentinel-golang v0.6.1 h1:Pxyw2X7ryklvToF40KG9l4uuO90jRZA2MWb8Z3d1wPo= github.com/alibaba/sentinel-golang v0.6.1/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= +github.com/alibaba/sentinel-golang v0.6.2 h1:1OjjpljJbNKWp9p5RJKxOqS1gHGZPUWPlCcokv5xYJs= +github.com/alibaba/sentinel-golang v0.6.2/go.mod h1:5jemKdyCQCKVf+quEia53fo9a17OSe+wnl9HX2NbNpc= github.com/aliyun/alibaba-cloud-sdk-go v0.0.0-20190808125512-07798873deee/go.mod h1:myCDvQSzCW+wB1WAlocEru4wMGJxy+vlxHdhegi1CDQ= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18 h1:zOVTBdCKFd9JbCKz9/nt+FovbjPFmb7mUnp8nH9fQBA= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk=
[dubbo-go-samples] branch makefile updated: clean up imports
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new cdbddd8 clean up imports
cdbddd8 is described below
commit cdbddd8a7047648c8d645d17cbdb8fad5b1f7aab
Author: Ian Luo
AuthorDate: Fri Oct 30 11:27:58 2020 +0800
clean up imports
---
direct/go-client/conf/client.yml| 2 +-
direct/go-server/tests/integration/main_test.go | 10 +-
direct/go-server/tests/integration/userprovider_test.go | 8
generic/go-server/tests/integration/main_test.go| 7 +++
generic/go-server/tests/integration/userprovider_test.go| 7 ---
helloworld/go-client/conf/client.yml| 2 +-
helloworld/go-client/pkg/user.go| 6 +-
helloworld/go-server/cmd/server.go | 3 +--
helloworld/go-server/conf/client.yml| 2 +-
helloworld/go-server/tests/integration/main_test.go | 8
helloworld/go-server/tests/integration/userprovider_test.go | 8
11 files changed, 33 insertions(+), 30 deletions(-)
diff --git a/direct/go-client/conf/client.yml b/direct/go-client/conf/client.yml
index 6fb0977..3822e1f 100644
--- a/direct/go-client/conf/client.yml
+++ b/direct/go-client/conf/client.yml
@@ -9,7 +9,7 @@ connect_timeout: "3s"
# application config
application:
organization: "dubbo.io"
- name: "UserInfoServer"
+ name: "UserInfoClient"
module: "dubbo-go user-info client"
version: "0.0.1"
environment: "dev"
diff --git a/direct/go-server/tests/integration/main_test.go
b/direct/go-server/tests/integration/main_test.go
index 1c10dec..0f824e6 100644
--- a/direct/go-server/tests/integration/main_test.go
+++ b/direct/go-server/tests/integration/main_test.go
@@ -22,6 +22,14 @@ package integration
import (
hessian "github.com/apache/dubbo-go-hessian2"
"github.com/apache/dubbo-go/config"
+
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
+ _ "github.com/apache/dubbo-go/filter/filter_impl"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
import (
@@ -59,4 +67,4 @@ func (u *UserProvider) Reference() string {
func (User) JavaClassName() string {
return "org.apache.dubbo.User"
-}
\ No newline at end of file
+}
diff --git a/direct/go-server/tests/integration/userprovider_test.go
b/direct/go-server/tests/integration/userprovider_test.go
index f3cf65b..e5da5e0 100644
--- a/direct/go-server/tests/integration/userprovider_test.go
+++ b/direct/go-server/tests/integration/userprovider_test.go
@@ -24,14 +24,6 @@ import (
"testing"
)
import (
- _ "github.com/apache/dubbo-go/cluster/cluster_impl"
- _ "github.com/apache/dubbo-go/cluster/loadbalance"
- _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
- _ "github.com/apache/dubbo-go/filter/filter_impl"
- _ "github.com/apache/dubbo-go/protocol/dubbo"
- _ "github.com/apache/dubbo-go/registry/protocol"
- _ "github.com/apache/dubbo-go/registry/zookeeper"
-
"github.com/stretchr/testify/assert"
)
diff --git a/generic/go-server/tests/integration/main_test.go
b/generic/go-server/tests/integration/main_test.go
index b22fff2..1cf9287 100644
--- a/generic/go-server/tests/integration/main_test.go
+++ b/generic/go-server/tests/integration/main_test.go
@@ -20,8 +20,15 @@
package integration
import (
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+ _ "github.com/apache/dubbo-go/cluster/loadbalance"
+ _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
+ _ "github.com/apache/dubbo-go/filter/filter_impl"
"github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/protocol/dubbo"
+ _ "github.com/apache/dubbo-go/registry/protocol"
+ _ "github.com/apache/dubbo-go/registry/zookeeper"
)
import (
diff --git a/generic/go-server/tests/integration/userprovider_test.go
b/generic/go-server/tests/integration/userprovider_test.go
index 0c9a6cb..d7c0880 100644
--- a/generic/go-server/tests/integration/userprovider_test.go
+++ b/generic/go-server/tests/integration/userprovider_test.go
@@ -26,14 +26,7 @@ import (
"time"
)
import (
- _ "github.com/apache/dubbo-go/cluster/cluster_impl"
- _ "github.com/apache/dubbo-go/cluster/loadbalance"
- _ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
- _ "github.com/apache/dubbo-go/filter/filter_impl"
-
[dubbo-go-samples] branch makefile updated: make integration test works for nacos
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new 20e4f90 make integration test works for nacos
20e4f90 is described below
commit 20e4f90cb7bdb2892d608d3172847e93fc003c01
Author: Ian Luo
AuthorDate: Fri Oct 30 11:43:37 2020 +0800
make integration test works for nacos
---
configcenter/apollo/README.md | 38
configcenter/nacos/README.md | 11 --
.../nacos/dubbo/go-client/assembly/bin/load.sh | 203 -
.../dubbo/go-client/assembly/common/app.properties | 23 ---
.../nacos/dubbo/go-client/assembly/common/build.sh | 83 -
.../nacos/dubbo/go-client/assembly/linux/dev.sh| 36
.../dubbo/go-client/assembly/linux/release.sh | 35
.../nacos/dubbo/go-client/assembly/linux/test.sh | 35
.../nacos/dubbo/go-client/assembly/mac/dev.sh | 36
.../nacos/dubbo/go-client/assembly/mac/release.sh | 34
.../nacos/dubbo/go-client/assembly/mac/test.sh | 34
.../nacos/dubbo/go-client/assembly/windows/dev.sh | 34
.../dubbo/go-client/assembly/windows/release.sh| 34
.../nacos/dubbo/go-client/assembly/windows/test.sh | 34
.../dubbo/config/user-info-client/dubbo.properties | 1 -
.../nacos/dubbo/go-server/assembly/bin/load.sh | 151 ---
.../dubbo/go-server/assembly/common/app.properties | 23 ---
.../nacos/dubbo/go-server/assembly/common/build.sh | 80
.../nacos/dubbo/go-server/assembly/linux/dev.sh| 36
.../dubbo/go-server/assembly/linux/release.sh | 36
.../nacos/dubbo/go-server/assembly/linux/test.sh | 36
.../nacos/dubbo/go-server/assembly/mac/dev.sh | 36
.../nacos/dubbo/go-server/assembly/mac/release.sh | 36
.../nacos/dubbo/go-server/assembly/mac/test.sh | 36
.../nacos/dubbo/go-server/assembly/windows/dev.sh | 36
.../dubbo/go-server/assembly/windows/release.sh| 36
.../nacos/dubbo/go-server/assembly/windows/test.sh | 36
.../dubbo/config/user-info-server/dubbo.properties | 4 -
.../go-client/app => go-client/cmd}/client.go | 65 ++-
.../profiles/dev => go-client/conf}/client.yml | 41 +++--
.../profiles/dev => go-client/conf}/log.yml| 56 +++---
.../{dubbo/go-client/app => go-client/pkg}/user.go | 38 ++--
.../nacos/{dubbo => }/go-server/app/server.go | 0
.../nacos/{dubbo => }/go-server/app/user.go| 0
.../app/client.go => go-server/cmd/server.go} | 39 ++--
.../profiles/dev => go-server/conf}/client.yml | 41 +++--
.../profiles/dev => go-server/conf}/log.yml| 56 +++---
.../profiles/dev => go-server/conf}/server.yml | 34 ++--
.../nacos/go-server/docker/docker-compose.yml | 17 ++
.../{dubbo/go-client/app => go-server/pkg}/user.go | 23 ++-
.../tests/integration/main_test.go}| 31 +++-
.../tests/integration/userprovider_test.go}| 42 ++---
42 files changed, 240 insertions(+), 1496 deletions(-)
diff --git a/configcenter/apollo/README.md b/configcenter/apollo/README.md
deleted file mode 100644
index 7f986f9..000
--- a/configcenter/apollo/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-### 1.Run apollo as config center
-
-* download this folder as below
-
-[docker-quick-start](https://github.com/ctripcorp/apollo/tree/master/scripts/docker-quick-start)
-
-* enter docker-quick-start folder and run
-
-```docker-compose up```
-
-### 2.Run java server & java client following
[README](https://github.com/dubbogo/dubbo-samples/blob/master/golang/README.md)
-
-* Set config item **app.id** in /resources/META-INF/app.properties like
-
-```
-app.id=application
-```
-
-* Set apollo meta url in /resources/META-INF/spring/dubbo.provider.xml and
/resources/META-INF/spring/dubbo.consumer.xml like
-
-```
-
-```
-
-Build and run it , enjoy.
-
-### 3.Run java server & go client
-
-Stop java client. Copy go client configuration file
[dubbo.properties](https://github.com/dubbogo/dubbo-samples/golang/blob/master/configcenter/apollo/dubbo/go-client/profiles/dev/dubbo/config/user-info-client/dubbo.properties)
as
-namespace dubbo.properties in apollo.
-
-Then start go client following
[README](https://github.com/dubbogo/dubbo-samples/blob/master/golang/README.md).
-
-### 4.Run go server
-
-The same as step 3. Copy go server configuration file
[dubbo.properties](https://github.com/dubbogo/dubbo-samples/blob/master/golang/configcenter/apollo/dubbo/go-server/profiles/dev/dubbo/config/user-info-server/dubbo.properties)
as
-namespace dubbo.properties in apollo.
-
diff --git a/configcenter/nacos/README.md b/configcenter/nacos/README.md
deleted file mode 100644
index 614760e..000
--- a/configcenter/nacos/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-### 1.Run nao
[dubbo-go-samples] branch makefile updated: remove useless java dirs
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new aeb1750 remove useless java dirs
aeb1750 is described below
commit aeb17507b3df74c47a691943bb471a7350680d74
Author: Ian Luo
AuthorDate: Fri Oct 30 11:44:20 2020 +0800
remove useless java dirs
---
configcenter/apollo/java-client/build.sh | 21 --
configcenter/apollo/java-client/pom.xml| 211 -
.../java-client/src/main/assembly/assembly.xml | 43
.../src/main/java/com/ikurento/user/Consumer.java | 61 -
.../java/com/ikurento/user/EmbeddedZooKeeper.java | 250 -
.../src/main/java/com/ikurento/user/User.java | 76 ---
.../main/java/com/ikurento/user/UserProvider.java | 18 --
.../src/main/java/com/ikurento/user/ZKTools.java | 88
.../src/main/resources/META-INF/app.properties | 1 -
.../resources/META-INF/spring/dubbo.consumer.xml | 34 ---
.../src/main/resources/META-INF/spring/service.xml | 27 ---
.../src/main/resources/log4j.properties| 19 --
configcenter/apollo/java-server/build.sh | 20 --
configcenter/apollo/java-server/pom.xml| 216 --
configcenter/apollo/java-server/script/debug.sh| 23 --
.../java-server/src/main/assembly/assembly.xml | 43
.../java/com/ikurento/user/EmbeddedZooKeeper.java | 250 -
.../src/main/java/com/ikurento/user/Provider.java | 40
.../src/main/java/com/ikurento/user/User.java | 86 ---
.../main/java/com/ikurento/user/UserProvider.java | 24 --
.../src/main/java/com/ikurento/user/ZKTools.java | 89
.../com/ikurento/user/impl/UserProviderImpl.java | 32 ---
.../src/main/resources/META-INF/app.properties | 1 -
.../resources/META-INF/spring/dubbo.provider.xml | 32 ---
.../src/main/resources/log4j.properties| 20 --
25 files changed, 1725 deletions(-)
diff --git a/configcenter/apollo/java-client/build.sh
b/configcenter/apollo/java-client/build.sh
deleted file mode 100644
index c869acf..000
--- a/configcenter/apollo/java-client/build.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# rm src/main/resources/META-INF/spring/dubbo.consumer.xml
-# cp src/main/resources/META-INF/spring/dubbo-protocol.consumer.xml
src/main/resources/META-INF/spring/dubbo.consumer.xml
-# cp src/main/resources/META-INF/spring/jsonrpc-protocol.consumer.xml
src/main/resources/META-INF/spring/dubbo.consumer.xml
-mvn clean package -Dmaven.test.skip
diff --git a/configcenter/apollo/java-client/pom.xml
b/configcenter/apollo/java-client/pom.xml
deleted file mode 100644
index ce2d151..000
--- a/configcenter/apollo/java-client/pom.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-
-
-
-http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";
-xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- 4.0.0
-
- com.ikurento
- user-info-client
- jar
- 0.2.0
- The demo consumer module of dubbo project
-
-
- 1.8
- 1.8
- 2.7.3
- 4.3.16.RELEASE
- 4.12
-
0.30.0
- 1.2.0
-
3.7.0
-
2.21.0
- ${artifactId}:${dubbo.version}
- openjdk:8
- 20880
- 2181
-
-
-
-
- org.apache.dubbo
- dubbo
- ${dubbo.version}
-
-
-
- org.apache.dubbo
- dubbo-dependencies-zookeeper
- ${dubbo.version}
- pom
-
-
- org.apache.dubbo
- dubbo-configcenter-apollo
- ${dubbo.version}
- pom
-
-
-
[dubbo-go-samples] branch makefile updated: make integration test work for configcenter/zookeeper
This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch makefile
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
The following commit(s) were added to refs/heads/makefile by this push:
new f2dfc66 make integration test work for configcenter/zookeeper
f2dfc66 is described below
commit f2dfc660172196f107096e2a308aa304d66bc8d9
Author: Ian Luo
AuthorDate: Fri Oct 30 13:22:03 2020 +0800
make integration test work for configcenter/zookeeper
---
configcenter/zookeeper/README.md | 38
.../zookeeper/dubbo/go-client/assembly/bin/load.sh | 203 -
.../dubbo/go-client/assembly/common/app.properties | 23 --
.../dubbo/go-client/assembly/common/build.sh | 83 ---
.../dubbo/go-client/assembly/linux/dev.sh | 36 ---
.../dubbo/go-client/assembly/linux/release.sh | 35 ---
.../dubbo/go-client/assembly/linux/test.sh | 35 ---
.../zookeeper/dubbo/go-client/assembly/mac/dev.sh | 36 ---
.../dubbo/go-client/assembly/mac/release.sh| 34 ---
.../zookeeper/dubbo/go-client/assembly/mac/test.sh | 34 ---
.../dubbo/go-client/assembly/windows/dev.sh| 34 ---
.../dubbo/go-client/assembly/windows/release.sh| 34 ---
.../dubbo/go-client/assembly/windows/test.sh | 34 ---
.../dubbo/config/user-info-client/dubbo.properties | 1 -
.../zookeeper/dubbo/go-server/assembly/bin/load.sh | 151 -
.../dubbo/go-server/assembly/common/app.properties | 23 --
.../dubbo/go-server/assembly/common/build.sh | 80 ---
.../dubbo/go-server/assembly/linux/dev.sh | 36 ---
.../dubbo/go-server/assembly/linux/release.sh | 36 ---
.../dubbo/go-server/assembly/linux/test.sh | 36 ---
.../zookeeper/dubbo/go-server/assembly/mac/dev.sh | 36 ---
.../dubbo/go-server/assembly/mac/release.sh| 36 ---
.../zookeeper/dubbo/go-server/assembly/mac/test.sh | 36 ---
.../dubbo/go-server/assembly/windows/dev.sh| 36 ---
.../dubbo/go-server/assembly/windows/release.sh| 36 ---
.../dubbo/go-server/assembly/windows/test.sh | 36 ---
.../dubbo/config/user-info-server/dubbo.properties | 4 -
configcenter/zookeeper/dubbo/java-client/build.sh | 21 --
configcenter/zookeeper/dubbo/java-client/pom.xml | 205 -
.../java-client/src/main/assembly/assembly.xml | 43
.../src/main/java/com/ikurento/user/Consumer.java | 63 --
.../java/com/ikurento/user/EmbeddedZooKeeper.java | 250 -
.../src/main/java/com/ikurento/user/User.java | 76 ---
.../main/java/com/ikurento/user/UserProvider.java | 18 --
.../src/main/java/com/ikurento/user/ZKTools.java | 88
.../resources/META-INF/spring/dubbo.consumer.xml | 34 ---
.../src/main/resources/META-INF/spring/service.xml | 27 ---
.../src/main/resources/log4j.properties| 19 --
configcenter/zookeeper/dubbo/java-server/build.sh | 20 --
configcenter/zookeeper/dubbo/java-server/pom.xml | 210 -
.../zookeeper/dubbo/java-server/script/debug.sh| 23 --
.../java-server/src/main/assembly/assembly.xml | 43
.../java/com/ikurento/user/EmbeddedZooKeeper.java | 250 -
.../src/main/java/com/ikurento/user/Provider.java | 42
.../src/main/java/com/ikurento/user/User.java | 86 ---
.../src/main/java/com/ikurento/user/ZKTools.java | 89
.../com/ikurento/user/impl/UserProviderImpl.java | 32 ---
.../resources/META-INF/spring/dubbo.provider.xml | 32 ---
.../src/main/resources/log4j.properties| 20 --
.../go-client/app => go-client/cmd}/client.go | 66 ++
.../profiles/dev => go-client/conf}/client.yml | 38 +++-
.../profiles/dev => go-client/conf}/log.yml| 56 ++---
.../{dubbo/go-client/app => go-client/pkg}/user.go | 38 ++--
.../go-server/app => go-server/cmd}/server.go | 9 +-
.../profiles/dev => go-server/conf}/client.yml | 38 +++-
.../profiles/dev => go-server/conf}/log.yml| 56 ++---
.../profiles/dev => go-server/conf}/server.yml | 33 ++-
.../docker/docker-compose.yml} | 7 +-
.../{dubbo/go-server/app => go-server/pkg}/user.go | 4 +-
.../tests/integration/main_test.go}| 31 ++-
.../tests/integration/userprovider_test.go}| 62 +++--
61 files changed, 264 insertions(+), 3107 deletions(-)
diff --git a/configcenter/zookeeper/README.md b/configcenter/zookeeper/README.md
deleted file mode 100644
index bc6f23d..000
--- a/configcenter/zookeeper/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-### 1.Run zookeeper as config center
-
-```docker-compose -f docker/docker-compose.yaml up -d```
-
-### 2.Run java server & java client following
[README](https://github.com/dubbogo/dubbo-samples/blob/master/golang/README.md)（You
must run java program to initialize configuration in zookeeper）
-
-Java program will
[dubbo-go-samples] 05/34: trigger test
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 7cd792d64787109530dc00d68cd36f07af944fd8 Author: Joe Zou AuthorDate: Wed Oct 14 16:29:14 2020 +0800 trigger test --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 09f1032..8cef239 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,5 +6,5 @@ go: env: - GO111MODULE=on import: - - golang/helloworld/dubbo/.travis.yml -# - golang/direct/dubbo/.travis.yml + - helloworld/dubbo/.travis.yml + - golang/direct/dubbo/.travis.yml
[dubbo-go-samples] 09/34: fix test problems
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 40a18d38ab3f6334f8a0da76b59f27b7b386ae2c Author: Joe Zou AuthorDate: Thu Oct 15 00:23:55 2020 +0800 fix test problems --- async/.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/async/.travis.yml b/async/.travis.yml index 6177f28..4d6e2ea 100644 --- a/async/.travis.yml +++ b/async/.travis.yml @@ -4,7 +4,7 @@ jobs: include: - stage: Test async script: -- PROJECT_HOME=$(pwd)/golang +- PROJECT_HOME=$(pwd) - CASE_HOME=/direct/dubbo - GO_SERVER=/go-server - GO_CLIENT=/go-client
[dubbo-go-samples] branch master updated (3722ee2 -> f19feed)
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git.
from 3722ee2 format import
new 5536f32 consul service discovery sample
new f71bec1 code optimization
new f19feed Merge pull request #7 from
zhangshen023/consul_service_discovery
The 34 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:
.../{zookeeper => consul}/go-client/app/client.go | 17 -
.../servicediscovery/consul}/go-client/app/user.go | 2 +-
.../servicediscovery/consul/go-client}/app/version.go | 0
.../consul}/go-client/assembly/bin/load.sh | 0
.../consul}/go-client/assembly/common/app.properties| 0
.../consul}/go-client/assembly/common/build.sh | 0
.../consul}/go-client/assembly/linux/dev.sh | 0
.../consul}/go-client/assembly/linux/release.sh | 0
.../consul}/go-client/assembly/linux/test.sh| 0
.../consul}/go-client/assembly/mac/dev.sh | 0
.../consul}/go-client/assembly/mac/release.sh | 0
.../consul}/go-client/assembly/mac/test.sh | 0
.../consul}/go-client/assembly/windows/dev.sh | 0
.../consul}/go-client/assembly/windows/release.sh | 0
.../consul}/go-client/assembly/windows/test.sh | 0
.../{etcd => consul}/go-client/profiles/dev/client.yml | 16
.../consul/go-client}/profiles/dev/log.yml | 0
.../go-client/profiles/release/client.yml | 0
.../consul/go-client}/profiles/release/log.yml | 0
.../go-client/profiles/test/client.yml | 0
.../consul/go-client}/profiles/test/log.yml | 0
.../{zookeeper => consul}/go-server/app/server.go | 4 ++--
.../servicediscovery/consul}/go-server/app/user.go | 10 +-
.../servicediscovery/consul}/go-server/app/version.go | 0
.../consul}/go-server/assembly/bin/load.sh | 0
.../consul}/go-server/assembly/common/app.properties| 0
.../consul}/go-server/assembly/common/build.sh | 0
.../consul}/go-server/assembly/linux/dev.sh | 0
.../consul}/go-server/assembly/linux/release.sh | 0
.../consul}/go-server/assembly/linux/test.sh| 0
.../consul}/go-server/assembly/mac/dev.sh | 0
.../consul}/go-server/assembly/mac/release.sh | 0
.../consul}/go-server/assembly/mac/test.sh | 0
.../consul}/go-server/assembly/windows/dev.sh | 0
.../consul}/go-server/assembly/windows/release.sh | 0
.../consul}/go-server/assembly/windows/test.sh | 0
.../consul}/go-server/profiles/dev/log.yml | 0
.../{etcd => consul}/go-server/profiles/dev/server.yml | 16
.../consul/go-server/profiles/release}/log.yml | 0
.../go-server/profiles/release}/server.yml | 0
.../consul/go-server/profiles/test}/log.yml | 0
.../go-server/profiles/test/server.yml | 0
42 files changed, 32 insertions(+), 33 deletions(-)
copy registry/servicediscovery/{zookeeper => consul}/go-client/app/client.go
(93%)
copy {configcenter/apollo/dubbo =>
registry/servicediscovery/consul}/go-client/app/user.go (97%)
copy {tracing/jsonrpc/go-server =>
registry/servicediscovery/consul/go-client}/app/version.go (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/bin/load.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/common/app.properties
(100%)
copy {tracing/grpc =>
registry/servicediscovery/consul}/go-client/assembly/common/build.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/linux/dev.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/linux/release.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/linux/test.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/mac/dev.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/mac/release.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/mac/test.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/windows/dev.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/windows/release.sh (100%)
copy {tracing/jsonrpc =>
registry/servicediscovery/consul}/go-client/assembly/windows/test.sh (100%)
copy registry/servicediscovery/{etcd =>
consul}/go-client/profiles/dev/client.yml (88%)
copy {tracing/grpc/go-server =
[dubbo-go-samples] 27/34: enable issues
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 15a68f677483e45b75fa8abb02e60b82fab6d4b0 Author: Ian Luo AuthorDate: Mon Oct 26 10:26:12 2020 +0800 enable issues --- .asf.yaml | 6 ++ 1 file changed, 6 insertions(+) diff --git a/.asf.yaml b/.asf.yaml index 8d84e69..3724583 100644 --- a/.asf.yaml +++ b/.asf.yaml @@ -1,3 +1,9 @@ +github: +features: +wiki: true +issues: true +merge: true +projects: true notifications: commits: commits@dubbo.apache.org issues: notificati...@dubbo.apache.org
[dubbo-go-samples] 23/34: add test for filter/custom_filter/dubbo
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit dbba7d116895ff35650f8e81801cd7b4e2767568
Author: Joe Zou
AuthorDate: Thu Oct 22 23:10:01 2020 +0800
add test for filter/custom_filter/dubbo
---
.travis.yml| 1 +
filter/custom_filter/dubbo/.travis.yml | 16 +++
.../dubbo/go-client/integration_testing.sh | 31 ++
.../dubbo/go-server/integration_testing.sh | 31 ++
4 files changed, 79 insertions(+)
diff --git a/.travis.yml b/.travis.yml
index 3118b34..6c851d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,3 +10,4 @@ import:
- direct/dubbo/.travis.yml
- async/.travis.yml
- metric/dubbo/.travis.yml
+ - filter/custom_filter/dubbo/.travis.yml
diff --git a/filter/custom_filter/dubbo/.travis.yml
b/filter/custom_filter/dubbo/.travis.yml
new file mode 100644
index 000..dc569b1
--- /dev/null
+++ b/filter/custom_filter/dubbo/.travis.yml
@@ -0,0 +1,16 @@
+stages:
+ - Test filter/custom_filter/dubbo
+jobs:
+ include:
+- stage: Test filter/custom_filter/dubbo
+ script:
+- PROJECT_HOME=$(pwd)
+- CASE_HOME=/filter/custom_filter/dubbo
+- GO_SERVER=/go-server
+- GO_CLIENT=/go-client
+- docker run -d --network host zookeeper
+- echo "zookeeper listen in [:]2181"
+- cd ${PROJECT_HOME}${CASE_HOME}${GO_SERVER}
+- ./integration_testing.sh ${PROJECT_HOME} ${GO_SERVER} true
+- cd ${PROJECT_HOME}${CASE_HOME}${GO_CLIENT}
+- ./integration_testing.sh ${PROJECT_HOME} ${GO_CLIENT}
diff --git a/filter/custom_filter/dubbo/go-client/integration_testing.sh
b/filter/custom_filter/dubbo/go-client/integration_testing.sh
new file mode 100755
index 000..49f7b49
--- /dev/null
+++ b/filter/custom_filter/dubbo/go-client/integration_testing.sh
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/bash
+
+set -e
+set -x
+
+rm -rf assembly
+cp -r $1/.integration/testing/$2/assembly .
+assembly/linux/dev.sh
+cd target/*/*/
+# is async
+if [[ $3 ]]; then
+ nohup bin/load.sh start > a.out&
+else
+ bin/load.sh start
+fi
\ No newline at end of file
diff --git a/filter/custom_filter/dubbo/go-server/integration_testing.sh
b/filter/custom_filter/dubbo/go-server/integration_testing.sh
new file mode 100755
index 000..49f7b49
--- /dev/null
+++ b/filter/custom_filter/dubbo/go-server/integration_testing.sh
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/bash
+
+set -e
+set -x
+
+rm -rf assembly
+cp -r $1/.integration/testing/$2/assembly .
+assembly/linux/dev.sh
+cd target/*/*/
+# is async
+if [[ $3 ]]; then
+ nohup bin/load.sh start > a.out&
+else
+ bin/load.sh start
+fi
\ No newline at end of file
[dubbo-go-samples] 13/34: change go mod version
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 5612a3c66734e6ebd50fcb1c4d157d4253e640f9 Author: Joe Zou AuthorDate: Fri Oct 16 10:35:56 2020 +0800 change go mod version --- go.mod | 2 +- go.sum | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9de398b..7b80fca 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/apache/dubbo-samples/golang require ( - github.com/apache/dubbo-go v1.5.3-0.20201015161623-1268a960bc7b // indirect + github.com/apache/dubbo-go v1.5.3 github.com/apache/dubbo-go-hessian2 v1.7.0 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect github.com/dubbogo/gost v1.9.2 diff --git a/go.sum b/go.sum index b636bb3..d6447e9 100644 --- a/go.sum +++ b/go.sum @@ -87,7 +87,10 @@ github.com/apache/dubbo-getty v1.3.10/go.mod h1:x6rraK01BL5C7jUM2fPl5KMkAxLVIx54 github.com/apache/dubbo-go v1.4.0-rc1.0.20200919130513-8a059ddd7bf7/go.mod h1:KIvoPmZH/0PPmBnty4dz4uXtTFUYQ37jMJsXaEYn+WQ= github.com/apache/dubbo-go v1.5.2-0.20200919130513-8a059ddd7bf7 h1:o2wh0fKS1YXsLLDGYQTA2QFZOQ93RvCdUdodN50OyVc= github.com/apache/dubbo-go v1.5.2-0.20200919130513-8a059ddd7bf7/go.mod h1:KIvoPmZH/0PPmBnty4dz4uXtTFUYQ37jMJsXaEYn+WQ= +github.com/apache/dubbo-go v1.5.3-0.20201015161623-1268a960bc7b h1:KqMRVxf+UZXBWY3OHKLvICrXxFceaa1wU/n5Hpx4M5s= github.com/apache/dubbo-go v1.5.3-0.20201015161623-1268a960bc7b/go.mod h1:MmCthhkWG4/t1c5lqN4VQGvUdi+9yLhb58++vn88EyE= +github.com/apache/dubbo-go v1.5.3 h1:cr4bRXHvd8z/Limorjf87yEhVeLTYGHPaXXN2qBKh6E= +github.com/apache/dubbo-go v1.5.3/go.mod h1:MmCthhkWG4/t1c5lqN4VQGvUdi+9yLhb58++vn88EyE= github.com/apache/dubbo-go-hessian2 v1.7.0 h1:u2XxIuepu/zb6JcGZc7EbvKboXdKoJbf7rbmeq6SF1w= github.com/apache/dubbo-go-hessian2 v1.7.0/go.mod h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
[dubbo-go-samples] 06/34: trigger test
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit f32a81825959ef7f57b8d01bfb7f4365b3af2644 Author: Joe Zou AuthorDate: Wed Oct 14 16:32:11 2020 +0800 trigger test --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8cef239..bbab1ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,4 +7,4 @@ env: - GO111MODULE=on import: - helloworld/dubbo/.travis.yml - - golang/direct/dubbo/.travis.yml + - direct/dubbo/.travis.yml
[dubbo-go-samples] 30/34: fix:import block
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 680f8847ecb1b00d0fd79afbfd71a3e6215ea437
Author: 382673...@qq.com <382673...@qq.com>
AuthorDate: Thu Oct 29 13:06:12 2020 +0800
fix:import block
---
general/grpc/stream/go-client/app/client.go | 15 ++-
general/grpc/stream/go-client/app/hello.go | 7 ++-
general/grpc/stream/go-server/app/greeter.go | 2 ++
3 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/general/grpc/stream/go-client/app/client.go
b/general/grpc/stream/go-client/app/client.go
index 4fe3a9f..2333724 100644
--- a/general/grpc/stream/go-client/app/client.go
+++ b/general/grpc/stream/go-client/app/client.go
@@ -24,26 +24,23 @@ import (
"os/signal"
"syscall"
"time"
+)
- _ "github.com/apache/dubbo-go/cluster/cluster_impl"
+import (
+ gxlog "github.com/dubbogo/gost/log"
+)
+import (
+ _ "github.com/apache/dubbo-go/cluster/cluster_impl"
_ "github.com/apache/dubbo-go/cluster/loadbalance"
"github.com/apache/dubbo-go/common/logger"
-
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
-
_ "github.com/apache/dubbo-go/filter/filter_impl"
-
_ "github.com/apache/dubbo-go/protocol/dubbo"
-
_ "github.com/apache/dubbo-go/protocol/grpc"
-
_ "github.com/apache/dubbo-go/registry/protocol"
-
_ "github.com/apache/dubbo-go/registry/zookeeper"
-
- gxlog "github.com/dubbogo/gost/log"
)
var (
diff --git a/general/grpc/stream/go-client/app/hello.go
b/general/grpc/stream/go-client/app/hello.go
index a427bb0..1066565 100644
--- a/general/grpc/stream/go-client/app/hello.go
+++ b/general/grpc/stream/go-client/app/hello.go
@@ -19,11 +19,16 @@ package main
import (
"context"
+)
- "github.com/apache/dubbo-go/config"
+import (
"google.golang.org/grpc"
)
+import (
+ "github.com/apache/dubbo-go/config"
+)
+
var grpcGreeterImpl = new(GrpcGreeterImpl)
func init() {
diff --git a/general/grpc/stream/go-server/app/greeter.go
b/general/grpc/stream/go-server/app/greeter.go
index 49d0087..d043aa9 100644
--- a/general/grpc/stream/go-server/app/greeter.go
+++ b/general/grpc/stream/go-server/app/greeter.go
@@ -19,7 +19,9 @@ package main
import (
"fmt"
+)
+import (
"github.com/apache/dubbo-go/common/logger"
"github.com/apache/dubbo-go/config"
)
[dubbo-go-samples] 24/34: add test for filter/custom_filter/dubbo
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit ea8b7b3862581e1ecaabec6427b1a9fbc7799dac
Author: Joe Zou
AuthorDate: Fri Oct 23 17:00:18 2020 +0800
add test for filter/custom_filter/dubbo
---
filter/custom_filter/dubbo/go-client/app/client.go | 34 ++
1 file changed, 3 insertions(+), 31 deletions(-)
diff --git a/filter/custom_filter/dubbo/go-client/app/client.go
b/filter/custom_filter/dubbo/go-client/app/client.go
index 0d0b138..5bf98d8 100644
--- a/filter/custom_filter/dubbo/go-client/app/client.go
+++ b/filter/custom_filter/dubbo/go-client/app/client.go
@@ -19,10 +19,7 @@ package main
import (
"context"
- "fmt"
"os"
- "os/signal"
- "syscall"
"time"
)
@@ -32,7 +29,6 @@ import (
import (
hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/apache/dubbo-go/common/logger"
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
_ "github.com/apache/dubbo-go/protocol/dubbo"
@@ -61,32 +57,8 @@ func main() {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
if err != nil {
- panic(err)
+ os.Exit(1)
+ return
}
gxlog.CInfo("response result: %v\n", user)
- initSignal()
-}
-
-func initSignal() {
- signals := make(chan os.Signal, 1)
- // It is not possible to block SIGKILL or syscall.SIGSTOP
- signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP,
- syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
- for {
- sig := <-signals
- logger.Infof("get signal %s", sig.String())
- switch sig {
- case syscall.SIGHUP:
- // reload()
- default:
- time.AfterFunc(time.Duration(survivalTimeout), func() {
- logger.Warnf("app exit now by force...")
- os.Exit(1)
- })
-
- // The program exits normally or timeout forcibly exits.
- fmt.Println("app exit now...")
- return
- }
- }
-}
+}
\ No newline at end of file
[dubbo-go-samples] 22/34: Merge pull request #4 from zouyx/feature/fixAutoTest
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 28bb1f09f2a6ffa21f1f1490cad9649c99066cd4 Merge: c8444c5 49db864 Author: Joe Zou AuthorDate: Thu Oct 22 23:08:30 2020 +0800 Merge pull request #4 from zouyx/feature/fixAutoTest Ftr:Add auto generate test script and test it in metric/dubbo .integration/testing/.travis.yml | 16 +++ .integration/testing/integration_testing.sh | 31 + .travis.yml | 1 + ci.sh | 16 +++ gen_integrate_test.sh | 39 +++ metric/dubbo/.travis.yml | 16 +++ metric/dubbo/go-client/app/client.go | 34 +++ metric/dubbo/go-client/integration_testing.sh | 31 + metric/dubbo/go-server/integration_testing.sh | 31 + 9 files changed, 184 insertions(+), 31 deletions(-)
[dubbo-go-samples] 12/34: change go mod version
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 3b6d928329fae057a90dd2050f0b64680987d404 Author: Joe Zou AuthorDate: Fri Oct 16 08:19:52 2020 +0800 change go mod version --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 1c1a607..9de398b 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/apache/dubbo-samples/golang require ( - github.com/apache/dubbo-go v1.5.3-0.20201015161623-1268a960bc7b + github.com/apache/dubbo-go v1.5.3-0.20201015161623-1268a960bc7b // indirect github.com/apache/dubbo-go-hessian2 v1.7.0 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect github.com/dubbogo/gost v1.9.2
[dubbo-go-samples] 08/34: fix test problems
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit b7a837cc97e9c717afd7be23b9a19917641f6bb4
Author: Joe Zou
AuthorDate: Thu Oct 15 00:04:22 2020 +0800
fix test problems
---
.../testing/go-client/assembly/bin/load.sh | 205 +
.../go-client/assembly/common/app.properties | 23 +++
.../testing/go-client/assembly/common/build.sh | 79
.../testing/go-client/assembly/linux/dev.sh| 36
.../testing/go-client/assembly/linux/release.sh| 35
.../testing/go-client/assembly/linux/test.sh | 35
.integration/testing/go-client/assembly/mac/dev.sh | 36
.../testing/go-client/assembly/mac/release.sh | 34
.../testing/go-client/assembly/mac/test.sh | 34
.../testing/go-client/assembly/windows/dev.sh | 34
.../testing/go-client/assembly/windows/release.sh | 34
.../testing/go-client/assembly/windows/test.sh | 34
.../testing/go-server/assembly/bin/load.sh | 151 +++
.../go-server/assembly/common/app.properties | 23 +++
.../testing/go-server/assembly/common/build.sh | 80
.../testing/go-server/assembly/linux/dev.sh| 36
.../testing/go-server/assembly/linux/release.sh| 36
.../testing/go-server/assembly/linux/test.sh | 36
.integration/testing/go-server/assembly/mac/dev.sh | 36
.../testing/go-server/assembly/mac/release.sh | 36
.../testing/go-server/assembly/mac/test.sh | 36
.../testing/go-server/assembly/windows/dev.sh | 36
.../testing/go-server/assembly/windows/release.sh | 36
.../testing/go-server/assembly/windows/test.sh | 36
.travis.yml| 1 +
25 files changed, 1198 insertions(+)
diff --git a/.integration/testing/go-client/assembly/bin/load.sh
b/.integration/testing/go-client/assembly/bin/load.sh
new file mode 100755
index 000..6d41032
--- /dev/null
+++ b/.integration/testing/go-client/assembly/bin/load.sh
@@ -0,0 +1,205 @@
+#!/usr/bin/env bash
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+APP_NAME="APPLICATION_NAME"
+APP_ARGS=""
+SLEEP_INTERVAL=5
+MAX_LIFETIME=4000
+
+PROJECT_HOME=""
+OS_NAME=`uname`
+if [[ ${OS_NAME} != "Windows" ]]; then
+PROJECT_HOME=`pwd`
+PROJECT_HOME=${PROJECT_HOME}"/"
+else
+APP_NAME="APPLICATION_NAME.exe"
+fi
+
+export CONF_CONSUMER_FILE_PATH=${PROJECT_HOME}"TARGET_CONF_FILE"
+export APP_LOG_CONF_FILE=${PROJECT_HOME}"TARGET_LOG_CONF_FILE"
+# export GOTRACEBACK=system
+# export GODEBUG=gctrace=1
+
+usage() {
+echo "Usage: $0 start [conf suffix]"
+echo " $0 stop"
+echo " $0 term"
+echo " $0 restart"
+echo " $0 list"
+echo " $0 monitor"
+echo " $0 crontab"
+exit
+}
+
+start() {
+arg=$1
+if [ "$arg" = "" ];then
+echo "No registry type! Default client.yml!"
+else
+export
CONF_CONSUMER_FILE_PATH=${CONF_CONSUMER_FILE_PATH//\.yml/\_$arg\.yml}
+fi
+if [ ! -f "${CONF_CONSUMER_FILE_PATH}" ];then
+echo $CONF_CONSUMER_FILE_PATH" is not existing!"
+return
+fi
+APP_LOG_PATH=${PROJECT_HOME}"logs/"
+mkdir -p ${APP_LOG_PATH}
+APP_BIN=${PROJECT_HOME}sbin/${APP_NAME}
+chmod u+x ${APP_BIN}
+# CMD="nohup ${APP_BIN} ${APP_ARGS} >>${APP_NAME}.nohup.out 2>&1 &"
+CMD="${APP_BIN}"
+eval ${CMD}
+R=$?
+PID=`ps aux | grep -w ${APP_NAME} | grep -v grep | awk '{print $2}'`
+if [[ ${OS_NAME} != "Linux" && ${OS_NAME} != "Darwin" ]]; then
+PID=`ps aux | grep -w ${APP_NAME} | grep -v grep | awk '{print $1}'`
+fi
+CUR=`date +%FT%T`
+if [ "${PID}" != "" ]; then
+for p in ${PID}
+do
+echo "start ${APP_NAME} ( pid =" ${p} ") at " ${CUR}
+done
+fi
+return $R
+}
+
+stop() {
+PID=`ps aux | grep -w ${APP_NAME} | grep -v grep | awk '{print $2}'`
+if [[ ${OS_NAME} != "Linux" && ${OS_NAME} != "Darwin" ]]; then
+PID=`ps aux | grep -w ${APP_NAME} | grep -v grep | awk '{print $1}'`
+
[dubbo-go-samples] 19/34: test it in metric/dubbo
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 7896b90c03c6ddc06a4c95884f2cc45a1b02620b
Author: Joe Zou
AuthorDate: Wed Oct 21 23:26:59 2020 +0800
test it in metric/dubbo
---
metric/dubbo/go-client/app/client.go | 34 +++---
1 file changed, 3 insertions(+), 31 deletions(-)
diff --git a/metric/dubbo/go-client/app/client.go
b/metric/dubbo/go-client/app/client.go
index 501cd8b..f4f9ff3 100644
--- a/metric/dubbo/go-client/app/client.go
+++ b/metric/dubbo/go-client/app/client.go
@@ -19,11 +19,7 @@ package main
import (
"context"
- "fmt"
"os"
- "os/signal"
- "syscall"
- "time"
)
import (
@@ -32,7 +28,6 @@ import (
import (
hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/apache/dubbo-go/common/logger"
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
_ "github.com/apache/dubbo-go/protocol/dubbo"
@@ -60,32 +55,9 @@ func main() {
user := &User{}
err := userProvider.GetUser(context.Background(),
[]interface{}{"A001"}, user)
if err != nil {
- panic(err)
+ gxlog.CError("error: %v\n", err)
+ os.Exit(1)
+ return
}
gxlog.CInfo("response result: %v\n", user)
- initSignal()
-}
-
-func initSignal() {
- signals := make(chan os.Signal, 1)
- // It is not possible to block SIGKILL or syscall.SIGSTOP
- signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP,
- syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
- for {
- sig := <-signals
- logger.Infof("get signal %s", sig.String())
- switch sig {
- case syscall.SIGHUP:
- // reload()
- default:
- time.AfterFunc(time.Duration(survivalTimeout), func() {
- logger.Warnf("app exit now by force...")
- os.Exit(1)
- })
-
- // The program exits normally or timeout forcibly exits.
- fmt.Println("app exit now...")
- return
- }
- }
}
\ No newline at end of file
[dubbo-go-samples] 25/34: add test for config_center case
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 6c4dfb6a70d80b38b71d8e66ec3bab6b50f73855
Author: Joe Zou
AuthorDate: Fri Oct 23 17:19:39 2020 +0800
add test for config_center case
---
.travis.yml| 3 ++
configcenter/apollo/dubbo/.travis.yml | 16 +++
configcenter/apollo/dubbo/go-client/app/client.go | 32 ++
.../apollo/dubbo/go-client/integration_testing.sh | 31 +
.../apollo/dubbo/go-server/integration_testing.sh | 31 +
configcenter/nacos/dubbo/.travis.yml | 16 +++
configcenter/nacos/dubbo/go-client/app/client.go | 32 ++
.../nacos/dubbo/go-client/integration_testing.sh | 31 +
.../nacos/dubbo/go-server/integration_testing.sh | 31 +
configcenter/zookeeper/dubbo/.travis.yml | 16 +++
.../zookeeper/dubbo/go-client/app/client.go| 32 ++
.../dubbo/go-client/integration_testing.sh | 31 +
.../dubbo/go-server/integration_testing.sh | 31 +
13 files changed, 243 insertions(+), 90 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 6c851d0..236daf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,3 +11,6 @@ import:
- async/.travis.yml
- metric/dubbo/.travis.yml
- filter/custom_filter/dubbo/.travis.yml
+ - configcenter/apollo/dubbo/.travis.yml
+ - configcenter/zookeeper/dubbo/.travis.yml
+ - configcenter/nacos/dubbo/.travis.yml
diff --git a/configcenter/apollo/dubbo/.travis.yml
b/configcenter/apollo/dubbo/.travis.yml
new file mode 100644
index 000..6be39c0
--- /dev/null
+++ b/configcenter/apollo/dubbo/.travis.yml
@@ -0,0 +1,16 @@
+stages:
+ - Test configcenter/apollo/dubbo
+jobs:
+ include:
+- stage: Test configcenter/apollo/dubbo
+ script:
+- PROJECT_HOME=$(pwd)
+- CASE_HOME=/configcenter/apollo/dubbo
+- GO_SERVER=/go-server
+- GO_CLIENT=/go-client
+- docker run -d --network host zookeeper
+- echo "zookeeper listen in [:]2181"
+- cd ${PROJECT_HOME}${CASE_HOME}${GO_SERVER}
+- ./integration_testing.sh ${PROJECT_HOME} ${GO_SERVER} true
+- cd ${PROJECT_HOME}${CASE_HOME}${GO_CLIENT}
+- ./integration_testing.sh ${PROJECT_HOME} ${GO_CLIENT}
diff --git a/configcenter/apollo/dubbo/go-client/app/client.go
b/configcenter/apollo/dubbo/go-client/app/client.go
index 0f7b9f6..31edbdc 100644
--- a/configcenter/apollo/dubbo/go-client/app/client.go
+++ b/configcenter/apollo/dubbo/go-client/app/client.go
@@ -19,10 +19,7 @@ package main
import (
"context"
- "fmt"
"os"
- "os/signal"
- "syscall"
"time"
)
@@ -32,7 +29,6 @@ import (
import (
hessian "github.com/apache/dubbo-go-hessian2"
- "github.com/apache/dubbo-go/common/logger"
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
_ "github.com/apache/dubbo-go/protocol/dubbo"
@@ -62,32 +58,8 @@ func main() {
user := &User{}
err := userProvider.GetUser(context.TODO(), []interface{}{"A001"}, user)
if err != nil {
- panic(err)
+ os.Exit(1)
+ return
}
gxlog.CInfo("response result: %v\n", user)
- initSignal()
-}
-
-func initSignal() {
- signals := make(chan os.Signal, 1)
- // It is not possible to block SIGKILL or syscall.SIGSTOP
- signal.Notify(signals, os.Interrupt, os.Kill, syscall.SIGHUP,
- syscall.SIGQUIT, syscall.SIGTERM, syscall.SIGINT)
- for {
- sig := <-signals
- logger.Infof("get signal %s", sig.String())
- switch sig {
- case syscall.SIGHUP:
- // reload()
- default:
- time.AfterFunc(time.Duration(survivalTimeout), func() {
- logger.Warnf("app exit now by force...")
- os.Exit(1)
- })
-
- // The program exits normally or timeout forcibly exits.
- fmt.Println("app exit now...")
- return
- }
- }
}
diff --git a/configcenter/apollo/dubbo/go-client/integration_testing.sh
b/configcenter/apollo/dubbo/go-client/integration_testing.sh
new file mode 100755
index 000..49f7b49
--- /dev/null
+++ b/configcenter/apollo/dubbo/go-client/integration_testing.sh
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+
[dubbo-go-samples] 34/34: Merge pull request #7 from zhangshen023/consul_service_discovery
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit f19feede9574ce6a7a8e152d1e0c311362ff1838 Merge: 3722ee2 f71bec1 Author: Joe Zou AuthorDate: Fri Oct 30 13:23:50 2020 +0800 Merge pull request #7 from zhangshen023/consul_service_discovery consul service discovery sample .../consul/go-client/app/client.go | 99 ++ .../servicediscovery/consul/go-client/app/user.go | 54 ++ .../consul/go-client/app/version.go| 22 +++ .../consul/go-client/assembly/bin/load.sh | 203 + .../go-client/assembly/common/app.properties | 23 +++ .../consul/go-client/assembly/common/build.sh | 83 + .../consul/go-client/assembly/linux/dev.sh | 36 .../consul/go-client/assembly/linux/release.sh | 35 .../consul/go-client/assembly/linux/test.sh| 35 .../consul/go-client/assembly/mac/dev.sh | 36 .../consul/go-client/assembly/mac/release.sh | 34 .../consul/go-client/assembly/mac/test.sh | 34 .../consul/go-client/assembly/windows/dev.sh | 34 .../consul/go-client/assembly/windows/release.sh | 34 .../consul/go-client/assembly/windows/test.sh | 34 .../consul/go-client/profiles/dev/client.yml | 77 .../consul/go-client/profiles/dev/log.yml | 28 +++ .../consul/go-client/profiles/release/client.yml | 60 ++ .../consul/go-client/profiles/release/log.yml | 28 +++ .../consul/go-client/profiles/test/client.yml | 59 ++ .../consul/go-client/profiles/test/log.yml | 28 +++ .../consul/go-server/app/server.go | 87 + .../servicediscovery/consul/go-server/app/user.go | 63 +++ .../consul/go-server/app/version.go| 22 +++ .../consul/go-server/assembly/bin/load.sh | 151 +++ .../go-server/assembly/common/app.properties | 23 +++ .../consul/go-server/assembly/common/build.sh | 80 .../consul/go-server/assembly/linux/dev.sh | 36 .../consul/go-server/assembly/linux/release.sh | 36 .../consul/go-server/assembly/linux/test.sh| 36 .../consul/go-server/assembly/mac/dev.sh | 36 .../consul/go-server/assembly/mac/release.sh | 36 .../consul/go-server/assembly/mac/test.sh | 36 .../consul/go-server/assembly/windows/dev.sh | 36 .../consul/go-server/assembly/windows/release.sh | 36 .../consul/go-server/assembly/windows/test.sh | 36 .../consul/go-server/profiles/dev/log.yml | 28 +++ .../consul/go-server/profiles/dev/server.yml | 75 .../consul/go-server/profiles/release/log.yml | 28 +++ .../consul/go-server/profiles/release/server.yml | 79 .../consul/go-server/profiles/test/log.yml | 28 +++ .../consul/go-server/profiles/test/server.yml | 79 42 files changed, 2143 insertions(+)
[dubbo-go-samples] 26/34: remove zk config center case
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 6a423a80b86b685040ad24a92f1c8acdf4413e99 Author: Joe Zou AuthorDate: Sun Oct 25 22:32:46 2020 +0800 remove zk config center case --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 236daf0..7f233ad 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,5 +12,5 @@ import: - metric/dubbo/.travis.yml - filter/custom_filter/dubbo/.travis.yml - configcenter/apollo/dubbo/.travis.yml - - configcenter/zookeeper/dubbo/.travis.yml +# - configcenter/zookeeper/dubbo/.travis.yml - configcenter/nacos/dubbo/.travis.yml
[dubbo-go-samples] 29/34: consul service discovery sample
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 5536f3270ef8dd651fb1a861300944400016abd5 Author: shen AuthorDate: Thu Oct 29 10:48:59 2020 +0800 consul service discovery sample --- .../consul/go-client/app/client.go | 96 ++ .../servicediscovery/consul/go-client/app/user.go | 54 ++ .../consul/go-client/app/version.go| 22 +++ .../consul/go-client/assembly/bin/load.sh | 203 + .../go-client/assembly/common/app.properties | 23 +++ .../consul/go-client/assembly/common/build.sh | 83 + .../consul/go-client/assembly/linux/dev.sh | 36 .../consul/go-client/assembly/linux/release.sh | 35 .../consul/go-client/assembly/linux/test.sh| 35 .../consul/go-client/assembly/mac/dev.sh | 36 .../consul/go-client/assembly/mac/release.sh | 34 .../consul/go-client/assembly/mac/test.sh | 34 .../consul/go-client/assembly/windows/dev.sh | 34 .../consul/go-client/assembly/windows/release.sh | 34 .../consul/go-client/assembly/windows/test.sh | 34 .../consul/go-client/profiles/dev/client.yml | 77 .../consul/go-client/profiles/dev/log.yml | 28 +++ .../consul/go-client/profiles/release/client.yml | 60 ++ .../consul/go-client/profiles/release/log.yml | 28 +++ .../consul/go-client/profiles/test/client.yml | 59 ++ .../consul/go-client/profiles/test/log.yml | 28 +++ .../consul/go-server/app/server.go | 87 + .../servicediscovery/consul/go-server/app/user.go | 60 ++ .../consul/go-server/app/version.go| 22 +++ .../consul/go-server/assembly/bin/load.sh | 151 +++ .../go-server/assembly/common/app.properties | 23 +++ .../consul/go-server/assembly/common/build.sh | 80 .../consul/go-server/assembly/linux/dev.sh | 36 .../consul/go-server/assembly/linux/release.sh | 36 .../consul/go-server/assembly/linux/test.sh| 36 .../consul/go-server/assembly/mac/dev.sh | 36 .../consul/go-server/assembly/mac/release.sh | 36 .../consul/go-server/assembly/mac/test.sh | 36 .../consul/go-server/assembly/windows/dev.sh | 36 .../consul/go-server/assembly/windows/release.sh | 36 .../consul/go-server/assembly/windows/test.sh | 36 .../consul/go-server/profiles/dev/log.yml | 28 +++ .../consul/go-server/profiles/dev/server.yml | 75 .../consul/go-server/profiles/release/log.yml | 28 +++ .../consul/go-server/profiles/release/server.yml | 79 .../consul/go-server/profiles/test/log.yml | 28 +++ .../consul/go-server/profiles/test/server.yml | 79 42 files changed, 2137 insertions(+) diff --git a/registry/servicediscovery/consul/go-client/app/client.go b/registry/servicediscovery/consul/go-client/app/client.go new file mode 100644 index 000..5d3f04b --- /dev/null +++ b/registry/servicediscovery/consul/go-client/app/client.go @@ -0,0 +1,96 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package main + +import ( + "context" + "fmt" + "os" + "os/signal" + "syscall" + "time" +) + +import ( + hessian "github.com/apache/dubbo-go-hessian2" + + "github.com/apache/dubbo-go/common/logger" + _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" + "github.com/apache/dubbo-go/config" + _ "github.com/apache/dubbo-go/protocol/dubbo" + _ "github.com/apache/dubbo-go/registry/protocol" + + _ "github.com/apache/dubbo-go/filter/filter_impl" + + _ "github.com/apache/dubbo-go/cluster/cluster_impl" + _ "github.com/apache/dubbo-go/cluster/loadbalance" + + _ "github.com/apache/dubbo-go/metadata/mapping/dynamic" + _ "github.com/apache/dubbo-go/metadata/report/consul" + _ "github.com/apache/dubbo-go/metadata/service/remote
[dubbo-go-samples] 18/34: test it in metric/dubbo
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 1d8562c820b5f3ee16a566f0693d49c201830190 Author: Joe Zou AuthorDate: Wed Oct 21 23:22:27 2020 +0800 test it in metric/dubbo --- .travis.yml | 1 + gen_integrate_test.sh | 3 +++ 2 files changed, 4 insertions(+) diff --git a/.travis.yml b/.travis.yml index 29eb0b1..3118b34 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,3 +9,4 @@ import: - helloworld/dubbo/.travis.yml - direct/dubbo/.travis.yml - async/.travis.yml + - metric/dubbo/.travis.yml diff --git a/gen_integrate_test.sh b/gen_integrate_test.sh index 22c5507..9edb867 100755 --- a/gen_integrate_test.sh +++ b/gen_integrate_test.sh @@ -33,4 +33,7 @@ sed "s/%DIR%/$targetDir/g" .integration/testing/.travis.yml > $dir/.travis.yml echo "Copy integration_testing.sh " cp .integration/testing/integration_testing.sh $dir/go-client/ cp .integration/testing/integration_testing.sh $dir/go-server/ + +echo "Modify .travis.yml " +echo " - $dir/.travis.yml" >> .travis.yml echo "Auto test case for $dir finished!" \ No newline at end of file
[dubbo-go-samples] 33/34: code optimization
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit f71bec19c52e806b603205347098f43c566cd292
Author: shen
AuthorDate: Thu Oct 29 14:51:25 2020 +0800
code optimization
---
registry/servicediscovery/consul/go-client/app/client.go | 11 +++
registry/servicediscovery/consul/go-server/app/user.go | 9 ++---
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/registry/servicediscovery/consul/go-client/app/client.go
b/registry/servicediscovery/consul/go-client/app/client.go
index 5d3f04b..08e329d 100644
--- a/registry/servicediscovery/consul/go-client/app/client.go
+++ b/registry/servicediscovery/consul/go-client/app/client.go
@@ -27,8 +27,6 @@ import (
)
import (
- hessian "github.com/apache/dubbo-go-hessian2"
-
"github.com/apache/dubbo-go/common/logger"
_ "github.com/apache/dubbo-go/common/proxy/proxy_factory"
"github.com/apache/dubbo-go/config"
@@ -45,6 +43,11 @@ import (
_ "github.com/apache/dubbo-go/metadata/service/remote"
_ "github.com/apache/dubbo-go/registry/consul"
_ "github.com/apache/dubbo-go/registry/servicediscovery"
+ gxlog "github.com/dubbogo/gost/log"
+)
+
+import (
+ hessian "github.com/apache/dubbo-go-hessian2"
)
var (
@@ -59,14 +62,14 @@ func main() {
config.Load()
time.Sleep(3e9)
- fmt.Printf("\033[32;40m" + "\n\n\nstart to test dubbo" + "\033[0m\n")
+ gxlog.CInfo("\n\n\nstart to test dubbo\n")
user := &User{}
for i := 0; i < 5; i++ {
err := userProvider.GetUser(context.TODO(),
[]interface{}{"A001"}, user)
if err != nil {
panic(err)
}
- fmt.Printf("\033[32;40m"+"response result: %v\n"+"\033[0m\n",
user)
+ gxlog.CInfo("response result: %v\n", user)
}
initSignal()
}
diff --git a/registry/servicediscovery/consul/go-server/app/user.go
b/registry/servicediscovery/consul/go-server/app/user.go
index 8dea8a2..2132357 100644
--- a/registry/servicediscovery/consul/go-server/app/user.go
+++ b/registry/servicediscovery/consul/go-server/app/user.go
@@ -19,7 +19,6 @@ package main
import (
"context"
- "fmt"
"time"
)
@@ -28,6 +27,10 @@ import (
"github.com/apache/dubbo-go/config"
)
+import (
+ gxlog "github.com/dubbogo/gost/log"
+)
+
func init() {
config.SetProviderService(new(UserProvider))
// --for hessian2--
@@ -45,9 +48,9 @@ type UserProvider struct {
}
func (u *UserProvider) GetUser(ctx context.Context, req []interface{}) (*User,
error) {
- fmt.Printf("\033[32;40m"+"req:%#v"+"\033[0m\n", req)
+ gxlog.CInfo("req: %v\n", req)
rsp := User{"A001", "Alex Stocks", 18, time.Now()}
- fmt.Printf("\033[32;40m"+"rsp:%#v"+"\033[0m\n", rsp)
+ gxlog.CInfo("rsp: %v\n", rsp)
return &rsp, nil
}
[dubbo-go-samples] 20/34: test it in metric/dubbo
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit e3aba022ff40e6011b5f6e531077c6bece983763 Author: Joe Zou AuthorDate: Thu Oct 22 00:10:03 2020 +0800 test it in metric/dubbo --- .integration/testing/.travis.yml | 2 +- metric/dubbo/.travis.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.integration/testing/.travis.yml b/.integration/testing/.travis.yml index 7ce5f91..b5902b3 100644 --- a/.integration/testing/.travis.yml +++ b/.integration/testing/.travis.yml @@ -5,7 +5,7 @@ jobs: - stage: Test %DIR% script: - PROJECT_HOME=$(pwd) -- CASE_HOME=%DIR% +- CASE_HOME=/%DIR% - GO_SERVER=/go-server - GO_CLIENT=/go-client - docker run -d --network host zookeeper diff --git a/metric/dubbo/.travis.yml b/metric/dubbo/.travis.yml index 2b231e4..57bfe36 100644 --- a/metric/dubbo/.travis.yml +++ b/metric/dubbo/.travis.yml @@ -5,7 +5,7 @@ jobs: - stage: Test metric/dubbo script: - PROJECT_HOME=$(pwd) -- CASE_HOME=metric/dubbo +- CASE_HOME=/metric/dubbo - GO_SERVER=/go-server - GO_CLIENT=/go-client - docker run -d --network host zookeeper
[dubbo-go-samples] 11/34: change go mod version
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 2cab859e48e3c6a4418d256da25d1b68fff0d42d Author: Joe Zou AuthorDate: Fri Oct 16 08:19:10 2020 +0800 change go mod version --- go.mod | 2 +- go.sum | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 7feea69..1c1a607 100644 --- a/go.mod +++ b/go.mod @@ -1,7 +1,7 @@ module github.com/apache/dubbo-samples/golang require ( - github.com/apache/dubbo-go v1.5.2-0.20200919130513-8a059ddd7bf7 + github.com/apache/dubbo-go v1.5.3-0.20201015161623-1268a960bc7b github.com/apache/dubbo-go-hessian2 v1.7.0 github.com/codahale/hdrhistogram v0.0.0-20161010025455-3a0bb77429bd // indirect github.com/dubbogo/gost v1.9.2 diff --git a/go.sum b/go.sum index 99ea0bb..b636bb3 100644 --- a/go.sum +++ b/go.sum @@ -87,6 +87,7 @@ github.com/apache/dubbo-getty v1.3.10/go.mod h1:x6rraK01BL5C7jUM2fPl5KMkAxLVIx54 github.com/apache/dubbo-go v1.4.0-rc1.0.20200919130513-8a059ddd7bf7/go.mod h1:KIvoPmZH/0PPmBnty4dz4uXtTFUYQ37jMJsXaEYn+WQ= github.com/apache/dubbo-go v1.5.2-0.20200919130513-8a059ddd7bf7 h1:o2wh0fKS1YXsLLDGYQTA2QFZOQ93RvCdUdodN50OyVc= github.com/apache/dubbo-go v1.5.2-0.20200919130513-8a059ddd7bf7/go.mod h1:KIvoPmZH/0PPmBnty4dz4uXtTFUYQ37jMJsXaEYn+WQ= +github.com/apache/dubbo-go v1.5.3-0.20201015161623-1268a960bc7b/go.mod h1:MmCthhkWG4/t1c5lqN4VQGvUdi+9yLhb58++vn88EyE= github.com/apache/dubbo-go-hessian2 v1.7.0 h1:u2XxIuepu/zb6JcGZc7EbvKboXdKoJbf7rbmeq6SF1w= github.com/apache/dubbo-go-hessian2 v1.7.0/go.mod h1:7rEw9guWABQa6Aqb8HeZcsYPHsOS7XT1qtJvkmI6c5w= github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
[dubbo-go-samples] 14/34: Merge pull request #2 from zouyx/feature/fixAutoTest
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit eba7616aee0826e4be851ba49d2654d154ec1552 Merge: 744819c 5612a3c Author: Joe Zou AuthorDate: Fri Oct 16 10:56:39 2020 +0800 Merge pull request #2 from zouyx/feature/fixAutoTest Test: v1.5.3 go.mod | 2 +- go.sum | 4 2 files changed, 5 insertions(+), 1 deletion(-)
[dubbo-go-samples] 15/34: feat: add grpc stream sample
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 7e1b8b12e991828c973eeb29c42939aa8c33d6ad
Author: 382673...@qq.com <382673...@qq.com>
AuthorDate: Fri Oct 16 17:35:13 2020 +0800
feat: add grpc stream sample
---
general/grpc/{ => stream}/go-client/app/Makefile | 0
general/grpc/{ => stream}/go-client/app/client.go | 75 +++-
general/grpc/{ => stream}/go-client/app/hello.go | 11 +-
general/grpc/stream/go-client/app/helloworld.pb.go | 472 +
.../{ => stream}/go-client/app/helloworld.proto| 4 +-
.../{go-server => stream/go-client}/app/version.go | 0
.../{ => stream}/go-client/assembly/bin/load.sh| 0
.../go-client/assembly/common/app.properties | 0
.../go-client/assembly/common/build.sh | 0
.../{ => stream}/go-client/assembly/linux/dev.sh | 0
.../go-client/assembly/linux/release.sh| 0
.../{ => stream}/go-client/assembly/linux/test.sh | 0
.../{ => stream}/go-client/assembly/mac/dev.sh | 0
.../{ => stream}/go-client/assembly/mac/release.sh | 0
.../{ => stream}/go-client/assembly/mac/test.sh| 0
.../{ => stream}/go-client/assembly/windows/dev.sh | 0
.../go-client/assembly/windows/release.sh | 0
.../go-client/assembly/windows/test.sh | 0
.../{ => stream}/go-client/profiles/dev/client.yml | 0
.../go-client}/profiles/dev/log.yml| 0
.../go-client/profiles/release/client.yml | 0
.../go-client}/profiles/release/log.yml| 0
.../go-client/profiles/test/client.yml | 0
.../go-client}/profiles/test/log.yml | 0
general/grpc/stream/go-server/app/greeter.go | 101 +
general/grpc/stream/go-server/app/helloworld.pb.go | 472 +
.../go-server}/app/helloworld.proto| 4 +-
general/grpc/{ => stream}/go-server/app/server.go | 0
.../{go-client => stream/go-server}/app/version.go | 0
.../{ => stream}/go-server/assembly/bin/load.sh| 0
.../go-server/assembly/common/app.properties | 0
.../go-server/assembly/common/build.sh | 0
.../{ => stream}/go-server/assembly/linux/dev.sh | 0
.../go-server/assembly/linux/release.sh| 0
.../{ => stream}/go-server/assembly/linux/test.sh | 0
.../{ => stream}/go-server/assembly/mac/dev.sh | 0
.../{ => stream}/go-server/assembly/mac/release.sh | 0
.../{ => stream}/go-server/assembly/mac/test.sh| 0
.../{ => stream}/go-server/assembly/windows/dev.sh | 0
.../go-server/assembly/windows/release.sh | 0
.../go-server/assembly/windows/test.sh | 0
.../go-server}/profiles/dev/log.yml| 0
.../{ => stream}/go-server/profiles/dev/server.yml | 0
.../go-server}/profiles/release/log.yml| 0
.../go-server/profiles/release/server.yml | 0
.../go-server}/profiles/test/log.yml | 0
.../go-server/profiles/test/server.yml | 0
general/grpc/{ => unary}/go-client/app/Makefile| 0
general/grpc/{ => unary}/go-client/app/client.go | 13 +-
general/grpc/{ => unary}/go-client/app/hello.go| 0
.../go-client}/app/helloworld.pb.go| 0
.../go-client}/app/helloworld.proto| 0
.../{go-server => unary/go-client}/app/version.go | 0
.../{ => unary}/go-client/assembly/bin/load.sh | 0
.../go-client/assembly/common/app.properties | 0
.../{ => unary}/go-client/assembly/common/build.sh | 0
.../{ => unary}/go-client/assembly/linux/dev.sh| 0
.../go-client/assembly/linux/release.sh| 0
.../{ => unary}/go-client/assembly/linux/test.sh | 0
.../grpc/{ => unary}/go-client/assembly/mac/dev.sh | 0
.../{ => unary}/go-client/assembly/mac/release.sh | 0
.../{ => unary}/go-client/assembly/mac/test.sh | 0
.../{ => unary}/go-client/assembly/windows/dev.sh | 0
.../go-client/assembly/windows/release.sh | 0
.../{ => unary}/go-client/assembly/windows/test.sh | 0
.../{ => unary}/go-client/profiles/dev/client.yml | 0
.../go-client}/profiles/dev/log.yml| 0
.../go-client/profiles/release/client.yml | 0
.../go-client}/profiles/release/log.yml| 0
.../{ => unary}/go-client/profiles/test/client.yml | 0
.../go-client}/profiles/test/log.yml | 0
general/grpc/{ => unary}/go-server/app/greeter.go | 0
.../go-server}/app/helloworld.pb.go| 0
.../go-server}/app/helloworld.proto| 0
general/grpc/{ => unary}/go-server/app/server.go | 0
general/grpc/{ => unary}/go-server/app/version.go | 0
.../{ => unary}/go-server/assembly/bin/load.sh | 0
.../go-server/assembly/common/app.properties | 0
.../{ => unary}/go-server/assembly/common/build.sh |
[dubbo-go-samples] 32/34: format import
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 3722ee21a69d58bb29acd8530f1dd01ac6f24a6b Author: yuyu AuthorDate: Thu Oct 29 13:50:15 2020 +0800 format import --- general/grpc/unary/go-client/app/client.go | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/general/grpc/unary/go-client/app/client.go b/general/grpc/unary/go-client/app/client.go index eb39e34..db9b67c 100644 --- a/general/grpc/unary/go-client/app/client.go +++ b/general/grpc/unary/go-client/app/client.go @@ -24,25 +24,22 @@ import ( "os/signal" "syscall" "time" +) +import ( gxlog "github.com/dubbogo/gost/log" +) +import ( _ "github.com/apache/dubbo-go/cluster/cluster_impl" - _ "github.com/apache/dubbo-go/cluster/loadbalance" "github.com/apache/dubbo-go/common/logger" - _ "github.com/apache/dubbo-go/common/proxy/proxy_factory" "github.com/apache/dubbo-go/config" - _ "github.com/apache/dubbo-go/filter/filter_impl" - _ "github.com/apache/dubbo-go/protocol/dubbo" - _ "github.com/apache/dubbo-go/protocol/grpc" - _ "github.com/apache/dubbo-go/registry/protocol" - _ "github.com/apache/dubbo-go/registry/zookeeper" )
[dubbo-go-samples] 01/34: initial commit
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 708f62966fe311935ba9ad1a6a8d7fdd2b1174db Author: zouyixian AuthorDate: Wed Oct 14 11:01:52 2020 +0800 initial commit
[dubbo-go-samples] 31/34: Merge pull request #3 from LaurenceLiZhixin/feat/grpc-stream-support
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit 1680a1988cd05609b6953087941e4d203350338e
Merge: 653c445 680f884
Author: Xin.Zh
AuthorDate: Thu Oct 29 13:47:04 2020 +0800
Merge pull request #3 from LaurenceLiZhixin/feat/grpc-stream-support
feat: add grpc stream sample
general/grpc/{ => stream}/go-client/app/Makefile | 0
general/grpc/{ => stream}/go-client/app/client.go | 62 ++-
general/grpc/{ => stream}/go-client/app/hello.go | 4 +-
general/grpc/stream/go-client/app/helloworld.pb.go | 472 +
.../{ => stream}/go-client/app/helloworld.proto| 4 +-
.../{go-server => stream/go-client}/app/version.go | 0
.../{ => stream}/go-client/assembly/bin/load.sh| 0
.../go-client/assembly/common/app.properties | 0
.../go-client/assembly/common/build.sh | 0
.../{ => stream}/go-client/assembly/linux/dev.sh | 0
.../go-client/assembly/linux/release.sh| 0
.../{ => stream}/go-client/assembly/linux/test.sh | 0
.../{ => stream}/go-client/assembly/mac/dev.sh | 0
.../{ => stream}/go-client/assembly/mac/release.sh | 0
.../{ => stream}/go-client/assembly/mac/test.sh| 0
.../{ => stream}/go-client/assembly/windows/dev.sh | 0
.../go-client/assembly/windows/release.sh | 0
.../go-client/assembly/windows/test.sh | 0
.../{ => stream}/go-client/profiles/dev/client.yml | 0
.../go-client}/profiles/dev/log.yml| 0
.../go-client/profiles/release/client.yml | 0
.../go-client}/profiles/release/log.yml| 0
.../go-client/profiles/test/client.yml | 0
.../go-client}/profiles/test/log.yml | 0
general/grpc/stream/go-server/app/greeter.go | 103 +
general/grpc/stream/go-server/app/helloworld.pb.go | 472 +
.../go-server}/app/helloworld.proto| 4 +-
general/grpc/{ => stream}/go-server/app/server.go | 0
.../{go-client => stream/go-server}/app/version.go | 0
.../{ => stream}/go-server/assembly/bin/load.sh| 0
.../go-server/assembly/common/app.properties | 0
.../go-server/assembly/common/build.sh | 0
.../{ => stream}/go-server/assembly/linux/dev.sh | 0
.../go-server/assembly/linux/release.sh| 0
.../{ => stream}/go-server/assembly/linux/test.sh | 0
.../{ => stream}/go-server/assembly/mac/dev.sh | 0
.../{ => stream}/go-server/assembly/mac/release.sh | 0
.../{ => stream}/go-server/assembly/mac/test.sh| 0
.../{ => stream}/go-server/assembly/windows/dev.sh | 0
.../go-server/assembly/windows/release.sh | 0
.../go-server/assembly/windows/test.sh | 0
.../go-server}/profiles/dev/log.yml| 0
.../{ => stream}/go-server/profiles/dev/server.yml | 0
.../go-server}/profiles/release/log.yml| 0
.../go-server/profiles/release/server.yml | 0
.../go-server}/profiles/test/log.yml | 0
.../go-server/profiles/test/server.yml | 0
general/grpc/{ => unary}/go-client/app/Makefile| 0
general/grpc/{ => unary}/go-client/app/client.go | 13 +-
general/grpc/{ => unary}/go-client/app/hello.go| 0
.../go-client}/app/helloworld.pb.go| 0
.../go-client}/app/helloworld.proto| 0
.../{go-server => unary/go-client}/app/version.go | 0
.../{ => unary}/go-client/assembly/bin/load.sh | 0
.../go-client/assembly/common/app.properties | 0
.../{ => unary}/go-client/assembly/common/build.sh | 0
.../{ => unary}/go-client/assembly/linux/dev.sh| 0
.../go-client/assembly/linux/release.sh| 0
.../{ => unary}/go-client/assembly/linux/test.sh | 0
.../grpc/{ => unary}/go-client/assembly/mac/dev.sh | 0
.../{ => unary}/go-client/assembly/mac/release.sh | 0
.../{ => unary}/go-client/assembly/mac/test.sh | 0
.../{ => unary}/go-client/assembly/windows/dev.sh | 0
.../go-client/assembly/windows/release.sh | 0
.../{ => unary}/go-client/assembly/windows/test.sh | 0
.../{ => unary}/go-client/profiles/dev/client.yml | 0
.../go-client}/profiles/dev/log.yml| 0
.../go-client/profiles/release/client.yml | 0
.../go-client}/profiles/release/log.yml| 0
.../{ => unary}/go-client/profiles/test/client.yml | 0
.../go-client}/profiles/test/log.yml | 0
general/grpc/{ => unary}/go-server/app/greeter.go | 0
.../go-server}/app/helloworld.pb.go| 0
.../go-server}/app/helloworld.proto| 0
general/grpc/{ => unary}/go-server/app/server.go | 0
general/grpc/{ => unary}/go-server/app/version.go | 0
.../{ => unary}/go-server/assembly/bin/load.sh | 0
.../go-server/assembly/common/app.properti
[dubbo-go-samples] 10/34: Merge pull request #1 from zouyx/feature/fixAutoTest
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 744819cd9a3071599b59dbb7264bdb313d03c507 Merge: f32a818 40a18d3 Author: Joe Zou AuthorDate: Thu Oct 15 16:14:19 2020 +0800 Merge pull request #1 from zouyx/feature/fixAutoTest Fix: Auto test problems .../testing/go-client/assembly/bin/load.sh | 205 + .../go-client/assembly/common/app.properties | 23 ++ .../testing/go-client/assembly/common/build.sh | 79 .../testing/go-client/assembly/linux/dev.sh| 36 ++ .../testing/go-client/assembly/linux/release.sh| 35 ++ .../testing/go-client/assembly/linux/test.sh | 35 ++ .integration/testing/go-client/assembly/mac/dev.sh | 36 ++ .../testing/go-client/assembly/mac/release.sh | 34 ++ .../testing/go-client/assembly/mac/test.sh | 34 ++ .../testing/go-client/assembly/windows/dev.sh | 34 ++ .../testing/go-client/assembly/windows/release.sh | 34 ++ .../testing/go-client/assembly/windows/test.sh | 34 ++ .../testing/go-server/assembly/bin/load.sh | 151 +++ .../go-server/assembly/common/app.properties | 23 ++ .../testing/go-server/assembly/common/build.sh | 80 .../testing/go-server/assembly/linux/dev.sh| 36 ++ .../testing/go-server/assembly/linux/release.sh| 36 ++ .../testing/go-server/assembly/linux/test.sh | 36 ++ .integration/testing/go-server/assembly/mac/dev.sh | 36 ++ .../testing/go-server/assembly/mac/release.sh | 36 ++ .../testing/go-server/assembly/mac/test.sh | 36 ++ .../testing/go-server/assembly/windows/dev.sh | 36 ++ .../testing/go-server/assembly/windows/release.sh | 36 ++ .../testing/go-server/assembly/windows/test.sh | 36 ++ .travis.yml| 1 + async/.travis.yml | 16 + async/go-client/app/client.go | 6 +- async/go-client/integration_testing.sh | 31 ++ async/go-server/integration_testing.sh | 31 ++ .../apollo/dubbo/go-client/profiles/dev/log.yml| 56 +-- .../apollo/dubbo/go-server/profiles/dev/log.yml| 56 +-- configcenter/apollo/dubbo/java-client/pom.xml | 422 +-- .../java-client/src/main/assembly/assembly.xml | 84 ++-- .../src/main/java/com/ikurento/user/Consumer.java | 122 +++--- .../src/main/java/com/ikurento/user/User.java | 152 +++ .../main/java/com/ikurento/user/UserProvider.java | 36 +- .../src/main/resources/META-INF/spring/service.xml | 54 +-- .../java-server/src/main/assembly/assembly.xml | 84 ++-- .../src/main/java/com/ikurento/user/User.java | 172 .../main/java/com/ikurento/user/UserProvider.java | 48 +-- .../com/ikurento/user/impl/UserProviderImpl.java | 64 +-- .../resources/META-INF/spring/dubbo.provider.xml | 64 +-- .../src/main/resources/log4j.properties| 40 +- .../nacos/dubbo/go-client/profiles/dev/log.yml | 56 +-- .../nacos/dubbo/go-server/profiles/dev/log.yml | 56 +-- .../zookeeper/dubbo/go-client/profiles/dev/log.yml | 56 +-- .../zookeeper/dubbo/go-server/profiles/dev/log.yml | 56 +-- configcenter/zookeeper/dubbo/java-client/pom.xml | 410 +- .../java-client/src/main/assembly/assembly.xml | 84 ++-- .../src/main/java/com/ikurento/user/Consumer.java | 126 +++--- .../src/main/java/com/ikurento/user/User.java | 152 +++ .../main/java/com/ikurento/user/UserProvider.java | 36 +- .../src/main/resources/META-INF/spring/service.xml | 54 +-- .../java-server/src/main/assembly/assembly.xml | 84 ++-- .../src/main/java/com/ikurento/user/User.java | 172 .../main/java/com/ikurento/user/UserProvider.java | 48 +-- .../com/ikurento/user/impl/UserProviderImpl.java | 64 +-- .../resources/META-INF/spring/dubbo.provider.xml | 64 +-- .../src/main/resources/log4j.properties| 40 +- direct/README.md | 6 +- direct/dubbo/.travis.yml | 20 +- direct/dubbo/go-client/app/client.go | 1 + direct/dubbo/go-client/integration_testing.sh | 31 ++ direct/dubbo/go-client/profiles/dev/log.yml| 56 +-- direct/dubbo/go-client/profiles/release/log.yml| 56 +-- direct/dubbo/go-client/profiles/test/log.yml | 56 +-- direct/dubbo/go-server/integration_testing.sh | 31 ++ direct/dubbo/go-server/profiles/dev/log.yml| 56 +-- direct/dubbo/go-server/profiles/release/log.yml| 56 +-- direct/dubbo/go-server/profiles/test/log.yml | 56 +-- .../dubbo/go-client/profiles/dev/log.yml | 56 +-- .../dubbo/go-client/profiles/release/log.yml | 56 +-- .../dubbo/go-client/profiles/test/log.yml | 56 +-- .../dubbo/go-server/profiles/dev/l
[dubbo-go-samples] 28/34: Merge pull request #5 from zouyx/feature/fixAutoTest
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 653c4458eac0cf91983b9cd560e17de9e82aa5ea Merge: 15a68f6 6a423a8 Author: Joe Zou AuthorDate: Mon Oct 26 12:48:03 2020 +0800 Merge pull request #5 from zouyx/feature/fixAutoTest Ftr: Add case for config center but exclude zookeeper .travis.yml| 4 +++ configcenter/apollo/dubbo/.travis.yml | 16 ++ configcenter/apollo/dubbo/go-client/app/client.go | 32 ++-- .../apollo/dubbo/go-client/integration_testing.sh | 31 .../apollo/dubbo/go-server/integration_testing.sh | 31 configcenter/nacos/dubbo/.travis.yml | 16 ++ configcenter/nacos/dubbo/go-client/app/client.go | 32 ++-- .../nacos/dubbo/go-client/integration_testing.sh | 31 .../nacos/dubbo/go-server/integration_testing.sh | 31 configcenter/zookeeper/dubbo/.travis.yml | 16 ++ .../zookeeper/dubbo/go-client/app/client.go| 32 ++-- .../dubbo/go-client/integration_testing.sh | 31 .../dubbo/go-server/integration_testing.sh | 31 filter/custom_filter/dubbo/.travis.yml | 16 ++ filter/custom_filter/dubbo/go-client/app/client.go | 34 ++ .../dubbo/go-client/integration_testing.sh | 31 .../dubbo/go-server/integration_testing.sh | 31 17 files changed, 325 insertions(+), 121 deletions(-)
[dubbo-go-samples] 17/34: add auto generate test script and test it in metric/dubbo
This is an automated email from the ASF dual-hosted git repository.
joezou pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git
commit c4fc5ee0ac07dfc840e7eb0ac285837beb1d0d89
Author: Joe Zou
AuthorDate: Wed Oct 21 23:04:52 2020 +0800
add auto generate test script and test it in metric/dubbo
---
{direct/dubbo => .integration/testing}/.travis.yml | 6 ++--
.integration/testing/integration_testing.sh| 31 +++
ci.sh | 16 ++
direct/dubbo/.travis.yml | 2 +-
gen_integrate_test.sh | 36 ++
{direct => metric}/dubbo/.travis.yml | 8 ++---
metric/dubbo/go-client/integration_testing.sh | 31 +++
metric/dubbo/go-server/integration_testing.sh | 31 +++
8 files changed, 153 insertions(+), 8 deletions(-)
diff --git a/direct/dubbo/.travis.yml b/.integration/testing/.travis.yml
similarity index 74%
copy from direct/dubbo/.travis.yml
copy to .integration/testing/.travis.yml
index b1d86d7..7ce5f91 100644
--- a/direct/dubbo/.travis.yml
+++ b/.integration/testing/.travis.yml
@@ -1,11 +1,11 @@
stages:
- - Test direct
+ - Test %DIR%
jobs:
include:
-- stage: Test direct
+- stage: Test %DIR%
script:
- PROJECT_HOME=$(pwd)
-- CASE_HOME=/direct/dubbo
+- CASE_HOME=%DIR%
- GO_SERVER=/go-server
- GO_CLIENT=/go-client
- docker run -d --network host zookeeper
diff --git a/.integration/testing/integration_testing.sh
b/.integration/testing/integration_testing.sh
new file mode 100755
index 000..49f7b49
--- /dev/null
+++ b/.integration/testing/integration_testing.sh
@@ -0,0 +1,31 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+#!/bin/bash
+
+set -e
+set -x
+
+rm -rf assembly
+cp -r $1/.integration/testing/$2/assembly .
+assembly/linux/dev.sh
+cd target/*/*/
+# is async
+if [[ $3 ]]; then
+ nohup bin/load.sh start > a.out&
+else
+ bin/load.sh start
+fi
\ No newline at end of file
diff --git a/ci.sh b/ci.sh
index 23bcad7..f1a214a 100644
--- a/ci.sh
+++ b/ci.sh
@@ -1,3 +1,19 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
allSamples=`find .|grep /assembly/linux/dev.sh | awk
'{gsub("/assembly/linux/dev.sh","");print}'`
currentFolder=`pwd`
diff --git a/direct/dubbo/.travis.yml b/direct/dubbo/.travis.yml
index b1d86d7..e6e311d 100644
--- a/direct/dubbo/.travis.yml
+++ b/direct/dubbo/.travis.yml
@@ -6,7 +6,7 @@ jobs:
script:
- PROJECT_HOME=$(pwd)
- CASE_HOME=/direct/dubbo
-- GO_SERVER=/go-server
+- GO_SERVER=%GO_SERVER%
- GO_CLIENT=/go-client
- docker run -d --network host zookeeper
- echo "zookeeper listen in [:]2181"
diff --git a/gen_integrate_test.sh b/gen_integrate_test.sh
new file mode 100755
index 000..22c5507
--- /dev/null
+++ b/gen_integrate_test.sh
@@ -0,0 +1,36 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://
[dubbo-go-samples] 21/34: fix bug
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit 49db86432ab13373c473c0c8b92b86358b2aa9d8 Author: Joe Zou AuthorDate: Thu Oct 22 11:35:09 2020 +0800 fix bug --- direct/dubbo/.travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/direct/dubbo/.travis.yml b/direct/dubbo/.travis.yml index e6e311d..b1d86d7 100644 --- a/direct/dubbo/.travis.yml +++ b/direct/dubbo/.travis.yml @@ -6,7 +6,7 @@ jobs: script: - PROJECT_HOME=$(pwd) - CASE_HOME=/direct/dubbo -- GO_SERVER=%GO_SERVER% +- GO_SERVER=/go-server - GO_CLIENT=/go-client - docker run -d --network host zookeeper - echo "zookeeper listen in [:]2181"
[dubbo-go-samples] 16/34: Create .asf.yaml
This is an automated email from the ASF dual-hosted git repository. joezou pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/dubbo-go-samples.git commit c8444c5ea53d02a2227b683350cf88879de48658 Author: Huang YunKun AuthorDate: Tue Oct 20 19:20:10 2020 +0800 Create .asf.yaml --- .asf.yaml | 5 + 1 file changed, 5 insertions(+) diff --git a/.asf.yaml b/.asf.yaml new file mode 100644 index 000..8d84e69 --- /dev/null +++ b/.asf.yaml @@ -0,0 +1,5 @@ +notifications: +commits: commits@dubbo.apache.org +issues: notificati...@dubbo.apache.org +pullrequests: notificati...@dubbo.apache.org +jira_options: link label link label
[dubbo-website] branch master updated: fix typo in load-balance.md (#632)
This is an automated email from the ASF dual-hosted git repository. hyunkun 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 b1cc9a0 fix typo in load-balance.md (#632) b1cc9a0 is described below commit b1cc9a07941553ad5e1b1f5d9976766473fd5776 Author: wsy54130816 <1014780...@qq.com> AuthorDate: Fri Oct 30 13:31:41 2020 +0800 fix typo in load-balance.md (#632) --- docs/zh-cn/dev/impls/load-balance.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/zh-cn/dev/impls/load-balance.md b/docs/zh-cn/dev/impls/load-balance.md index 4217e55..d0fbdc2 100644 --- a/docs/zh-cn/dev/impls/load-balance.md +++ b/docs/zh-cn/dev/impls/load-balance.md @@ -2,7 +2,7 @@ ## 扩展说明 -从多个服务提者方中选择一个进行调用 +从多个服务提供方中选择一个进行调用 ## 扩展接口
[dubbo-website] branch asf-site updated: Automated deployment: Fri Oct 30 05:33:21 UTC 2020 b1cc9a07941553ad5e1b1f5d9976766473fd5776
This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/dubbo-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 0423f21 Automated deployment: Fri Oct 30 05:33:21 UTC 2020
b1cc9a07941553ad5e1b1f5d9976766473fd5776
0423f21 is described below
commit 0423f2142d5a28a4f45f8be94966a20e9744c50b
Author: htynkn
AuthorDate: Fri Oct 30 05:33:21 2020 +
Automated deployment: Fri Oct 30 05:33:21 UTC 2020
b1cc9a07941553ad5e1b1f5d9976766473fd5776
---
zh-cn/docs/dev/impls/load-balance.html | 2 +-
zh-cn/docs/dev/impls/load-balance.json | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/zh-cn/docs/dev/impls/load-balance.html
b/zh-cn/docs/dev/impls/load-balance.html
index 6f30331..93dbfb7 100644
--- a/zh-cn/docs/dev/impls/load-balance.html
+++ b/zh-cn/docs/dev/impls/load-balance.html
@@ -14,7 +14,7 @@
En扩展说明
-从多个服务提者方中选择一个进行调用
+从多个服务提供方中选择一个进行调用
扩展接口
org.apache.dubbo.rpc.cluster.LoadBalance
扩展配置
diff --git a/zh-cn/docs/dev/impls/load-balance.json
b/zh-cn/docs/dev/impls/load-balance.json
index 23e3b56..e69df6f 100644
--- a/zh-cn/docs/dev/impls/load-balance.json
+++ b/zh-cn/docs/dev/impls/load-balance.json
@@ -1,6 +1,6 @@
{
"filename": "load-balance.md",
- "__html":
"负载均衡扩展\n扩展说明\n从多个服务提者方中选择一个进行调用\n扩展接口\norg.apache.dubbo.rpc.cluster.LoadBalance\n扩展配置\n
