This is an automated email from the ASF dual-hosted git repository.
mark4z pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/dubbo-go-pixiu-samples.git
The following commit(s) were added to refs/heads/main by this push:
new 680ba4f update demo for registry center (#58)
680ba4f is described below
commit 680ba4f5a714cdcc9de7307748e9158c6ccf13b7
Author: foghost <[email protected]>
AuthorDate: Mon Oct 14 10:38:07 2024 +0800
update demo for registry center (#58)
---
dubbogo/simple/nacos/pixiu/conf.yaml | 35 ++++---------
.../simple/nacos/server/profiles/dev/server.yml | 1 +
dubbogo/simple/nacos/test/pixiu_test.go | 4 +-
.../server/profiles/dev/log.yml} | 50 ++++++++++---------
.../simple/triple/server/profiles/dev/server.yml | 1 +
dubbogo/simple/zookeeper/pixiu/conf.yaml | 57 ++++------------------
.../zookeeper/server/profiles/dev/server.yml | 1 +
dubbogo/simple/zookeeper/test/pixiu_test.go | 7 ++-
8 files changed, 56 insertions(+), 100 deletions(-)
diff --git a/dubbogo/simple/nacos/pixiu/conf.yaml
b/dubbogo/simple/nacos/pixiu/conf.yaml
index f9ac528..2057484 100644
--- a/dubbogo/simple/nacos/pixiu/conf.yaml
+++ b/dubbogo/simple/nacos/pixiu/conf.yaml
@@ -26,36 +26,21 @@ static_resources:
address: "0.0.0.0"
port: 8881
filter_chains:
- filters:
- - name: dgp.filter.httpconnectionmanager
- config:
- route_config:
- routes:
- - match:
- prefix: "*"
- http_filters:
- - name: dgp.filter.http.apiconfig
- config:
- dynamic: true
- dynamic_adapter: test
- - name: dgp.filter.http.dubboproxy
- config:
- dubboProxyConfig:
- registries:
- "nacos":
- protocol: "nacos"
- timeout: "3s"
- address: "127.0.0.1:8848"
- username: nacos
- password: nacos
- group: test-group
- namespace: test-namespace
+ filters:
+ - name: dgp.filter.httpconnectionmanager
+ config:
+ route_config:
+ dynamic: true
+ http_filters:
+ - name: dgp.filter.http.directdubboproxy
+ config:
adapters:
- id: test
name: dgp.adapter.dubboregistrycenter
config:
registries:
- "nacos":
+ nacos:
+ registry_type: interface # or interface
protocol: nacos
address: "127.0.0.1:8848"
timeout: "5s"
diff --git a/dubbogo/simple/nacos/server/profiles/dev/server.yml
b/dubbogo/simple/nacos/server/profiles/dev/server.yml
index 6a108b5..ec4cc3a 100644
--- a/dubbogo/simple/nacos/server/profiles/dev/server.yml
+++ b/dubbogo/simple/nacos/server/profiles/dev/server.yml
@@ -30,6 +30,7 @@ dubbo:
password: nacos
group: test-group
namespace: test-namespace
+ registry-type: all
protocols:
dubbo:
name: dubbo
diff --git a/dubbogo/simple/nacos/test/pixiu_test.go
b/dubbogo/simple/nacos/test/pixiu_test.go
index 0d8956f..b21bd06 100644
--- a/dubbogo/simple/nacos/test/pixiu_test.go
+++ b/dubbogo/simple/nacos/test/pixiu_test.go
@@ -30,8 +30,8 @@ import (
)
func TestPost1(t *testing.T) {
- url :=
"http://localhost:8881/BDTService/com.dubbogo.pixiu.UserService/1.0.0/GetUserByName";
- data := "{\"types\":\"string\",\"values\":\"tc\"}"
+ url :=
"http://localhost:8881/BDTService/com.dubbogo.pixiu.UserService/GetUserByName";
+ data := "[\"tc\"]"
client := &http.Client{Timeout: 5 * time.Second}
req, err := http.NewRequest("POST", url, strings.NewReader(data))
req.Header.Set("x-dubbo-http1.1-dubbo-version", "1.0.0")
diff --git a/dubbogo/simple/zookeeper/server/profiles/dev/server.yml
b/dubbogo/simple/triple/server/profiles/dev/log.yml
similarity index 61%
copy from dubbogo/simple/zookeeper/server/profiles/dev/server.yml
copy to dubbogo/simple/triple/server/profiles/dev/log.yml
index 4ac9e7f..9330cda 100644
--- a/dubbogo/simple/zookeeper/server/profiles/dev/server.yml
+++ b/dubbogo/simple/triple/server/profiles/dev/log.yml
@@ -16,26 +16,30 @@
# specific language governing permissions and limitations
# under the License.
#
-# dubbo server yaml configure file
-# application config
-dubbo:
- application:
- name: BDTService
- registries:
- zk:
- protocol: zookeeper
- timeout: 3s
- address: 127.0.0.1:2181
- protocols:
- dubbo:
- name: dubbo
- port: 20000
- provider:
- registry-ids: zk
- services:
- UserProvider:
- group: test
- version: 1.0.0
- cluster: test_dubbo
- serialization: hessian2
- interface: com.dubbogo.pixiu.UserService
\ No newline at end of file
+level: "debug"
+development: true
+disableCaller: false
+disableStacktrace: false
+sampling:
+encoding: "console"
+
+# encoder
+encoderConfig:
+ messageKey: "message"
+ levelKey: "level"
+ timeKey: "time"
+ nameKey: "logger"
+ callerKey: "caller"
+ stacktraceKey: "stacktrace"
+ lineEnding: ""
+ levelEncoder: "capitalColor"
+ timeEncoder: "iso8601"
+ durationEncoder: "seconds"
+ callerEncoder: "short"
+ nameEncoder: ""
+
+outputPaths:
+ - "stderr"
+errorOutputPaths:
+ - "stderr"
+initialFields:
diff --git a/dubbogo/simple/triple/server/profiles/dev/server.yml
b/dubbogo/simple/triple/server/profiles/dev/server.yml
index 129ce4c..1dc893f 100644
--- a/dubbogo/simple/triple/server/profiles/dev/server.yml
+++ b/dubbogo/simple/triple/server/profiles/dev/server.yml
@@ -26,6 +26,7 @@ dubbo:
protocol: nacos
timeout: 3s
address: 127.0.0.1:8848
+ registry-type: all
protocols:
triple:
name: tri
diff --git a/dubbogo/simple/zookeeper/pixiu/conf.yaml
b/dubbogo/simple/zookeeper/pixiu/conf.yaml
index f48327b..d9715f7 100644
--- a/dubbogo/simple/zookeeper/pixiu/conf.yaml
+++ b/dubbogo/simple/zookeeper/pixiu/conf.yaml
@@ -26,60 +26,21 @@ static_resources:
address: "0.0.0.0"
port: 8881
filter_chains:
- filters:
- - name: dgp.filter.httpconnectionmanager
- config:
- route_config:
- routes:
- - match:
- prefix: "/"
- route:
- cluster: "test-dubbo"
- cluster_not_found_response_code: 505
- http_filters:
- - name: dgp.filter.http.apiconfig
- config:
- dynamic: true
- dynamic_adapter: test
- - name: dgp.filter.http.dubboproxy
- config:
- dubboProxyConfig:
- registries:
- "zookeeper":
- protocol: "zookeeper"
- timeout: "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
- timeout_config:
- connect_timeout: 5s
- request_timeout: 5s
-
- server_name: "test_http_dubbo"
- generate_request_id: false
- config:
- idle_timeout: 5s
- read_timeout: 5s
- write_timeout: 5s
- clusters:
- - name: "test-dubbo"
- lb_policy: "RoundRobin"
- registries:
- "zookeeper":
- timeout: "3s"
- address: "127.0.0.1:2181"
- username: ""
- password: ""
- shutdown_config:
- timeout: "60s"
- step_timeout: "10s"
- reject_policy: "immediacy"
+ filters:
+ - name: dgp.filter.httpconnectionmanager
+ config:
+ route_config:
+ dynamic: true
+ http_filters:
+ - name: dgp.filter.http.directdubboproxy
+ config:
adapters:
- id: test
name: dgp.adapter.dubboregistrycenter
config:
registries:
"zookeeper":
+ registry_type: interface # or interface
protocol: zookeeper
address: "127.0.0.1:2181"
timeout: "5s"
\ No newline at end of file
diff --git a/dubbogo/simple/zookeeper/server/profiles/dev/server.yml
b/dubbogo/simple/zookeeper/server/profiles/dev/server.yml
index 4ac9e7f..a6367cb 100644
--- a/dubbogo/simple/zookeeper/server/profiles/dev/server.yml
+++ b/dubbogo/simple/zookeeper/server/profiles/dev/server.yml
@@ -26,6 +26,7 @@ dubbo:
protocol: zookeeper
timeout: 3s
address: 127.0.0.1:2181
+ registry-type: all
protocols:
dubbo:
name: dubbo
diff --git a/dubbogo/simple/zookeeper/test/pixiu_test.go
b/dubbogo/simple/zookeeper/test/pixiu_test.go
index 6759301..2a0cb7c 100644
--- a/dubbogo/simple/zookeeper/test/pixiu_test.go
+++ b/dubbogo/simple/zookeeper/test/pixiu_test.go
@@ -30,12 +30,15 @@ import (
)
func TestPost1(t *testing.T) {
- url :=
"http://localhost:8881/BDTService/com.dubbogo.pixiu.UserService/1.0.0/GetUserByName";
- data := "{\"types\":\"string\",\"values\":\"tc\"}"
+ url :=
"http://localhost:8881/BDTService/com.dubbogo.pixiu.UserService/GetUserByName";
+ data := "[\"tc\"]"
client := &http.Client{Timeout: 5 * time.Second}
req, err := http.NewRequest("POST", url, strings.NewReader(data))
assert.NoError(t, err)
req.Header.Add("Content-Type", "application/json")
+ req.Header.Set("x-dubbo-service-version", "1.0.0")
+ req.Header.Set("x-dubbo-service-protocol", "dubbo")
+ req.Header.Set("x-dubbo-service-group", "test")
resp, err := client.Do(req)
assert.NoError(t, err)
assert.NotNil(t, resp)
