fix/1012 fdp (#49)

anilibria · Sep 25, 2024 · 3118948 · 3118948
2 parents 0c8d4b0 + 3ff4954
commit 3118948
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go
@@ -139,7 +139,7 @@ func (*Proxy) unmarshalApiResponse(c *fiber.Ctx, rsp *fasthttp.Response) (ok boo
 	}
 	defer utils.ReleaseApiResponseWOData(apirsp)
 
-	if apirsp.Status && (apirsp.Error == nil || apirsp.Error.Code == 0) {
+	if apirsp.Status && (apirsp.Error == nil || apirsp.Error.Code == "0") {
 		ok = true
 		return
 	}
@@ -160,7 +160,7 @@ func (*Proxy) unmarshalApiResponse(c *fiber.Ctx, rsp *fasthttp.Response) (ok boo
 		rlog(c).Trace().Msgf("%+v", apirsp.Error)
 	}
 
-	rlog(c).Info().Msgf("api server respond with %d - %s", apirsp.Error.Code, apirsp.Error.Message)
+	rlog(c).Info().Msgf("api server respond with %s - %s", apirsp.Error.Code, apirsp.Error.Message)
 	return
 }
 

diff --git a/internal/utils/apiv1_response.go b/internal/utils/apiv1_response.go
@@ -2,6 +2,7 @@ package utils
 
 import (
 	"io"
+	"strconv"
 	"sync"
 
 	"github.com/mailru/easyjson"
@@ -22,7 +23,7 @@ type (
 		Code string
 	}
 	ApiError struct {
-		Code        int
+		Code        string
 		Message     string
 		Description string
 	}
@@ -42,7 +43,7 @@ func AcquireApiResponseWOData() *ApiResponseWOData {
 
 func ReleaseApiResponseWOData(ar *ApiResponseWOData) {
 	ar.Status = false
-	ar.Error.Code, ar.Error.Message, ar.Error.Description = 0, "", ""
+	ar.Error.Code, ar.Error.Message, ar.Error.Description = "", "", ""
 	apiResponseWODataPool.Put(ar)
 }
 
@@ -72,7 +73,7 @@ func RespondWithApiError(status int, msg, desc string, w io.Writer) (e error) {
 	defer ReleaseApiResponse(apirsp)
 
 	apirsp.Error.Code, apirsp.Error.Message, apirsp.Error.Description =
-		status, msg, desc
+		strconv.Itoa(status), msg, desc
 	apirsp.Data = nil
 
 	var buf []byte

diff --git a/internal/utils/apiv1_response_easyjson.go b/internal/utils/apiv1_response_easyjson.go