Imp: Add environment/default.timeout for go client schema;
Fix:change go server schema timeout/time unit from second to millisecond;
Fix: go client schema protocol from jsonrpc:// to consumer://
diff --git a/examples/go-client/profiles/dev/client.yml b/examples/go-client/profiles/dev/client.yml
index a41f128..3d75cb2 100644
--- a/examples/go-client/profiles/dev/client.yml
+++ b/examples/go-client/profiles/dev/client.yml
@@ -21,6 +21,7 @@
module : "dubbogo user-info client"
version : "0.0.1"
owner : "ZX"
+ environment : "dev"
registry_config:
timeout : "3s"
diff --git a/examples/go-client/profiles/release/client.yml b/examples/go-client/profiles/release/client.yml
index a41f128..30fee1d 100644
--- a/examples/go-client/profiles/release/client.yml
+++ b/examples/go-client/profiles/release/client.yml
@@ -21,6 +21,7 @@
module : "dubbogo user-info client"
version : "0.0.1"
owner : "ZX"
+ environment : "product"
registry_config:
timeout : "3s"
diff --git a/examples/go-client/profiles/test/client.yml b/examples/go-client/profiles/test/client.yml
index a41f128..3dc116d 100644
--- a/examples/go-client/profiles/test/client.yml
+++ b/examples/go-client/profiles/test/client.yml
@@ -21,6 +21,7 @@
module : "dubbogo user-info client"
version : "0.0.1"
owner : "ZX"
+ environment : "test"
registry_config:
timeout : "3s"
diff --git a/examples/go-server/profiles/dev/server.yml b/examples/go-server/profiles/dev/server.yml
index 99a7d84..fae6b33 100644
--- a/examples/go-server/profiles/dev/server.yml
+++ b/examples/go-server/profiles/dev/server.yml
@@ -15,7 +15,7 @@
module : "dubbogo user-info server"
version : "0.0.1"
owner : "ZX"
- environment: "dev"
+ environment : "dev"
registry_config:
timeout : "3s"
diff --git a/examples/go-server/profiles/release/server.yml b/examples/go-server/profiles/release/server.yml
index d41930a..1815fe1 100644
--- a/examples/go-server/profiles/release/server.yml
+++ b/examples/go-server/profiles/release/server.yml
@@ -15,7 +15,7 @@
module : "dubbogo user-info server"
version : "0.0.1"
owner : "ZX"
- environment: "product"
+ environment : "product"
registry_config:
timeout : "3s"
diff --git a/examples/go-server/profiles/test/server.yml b/examples/go-server/profiles/test/server.yml
index 8fb8b53..1e3e77f 100644
--- a/examples/go-server/profiles/test/server.yml
+++ b/examples/go-server/profiles/test/server.yml
@@ -15,7 +15,7 @@
module : "dubbogo user-info server"
version : "0.0.1"
owner : "ZX"
- environment: "test"
+ environment : "test"
registry_config:
timeout : "3s"
diff --git a/registry/consumer.go b/registry/consumer.go
index 29000b3..2c00596 100644
--- a/registry/consumer.go
+++ b/registry/consumer.go
@@ -123,7 +123,7 @@
)
r = &ZkConsumerRegistry{
- birth: time.Now().Unix(),
+ birth: time.Now().UnixNano(),
done: make(chan struct{}),
services: make(map[string]ServiceConfigIf),
listenerServiceMap: make(map[string]*serviceArray),
@@ -325,8 +325,11 @@
}
params = url.Values{}
- params.Add("interface", conf.Service)
params.Add("application", r.ApplicationConfig.Name)
+ params.Add("default.timeout", fmt.Sprintf("%d", defaultTimeout/1e6))
+ params.Add("environment", r.ApplicationConfig.Environment)
+ params.Add("protocol", conf.Protocol)
+ params.Add("interface", conf.Service)
revision = r.ApplicationConfig.Version
if revision == "" {
revision = "0.1.0"
@@ -343,12 +346,12 @@
params.Add("side", (DubboType(CONSUMER)).Role())
params.Add("pid", processID)
params.Add("ip", localIP)
- params.Add("timeout", fmt.Sprintf("%v", r.Timeout.Seconds()))
- params.Add("timestamp", fmt.Sprintf("%d", r.birth))
+ params.Add("timeout", fmt.Sprintf("%d", int64(r.Timeout)/1e6))
+ params.Add("timestamp", fmt.Sprintf("%d", r.birth/1e6))
if conf.Version != "" {
params.Add("version", conf.Version)
}
- rawURL = fmt.Sprintf("%s://%s/%s?%s", conf.Protocol, localIP, conf.Service+conf.Version, params.Encode())
+ rawURL = fmt.Sprintf("consumer://%s/%s?%s", localIP, conf.Service+conf.Version, params.Encode())
encodedURL = url.QueryEscape(rawURL)
dubboPath = fmt.Sprintf("/dubbo/%s/%s", conf.Service, (DubboType(CONSUMER)).String())
