Merge pull request #91 from songquanpeng/main

Fork Sync: Update from parent repository

i18n/en.json

@@ -457,5 +457,7 @@
   "提示": "Prompt",
   "补全": "Completion",
   "消耗额度": "Used Quota",
-  "可选值": "Optional Values"
+  "可选值": "Optional Values",
+  "渠道不存在：%d": "Channel does not exist: %d",
+  "数据库一致性已被破坏，请联系管理员": "Database consistency has been broken, please contact the administrator"
 }

middleware/distributor.go

@@ -78,9 +78,14 @@ func Distribute() func(c *gin.Context) {
 			}
 			channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model)
 			if err != nil {
+				message := "无可用渠道"
+				if channel != nil {
+					common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
+					message = "数据库一致性已被破坏，请联系管理员"
+				}
 				c.JSON(http.StatusServiceUnavailable, gin.H{
 					"error": gin.H{
-						"message": "无可用渠道",
+						"message": message,
 						"type":    "one_api_error",
 					},
 				})

model/ability.go

@@ -24,6 +24,7 @@ func GetRandomSatisfiedChannel(group string, model string) (*Channel, error) {
 		return nil, err
 	}
 	channel := Channel{}
+	channel.Id = ability.ChannelId
 	err = DB.First(&channel, "id = ?", ability.ChannelId).Error
 	return &channel, err
 }