diff --git a/clients/config_client/config_client.go b/clients/config_client/config_client.go index 8cafcc7e..0a07a1e9 100644 --- a/clients/config_client/config_client.go +++ b/clients/config_client/config_client.go @@ -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") } diff --git a/clients/config_client/config_client_interface.go b/clients/config_client/config_client_interface.go index b50ab106..c913011a 100644 --- a/clients/config_client/config_client_interface.go +++ b/clients/config_client/config_client_interface.go @@ -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() diff --git a/clients/config_client/config_client_test.go b/clients/config_client/config_client_test.go index f523cd73..5239026b 100644 --- a/clients/config_client/config_client_test.go +++ b/clients/config_client/config_client_test.go @@ -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", diff --git a/clients/config_client/config_proxy.go b/clients/config_client/config_proxy.go index 328c6e4c..7dbe5e54 100644 --- a/clients/config_client/config_proxy.go +++ b/clients/config_client/config_proxy.go @@ -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 diff --git a/clients/config_client/config_proxy_interface.go b/clients/config_client/config_proxy_interface.go index aff9c759..c3a5c3aa 100644 --- a/clients/config_client/config_proxy_interface.go +++ b/clients/config_client/config_proxy_interface.go @@ -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 diff --git a/common/constant/const.go b/common/constant/const.go index 55573f9e..cd10d1e0 100644 --- a/common/constant/const.go +++ b/common/constant/const.go @@ -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 = "@@" diff --git a/example/config/main.go b/example/config/main.go index 4a9708ae..8f364d11 100644 --- a/example/config/main.go +++ b/example/config/main.go @@ -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: "", diff --git a/vo/config_param.go b/vo/config_param.go index 018e9913..87698b27 100644 --- a/vo/config_param.go +++ b/vo/config_param.go @@ -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"`