disabled channel when return 无可用渠道

This commit is contained in:
Ghostz 2024-06-21 11:40:36 +08:00
parent ff196b75a7
commit 15737cd0cf
2 changed files with 9 additions and 5 deletions

View File

@ -2,13 +2,14 @@ package middleware
import ( import (
"fmt" "fmt"
"net/http"
"strconv"
"github.com/gin-gonic/gin" "github.com/gin-gonic/gin"
"github.com/songquanpeng/one-api/common/ctxkey" "github.com/songquanpeng/one-api/common/ctxkey"
"github.com/songquanpeng/one-api/common/logger" "github.com/songquanpeng/one-api/common/logger"
"github.com/songquanpeng/one-api/model" "github.com/songquanpeng/one-api/model"
"github.com/songquanpeng/one-api/relay/channeltype" "github.com/songquanpeng/one-api/relay/channeltype"
"net/http"
"strconv"
) )
type ModelRequest struct { type ModelRequest struct {
@ -48,7 +49,7 @@ func Distribute() func(c *gin.Context) {
logger.SysError(fmt.Sprintf("渠道不存在:%d", channel.Id)) logger.SysError(fmt.Sprintf("渠道不存在:%d", channel.Id))
message = "数据库一致性已被破坏,请联系管理员" message = "数据库一致性已被破坏,请联系管理员"
} }
abortWithMessage(c, http.StatusServiceUnavailable, message) abortWithMessage(c, http.StatusNotFound, message)
return return
} }
} }

View File

@ -1,10 +1,11 @@
package monitor package monitor
import ( import (
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/relay/model"
"net/http" "net/http"
"strings" "strings"
"github.com/songquanpeng/one-api/common/config"
"github.com/songquanpeng/one-api/relay/model"
) )
func ShouldDisableChannel(err *model.Error, statusCode int) bool { func ShouldDisableChannel(err *model.Error, statusCode int) bool {
@ -35,6 +36,8 @@ func ShouldDisableChannel(err *model.Error, statusCode int) bool {
return true return true
} else if strings.HasPrefix(err.Message, "This organization has been disabled.") { } else if strings.HasPrefix(err.Message, "This organization has been disabled.") {
return true return true
} else if strings.HasPrefix(err.Message, "无可用渠道") {
return true
} }
//if strings.Contains(err.Message, "quota") { //if strings.Contains(err.Message, "quota") {
// return true // return true