diff --git a/common/utils.go b/common/utils.go index 3d95508..6a9a13d 100644 --- a/common/utils.go +++ b/common/utils.go @@ -179,8 +179,8 @@ func Max(a int, b int) int { } } -func MessageWithRequestId(message string, id string) string { - return fmt.Sprintf("%s (request id: %s)", message, id) +func MessageWithRequestId(message string, id string, userId int) string { + return fmt.Sprintf("%s (request id: %s, user id: %d)", message, id, userId) } func RandomSleep() { diff --git a/controller/relay.go b/controller/relay.go index bc951f7..f0b714a 100644 --- a/controller/relay.go +++ b/controller/relay.go @@ -82,7 +82,8 @@ func Relay(c *gin.Context) { if openaiErr.StatusCode == http.StatusTooManyRequests { openaiErr.Error.Message = "当前分组上游负载已饱和,请稍后再试" } - openaiErr.Error.Message = common.MessageWithRequestId(openaiErr.Error.Message, requestId) + userId := c.GetInt("id") + openaiErr.Error.Message = common.MessageWithRequestId(openaiErr.Error.Message, requestId, userId) c.JSON(openaiErr.StatusCode, gin.H{ "error": openaiErr.Error, }) diff --git a/middleware/utils.go b/middleware/utils.go index 43801c1..52614c6 100644 --- a/middleware/utils.go +++ b/middleware/utils.go @@ -6,9 +6,10 @@ import ( ) func abortWithOpenAiMessage(c *gin.Context, statusCode int, message string) { + userId := c.GetInt("id") c.JSON(statusCode, gin.H{ "error": gin.H{ - "message": common.MessageWithRequestId(message, c.GetString(common.RequestIdKey)), + "message": common.MessageWithRequestId(message, c.GetString(common.RequestIdKey), userId), "type": "new_api_error", }, })