zhouqunjie
/
nacos-sdk-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update SearchConfigParam (#535)

This commit is contained in:
binbin.zhang 2022-10-29 15:55:48 +08:00 committed by GitHub
parent cad5a5ec2b
commit a13f6f2403
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
clients/config_client/config_client.go
View File

@ -262,7 +262,7 @@ func (client *ConfigClient) DeleteConfig(param vo.ConfigParam) (deleted bool, er
return false, err
}
//Cancel Listen Config
// Cancel Listen Config
func (client *ConfigClient) CancelListenConfig(param vo.ConfigParam) (err error) {
clientConfig, err := client.GetClientConfig()
if err != nil {
@ -324,7 +324,7 @@ func (client *ConfigClient) ListenConfig(param vo.ConfigParam) (err error) {
return
}
func (client *ConfigClient) SearchConfig(param vo.SearchConfigParm) (*model.ConfigPage, error) {
func (client *ConfigClient) SearchConfig(param vo.SearchConfigParam) (*model.ConfigPage, error) {
return client.searchConfigInner(param)
}
@ -333,7 +333,7 @@ func (client *ConfigClient) CloseClient() {
client.cancel()
}
func (client *ConfigClient) searchConfigInner(param vo.SearchConfigParm) (*model.ConfigPage, error) {
func (client *ConfigClient) searchConfigInner(param vo.SearchConfigParam) (*model.ConfigPage, error) {
if param.Search != "accurate" && param.Search != "blur" {
return nil, errors.New("[client.searchConfigInner] param.search must be accurate or blur")
}

2
clients/config_client/config_client_interface.go
View File

@ -63,7 +63,7 @@ type IConfigClient interface {
// tenant ==>nacos.namespace optional
// pageNo option,default is 1
// pageSize option,default is 10
SearchConfig(param vo.SearchConfigParm) (*model.ConfigPage, error)
SearchConfig(param vo.SearchConfigParam) (*model.ConfigPage, error)
// CloseClient Close the GRPC client
CloseClient()

4
clients/config_client/config_client_test.go
View File

@ -69,7 +69,7 @@ func (m *MockConfigProxy) queryConfig(dataId, group, tenant string, timeout uint
}
return &rpc_response.ConfigQueryResponse{Content: "hello world"}, nil
}
func (m *MockConfigProxy) searchConfigProxy(param vo.SearchConfigParm, tenant, accessKey, secretKey string) (*model.ConfigPage, error) {
func (m *MockConfigProxy) searchConfigProxy(param vo.SearchConfigParam, tenant, accessKey, secretKey string) (*model.ConfigPage, error) {
return &model.ConfigPage{TotalCount: 1}, nil
}
func (m *MockConfigProxy) requestProxy(rpcClient *rpc.RpcClient, request rpc_request.IRequest, timeoutMills uint64) (rpc_response.IResponse, error) {
@ -106,7 +106,7 @@ func Test_SearchConfig(t *testing.T) {
DataId: localConfigTest.DataId,
Group: "DEFAULT_GROUP",
Content: "hello world"})
configPage, err := client.SearchConfig(vo.SearchConfigParm{
configPage, err := client.SearchConfig(vo.SearchConfigParam{
Search: "accurate",
DataId: localConfigTest.DataId,
Group: "DEFAULT_GROUP",

2
clients/config_client/config_proxy.go
View File

@ -75,7 +75,7 @@ func (cp *ConfigProxy) injectCommHeader(param map[string]string) {
param[constant.CHARSET_KEY] = "utf-8"
}
func (cp *ConfigProxy) searchConfigProxy(param vo.SearchConfigParm, tenant, accessKey, secretKey string) (*model.ConfigPage, error) {
func (cp *ConfigProxy) searchConfigProxy(param vo.SearchConfigParam, tenant, accessKey, secretKey string) (*model.ConfigPage, error) {
params := util.TransformObject2Param(param)
if len(tenant) > 0 {
params["tenant"] = tenant

2
clients/config_client/config_proxy_interface.go
View File

@ -12,7 +12,7 @@ import (
type IConfigProxy interface {
queryConfig(dataId, group, tenant string, timeout uint64, notify bool, client *ConfigClient) (*rpc_response.ConfigQueryResponse, error)
searchConfigProxy(param vo.SearchConfigParm, tenant, accessKey, secretKey string) (*model.ConfigPage, error)
searchConfigProxy(param vo.SearchConfigParam, tenant, accessKey, secretKey string) (*model.ConfigPage, error)
requestProxy(rpcClient *rpc.RpcClient, request rpc_request.IRequest, timeoutMills uint64) (rpc_response.IResponse, error)
createRpcClient(ctx context.Context, taskId string, client *ConfigClient) *rpc.RpcClient
getRpcClient(client *ConfigClient) *rpc.RpcClient

2
common/constant/const.go
View File

@ -68,7 +68,7 @@ const (
KEY_BEAT = "beat"
KEY_DOM = "dom"
DEFAULT_CONTEXT_PATH = "/nacos"
CLIENT_VERSION = "Nacos-Go-Client:v2.1.1"
CLIENT_VERSION = "Nacos-Go-Client:v2.1.2"
REQUEST_DOMAIN_RETRY_TIME = 3
SERVICE_INFO_SPLITER = "@@"
CONFIG_INFO_SPLITER = "@@"

2
example/config/main.go
View File

@ -124,7 +124,7 @@ func main() {
})
time.Sleep(1 * time.Second)
searchPage, _ := client.SearchConfig(vo.SearchConfigParm{
searchPage, _ := client.SearchConfig(vo.SearchConfigParam{
Search: "blur",
DataId: "",
Group: "",

2
vo/config_param.go
View File

@ -31,7 +31,7 @@ type ConfigParam struct {
OnChange func(namespace, group, dataId, data string)
}
type SearchConfigParm struct {
type SearchConfigParam struct {
Search string `param:"search"`
DataId string `param:"dataId"`
Group string `param:"group"`