oadmin/new-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #590 from iszcz/new512

Browse Source 
realtime令牌额度检测和http
This commit is contained in:
Calcium-Ion
2024-12-04 19:49:57 +08:00
committed by GitHub
parent 07b1c9a4db c8a29251ac
commit ee99041910
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
relay/channel/openai/adaptor.go
View File

@@ -32,11 +32,15 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo) {
func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) { func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
if info.RelayMode == constant.RelayModeRealtime { if info.RelayMode == constant.RelayModeRealtime {
// trim https if strings.HasPrefix(info.BaseUrl, "https://") {
baseUrl := strings.TrimPrefix(info.BaseUrl, "https://") baseUrl := strings.TrimPrefix(info.BaseUrl, "https://")
baseUrl = strings.TrimPrefix(baseUrl, "http://") baseUrl = "wss://" + baseUrl
baseUrl = "wss://" + baseUrl info.BaseUrl = baseUrl
info.BaseUrl = baseUrl } else if strings.HasPrefix(info.BaseUrl, "http://") {
baseUrl := strings.TrimPrefix(info.BaseUrl, "http://")
baseUrl = "ws://" + baseUrl
info.BaseUrl = baseUrl
}
} }
switch info.ChannelType { switch info.ChannelType {
case common.ChannelTypeAzure: case common.ChannelTypeAzure:

2
service/quota.go
View File

@@ -53,7 +53,7 @@ func PreWssConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, usag
return errors.New(fmt.Sprintf("用户额度不足，剩余额度为 %d", userQuota)) return errors.New(fmt.Sprintf("用户额度不足，剩余额度为 %d", userQuota))
} }
if token.RemainQuota < quota { if !token.UnlimitedQuota && token.RemainQuota < quota {
return errors.New(fmt.Sprintf("令牌额度不足，剩余额度为 %d", token.RemainQuota)) return errors.New(fmt.Sprintf("令牌额度不足，剩余额度为 %d", token.RemainQuota))
} }