You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shenyu.apache.org by xi...@apache.org on 2022/07/01 09:02:39 UTC
[incubator-shenyu-client-golang] branch main updated: fix: can not register. (#22)
This is an automated email from the ASF dual-hosted git repository.
xiaoyu pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/incubator-shenyu-client-golang.git
The following commit(s) were added to refs/heads/main by this push:
new 9be8e37 fix: can not register. (#22)
9be8e37 is described below
commit 9be8e3794ce0bd439a47d90cb193cabdc8825ff8
Author: Zhiqiang Li <st...@qq.com>
AuthorDate: Fri Jul 1 17:02:33 2022 +0800
fix: can not register. (#22)
---
clients/http_client_factory.go | 16 ++++++++++++++--
example/http_client/main.go | 17 +++++++++--------
model/common_meta_data_register.go | 2 ++
3 files changed, 25 insertions(+), 10 deletions(-)
diff --git a/clients/http_client_factory.go b/clients/http_client_factory.go
index 59b6211..38c4039 100644
--- a/clients/http_client_factory.go
+++ b/clients/http_client_factory.go
@@ -65,9 +65,21 @@ func RegisterMetaData(adminTokenData model.AdminTokenData, metaData *model.MetaD
}
params["appName"] = metaData.AppName
params["path"] = metaData.Path
+ params["contextPath"] = metaData.ContextPath
params["host"] = metaData.Host
params["port"] = metaData.Port
- params["rpcType"] = constants.RPCTYPE_HTTP
+
+ if metaData.RPCType != "" {
+ params["rpcType"] = metaData.RPCType
+ } else {
+ params["rpcType"] = constants.RPCTYPE_HTTP
+ }
+
+ if metaData.RuleName != "" {
+ params["ruleName"] = metaData.RuleName
+ } else {
+ params["ruleName"] = metaData.Path
+ }
tokenRequest := initShenYuCommonRequest(headers, params, constants.REGISTER_METADATA, "")
@@ -89,7 +101,7 @@ func UrlRegister(adminTokenData model.AdminTokenData, urlMetaData *model.URIRegi
if urlMetaData.AppName == "" || urlMetaData.RPCType == "" || urlMetaData.Host == "" || urlMetaData.Port == "" {
return false, shenyu_error.NewShenYuError(constants.MISS_PARAM_ERROR_CODE, constants.MISS_PARAM_ERROR_MSG, err)
}
- params["protocol"] = constants.RPCTYPE_HTTP
+ params["protocol"] = urlMetaData.Protocol
params["appName"] = urlMetaData.AppName
params["contextPath"] = urlMetaData.ContextPath
params["host"] = urlMetaData.Host
diff --git a/example/http_client/main.go b/example/http_client/main.go
index 6ad711d..ab79cb5 100644
--- a/example/http_client/main.go
+++ b/example/http_client/main.go
@@ -42,11 +42,12 @@ func main() {
//init MetaDataRegister
metaData := &model.MetaDataRegister{
- AppName: "testMetaDataRegister", //require user provide
- Path: "/your/path", //require user provide
- Enabled: true, //require user provide
- Host: "127.0.0.1", //require user provide
- Port: "8080", //require user provide
+ AppName: "testGoAppName", //require user provide
+ Path: "/golang/your/path", //require user provide
+ ContextPath: "/golang", //require user provide
+ Enabled: true, //require user provide
+ Host: "127.0.0.1", //require user provide
+ Port: "8080", //require user provide
}
result, err := clients.RegisterMetaData(adminToken.AdminTokenData, metaData)
if err != nil {
@@ -56,9 +57,9 @@ func main() {
//init urlRegister
urlRegister := &model.URIRegister{
- Protocol: "testMetaDataRegister", //require user provide
- AppName: "testURLRegister", //require user provide
- ContextPath: "contextPath", //require user provide
+ Protocol: "http://", //require user provide
+ AppName: "testGoAppName", //require user provide
+ ContextPath: "/golang", //require user provide
RPCType: constants.RPCTYPE_HTTP, //require user provide
Host: "127.0.0.1", //require user provide
Port: "8080", //require user provide
diff --git a/model/common_meta_data_register.go b/model/common_meta_data_register.go
index 9a8b9a1..8721e7d 100644
--- a/model/common_meta_data_register.go
+++ b/model/common_meta_data_register.go
@@ -23,6 +23,8 @@ package model
type MetaDataRegister struct {
AppName string `json:"appName"`
Path string `json:"path"`
+ ContextPath string `json:"contextPath"`
+ RuleName string `json:"ruleName"`
RPCType string `json:"rpcType"`
Enabled bool `json:"enabled"`
Host string `json:"host"`