Merge remote-tracking branch 'origin/errcode' into errcode

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)
 	}

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
 }