From 01dc8df3c432b10890985884c0bfc886e2217b09 Mon Sep 17 00:00:00 2001 From: devad Date: Wed, 8 Nov 2023 11:16:57 +0800 Subject: [PATCH] :bug: fix Signed-off-by: devad Former-commit-id: a1cc97e48d79106c29ce0f18639e34e1b4b0ed9c --- .../handler/core/scheduletaskbyyamlhandler.go | 2 +- pkg/repository/result/httpResult.go | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api/internal/handler/core/scheduletaskbyyamlhandler.go b/api/internal/handler/core/scheduletaskbyyamlhandler.go index c1549eb4..b90aeae8 100644 --- a/api/internal/handler/core/scheduletaskbyyamlhandler.go +++ b/api/internal/handler/core/scheduletaskbyyamlhandler.go @@ -1,8 +1,8 @@ package core import ( + "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/repository/result" "gitlink.org.cn/jcce-pcm/pcm-coordinator/pkg/utils" - "gitlink.org.cn/jcce-pcm/utils/result" "net/http" "github.com/zeromicro/go-zero/rest/httpx" diff --git a/pkg/repository/result/httpResult.go b/pkg/repository/result/httpResult.go index e0af446a..11467862 100644 --- a/pkg/repository/result/httpResult.go +++ b/pkg/repository/result/httpResult.go @@ -47,14 +47,14 @@ func HttpResult(r *http.Request, w http.ResponseWriter, resp interface{}, err er //自定义CodeError errcode = e.GetErrCode() errmsg = e.GetErrMsg() - } else { - if gstatus, ok := status.FromError(causeErr); ok { // grpc err错误 - grpcCode := uint32(gstatus.Code()) - if xerr.IsCodeErr(grpcCode) { //区分自定义错误跟系统底层、db等错误，底层、db错误不能返回给前端 - errcode = grpcCode - errmsg = gstatus.Message() - } + } else if gstatus, ok := status.FromError(causeErr); ok { // grpc err错误 + grpcCode := uint32(gstatus.Code()) + if xerr.IsCodeErr(grpcCode) { //区分自定义错误跟系统底层、db等错误，底层、db错误不能返回给前端 + errcode = grpcCode + errmsg = gstatus.Message() } + } else { //返回原始错误 + errmsg = err.Error() } logx.WithContext(r.Context()).Errorf("【API-ERR】 : %+v ", err)