From 6c6e02967acafda5683462f55ccf7310d42666e0 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Thu, 12 Jan 2023 16:49:00 +0800 Subject: [PATCH 1/2] 1 --- pkg/getcdv3/temp.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/getcdv3/temp.go b/pkg/getcdv3/temp.go index 2c7fc4dd2..e2239e8e4 100644 --- a/pkg/getcdv3/temp.go +++ b/pkg/getcdv3/temp.go @@ -21,7 +21,7 @@ func GetConn(ctx context.Context, serviceName string) (conn *grpc.ClientConn, er conn = getcdv3.GetConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), serviceName, trace_log.GetOperationID(ctx), config.Config.Etcd.UserName, config.Config.Etcd.Password) if conn == nil { - return nil, &constant.ErrInternalServer + return nil, constant.ErrInternalServer } return conn, nil } From b0834ae437a02711f16018dec4adf45ce06fb7b9 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Thu, 12 Jan 2023 16:50:26 +0800 Subject: [PATCH 2/2] 1 --- pkg/common/http/http_client.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/common/http/http_client.go b/pkg/common/http/http_client.go index aa515d55c..5d677b23b 100644 --- a/pkg/common/http/http_client.go +++ b/pkg/common/http/http_client.go @@ -65,13 +65,13 @@ func CallBackPostReturn(url, callbackCommand string, input interface{}, output c b, err := Post(url, input, timeOut) if err != nil { if failedContinue != nil && *failedContinue { - return &constant.ErrCallbackContinue + return constant.ErrCallbackContinue } return constant.NewErrNetwork(err) } if err = json.Unmarshal(b, output); err != nil { if failedContinue != nil && *failedContinue { - return &constant.ErrCallbackContinue + return constant.ErrCallbackContinue } return constant.NewErrData(err) }