merge upstream

Signed-off-by: wozulong <>

common/logger.go

@@ -2,6 +2,7 @@ package common
 
 import (
 	"context"
+	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
 	"io"
@@ -99,6 +100,7 @@ func LogQuota(quota int) string {
 	}
 }
 
+
 func LogQuotaF(quota float64) string {
 	if DisplayInCurrencyEnabled {
 		return fmt.Sprintf("＄%.6f 额度", quota/QuotaPerUnit)
@@ -106,3 +108,14 @@ func LogQuotaF(quota float64) string {
 		return fmt.Sprintf("%d 点额度", int64(quota))
 	}
 }
+
+
+// LogJson 仅供测试使用 only for test
+func LogJson(ctx context.Context, msg string, obj any) {
+	jsonStr, err := json.Marshal(obj)
+	if err != nil {
+		LogError(ctx, fmt.Sprintf("json marshal failed: %s", err.Error()))
+		return
+	}
+	LogInfo(ctx, fmt.Sprintf("%s | %s", msg, string(jsonStr)))
+}