docs: update README

* fix: baseURL not working in APITypePaLM

* chore: use the same logic as claude

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>

.github/workflows/docker-image-amd64-en.yml

@@ -38,7 +38,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ckt1031/one-api-en
+            justsong/one-api-en
 
       - name: Build and push Docker images
         uses: docker/build-push-action@v3

.github/workflows/docker-image-amd64.yml

@@ -42,7 +42,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ckt1031/one-api
+            justsong/one-api
             ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker images

.github/workflows/docker-image-arm64.yml

@@ -49,7 +49,7 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ckt1031/one-api
+            justsong/one-api
             ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker images

.gitignore

@@ -4,5 +4,4 @@ upload
 *.exe
 *.db
 build
-*.db-journal
-.env*
+*.db-journal

Dockerfile

@@ -1,29 +1,31 @@
-# Node build stage
-FROM node:18 as builder
+FROM node:16 as builder
+
 WORKDIR /build
-COPY ./web/package*.json ./
-RUN npm ci
 COPY ./web .
 COPY ./VERSION .
+RUN npm install
 RUN REACT_APP_VERSION=$(cat VERSION) npm run build
 
-# Go build stage
 FROM golang AS builder2
+
 ENV GO111MODULE=on \
     CGO_ENABLED=1 \
     GOOS=linux
+
 WORKDIR /build
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
 COPY . .
 COPY --from=builder /build/build ./web/build
+RUN go mod download
 RUN go build -ldflags "-s -w -X 'one-api/common.Version=$(cat VERSION)' -extldflags '-static'" -o one-api
 
-# Final stage
 FROM alpine
-RUN apk update && apk upgrade && apk add --no-cache ca-certificates tzdata && update-ca-certificates 2>/dev/null || true
-WORKDIR /data
+
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache ca-certificates tzdata \
+    && update-ca-certificates 2>/dev/null || true
+
 COPY --from=builder2 /build/one-api /
 EXPOSE 3000
+WORKDIR /data
 ENTRYPOINT ["/one-api"]

README.en.md

@@ -10,7 +10,7 @@
 
 # One API
 
-_✨ An OpenAI key management & redistribution system, easy to deploy & use ✨_
+_✨ Access all LLM through the standard OpenAI API format, easy to deploy & use ✨_
 
 </div>
 
@@ -57,15 +57,13 @@ _✨ An OpenAI key management & redistribution system, easy to deploy & use ✨_
 > **Note**: The latest image pulled from Docker may be an `alpha` release. Specify the version manually if you require stability.
 
 ## Features
-1. Supports multiple API access channels:
-    + [x] Official OpenAI channel (support proxy configuration)
-    + [x] **Azure OpenAI API**
-    + [x] [API Distribute](https://api.gptjk.top/register?aff=QGxj)
-    + [x] [OpenAI-SB](https://openai-sb.com)
-    + [x] [API2D](https://api2d.com/r/197971)
-    + [x] [OhMyGPT](https://aigptx.top?aff=uFpUl2Kf)
-    + [x] [AI Proxy](https://aiproxy.io/?i=OneAPI) (invitation code: `OneAPI`)
-    + [x] Custom channel: Various third-party proxy services not included in the list
+1. Support for multiple large models:
+   + [x] [OpenAI ChatGPT Series Models](https://platform.openai.com/docs/guides/gpt/chat-completions-api) (Supports [Azure OpenAI API](https://learn.microsoft.com/en-us/azure/ai-services/openai/reference))
+   + [x] [Anthropic Claude Series Models](https://anthropic.com)
+   + [x] [Google PaLM2 Series Models](https://developers.generativeai.google)
+   + [x] [Baidu Wenxin Yiyuan Series Models](https://cloud.baidu.com/doc/WENXINWORKSHOP/index.html)
+   + [x] [Alibaba Tongyi Qianwen Series Models](https://help.aliyun.com/document_detail/2400395.html)
+   + [x] [Zhipu ChatGLM Series Models](https://bigmodel.cn)
 2. Supports access to multiple channels through **load balancing**.
 3. Supports **stream mode** that enables typewriter-like effect through stream transmission.
 4. Supports **multi-machine deployment**. [See here](#multi-machine-deployment) for more details.

README.md

@@ -11,7 +11,7 @@
 
 # One API
 
-_✨ All in one 的 OpenAI 接口，整合各种 API 访问方式，开箱即用✨_
+_✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用 ✨_
 
 </div>
 
@@ -58,42 +58,44 @@ _✨ All in one 的 OpenAI 接口，整合各种 API 访问方式，开箱即用
 > **Warning**：从 `v0.3` 版本升级到 `v0.4` 版本需要手动迁移数据库，请手动执行[数据库迁移脚本](./bin/migration_v0.3-v0.4.sql)。
 
 ## 功能
-1. 支持多种 API 访问渠道：
-   + [x] OpenAI 官方通道（支持配置镜像）
-   + [x] **Azure OpenAI API**
-   + [x] [API Distribute](https://api.gptjk.top/register?aff=QGxj)
+1. 支持多种大模型：
+   + [x] [OpenAI ChatGPT 系列模型](https://platform.openai.com/docs/guides/gpt/chat-completions-api)（支持 [Azure OpenAI API](https://learn.microsoft.com/en-us/azure/ai-services/openai/reference)）
+   + [x] [Anthropic Claude 系列模型](https://anthropic.com)
+   + [x] [Google PaLM2 系列模型](https://developers.generativeai.google)
+   + [x] [百度文心一言系列模型](https://cloud.baidu.com/doc/WENXINWORKSHOP/index.html)
+   + [x] [阿里通义千问系列模型](https://help.aliyun.com/document_detail/2400395.html)
+   + [x] [智谱 ChatGLM 系列模型](https://bigmodel.cn)
+2. 支持配置镜像以及众多第三方代理服务：
    + [x] [OpenAI-SB](https://openai-sb.com)
    + [x] [API2D](https://api2d.com/r/197971)
    + [x] [OhMyGPT](https://aigptx.top?aff=uFpUl2Kf)
    + [x] [AI Proxy](https://aiproxy.io/?i=OneAPI) （邀请码：`OneAPI`）
    + [x] [CloseAI](https://console.closeai-asia.com/r/2412)
    + [x] 自定义渠道：例如各种未收录的第三方代理服务
-2. 支持通过**负载均衡**的方式访问多个渠道。
-3. 支持 **stream 模式**，可以通过流式传输实现打字机效果。
-4. 支持**多机部署**，[详见此处](#多机部署)。
-5. 支持**令牌管理**，设置令牌的过期时间和额度。
-6. 支持**兑换码管理**，支持批量生成和导出兑换码，可使用兑换码为账户进行充值。
-7. 支持**通道管理**，批量创建通道。
-8. 支持**用户分组**以及**渠道分组**，支持为不同分组设置不同的倍率。
-9. 支持渠道**设置模型列表**。
-10. 支持**查看额度明细**。
-11. 支持**用户邀请奖励**。
-12. 支持以美元为单位显示额度。
-13. 支持发布公告，设置充值链接，设置新用户初始额度。
-14. 支持模型映射，重定向用户的请求模型。
-15. 支持失败自动重试。
-16. 支持绘图接口。
-17. 支持丰富的**自定义**设置，
+3. 支持通过**负载均衡**的方式访问多个渠道。
+4. 支持 **stream 模式**，可以通过流式传输实现打字机效果。
+5. 支持**多机部署**，[详见此处](#多机部署)。
+6. 支持**令牌管理**，设置令牌的过期时间和额度。
+7. 支持**兑换码管理**，支持批量生成和导出兑换码，可使用兑换码为账户进行充值。
+8. 支持**通道管理**，批量创建通道。
+9. 支持**用户分组**以及**渠道分组**，支持为不同分组设置不同的倍率。
+10. 支持渠道**设置模型列表**。
+11. 支持**查看额度明细**。
+12. 支持**用户邀请奖励**。
+13. 支持以美元为单位显示额度。
+14. 支持发布公告，设置充值链接，设置新用户初始额度。
+15. 支持模型映射，重定向用户的请求模型。
+16. 支持失败自动重试。
+17. 支持绘图接口。
+18. 支持丰富的**自定义**设置，
     1. 支持自定义系统名称，logo 以及页脚。
     2. 支持自定义首页和关于页面，可以选择使用 HTML & Markdown 代码进行自定义，或者使用一个单独的网页通过 iframe 嵌入。
-18. 支持通过系统访问令牌访问管理 API。
-19. 支持 Cloudflare Turnstile 用户校验。
-20. 支持用户管理，支持**多种用户登录注册方式**：
+19. 支持通过系统访问令牌访问管理 API。
+20. 支持 Cloudflare Turnstile 用户校验。
+21. 支持用户管理，支持**多种用户登录注册方式**：
     + 邮箱登录注册以及通过邮箱进行密码重置。
     + [GitHub 开放授权](https://github.com/settings/applications/new)。
     + 微信公众号授权（需要额外部署 [WeChat Server](https://github.com/songquanpeng/wechat-server)）。
-21. 支持 [ChatGLM](https://github.com/THUDM/ChatGLM2-6B)。
-22. 未来其他大模型开放 API 后，将第一时间支持，并将其封装成同样的 API 访问方式。
 
 ## 部署
 ### 基于 Docker 进行部署

common/constants.go

@@ -38,7 +38,6 @@ var PasswordLoginEnabled = true
 var PasswordRegisterEnabled = true
 var EmailVerificationEnabled = false
 var GitHubOAuthEnabled = false
-var DiscordOAuthEnabled = false
 var WeChatAuthEnabled = false
 var TurnstileCheckEnabled = false
 var RegisterEnabled = true
@@ -54,12 +53,6 @@ var SMTPToken = ""
 var GitHubClientId = ""
 var GitHubClientSecret = ""
 
-var DiscordClientId = ""
-var DiscordClientSecret = ""
-var DiscordGuildId = ""
-var DiscordAllowJoiningGuild = "false"
-var DiscordBotToken = ""
-
 var WeChatServerAddress = ""
 var WeChatServerToken = ""
 var WeChatAccountQRCodeImageURL = ""
@@ -84,6 +77,8 @@ var IsMasterNode = os.Getenv("NODE_TYPE") != "slave"
 var requestInterval, _ = strconv.Atoi(os.Getenv("POLLING_INTERVAL"))
 var RequestInterval = time.Duration(requestInterval) * time.Second
 
+var SyncFrequency = 10 * 60 // unit is second, will be overwritten by SYNC_FREQUENCY
+
 const (
 	RoleGuestUser  = 0
 	RoleCommonUser = 1
@@ -158,29 +153,29 @@ const (
 	ChannelTypePaLM      = 11
 	ChannelTypeAPI2GPT   = 12
 	ChannelTypeAIGC2D    = 13
-
-	// Reserve engineering for public projects
-	ChannelTypeChatGPTWeb = 14 // Chanzhaoyu/chatgpt-web
-	ChannelTypeChatbotUI  = 15 // mckaywrigley/chatbot-ui
+	ChannelTypeAnthropic = 14
+	ChannelTypeBaidu     = 15
+	ChannelTypeZhipu     = 16
+	ChannelTypeAli       = 17
 )
 
 var ChannelBaseURLs = []string{
-	"",                              // 0
-	"https://api.openai.com",        // 1
-	"https://oa.api2d.net",          // 2
-	"",                              // 3
-	"https://api.closeai-proxy.xyz", // 4
-	"https://api.openai-sb.com",     // 5
-	"https://api.openaimax.com",     // 6
-	"https://api.ohmygpt.com",       // 7
-	"",                              // 8
-	"https://api.caipacity.com",     // 9
-	"https://api.aiproxy.io",        // 10
-	"",                              // 11
-	"https://api.api2gpt.com",       // 12
-	"https://api.aigc2d.com",        // 13
-
-	// Reserve engineering for public projects
-	"", // 14 // Chanzhaoyu/chatgpt-web
-	"", // 15 // mckaywrigley/chatbot-ui
+	"",                               // 0
+	"https://api.openai.com",         // 1
+	"https://oa.api2d.net",           // 2
+	"",                               // 3
+	"https://api.closeai-proxy.xyz",  // 4
+	"https://api.openai-sb.com",      // 5
+	"https://api.openaimax.com",      // 6
+	"https://api.ohmygpt.com",        // 7
+	"",                               // 8
+	"https://api.caipacity.com",      // 9
+	"https://api.aiproxy.io",         // 10
+	"",                               // 11
+	"https://api.api2gpt.com",        // 12
+	"https://api.aigc2d.com",         // 13
+	"https://api.anthropic.com",      // 14
+	"https://aip.baidubce.com",       // 15
+	"https://open.bigmodel.cn",       // 16
+	"https://dashscope.aliyuncs.com", // 17
 }

common/ip-gen.go

@@ -1,16 +0,0 @@
-package common
-
-import (
-	"fmt"
-	"math/rand"
-)
-
-func GenerateIP() string {
-	// Generate a random number between 20 and 240
-	segment2 := rand.Intn(221) + 20
-	segment3 := rand.Intn(256)
-	segment4 := rand.Intn(256)
-
-	ipAddress := fmt.Sprintf("104.%d.%d.%d", segment2, segment3, segment4)
-	return ipAddress
-}

common/model-ratio.go

@@ -4,9 +4,11 @@ import "encoding/json"
 
 // ModelRatio
 // https://platform.openai.com/docs/models/model-endpoint-compatibility
+// https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Blfmc9dlf
 // https://openai.com/pricing
 // TODO: when a new api is enabled, check the pricing here
 // 1 === $0.002 / 1K tokens
+// 1 === ￥0.014 / 1k tokens
 var ModelRatio = map[string]float64{
 	"gpt-4":                   15,
 	"gpt-4-0314":              15,
@@ -36,6 +38,16 @@ var ModelRatio = map[string]float64{
 	"text-moderation-stable":  0.1,
 	"text-moderation-latest":  0.1,
 	"dall-e":                  8,
+	"claude-instant-1":        0.75,
+	"claude-2":                30,
+	"ERNIE-Bot":               0.8572, // ￥0.012 / 1k tokens
+	"ERNIE-Bot-turbo":         0.5715, // ￥0.008 / 1k tokens
+	"PaLM-2":                  1,
+	"chatglm_pro":             0.7143, // ￥0.01 / 1k tokens
+	"chatglm_std":             0.3572, // ￥0.005 / 1k tokens
+	"chatglm_lite":            0.1429, // ￥0.002 / 1k tokens
+	"qwen-v1":                 0.8572, // TBD: https://help.aliyun.com/document_detail/2399482.html?spm=a2c4g.2399482.0.0.1ad347feilAgag
+	"qwen-plus-v1":            0.5715, // Same as above
 }
 
 func ModelRatio2JSONString() string {

controller/billing.go

@@ -1,26 +1,21 @@
 package controller
 
 import (
+	"github.com/gin-gonic/gin"
 	"one-api/common"
 	"one-api/model"
-
-	"github.com/gin-gonic/gin"
 )
 
 func GetSubscription(c *gin.Context) {
 	var remainQuota int
 	var usedQuota int
 	var err error
-	var expirationDate int64
-
-	tokenId := c.GetInt("token_id")
-	token, err := model.GetTokenById(tokenId)
-
-	expirationDate = token.ExpiredTime
-
+	var token *model.Token
+	var expiredTime int64
 	if common.DisplayTokenStatEnabled {
 		tokenId := c.GetInt("token_id")
 		token, err = model.GetTokenById(tokenId)
+		expiredTime = token.ExpiredTime
 		remainQuota = token.RemainQuota
 		usedQuota = token.UsedQuota
 	} else {
@@ -28,6 +23,9 @@ func GetSubscription(c *gin.Context) {
 		remainQuota, err = model.GetUserQuota(userId)
 		usedQuota, err = model.GetUserUsedQuota(userId)
 	}
+	if expiredTime <= 0 {
+		expiredTime = 0
+	}
 	if err != nil {
 		openAIError := OpenAIError{
 			Message: err.Error(),
@@ -52,7 +50,7 @@ func GetSubscription(c *gin.Context) {
 		SoftLimitUSD:       amount,
 		HardLimitUSD:       amount,
 		SystemHardLimitUSD: amount,
-		AccessUntil:        expirationDate,
+		AccessUntil:        expiredTime,
 	}
 	c.JSON(200, subscription)
 	return

controller/channel-billing.go

@@ -85,7 +85,6 @@ func GetAuthHeader(token string) http.Header {
 }
 
 func GetResponseBody(method, url string, channel *model.Channel, headers http.Header) ([]byte, error) {
-	client := &http.Client{}
 	req, err := http.NewRequest(method, url, nil)
 	if err != nil {
 		return nil, err
@@ -93,7 +92,7 @@ func GetResponseBody(method, url string, channel *model.Channel, headers http.He
 	for k := range headers {
 		req.Header.Add(k, headers.Get(k))
 	}
-	res, err := client.Do(req)
+	res, err := httpClient.Do(req)
 	if err != nil {
 		return nil, err
 	}

controller/channel-test.go

@@ -1,32 +1,29 @@
 package controller
 
 import (
-	"bufio"
 	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
-	"log"
+	"github.com/gin-gonic/gin"
 	"net/http"
 	"one-api/common"
 	"one-api/model"
 	"strconv"
-	"strings"
 	"sync"
 	"time"
-
-	"github.com/gin-gonic/gin"
 )
 
-func formatFloat(input float64) float64 {
-	if input == float64(int64(input)) {
-		return input
-	}
-	return float64(int64(input*10)) / 10
-}
-
-func testChannel(channel *model.Channel, request ChatRequest) error {
+func testChannel(channel *model.Channel, request ChatRequest) (error, *OpenAIError) {
 	switch channel.Type {
+	case common.ChannelTypePaLM:
+		fallthrough
+	case common.ChannelTypeAnthropic:
+		fallthrough
+	case common.ChannelTypeBaidu:
+		fallthrough
+	case common.ChannelTypeZhipu:
+		return errors.New("该渠道类型当前版本不支持测试，请手动测试"), nil
 	case common.ChannelTypeAzure:
 		request.Model = "gpt-35-turbo"
 	default:
@@ -35,14 +32,6 @@ func testChannel(channel *model.Channel, request ChatRequest) error {
 	requestURL := common.ChannelBaseURLs[channel.Type]
 	if channel.Type == common.ChannelTypeAzure {
 		requestURL = fmt.Sprintf("%s/openai/deployments/%s/chat/completions?api-version=2023-03-15-preview", channel.BaseURL, request.Model)
-	} else if channel.Type == common.ChannelTypeChatGPTWeb {
-		if channel.BaseURL != "" {
-			requestURL = channel.BaseURL
-		}
-	} else if channel.Type == common.ChannelTypeChatbotUI {
-		if channel.BaseURL != "" {
-			requestURL = channel.BaseURL
-		}
 	} else {
 		if channel.BaseURL != "" {
 			requestURL = channel.BaseURL
@@ -51,80 +40,12 @@ func testChannel(channel *model.Channel, request ChatRequest) error {
 	}
 
 	jsonData, err := json.Marshal(request)
-
-	if channel.Type == common.ChannelTypeChatGPTWeb {
-		// Get system message from Message json, Role == "system"
-		var systemMessage Message
-
-		for _, message := range request.Messages {
-			if message.Role == "system" {
-				systemMessage = message
-				break
-			}
-		}
-
-		var prompt string
-
-		// Get all the Message, Roles from request.Messages, and format it into string by
-		// ||> role: content
-		for _, message := range request.Messages {
-			// Exclude system message
-			if message.Role == "system" {
-				continue
-			}
-			prompt += "||> " + message.Role + ": " + message.Content + "\n"
-		}
-
-		// Construct json data without adding escape character
-		map1 := make(map[string]interface{})
-
-		map1["prompt"] = prompt
-		map1["systemMessage"] = systemMessage.Content
-
-		if request.Temperature != 0 {
-			map1["temperature"] = formatFloat(request.Temperature)
-		}
-		if request.TopP != 0 {
-			map1["top_p"] = formatFloat(request.TopP)
-		}
-
-		// Convert map to json string
-		jsonData, err = json.Marshal(map1)
-	} else if channel.Type == common.ChannelTypeChatbotUI {
-		// Get system message from Message json, Role == "system"
-		var systemMessage string
-
-		for _, message := range request.Messages {
-			if message.Role == "system" {
-				systemMessage = message.Content
-				break
-			}
-		}
-
-		// Construct json data without adding escape character
-		map1 := make(map[string]interface{})
-
-		map1["prompt"] = systemMessage
-		map1["temperature"] = formatFloat(request.Temperature)
-		map1["key"] = ""
-		map1["messages"] = request.Messages
-		map1["model"] = map[string]interface{}{
-			"id": request.Model,
-		}
-
-		// Convert map to json string
-		jsonData, err = json.Marshal(map1)
-
-		//Print jsoinData to console
-		log.Println(string(jsonData))
-	}
-
 	if err != nil {
-		return err
+		return err, nil
 	}
 	req, err := http.NewRequest("POST", requestURL, bytes.NewBuffer(jsonData))
 	if err != nil {
-		return err
+		return err, nil
 	}
 	if channel.Type == common.ChannelTypeAzure {
 		req.Header.Set("api-key", channel.Key)
@@ -132,159 +53,30 @@ func testChannel(channel *model.Channel, request ChatRequest) error {
 		req.Header.Set("Authorization", "Bearer "+channel.Key)
 	}
 	req.Header.Set("Content-Type", "application/json")
-
-	if channel.EnableIpRandomization {
-		// Generate random IP
-		ip := common.GenerateIP()
-		req.Header.Set("X-Forwarded-For", ip)
-		req.Header.Set("X-Real-IP", ip)
-		req.Header.Set("X-Client-IP", ip)
-		req.Header.Set("X-Forwarded-Host", ip)
-		req.Header.Set("X-Originating-IP", ip)
-		req.RemoteAddr = ip
-		req.Header.Set("X-Remote-IP", ip)
-		req.Header.Set("X-Remote-Addr", ip)
-	}
-
-	custom_http_headers := channel.CustomHttpHeaders
-	if custom_http_headers != "" {
-		var custom_http_headers_map map[string]string
-		err := json.Unmarshal([]byte(custom_http_headers), &custom_http_headers_map)
-
-		if err != nil {
-			return err
-		}
-
-		for key, value := range custom_http_headers_map {
-			req.Header.Set(key, value)
-		}
-	}
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
+	resp, err := httpClient.Do(req)
 	if err != nil {
-		return err
+		return err, nil
 	}
-
-	if resp.StatusCode != http.StatusOK {
-		// Print the body in string
-		if resp.Body != nil {
-			buf := new(bytes.Buffer)
-			buf.ReadFrom(resp.Body)
-			return errors.New("error response: " + strconv.Itoa(resp.StatusCode) + " " + buf.String())
-		}
-
-		return errors.New("error response: " + strconv.Itoa(resp.StatusCode))
-	}
-
-	var streamResponseText = ""
-
-	scanner := bufio.NewScanner(resp.Body)
-
-	if channel.Type != common.ChannelTypeChatGPTWeb && channel.Type != common.ChannelTypeChatbotUI {
-		scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
-			if atEOF && len(data) == 0 {
-				return 0, nil, nil
-			}
-
-			if i := strings.Index(string(data), "\n"); i >= 0 {
-				return i + 2, data[0:i], nil
-			}
-
-			if atEOF {
-				return len(data), data, nil
-			}
-
-			return 0, nil, nil
-		})
-	}
-
-	for scanner.Scan() {
-		data := scanner.Text()
-		if len(data) < 6 { // must be something wrong!
-			continue
-		}
-
-		if channel.Type == common.ChannelTypeChatGPTWeb {
-			var chatResponse ChatGptWebChatResponse
-			err = json.Unmarshal([]byte(data), &chatResponse)
-			if err != nil {
-				// Print the body in string
-				buf := new(bytes.Buffer)
-				buf.ReadFrom(resp.Body)
-				common.SysError("error unmarshalling chat response: " + err.Error() + " " + buf.String())
-				return err
-			}
-
-			// if response role is assistant and contains delta, append the content to streamResponseText
-			if chatResponse.Role == "assistant" && chatResponse.Detail != nil {
-				for _, choice := range chatResponse.Detail.Choices {
-					streamResponseText += choice.Delta.Content
-				}
-			}
-
-		} else if channel.Type == common.ChannelTypeChatbotUI {
-			streamResponseText += data
-		} else if channel.Type != common.ChannelTypeChatGPTWeb {
-			// If data has event: event content inside, remove it, it can be prefix or inside the data
-			if strings.HasPrefix(data, "event:") || strings.Contains(data, "event:") {
-				// Remove event: event in the front or back
-				data = strings.TrimPrefix(data, "event: event")
-				data = strings.TrimSuffix(data, "event: event")
-				// Remove everything, only keep `data: {...}` <--- this is the json
-				// Find the start and end indices of `data: {...}` substring
-				startIndex := strings.Index(data, "data:")
-				endIndex := strings.LastIndex(data, "}")
-
-				// If both indices are found and end index is greater than start index
-				if startIndex != -1 && endIndex != -1 && endIndex > startIndex {
-					// Extract the `data: {...}` substring
-					data = data[startIndex : endIndex+1]
-				}
-
-				// Trim whitespace and newlines from the modified data string
-				data = strings.TrimSpace(data)
-			}
-			if !strings.HasPrefix(data, "data:") {
-				continue
-			}
-			data = data[6:]
-			if !strings.HasPrefix(data, "[DONE]") {
-				var streamResponse ChatCompletionsStreamResponse
-				err = json.Unmarshal([]byte(data), &streamResponse)
-				if err != nil {
-					// Prinnt the body in string
-					buf := new(bytes.Buffer)
-					buf.ReadFrom(resp.Body)
-					common.SysError("error unmarshalling stream response: " + err.Error() + " " + buf.String())
-					return err
-				}
-				for _, choice := range streamResponse.Choices {
-					streamResponseText += choice.Delta.Content
-				}
-			}
-
-		}
-	}
-
 	defer resp.Body.Close()
-
-	// Check if streaming is complete and streamResponseText is populated
-	if streamResponseText == "" {
-		return errors.New("Streaming not complete")
+	var response TextResponse
+	err = json.NewDecoder(resp.Body).Decode(&response)
+	if err != nil {
+		return err, nil
 	}
-
-	return nil
+	if response.Usage.CompletionTokens == 0 {
+		return errors.New(fmt.Sprintf("type %s, code %v, message %s", response.Error.Type, response.Error.Code, response.Error.Message)), &response.Error
+	}
+	return nil, nil
 }
 
 func buildTestRequest() *ChatRequest {
 	testRequest := &ChatRequest{
-		Model:  "", // this will be set later
-		Stream: true,
+		Model:     "", // this will be set later
+		MaxTokens: 1,
 	}
 	testMessage := Message{
 		Role:    "user",
-		Content: "Hello ChatGPT!",
+		Content: "hi",
 	}
 	testRequest.Messages = append(testRequest.Messages, testMessage)
 	return testRequest
@@ -309,7 +101,7 @@ func TestChannel(c *gin.Context) {
 	}
 	testRequest := buildTestRequest()
 	tik := time.Now()
-	err = testChannel(channel, *testRequest)
+	err, _ = testChannel(channel, *testRequest)
 	tok := time.Now()
 	milliseconds := tok.Sub(tik).Milliseconds()
 	go channel.UpdateResponseTime(milliseconds)
@@ -373,13 +165,14 @@ func testAllChannels(notify bool) error {
 				continue
 			}
 			tik := time.Now()
-			err := testChannel(channel, *testRequest)
+			err, openaiErr := testChannel(channel, *testRequest)
 			tok := time.Now()
 			milliseconds := tok.Sub(tik).Milliseconds()
-			if err != nil || milliseconds > disableThreshold {
-				if milliseconds > disableThreshold {
-					err = errors.New(fmt.Sprintf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0))
-				}
+			if milliseconds > disableThreshold {
+				err = errors.New(fmt.Sprintf("响应时间 %.2fs 超过阈值 %.2fs", float64(milliseconds)/1000.0, float64(disableThreshold)/1000.0))
+				disableChannel(channel.Id, channel.Name, err.Error())
+			}
+			if shouldDisableChannel(openaiErr) {
 				disableChannel(channel.Id, channel.Name, err.Error())
 			}
 			channel.UpdateResponseTime(milliseconds)

controller/discord.go

@@ -1,237 +0,0 @@
-package controller
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-	"net/http"
-	"one-api/common"
-	"one-api/model"
-	"strconv"
-
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-gonic/gin"
-
-	disgoauth "github.com/realTristan/disgoauth"
-)
-
-type DiscordOAuthResponse struct {
-	AccessToken string `json:"access_token"`
-	Scope       string `json:"scope"`
-	TokenType   string `json:"token_type"`
-}
-
-type DiscordUser struct {
-	Id       string `json:"id"`
-	Username string `json:"username"`
-}
-
-func getDiscordUserInfoByCode(codeFromURLParamaters string, host string) (*DiscordUser, error) {
-	if codeFromURLParamaters == "" {
-		return nil, errors.New("Invalid parameter")
-	}
-
-	// Establish a new discord client
-	var dc *disgoauth.Client = disgoauth.Init(&disgoauth.Client{
-		ClientID:     common.DiscordClientId,
-		ClientSecret: common.DiscordClientSecret,
-		RedirectURI:  fmt.Sprintf("https://%s/oauth/discord", host),
-		Scopes:       []string{disgoauth.ScopeIdentify, disgoauth.ScopeEmail, disgoauth.ScopeGuilds, disgoauth.ScopeGuildsJoin},
-	})
-
-	accessToken, _ := dc.GetOnlyAccessToken(codeFromURLParamaters)
-
-	// Get the authorized user's data using the above accessToken
-	userData, _ := disgoauth.GetUserData(accessToken)
-
-	// Create a new DiscordUser
-	var discordUser DiscordUser
-
-	// Decode the userData map[string]interface{} into the discordUser
-	// Convert the map to JSON
-	jsonData, _ := json.Marshal(userData)
-
-	// Convert the JSON to a struct
-	err := json.Unmarshal(jsonData, &discordUser)
-
-	if err != nil {
-		return nil, err
-	}
-
-	// Add guild member.
-	if common.DiscordGuildId != "" && discordUser.Id != "" && common.DiscordBotToken != "" && common.DiscordAllowJoiningGuild == "true" {
-		url := fmt.Sprintf("https://discord.com/api/guilds/%s/members/%s", common.DiscordGuildId, discordUser.Id)
-
-		// Set JSON
-		map1 := map[string]interface{}{
-			// accessToken remove "Bearer "
-			"access_token": string(accessToken[7:]),
-		}
-
-		// Convert map to JSON
-		jsonData, _ := json.Marshal(map1)
-
-		req, _ := http.NewRequest("PUT", url, bytes.NewBuffer(jsonData))
-
-		// Set Header
-		req.Header.Set("Authorization", fmt.Sprintf("Bot %s", common.DiscordBotToken))
-		req.Header.Set("Content-Type", "application/json")
-
-		// Create a new HTTP Client
-		client := &http.Client{}
-		resp, err := client.Do(req)
-
-		log.Print(resp.StatusCode)
-
-		if err != nil || (resp.StatusCode != 200 && resp.StatusCode != 201 && resp.StatusCode != 204) {
-			// Print content
-			stringBuff := new(bytes.Buffer)
-			stringBuff.ReadFrom(resp.Body)
-
-			// Print error
-			fmt.Println("Error: ", stringBuff.String())
-
-			return nil, errors.New("You must join the discord server first or be verified member to be able to login!")
-		}
-
-		// Close the response body
-		defer resp.Body.Close()
-	}
-
-	if discordUser.Username == "" {
-		return nil, errors.New("Invalid return value, user field is empty, please try again later!")
-	}
-
-	return &discordUser, nil
-}
-
-func DiscordOAuth(c *gin.Context) {
-	session := sessions.Default(c)
-	username := session.Get("username")
-	if username != nil {
-		DiscordBind(c)
-		return
-	}
-
-	if !common.DiscordOAuthEnabled {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": "管理员未开启通过 Discord 登录以及注册",
-		})
-		return
-	}
-	code := c.Query("code")
-	host := c.Request.Host
-	discordUser, err := getDiscordUserInfoByCode(code, host)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": err.Error(),
-		})
-		return
-	}
-	user := model.User{
-		DiscordId: discordUser.Id,
-	}
-	if model.IsDiscordIdAlreadyTaken(user.DiscordId) {
-		err := user.FillUserByDiscordId()
-		if err != nil {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": err.Error(),
-			})
-			return
-		}
-	} else {
-		if common.RegisterEnabled {
-			user.Username = "discord_" + strconv.Itoa(model.GetMaxUserId()+1)
-			if discordUser.Username != "" {
-				user.DisplayName = discordUser.Username
-			} else {
-				user.DisplayName = "Discord User"
-			}
-			user.Role = common.RoleCommonUser
-			user.Status = common.UserStatusEnabled
-
-			if err := user.Insert(0); err != nil {
-				c.JSON(http.StatusOK, gin.H{
-					"success": false,
-					"message": err.Error(),
-				})
-				return
-			}
-		} else {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": "管理员关闭了新用户注册",
-			})
-			return
-		}
-	}
-
-	if user.Status != common.UserStatusEnabled {
-		c.JSON(http.StatusOK, gin.H{
-			"message": "用户已被封禁",
-			"success": false,
-		})
-		return
-	}
-	setupLogin(&user, c)
-}
-
-func DiscordBind(c *gin.Context) {
-	if !common.DiscordOAuthEnabled {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": "管理员未开启通过 Discord 登录以及注册",
-		})
-		return
-	}
-	code := c.Query("code")
-	discordUser, err := getDiscordUserInfoByCode(code, c.Request.Host)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": err.Error(),
-		})
-		return
-	}
-	user := model.User{
-		DiscordId: discordUser.Id,
-	}
-	if model.IsDiscordIdAlreadyTaken(user.DiscordId) {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": "该 Discord 账户已被绑定",
-		})
-		return
-	}
-	session := sessions.Default(c)
-	id := session.Get("id")
-	// id := c.GetInt("id")  // critical bug!
-	user.Id = id.(int)
-	err = user.FillUserById()
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": err.Error(),
-		})
-		return
-	}
-	user.DiscordId = discordUser.Id
-	err = user.Update(false)
-	if err != nil {
-		c.JSON(http.StatusOK, gin.H{
-			"success": false,
-			"message": err.Error(),
-		})
-		return
-	}
-	c.JSON(http.StatusOK, gin.H{
-		"success": true,
-		"message": "bind",
-	})
-	return
-}

controller/github.go

@@ -5,14 +5,13 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
 	"net/http"
 	"one-api/common"
 	"one-api/model"
 	"strconv"
 	"time"
-
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-gonic/gin"
 )
 
 type GitHubOAuthResponse struct {

controller/misc.go

@@ -3,11 +3,10 @@ package controller
 import (
 	"encoding/json"
 	"fmt"
+	"github.com/gin-gonic/gin"
 	"net/http"
 	"one-api/common"
 	"one-api/model"
-
-	"github.com/gin-gonic/gin"
 )
 
 func GetStatus(c *gin.Context) {
@@ -15,27 +14,23 @@ func GetStatus(c *gin.Context) {
 		"success": true,
 		"message": "",
 		"data": gin.H{
-			"version":                     common.Version,
-			"start_time":                  common.StartTime,
-			"email_verification":          common.EmailVerificationEnabled,
-			"github_oauth":                common.GitHubOAuthEnabled,
-			"github_client_id":            common.GitHubClientId,
-			"discord_oauth":               common.DiscordOAuthEnabled,
-			"discord_client_id":           common.DiscordClientId,
-			"discord_guild_id":            common.DiscordGuildId,
-			"discord_allow_joining_guild": common.DiscordAllowJoiningGuild,
-			"system_name":                 common.SystemName,
-			"logo":                        common.Logo,
-			"footer_html":                 common.Footer,
-			"wechat_qrcode":               common.WeChatAccountQRCodeImageURL,
-			"wechat_login":                common.WeChatAuthEnabled,
-			"server_address":              common.ServerAddress,
-			"turnstile_check":             common.TurnstileCheckEnabled,
-			"turnstile_site_key":          common.TurnstileSiteKey,
-			"top_up_link":                 common.TopUpLink,
-			"chat_link":                   common.ChatLink,
-			"quota_per_unit":              common.QuotaPerUnit,
-			"display_in_currency":         common.DisplayInCurrencyEnabled,
+			"version":             common.Version,
+			"start_time":          common.StartTime,
+			"email_verification":  common.EmailVerificationEnabled,
+			"github_oauth":        common.GitHubOAuthEnabled,
+			"github_client_id":    common.GitHubClientId,
+			"system_name":         common.SystemName,
+			"logo":                common.Logo,
+			"footer_html":         common.Footer,
+			"wechat_qrcode":       common.WeChatAccountQRCodeImageURL,
+			"wechat_login":        common.WeChatAuthEnabled,
+			"server_address":      common.ServerAddress,
+			"turnstile_check":     common.TurnstileCheckEnabled,
+			"turnstile_site_key":  common.TurnstileSiteKey,
+			"top_up_link":         common.TopUpLink,
+			"chat_link":           common.ChatLink,
+			"quota_per_unit":      common.QuotaPerUnit,
+			"display_in_currency": common.DisplayInCurrencyEnabled,
 		},
 	})
 	return
@@ -132,8 +127,9 @@ func SendPasswordResetEmail(c *gin.Context) {
 	link := fmt.Sprintf("%s/user/reset?email=%s&token=%s", common.ServerAddress, email, code)
 	subject := fmt.Sprintf("%s密码重置", common.SystemName)
 	content := fmt.Sprintf("<p>您好，你正在进行%s密码重置。</p>"+
-		"<p>点击<a href='%s'>此处</a>进行密码重置。</p>"+
-		"<p>重置链接 %d 分钟内有效，如果不是本人操作，请忽略。</p>", common.SystemName, link, common.VerificationValidMinutes)
+		"<p>点击 <a href='%s'>此处</a> 进行密码重置。</p>"+
+		"<p>如果链接无法点击，请尝试点击下面的链接或将其复制到浏览器中打开：<br> %s </p>"+
+		"<p>重置链接 %d 分钟内有效，如果不是本人操作，请忽略。</p>", common.SystemName, link, link, common.VerificationValidMinutes)
 	err := common.SendEmail(subject, email, content)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{

controller/model.go

@@ -253,21 +253,93 @@ func init() {
 			Parent:     nil,
 		},
 		{
-			Id:         "ChatGLM",
+			Id:         "claude-instant-1",
 			Object:     "model",
 			Created:    1677649963,
-			OwnedBy:    "thudm",
+			OwnedBy:    "anturopic",
 			Permission: permission,
-			Root:       "ChatGLM",
+			Root:       "claude-instant-1",
 			Parent:     nil,
 		},
 		{
-			Id:         "ChatGLM2",
+			Id:         "claude-2",
 			Object:     "model",
 			Created:    1677649963,
-			OwnedBy:    "thudm",
+			OwnedBy:    "anturopic",
 			Permission: permission,
-			Root:       "ChatGLM2",
+			Root:       "claude-2",
+			Parent:     nil,
+		},
+		{
+			Id:         "ERNIE-Bot",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "baidu",
+			Permission: permission,
+			Root:       "ERNIE-Bot",
+			Parent:     nil,
+		},
+		{
+			Id:         "ERNIE-Bot-turbo",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "baidu",
+			Permission: permission,
+			Root:       "ERNIE-Bot-turbo",
+			Parent:     nil,
+		},
+		{
+			Id:         "PaLM-2",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "google",
+			Permission: permission,
+			Root:       "PaLM-2",
+			Parent:     nil,
+		},
+		{
+			Id:         "chatglm_pro",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "zhipu",
+			Permission: permission,
+			Root:       "chatglm_pro",
+			Parent:     nil,
+		},
+		{
+			Id:         "chatglm_std",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "zhipu",
+			Permission: permission,
+			Root:       "chatglm_std",
+			Parent:     nil,
+		},
+		{
+			Id:         "chatglm_lite",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "zhipu",
+			Permission: permission,
+			Root:       "chatglm_lite",
+			Parent:     nil,
+		},
+		{
+			Id:         "qwen-v1",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "ali",
+			Permission: permission,
+			Root:       "qwen-v1",
+			Parent:     nil,
+		},
+		{
+			Id:         "qwen-plus-v1",
+			Object:     "model",
+			Created:    1677649963,
+			OwnedBy:    "ali",
+			Permission: permission,
+			Root:       "qwen-plus-v1",
 			Parent:     nil,
 		},
 	}

controller/option.go

@@ -2,12 +2,11 @@ package controller
 
 import (
 	"encoding/json"
+	"github.com/gin-gonic/gin"
 	"net/http"
 	"one-api/common"
 	"one-api/model"
 	"strings"
-
-	"github.com/gin-gonic/gin"
 )
 
 func GetOptions(c *gin.Context) {
@@ -42,14 +41,6 @@ func UpdateOption(c *gin.Context) {
 		return
 	}
 	switch option.Key {
-	case "DiscordOAuthEnabled":
-		if option.Value == "true" && common.DiscordClientId == "" {
-			c.JSON(http.StatusOK, gin.H{
-				"success": false,
-				"message": "无法启用 Discord OAuth，请先填入 Discord Client ID 以及 Discord Client Secret！",
-			})
-			return
-		}
 	case "GitHubOAuthEnabled":
 		if option.Value == "true" && common.GitHubClientId == "" {
 			c.JSON(http.StatusOK, gin.H{

controller/relay-ali.go

@@ -0,0 +1,240 @@
+package controller
+
+import (
+	"bufio"
+	"encoding/json"
+	"github.com/gin-gonic/gin"
+	"io"
+	"net/http"
+	"one-api/common"
+	"strings"
+)
+
+// https://help.aliyun.com/document_detail/613695.html?spm=a2c4g.2399480.0.0.1adb778fAdzP9w#341800c0f8w0r
+
+type AliMessage struct {
+	User string `json:"user"`
+	Bot  string `json:"bot"`
+}
+
+type AliInput struct {
+	Prompt  string       `json:"prompt"`
+	History []AliMessage `json:"history"`
+}
+
+type AliParameters struct {
+	TopP         float64 `json:"top_p,omitempty"`
+	TopK         int     `json:"top_k,omitempty"`
+	Seed         uint64  `json:"seed,omitempty"`
+	EnableSearch bool    `json:"enable_search,omitempty"`
+}
+
+type AliChatRequest struct {
+	Model      string        `json:"model"`
+	Input      AliInput      `json:"input"`
+	Parameters AliParameters `json:"parameters,omitempty"`
+}
+
+type AliError struct {
+	Code      string `json:"code"`
+	Message   string `json:"message"`
+	RequestId string `json:"request_id"`
+}
+
+type AliUsage struct {
+	InputTokens  int `json:"input_tokens"`
+	OutputTokens int `json:"output_tokens"`
+}
+
+type AliOutput struct {
+	Text         string `json:"text"`
+	FinishReason string `json:"finish_reason"`
+}
+
+type AliChatResponse struct {
+	Output AliOutput `json:"output"`
+	Usage  AliUsage  `json:"usage"`
+	AliError
+}
+
+func requestOpenAI2Ali(request GeneralOpenAIRequest) *AliChatRequest {
+	messages := make([]AliMessage, 0, len(request.Messages))
+	prompt := ""
+	for i := 0; i < len(request.Messages); i++ {
+		message := request.Messages[i]
+		if message.Role == "system" {
+			messages = append(messages, AliMessage{
+				User: message.Content,
+				Bot:  "Okay",
+			})
+			continue
+		} else {
+			if i == len(request.Messages)-1 {
+				prompt = message.Content
+				break
+			}
+			messages = append(messages, AliMessage{
+				User: message.Content,
+				Bot:  request.Messages[i+1].Content,
+			})
+			i++
+		}
+	}
+	return &AliChatRequest{
+		Model: request.Model,
+		Input: AliInput{
+			Prompt:  prompt,
+			History: messages,
+		},
+		//Parameters: AliParameters{  // ChatGPT's parameters are not compatible with Ali's
+		//	TopP: request.TopP,
+		//	TopK: 50,
+		//	//Seed:         0,
+		//	//EnableSearch: false,
+		//},
+	}
+}
+
+func responseAli2OpenAI(response *AliChatResponse) *OpenAITextResponse {
+	choice := OpenAITextResponseChoice{
+		Index: 0,
+		Message: Message{
+			Role:    "assistant",
+			Content: response.Output.Text,
+		},
+		FinishReason: response.Output.FinishReason,
+	}
+	fullTextResponse := OpenAITextResponse{
+		Id:      response.RequestId,
+		Object:  "chat.completion",
+		Created: common.GetTimestamp(),
+		Choices: []OpenAITextResponseChoice{choice},
+		Usage: Usage{
+			PromptTokens:     response.Usage.InputTokens,
+			CompletionTokens: response.Usage.OutputTokens,
+			TotalTokens:      response.Usage.InputTokens + response.Usage.OutputTokens,
+		},
+	}
+	return &fullTextResponse
+}
+
+func streamResponseAli2OpenAI(aliResponse *AliChatResponse) *ChatCompletionsStreamResponse {
+	var choice ChatCompletionsStreamResponseChoice
+	choice.Delta.Content = aliResponse.Output.Text
+	choice.FinishReason = aliResponse.Output.FinishReason
+	response := ChatCompletionsStreamResponse{
+		Id:      aliResponse.RequestId,
+		Object:  "chat.completion.chunk",
+		Created: common.GetTimestamp(),
+		Model:   "ernie-bot",
+		Choices: []ChatCompletionsStreamResponseChoice{choice},
+	}
+	return &response
+}
+
+func aliStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, *Usage) {
+	var usage Usage
+	scanner := bufio.NewScanner(resp.Body)
+	scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
+		if atEOF && len(data) == 0 {
+			return 0, nil, nil
+		}
+		if i := strings.Index(string(data), "\n"); i >= 0 {
+			return i + 1, data[0:i], nil
+		}
+		if atEOF {
+			return len(data), data, nil
+		}
+		return 0, nil, nil
+	})
+	dataChan := make(chan string)
+	stopChan := make(chan bool)
+	go func() {
+		for scanner.Scan() {
+			data := scanner.Text()
+			if len(data) < 5 { // ignore blank line or wrong format
+				continue
+			}
+			if data[:5] != "data:" {
+				continue
+			}
+			data = data[5:]
+			dataChan <- data
+		}
+		stopChan <- true
+	}()
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+	c.Writer.Header().Set("Cache-Control", "no-cache")
+	c.Writer.Header().Set("Connection", "keep-alive")
+	c.Writer.Header().Set("Transfer-Encoding", "chunked")
+	c.Writer.Header().Set("X-Accel-Buffering", "no")
+	lastResponseText := ""
+	c.Stream(func(w io.Writer) bool {
+		select {
+		case data := <-dataChan:
+			var aliResponse AliChatResponse
+			err := json.Unmarshal([]byte(data), &aliResponse)
+			if err != nil {
+				common.SysError("error unmarshalling stream response: " + err.Error())
+				return true
+			}
+			usage.PromptTokens += aliResponse.Usage.InputTokens
+			usage.CompletionTokens += aliResponse.Usage.OutputTokens
+			usage.TotalTokens += aliResponse.Usage.InputTokens + aliResponse.Usage.OutputTokens
+			response := streamResponseAli2OpenAI(&aliResponse)
+			response.Choices[0].Delta.Content = strings.TrimPrefix(response.Choices[0].Delta.Content, lastResponseText)
+			lastResponseText = aliResponse.Output.Text
+			jsonResponse, err := json.Marshal(response)
+			if err != nil {
+				common.SysError("error marshalling stream response: " + err.Error())
+				return true
+			}
+			c.Render(-1, common.CustomEvent{Data: "data: " + string(jsonResponse)})
+			return true
+		case <-stopChan:
+			c.Render(-1, common.CustomEvent{Data: "data: [DONE]"})
+			return false
+		}
+	})
+	err := resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	return nil, &usage
+}
+
+func aliHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, *Usage) {
+	var aliResponse AliChatResponse
+	responseBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return errorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = json.Unmarshal(responseBody, &aliResponse)
+	if err != nil {
+		return errorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	if aliResponse.Code != "" {
+		return &OpenAIErrorWithStatusCode{
+			OpenAIError: OpenAIError{
+				Message: aliResponse.Message,
+				Type:    aliResponse.Code,
+				Param:   aliResponse.RequestId,
+				Code:    aliResponse.Code,
+			},
+			StatusCode: resp.StatusCode,
+		}, nil
+	}
+	fullTextResponse := responseAli2OpenAI(&aliResponse)
+	jsonResponse, err := json.Marshal(fullTextResponse)
+	if err != nil {
+		return errorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err = c.Writer.Write(jsonResponse)
+	return nil, &fullTextResponse.Usage
+}

controller/relay-baidu.go

@@ -0,0 +1,214 @@
+package controller
+
+import (
+	"bufio"
+	"encoding/json"
+	"github.com/gin-gonic/gin"
+	"io"
+	"net/http"
+	"one-api/common"
+	"strings"
+)
+
+// https://cloud.baidu.com/doc/WENXINWORKSHOP/s/flfmc9do2
+
+type BaiduTokenResponse struct {
+	RefreshToken  string `json:"refresh_token"`
+	ExpiresIn     int    `json:"expires_in"`
+	SessionKey    string `json:"session_key"`
+	AccessToken   string `json:"access_token"`
+	Scope         string `json:"scope"`
+	SessionSecret string `json:"session_secret"`
+}
+
+type BaiduMessage struct {
+	Role    string `json:"role"`
+	Content string `json:"content"`
+}
+
+type BaiduChatRequest struct {
+	Messages []BaiduMessage `json:"messages"`
+	Stream   bool           `json:"stream"`
+	UserId   string         `json:"user_id,omitempty"`
+}
+
+type BaiduError struct {
+	ErrorCode int    `json:"error_code"`
+	ErrorMsg  string `json:"error_msg"`
+}
+
+type BaiduChatResponse struct {
+	Id               string `json:"id"`
+	Object           string `json:"object"`
+	Created          int64  `json:"created"`
+	Result           string `json:"result"`
+	IsTruncated      bool   `json:"is_truncated"`
+	NeedClearHistory bool   `json:"need_clear_history"`
+	Usage            Usage  `json:"usage"`
+	BaiduError
+}
+
+type BaiduChatStreamResponse struct {
+	BaiduChatResponse
+	SentenceId int  `json:"sentence_id"`
+	IsEnd      bool `json:"is_end"`
+}
+
+func requestOpenAI2Baidu(request GeneralOpenAIRequest) *BaiduChatRequest {
+	messages := make([]BaiduMessage, 0, len(request.Messages))
+	for _, message := range request.Messages {
+		if message.Role == "system" {
+			messages = append(messages, BaiduMessage{
+				Role:    "user",
+				Content: message.Content,
+			})
+			messages = append(messages, BaiduMessage{
+				Role:    "assistant",
+				Content: "Okay",
+			})
+		} else {
+			messages = append(messages, BaiduMessage{
+				Role:    message.Role,
+				Content: message.Content,
+			})
+		}
+	}
+	return &BaiduChatRequest{
+		Messages: messages,
+		Stream:   request.Stream,
+	}
+}
+
+func responseBaidu2OpenAI(response *BaiduChatResponse) *OpenAITextResponse {
+	choice := OpenAITextResponseChoice{
+		Index: 0,
+		Message: Message{
+			Role:    "assistant",
+			Content: response.Result,
+		},
+		FinishReason: "stop",
+	}
+	fullTextResponse := OpenAITextResponse{
+		Id:      response.Id,
+		Object:  "chat.completion",
+		Created: response.Created,
+		Choices: []OpenAITextResponseChoice{choice},
+		Usage:   response.Usage,
+	}
+	return &fullTextResponse
+}
+
+func streamResponseBaidu2OpenAI(baiduResponse *BaiduChatStreamResponse) *ChatCompletionsStreamResponse {
+	var choice ChatCompletionsStreamResponseChoice
+	choice.Delta.Content = baiduResponse.Result
+	choice.FinishReason = "stop"
+	response := ChatCompletionsStreamResponse{
+		Id:      baiduResponse.Id,
+		Object:  "chat.completion.chunk",
+		Created: baiduResponse.Created,
+		Model:   "ernie-bot",
+		Choices: []ChatCompletionsStreamResponseChoice{choice},
+	}
+	return &response
+}
+
+func baiduStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, *Usage) {
+	var usage Usage
+	scanner := bufio.NewScanner(resp.Body)
+	scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
+		if atEOF && len(data) == 0 {
+			return 0, nil, nil
+		}
+		if i := strings.Index(string(data), "\n"); i >= 0 {
+			return i + 1, data[0:i], nil
+		}
+		if atEOF {
+			return len(data), data, nil
+		}
+		return 0, nil, nil
+	})
+	dataChan := make(chan string)
+	stopChan := make(chan bool)
+	go func() {
+		for scanner.Scan() {
+			data := scanner.Text()
+			if len(data) < 6 { // ignore blank line or wrong format
+				continue
+			}
+			data = data[6:]
+			dataChan <- data
+		}
+		stopChan <- true
+	}()
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+	c.Writer.Header().Set("Cache-Control", "no-cache")
+	c.Writer.Header().Set("Connection", "keep-alive")
+	c.Writer.Header().Set("Transfer-Encoding", "chunked")
+	c.Writer.Header().Set("X-Accel-Buffering", "no")
+	c.Stream(func(w io.Writer) bool {
+		select {
+		case data := <-dataChan:
+			var baiduResponse BaiduChatStreamResponse
+			err := json.Unmarshal([]byte(data), &baiduResponse)
+			if err != nil {
+				common.SysError("error unmarshalling stream response: " + err.Error())
+				return true
+			}
+			usage.PromptTokens += baiduResponse.Usage.PromptTokens
+			usage.CompletionTokens += baiduResponse.Usage.CompletionTokens
+			usage.TotalTokens += baiduResponse.Usage.TotalTokens
+			response := streamResponseBaidu2OpenAI(&baiduResponse)
+			jsonResponse, err := json.Marshal(response)
+			if err != nil {
+				common.SysError("error marshalling stream response: " + err.Error())
+				return true
+			}
+			c.Render(-1, common.CustomEvent{Data: "data: " + string(jsonResponse)})
+			return true
+		case <-stopChan:
+			c.Render(-1, common.CustomEvent{Data: "data: [DONE]"})
+			return false
+		}
+	})
+	err := resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	return nil, &usage
+}
+
+func baiduHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, *Usage) {
+	var baiduResponse BaiduChatResponse
+	responseBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return errorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = json.Unmarshal(responseBody, &baiduResponse)
+	if err != nil {
+		return errorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	if baiduResponse.ErrorMsg != "" {
+		return &OpenAIErrorWithStatusCode{
+			OpenAIError: OpenAIError{
+				Message: baiduResponse.ErrorMsg,
+				Type:    "baidu_error",
+				Param:   "",
+				Code:    baiduResponse.ErrorCode,
+			},
+			StatusCode: resp.StatusCode,
+		}, nil
+	}
+	fullTextResponse := responseBaidu2OpenAI(&baiduResponse)
+	jsonResponse, err := json.Marshal(fullTextResponse)
+	if err != nil {
+		return errorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err = c.Writer.Write(jsonResponse)
+	return nil, &fullTextResponse.Usage
+}

controller/relay-claude.go

@@ -0,0 +1,221 @@
+package controller
+
+import (
+	"bufio"
+	"encoding/json"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"io"
+	"net/http"
+	"one-api/common"
+	"strings"
+)
+
+type ClaudeMetadata struct {
+	UserId string `json:"user_id"`
+}
+
+type ClaudeRequest struct {
+	Model             string   `json:"model"`
+	Prompt            string   `json:"prompt"`
+	MaxTokensToSample int      `json:"max_tokens_to_sample"`
+	StopSequences     []string `json:"stop_sequences,omitempty"`
+	Temperature       float64  `json:"temperature,omitempty"`
+	TopP              float64  `json:"top_p,omitempty"`
+	TopK              int      `json:"top_k,omitempty"`
+	//ClaudeMetadata    `json:"metadata,omitempty"`
+	Stream bool `json:"stream,omitempty"`
+}
+
+type ClaudeError struct {
+	Type    string `json:"type"`
+	Message string `json:"message"`
+}
+
+type ClaudeResponse struct {
+	Completion string      `json:"completion"`
+	StopReason string      `json:"stop_reason"`
+	Model      string      `json:"model"`
+	Error      ClaudeError `json:"error"`
+}
+
+func stopReasonClaude2OpenAI(reason string) string {
+	switch reason {
+	case "stop_sequence":
+		return "stop"
+	case "max_tokens":
+		return "length"
+	default:
+		return reason
+	}
+}
+
+func requestOpenAI2Claude(textRequest GeneralOpenAIRequest) *ClaudeRequest {
+	claudeRequest := ClaudeRequest{
+		Model:             textRequest.Model,
+		Prompt:            "",
+		MaxTokensToSample: textRequest.MaxTokens,
+		StopSequences:     nil,
+		Temperature:       textRequest.Temperature,
+		TopP:              textRequest.TopP,
+		Stream:            textRequest.Stream,
+	}
+	if claudeRequest.MaxTokensToSample == 0 {
+		claudeRequest.MaxTokensToSample = 1000000
+	}
+	prompt := ""
+	for _, message := range textRequest.Messages {
+		if message.Role == "user" {
+			prompt += fmt.Sprintf("\n\nHuman: %s", message.Content)
+		} else if message.Role == "assistant" {
+			prompt += fmt.Sprintf("\n\nAssistant: %s", message.Content)
+		} else if message.Role == "system" {
+			prompt += fmt.Sprintf("\n\nSystem: %s", message.Content)
+		}
+	}
+	prompt += "\n\nAssistant:"
+	claudeRequest.Prompt = prompt
+	return &claudeRequest
+}
+
+func streamResponseClaude2OpenAI(claudeResponse *ClaudeResponse) *ChatCompletionsStreamResponse {
+	var choice ChatCompletionsStreamResponseChoice
+	choice.Delta.Content = claudeResponse.Completion
+	choice.FinishReason = stopReasonClaude2OpenAI(claudeResponse.StopReason)
+	var response ChatCompletionsStreamResponse
+	response.Object = "chat.completion.chunk"
+	response.Model = claudeResponse.Model
+	response.Choices = []ChatCompletionsStreamResponseChoice{choice}
+	return &response
+}
+
+func responseClaude2OpenAI(claudeResponse *ClaudeResponse) *OpenAITextResponse {
+	choice := OpenAITextResponseChoice{
+		Index: 0,
+		Message: Message{
+			Role:    "assistant",
+			Content: strings.TrimPrefix(claudeResponse.Completion, " "),
+			Name:    nil,
+		},
+		FinishReason: stopReasonClaude2OpenAI(claudeResponse.StopReason),
+	}
+	fullTextResponse := OpenAITextResponse{
+		Id:      fmt.Sprintf("chatcmpl-%s", common.GetUUID()),
+		Object:  "chat.completion",
+		Created: common.GetTimestamp(),
+		Choices: []OpenAITextResponseChoice{choice},
+	}
+	return &fullTextResponse
+}
+
+func claudeStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, string) {
+	responseText := ""
+	responseId := fmt.Sprintf("chatcmpl-%s", common.GetUUID())
+	createdTime := common.GetTimestamp()
+	scanner := bufio.NewScanner(resp.Body)
+	scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
+		if atEOF && len(data) == 0 {
+			return 0, nil, nil
+		}
+		if i := strings.Index(string(data), "\r\n\r\n"); i >= 0 {
+			return i + 4, data[0:i], nil
+		}
+		if atEOF {
+			return len(data), data, nil
+		}
+		return 0, nil, nil
+	})
+	dataChan := make(chan string)
+	stopChan := make(chan bool)
+	go func() {
+		for scanner.Scan() {
+			data := scanner.Text()
+			if !strings.HasPrefix(data, "event: completion") {
+				continue
+			}
+			data = strings.TrimPrefix(data, "event: completion\r\ndata: ")
+			dataChan <- data
+		}
+		stopChan <- true
+	}()
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+	c.Writer.Header().Set("Cache-Control", "no-cache")
+	c.Writer.Header().Set("Connection", "keep-alive")
+	c.Writer.Header().Set("Transfer-Encoding", "chunked")
+	c.Writer.Header().Set("X-Accel-Buffering", "no")
+	c.Stream(func(w io.Writer) bool {
+		select {
+		case data := <-dataChan:
+			// some implementations may add \r at the end of data
+			data = strings.TrimSuffix(data, "\r")
+			var claudeResponse ClaudeResponse
+			err := json.Unmarshal([]byte(data), &claudeResponse)
+			if err != nil {
+				common.SysError("error unmarshalling stream response: " + err.Error())
+				return true
+			}
+			responseText += claudeResponse.Completion
+			response := streamResponseClaude2OpenAI(&claudeResponse)
+			response.Id = responseId
+			response.Created = createdTime
+			jsonStr, err := json.Marshal(response)
+			if err != nil {
+				common.SysError("error marshalling stream response: " + err.Error())
+				return true
+			}
+			c.Render(-1, common.CustomEvent{Data: "data: " + string(jsonStr)})
+			return true
+		case <-stopChan:
+			c.Render(-1, common.CustomEvent{Data: "data: [DONE]"})
+			return false
+		}
+	})
+	err := resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), ""
+	}
+	return nil, responseText
+}
+
+func claudeHandler(c *gin.Context, resp *http.Response, promptTokens int, model string) (*OpenAIErrorWithStatusCode, *Usage) {
+	responseBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return errorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	var claudeResponse ClaudeResponse
+	err = json.Unmarshal(responseBody, &claudeResponse)
+	if err != nil {
+		return errorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	if claudeResponse.Error.Type != "" {
+		return &OpenAIErrorWithStatusCode{
+			OpenAIError: OpenAIError{
+				Message: claudeResponse.Error.Message,
+				Type:    claudeResponse.Error.Type,
+				Param:   "",
+				Code:    claudeResponse.Error.Type,
+			},
+			StatusCode: resp.StatusCode,
+		}, nil
+	}
+	fullTextResponse := responseClaude2OpenAI(&claudeResponse)
+	completionTokens := countTokenText(claudeResponse.Completion, model)
+	usage := Usage{
+		PromptTokens:     promptTokens,
+		CompletionTokens: completionTokens,
+		TotalTokens:      promptTokens + completionTokens,
+	}
+	fullTextResponse.Usage = usage
+	jsonResponse, err := json.Marshal(fullTextResponse)
+	if err != nil {
+		return errorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err = c.Writer.Write(jsonResponse)
+	return nil, &usage
+}

controller/relay-image.go

@@ -109,22 +109,7 @@ func relayImageHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode
 	req.Header.Set("Content-Type", c.Request.Header.Get("Content-Type"))
 	req.Header.Set("Accept", c.Request.Header.Get("Accept"))
 
-	custom_http_headers := c.GetString("custom_http_headers")
-	if custom_http_headers != "" {
-		var custom_http_headers_map map[string]string
-		err := json.Unmarshal([]byte(custom_http_headers), &custom_http_headers_map)
-
-		if err != nil {
-			return errorWrapper(err, "unmarshal_custom_http_headers_failed", http.StatusInternalServerError)
-		}
-
-		for key, value := range custom_http_headers_map {
-			req.Header.Set(key, value)
-		}
-	}
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
+	resp, err := httpClient.Do(req)
 	if err != nil {
 		return errorWrapper(err, "do_request_failed", http.StatusInternalServerError)
 	}

controller/relay-openai.go

@@ -0,0 +1,133 @@
+package controller
+
+import (
+	"bufio"
+	"bytes"
+	"encoding/json"
+	"github.com/gin-gonic/gin"
+	"io"
+	"net/http"
+	"one-api/common"
+	"strings"
+)
+
+func openaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*OpenAIErrorWithStatusCode, string) {
+	responseText := ""
+	scanner := bufio.NewScanner(resp.Body)
+	scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
+		if atEOF && len(data) == 0 {
+			return 0, nil, nil
+		}
+		if i := strings.Index(string(data), "\n"); i >= 0 {
+			return i + 1, data[0:i], nil
+		}
+		if atEOF {
+			return len(data), data, nil
+		}
+		return 0, nil, nil
+	})
+	dataChan := make(chan string)
+	stopChan := make(chan bool)
+	go func() {
+		for scanner.Scan() {
+			data := scanner.Text()
+			if len(data) < 6 { // ignore blank line or wrong format
+				continue
+			}
+			dataChan <- data
+			data = data[6:]
+			if !strings.HasPrefix(data, "[DONE]") {
+				switch relayMode {
+				case RelayModeChatCompletions:
+					var streamResponse ChatCompletionsStreamResponse
+					err := json.Unmarshal([]byte(data), &streamResponse)
+					if err != nil {
+						common.SysError("error unmarshalling stream response: " + err.Error())
+						return
+					}
+					for _, choice := range streamResponse.Choices {
+						responseText += choice.Delta.Content
+					}
+				case RelayModeCompletions:
+					var streamResponse CompletionsStreamResponse
+					err := json.Unmarshal([]byte(data), &streamResponse)
+					if err != nil {
+						common.SysError("error unmarshalling stream response: " + err.Error())
+						return
+					}
+					for _, choice := range streamResponse.Choices {
+						responseText += choice.Text
+					}
+				}
+			}
+		}
+		stopChan <- true
+	}()
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+	c.Writer.Header().Set("Cache-Control", "no-cache")
+	c.Writer.Header().Set("Connection", "keep-alive")
+	c.Writer.Header().Set("Transfer-Encoding", "chunked")
+	c.Writer.Header().Set("X-Accel-Buffering", "no")
+	c.Stream(func(w io.Writer) bool {
+		select {
+		case data := <-dataChan:
+			if strings.HasPrefix(data, "data: [DONE]") {
+				data = data[:12]
+			}
+			// some implementations may add \r at the end of data
+			data = strings.TrimSuffix(data, "\r")
+			c.Render(-1, common.CustomEvent{Data: data})
+			return true
+		case <-stopChan:
+			return false
+		}
+	})
+	err := resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), ""
+	}
+	return nil, responseText
+}
+
+func openaiHandler(c *gin.Context, resp *http.Response, consumeQuota bool) (*OpenAIErrorWithStatusCode, *Usage) {
+	var textResponse TextResponse
+	if consumeQuota {
+		responseBody, err := io.ReadAll(resp.Body)
+		if err != nil {
+			return errorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+		}
+		err = resp.Body.Close()
+		if err != nil {
+			return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+		}
+		err = json.Unmarshal(responseBody, &textResponse)
+		if err != nil {
+			return errorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+		}
+		if textResponse.Error.Type != "" {
+			return &OpenAIErrorWithStatusCode{
+				OpenAIError: textResponse.Error,
+				StatusCode:  resp.StatusCode,
+			}, nil
+		}
+		// Reset response body
+		resp.Body = io.NopCloser(bytes.NewBuffer(responseBody))
+	}
+	// We shouldn't set the header before we parse the response body, because the parse part may fail.
+	// And then we will have to send an error response, but in this case, the header has already been set.
+	// So the httpClient will be confused by the response.
+	// For example, Postman will report error, and we cannot check the response at all.
+	for k, v := range resp.Header {
+		c.Writer.Header().Set(k, v[0])
+	}
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err := io.Copy(c.Writer, resp.Body)
+	if err != nil {
+		return errorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	return nil, &textResponse.Usage
+}

controller/relay-palm.go

@@ -1,10 +1,17 @@
 package controller
 
 import (
+	"encoding/json"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"io"
+	"net/http"
+	"one-api/common"
 )
 
+// https://developers.generativeai.google/api/rest/generativelanguage/models/generateMessage#request-body
+// https://developers.generativeai.google/api/rest/generativelanguage/models/generateMessage#response-body
+
 type PaLMChatMessage struct {
 	Author  string `json:"author"`
 	Content string `json:"content"`
@@ -15,45 +22,188 @@ type PaLMFilter struct {
 	Message string `json:"message"`
 }
 
-// https://developers.generativeai.google/api/rest/generativelanguage/models/generateMessage#request-body
+type PaLMPrompt struct {
+	Messages []PaLMChatMessage `json:"messages"`
+}
+
 type PaLMChatRequest struct {
-	Prompt         []Message `json:"prompt"`
-	Temperature    float64   `json:"temperature"`
-	CandidateCount int       `json:"candidateCount"`
-	TopP           float64   `json:"topP"`
-	TopK           int       `json:"topK"`
+	Prompt         PaLMPrompt `json:"prompt"`
+	Temperature    float64    `json:"temperature,omitempty"`
+	CandidateCount int        `json:"candidateCount,omitempty"`
+	TopP           float64    `json:"topP,omitempty"`
+	TopK           int        `json:"topK,omitempty"`
+}
+
+type PaLMError struct {
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Status  string `json:"status"`
 }
 
-// https://developers.generativeai.google/api/rest/generativelanguage/models/generateMessage#response-body
 type PaLMChatResponse struct {
-	Candidates []Message    `json:"candidates"`
-	Messages   []Message    `json:"messages"`
-	Filters    []PaLMFilter `json:"filters"`
+	Candidates []PaLMChatMessage `json:"candidates"`
+	Messages   []Message         `json:"messages"`
+	Filters    []PaLMFilter      `json:"filters"`
+	Error      PaLMError         `json:"error"`
 }
 
-func relayPaLM(openAIRequest GeneralOpenAIRequest, c *gin.Context) *OpenAIErrorWithStatusCode {
-	// https://developers.generativeai.google/api/rest/generativelanguage/models/generateMessage
-	messages := make([]PaLMChatMessage, 0, len(openAIRequest.Messages))
-	for _, message := range openAIRequest.Messages {
-		var author string
-		if message.Role == "user" {
-			author = "0"
-		} else {
-			author = "1"
-		}
-		messages = append(messages, PaLMChatMessage{
-			Author:  author,
+func requestOpenAI2PaLM(textRequest GeneralOpenAIRequest) *PaLMChatRequest {
+	palmRequest := PaLMChatRequest{
+		Prompt: PaLMPrompt{
+			Messages: make([]PaLMChatMessage, 0, len(textRequest.Messages)),
+		},
+		Temperature:    textRequest.Temperature,
+		CandidateCount: textRequest.N,
+		TopP:           textRequest.TopP,
+		TopK:           textRequest.MaxTokens,
+	}
+	for _, message := range textRequest.Messages {
+		palmMessage := PaLMChatMessage{
 			Content: message.Content,
-		})
+		}
+		if message.Role == "user" {
+			palmMessage.Author = "0"
+		} else {
+			palmMessage.Author = "1"
+		}
+		palmRequest.Prompt.Messages = append(palmRequest.Prompt.Messages, palmMessage)
 	}
-	request := PaLMChatRequest{
-		Prompt:         nil,
-		Temperature:    openAIRequest.Temperature,
-		CandidateCount: openAIRequest.N,
-		TopP:           openAIRequest.TopP,
-		TopK:           openAIRequest.MaxTokens,
-	}
-	// TODO: forward request to PaLM & convert response
-	fmt.Print(request)
-	return nil
+	return &palmRequest
+}
+
+func responsePaLM2OpenAI(response *PaLMChatResponse) *OpenAITextResponse {
+	fullTextResponse := OpenAITextResponse{
+		Choices: make([]OpenAITextResponseChoice, 0, len(response.Candidates)),
+	}
+	for i, candidate := range response.Candidates {
+		choice := OpenAITextResponseChoice{
+			Index: i,
+			Message: Message{
+				Role:    "assistant",
+				Content: candidate.Content,
+			},
+			FinishReason: "stop",
+		}
+		fullTextResponse.Choices = append(fullTextResponse.Choices, choice)
+	}
+	return &fullTextResponse
+}
+
+func streamResponsePaLM2OpenAI(palmResponse *PaLMChatResponse) *ChatCompletionsStreamResponse {
+	var choice ChatCompletionsStreamResponseChoice
+	if len(palmResponse.Candidates) > 0 {
+		choice.Delta.Content = palmResponse.Candidates[0].Content
+	}
+	choice.FinishReason = "stop"
+	var response ChatCompletionsStreamResponse
+	response.Object = "chat.completion.chunk"
+	response.Model = "palm2"
+	response.Choices = []ChatCompletionsStreamResponseChoice{choice}
+	return &response
+}
+
+func palmStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, string) {
+	responseText := ""
+	responseId := fmt.Sprintf("chatcmpl-%s", common.GetUUID())
+	createdTime := common.GetTimestamp()
+	dataChan := make(chan string)
+	stopChan := make(chan bool)
+	go func() {
+		responseBody, err := io.ReadAll(resp.Body)
+		if err != nil {
+			common.SysError("error reading stream response: " + err.Error())
+			stopChan <- true
+			return
+		}
+		err = resp.Body.Close()
+		if err != nil {
+			common.SysError("error closing stream response: " + err.Error())
+			stopChan <- true
+			return
+		}
+		var palmResponse PaLMChatResponse
+		err = json.Unmarshal(responseBody, &palmResponse)
+		if err != nil {
+			common.SysError("error unmarshalling stream response: " + err.Error())
+			stopChan <- true
+			return
+		}
+		fullTextResponse := streamResponsePaLM2OpenAI(&palmResponse)
+		fullTextResponse.Id = responseId
+		fullTextResponse.Created = createdTime
+		if len(palmResponse.Candidates) > 0 {
+			responseText = palmResponse.Candidates[0].Content
+		}
+		jsonResponse, err := json.Marshal(fullTextResponse)
+		if err != nil {
+			common.SysError("error marshalling stream response: " + err.Error())
+			stopChan <- true
+			return
+		}
+		dataChan <- string(jsonResponse)
+		stopChan <- true
+	}()
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+	c.Writer.Header().Set("Cache-Control", "no-cache")
+	c.Writer.Header().Set("Connection", "keep-alive")
+	c.Writer.Header().Set("Transfer-Encoding", "chunked")
+	c.Writer.Header().Set("X-Accel-Buffering", "no")
+	c.Stream(func(w io.Writer) bool {
+		select {
+		case data := <-dataChan:
+			c.Render(-1, common.CustomEvent{Data: "data: " + data})
+			return true
+		case <-stopChan:
+			c.Render(-1, common.CustomEvent{Data: "data: [DONE]"})
+			return false
+		}
+	})
+	err := resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), ""
+	}
+	return nil, responseText
+}
+
+func palmHandler(c *gin.Context, resp *http.Response, promptTokens int, model string) (*OpenAIErrorWithStatusCode, *Usage) {
+	responseBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return errorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	var palmResponse PaLMChatResponse
+	err = json.Unmarshal(responseBody, &palmResponse)
+	if err != nil {
+		return errorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	if palmResponse.Error.Code != 0 || len(palmResponse.Candidates) == 0 {
+		return &OpenAIErrorWithStatusCode{
+			OpenAIError: OpenAIError{
+				Message: palmResponse.Error.Message,
+				Type:    palmResponse.Error.Status,
+				Param:   "",
+				Code:    palmResponse.Error.Code,
+			},
+			StatusCode: resp.StatusCode,
+		}, nil
+	}
+	fullTextResponse := responsePaLM2OpenAI(&palmResponse)
+	completionTokens := countTokenText(palmResponse.Candidates[0].Content, model)
+	usage := Usage{
+		PromptTokens:     promptTokens,
+		CompletionTokens: completionTokens,
+		TotalTokens:      promptTokens + completionTokens,
+	}
+	fullTextResponse.Usage = usage
+	jsonResponse, err := json.Marshal(fullTextResponse)
+	if err != nil {
+		return errorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err = c.Writer.Write(jsonResponse)
+	return nil, &usage
 }

controller/relay-text.go

@@ -1,23 +1,34 @@
 package controller
 
 import (
-	"bufio"
 	"bytes"
 	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
-	"log"
 	"net/http"
 	"one-api/common"
 	"one-api/model"
-	"strconv"
 	"strings"
-	"time"
 
 	"github.com/gin-gonic/gin"
 )
 
+const (
+	APITypeOpenAI = iota
+	APITypeClaude
+	APITypePaLM
+	APITypeBaidu
+	APITypeZhipu
+	APITypeAli
+)
+
+var httpClient *http.Client
+
+func init() {
+	httpClient = &http.Client{}
+}
+
 func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 	channelType := c.GetInt("channel")
 	tokenId := c.GetInt("token_id")
@@ -74,62 +85,80 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 			isModelMapped = true
 		}
 	}
+	apiType := APITypeOpenAI
+	switch channelType {
+	case common.ChannelTypeAnthropic:
+		apiType = APITypeClaude
+	case common.ChannelTypeBaidu:
+		apiType = APITypeBaidu
+	case common.ChannelTypePaLM:
+		apiType = APITypePaLM
+	case common.ChannelTypeZhipu:
+		apiType = APITypeZhipu
+	case common.ChannelTypeAli:
+		apiType = APITypeAli
 
-	// Get token info
-	tokenInfo, err := model.GetTokenById(tokenId)
-
-	if err != nil {
-		return errorWrapper(err, "get_token_info_failed", http.StatusInternalServerError)
 	}
-
-	hasModelAvailable := func() bool {
-		for _, token := range strings.Split(tokenInfo.Models, ",") {
-			if token == textRequest.Model {
-				return true
-			}
-		}
-		return false
-	}()
-
-	if !hasModelAvailable {
-		return errorWrapper(errors.New("model not available for use"), "model_not_available_for_use", http.StatusBadRequest)
-	}
-
 	baseURL := common.ChannelBaseURLs[channelType]
 	requestURL := c.Request.URL.String()
 	if c.GetString("base_url") != "" {
 		baseURL = c.GetString("base_url")
 	}
 	fullRequestURL := fmt.Sprintf("%s%s", baseURL, requestURL)
-	if channelType == common.ChannelTypeAzure {
-		// https://learn.microsoft.com/en-us/azure/cognitive-services/openai/chatgpt-quickstart?pivots=rest-api&tabs=command-line#rest-api
-		query := c.Request.URL.Query()
-		apiVersion := query.Get("api-version")
-		if apiVersion == "" {
-			apiVersion = c.GetString("api_version")
+	switch apiType {
+	case APITypeOpenAI:
+		if channelType == common.ChannelTypeAzure {
+			// https://learn.microsoft.com/en-us/azure/cognitive-services/openai/chatgpt-quickstart?pivots=rest-api&tabs=command-line#rest-api
+			query := c.Request.URL.Query()
+			apiVersion := query.Get("api-version")
+			if apiVersion == "" {
+				apiVersion = c.GetString("api_version")
+			}
+			requestURL := strings.Split(requestURL, "?")[0]
+			requestURL = fmt.Sprintf("%s?api-version=%s", requestURL, apiVersion)
+			baseURL = c.GetString("base_url")
+			task := strings.TrimPrefix(requestURL, "/v1/")
+			model_ := textRequest.Model
+			model_ = strings.Replace(model_, ".", "", -1)
+			// https://github.com/songquanpeng/one-api/issues/67
+			model_ = strings.TrimSuffix(model_, "-0301")
+			model_ = strings.TrimSuffix(model_, "-0314")
+			model_ = strings.TrimSuffix(model_, "-0613")
+			fullRequestURL = fmt.Sprintf("%s/openai/deployments/%s/%s", baseURL, model_, task)
 		}
-		requestURL := strings.Split(requestURL, "?")[0]
-		requestURL = fmt.Sprintf("%s?api-version=%s", requestURL, apiVersion)
-		baseURL = c.GetString("base_url")
-		task := strings.TrimPrefix(requestURL, "/v1/")
-		model_ := textRequest.Model
-		model_ = strings.Replace(model_, ".", "", -1)
-		// https://github.com/songquanpeng/one-api/issues/67
-		model_ = strings.TrimSuffix(model_, "-0301")
-		model_ = strings.TrimSuffix(model_, "-0314")
-		model_ = strings.TrimSuffix(model_, "-0613")
-		fullRequestURL = fmt.Sprintf("%s/openai/deployments/%s/%s", baseURL, model_, task)
-	} else if channelType == common.ChannelTypeChatGPTWeb {
-		// remove /v1/chat/completions from request url
-		requestURL := strings.Split(requestURL, "/v1/chat/completions")[0]
-		fullRequestURL = fmt.Sprintf("%s%s", baseURL, requestURL)
-	} else if channelType == common.ChannelTypeChatbotUI {
-		// remove /v1/chat/completions from request url
-		requestURL := strings.Split(requestURL, "/v1/chat/completions")[0]
-		fullRequestURL = fmt.Sprintf("%s%s", baseURL, requestURL)
-	} else if channelType == common.ChannelTypePaLM {
-		err := relayPaLM(textRequest, c)
-		return err
+	case APITypeClaude:
+		fullRequestURL = "https://api.anthropic.com/v1/complete"
+		if baseURL != "" {
+			fullRequestURL = fmt.Sprintf("%s/v1/complete", baseURL)
+		}
+	case APITypeBaidu:
+		switch textRequest.Model {
+		case "ERNIE-Bot":
+			fullRequestURL = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions"
+		case "ERNIE-Bot-turbo":
+			fullRequestURL = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/eb-instant"
+		case "BLOOMZ-7B":
+			fullRequestURL = "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/bloomz_7b1"
+		}
+		apiKey := c.Request.Header.Get("Authorization")
+		apiKey = strings.TrimPrefix(apiKey, "Bearer ")
+		fullRequestURL += "?access_token=" + apiKey // TODO: access token expire in 30 days
+	case APITypePaLM:
+		fullRequestURL = "https://generativelanguage.googleapis.com/v1beta2/models/chat-bison-001:generateMessage"
+		if baseURL != "" {
+			fullRequestURL = fmt.Sprintf("%s/v1beta2/models/chat-bison-001:generateMessage", baseURL)
+		}
+		apiKey := c.Request.Header.Get("Authorization")
+		apiKey = strings.TrimPrefix(apiKey, "Bearer ")
+		fullRequestURL += "?key=" + apiKey
+	case APITypeZhipu:
+		method := "invoke"
+		if textRequest.Stream {
+			method = "sse-invoke"
+		}
+		fullRequestURL = fmt.Sprintf("https://open.bigmodel.cn/api/paas/v3/model-api/%s/%s", textRequest.Model, method)
+	case APITypeAli:
+		fullRequestURL = "https://dashscope.aliyuncs.com/api/v1/services/aigc/text-generation/generation"
 	}
 	var promptTokens int
 	var completionTokens int
@@ -172,184 +201,81 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 		}
 		requestBody = bytes.NewBuffer(jsonStr)
 	} else {
-		bodyBytes, err := io.ReadAll(c.Request.Body)
-		if err != nil {
-			return errorWrapper(err, "read_request_body_failed", http.StatusInternalServerError)
-		}
-		var bodyMap map[string]interface{}
-		err = json.Unmarshal(bodyBytes, &bodyMap)
-		if err != nil {
-			return errorWrapper(err, "unmarshal_request_body_failed", http.StatusInternalServerError)
-		}
-
-		// Add "stream":true to body map if it doesn't exist
-		if _, exists := bodyMap["stream"]; !exists {
-			bodyMap["stream"] = true
-		}
-
-		// Marshal the body map back into JSON
-		bodyBytes, err = json.Marshal(bodyMap)
-		if err != nil {
-			return errorWrapper(err, "marshal_request_body_failed", http.StatusInternalServerError)
-		}
-
-		requestBody = bytes.NewBuffer(bodyBytes)
+		requestBody = c.Request.Body
 	}
-
-	if channelType == common.ChannelTypeChatGPTWeb {
-		// Get system message from Message json, Role == "system"
-		var reqBody ChatRequest
-		var systemMessage Message
-
-		// Parse requestBody into systemMessage
-		err := json.NewDecoder(requestBody).Decode(&reqBody)
-
+	switch apiType {
+	case APITypeClaude:
+		claudeRequest := requestOpenAI2Claude(textRequest)
+		jsonStr, err := json.Marshal(claudeRequest)
 		if err != nil {
-			return errorWrapper(err, "decode_request_body_failed", http.StatusInternalServerError)
+			return errorWrapper(err, "marshal_text_request_failed", http.StatusInternalServerError)
 		}
-
-		for _, message := range reqBody.Messages {
-			if message.Role == "system" {
-				systemMessage = message
-				break
-			}
-		}
-
-		var prompt string
-
-		// Get all the Message, Roles from request.Messages, and format it into string by
-		// ||> role: content
-		for _, message := range reqBody.Messages {
-			// Exclude system message
-			if message.Role == "system" {
-				continue
-			}
-			prompt += "||> " + message.Role + ": " + message.Content + "\n"
-		}
-
-		// Construct json data without adding escape character
-		map1 := make(map[string]interface{})
-
-		map1["prompt"] = prompt + "\nResponse as assistant, but do not include the role in response."
-		map1["systemMessage"] = systemMessage.Content
-
-		if reqBody.Temperature != 0 {
-			map1["temperature"] = formatFloat(reqBody.Temperature)
-		}
-		if reqBody.TopP != 0 {
-			map1["top_p"] = formatFloat(reqBody.TopP)
-		}
-
-		// Convert map to json string
-		jsonData, err := json.Marshal(map1)
-
+		requestBody = bytes.NewBuffer(jsonStr)
+	case APITypeBaidu:
+		baiduRequest := requestOpenAI2Baidu(textRequest)
+		jsonStr, err := json.Marshal(baiduRequest)
 		if err != nil {
-			return errorWrapper(err, "marshal_json_failed", http.StatusInternalServerError)
+			return errorWrapper(err, "marshal_text_request_failed", http.StatusInternalServerError)
 		}
-
-		// Convert json string to io.Reader
-		requestBody = bytes.NewReader(jsonData)
-	} else if channelType == common.ChannelTypeChatbotUI {
-		// Get system message from Message json, Role == "system"
-		var reqBody ChatRequest
-
-		// Parse requestBody into systemMessage
-		err := json.NewDecoder(requestBody).Decode(&reqBody)
-
+		requestBody = bytes.NewBuffer(jsonStr)
+	case APITypePaLM:
+		palmRequest := requestOpenAI2PaLM(textRequest)
+		jsonStr, err := json.Marshal(palmRequest)
 		if err != nil {
-			return errorWrapper(err, "decode_request_body_failed", http.StatusInternalServerError)
+			return errorWrapper(err, "marshal_text_request_failed", http.StatusInternalServerError)
 		}
-
-		// Get system message from Message json, Role == "system"
-		var systemMessage string
-
-		for _, message := range reqBody.Messages {
-			if message.Role == "system" {
-				systemMessage = message.Content
-				break
-			}
-		}
-
-		// Construct json data without adding escape character
-		map1 := make(map[string]interface{})
-
-		map1["prompt"] = systemMessage
-		map1["temperature"] = formatFloat(reqBody.Temperature)
-		map1["key"] = ""
-		map1["messages"] = reqBody.Messages
-		map1["model"] = map[string]interface{}{
-			"id": reqBody.Model,
-		}
-
-		// Convert map to json string
-		jsonData, err := json.Marshal(map1)
-
+		requestBody = bytes.NewBuffer(jsonStr)
+	case APITypeZhipu:
+		zhipuRequest := requestOpenAI2Zhipu(textRequest)
+		jsonStr, err := json.Marshal(zhipuRequest)
 		if err != nil {
-			return errorWrapper(err, "marshal_json_failed", http.StatusInternalServerError)
+			return errorWrapper(err, "marshal_text_request_failed", http.StatusInternalServerError)
 		}
-
-		// Convert json string to io.Reader
-		requestBody = bytes.NewReader(jsonData)
+		requestBody = bytes.NewBuffer(jsonStr)
+	case APITypeAli:
+		aliRequest := requestOpenAI2Ali(textRequest)
+		jsonStr, err := json.Marshal(aliRequest)
+		if err != nil {
+			return errorWrapper(err, "marshal_text_request_failed", http.StatusInternalServerError)
+		}
+		requestBody = bytes.NewBuffer(jsonStr)
 	}
-
 	req, err := http.NewRequest(c.Request.Method, fullRequestURL, requestBody)
 	if err != nil {
 		return errorWrapper(err, "new_request_failed", http.StatusInternalServerError)
 	}
-	if channelType == common.ChannelTypeAzure {
-		key := c.Request.Header.Get("Authorization")
-		key = strings.TrimPrefix(key, "Bearer ")
-		req.Header.Set("api-key", key)
-	} else {
-		req.Header.Set("Authorization", c.Request.Header.Get("Authorization"))
+	apiKey := c.Request.Header.Get("Authorization")
+	apiKey = strings.TrimPrefix(apiKey, "Bearer ")
+	switch apiType {
+	case APITypeOpenAI:
+		if channelType == common.ChannelTypeAzure {
+			req.Header.Set("api-key", apiKey)
+		} else {
+			req.Header.Set("Authorization", c.Request.Header.Get("Authorization"))
+		}
+	case APITypeClaude:
+		req.Header.Set("x-api-key", apiKey)
+		anthropicVersion := c.Request.Header.Get("anthropic-version")
+		if anthropicVersion == "" {
+			anthropicVersion = "2023-06-01"
+		}
+		req.Header.Set("anthropic-version", anthropicVersion)
+	case APITypeZhipu:
+		token := getZhipuToken(apiKey)
+		req.Header.Set("Authorization", token)
+	case APITypeAli:
+		req.Header.Set("Authorization", "Bearer "+apiKey)
+		if textRequest.Stream {
+			req.Header.Set("X-DashScope-SSE", "enable")
+		}
 	}
 	req.Header.Set("Content-Type", c.Request.Header.Get("Content-Type"))
 	req.Header.Set("Accept", c.Request.Header.Get("Accept"))
 	//req.Header.Set("Connection", c.Request.Header.Get("Connection"))
-
-	if c.GetBool("enable_ip_randomization") == true {
-		// Generate random IP
-		ip := common.GenerateIP()
-		req.Header.Set("X-Forwarded-For", ip)
-		req.Header.Set("X-Real-IP", ip)
-		req.Header.Set("X-Client-IP", ip)
-		req.Header.Set("X-Forwarded-Host", ip)
-		req.Header.Set("X-Originating-IP", ip)
-		req.RemoteAddr = ip
-		req.Header.Set("X-Remote-IP", ip)
-		req.Header.Set("X-Remote-Addr", ip)
-	}
-
-	custom_http_headers := c.GetString("custom_http_headers")
-	if custom_http_headers != "" {
-		var custom_http_headers_map map[string]string
-		err := json.Unmarshal([]byte(custom_http_headers), &custom_http_headers_map)
-
-		if err != nil {
-			return errorWrapper(err, "unmarshal_custom_http_headers_failed", http.StatusInternalServerError)
-		}
-
-		for key, value := range custom_http_headers_map {
-			req.Header.Set(key, value)
-		}
-	}
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
+	resp, err := httpClient.Do(req)
 	if err != nil {
 		return errorWrapper(err, "do_request_failed", http.StatusInternalServerError)
 	}
-	if resp.StatusCode != http.StatusOK {
-		// Print the body in string
-		if resp.Body != nil {
-			buf := new(bytes.Buffer)
-			buf.ReadFrom(resp.Body)
-			log.Printf("Error Channel (%s) (%s): %s", baseURL, textRequest.Model, buf.String())
-			return errorWrapper(err, "request_failed", resp.StatusCode)
-		}
-
-		return errorWrapper(err, "request_failed", resp.StatusCode)
-	}
 	err = req.Body.Close()
 	if err != nil {
 		return errorWrapper(err, "close_request_body_failed", http.StatusInternalServerError)
@@ -359,7 +285,7 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 		return errorWrapper(err, "close_request_body_failed", http.StatusInternalServerError)
 	}
 	var textResponse TextResponse
-	isStream := strings.HasPrefix(resp.Header.Get("Content-Type"), "text/event-stream") || strings.HasPrefix(resp.Header.Get("Content-Type"), "application/octet-stream")
+	isStream := strings.HasPrefix(resp.Header.Get("Content-Type"), "text/event-stream")
 	var streamResponseText string
 
 	defer func() {
@@ -372,11 +298,15 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 			if strings.HasPrefix(textRequest.Model, "gpt-4") {
 				completionRatio = 2
 			}
-			if isStream {
+			if isStream && apiType != APITypeBaidu && apiType != APITypeZhipu && apiType != APITypeAli {
 				completionTokens = countTokenText(streamResponseText, textRequest.Model)
 			} else {
 				promptTokens = textResponse.Usage.PromptTokens
 				completionTokens = textResponse.Usage.CompletionTokens
+				if apiType == APITypeZhipu {
+					// zhipu's API does not return prompt tokens & completion tokens
+					promptTokens = textResponse.Usage.TotalTokens
+				}
 			}
 			quota = promptTokens + int(float64(completionTokens)*completionRatio)
 			quota = int(float64(quota) * ratio)
@@ -408,216 +338,122 @@ func relayTextHelper(c *gin.Context, relayMode int) *OpenAIErrorWithStatusCode {
 			}
 		}
 	}()
-
-	if isStream || channelType == common.ChannelTypeChatGPTWeb || channelType == common.ChannelTypeChatbotUI {
-		dataChan := make(chan string)
-		stopChan := make(chan bool)
-
-		scanner := bufio.NewScanner(resp.Body)
-
-		if channelType != common.ChannelTypeChatGPTWeb && channelType != common.ChannelTypeChatbotUI {
-			scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
-				if atEOF && len(data) == 0 {
-					return 0, nil, nil
-				}
-
-				if i := strings.Index(string(data), "\n"); i >= 0 {
-					return i + 2, data[0:i], nil
-				}
-
-				if atEOF {
-					return len(data), data, nil
-				}
-
-				return 0, nil, nil
-			})
-		}
-
-		go func() {
-			for scanner.Scan() {
-				data := scanner.Text()
-				if len(data) < 6 { // must be something wrong!
-					continue
-				}
-
-				if channelType == common.ChannelTypeChatGPTWeb {
-					var chatResponse ChatGptWebChatResponse
-					err = json.Unmarshal([]byte(data), &chatResponse)
-					if err != nil {
-						// Print the body in string
-						buf := new(bytes.Buffer)
-						buf.ReadFrom(resp.Body)
-						common.SysError("error unmarshalling chat response: " + err.Error() + " " + buf.String())
-						return
-					}
-
-					// if response role is assistant and contains delta, append the content to streamResponseText
-					if chatResponse.Role == "assistant" && chatResponse.Detail != nil {
-						for _, choice := range chatResponse.Detail.Choices {
-							streamResponseText += choice.Delta.Content
-
-							returnObj := map[string]interface{}{
-								"id":      chatResponse.ID,
-								"object":  chatResponse.Detail.Object,
-								"created": chatResponse.Detail.Created,
-								"model":   chatResponse.Detail.Model,
-								"choices": []map[string]interface{}{
-									// set finish_reason to null in json
-									{
-										"finish_reason": nil,
-										"index":         0,
-										"delta": map[string]interface{}{
-											"content": choice.Delta.Content,
-										},
-									},
-								},
-							}
-
-							jsonData, _ := json.Marshal(returnObj)
-
-							dataChan <- "data: " + string(jsonData)
-						}
-					}
-				} else if channelType == common.ChannelTypeChatbotUI {
-					returnObj := map[string]interface{}{
-						"id":      "chatcmpl-" + strconv.Itoa(int(time.Now().UnixNano())),
-						"object":  "text_completion",
-						"created": time.Now().Unix(),
-						"model":   textRequest.Model,
-						"choices": []map[string]interface{}{
-							// set finish_reason to null in json
-							{
-								"finish_reason": nil,
-								"index":         0,
-								"delta": map[string]interface{}{
-									"content": data,
-								},
-							},
-						},
-					}
-
-					jsonData, _ := json.Marshal(returnObj)
-
-					dataChan <- "data: " + string(jsonData)
-				} else {
-					// If data has event: event content inside, remove it, it can be prefix or inside the data
-					if strings.HasPrefix(data, "event:") || strings.Contains(data, "event:") {
-						// Remove event: event in the front or back
-						data = strings.TrimPrefix(data, "event: event")
-						data = strings.TrimSuffix(data, "event: event")
-						// Remove everything, only keep `data: {...}` <--- this is the json
-						// Find the start and end indices of `data: {...}` substring
-						startIndex := strings.Index(data, "data:")
-						endIndex := strings.LastIndex(data, "}")
-
-						// If both indices are found and end index is greater than start index
-						if startIndex != -1 && endIndex != -1 && endIndex > startIndex {
-							// Extract the `data: {...}` substring
-							data = data[startIndex : endIndex+1]
-						}
-
-						// Trim whitespace and newlines from the modified data string
-						data = strings.TrimSpace(data)
-					}
-					if !strings.HasPrefix(data, "data:") {
-						continue
-					}
-					dataChan <- data
-					data = data[6:]
-					if !strings.HasPrefix(data, "[DONE]") {
-						switch relayMode {
-						case RelayModeChatCompletions:
-							var streamResponse ChatCompletionsStreamResponse
-							err = json.Unmarshal([]byte(data), &streamResponse)
-							if err != nil {
-								common.SysError("error unmarshalling stream response: " + err.Error())
-								return
-							}
-							for _, choice := range streamResponse.Choices {
-								streamResponseText += choice.Delta.Content
-							}
-						case RelayModeCompletions:
-							var streamResponse CompletionsStreamResponse
-							err = json.Unmarshal([]byte(data), &streamResponse)
-							if err != nil {
-								common.SysError("error unmarshalling stream response: " + err.Error())
-								return
-							}
-							for _, choice := range streamResponse.Choices {
-								streamResponseText += choice.Text
-							}
-						}
-
-					}
-
-				}
-			}
-			stopChan <- true
-		}()
-
-		c.Writer.Header().Set("Content-Type", "text/event-stream")
-		c.Writer.Header().Set("Cache-Control", "no-cache")
-		c.Writer.Header().Set("Connection", "keep-alive")
-		c.Writer.Header().Set("Transfer-Encoding", "chunked")
-		c.Writer.Header().Set("X-Accel-Buffering", "no")
-		c.Stream(func(w io.Writer) bool {
-			select {
-			case data := <-dataChan:
-				if strings.HasPrefix(data, "data: [DONE]") {
-					data = data[:12]
-				}
-				// some implementations may add \r at the end of data
-				data = strings.TrimSuffix(data, "\r")
-				c.Render(-1, common.CustomEvent{Data: data})
-				return true
-			case <-stopChan:
-				return false
-			}
-		})
-		err = resp.Body.Close()
-		if err != nil {
-			return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError)
-		}
-		return nil
-	} else {
-		if consumeQuota {
-			responseBody, err := io.ReadAll(resp.Body)
+	switch apiType {
+	case APITypeOpenAI:
+		if isStream {
+			err, responseText := openaiStreamHandler(c, resp, relayMode)
 			if err != nil {
-				return errorWrapper(err, "read_response_body_failed", http.StatusInternalServerError)
+				return err
 			}
-			err = resp.Body.Close()
+			streamResponseText = responseText
+			return nil
+		} else {
+			err, usage := openaiHandler(c, resp, consumeQuota)
 			if err != nil {
-				return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError)
+				return err
 			}
-			err = json.Unmarshal(responseBody, &textResponse)
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
+		}
+	case APITypeClaude:
+		if isStream {
+			err, responseText := claudeStreamHandler(c, resp)
 			if err != nil {
-				return errorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError)
+				return err
 			}
-			if textResponse.Error.Type != "" {
-				return &OpenAIErrorWithStatusCode{
-					OpenAIError: textResponse.Error,
-					StatusCode:  resp.StatusCode,
-				}
+			streamResponseText = responseText
+			return nil
+		} else {
+			err, usage := claudeHandler(c, resp, promptTokens, textRequest.Model)
+			if err != nil {
+				return err
 			}
-			// Reset response body
-			resp.Body = io.NopCloser(bytes.NewBuffer(responseBody))
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
 		}
-		// We shouldn't set the header before we parse the response body, because the parse part may fail.
-		// And then we will have to send an error response, but in this case, the header has already been set.
-		// So the client will be confused by the response.
-		// For example, Postman will report error, and we cannot check the response at all.
-		for k, v := range resp.Header {
-			c.Writer.Header().Set(k, v[0])
+	case APITypeBaidu:
+		if isStream {
+			err, usage := baiduStreamHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
+		} else {
+			err, usage := baiduHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
 		}
-		c.Writer.WriteHeader(resp.StatusCode)
-		_, err = io.Copy(c.Writer, resp.Body)
-		if err != nil {
-			return errorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError)
+	case APITypePaLM:
+		if textRequest.Stream { // PaLM2 API does not support stream
+			err, responseText := palmStreamHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			streamResponseText = responseText
+			return nil
+		} else {
+			err, usage := palmHandler(c, resp, promptTokens, textRequest.Model)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
 		}
-		err = resp.Body.Close()
-		if err != nil {
-			return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError)
+	case APITypeZhipu:
+		if isStream {
+			err, usage := zhipuStreamHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
+		} else {
+			err, usage := zhipuHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
 		}
-		return nil
+	case APITypeAli:
+		if isStream {
+			err, usage := aliStreamHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
+		} else {
+			err, usage := aliHandler(c, resp)
+			if err != nil {
+				return err
+			}
+			if usage != nil {
+				textResponse.Usage = *usage
+			}
+			return nil
+		}
+	default:
+		return errorWrapper(errors.New("unknown api type"), "unknown_api_type", http.StatusInternalServerError)
 	}
 }

controller/relay-utils.go

@@ -91,3 +91,16 @@ func errorWrapper(err error, code string, statusCode int) *OpenAIErrorWithStatus
 		StatusCode:  statusCode,
 	}
 }
+
+func shouldDisableChannel(err *OpenAIError) bool {
+	if !common.AutomaticDisableChannelEnabled {
+		return false
+	}
+	if err == nil {
+		return false
+	}
+	if err.Type == "insufficient_quota" || err.Code == "invalid_api_key" || err.Code == "account_deactivated" {
+		return true
+	}
+	return false
+}

controller/relay-zhipu.go

@@ -0,0 +1,301 @@
+package controller
+
+import (
+	"bufio"
+	"encoding/json"
+	"github.com/gin-gonic/gin"
+	"github.com/golang-jwt/jwt"
+	"io"
+	"net/http"
+	"one-api/common"
+	"strings"
+	"sync"
+	"time"
+)
+
+// https://open.bigmodel.cn/doc/api#chatglm_std
+// chatglm_std, chatglm_lite
+// https://open.bigmodel.cn/api/paas/v3/model-api/chatglm_std/invoke
+// https://open.bigmodel.cn/api/paas/v3/model-api/chatglm_std/sse-invoke
+
+type ZhipuMessage struct {
+	Role    string `json:"role"`
+	Content string `json:"content"`
+}
+
+type ZhipuRequest struct {
+	Prompt      []ZhipuMessage `json:"prompt"`
+	Temperature float64        `json:"temperature,omitempty"`
+	TopP        float64        `json:"top_p,omitempty"`
+	RequestId   string         `json:"request_id,omitempty"`
+	Incremental bool           `json:"incremental,omitempty"`
+}
+
+type ZhipuResponseData struct {
+	TaskId     string         `json:"task_id"`
+	RequestId  string         `json:"request_id"`
+	TaskStatus string         `json:"task_status"`
+	Choices    []ZhipuMessage `json:"choices"`
+	Usage      `json:"usage"`
+}
+
+type ZhipuResponse struct {
+	Code    int               `json:"code"`
+	Msg     string            `json:"msg"`
+	Success bool              `json:"success"`
+	Data    ZhipuResponseData `json:"data"`
+}
+
+type ZhipuStreamMetaResponse struct {
+	RequestId  string `json:"request_id"`
+	TaskId     string `json:"task_id"`
+	TaskStatus string `json:"task_status"`
+	Usage      `json:"usage"`
+}
+
+type zhipuTokenData struct {
+	Token      string
+	ExpiryTime time.Time
+}
+
+var zhipuTokens sync.Map
+var expSeconds int64 = 24 * 3600
+
+func getZhipuToken(apikey string) string {
+	data, ok := zhipuTokens.Load(apikey)
+	if ok {
+		tokenData := data.(zhipuTokenData)
+		if time.Now().Before(tokenData.ExpiryTime) {
+			return tokenData.Token
+		}
+	}
+
+	split := strings.Split(apikey, ".")
+	if len(split) != 2 {
+		common.SysError("invalid zhipu key: " + apikey)
+		return ""
+	}
+
+	id := split[0]
+	secret := split[1]
+
+	expMillis := time.Now().Add(time.Duration(expSeconds)*time.Second).UnixNano() / 1e6
+	expiryTime := time.Now().Add(time.Duration(expSeconds) * time.Second)
+
+	timestamp := time.Now().UnixNano() / 1e6
+
+	payload := jwt.MapClaims{
+		"api_key":   id,
+		"exp":       expMillis,
+		"timestamp": timestamp,
+	}
+
+	token := jwt.NewWithClaims(jwt.SigningMethodHS256, payload)
+
+	token.Header["alg"] = "HS256"
+	token.Header["sign_type"] = "SIGN"
+
+	tokenString, err := token.SignedString([]byte(secret))
+	if err != nil {
+		return ""
+	}
+
+	zhipuTokens.Store(apikey, zhipuTokenData{
+		Token:      tokenString,
+		ExpiryTime: expiryTime,
+	})
+
+	return tokenString
+}
+
+func requestOpenAI2Zhipu(request GeneralOpenAIRequest) *ZhipuRequest {
+	messages := make([]ZhipuMessage, 0, len(request.Messages))
+	for _, message := range request.Messages {
+		if message.Role == "system" {
+			messages = append(messages, ZhipuMessage{
+				Role:    "system",
+				Content: message.Content,
+			})
+			messages = append(messages, ZhipuMessage{
+				Role:    "user",
+				Content: "Okay",
+			})
+		} else {
+			messages = append(messages, ZhipuMessage{
+				Role:    message.Role,
+				Content: message.Content,
+			})
+		}
+	}
+	return &ZhipuRequest{
+		Prompt:      messages,
+		Temperature: request.Temperature,
+		TopP:        request.TopP,
+		Incremental: false,
+	}
+}
+
+func responseZhipu2OpenAI(response *ZhipuResponse) *OpenAITextResponse {
+	fullTextResponse := OpenAITextResponse{
+		Id:      response.Data.TaskId,
+		Object:  "chat.completion",
+		Created: common.GetTimestamp(),
+		Choices: make([]OpenAITextResponseChoice, 0, len(response.Data.Choices)),
+		Usage:   response.Data.Usage,
+	}
+	for i, choice := range response.Data.Choices {
+		openaiChoice := OpenAITextResponseChoice{
+			Index: i,
+			Message: Message{
+				Role:    choice.Role,
+				Content: strings.Trim(choice.Content, "\""),
+			},
+			FinishReason: "",
+		}
+		if i == len(response.Data.Choices)-1 {
+			openaiChoice.FinishReason = "stop"
+		}
+		fullTextResponse.Choices = append(fullTextResponse.Choices, openaiChoice)
+	}
+	return &fullTextResponse
+}
+
+func streamResponseZhipu2OpenAI(zhipuResponse string) *ChatCompletionsStreamResponse {
+	var choice ChatCompletionsStreamResponseChoice
+	choice.Delta.Content = zhipuResponse
+	choice.FinishReason = ""
+	response := ChatCompletionsStreamResponse{
+		Object:  "chat.completion.chunk",
+		Created: common.GetTimestamp(),
+		Model:   "chatglm",
+		Choices: []ChatCompletionsStreamResponseChoice{choice},
+	}
+	return &response
+}
+
+func streamMetaResponseZhipu2OpenAI(zhipuResponse *ZhipuStreamMetaResponse) (*ChatCompletionsStreamResponse, *Usage) {
+	var choice ChatCompletionsStreamResponseChoice
+	choice.Delta.Content = ""
+	choice.FinishReason = "stop"
+	response := ChatCompletionsStreamResponse{
+		Id:      zhipuResponse.RequestId,
+		Object:  "chat.completion.chunk",
+		Created: common.GetTimestamp(),
+		Model:   "chatglm",
+		Choices: []ChatCompletionsStreamResponseChoice{choice},
+	}
+	return &response, &zhipuResponse.Usage
+}
+
+func zhipuStreamHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, *Usage) {
+	var usage *Usage
+	scanner := bufio.NewScanner(resp.Body)
+	scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
+		if atEOF && len(data) == 0 {
+			return 0, nil, nil
+		}
+		if i := strings.Index(string(data), "\n"); i >= 0 {
+			return i + 1, data[0:i], nil
+		}
+		if atEOF {
+			return len(data), data, nil
+		}
+		return 0, nil, nil
+	})
+	dataChan := make(chan string)
+	metaChan := make(chan string)
+	stopChan := make(chan bool)
+	go func() {
+		for scanner.Scan() {
+			data := scanner.Text()
+			data = strings.Trim(data, "\"")
+			if len(data) < 5 { // ignore blank line or wrong format
+				continue
+			}
+			if data[:5] == "data:" {
+				dataChan <- data[5:]
+			} else if data[:5] == "meta:" {
+				metaChan <- data[5:]
+			}
+		}
+		stopChan <- true
+	}()
+	c.Writer.Header().Set("Content-Type", "text/event-stream")
+	c.Writer.Header().Set("Cache-Control", "no-cache")
+	c.Writer.Header().Set("Connection", "keep-alive")
+	c.Writer.Header().Set("Transfer-Encoding", "chunked")
+	c.Writer.Header().Set("X-Accel-Buffering", "no")
+	c.Stream(func(w io.Writer) bool {
+		select {
+		case data := <-dataChan:
+			response := streamResponseZhipu2OpenAI(data)
+			jsonResponse, err := json.Marshal(response)
+			if err != nil {
+				common.SysError("error marshalling stream response: " + err.Error())
+				return true
+			}
+			c.Render(-1, common.CustomEvent{Data: "data: " + string(jsonResponse)})
+			return true
+		case data := <-metaChan:
+			var zhipuResponse ZhipuStreamMetaResponse
+			err := json.Unmarshal([]byte(data), &zhipuResponse)
+			if err != nil {
+				common.SysError("error unmarshalling stream response: " + err.Error())
+				return true
+			}
+			response, zhipuUsage := streamMetaResponseZhipu2OpenAI(&zhipuResponse)
+			jsonResponse, err := json.Marshal(response)
+			if err != nil {
+				common.SysError("error marshalling stream response: " + err.Error())
+				return true
+			}
+			usage = zhipuUsage
+			c.Render(-1, common.CustomEvent{Data: "data: " + string(jsonResponse)})
+			return true
+		case <-stopChan:
+			c.Render(-1, common.CustomEvent{Data: "data: [DONE]"})
+			return false
+		}
+	})
+	err := resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	return nil, usage
+}
+
+func zhipuHandler(c *gin.Context, resp *http.Response) (*OpenAIErrorWithStatusCode, *Usage) {
+	var zhipuResponse ZhipuResponse
+	responseBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return errorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return errorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = json.Unmarshal(responseBody, &zhipuResponse)
+	if err != nil {
+		return errorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	if !zhipuResponse.Success {
+		return &OpenAIErrorWithStatusCode{
+			OpenAIError: OpenAIError{
+				Message: zhipuResponse.Msg,
+				Type:    "zhipu_error",
+				Param:   "",
+				Code:    zhipuResponse.Code,
+			},
+			StatusCode: resp.StatusCode,
+		}, nil
+	}
+	fullTextResponse := responseZhipu2OpenAI(&zhipuResponse)
+	jsonResponse, err := json.Marshal(fullTextResponse)
+	if err != nil {
+		return errorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	c.Writer.Header().Set("Content-Type", "application/json")
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err = c.Writer.Write(jsonResponse)
+	return nil, &fullTextResponse.Usage
+}

controller/relay.go

@@ -45,11 +45,7 @@ type GeneralOpenAIRequest struct {
 type ChatRequest struct {
 	Model     string    `json:"model"`
 	Messages  []Message `json:"messages"`
-	MaxTokens *int      `json:"max_tokens,omitempty"`
-	Stream    bool      `json:"stream"`
-	// -1.0 to 1.0
-	Temperature float64 `json:"temperature"`
-	TopP        float64 `json:"top_p"`
+	MaxTokens int       `json:"max_tokens"`
 }
 
 type TextRequest struct {
@@ -89,6 +85,20 @@ type TextResponse struct {
 	Error OpenAIError `json:"error"`
 }
 
+type OpenAITextResponseChoice struct {
+	Index        int `json:"index"`
+	Message      `json:"message"`
+	FinishReason string `json:"finish_reason"`
+}
+
+type OpenAITextResponse struct {
+	Id      string                     `json:"id"`
+	Object  string                     `json:"object"`
+	Created int64                      `json:"created"`
+	Choices []OpenAITextResponseChoice `json:"choices"`
+	Usage   `json:"usage"`
+}
+
 type ImageResponse struct {
 	Created int `json:"created"`
 	Data    []struct {
@@ -96,13 +106,19 @@ type ImageResponse struct {
 	}
 }
 
+type ChatCompletionsStreamResponseChoice struct {
+	Delta struct {
+		Content string `json:"content"`
+	} `json:"delta"`
+	FinishReason string `json:"finish_reason,omitempty"`
+}
+
 type ChatCompletionsStreamResponse struct {
-	Choices []struct {
-		Delta struct {
-			Content string `json:"content"`
-		} `json:"delta"`
-		FinishReason string `json:"finish_reason"`
-	} `json:"choices"`
+	Id      string                                `json:"id"`
+	Object  string                                `json:"object"`
+	Created int64                                 `json:"created"`
+	Model   string                                `json:"model"`
+	Choices []ChatCompletionsStreamResponseChoice `json:"choices"`
 }
 
 type CompletionsStreamResponse struct {
@@ -112,32 +128,6 @@ type CompletionsStreamResponse struct {
 	} `json:"choices"`
 }
 
-type ChatGptWebDetail struct {
-	ID      string             `json:"id"`
-	Object  string             `json:"object"`
-	Created int                `json:"created"`
-	Model   string             `json:"model"`
-	Choices []ChatGptWebChoice `json:"choices"`
-}
-
-type ChatGptWebChoice struct {
-	Delta struct {
-		Content string `json:"content"`
-		Role    string `json:"role"`
-	} `json:"delta"`
-	Index         int    `json:"index"`
-	Finish_Reason string `json:"finish_reason"`
-}
-
-type ChatGptWebChatResponse struct {
-	Role            string            `json:"role"`
-	ID              string            `json:"id"`
-	ParentMessageID string            `json:"parentMessageId"`
-	Text            string            `json:"text"`
-	Delta           string            `json:"delta"`
-	Detail          *ChatGptWebDetail `json:"detail"`
-}
-
 func Relay(c *gin.Context) {
 	relayMode := RelayModeUnknown
 	if strings.HasPrefix(c.Request.URL.Path, "/v1/chat/completions") {
@@ -181,7 +171,7 @@ func Relay(c *gin.Context) {
 		channelId := c.GetInt("channel_id")
 		common.SysError(fmt.Sprintf("relay error (channel #%d): %s", channelId, err.Message))
 		// https://platform.openai.com/docs/guides/error-codes/api-errors
-		if common.AutomaticDisableChannelEnabled && (err.Type == "insufficient_quota" || err.Code == "invalid_api_key" || err.Code == "account_deactivated") {
+		if shouldDisableChannel(&err.OpenAIError) {
 			channelId := c.GetInt("channel_id")
 			channelName := c.GetString("channel_name")
 			disableChannel(channelId, channelName, err.Message)

controller/token.go

@@ -1,12 +1,11 @@
 package controller
 
 import (
+	"github.com/gin-gonic/gin"
 	"net/http"
 	"one-api/common"
 	"one-api/model"
 	"strconv"
-
-	"github.com/gin-gonic/gin"
 )
 
 func GetAllTokens(c *gin.Context) {
@@ -126,7 +125,6 @@ func AddToken(c *gin.Context) {
 		ExpiredTime:    token.ExpiredTime,
 		RemainQuota:    token.RemainQuota,
 		UnlimitedQuota: token.UnlimitedQuota,
-		Models:         token.Models,
 	}
 	err = cleanToken.Insert()
 	if err != nil {
@@ -205,7 +203,6 @@ func UpdateToken(c *gin.Context) {
 		cleanToken.ExpiredTime = token.ExpiredTime
 		cleanToken.RemainQuota = token.RemainQuota
 		cleanToken.UnlimitedQuota = token.UnlimitedQuota
-		cleanToken.Models = token.Models
 	}
 	err = cleanToken.Update()
 	if err != nil {

controller/user.go

@@ -483,7 +483,7 @@ func DeleteSelf(c *gin.Context) {
 	if user.Role == common.RoleRootUser {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
-			"message": "无权删除超级管理员",
+			"message": "不能删除超级管理员账户",
 		})
 		return
 	}

english.dockerfile

@@ -1,34 +0,0 @@
-# Initial stage
-FROM python:3.11 as translator
-WORKDIR /app
-COPY . .
-RUN python ./i18n/translate.py --repository_path . --json_file_path ./i18n/en.json
-
-# Node build stage
-FROM node:18-alpine as nodeBuilder
-WORKDIR /build
-COPY ./web/package*.json ./
-RUN npm ci
-COPY --from=translator /app .
-RUN cd web && REACT_APP_VERSION=$(cat VERSION) npm run build
-
-# Go build stage
-FROM golang:1.20.5 AS goBuilder
-ENV GO111MODULE=on \
-    CGO_ENABLED=1 \
-    GOOS=linux
-WORKDIR /build
-COPY go.mod .
-COPY go.sum .
-RUN go mod download
-COPY --from=translator /app .
-COPY --from=nodeBuilder /build/web/build ./web/build
-RUN go build -ldflags "-s -w -X 'one-api/common.Version=$(cat VERSION)' -extldflags '-static'" -o one-api
-
-# Final stage
-FROM alpine:latest
-RUN apk update && apk upgrade && apk add --no-cache ca-certificates tzdata && update-ca-certificates 2>/dev/null || true
-WORKDIR /data
-COPY --from=goBuilder /build/one-api /
-EXPOSE 3000
-ENTRYPOINT ["/one-api"]

go.mod

@@ -9,56 +9,48 @@ require (
 	github.com/gin-contrib/sessions v0.0.5
 	github.com/gin-contrib/static v0.0.1
 	github.com/gin-gonic/gin v1.9.1
-	github.com/go-playground/validator/v10 v10.14.1
+	github.com/go-playground/validator/v10 v10.14.0
 	github.com/go-redis/redis/v8 v8.11.5
+	github.com/golang-jwt/jwt v3.2.2+incompatible
 	github.com/google/uuid v1.3.0
-	github.com/pkoukk/tiktoken-go v0.1.5
-	golang.org/x/crypto v0.11.0
-	gorm.io/driver/mysql v1.5.1
-	gorm.io/driver/sqlite v1.5.2
-	gorm.io/gorm v1.25.2
+	github.com/pkoukk/tiktoken-go v0.1.1
+	golang.org/x/crypto v0.9.0
+	gorm.io/driver/mysql v1.4.3
+	gorm.io/driver/sqlite v1.4.3
+	gorm.io/gorm v1.24.0
 )
 
 require (
-	github.com/chenzhuoyu/iasm v0.9.0 // indirect
-	github.com/knz/go-libedit v1.10.1 // indirect
-)
-
-require (
-	github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff // indirect
-	github.com/bytedance/sonic v1.10.0-rc2 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
-	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/bytedance/sonic v1.9.1 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/dlclark/regexp2 v1.10.0 // indirect
+	github.com/dlclark/regexp2 v1.8.1 // indirect
 	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.1 // indirect
 	github.com/go-playground/universal-translator v0.18.1 // indirect
-	github.com/go-sql-driver/mysql v1.7.1 // indirect
+	github.com/go-sql-driver/mysql v1.6.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
-	github.com/gomodule/redigo v2.0.0+incompatible // indirect
 	github.com/gorilla/context v1.1.1 // indirect
 	github.com/gorilla/securecookie v1.1.1 // indirect
 	github.com/gorilla/sessions v1.2.1 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
-	github.com/joho/godotenv v1.5.1
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/go-sqlite3 v2.0.3+incompatible // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/pelletier/go-toml/v2 v2.0.9 // indirect
-	github.com/realTristan/disgoauth v1.0.2
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
-	golang.org/x/arch v0.4.0 // indirect
-	golang.org/x/net v0.12.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
-	golang.org/x/text v0.11.0 // indirect
-	google.golang.org/protobuf v1.31.0 // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/sys v0.8.0 // indirect
+	golang.org/x/text v0.9.0 // indirect
+	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,25 +1,11 @@
-github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff h1:RmdPFa+slIr4SCBg4st/l/vZWVe9QJKMXGO60Bxbe04=
-github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
-github.com/bytedance/sonic v1.9.2 h1:GDaNjuWSGu09guE9Oql0MSTNhNCLlWwO8y/xM5BzcbM=
-github.com/bytedance/sonic v1.9.2/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
-github.com/bytedance/sonic v1.10.0-rc h1:3S5HeWxjX08CUqNrXtEittExpJsEKBNzrV5UnrzHxVQ=
-github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
-github.com/bytedance/sonic v1.10.0-rc2 h1:oDfRZ+4m6AYCOC0GFeOCeYqvBmucy1isvouS2K0cPzo=
-github.com/bytedance/sonic v1.10.0-rc2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
 github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE=
 github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
-github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311 h1:qSGYFH7+jGhDF8vLC+iwCD4WpbV1EBDSzWkJODFLams=
 github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
-github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
-github.com/chenzhuoyu/iasm v0.9.0 h1:9fhXjVzq5hUy2gkhhgHl95zG2cEAhw9OSGs8toWWAwo=
-github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -28,8 +14,6 @@ github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/r
 github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/dlclark/regexp2 v1.8.1 h1:6Lcdwya6GjPUNsBct8Lg/yRPwMhABj269AAzdGSiR+0=
 github.com/dlclark/regexp2 v1.8.1/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2 v1.10.0 h1:+/GIL799phkJqYW+3YbOd8LCcbHzT0Pbo8zl70MHsq0=
-github.com/dlclark/regexp2 v1.10.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
@@ -61,25 +45,17 @@ github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GO
 github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
 github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
-github.com/go-playground/validator/v10 v10.14.1 h1:9c50NUPC30zyuKprjL3vNZ0m5oG+jU0zvx4AqHGnv4k=
-github.com/go-playground/validator/v10 v10.14.1/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
 github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE=
 github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
-github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
-github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
 github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
-github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
-github.com/gomodule/redigo v2.0.0+incompatible h1:K/R+8tc58AaqLkqG2Ol3Qk+DR/TlNuhuh457pBFPtt0=
-github.com/gomodule/redigo v2.0.0+incompatible/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
@@ -89,7 +65,6 @@ github.com/gorilla/context v1.1.1 h1:AWwleXJkX/nhcU9bZSnZoi3h/qGYqQAGhq6zZe/aQW8
 github.com/gorilla/context v1.1.1/go.mod h1:kBGZzfjB9CEq2AlWe17Uuf7NDRt0dE0s8S51q0aT7Yg=
 github.com/gorilla/securecookie v1.1.1 h1:miw7JPhV+b/lAHSXz4qd/nN9jRiAFV5FwjeKyCS8BvQ=
 github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4=
-github.com/gorilla/sessions v1.1.1/go.mod h1:8KCfur6+4Mqcc6S0FEfKuN15Vl5MgXW92AE8ovaJD0w=
 github.com/gorilla/sessions v1.2.1 h1:DHd3rPN5lE3Ts3D8rKkQ8x/0kqfeNmBAaiSi+o7FsgI=
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
@@ -97,18 +72,12 @@ github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkr
 github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
-github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.4 h1:acbojRNwl3o09bUq+yDCtZFc1aiwaAAxtcn8YkZXnvk=
 github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
-github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
-github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
-github.com/knz/go-libedit v1.10.1 h1:0pHpWtx9vcvC0xGZqEQlQdfSQs7WRlAjuPvk3fOZDCo=
-github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
@@ -140,21 +109,11 @@ github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
 github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
 github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
 github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
-github.com/pelletier/go-toml/v2 v2.0.9 h1:uH2qQXheeefCCkuBBSLi7jCiSmj3VRh2+Goq2N7Xxu0=
-github.com/pelletier/go-toml/v2 v2.0.9/go.mod h1:tJU2Z3ZkXwnxa4DPO899bsyIoywizdUvyaeZurnPPDc=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkoukk/tiktoken-go v0.1.1 h1:jtkYlIECjyM9OW1w4rjPmTohK4arORP9V25y6TM6nXo=
 github.com/pkoukk/tiktoken-go v0.1.1/go.mod h1:boMWvk9pQCOTx11pgu0DrIdrAKgQzzJKUP6vLXaz7Rw=
-github.com/pkoukk/tiktoken-go v0.1.4 h1:bniMzWdUvNO6YkRbASo2x5qJf2LAG/TIJojqz+Igm8E=
-github.com/pkoukk/tiktoken-go v0.1.4/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=
-github.com/pkoukk/tiktoken-go v0.1.5 h1:hAlT4dCf6Uk50x8E7HQrddhH3EWMKUN+LArExQQsQx4=
-github.com/pkoukk/tiktoken-go v0.1.5/go.mod h1:9NiV+i9mJKGj1rYOT+njbv+ZwA/zJxYdewGl6qVatpg=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/ravener/discord-oauth2 v0.0.0-20230514095040-ae65713199b3 h1:x3LgcvujjG+mx8PUMfPmwn3tcu2aA95uCB6ilGGObWk=
-github.com/ravener/discord-oauth2 v0.0.0-20230514095040-ae65713199b3/go.mod h1:P/mZMYLZ87lqRSECEWsOqywGrO1hlZkk9RTwEw35IP4=
-github.com/realTristan/disgoauth v1.0.2 h1:dfto2Kf1gFlZsf8XuwRNoemLgk+hGn/TJpSdtMrEh8E=
-github.com/realTristan/disgoauth v1.0.2/go.mod h1:t72aRaWMq2gknUZcKONReJlEYFod5sHC86WCJ0X9GxA=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8=
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
@@ -171,7 +130,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY=
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
 github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
@@ -183,56 +141,34 @@ github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZ
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.3.0 h1:02VY4/ZcO/gBOH6PUaoiptASxtXU10jazRCP865E97k=
 golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc=
-golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
-golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.9.0 h1:LF6fAI+IutBocDJ2OT0Q1g8plpYljMZ4+lty+dsqw3g=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
-golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
-golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
-golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
-golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
-golang.org/x/oauth2 v0.10.0 h1:zHCpF2Khkwy4mMB4bv0U37YtJdTGW8jI0glAApi0Kh8=
-golang.org/x/oauth2 v0.10.0/go.mod h1:kTpgurOux7LqtuxjuyZa4Gj2gdezIt/jQtGnNFfypQI=
-golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
-golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
-golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
-google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
-google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@@ -249,17 +185,9 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/mysql v1.4.3 h1:/JhWJhO2v17d8hjApTltKNADm7K7YI2ogkR7avJUL3k=
 gorm.io/driver/mysql v1.4.3/go.mod h1:sSIebwZAVPiT+27jK9HIwvsqOGKx3YMPmrA3mBJR10c=
-gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
-gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
 gorm.io/driver/sqlite v1.4.3 h1:HBBcZSDnWi5BW3B3rwvVTc510KGkBkexlOg0QrmLUuU=
 gorm.io/driver/sqlite v1.4.3/go.mod h1:0Aq3iPO+v9ZKbcdiz8gLWRw5VOPcBOPUQJFLq5e2ecI=
-gorm.io/driver/sqlite v1.5.2 h1:TpQ+/dqCY4uCigCFyrfnrJnrW9zjpelWVoEVNy5qJkc=
-gorm.io/driver/sqlite v1.5.2/go.mod h1:qxAuCol+2r6PannQDpOP1FP6ag3mKi4esLnB/jHed+4=
 gorm.io/gorm v1.23.8/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk=
 gorm.io/gorm v1.24.0 h1:j/CoiSm6xpRpmzbFJsQHYj+I8bGYWLXVHeYEyyKlF74=
 gorm.io/gorm v1.24.0/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
-gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
-gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=

i18n/en.json

@@ -237,8 +237,7 @@
   "保存首页内容": "Save Home Page Content",
   "在此输入新的关于内容，支持 Markdown & HTML 代码。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为关于页面": "Enter new about content here, supports Markdown & HTML code. If a link is entered, it will be used as the src attribute of the iframe, allowing you to set any webpage as the about page.",
   "保存关于": "Save About",
-  "移除 One API": "Removal of One API",
-  "的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目。": " copyright mark must first be authorized. Project maintenance requires a lot of effort. If this project is meaningful to you, please actively support it.",
+  "移除 One API 的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目": "Removal of One API copyright mark must first be authorized. Project maintenance requires a lot of effort. If this project is meaningful to you, please actively support it.",
   "页脚": "Footer",
   "在此输入新的页脚，留空则使用默认页脚，支持 HTML 代码": "Enter the new footer here, leave blank to use the default footer, supports HTML code.",
   "设置页脚": "Set Footer",
@@ -444,7 +443,6 @@
   "显示名称": "Display Name",
   "请输入新的显示名称": "Please enter a new display name",
   "已绑定的 GitHub 账户": "GitHub Account Bound",
-  "已绑定的 Discord 账户": "Discord Account Bound",
   "此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改": "This item is read-only. Users need to bind through the relevant binding button on the personal settings page, and cannot be modified directly",
   "已绑定的微信账户": "WeChat Account Bound",
   "已绑定的邮箱账户": "Email Account Bound",
@@ -505,37 +503,5 @@
   "请输入 AZURE_OPENAI_ENDPOINT": "Please enter AZURE_OPENAI_ENDPOINT",
   "请输入自定义渠道的 Base URL": "Please enter the Base URL of the custom channel",
   "Homepage URL 填": "Fill in the Homepage URL",
-  "Authorization callback URL 填": "Fill in the Authorization callback URL",
-  "允许通过 Discord 账户登录和注册": "Allow login and registration via Discord account",
-  "Discord 身份验证": "Discord Authentication",
-  "确认文字": "Confirmation Text",
-  "请输入 \"CONFIRM\" 以删除您的帐户。": "Please enter \"CONFIRM\" to delete your account.",
-  "请确认您要删除账户！": "Please confirm that you want to delete the account!",
-  "账户已删除！": "Account deleted!",
-  "您是否确认删除自己的帐户?": "Are you sure you want to delete your account?",
-  "配置 Discord OAuth App": "Configure Discord OAuth App",
-  "管理你的 Discord OAuth App": "Manage your Discord OAuth App",
-  "输入你注册的 Discord OAuth APP 的 ID": "Enter the ID of your registered Discord OAuth APP",
-  "保存 Discord OAuth 设置": "Save Discord OAuth Settings",
-  "删除个人账户": "Delete personal account",
-  "绑定 Discord 账号": "Bind Discord account",
-  "无权将其他用户权限等级提升到大于等于自己的权限等级": "You are not allowed to upgrade the permission level of other users to greater than or equal to your own permission level",
-  "无权删除超级管理员": "You are not allowed to delete super administrators",
-  "该 Discord 账户已被绑定": "The Discord account has been bound",
-  "管理员未开启通过 Discord 登录以及注册": "The administrator has not enabled login and registration via Discord",
-  "无法启用 Discord OAuth，请先填入 Discord Client ID 以及 Discord Client Secret！": "Unable to enable Discord OAuth, please fill in the Discord Client ID and Discord Client Secret first!",
-  "兑换失败，": "Redemption failed, ",
-  "请选择此密钥支持的模型": "Please select the models supported by this key",
-  "将IP随机地址传递给HTTP头": "Pass the IP random address to the HTTP header",
-  "失败重试次数": "Number of failed retries",
-  "消费": "Consumption",
-  "管理": "Management",
-  "系统": "System",
-  "未知": "Unknown",
-  "One API 会把请求体中的 model": "One API will take the model in the request body",
-  "，因为": ", because",
-  "参数替换为你的部署名称（模型名称中的点会被剔除），": "Replace the parameter with your deployment name (dots in the model name will be removed), ",
-  "注意，此处生成的令牌用于系统管理，而非用于请求 OpenAI": "Note that the generated token here is used for system management, not for requesting OpenAI",
-  "相关的服务，请知悉。": "related services, please be aware.",
-  "填入": "Fill in"
+  "Authorization callback URL 填": "Fill in the Authorization callback URL"
 }

main.go

@@ -2,6 +2,9 @@ package main
 
 import (
 	"embed"
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-contrib/sessions/cookie"
+	"github.com/gin-gonic/gin"
 	"one-api/common"
 	"one-api/controller"
 	"one-api/middleware"
@@ -9,11 +12,6 @@ import (
 	"one-api/router"
 	"os"
 	"strconv"
-
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/cookie"
-	"github.com/gin-gonic/gin"
-	"github.com/joho/godotenv"
 )
 
 //go:embed web/build
@@ -23,8 +21,6 @@ var buildFS embed.FS
 var indexPage []byte
 
 func main() {
-	godotenv.Load(".env")
-
 	common.SetupGinLog()
 	common.SysLog("One API " + common.Version + " started")
 	if os.Getenv("GIN_MODE") != "debug" {
@@ -58,6 +54,7 @@ func main() {
 		if err != nil {
 			common.FatalLog("failed to parse SYNC_FREQUENCY: " + err.Error())
 		}
+		common.SyncFrequency = frequency
 		go model.SyncOptions(frequency)
 		if common.RedisEnabled {
 			go model.SyncChannelCache(frequency)

middleware/distributor.go

@@ -86,7 +86,7 @@ func Distribute() func(c *gin.Context) {
 			}
 			channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model)
 			if err != nil {
-				message := "无可用渠道"
+				message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", userGroup, modelRequest.Model)
 				if channel != nil {
 					common.SysError(fmt.Sprintf("渠道不存在：%d", channel.Id))
 					message = "数据库一致性已被破坏，请联系管理员"
@@ -105,8 +105,6 @@ func Distribute() func(c *gin.Context) {
 		c.Set("channel_id", channel.Id)
 		c.Set("channel_name", channel.Name)
 		c.Set("model_mapping", channel.ModelMapping)
-		c.Set("custom_http_headers", channel.CustomHttpHeaders)
-		c.Set("enable_ip_randomization", channel.EnableIpRandomization)
 		c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key))
 		c.Set("base_url", channel.BaseURL)
 		if channel.Type == common.ChannelTypeAzure {

model/cache.go

@@ -12,11 +12,11 @@ import (
 	"time"
 )
 
-const (
-	TokenCacheSeconds         = 60 * 60
-	UserId2GroupCacheSeconds  = 60 * 60
-	UserId2QuotaCacheSeconds  = 10 * 60
-	UserId2StatusCacheSeconds = 60 * 60
+var (
+	TokenCacheSeconds         = common.SyncFrequency
+	UserId2GroupCacheSeconds  = common.SyncFrequency
+	UserId2QuotaCacheSeconds  = common.SyncFrequency
+	UserId2StatusCacheSeconds = common.SyncFrequency
 )
 
 func CacheGetTokenByKey(key string) (*Token, error) {
@@ -35,7 +35,7 @@ func CacheGetTokenByKey(key string) (*Token, error) {
 		if err != nil {
 			return nil, err
 		}
-		err = common.RedisSet(fmt.Sprintf("token:%s", key), string(jsonBytes), TokenCacheSeconds*time.Second)
+		err = common.RedisSet(fmt.Sprintf("token:%s", key), string(jsonBytes), time.Duration(TokenCacheSeconds)*time.Second)
 		if err != nil {
 			common.SysError("Redis set token error: " + err.Error())
 		}
@@ -55,7 +55,7 @@ func CacheGetUserGroup(id int) (group string, err error) {
 		if err != nil {
 			return "", err
 		}
-		err = common.RedisSet(fmt.Sprintf("user_group:%d", id), group, UserId2GroupCacheSeconds*time.Second)
+		err = common.RedisSet(fmt.Sprintf("user_group:%d", id), group, time.Duration(UserId2GroupCacheSeconds)*time.Second)
 		if err != nil {
 			common.SysError("Redis set user group error: " + err.Error())
 		}
@@ -73,7 +73,7 @@ func CacheGetUserQuota(id int) (quota int, err error) {
 		if err != nil {
 			return 0, err
 		}
-		err = common.RedisSet(fmt.Sprintf("user_quota:%d", id), fmt.Sprintf("%d", quota), UserId2QuotaCacheSeconds*time.Second)
+		err = common.RedisSet(fmt.Sprintf("user_quota:%d", id), fmt.Sprintf("%d", quota), time.Duration(UserId2QuotaCacheSeconds)*time.Second)
 		if err != nil {
 			common.SysError("Redis set user quota error: " + err.Error())
 		}
@@ -91,7 +91,7 @@ func CacheUpdateUserQuota(id int) error {
 	if err != nil {
 		return err
 	}
-	err = common.RedisSet(fmt.Sprintf("user_quota:%d", id), fmt.Sprintf("%d", quota), UserId2QuotaCacheSeconds*time.Second)
+	err = common.RedisSet(fmt.Sprintf("user_quota:%d", id), fmt.Sprintf("%d", quota), time.Duration(UserId2QuotaCacheSeconds)*time.Second)
 	return err
 }
 
@@ -106,7 +106,7 @@ func CacheIsUserEnabled(userId int) bool {
 			status = common.UserStatusEnabled
 		}
 		enabled = fmt.Sprintf("%d", status)
-		err = common.RedisSet(fmt.Sprintf("user_enabled:%d", userId), enabled, UserId2StatusCacheSeconds*time.Second)
+		err = common.RedisSet(fmt.Sprintf("user_enabled:%d", userId), enabled, time.Duration(UserId2StatusCacheSeconds)*time.Second)
 		if err != nil {
 			common.SysError("Redis set user enabled error: " + err.Error())
 		}

model/channel.go

@@ -1,9 +1,8 @@
 package model
 
 import (
-	"one-api/common"
-
 	"gorm.io/gorm"
+	"one-api/common"
 )
 
 type Channel struct {
@@ -24,10 +23,6 @@ type Channel struct {
 	Group              string  `json:"group" gorm:"type:varchar(32);default:'default'"`
 	UsedQuota          int64   `json:"used_quota" gorm:"bigint;default:0"`
 	ModelMapping       string  `json:"model_mapping" gorm:"type:varchar(1024);default:''"`
-
-	// Additional fields, default value is false
-	EnableIpRandomization bool   `json:"enable_ip_randomization"`
-	CustomHttpHeaders     string `json:"custom_http_headers"`
 }
 
 func GetAllChannels(startIdx int, num int, selectAll bool) ([]*Channel, error) {

model/option.go

@@ -30,7 +30,6 @@ func InitOptionMap() {
 	common.OptionMap["PasswordRegisterEnabled"] = strconv.FormatBool(common.PasswordRegisterEnabled)
 	common.OptionMap["EmailVerificationEnabled"] = strconv.FormatBool(common.EmailVerificationEnabled)
 	common.OptionMap["GitHubOAuthEnabled"] = strconv.FormatBool(common.GitHubOAuthEnabled)
-	common.OptionMap["DiscordOAuthEnabled"] = strconv.FormatBool(common.DiscordOAuthEnabled)
 	common.OptionMap["WeChatAuthEnabled"] = strconv.FormatBool(common.WeChatAuthEnabled)
 	common.OptionMap["TurnstileCheckEnabled"] = strconv.FormatBool(common.TurnstileCheckEnabled)
 	common.OptionMap["RegisterEnabled"] = strconv.FormatBool(common.RegisterEnabled)
@@ -54,11 +53,6 @@ func InitOptionMap() {
 	common.OptionMap["ServerAddress"] = ""
 	common.OptionMap["GitHubClientId"] = ""
 	common.OptionMap["GitHubClientSecret"] = ""
-	common.OptionMap["DiscordClientId"] = ""
-	common.OptionMap["DiscordClientSecret"] = ""
-	common.OptionMap["DiscordGuildId"] = ""
-	common.OptionMap["DiscordBotToken"] = ""
-	common.OptionMap["DiscordAllowJoiningGuild"] = ""
 	common.OptionMap["WeChatServerAddress"] = ""
 	common.OptionMap["WeChatServerToken"] = ""
 	common.OptionMap["WeChatAccountQRCodeImageURL"] = ""
@@ -139,8 +133,6 @@ func updateOptionMap(key string, value string) (err error) {
 			common.PasswordLoginEnabled = boolValue
 		case "EmailVerificationEnabled":
 			common.EmailVerificationEnabled = boolValue
-		case "DiscordOAuthEnabled":
-			common.DiscordOAuthEnabled = boolValue
 		case "GitHubOAuthEnabled":
 			common.GitHubOAuthEnabled = boolValue
 		case "WeChatAuthEnabled":
@@ -179,16 +171,6 @@ func updateOptionMap(key string, value string) (err error) {
 		common.GitHubClientId = value
 	case "GitHubClientSecret":
 		common.GitHubClientSecret = value
-	case "DiscordClientId":
-		common.DiscordClientId = value
-	case "DiscordGuildId":
-		common.DiscordGuildId = value
-	case "DiscordBotToken":
-		common.DiscordBotToken = value
-	case "DiscordAllowJoiningGuild":
-		common.DiscordAllowJoiningGuild = value
-	case "DiscordClientSecret":
-		common.DiscordClientSecret = value
 	case "Footer":
 		common.Footer = value
 	case "SystemName":

model/redemption.go

@@ -51,20 +51,21 @@ func Redeem(key string, userId int) (quota int, err error) {
 	redemption := &Redemption{}
 
 	err = DB.Transaction(func(tx *gorm.DB) error {
-		err := DB.Where("`key` = ?", key).First(redemption).Error
+		err := tx.Set("gorm:query_option", "FOR UPDATE").Where("`key` = ?", key).First(redemption).Error
 		if err != nil {
 			return errors.New("无效的兑换码")
 		}
 		if redemption.Status != common.RedemptionCodeStatusEnabled {
 			return errors.New("该兑换码已被使用")
 		}
-		err = DB.Model(&User{}).Where("id = ?", userId).Update("quota", gorm.Expr("quota + ?", redemption.Quota)).Error
+		err = tx.Model(&User{}).Where("id = ?", userId).Update("quota", gorm.Expr("quota + ?", redemption.Quota)).Error
 		if err != nil {
 			return err
 		}
 		redemption.RedeemedTime = common.GetTimestamp()
 		redemption.Status = common.RedemptionCodeStatusUsed
-		return redemption.SelectUpdate()
+		err = tx.Save(redemption).Error
+		return err
 	})
 	if err != nil {
 		return 0, errors.New("兑换失败，" + err.Error())

model/token.go

@@ -3,9 +3,8 @@ package model
 import (
 	"errors"
 	"fmt"
-	"one-api/common"
-
 	"gorm.io/gorm"
+	"one-api/common"
 )
 
 type Token struct {
@@ -20,7 +19,6 @@ type Token struct {
 	RemainQuota    int    `json:"remain_quota" gorm:"default:0"`
 	UnlimitedQuota bool   `json:"unlimited_quota" gorm:"default:false"`
 	UsedQuota      int    `json:"used_quota" gorm:"default:0"` // used quota
-	Models         string `json:"models"`
 }
 
 func GetAllUserTokens(userId int, startIdx int, num int) ([]*Token, error) {
@@ -101,7 +99,7 @@ func (token *Token) Insert() error {
 // Update Make sure your token's fields is completed, because this will update non-zero values
 func (token *Token) Update() error {
 	var err error
-	err = DB.Model(token).Select("name", "status", "expired_time", "remain_quota", "unlimited_quota", "models").Updates(token).Error
+	err = DB.Model(token).Select("name", "status", "expired_time", "remain_quota", "unlimited_quota").Updates(token).Error
 	return err
 }
 

model/user.go

@@ -3,10 +3,9 @@ package model
 import (
 	"errors"
 	"fmt"
+	"gorm.io/gorm"
 	"one-api/common"
 	"strings"
-
-	"gorm.io/gorm"
 )
 
 // User if you add sensitive fields, don't forget to clean them in setupLogin function.
@@ -20,7 +19,6 @@ type User struct {
 	Status           int    `json:"status" gorm:"type:int;default:1"` // enabled, disabled
 	Email            string `json:"email" gorm:"index" validate:"max=50"`
 	GitHubId         string `json:"github_id" gorm:"column:github_id;index"`
-	DiscordId        string `json:"discord_id" gorm:"column:discord_id;index"`
 	WeChatId         string `json:"wechat_id" gorm:"column:wechat_id;index"`
 	VerificationCode string `json:"verification_code" gorm:"-:all"`                                    // this field is only for Email verification, don't save it to database!
 	AccessToken      string `json:"access_token" gorm:"type:char(32);column:access_token;uniqueIndex"` // this token is for system management
@@ -171,14 +169,6 @@ func (user *User) FillUserByGitHubId() error {
 	return nil
 }
 
-func (user *User) FillUserByDiscordId() error {
-	if user.DiscordId == "" {
-		return errors.New("Discord id 为空！")
-	}
-	DB.Where(User{DiscordId: user.DiscordId}).First(user)
-	return nil
-}
-
 func (user *User) FillUserByWeChatId() error {
 	if user.WeChatId == "" {
 		return errors.New("WeChat id 为空！")
@@ -207,10 +197,6 @@ func IsGitHubIdAlreadyTaken(githubId string) bool {
 	return DB.Where("github_id = ?", githubId).Find(&User{}).RowsAffected == 1
 }
 
-func IsDiscordIdAlreadyTaken(discordId string) bool {
-	return DB.Where("discord_id = ?", discordId).Find(&User{}).RowsAffected == 1
-}
-
 func IsUsernameAlreadyTaken(username string) bool {
 	return DB.Where("username = ?", username).Find(&User{}).RowsAffected == 1
 }

router/api-router.go

@@ -21,7 +21,6 @@ func SetApiRouter(router *gin.Engine) {
 		apiRouter.GET("/reset_password", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendPasswordResetEmail)
 		apiRouter.POST("/user/reset", middleware.CriticalRateLimit(), controller.ResetPassword)
 		apiRouter.GET("/oauth/github", middleware.CriticalRateLimit(), controller.GitHubOAuth)
-		apiRouter.GET("/oauth/discord", middleware.CriticalRateLimit(), controller.DiscordOAuth)
 		apiRouter.GET("/oauth/wechat", middleware.CriticalRateLimit(), controller.WeChatAuth)
 		apiRouter.GET("/oauth/wechat/bind", middleware.CriticalRateLimit(), middleware.UserAuth(), controller.WeChatBind)
 		apiRouter.GET("/oauth/email/bind", middleware.CriticalRateLimit(), middleware.UserAuth(), controller.EmailBind)
@@ -29,7 +28,7 @@ func SetApiRouter(router *gin.Engine) {
 		userRoute := apiRouter.Group("/user")
 		{
 			userRoute.POST("/register", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.Register)
-			userRoute.POST("/login", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.Login)
+			userRoute.POST("/login", middleware.CriticalRateLimit(), controller.Login)
 			userRoute.GET("/logout", controller.Logout)
 
 			selfRoute := userRoute.Group("/")
@@ -62,13 +61,11 @@ func SetApiRouter(router *gin.Engine) {
 			optionRoute.PUT("/", controller.UpdateOption)
 		}
 		channelRoute := apiRouter.Group("/channel")
-
-		channelRoute.Use(middleware.UserAuth()).GET("/models", controller.ListModels)
-
 		channelRoute.Use(middleware.AdminAuth())
 		{
 			channelRoute.GET("/", controller.GetAllChannels)
 			channelRoute.GET("/search", controller.SearchChannels)
+			channelRoute.GET("/models", controller.ListModels)
 			channelRoute.GET("/:id", controller.GetChannel)
 			channelRoute.GET("/test", controller.TestAllChannels)
 			channelRoute.GET("/test/:id", controller.TestChannel)
@@ -78,7 +75,6 @@ func SetApiRouter(router *gin.Engine) {
 			channelRoute.PUT("/", controller.UpdateChannel)
 			channelRoute.DELETE("/:id", controller.DeleteChannel)
 		}
-
 		tokenRoute := apiRouter.Group("/token")
 		tokenRoute.Use(middleware.UserAuth())
 		{

router/relay-router.go

@@ -12,7 +12,7 @@ func SetRelayRouter(router *gin.Engine) {
 	modelsRouter := router.Group("/v1/models")
 	modelsRouter.Use(middleware.TokenAuth())
 	{
-		modelsRouter.GET("/", controller.ListModels)
+		modelsRouter.GET("", controller.ListModels)
 		modelsRouter.GET("/:model", controller.RetrieveModel)
 	}
 	relayV1Router := router.Group("/v1")

web/.gitignore

@@ -22,4 +22,5 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 .idea
-yarn.lock
+package-lock.json
+yarn.lock

web/README.md

@@ -18,4 +18,4 @@ Before you start editing, make sure your `Actions on Save` options have `Optimiz
 ## Reference
 
 1. https://github.com/OIerDb-ng/OIerDb
-2. https://github.com/cornflourblue/react-hooks-redux-registration-login-example
+2. https://github.com/cornflourblue/react-hooks-redux-registration-login-example

web/package.json

@@ -3,19 +3,18 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "axios": "^1.4.0",
+    "axios": "^0.27.2",
     "history": "^5.3.0",
-    "marked": "^5.1.1",
+    "marked": "^4.1.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
-    "react-router-dom": "^6.14.2",
+    "react-router-dom": "^6.3.0",
     "react-scripts": "5.0.1",
-    "react-toastify": "^9.1.3",
-    "react-turnstile": "^1.1.1",
+    "react-toastify": "^9.0.8",
+    "react-turnstile": "^1.0.5",
     "semantic-ui-css": "^2.5.0",
-    "semantic-ui-react": "^2.1.4"
+    "semantic-ui-react": "^2.1.3"
   },
   "scripts": {
     "start": "react-scripts start",
@@ -42,7 +41,7 @@
     ]
   },
   "devDependencies": {
-    "prettier": "^3.0.0"
+    "prettier": "^2.7.1"
   },
   "prettier": {
     "singleQuote": true,

web/public/index.html

@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

web/src/App.js

@@ -12,7 +12,6 @@ import AddUser from './pages/User/AddUser';
 import { API, getLogo, getSystemName, showError, showNotice } from './helpers';
 import PasswordResetForm from './components/PasswordResetForm';
 import GitHubOAuth from './components/GitHubOAuth';
-import DiscordOAuth from './components/DiscordOAuth';
 import PasswordResetConfirm from './components/PasswordResetConfirm';
 import { UserContext } from './context/User';
 import { StatusContext } from './context/Status';
@@ -56,6 +55,15 @@ function App() {
       } else {
         localStorage.removeItem('chat_link');
       }
+      if (
+        data.version !== process.env.REACT_APP_VERSION &&
+        data.version !== 'v0.0.0' &&
+        process.env.REACT_APP_VERSION !== ''
+      ) {
+        showNotice(
+          `新版本可用：${data.version}，请使用快捷键 Shift + F5 刷新页面`
+        );
+      }
     } else {
       showError('无法正常连接至服务器！');
     }
@@ -231,14 +239,6 @@ function App() {
           </Suspense>
         }
       />
-      <Route
-        path='/oauth/discord'
-        element={
-          <Suspense fallback={<Loading></Loading>}>
-            <DiscordOAuth />
-          </Suspense>
-        }
-      />
       <Route
         path='/setting'
         element={
@@ -252,11 +252,11 @@ function App() {
       <Route
         path='/topup'
         element={
-          <PrivateRoute>
-            <Suspense fallback={<Loading></Loading>}>
-              <TopUp />
-            </Suspense>
-          </PrivateRoute>
+        <PrivateRoute>
+          <Suspense fallback={<Loading></Loading>}>
+            <TopUp />
+          </Suspense>
+        </PrivateRoute>
         }
       />
       <Route

web/src/components/ChannelsTable.js

@@ -1,43 +1,30 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Label,
-  Pagination,
-  Popup,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Form, Label, Pagination, Popup, Table } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
-import {
-  API,
-  showError,
-  showInfo,
-  showSuccess,
-  timestamp2string,
-} from '../helpers';
+import { API, showError, showInfo, showSuccess, timestamp2string } from '../helpers';
 
 import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants';
 import { renderGroup, renderNumber } from '../helpers/render';
 
 function renderTimestamp(timestamp) {
-  return <>{timestamp2string(timestamp)}</>;
+  return (
+    <>
+      {timestamp2string(timestamp)}
+    </>
+  );
 }
 
 let type2label = undefined;
 
 function renderType(type) {
   if (!type2label) {
-    type2label = new Map();
+    type2label = new Map;
     for (let i = 0; i < CHANNEL_OPTIONS.length; i++) {
       type2label[CHANNEL_OPTIONS[i].value] = CHANNEL_OPTIONS[i];
     }
     type2label[0] = { value: 0, text: '未知类型', color: 'grey' };
   }
-  return (
-    <Label basic color={type2label[type].color}>
-      {type2label[type].text}
-    </Label>
-  );
+  return <Label basic color={type2label[type].color}>{type2label[type].text}</Label>;
 }
 
 function renderBalance(type, balance) {
@@ -145,11 +132,7 @@ const ChannelsTable = () => {
   const renderStatus = (status) => {
     switch (status) {
       case 1:
-        return (
-          <Label basic color='green'>
-            已启用
-          </Label>
-        );
+        return <Label basic color='green'>已启用</Label>;
       case 2:
         return (
           <Label basic color='red'>
@@ -169,35 +152,15 @@ const ChannelsTable = () => {
     let time = responseTime / 1000;
     time = time.toFixed(2) + ' 秒';
     if (responseTime === 0) {
-      return (
-        <Label basic color='grey'>
-          未测试
-        </Label>
-      );
+      return <Label basic color='grey'>未测试</Label>;
     } else if (responseTime <= 1000) {
-      return (
-        <Label basic color='green'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='green'>{time}</Label>;
     } else if (responseTime <= 3000) {
-      return (
-        <Label basic color='olive'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='olive'>{time}</Label>;
     } else if (responseTime <= 5000) {
-      return (
-        <Label basic color='yellow'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='yellow'>{time}</Label>;
     } else {
-      return (
-        <Label basic color='red'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='red'>{time}</Label>;
     }
   };
 
@@ -379,7 +342,7 @@ const ChannelsTable = () => {
           {channels
             .slice(
               (activePage - 1) * ITEMS_PER_PAGE,
-              activePage * ITEMS_PER_PAGE,
+              activePage * ITEMS_PER_PAGE
             )
             .map((channel, idx) => {
               if (channel.deleted) return <></>;
@@ -392,11 +355,7 @@ const ChannelsTable = () => {
                   <Table.Cell>{renderStatus(channel.status)}</Table.Cell>
                   <Table.Cell>
                     <Popup
-                      content={
-                        channel.test_time
-                          ? renderTimestamp(channel.test_time)
-                          : '未测试'
-                      }
+                      content={channel.test_time ? renderTimestamp(channel.test_time) : '未测试'}
                       key={channel.id}
                       trigger={renderResponseTime(channel.response_time)}
                       basic
@@ -404,11 +363,7 @@ const ChannelsTable = () => {
                   </Table.Cell>
                   <Table.Cell>
                     <Popup
-                      content={
-                        channel.balance_updated_time
-                          ? renderTimestamp(channel.balance_updated_time)
-                          : '未更新'
-                      }
+                      content={channel.balance_updated_time ? renderTimestamp(channel.balance_updated_time) : '未更新'}
                       key={channel.id}
                       trigger={renderBalance(channel.type, channel.balance)}
                       basic
@@ -460,7 +415,7 @@ const ChannelsTable = () => {
                           manageChannel(
                             channel.id,
                             channel.status === 1 ? 'disable' : 'enable',
-                            idx,
+                            idx
                           );
                         }}
                       >
@@ -483,24 +438,14 @@ const ChannelsTable = () => {
         <Table.Footer>
           <Table.Row>
             <Table.HeaderCell colSpan='8'>
-              <Button
-                size='small'
-                as={Link}
-                to='/channel/add'
-                loading={loading}
-              >
+              <Button size='small' as={Link} to='/channel/add' loading={loading}>
                 添加新的渠道
               </Button>
               <Button size='small' loading={loading} onClick={testAllChannels}>
                 测试所有已启用通道
               </Button>
-              <Button
-                size='small'
-                onClick={updateAllChannelsBalance}
-                loading={loading || updatingBalance}
-              >
-                更新所有已启用通道余额
-              </Button>
+              <Button size='small' onClick={updateAllChannelsBalance}
+                      loading={loading || updatingBalance}>更新所有已启用通道余额</Button>
               <Pagination
                 floated='right'
                 activePage={activePage}
@@ -512,9 +457,7 @@ const ChannelsTable = () => {
                   (channels.length % ITEMS_PER_PAGE === 0 ? 1 : 0)
                 }
               />
-              <Button size='small' onClick={refresh} loading={loading}>
-                刷新
-              </Button>
+              <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
             </Table.HeaderCell>
           </Table.Row>
         </Table.Footer>

web/src/components/DiscordOAuth.js

@@ -1,57 +0,0 @@
-import React, { useContext, useEffect, useState } from 'react';
-import { Dimmer, Loader, Segment } from 'semantic-ui-react';
-import { useNavigate, useSearchParams } from 'react-router-dom';
-import { API, showError, showSuccess } from '../helpers';
-import { UserContext } from '../context/User';
-
-const DiscordOAuth = () => {
-  const [searchParams, setSearchParams] = useSearchParams();
-
-  const [userState, userDispatch] = useContext(UserContext);
-  const [prompt, setPrompt] = useState('处理中...');
-  const [processing, setProcessing] = useState(true);
-
-  let navigate = useNavigate();
-
-  const sendCode = async (code, count) => {
-    const res = await API.get(`/api/oauth/discord?code=${code}`);
-    const { success, message, data } = res.data;
-    if (success) {
-      if (message === 'bind') {
-        showSuccess('绑定成功！');
-        navigate('/setting');
-      } else {
-        userDispatch({ type: 'login', payload: data });
-        localStorage.setItem('user', JSON.stringify(data));
-        showSuccess('登录成功！');
-        navigate('/');
-      }
-    } else {
-      showError(message);
-      if (count === 0) {
-        setPrompt(`操作失败，重定向至登录界面中...`);
-        navigate('/setting'); // in case this is failed to bind GitHub
-        return;
-      }
-      count++;
-      setPrompt(`出现错误，第 ${count} 次重试中...`);
-      await new Promise((resolve) => setTimeout(resolve, count * 2000));
-      await sendCode(code, count);
-    }
-  };
-
-  useEffect(() => {
-    let code = searchParams.get('code');
-    sendCode(code, 0).then();
-  }, []);
-
-  return (
-    <Segment style={{ minHeight: '300px' }}>
-      <Dimmer active inverted>
-        <Loader size='large'>{prompt}</Loader>
-      </Dimmer>
-    </Segment>
-  );
-};
-
-export default DiscordOAuth;

web/src/components/Footer.js

@@ -37,7 +37,10 @@ const Footer = () => {
           ></div>
         ) : (
           <div className='custom-footer'>
-            <a href='https://github.com/songquanpeng/one-api' target='_blank'>
+            <a
+              href='https://github.com/songquanpeng/one-api'
+              target='_blank'
+            >
               {systemName} {process.env.REACT_APP_VERSION}{' '}
             </a>
             由{' '}

web/src/components/Header.js

@@ -2,22 +2,8 @@ import React, { useContext, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { UserContext } from '../context/User';
 
-import {
-  Button,
-  Container,
-  Dropdown,
-  Icon,
-  Menu,
-  Segment,
-} from 'semantic-ui-react';
-import {
-  API,
-  getLogo,
-  getSystemName,
-  isAdmin,
-  isMobile,
-  showSuccess,
-} from '../helpers';
+import { Button, Container, Dropdown, Icon, Menu, Segment } from 'semantic-ui-react';
+import { API, getLogo, getSystemName, isAdmin, isMobile, showSuccess } from '../helpers';
 import '../index.css';
 
 // Header Buttons
@@ -25,58 +11,58 @@ let headerButtons = [
   {
     name: '首页',
     to: '/',
-    icon: 'home',
+    icon: 'home'
   },
   {
     name: '渠道',
     to: '/channel',
     icon: 'sitemap',
-    admin: true,
+    admin: true
   },
   {
     name: '令牌',
     to: '/token',
-    icon: 'key',
+    icon: 'key'
   },
   {
     name: '兑换',
     to: '/redemption',
     icon: 'dollar sign',
-    admin: true,
+    admin: true
   },
   {
     name: '充值',
     to: '/topup',
-    icon: 'cart',
+    icon: 'cart'
   },
   {
     name: '用户',
     to: '/user',
     icon: 'user',
-    admin: true,
+    admin: true
   },
   {
     name: '日志',
     to: '/log',
-    icon: 'book',
+    icon: 'book'
   },
   {
     name: '设置',
     to: '/setting',
-    icon: 'setting',
+    icon: 'setting'
   },
   {
     name: '关于',
     to: '/about',
-    icon: 'info circle',
-  },
+    icon: 'info circle'
+  }
 ];
 
 if (localStorage.getItem('chat_link')) {
   headerButtons.splice(1, 0, {
     name: '聊天',
     to: '/chat',
-    icon: 'comments',
+    icon: 'comments'
   });
 }
 
@@ -134,17 +120,21 @@ const Header = () => {
           style={
             showSidebar
               ? {
-                  borderBottom: 'none',
-                  marginBottom: '0',
-                  borderTop: 'none',
-                  height: '51px',
-                }
+                borderBottom: 'none',
+                marginBottom: '0',
+                borderTop: 'none',
+                height: '51px'
+              }
               : { borderTop: 'none', height: '52px' }
           }
         >
           <Container>
             <Menu.Item as={Link} to='/'>
-              <img src={logo} alt='logo' style={{ marginRight: '0.75em' }} />
+              <img
+                src={logo}
+                alt='logo'
+                style={{ marginRight: '0.75em' }}
+              />
               <div style={{ fontSize: '20px' }}>
                 <b>{systemName}</b>
               </div>

web/src/components/LoginForm.js

@@ -1,35 +1,20 @@
 import React, { useContext, useEffect, useState } from 'react';
-import {
-  Button,
-  Divider,
-  Form,
-  Grid,
-  Header,
-  Image,
-  Message,
-  Modal,
-  Segment,
-} from 'semantic-ui-react';
+import { Button, Divider, Form, Grid, Header, Image, Message, Modal, Segment } from 'semantic-ui-react';
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import { UserContext } from '../context/User';
-import { API, getLogo, showError, showSuccess, showInfo } from '../helpers';
-import Turnstile from 'react-turnstile';
+import { API, getLogo, showError, showSuccess } from '../helpers';
 
 const LoginForm = () => {
   const [inputs, setInputs] = useState({
     username: '',
     password: '',
-    wechat_verification_code: '',
+    wechat_verification_code: ''
   });
   const [searchParams, setSearchParams] = useSearchParams();
   const [submitted, setSubmitted] = useState(false);
   const { username, password } = inputs;
   const [userState, userDispatch] = useContext(UserContext);
-  const [turnstileEnabled, setTurnstileEnabled] = useState(false);
-  const [turnstileSiteKey, setTurnstileSiteKey] = useState('');
-  const [turnstileToken, setTurnstileToken] = useState('');
   let navigate = useNavigate();
-
   const [status, setStatus] = useState({});
   const logo = getLogo();
 
@@ -41,11 +26,6 @@ const LoginForm = () => {
     if (status) {
       status = JSON.parse(status);
       setStatus(status);
-
-      if (status.turnstile_check) {
-        setTurnstileEnabled(true);
-        setTurnstileSiteKey(status.turnstile_site_key);
-      }
     }
   }, []);
 
@@ -53,13 +33,7 @@ const LoginForm = () => {
 
   const onGitHubOAuthClicked = () => {
     window.open(
-      `https://github.com/login/oauth/authorize?client_id=${status.github_client_id}&scope=user:email`,
-    );
-  };
-
-  const onDiscordOAuthClicked = () => {
-    window.open(
-      `https://discord.com/oauth2/authorize?response_type=code&client_id=${status.discord_client_id}&redirect_uri=${window.location.origin}/oauth/discord&scope=identify%20guilds%20email%20guilds.join`,
+      `https://github.com/login/oauth/authorize?client_id=${status.github_client_id}&scope=user:email`
     );
   };
 
@@ -69,7 +43,7 @@ const LoginForm = () => {
 
   const onSubmitWeChatVerificationCode = async () => {
     const res = await API.get(
-      `/api/oauth/wechat?code=${inputs.wechat_verification_code}`,
+      `/api/oauth/wechat?code=${inputs.wechat_verification_code}`
     );
     const { success, message, data } = res.data;
     if (success) {
@@ -91,18 +65,10 @@ const LoginForm = () => {
   async function handleSubmit(e) {
     setSubmitted(true);
     if (username && password) {
-      if (turnstileEnabled && turnstileToken === '') {
-        showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
-        return;
-      }
-
-      const res = await API.post(
-        `/api/user/login?turnstile=${turnstileToken}`,
-        {
-          username,
-          password,
-        },
-      );
+      const res = await API.post(`/api/user/login`, {
+        username,
+        password
+      });
       const { success, message, data } = res.data;
       if (success) {
         userDispatch({ type: 'login', payload: data });
@@ -142,17 +108,7 @@ const LoginForm = () => {
               value={password}
               onChange={handleChange}
             />
-            {turnstileEnabled ? (
-              <Turnstile
-                sitekey={turnstileSiteKey}
-                onVerify={(token) => {
-                  setTurnstileToken(token);
-                }}
-              />
-            ) : (
-              <></>
-            )}
-            <Button color='' fluid size='large' onClick={handleSubmit}>
+            <Button color='green' fluid size='large' onClick={handleSubmit}>
               登录
             </Button>
           </Segment>
@@ -167,32 +123,28 @@ const LoginForm = () => {
             点击注册
           </Link>
         </Message>
-        {status.github_oauth || status.wechat_login || status.discord_oauth ? (
+        {status.github_oauth || status.wechat_login ? (
           <>
             <Divider horizontal>Or</Divider>
-            {status.discord_oauth && (
-              <Button
-                circular
-                color='blue'
-                icon='discord'
-                onClick={onDiscordOAuthClicked}
-              />
-            )}
-            {status.github_oauth && (
+            {status.github_oauth ? (
               <Button
                 circular
                 color='black'
                 icon='github'
                 onClick={onGitHubOAuthClicked}
               />
+            ) : (
+              <></>
             )}
-            {status.wechat_login && (
+            {status.wechat_login ? (
               <Button
                 circular
                 color='green'
                 icon='wechat'
                 onClick={onWeChatLoginClicked}
               />
+            ) : (
+              <></>
             )}
           </>
         ) : (

web/src/components/LogsTable.js

@@ -1,26 +1,21 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Header,
-  Label,
-  Pagination,
-  Segment,
-  Select,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Form, Header, Label, Pagination, Segment, Select, Table } from 'semantic-ui-react';
 import { API, isAdmin, showError, timestamp2string } from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderQuota } from '../helpers/render';
 
 function renderTimestamp(timestamp) {
-  return <>{timestamp2string(timestamp)}</>;
+  return (
+    <>
+      {timestamp2string(timestamp)}
+    </>
+  );
 }
 
 const MODE_OPTIONS = [
   { key: 'all', text: '全部用户', value: 'all' },
-  { key: 'self', text: '当前用户', value: 'self' },
+  { key: 'self', text: '当前用户', value: 'self' }
 ];
 
 const LOG_OPTIONS = [
@@ -28,46 +23,21 @@ const LOG_OPTIONS = [
   { key: '1', text: '充值', value: 1 },
   { key: '2', text: '消费', value: 2 },
   { key: '3', text: '管理', value: 3 },
-  { key: '4', text: '系统', value: 4 },
+  { key: '4', text: '系统', value: 4 }
 ];
 
 function renderType(type) {
   switch (type) {
     case 1:
-      return (
-        <Label basic color='green'>
-          {' '}
-          充值{' '}
-        </Label>
-      );
+      return <Label basic color='green'> 充值 </Label>;
     case 2:
-      return (
-        <Label basic color='olive'>
-          {' '}
-          消费{' '}
-        </Label>
-      );
+      return <Label basic color='olive'> 消费 </Label>;
     case 3:
-      return (
-        <Label basic color='orange'>
-          {' '}
-          管理{' '}
-        </Label>
-      );
+      return <Label basic color='orange'> 管理 </Label>;
     case 4:
-      return (
-        <Label basic color='purple'>
-          {' '}
-          系统{' '}
-        </Label>
-      );
+      return <Label basic color='purple'> 系统 </Label>;
     default:
-      return (
-        <Label basic color='black'>
-          {' '}
-          未知{' '}
-        </Label>
-      );
+      return <Label basic color='black'> 未知 </Label>;
   }
 }
 
@@ -85,14 +55,13 @@ const LogsTable = () => {
     token_name: '',
     model_name: '',
     start_timestamp: timestamp2string(0),
-    end_timestamp: timestamp2string(now.getTime() / 1000 + 3600),
+    end_timestamp: timestamp2string(now.getTime() / 1000 + 3600)
   });
-  const { username, token_name, model_name, start_timestamp, end_timestamp } =
-    inputs;
+  const { username, token_name, model_name, start_timestamp, end_timestamp } = inputs;
 
   const [stat, setStat] = useState({
     quota: 0,
-    token: 0,
+    token: 0
   });
 
   const handleInputChange = (e, { name, value }) => {
@@ -102,9 +71,7 @@ const LogsTable = () => {
   const getLogSelfStat = async () => {
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
     let localEndTimestamp = Date.parse(end_timestamp) / 1000;
-    let res = await API.get(
-      `/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`,
-    );
+    let res = await API.get(`/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`);
     const { success, message, data } = res.data;
     if (success) {
       setStat(data);
@@ -116,9 +83,7 @@ const LogsTable = () => {
   const getLogStat = async () => {
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
     let localEndTimestamp = Date.parse(end_timestamp) / 1000;
-    let res = await API.get(
-      `/api/log/stat?type=${logType}&username=${username}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`,
-    );
+    let res = await API.get(`/api/log/stat?type=${logType}&username=${username}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`);
     const { success, message, data } = res.data;
     if (success) {
       setStat(data);
@@ -164,7 +129,7 @@ const LogsTable = () => {
 
   const refresh = async () => {
     setLoading(true);
-    setActivePage(1);
+    setActivePage(1)
     await loadLogs(0);
     if (isAdminUser) {
       getLogStat().then();
@@ -204,7 +169,7 @@ const LogsTable = () => {
     if (logs.length === 0) return;
     setLoading(true);
     let sortedLogs = [...logs];
-    if (typeof sortedLogs[0][key] === 'string') {
+    if (typeof sortedLogs[0][key] === 'string'){
       sortedLogs.sort((a, b) => {
         return ('' + a[key]).localeCompare(b[key]);
       });
@@ -225,61 +190,28 @@ const LogsTable = () => {
   return (
     <>
       <Segment>
-        <Header as='h3'>
-          使用明细（总消耗额度：{renderQuota(stat.quota)}）
-        </Header>
+        <Header as='h3'>使用明细（总消耗额度：{renderQuota(stat.quota)}）</Header>
         <Form>
           <Form.Group>
-            {isAdminUser && (
-              <Form.Input
-                fluid
-                label={'用户名称'}
-                width={2}
-                value={username}
-                placeholder={'可选值'}
-                name='username'
-                onChange={handleInputChange}
-              />
-            )}
-            <Form.Input
-              fluid
-              label={'令牌名称'}
-              width={isAdminUser ? 2 : 3}
-              value={token_name}
-              placeholder={'可选值'}
-              name='token_name'
-              onChange={handleInputChange}
-            />
-            <Form.Input
-              fluid
-              label='模型名称'
-              width={isAdminUser ? 2 : 3}
-              value={model_name}
-              placeholder='可选值'
-              name='model_name'
-              onChange={handleInputChange}
-            />
-            <Form.Input
-              fluid
-              label='起始时间'
-              width={4}
-              value={start_timestamp}
-              type='datetime-local'
-              name='start_timestamp'
-              onChange={handleInputChange}
-            />
-            <Form.Input
-              fluid
-              label='结束时间'
-              width={4}
-              value={end_timestamp}
-              type='datetime-local'
-              name='end_timestamp'
-              onChange={handleInputChange}
-            />
-            <Form.Button fluid label='操作' width={2} onClick={refresh}>
-              查询
-            </Form.Button>
+            {
+              isAdminUser && (
+                <Form.Input fluid label={'用户名称'} width={2} value={username}
+                            placeholder={'可选值'} name='username'
+                            onChange={handleInputChange} />
+              )
+            }
+            <Form.Input fluid label={'令牌名称'} width={isAdminUser ? 2 : 3} value={token_name}
+                        placeholder={'可选值'} name='token_name' onChange={handleInputChange} />
+            <Form.Input fluid label='模型名称' width={isAdminUser ? 2 : 3} value={model_name} placeholder='可选值'
+                        name='model_name'
+                        onChange={handleInputChange} />
+            <Form.Input fluid label='起始时间' width={4} value={start_timestamp} type='datetime-local'
+                        name='start_timestamp'
+                        onChange={handleInputChange} />
+            <Form.Input fluid label='结束时间' width={4} value={end_timestamp} type='datetime-local'
+                        name='end_timestamp'
+                        onChange={handleInputChange} />
+            <Form.Button fluid label='操作' width={2} onClick={refresh}>查询</Form.Button>
           </Form.Group>
         </Form>
         <Table basic compact size='small'>
@@ -294,8 +226,8 @@ const LogsTable = () => {
               >
                 时间
               </Table.HeaderCell>
-              {isAdminUser && (
-                <Table.HeaderCell
+              {
+                isAdminUser && <Table.HeaderCell
                   style={{ cursor: 'pointer' }}
                   onClick={() => {
                     sortLog('username');
@@ -304,7 +236,7 @@ const LogsTable = () => {
                 >
                   用户
                 </Table.HeaderCell>
-              )}
+              }
               <Table.HeaderCell
                 style={{ cursor: 'pointer' }}
                 onClick={() => {
@@ -375,42 +307,24 @@ const LogsTable = () => {
             {logs
               .slice(
                 (activePage - 1) * ITEMS_PER_PAGE,
-                activePage * ITEMS_PER_PAGE,
+                activePage * ITEMS_PER_PAGE
               )
               .map((log, idx) => {
                 if (log.deleted) return <></>;
                 return (
                   <Table.Row key={log.created_at}>
                     <Table.Cell>{renderTimestamp(log.created_at)}</Table.Cell>
-                    {isAdminUser && (
-                      <Table.Cell>
-                        {log.username ? <Label>{log.username}</Label> : ''}
-                      </Table.Cell>
-                    )}
-                    <Table.Cell>
-                      {log.token_name ? (
-                        <Label basic>{log.token_name}</Label>
-                      ) : (
-                        ''
-                      )}
-                    </Table.Cell>
+                    {
+                      isAdminUser && (
+                        <Table.Cell>{log.username ? <Label>{log.username}</Label> : ''}</Table.Cell>
+                      )
+                    }
+                    <Table.Cell>{log.token_name ? <Label basic>{log.token_name}</Label> : ''}</Table.Cell>
                     <Table.Cell>{renderType(log.type)}</Table.Cell>
-                    <Table.Cell>
-                      {log.model_name ? (
-                        <Label basic>{log.model_name}</Label>
-                      ) : (
-                        ''
-                      )}
-                    </Table.Cell>
-                    <Table.Cell>
-                      {log.prompt_tokens ? log.prompt_tokens : ''}
-                    </Table.Cell>
-                    <Table.Cell>
-                      {log.completion_tokens ? log.completion_tokens : ''}
-                    </Table.Cell>
-                    <Table.Cell>
-                      {log.quota ? renderQuota(log.quota, 6) : ''}
-                    </Table.Cell>
+                    <Table.Cell>{log.model_name ? <Label basic>{log.model_name}</Label> : ''}</Table.Cell>
+                    <Table.Cell>{log.prompt_tokens ? log.prompt_tokens : ''}</Table.Cell>
+                    <Table.Cell>{log.completion_tokens ? log.completion_tokens : ''}</Table.Cell>
+                    <Table.Cell>{log.quota ? renderQuota(log.quota, 6) : ''}</Table.Cell>
                     <Table.Cell>{log.content}</Table.Cell>
                   </Table.Row>
                 );
@@ -430,9 +344,7 @@ const LogsTable = () => {
                     setLogType(value);
                   }}
                 />
-                <Button size='small' onClick={refresh} loading={loading}>
-                  刷新
-                </Button>
+                <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
                 <Pagination
                   floated='right'
                   activePage={activePage}

web/src/components/OperationSetting.js

@@ -54,7 +54,7 @@ const OperationSetting = () => {
     }
     const res = await API.put('/api/option/', {
       key,
-      value,
+      value
     });
     const { success, message } = res.data;
     if (success) {
@@ -76,22 +76,11 @@ const OperationSetting = () => {
   const submitConfig = async (group) => {
     switch (group) {
       case 'monitor':
-        if (
-          originInputs['ChannelDisableThreshold'] !==
-          inputs.ChannelDisableThreshold
-        ) {
-          await updateOption(
-            'ChannelDisableThreshold',
-            inputs.ChannelDisableThreshold,
-          );
+        if (originInputs['ChannelDisableThreshold'] !== inputs.ChannelDisableThreshold) {
+          await updateOption('ChannelDisableThreshold', inputs.ChannelDisableThreshold);
         }
-        if (
-          originInputs['QuotaRemindThreshold'] !== inputs.QuotaRemindThreshold
-        ) {
-          await updateOption(
-            'QuotaRemindThreshold',
-            inputs.QuotaRemindThreshold,
-          );
+        if (originInputs['QuotaRemindThreshold'] !== inputs.QuotaRemindThreshold) {
+          await updateOption('QuotaRemindThreshold', inputs.QuotaRemindThreshold);
         }
         break;
       case 'ratio':
@@ -145,7 +134,9 @@ const OperationSetting = () => {
     <Grid columns={1}>
       <Grid.Column>
         <Form loading={loading}>
-          <Header as='h3'>通用设置</Header>
+          <Header as='h3'>
+            通用设置
+          </Header>
           <Form.Group widths={4}>
             <Form.Input
               label='充值链接'
@@ -213,15 +204,13 @@ const OperationSetting = () => {
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('general').then();
-            }}
-          >
-            保存通用设置
-          </Form.Button>
+          <Form.Button onClick={() => {
+            submitConfig('general').then();
+          }}>保存通用设置</Form.Button>
           <Divider />
-          <Header as='h3'>监控设置</Header>
+          <Header as='h3'>
+            监控设置
+          </Header>
           <Form.Group widths={3}>
             <Form.Input
               label='最长响应时间'
@@ -252,15 +241,13 @@ const OperationSetting = () => {
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('monitor').then();
-            }}
-          >
-            保存监控设置
-          </Form.Button>
+          <Form.Button onClick={() => {
+            submitConfig('monitor').then();
+          }}>保存监控设置</Form.Button>
           <Divider />
-          <Header as='h3'>额度设置</Header>
+          <Header as='h3'>
+            额度设置
+          </Header>
           <Form.Group widths={4}>
             <Form.Input
               label='新用户初始额度'
@@ -303,15 +290,13 @@ const OperationSetting = () => {
               placeholder='例如：1000'
             />
           </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('quota').then();
-            }}
-          >
-            保存额度设置
-          </Form.Button>
+          <Form.Button onClick={() => {
+            submitConfig('quota').then();
+          }}>保存额度设置</Form.Button>
           <Divider />
-          <Header as='h3'>倍率设置</Header>
+          <Header as='h3'>
+            倍率设置
+          </Header>
           <Form.Group widths='equal'>
             <Form.TextArea
               label='模型倍率'
@@ -334,13 +319,9 @@ const OperationSetting = () => {
               placeholder='为一个 JSON 文本，键为分组名称，值为倍率'
             />
           </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('ratio').then();
-            }}
-          >
-            保存倍率设置
-          </Form.Button>
+          <Form.Button onClick={() => {
+            submitConfig('ratio').then();
+          }}>保存倍率设置</Form.Button>
         </Form>
       </Grid.Column>
     </Grid>

web/src/components/OtherSetting.js

@@ -1,13 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Divider,
-  Form,
-  Grid,
-  Header,
-  Message,
-  Modal,
-} from 'semantic-ui-react';
+import { Button, Divider, Form, Grid, Header, Message, Modal } from 'semantic-ui-react';
 import { API, showError, showSuccess } from '../helpers';
 import { marked } from 'marked';
 
@@ -18,13 +10,13 @@ const OtherSetting = () => {
     About: '',
     SystemName: '',
     Logo: '',
-    HomePageContent: '',
+    HomePageContent: ''
   });
   let [loading, setLoading] = useState(false);
   const [showUpdateModal, setShowUpdateModal] = useState(false);
   const [updateData, setUpdateData] = useState({
     tag_name: '',
-    content: '',
+    content: ''
   });
 
   const getOptions = async () => {
@@ -51,7 +43,7 @@ const OtherSetting = () => {
     setLoading(true);
     const res = await API.put('/api/option/', {
       key,
-      value,
+      value
     });
     const { success, message } = res.data;
     if (success) {
@@ -91,12 +83,13 @@ const OtherSetting = () => {
   };
 
   const openGitHubRelease = () => {
-    window.location = 'https://github.com/songquanpeng/one-api/releases/latest';
+    window.location =
+      'https://github.com/songquanpeng/one-api/releases/latest';
   };
 
   const checkUpdate = async () => {
     const res = await API.get(
-      'https://api.github.com/repos/songquanpeng/one-api/releases/latest',
+      'https://api.github.com/repos/songquanpeng/one-api/releases/latest'
     );
     const { tag_name, body } = res.data;
     if (tag_name === process.env.REACT_APP_VERSION) {
@@ -104,7 +97,7 @@ const OtherSetting = () => {
     } else {
       setUpdateData({
         tag_name: tag_name,
-        content: marked.parse(body),
+        content: marked.parse(body)
       });
       setShowUpdateModal(true);
     }
@@ -160,9 +153,7 @@ const OtherSetting = () => {
               style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
             />
           </Form.Group>
-          <Form.Button onClick={() => submitOption('HomePageContent')}>
-            保存首页内容
-          </Form.Button>
+          <Form.Button onClick={() => submitOption('HomePageContent')}>保存首页内容</Form.Button>
           <Form.Group widths='equal'>
             <Form.TextArea
               label='关于'
@@ -174,10 +165,7 @@ const OtherSetting = () => {
             />
           </Form.Group>
           <Form.Button onClick={submitAbout}>保存关于</Form.Button>
-          <Message>
-            移除 One API
-            的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目。
-          </Message>
+          <Message>移除 One API 的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目。</Message>
           <Form.Group widths='equal'>
             <Form.Input
               label='页脚'

web/src/components/PasswordResetConfirm.js

@@ -1,13 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Form, Grid, Header, Image, Segment } from 'semantic-ui-react';
-import {
-  API,
-  copy,
-  showError,
-  showInfo,
-  showNotice,
-  showSuccess,
-} from '../helpers';
+import { API, copy, showError, showInfo, showNotice, showSuccess } from '../helpers';
 import { useSearchParams } from 'react-router-dom';
 
 const PasswordResetConfirm = () => {
@@ -19,6 +12,11 @@ const PasswordResetConfirm = () => {
 
   const [loading, setLoading] = useState(false);
 
+  const [disableButton, setDisableButton] = useState(false);
+  const [countdown, setCountdown] = useState(30);
+
+  const [newPassword, setNewPassword] = useState('');
+
   const [searchParams, setSearchParams] = useSearchParams();
   useEffect(() => {
     let token = searchParams.get('token');
@@ -29,7 +27,21 @@ const PasswordResetConfirm = () => {
     });
   }, []);
 
+  useEffect(() => {
+    let countdownInterval = null;
+    if (disableButton && countdown > 0) {
+      countdownInterval = setInterval(() => {
+        setCountdown(countdown - 1);
+      }, 1000);
+    } else if (countdown === 0) {
+      setDisableButton(false);
+      setCountdown(30);
+    }
+    return () => clearInterval(countdownInterval); 
+  }, [disableButton, countdown]);
+
   async function handleSubmit(e) {
+    setDisableButton(true);
     if (!email) return;
     setLoading(true);
     const res = await API.post(`/api/user/reset`, {
@@ -39,14 +51,15 @@ const PasswordResetConfirm = () => {
     const { success, message } = res.data;
     if (success) {
       let password = res.data.data;
+      setNewPassword(password);
       await copy(password);
-      showNotice(`密码已重置并已复制到剪贴板：${password}`);
+      showNotice(`新密码已复制到剪贴板：${password}`);
     } else {
       showError(message);
     }
     setLoading(false);
   }
-
+  
   return (
     <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
@@ -64,20 +77,37 @@ const PasswordResetConfirm = () => {
               value={email}
               readOnly
             />
+            {newPassword && (
+              <Form.Input
+              fluid
+              icon='lock'
+              iconPosition='left'
+              placeholder='新密码'
+              name='newPassword'
+              value={newPassword}
+              readOnly
+              onClick={(e) => {
+                e.target.select();
+                navigator.clipboard.writeText(newPassword);
+                showNotice(`密码已复制到剪贴板：${newPassword}`);
+              }}
+            />            
+            )}
             <Button
-              color=''
+              color='green'
               fluid
               size='large'
               onClick={handleSubmit}
               loading={loading}
+              disabled={disableButton}
             >
-              提交
+              {disableButton ? `密码重置完成` : '提交'}
             </Button>
           </Segment>
         </Form>
       </Grid.Column>
     </Grid>
-  );
+  );  
 };
 
 export default PasswordResetConfirm;

web/src/components/PasswordResetForm.js

@@ -5,7 +5,7 @@ import Turnstile from 'react-turnstile';
 
 const PasswordResetForm = () => {
   const [inputs, setInputs] = useState({
-    email: '',
+    email: ''
   });
   const { email } = inputs;
 
@@ -13,24 +13,29 @@ const PasswordResetForm = () => {
   const [turnstileEnabled, setTurnstileEnabled] = useState(false);
   const [turnstileSiteKey, setTurnstileSiteKey] = useState('');
   const [turnstileToken, setTurnstileToken] = useState('');
+  const [disableButton, setDisableButton] = useState(false);
+  const [countdown, setCountdown] = useState(30);
 
   useEffect(() => {
-    let status = localStorage.getItem('status');
-    if (status) {
-      status = JSON.parse(status);
-      if (status.turnstile_check) {
-        setTurnstileEnabled(true);
-        setTurnstileSiteKey(status.turnstile_site_key);
-      }
+    let countdownInterval = null;
+    if (disableButton && countdown > 0) {
+      countdownInterval = setInterval(() => {
+        setCountdown(countdown - 1);
+      }, 1000);
+    } else if (countdown === 0) {
+      setDisableButton(false);
+      setCountdown(30);
     }
-  }, []);
+    return () => clearInterval(countdownInterval);
+  }, [disableButton, countdown]);
 
   function handleChange(e) {
     const { name, value } = e.target;
-    setInputs((inputs) => ({ ...inputs, [name]: value }));
+    setInputs(inputs => ({ ...inputs, [name]: value }));
   }
 
   async function handleSubmit(e) {
+    setDisableButton(true);
     if (!email) return;
     if (turnstileEnabled && turnstileToken === '') {
       showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
@@ -38,7 +43,7 @@ const PasswordResetForm = () => {
     }
     setLoading(true);
     const res = await API.get(
-      `/api/reset_password?email=${email}&turnstile=${turnstileToken}`,
+      `/api/reset_password?email=${email}&turnstile=${turnstileToken}`
     );
     const { success, message } = res.data;
     if (success) {
@@ -78,13 +83,14 @@ const PasswordResetForm = () => {
               <></>
             )}
             <Button
-              color=''
+              color='green'
               fluid
               size='large'
               onClick={handleSubmit}
               loading={loading}
+              disabled={disableButton}
             >
-              提交
+              {disableButton ? `重试 (${countdown})` : '提交'}
             </Button>
           </Segment>
         </Form>

web/src/components/PersonalSetting.js

@@ -1,35 +1,19 @@
-import React, { useEffect, useState, useContext } from 'react';
-import {
-  Button,
-  Divider,
-  Form,
-  Header,
-  Image,
-  Message,
-  Modal,
-  Label,
-} from 'semantic-ui-react';
+import React, { useContext, useEffect, useState } from 'react';
+import { Button, Divider, Form, Header, Image, Message, Modal } from 'semantic-ui-react';
 import { Link, useNavigate } from 'react-router-dom';
-import {
-  API,
-  copy,
-  showError,
-  showInfo,
-  showNotice,
-  showSuccess,
-} from '../helpers';
+import { API, copy, showError, showInfo, showNotice, showSuccess } from '../helpers';
 import Turnstile from 'react-turnstile';
 import { UserContext } from '../context/User';
 
 const PersonalSetting = () => {
-  const [userDispatch] = useContext(UserContext);
+  const [userState, userDispatch] = useContext(UserContext);
   let navigate = useNavigate();
 
   const [inputs, setInputs] = useState({
     wechat_verification_code: '',
     email_verification_code: '',
     email: '',
-    self_account_deletion_confirmation: '',
+    self_account_deletion_confirmation: ''
   });
   const [status, setStatus] = useState({});
   const [showWeChatBindModal, setShowWeChatBindModal] = useState(false);
@@ -39,6 +23,8 @@ const PersonalSetting = () => {
   const [turnstileSiteKey, setTurnstileSiteKey] = useState('');
   const [turnstileToken, setTurnstileToken] = useState('');
   const [loading, setLoading] = useState(false);
+  const [disableButton, setDisableButton] = useState(false);
+  const [countdown, setCountdown] = useState(30);
 
   useEffect(() => {
     let status = localStorage.getItem('status');
@@ -52,6 +38,19 @@ const PersonalSetting = () => {
     }
   }, []);
 
+  useEffect(() => {
+    let countdownInterval = null;
+    if (disableButton && countdown > 0) {
+      countdownInterval = setInterval(() => {
+        setCountdown(countdown - 1);
+      }, 1000);
+    } else if (countdown === 0) {
+      setDisableButton(false);
+      setCountdown(30);
+    }
+    return () => clearInterval(countdownInterval); // Clean up on unmount
+  }, [disableButton, countdown]);
+
   const handleInputChange = (e, { name, value }) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
@@ -80,8 +79,8 @@ const PersonalSetting = () => {
   };
 
   const deleteAccount = async () => {
-    if (inputs.self_account_deletion_confirmation !== 'CONFIRM') {
-      showError('请确认您要删除账户！');
+    if (inputs.self_account_deletion_confirmation !== userState.user.username) {
+      showError('请输入你的账户名以确认删除！');
       return;
     }
 
@@ -102,7 +101,7 @@ const PersonalSetting = () => {
   const bindWeChat = async () => {
     if (inputs.wechat_verification_code === '') return;
     const res = await API.get(
-      `/api/oauth/wechat/bind?code=${inputs.wechat_verification_code}`,
+      `/api/oauth/wechat/bind?code=${inputs.wechat_verification_code}`
     );
     const { success, message } = res.data;
     if (success) {
@@ -115,17 +114,12 @@ const PersonalSetting = () => {
 
   const openGitHubOAuth = () => {
     window.open(
-      `https://github.com/login/oauth/authorize?client_id=${status.github_client_id}&scope=user:email`,
-    );
-  };
-
-  const openDiscordOAuth = () => {
-    window.open(
-      `https://discord.com/api/oauth2/authorize?client_id=${status.discord_client_id}&response_type=code&redirect_uri=${window.location.origin}/oauth/discord&scope=identify%20guilds%20email%20guilds.join`,
+      `https://github.com/login/oauth/authorize?client_id=${status.github_client_id}&scope=user:email`
     );
   };
 
   const sendVerificationCode = async () => {
+    setDisableButton(true);
     if (inputs.email === '') return;
     if (turnstileEnabled && turnstileToken === '') {
       showInfo('请稍后几秒重试，Turnstile 正在检查用户环境！');
@@ -133,7 +127,7 @@ const PersonalSetting = () => {
     }
     setLoading(true);
     const res = await API.get(
-      `/api/verification?email=${inputs.email}&turnstile=${turnstileToken}`,
+      `/api/verification?email=${inputs.email}&turnstile=${turnstileToken}`
     );
     const { success, message } = res.data;
     if (success) {
@@ -148,7 +142,7 @@ const PersonalSetting = () => {
     if (inputs.email_verification_code === '') return;
     setLoading(true);
     const res = await API.get(
-      `/api/oauth/email/bind?email=${inputs.email}&code=${inputs.email_verification_code}`,
+      `/api/oauth/email/bind?email=${inputs.email}&code=${inputs.email_verification_code}`
     );
     const { success, message } = res.data;
     if (success) {
@@ -164,33 +158,29 @@ const PersonalSetting = () => {
     <div style={{ lineHeight: '40px' }}>
       <Header as='h3'>通用设置</Header>
       <Message>
-        注意，此处生成的令牌用于系统管理，而非用于请求 OpenAI
-        相关的服务，请知悉。
+        注意，此处生成的令牌用于系统管理，而非用于请求 OpenAI 相关的服务，请知悉。
       </Message>
       <Button as={Link} to={`/user/edit/`}>
         更新个人信息
       </Button>
       <Button onClick={generateAccessToken}>生成系统访问令牌</Button>
       <Button onClick={getAffLink}>复制邀请链接</Button>
-      <Button
-        onClick={() => {
-          setShowAccountDeleteModal(true);
-        }}
-        color='red'
-      >
-        删除个人账户
-      </Button>
+      <Button onClick={() => {
+        setShowAccountDeleteModal(true);
+      }}>删除个人账户</Button>
       <Divider />
       <Header as='h3'>账号绑定</Header>
-      {status.wechat_login && (
-        <Button
-          onClick={() => {
-            setShowWeChatBindModal(true);
-          }}
-        >
-          绑定微信账号
-        </Button>
-      )}
+      {
+        status.wechat_login && (
+          <Button
+            onClick={() => {
+              setShowWeChatBindModal(true);
+            }}
+          >
+            绑定微信账号
+          </Button>
+        )
+      }
       <Modal
         onClose={() => setShowWeChatBindModal(false)}
         onOpen={() => setShowWeChatBindModal(true)}
@@ -220,12 +210,11 @@ const PersonalSetting = () => {
           </Modal.Description>
         </Modal.Content>
       </Modal>
-      {status.github_oauth && (
-        <Button onClick={openGitHubOAuth}>绑定 GitHub 账号</Button>
-      )}
-      {status.discord_oauth && (
-        <Button onClick={openDiscordOAuth}>绑定 Discord 账号</Button>
-      )}
+      {
+        status.github_oauth && (
+          <Button onClick={openGitHubOAuth}>绑定 GitHub 账号</Button>
+        )
+      }
       <Button
         onClick={() => {
           setShowEmailBindModal(true);
@@ -251,8 +240,8 @@ const PersonalSetting = () => {
                 name='email'
                 type='email'
                 action={
-                  <Button onClick={sendVerificationCode} disabled={loading}>
-                    获取验证码
+                  <Button onClick={sendVerificationCode} disabled={disableButton || loading}>
+                    {disableButton ? `重新发送(${countdown})` : '获取验证码'}
                   </Button>
                 }
               />
@@ -293,14 +282,13 @@ const PersonalSetting = () => {
         size={'tiny'}
         style={{ maxWidth: '450px' }}
       >
-        <Modal.Header>您是否确认删除自己的帐户?</Modal.Header>
+        <Modal.Header>确认删除自己的帐户</Modal.Header>
         <Modal.Content>
           <Modal.Description>
             <Form size='large'>
               <Form.Input
                 fluid
-                label='请输入 "CONFIRM" 以删除您的帐户。'
-                placeholder='确认文字'
+                placeholder={`输入你的账户名 ${userState?.user?.username} 以确认删除`}
                 name='self_account_deletion_confirmation'
                 value={inputs.self_account_deletion_confirmation}
                 onChange={handleInputChange}

web/src/components/PrivateRoute.js

@@ -2,6 +2,7 @@ import { Navigate } from 'react-router-dom';
 
 import { history } from '../helpers';
 
+
 function PrivateRoute({ children }) {
   if (!localStorage.getItem('user')) {
     return <Navigate to='/login' state={{ from: history.location }} />;
@@ -9,4 +10,4 @@ function PrivateRoute({ children }) {
   return children;
 }
 
-export { PrivateRoute };
+export { PrivateRoute };

web/src/components/RedemptionsTable.js

@@ -1,59 +1,29 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Label,
-  Message,
-  Pagination,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Form, Label, Message, Pagination, Table } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
-import {
-  API,
-  copy,
-  showError,
-  showInfo,
-  showSuccess,
-  showWarning,
-  timestamp2string,
-} from '../helpers';
+import { API, copy, showError, showInfo, showSuccess, showWarning, timestamp2string } from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderQuota } from '../helpers/render';
 
 function renderTimestamp(timestamp) {
-  return <>{timestamp2string(timestamp)}</>;
+  return (
+    <>
+      {timestamp2string(timestamp)}
+    </>
+  );
 }
 
 function renderStatus(status) {
   switch (status) {
     case 1:
-      return (
-        <Label basic color='green'>
-          未使用
-        </Label>
-      );
+      return <Label basic color='green'>未使用</Label>;
     case 2:
-      return (
-        <Label basic color='red'>
-          {' '}
-          已禁用{' '}
-        </Label>
-      );
+      return <Label basic color='red'> 已禁用 </Label>;
     case 3:
-      return (
-        <Label basic color='grey'>
-          {' '}
-          已使用{' '}
-        </Label>
-      );
+      return <Label basic color='grey'> 已使用 </Label>;
     default:
-      return (
-        <Label basic color='black'>
-          {' '}
-          未知状态{' '}
-        </Label>
-      );
+      return <Label basic color='black'> 未知状态 </Label>;
   }
 }
 
@@ -140,9 +110,7 @@ const RedemptionsTable = () => {
       return;
     }
     setSearching(true);
-    const res = await API.get(
-      `/api/redemption/search?keyword=${searchKeyword}`,
-    );
+    const res = await API.get(`/api/redemption/search?keyword=${searchKeyword}`);
     const { success, message, data } = res.data;
     if (success) {
       setRedemptions(data);
@@ -244,26 +212,18 @@ const RedemptionsTable = () => {
           {redemptions
             .slice(
               (activePage - 1) * ITEMS_PER_PAGE,
-              activePage * ITEMS_PER_PAGE,
+              activePage * ITEMS_PER_PAGE
             )
             .map((redemption, idx) => {
               if (redemption.deleted) return <></>;
               return (
                 <Table.Row key={redemption.id}>
                   <Table.Cell>{redemption.id}</Table.Cell>
-                  <Table.Cell>
-                    {redemption.name ? redemption.name : '无'}
-                  </Table.Cell>
+                  <Table.Cell>{redemption.name ? redemption.name : '无'}</Table.Cell>
                   <Table.Cell>{renderStatus(redemption.status)}</Table.Cell>
                   <Table.Cell>{renderQuota(redemption.quota)}</Table.Cell>
-                  <Table.Cell>
-                    {renderTimestamp(redemption.created_time)}
-                  </Table.Cell>
-                  <Table.Cell>
-                    {redemption.redeemed_time
-                      ? renderTimestamp(redemption.redeemed_time)
-                      : '尚未兑换'}{' '}
-                  </Table.Cell>
+                  <Table.Cell>{renderTimestamp(redemption.created_time)}</Table.Cell>
+                  <Table.Cell>{redemption.redeemed_time ? renderTimestamp(redemption.redeemed_time) : "尚未兑换"} </Table.Cell>
                   <Table.Cell>
                     <div>
                       <Button
@@ -273,9 +233,7 @@ const RedemptionsTable = () => {
                           if (await copy(redemption.key)) {
                             showSuccess('已复制到剪贴板！');
                           } else {
-                            showWarning(
-                              '无法复制到剪贴板，请手动复制，已将兑换码填入搜索框。',
-                            );
+                            showWarning('无法复制到剪贴板，请手动复制，已将兑换码填入搜索框。')
                             setSearchKeyword(redemption.key);
                           }
                         }}
@@ -293,12 +251,12 @@ const RedemptionsTable = () => {
                       </Button>
                       <Button
                         size={'small'}
-                        disabled={redemption.status === 3} // used
+                        disabled={redemption.status === 3}  // used
                         onClick={() => {
                           manageRedemption(
                             redemption.id,
                             redemption.status === 1 ? 'disable' : 'enable',
-                            idx,
+                            idx
                           );
                         }}
                       >
@@ -321,12 +279,7 @@ const RedemptionsTable = () => {
         <Table.Footer>
           <Table.Row>
             <Table.HeaderCell colSpan='8'>
-              <Button
-                size='small'
-                as={Link}
-                to='/redemption/add'
-                loading={loading}
-              >
+              <Button size='small' as={Link} to='/redemption/add' loading={loading}>
                 添加新的兑换码
               </Button>
               <Pagination

web/src/components/RegisterForm.js

@@ -1,13 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Grid,
-  Header,
-  Image,
-  Message,
-  Segment,
-} from 'semantic-ui-react';
+import { Button, Form, Grid, Header, Image, Message, Segment } from 'semantic-ui-react';
 import { Link, useNavigate } from 'react-router-dom';
 import { API, getLogo, showError, showInfo, showSuccess } from '../helpers';
 import Turnstile from 'react-turnstile';
@@ -18,7 +10,7 @@ const RegisterForm = () => {
     password: '',
     password2: '',
     email: '',
-    verification_code: '',
+    verification_code: ''
   });
   const { username, password, password2 } = inputs;
   const [showEmailVerification, setShowEmailVerification] = useState(false);
@@ -73,7 +65,7 @@ const RegisterForm = () => {
       inputs.aff_code = affCode;
       const res = await API.post(
         `/api/user/register?turnstile=${turnstileToken}`,
-        inputs,
+        inputs
       );
       const { success, message } = res.data;
       if (success) {
@@ -94,7 +86,7 @@ const RegisterForm = () => {
     }
     setLoading(true);
     const res = await API.get(
-      `/api/verification?email=${inputs.email}&turnstile=${turnstileToken}`,
+      `/api/verification?email=${inputs.email}&turnstile=${turnstileToken}`
     );
     const { success, message } = res.data;
     if (success) {
@@ -178,7 +170,7 @@ const RegisterForm = () => {
               <></>
             )}
             <Button
-              color=''
+              color='green'
               fluid
               size='large'
               onClick={handleSubmit}

web/src/components/SystemSetting.js

@@ -8,14 +8,8 @@ const SystemSetting = () => {
     PasswordRegisterEnabled: '',
     EmailVerificationEnabled: '',
     GitHubOAuthEnabled: '',
-    DiscordOAuthEnabled: '',
     GitHubClientId: '',
     GitHubClientSecret: '',
-    DiscordClientId: '',
-    DiscordAllowJoiningGuild: 'false',
-    DiscordGuildId: '',
-    DiscordBotToken: '',
-    DiscordClientSecret: '',
     Notice: '',
     SMTPServer: '',
     SMTPPort: '',
@@ -62,7 +56,6 @@ const SystemSetting = () => {
       case 'PasswordRegisterEnabled':
       case 'EmailVerificationEnabled':
       case 'GitHubOAuthEnabled':
-      case 'DiscordOAuthEnabled':
       case 'WeChatAuthEnabled':
       case 'TurnstileCheckEnabled':
       case 'RegisterEnabled':
@@ -73,7 +66,7 @@ const SystemSetting = () => {
     }
     const res = await API.put('/api/option/', {
       key,
-      value,
+      value
     });
     const { success, message } = res.data;
     if (success) {
@@ -89,11 +82,6 @@ const SystemSetting = () => {
       name === 'Notice' ||
       name.startsWith('SMTP') ||
       name === 'ServerAddress' ||
-      name === 'DiscordClientId' ||
-      name === 'DiscordGuildId' ||
-      name === 'DiscordAllowJoiningGuild' ||
-      name === 'DiscordBotToken' ||
-      name === 'DiscordClientSecret' ||
       name === 'GitHubClientId' ||
       name === 'GitHubClientSecret' ||
       name === 'WeChatServerAddress' ||
@@ -141,7 +129,7 @@ const SystemSetting = () => {
     if (originInputs['WeChatServerAddress'] !== inputs.WeChatServerAddress) {
       await updateOption(
         'WeChatServerAddress',
-        removeTrailingSlash(inputs.WeChatServerAddress),
+        removeTrailingSlash(inputs.WeChatServerAddress)
       );
     }
     if (
@@ -150,7 +138,7 @@ const SystemSetting = () => {
     ) {
       await updateOption(
         'WeChatAccountQRCodeImageURL',
-        inputs.WeChatAccountQRCodeImageURL,
+        inputs.WeChatAccountQRCodeImageURL
       );
     }
     if (
@@ -173,36 +161,6 @@ const SystemSetting = () => {
     }
   };
 
-  const submitDiscordOAuth = async () => {
-    if (originInputs['DiscordClientId'] !== inputs.DiscordClientId) {
-      await updateOption('DiscordClientId', inputs.DiscordClientId);
-    }
-    if (
-      originInputs['DiscordClientSecret'] !== inputs.DiscordClientSecret &&
-      inputs.DiscordClientSecret !== ''
-    ) {
-      await updateOption('DiscordClientSecret', inputs.DiscordClientSecret);
-    }
-    if (originInputs['DiscordGuildId'] !== inputs.DiscordGuildId) {
-      await updateOption('DiscordGuildId', inputs.DiscordGuildId);
-    }
-    if (
-      originInputs['DiscordBotToken'] !== inputs.DiscordBotToken &&
-      inputs.DiscordBotToken !== ''
-    ) {
-      await updateOption('DiscordBotToken', inputs.DiscordBotToken);
-    }
-    if (
-      originInputs['DiscordAllowJoiningGuild'] !==
-      inputs.DiscordAllowJoiningGuild
-    ) {
-      await updateOption(
-        'DiscordAllowJoiningGuild',
-        inputs.DiscordAllowJoiningGuild,
-      );
-    }
-  };
-
   const submitTurnstile = async () => {
     if (originInputs['TurnstileSiteKey'] !== inputs.TurnstileSiteKey) {
       await updateOption('TurnstileSiteKey', inputs.TurnstileSiteKey);
@@ -219,55 +177,49 @@ const SystemSetting = () => {
     <Grid columns={1}>
       <Grid.Column>
         <Form loading={loading}>
-          <Header as='h3'>General Settings</Header>
+          <Header as='h3'>通用设置</Header>
           <Form.Group widths='equal'>
             <Form.Input
-              label='Server Address'
-              placeholder='For example：https://yourdomain.com'
+              label='服务器地址'
+              placeholder='例如：https://yourdomain.com'
               value={inputs.ServerAddress}
               name='ServerAddress'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Form.Button onClick={submitServerAddress}>
-            Update Server Address
+            更新服务器地址
           </Form.Button>
           <Divider />
-          <Header as='h3'>Configure Login/Registration</Header>
+          <Header as='h3'>配置登录注册</Header>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.PasswordLoginEnabled === 'true'}
-              label='Allow login via password'
+              label='允许通过密码进行登录'
               name='PasswordLoginEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.PasswordRegisterEnabled === 'true'}
-              label='Allow registration via password'
+              label='允许通过密码进行注册'
               name='PasswordRegisterEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.EmailVerificationEnabled === 'true'}
-              label='Email verification is required when registering via password'
+              label='通过密码注册时需要进行邮箱验证'
               name='EmailVerificationEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.GitHubOAuthEnabled === 'true'}
-              label='Allow login & registration via GitHub account'
+              label='允许通过 GitHub 账户登录 & 注册'
               name='GitHubOAuthEnabled'
               onChange={handleInputChange}
             />
-            <Form.Checkbox
-              checked={inputs.DiscordOAuthEnabled === 'true'}
-              label='允许通过 Discord 账户登录和注册'
-              name='DiscordOAuthEnabled'
-              onChange={handleInputChange}
-            />
             <Form.Checkbox
               checked={inputs.WeChatAuthEnabled === 'true'}
-              label='Allow login & registration via WeChat'
+              label='允许通过微信登录 & 注册'
               name='WeChatAuthEnabled'
               onChange={handleInputChange}
             />
@@ -275,151 +227,82 @@ const SystemSetting = () => {
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.RegisterEnabled === 'true'}
-              label='Allow new user registration (if this option is off, new users will not be able to register in any way）'
+              label='允许新用户注册（此项为否时，新用户将无法以任何方式进行注册）'
               name='RegisterEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.TurnstileCheckEnabled === 'true'}
-              label='Enable Turnstile user verification'
+              label='启用 Turnstile 用户校验'
               name='TurnstileCheckEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Divider />
           <Header as='h3'>
-            Configure SMTP
-            <Header.Subheader>
-              To support the system email sending
-            </Header.Subheader>
+            配置 SMTP
+            <Header.Subheader>用以支持系统的邮件发送</Header.Subheader>
           </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label='SMTP Server Address'
+              label='SMTP 服务器地址'
               name='SMTPServer'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.SMTPServer}
-              placeholder='For example: smtp.qq.com'
+              placeholder='例如：smtp.qq.com'
             />
             <Form.Input
-              label='SMTP Port'
+              label='SMTP 端口'
               name='SMTPPort'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.SMTPPort}
-              placeholder='Default: 587'
+              placeholder='默认: 587'
             />
             <Form.Input
-              label='SMTP Account'
+              label='SMTP 账户'
               name='SMTPAccount'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.SMTPAccount}
-              placeholder='Usually an email address'
+              placeholder='通常是邮箱地址'
             />
           </Form.Group>
           <Form.Group widths={3}>
             <Form.Input
-              label='SMTP Sender email'
+              label='SMTP 发送者邮箱'
               name='SMTPFrom'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.SMTPFrom}
-              placeholder='Usually consistent with the email address'
+              placeholder='通常和邮箱地址保持一致'
             />
             <Form.Input
-              label='SMTP Access Credential'
+              label='SMTP 访问凭证'
               name='SMTPToken'
               onChange={handleInputChange}
               type='password'
               autoComplete='new-password'
               value={inputs.SMTPToken}
-              placeholder='Sensitive information will not be displayed in the frontend'
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
-          <Form.Button onClick={submitSMTP}>Save SMTP Settings</Form.Button>
+          <Form.Button onClick={submitSMTP}>保存 SMTP 设置</Form.Button>
           <Divider />
           <Header as='h3'>
-            Configure Discord OAuth App
+            配置 GitHub OAuth App
             <Header.Subheader>
-              To support login & registration via GitHub，
-              <a
-                href='https://discord.com/developers/applications'
-                target='_blank'
-              >
-                Click here
-              </a>
-              Manage your Discord OAuth App
-            </Header.Subheader>
-          </Header>
-          <Message>
-            Fill in the Homepage URL <code>{inputs.ServerAddress}</code>
-            ，Fill in the Authorization callback URL{' '}
-            <code>{`${inputs.ServerAddress}/oauth/discord`}</code>
-          </Message>
-          <Form.Group widths={3}>
-            <Form.Input
-              label='Discord Client ID'
-              name='DiscordClientId'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.DiscordClientId}
-              placeholder='Enter the ID of your registered Discord OAuth APP'
-            />
-            <Form.Input
-              label='Discord Client Secret'
-              name='DiscordClientSecret'
-              onChange={handleInputChange}
-              type='password'
-              autoComplete='new-password'
-              value={inputs.DiscordClientSecret}
-              placeholder='Sensitive information will not be displayed in the frontend'
-            />
-            <Form.Checkbox
-              label='Allow Joining Guild'
-              name='DiscordAllowJoiningGuild'
-              autoComplete='new-password'
-              checked={inputs.DiscordAllowJoiningGuild === 'true'}
-              onChange={(e, { name, checked }) =>
-                handleInputChange(e, { name, value: checked ? 'true' : 'false' })
-              }
-            />
-            <Form.Input
-              label='Discord Guild ID'
-              name='DiscordGuildId'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.DiscordGuildId}
-              placeholder='Enter the ID of your Discord server'
-            />
-            <Form.Input
-              label='Discord Bot Token'
-              name='DiscordBotToken'
-              onChange={handleInputChange}
-              type='password'
-              autoComplete='new-password'
-              value={inputs.DiscordBotToken}
-              placeholder='Sensitive information will not be displayed in the frontend'
-            />
-          </Form.Group>
-          <Form.Button onClick={submitDiscordOAuth}>
-            Save Discord OAuth Settings
-          </Form.Button>
-          <Divider />
-          <Header as='h3'>
-            Configure GitHub OAuth App
-            <Header.Subheader>
-              To support login & registration via GitHub，
+              用以支持通过 GitHub 进行登录注册，
               <a href='https://github.com/settings/developers' target='_blank'>
-                Click here
+                点击此处
               </a>
-              Manage your GitHub OAuth App
+              管理你的 GitHub OAuth App
             </Header.Subheader>
           </Header>
           <Message>
-            Fill in the Homepage URL <code>{inputs.ServerAddress}</code>
-            ，Fill in the Authorization callback URL{' '}
+            Homepage URL 填 <code>{inputs.ServerAddress}</code>
+            ，Authorization callback URL 填{' '}
             <code>{`${inputs.ServerAddress}/oauth/github`}</code>
           </Message>
           <Form.Group widths={3}>
@@ -429,7 +312,7 @@ const SystemSetting = () => {
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.GitHubClientId}
-              placeholder='Enter your registered GitHub OAuth APP ID'
+              placeholder='输入你注册的 GitHub OAuth APP 的 ID'
             />
             <Form.Input
               label='GitHub Client Secret'
@@ -438,66 +321,65 @@ const SystemSetting = () => {
               type='password'
               autoComplete='new-password'
               value={inputs.GitHubClientSecret}
-              placeholder='Sensitive information will not be displayed in the frontend'
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
           <Form.Button onClick={submitGitHubOAuth}>
-            Save GitHub OAuth Settings
+            保存 GitHub OAuth 设置
           </Form.Button>
           <Divider />
           <Header as='h3'>
-            Configure WeChat Server
+            配置 WeChat Server
             <Header.Subheader>
-              To support login & registration via WeChat，
+              用以支持通过微信进行登录注册，
               <a
                 href='https://github.com/songquanpeng/wechat-server'
                 target='_blank'
               >
-                Click here
+                点击此处
               </a>
-              Learn about WeChat Server
+              了解 WeChat Server
             </Header.Subheader>
           </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label='WeChat Server Server Address'
+              label='WeChat Server 服务器地址'
               name='WeChatServerAddress'
-              placeholder='For example：https://yourdomain.com'
+              placeholder='例如：https://yourdomain.com'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.WeChatServerAddress}
             />
             <Form.Input
-              label='WeChat Server Access Credential'
+              label='WeChat Server 访问凭证'
               name='WeChatServerToken'
               type='password'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.WeChatServerToken}
-              placeholder='Sensitive information will not be displayed in the frontend'
+              placeholder='敏感信息不会发送到前端显示'
             />
             <Form.Input
-              label='WeChat Public Account QR Code Image Link'
+              label='微信公众号二维码图片链接'
               name='WeChatAccountQRCodeImageURL'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.WeChatAccountQRCodeImageURL}
-              placeholder='Enter an image link'
+              placeholder='输入一个图片链接'
             />
           </Form.Group>
           <Form.Button onClick={submitWeChat}>
-            Save WeChat Server Settings
+            保存 WeChat Server 设置
           </Form.Button>
           <Divider />
           <Header as='h3'>
-            Configure Turnstile
+            配置 Turnstile
             <Header.Subheader>
-              To support user verification，
+              用以支持用户校验，
               <a href='https://dash.cloudflare.com/' target='_blank'>
-                Click here
+                点击此处
               </a>
-              Manage your Turnstile Sites, recommend selecting Invisible Widget
-              Type
+              管理你的 Turnstile Sites，推荐选择 Invisible Widget Type
             </Header.Subheader>
           </Header>
           <Form.Group widths={3}>
@@ -507,7 +389,7 @@ const SystemSetting = () => {
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.TurnstileSiteKey}
-              placeholder='Enter your registered Turnstile Site Key'
+              placeholder='输入你注册的 Turnstile Site Key'
             />
             <Form.Input
               label='Turnstile Secret Key'
@@ -516,11 +398,11 @@ const SystemSetting = () => {
               type='password'
               autoComplete='new-password'
               value={inputs.TurnstileSecretKey}
-              placeholder='Sensitive information will not be displayed in the frontend'
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
           <Form.Button onClick={submitTurnstile}>
-            Save Turnstile Settings
+            保存 Turnstile 设置
           </Form.Button>
         </Form>
       </Grid.Column>

web/src/components/TokensTable.js

@@ -1,66 +1,31 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Label,
-  Modal,
-  Pagination,
-  Popup,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Form, Label, Modal, Pagination, Popup, Table } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
-import {
-  API,
-  copy,
-  showError,
-  showSuccess,
-  showWarning,
-  timestamp2string,
-} from '../helpers';
+import { API, copy, showError, showSuccess, showWarning, timestamp2string } from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderQuota } from '../helpers/render';
 
 function renderTimestamp(timestamp) {
-  return <>{timestamp2string(timestamp)}</>;
+  return (
+    <>
+      {timestamp2string(timestamp)}
+    </>
+  );
 }
 
 function renderStatus(status) {
   switch (status) {
     case 1:
-      return (
-        <Label basic color='green'>
-          已启用
-        </Label>
-      );
+      return <Label basic color='green'>已启用</Label>;
     case 2:
-      return (
-        <Label basic color='red'>
-          {' '}
-          已禁用{' '}
-        </Label>
-      );
+      return <Label basic color='red'> 已禁用 </Label>;
     case 3:
-      return (
-        <Label basic color='yellow'>
-          {' '}
-          已过期{' '}
-        </Label>
-      );
+      return <Label basic color='yellow'> 已过期 </Label>;
     case 4:
-      return (
-        <Label basic color='grey'>
-          {' '}
-          已耗尽{' '}
-        </Label>
-      );
+      return <Label basic color='grey'> 已耗尽 </Label>;
     default:
-      return (
-        <Label basic color='black'>
-          {' '}
-          未知状态{' '}
-        </Label>
-      );
+      return <Label basic color='black'> 未知状态 </Label>;
   }
 }
 
@@ -103,7 +68,7 @@ const TokensTable = () => {
   const refresh = async () => {
     setLoading(true);
     await loadTokens(activePage - 1);
-  };
+  }
 
   useEffect(() => {
     loadTokens(0)
@@ -256,7 +221,7 @@ const TokensTable = () => {
           {tokens
             .slice(
               (activePage - 1) * ITEMS_PER_PAGE,
-              activePage * ITEMS_PER_PAGE,
+              activePage * ITEMS_PER_PAGE
             )
             .map((token, idx) => {
               if (token.deleted) return <></>;
@@ -265,30 +230,20 @@ const TokensTable = () => {
                   <Table.Cell>{token.name ? token.name : '无'}</Table.Cell>
                   <Table.Cell>{renderStatus(token.status)}</Table.Cell>
                   <Table.Cell>{renderQuota(token.used_quota)}</Table.Cell>
-                  <Table.Cell>
-                    {token.unlimited_quota
-                      ? '无限制'
-                      : renderQuota(token.remain_quota, 2)}
-                  </Table.Cell>
+                  <Table.Cell>{token.unlimited_quota ? '无限制' : renderQuota(token.remain_quota, 2)}</Table.Cell>
                   <Table.Cell>{renderTimestamp(token.created_time)}</Table.Cell>
-                  <Table.Cell>
-                    {token.expired_time === -1
-                      ? '永不过期'
-                      : renderTimestamp(token.expired_time)}
-                  </Table.Cell>
+                  <Table.Cell>{token.expired_time === -1 ? '永不过期' : renderTimestamp(token.expired_time)}</Table.Cell>
                   <Table.Cell>
                     <div>
                       <Button
                         size={'small'}
                         positive
                         onClick={async () => {
-                          let key = 'sk-' + token.key;
+                          let key = "sk-" + token.key;
                           if (await copy(key)) {
                             showSuccess('已复制到剪贴板！');
                           } else {
-                            showWarning(
-                              '无法复制到剪贴板，请手动复制，已将令牌填入搜索框。',
-                            );
+                            showWarning('无法复制到剪贴板，请手动复制，已将令牌填入搜索框。');
                             setSearchKeyword(key);
                           }
                         }}
@@ -320,7 +275,7 @@ const TokensTable = () => {
                           manageToken(
                             token.id,
                             token.status === 1 ? 'disable' : 'enable',
-                            idx,
+                            idx
                           );
                         }}
                       >
@@ -346,9 +301,7 @@ const TokensTable = () => {
               <Button size='small' as={Link} to='/token/add' loading={loading}>
                 添加新的令牌
               </Button>
-              <Button size='small' onClick={refresh} loading={loading}>
-                刷新
-              </Button>
+              <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
               <Pagination
                 floated='right'
                 activePage={activePage}

web/src/components/UsersTable.js

@@ -1,22 +1,10 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Label,
-  Pagination,
-  Popup,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Form, Label, Pagination, Popup, Table } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import { API, showError, showSuccess } from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
-import {
-  renderGroup,
-  renderNumber,
-  renderQuota,
-  renderText,
-} from '../helpers/render';
+import { renderGroup, renderNumber, renderQuota, renderText } from '../helpers/render';
 
 function renderRole(role) {
   switch (role) {
@@ -77,7 +65,7 @@ const UsersTable = () => {
     (async () => {
       const res = await API.post('/api/user/manage', {
         username,
-        action,
+        action
       });
       const { success, message } = res.data;
       if (success) {
@@ -227,7 +215,7 @@ const UsersTable = () => {
           {users
             .slice(
               (activePage - 1) * ITEMS_PER_PAGE,
-              activePage * ITEMS_PER_PAGE,
+              activePage * ITEMS_PER_PAGE
             )
             .map((user, idx) => {
               if (user.deleted) return <></>;
@@ -238,9 +226,7 @@ const UsersTable = () => {
                     <Popup
                       content={user.email ? user.email : '未绑定邮箱地址'}
                       key={user.username}
-                      header={
-                        user.display_name ? user.display_name : user.username
-                      }
+                      header={user.display_name ? user.display_name : user.username}
                       trigger={<span>{renderText(user.username, 10)}</span>}
                       hoverable
                     />
@@ -250,22 +236,9 @@ const UsersTable = () => {
                   {/*  {user.email ? <Popup hoverable content={user.email} trigger={<span>{renderText(user.email, 24)}</span>} /> : '无'}*/}
                   {/*</Table.Cell>*/}
                   <Table.Cell>
-                    <Popup
-                      content='剩余额度'
-                      trigger={<Label basic>{renderQuota(user.quota)}</Label>}
-                    />
-                    <Popup
-                      content='已用额度'
-                      trigger={
-                        <Label basic>{renderQuota(user.used_quota)}</Label>
-                      }
-                    />
-                    <Popup
-                      content='请求次数'
-                      trigger={
-                        <Label basic>{renderNumber(user.request_count)}</Label>
-                      }
-                    />
+                    <Popup content='剩余额度' trigger={<Label basic>{renderQuota(user.quota)}</Label>} />
+                    <Popup content='已用额度' trigger={<Label basic>{renderQuota(user.used_quota)}</Label>} />
+                    <Popup content='请求次数' trigger={<Label basic>{renderNumber(user.request_count)}</Label>} />
                   </Table.Cell>
                   <Table.Cell>{renderRole(user.role)}</Table.Cell>
                   <Table.Cell>{renderStatus(user.status)}</Table.Cell>
@@ -293,11 +266,7 @@ const UsersTable = () => {
                       </Button>
                       <Popup
                         trigger={
-                          <Button
-                            size='small'
-                            negative
-                            disabled={user.role === 100}
-                          >
+                          <Button size='small' negative disabled={user.role === 100}>
                             删除
                           </Button>
                         }
@@ -320,7 +289,7 @@ const UsersTable = () => {
                           manageUser(
                             user.username,
                             user.status === 1 ? 'disable' : 'enable',
-                            idx,
+                            idx
                           );
                         }}
                         disabled={user.role === 100}

web/src/constants/channel.constants.js

@@ -1,18 +1,19 @@
 export const CHANNEL_OPTIONS = [
   { key: 1, text: 'OpenAI', value: 1, color: 'green' },
-  { key: 8, text: '自定义', value: 8, color: 'pink' },
-  { key: 3, text: 'Azure', value: 3, color: 'olive' },
-  { key: 2, text: 'API2D', value: 2, color: 'blue' },
-  { key: 4, text: 'CloseAI', value: 4, color: 'teal' },
-  { key: 5, text: 'OpenAI-SB', value: 5, color: 'brown' },
-  { key: 6, text: 'OpenAI Max', value: 6, color: 'violet' },
-  { key: 7, text: 'OhMyGPT', value: 7, color: 'purple' },
-  { key: 9, text: 'AI.LS', value: 9, color: 'yellow' },
-  { key: 10, text: 'AI Proxy', value: 10, color: 'purple' },
-  { key: 12, text: 'API2GPT', value: 12, color: 'blue' },
-  { key: 13, text: 'AIGC2D', value: 13, color: 'purple' },
-
-  //
-  { key: 14, text: 'Chanzhaoyu/chatgpt-web', value: 14, color: 'purple' },
-  { key: 14, text: 'mckaywrigley/chatbot-ui', value: 15, color: 'orange' },
-];
+  { key: 14, text: 'Anthropic Claude', value: 14, color: 'black' },
+  { key: 3, text: 'Azure OpenAI', value: 3, color: 'olive' },
+  { key: 11, text: 'Google PaLM2', value: 11, color: 'orange' },
+  { key: 15, text: '百度文心千帆', value: 15, color: 'blue' },
+  { key: 17, text: '阿里通义千问', value: 17, color: 'orange' },
+  { key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet' },
+  { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
+  { key: 2, text: '代理：API2D', value: 2, color: 'blue' },
+  { key: 5, text: '代理：OpenAI-SB', value: 5, color: 'brown' },
+  { key: 7, text: '代理：OhMyGPT', value: 7, color: 'purple' },
+  { key: 10, text: '代理：AI Proxy', value: 10, color: 'purple' },
+  { key: 4, text: '代理：CloseAI', value: 4, color: 'teal' },
+  { key: 6, text: '代理：OpenAI Max', value: 6, color: 'violet' },
+  { key: 9, text: '代理：AI.LS', value: 9, color: 'yellow' },
+  { key: 12, text: '代理：API2GPT', value: 12, color: 'blue' },
+  { key: 13, text: '代理：AIGC2D', value: 13, color: 'purple' },
+];

web/src/constants/index.js

@@ -1,4 +1,4 @@
 export * from './toast.constants';
 export * from './user.constants';
 export * from './common.constant';
-export * from './channel.constants';
+export * from './channel.constants';

web/src/constants/toast.constants.js

@@ -3,5 +3,5 @@ export const toastConstants = {
   INFO_TIMEOUT: 3000,
   ERROR_TIMEOUT: 5000,
   WARNING_TIMEOUT: 10000,
-  NOTICE_TIMEOUT: 20000,
+  NOTICE_TIMEOUT: 20000
 };

web/src/constants/user.constants.js

@@ -1,19 +1,19 @@
 export const userConstants = {
-  REGISTER_REQUEST: 'USERS_REGISTER_REQUEST',
-  REGISTER_SUCCESS: 'USERS_REGISTER_SUCCESS',
-  REGISTER_FAILURE: 'USERS_REGISTER_FAILURE',
+    REGISTER_REQUEST: 'USERS_REGISTER_REQUEST',
+    REGISTER_SUCCESS: 'USERS_REGISTER_SUCCESS',
+    REGISTER_FAILURE: 'USERS_REGISTER_FAILURE',
 
-  LOGIN_REQUEST: 'USERS_LOGIN_REQUEST',
-  LOGIN_SUCCESS: 'USERS_LOGIN_SUCCESS',
-  LOGIN_FAILURE: 'USERS_LOGIN_FAILURE',
+    LOGIN_REQUEST: 'USERS_LOGIN_REQUEST',
+    LOGIN_SUCCESS: 'USERS_LOGIN_SUCCESS',
+    LOGIN_FAILURE: 'USERS_LOGIN_FAILURE',
+    
+    LOGOUT: 'USERS_LOGOUT',
 
-  LOGOUT: 'USERS_LOGOUT',
+    GETALL_REQUEST: 'USERS_GETALL_REQUEST',
+    GETALL_SUCCESS: 'USERS_GETALL_SUCCESS',
+    GETALL_FAILURE: 'USERS_GETALL_FAILURE',
 
-  GETALL_REQUEST: 'USERS_GETALL_REQUEST',
-  GETALL_SUCCESS: 'USERS_GETALL_SUCCESS',
-  GETALL_FAILURE: 'USERS_GETALL_FAILURE',
-
-  DELETE_REQUEST: 'USERS_DELETE_REQUEST',
-  DELETE_SUCCESS: 'USERS_DELETE_SUCCESS',
-  DELETE_FAILURE: 'USERS_DELETE_FAILURE',
+    DELETE_REQUEST: 'USERS_DELETE_REQUEST',
+    DELETE_SUCCESS: 'USERS_DELETE_SUCCESS',
+    DELETE_FAILURE: 'USERS_DELETE_FAILURE'    
 };

web/src/context/Status/index.js

@@ -16,4 +16,4 @@ export const StatusProvider = ({ children }) => {
       {children}
     </StatusContext.Provider>
   );
-};
+};

web/src/context/User/index.js

@@ -1,19 +1,19 @@
 // contexts/User/index.jsx
 
-import React from 'react';
-import { reducer, initialState } from './reducer';
+import React from "react"
+import { reducer, initialState } from "./reducer"
 
 export const UserContext = React.createContext({
   state: initialState,
-  dispatch: () => null,
-});
+  dispatch: () => null
+})
 
 export const UserProvider = ({ children }) => {
-  const [state, dispatch] = React.useReducer(reducer, initialState);
+  const [state, dispatch] = React.useReducer(reducer, initialState)
 
   return (
-    <UserContext.Provider value={[state, dispatch]}>
-      {children}
+    <UserContext.Provider value={[ state, dispatch ]}>
+      { children }
     </UserContext.Provider>
-  );
-};
+  )
+}

web/src/context/User/reducer.js

@@ -3,12 +3,12 @@ export const reducer = (state, action) => {
     case 'login':
       return {
         ...state,
-        user: action.payload,
+        user: action.payload
       };
     case 'logout':
       return {
         ...state,
-        user: undefined,
+        user: undefined
       };
 
     default:
@@ -17,5 +17,5 @@ export const reducer = (state, action) => {
 };
 
 export const initialState = {
-  user: undefined,
-};
+  user: undefined
+};

web/src/helpers/api.js

@@ -9,5 +9,5 @@ API.interceptors.response.use(
   (response) => response,
   (error) => {
     showError(error);
-  },
+  }
 );

web/src/helpers/auth-header.js

@@ -1,10 +1,10 @@
 export function authHeader() {
-  // return authorization header with jwt token
-  let user = JSON.parse(localStorage.getItem('user'));
+    // return authorization header with jwt token
+    let user = JSON.parse(localStorage.getItem('user'));
 
-  if (user && user.token) {
-    return { Authorization: 'Bearer ' + user.token };
-  } else {
-    return {};
-  }
-}
+    if (user && user.token) {
+        return { 'Authorization': 'Bearer ' + user.token };
+    } else {
+        return {};
+    }
+}

web/src/helpers/history.js

@@ -1,3 +1,3 @@
 import { createBrowserHistory } from 'history';
 
-export const history = createBrowserHistory();
+export const history = createBrowserHistory();

web/src/helpers/index.js

@@ -1,4 +1,4 @@
 export * from './history';
 export * from './auth-header';
 export * from './utils';
-export * from './api';
+export * from './api';

web/src/helpers/render.js

@@ -13,18 +13,16 @@ export function renderGroup(group) {
   }
   let groups = group.split(',');
   groups.sort();
-  return (
-    <>
-      {groups.map((group) => {
-        if (group === 'vip' || group === 'pro') {
-          return <Label color='yellow'>{group}</Label>;
-        } else if (group === 'svip' || group === 'premium') {
-          return <Label color='red'>{group}</Label>;
-        }
-        return <Label>{group}</Label>;
-      })}
-    </>
-  );
+  return <>
+    {groups.map((group) => {
+      if (group === 'vip' || group === 'pro') {
+        return <Label color='yellow'>{group}</Label>;
+      } else if (group === 'svip' || group === 'premium') {
+        return <Label color='red'>{group}</Label>;
+      }
+      return <Label>{group}</Label>;
+    })}
+  </>;
 }
 
 export function renderNumber(num) {
@@ -57,4 +55,4 @@ export function renderQuotaWithPrompt(quota, digits) {
     return `（等价金额：${renderQuota(quota, digits)}）`;
   }
   return '';
-}
+}

web/src/helpers/utils.js

@@ -24,7 +24,7 @@ export function getSystemName() {
 export function getLogo() {
   let logo = localStorage.getItem('logo');
   if (!logo) return '/logo.png';
-  return logo;
+  return logo
 }
 
 export function getFooterHTML() {
@@ -147,7 +147,17 @@ export function timestamp2string(timestamp) {
     second = '0' + second;
   }
   return (
-    year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second
+    year +
+    '-' +
+    month +
+    '-' +
+    day +
+    ' ' +
+    hour +
+    ':' +
+    minute +
+    ':' +
+    second
   );
 }
 
@@ -167,4 +177,4 @@ export const verifyJSON = (str) => {
     return false;
   }
   return true;
-};
+};

web/src/index.css

@@ -1,37 +1,35 @@
 body {
-  margin: 0;
-  padding-top: 55px;
-  overflow-y: scroll;
-  font-family: Lato, 'Helvetica Neue', Arial, Helvetica, 'Microsoft YaHei',
-    sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  scrollbar-width: none;
+    margin: 0;
+    padding-top: 55px;
+    overflow-y: scroll;
+    font-family: Lato, 'Helvetica Neue', Arial, Helvetica, "Microsoft YaHei", sans-serif;
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    scrollbar-width: none;
 }
 
 body::-webkit-scrollbar {
-  display: none;
+    display: none;
 }
 
 code {
-  font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
-    monospace;
+    font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New', monospace;
 }
 
 .main-content {
-  padding: 4px;
+    padding: 4px;
 }
 
 .small-icon .icon {
-  font-size: 1em !important;
+    font-size: 1em !important;
 }
 
 .custom-footer {
-  font-size: 1.1em;
+    font-size: 1.1em;
 }
 
 @media only screen and (max-width: 600px) {
-  .hide-on-mobile {
-    display: none !important;
-  }
+    .hide-on-mobile {
+        display: none !important;
+    }
 }

web/src/index.js

@@ -27,5 +27,5 @@ root.render(
         </BrowserRouter>
       </UserProvider>
     </StatusProvider>
-  </React.StrictMode>,
+  </React.StrictMode>
 );

web/src/pages/About/index.js

@@ -31,8 +31,8 @@ const About = () => {
 
   return (
     <>
-      {aboutLoaded && about === '' ? (
-        <>
+      {
+        aboutLoaded && about === '' ? <>
           <Segment>
             <Header as='h3'>关于</Header>
             <p>可在设置页面设置关于内容，支持 HTML & Markdown</p>
@@ -41,26 +41,18 @@ const About = () => {
               https://github.com/songquanpeng/one-api
             </a>
           </Segment>
-        </>
-      ) : (
-        <>
-          {about.startsWith('https://') ? (
-            <iframe
+        </> : <>
+          {
+            about.startsWith('https://') ? <iframe
               src={about}
               style={{ width: '100%', height: '100vh', border: 'none' }}
-            />
-          ) : (
-            <Segment>
-              <div
-                style={{ fontSize: 'larger' }}
-                dangerouslySetInnerHTML={{ __html: about }}
-              ></div>
-            </Segment>
-          )}
+            /> : <div style={{ fontSize: 'larger' }} dangerouslySetInnerHTML={{ __html: about }}></div>
+          }
         </>
-      )}
+      }
     </>
   );
 };
 
+
 export default About;

web/src/pages/Channel/EditChannel.js

@@ -1,30 +1,13 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Header,
-  Input,
-  Message,
-  Segment,
-} from 'semantic-ui-react';
+import { Button, Form, Header, Input, Message, Segment } from 'semantic-ui-react';
 import { useParams } from 'react-router-dom';
-import {
-  API,
-  showError,
-  showInfo,
-  showSuccess,
-  verifyJSON,
-} from '../../helpers';
+import { API, showError, showInfo, showSuccess, verifyJSON } from '../../helpers';
 import { CHANNEL_OPTIONS } from '../../constants';
 
 const MODEL_MAPPING_EXAMPLE = {
   'gpt-3.5-turbo-0301': 'gpt-3.5-turbo',
   'gpt-4-0314': 'gpt-4',
-  'gpt-4-32k-0314': 'gpt-4-32k',
-};
-
-const CUSTOM_HTTP_HEADERS_EXAMPLE = {
-  'X-OpenAI-Organization': 'OpenAI',
+  'gpt-4-32k-0314': 'gpt-4-32k'
 };
 
 const EditChannel = () => {
@@ -39,24 +22,22 @@ const EditChannel = () => {
     base_url: '',
     other: '',
     model_mapping: '',
-    custom_http_headers: '',
     models: [],
-    groups: ['default'],
-    enable_ip_randomization: false,
+    groups: ['default']
   };
   const [batch, setBatch] = useState(false);
   const [inputs, setInputs] = useState(originInputs);
+  const [originModelOptions, setOriginModelOptions] = useState([]);
   const [modelOptions, setModelOptions] = useState([]);
   const [groupOptions, setGroupOptions] = useState([]);
   const [basicModels, setBasicModels] = useState([]);
   const [fullModels, setFullModels] = useState([]);
   const [customModel, setCustomModel] = useState('');
   const handleInputChange = (e, { name, value }) => {
-    console.log(name, value);
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
 
-  const loadChannel = async (modelOptions) => {
+  const loadChannel = async () => {
     let res = await API.get(`/api/channel/${channelId}`);
     const { success, message, data } = res.data;
     if (success) {
@@ -64,19 +45,6 @@ const EditChannel = () => {
         data.models = [];
       } else {
         data.models = data.models.split(',');
-        setTimeout(() => {
-          let localModelOptions = [...modelOptions];
-          data.models.forEach((model) => {
-            if (!localModelOptions.find((option) => option.key === model)) {
-              localModelOptions.push({
-                key: model,
-                text: model,
-                value: model,
-              });
-            }
-          });
-          setModelOptions(localModelOptions);
-        }, 1000);
       }
       if (data.group === '') {
         data.groups = [];
@@ -84,18 +52,7 @@ const EditChannel = () => {
         data.groups = data.group.split(',');
       }
       if (data.model_mapping !== '') {
-        data.model_mapping = JSON.stringify(
-          JSON.parse(data.model_mapping),
-          null,
-          2,
-        );
-      }
-      if (data.custom_http_headers !== '') {
-        data.custom_http_headers = JSON.stringify(
-          JSON.parse(data.custom_http_headers),
-          null,
-          2,
-        );
+        data.model_mapping = JSON.stringify(JSON.parse(data.model_mapping), null, 2);
       }
       setInputs(data);
     } else {
@@ -107,23 +64,16 @@ const EditChannel = () => {
   const fetchModels = async () => {
     try {
       let res = await API.get(`/api/channel/models`);
-
-      setFullModels(res.data.data.map((model) => model.id));
-      setBasicModels(
-        res.data.data
-          .filter((model) => !model.id.startsWith('gpt-4'))
-          .map((model) => model.id),
-      );
-
-      const allModels = res.data.data.map((model) => ({
+      let localModelOptions = res.data.data.map((model) => ({
         key: model.id,
         text: model.id,
-        value: model.id,
+        value: model.id
       }));
-
-      setModelOptions(allModels);
-
-      return allModels;
+      setOriginModelOptions(localModelOptions);
+      setFullModels(res.data.data.map((model) => model.id));
+      setBasicModels(res.data.data.filter((model) => {
+        return model.id.startsWith('gpt-3') || model.id.startsWith('text-');
+      }).map((model) => model.id));
     } catch (error) {
       showError(error.message);
     }
@@ -132,24 +82,36 @@ const EditChannel = () => {
   const fetchGroups = async () => {
     try {
       let res = await API.get(`/api/group/`);
-      setGroupOptions(
-        res.data.data.map((group) => ({
-          key: group,
-          text: group,
-          value: group,
-        })),
-      );
+      setGroupOptions(res.data.data.map((group) => ({
+        key: group,
+        text: group,
+        value: group
+      })));
     } catch (error) {
       showError(error.message);
     }
   };
 
-  useEffect(async () => {
-    const models = await fetchModels();
-    await fetchGroups();
+  useEffect(() => {
+    let localModelOptions = [...originModelOptions];
+    inputs.models.forEach((model) => {
+      if (!localModelOptions.find((option) => option.key === model)) {
+        localModelOptions.push({
+          key: model,
+          text: model,
+          value: model
+        });
+      }
+    });
+    setModelOptions(localModelOptions);
+  }, [originModelOptions, inputs.models]);
+
+  useEffect(() => {
     if (isEdit) {
-      await loadChannel(models);
+      loadChannel().then();
     }
+    fetchModels().then();
+    fetchGroups().then();
   }, []);
 
   const submit = async () => {
@@ -165,19 +127,9 @@ const EditChannel = () => {
       showInfo('模型映射必须是合法的 JSON 格式！');
       return;
     }
-    if (
-      inputs.custom_http_headers !== '' &&
-      !verifyJSON(inputs.custom_http_headers)
-    ) {
-      showInfo('自定义 HTTP 头必须是合法的 JSON 格式！');
-      return;
-    }
     let localInputs = inputs;
     if (localInputs.base_url.endsWith('/')) {
-      localInputs.base_url = localInputs.base_url.slice(
-        0,
-        localInputs.base_url.length - 1,
-      );
+      localInputs.base_url = localInputs.base_url.slice(0, localInputs.base_url.length - 1);
     }
     if (localInputs.type === 3 && localInputs.other === '') {
       localInputs.other = '2023-03-15-preview';
@@ -186,10 +138,7 @@ const EditChannel = () => {
     localInputs.models = localInputs.models.join(',');
     localInputs.group = localInputs.groups.join(',');
     if (isEdit) {
-      res = await API.put(`/api/channel/`, {
-        ...localInputs,
-        id: parseInt(channelId),
-      });
+      res = await API.put(`/api/channel/`, { ...localInputs, id: parseInt(channelId) });
     } else {
       res = await API.post(`/api/channel/`, localInputs);
     }
@@ -221,80 +170,57 @@ const EditChannel = () => {
               onChange={handleInputChange}
             />
           </Form.Field>
-          {inputs.type === 3 && (
-            <>
-              <Message>
-                注意，<strong>模型部署名称必须和模型名称保持一致</strong>，因为
-                One API 会把请求体中的 model
-                参数替换为你的部署名称（模型名称中的点会被剔除），
-                <a
-                  target='_blank'
-                  href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'
-                >
-                  图片演示
-                </a>
-                。
-              </Message>
+          {
+            inputs.type === 3 && (
+              <>
+                <Message>
+                  注意，<strong>模型部署名称必须和模型名称保持一致</strong>，因为 One API 会把请求体中的 model
+                  参数替换为你的部署名称（模型名称中的点会被剔除），<a target='_blank'
+                                                                    href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'>图片演示</a>。
+                </Message>
+                <Form.Field>
+                  <Form.Input
+                    label='AZURE_OPENAI_ENDPOINT'
+                    name='base_url'
+                    placeholder={'请输入 AZURE_OPENAI_ENDPOINT，例如：https://docs-test-001.openai.azure.com'}
+                    onChange={handleInputChange}
+                    value={inputs.base_url}
+                    autoComplete='new-password'
+                  />
+                </Form.Field>
+                <Form.Field>
+                  <Form.Input
+                    label='默认 API 版本'
+                    name='other'
+                    placeholder={'请输入默认 API 版本，例如：2023-03-15-preview，该配置可以被实际的请求查询参数所覆盖'}
+                    onChange={handleInputChange}
+                    value={inputs.other}
+                    autoComplete='new-password'
+                  />
+                </Form.Field>
+              </>
+            )
+          }
+          {
+            inputs.type === 8 && (
               <Form.Field>
                 <Form.Input
-                  label='AZURE_OPENAI_ENDPOINT'
+                  label='Base URL'
                   name='base_url'
-                  placeholder={
-                    '请输入 AZURE_OPENAI_ENDPOINT，例如：https://docs-test-001.openai.azure.com'
-                  }
+                  placeholder={'请输入自定义渠道的 Base URL，例如：https://openai.justsong.cn'}
                   onChange={handleInputChange}
                   value={inputs.base_url}
                   autoComplete='new-password'
                 />
               </Form.Field>
-              <Form.Field>
-                <Form.Input
-                  label='默认 API 版本'
-                  name='other'
-                  placeholder={
-                    '请输入默认 API 版本，例如：2023-03-15-preview，该配置可以被实际的请求查询参数所覆盖'
-                  }
-                  onChange={handleInputChange}
-                  value={inputs.other}
-                  autoComplete='new-password'
-                />
-              </Form.Field>
-            </>
-          )}
-          {inputs.type === 8 && (
-            <Form.Field>
-              <Form.Input
-                label='Base URL'
-                name='base_url'
-                placeholder={
-                  '请输入自定义渠道的 Base URL，例如：https://openai.justsong.cn'
-                }
-                onChange={handleInputChange}
-                value={inputs.base_url}
-                autoComplete='new-password'
-              />
-            </Form.Field>
-          )}
-          {inputs.type !== 3 && inputs.type !== 8 && (
-            <Form.Field>
-              <Form.Input
-                label='镜像'
-                name='base_url'
-                placeholder={
-                  '此项可选，输入镜像站地址，格式为：https://domain.com'
-                }
-                onChange={handleInputChange}
-                value={inputs.base_url}
-                autoComplete='new-password'
-              />
-            </Form.Field>
-          )}
+            )
+          }
           <Form.Field>
             <Form.Input
               label='名称'
               required
               name='name'
-              placeholder={'请输入名称'}
+              placeholder={'请为渠道命名'}
               onChange={handleInputChange}
               value={inputs.name}
               autoComplete='new-password'
@@ -303,7 +229,7 @@ const EditChannel = () => {
           <Form.Field>
             <Form.Dropdown
               label='分组'
-              placeholder={'请选择分组'}
+              placeholder={'请选择可以使用该渠道的分组'}
               name='groups'
               required
               fluid
@@ -320,7 +246,7 @@ const EditChannel = () => {
           <Form.Field>
             <Form.Dropdown
               label='模型'
-              placeholder={'请选择该通道所支持的模型'}
+              placeholder={'请选择该渠道所支持的模型'}
               name='models'
               required
               fluid
@@ -333,52 +259,34 @@ const EditChannel = () => {
             />
           </Form.Field>
           <div style={{ lineHeight: '40px', marginBottom: '12px' }}>
-            <Button
-              type={'button'}
-              onClick={() => {
-                handleInputChange(null, { name: 'models', value: basicModels });
-              }}
-            >
-              填入基础模型
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                handleInputChange(null, { name: 'models', value: fullModels });
-              }}
-            >
-              填入所有模型
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                handleInputChange(null, { name: 'models', value: [] });
-              }}
-            >
-              清除所有模型
-            </Button>
+            <Button type={'button'} onClick={() => {
+              handleInputChange(null, { name: 'models', value: basicModels });
+            }}>填入基础模型</Button>
+            <Button type={'button'} onClick={() => {
+              handleInputChange(null, { name: 'models', value: fullModels });
+            }}>填入所有模型</Button>
+            <Button type={'button'} onClick={() => {
+              handleInputChange(null, { name: 'models', value: [] });
+            }}>清除所有模型</Button>
             <Input
               action={
-                <Button
-                  type={'button'}
-                  onClick={() => {
-                    let localModels = [...inputs.models];
-                    localModels.push(customModel);
-                    let localModelOptions = [...modelOptions];
-                    localModelOptions.push({
-                      key: customModel,
-                      text: customModel,
-                      value: customModel,
-                    });
-                    setModelOptions(localModelOptions);
-                    handleInputChange(null, {
-                      name: 'models',
-                      value: localModels,
-                    });
-                  }}
-                >
-                  填入
-                </Button>
+                <Button type={'button'} onClick={()=>{
+                  if (customModel.trim() === "") return;
+                  if (inputs.models.includes(customModel)) return;
+                  let localModels = [...inputs.models];
+                  localModels.push(customModel);
+                  let localModelOptions = [];
+                  localModelOptions.push({
+                    key: customModel,
+                    text: customModel,
+                    value: customModel,
+                  });
+                  setModelOptions(modelOptions=>{
+                    return [...modelOptions, ...localModelOptions];
+                  });
+                  setCustomModel('');
+                  handleInputChange(null, { name: 'models', value: localModels });
+                }}>填入</Button>
               }
               placeholder='输入自定义模型名称'
               value={customModel}
@@ -387,25 +295,10 @@ const EditChannel = () => {
               }}
             />
           </div>
-          <Form.Field>
-            <Form.Checkbox
-              name='enable_ip_randomization'
-              label='将IP随机地址传递给HTTP头'
-              onChange={(e, { name, checked }) => {
-                handleInputChange(e, { name, value: checked });
-              }}
-              checked={inputs.enable_ip_randomization}
-              autoComplete='new-password'
-            />
-          </Form.Field>
           <Form.Field>
             <Form.TextArea
               label='模型映射'
-              placeholder={`此项可选，为一个 JSON 文本，键为用户请求的模型名称，值为要替换的模型名称，例如：\n${JSON.stringify(
-                MODEL_MAPPING_EXAMPLE,
-                null,
-                2,
-              )}`}
+              placeholder={`此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称，例如：\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`}
               name='model_mapping'
               onChange={handleInputChange}
               value={inputs.model_mapping}
@@ -413,60 +306,55 @@ const EditChannel = () => {
               autoComplete='new-password'
             />
           </Form.Field>
-          <Form.Field>
-            <Form.TextArea
-              label='自定义 HTTP 头'
-              placeholder={`此项可选，为一个 JSON 文本，键为 HTTP 头名称，值为 HTTP 头内容，例如：\n${JSON.stringify(
-                CUSTOM_HTTP_HEADERS_EXAMPLE,
-                null,
-                2,
-              )}`}
-              name='custom_http_headers'
-              onChange={handleInputChange}
-              value={inputs.custom_http_headers}
-              style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete='new-password'
-            />
-          </Form.Field>
-          {batch ? (
-            <Form.Field>
+          {
+            batch ? <Form.Field>
               <Form.TextArea
                 label='密钥'
                 name='key'
+                required
                 placeholder={'请输入密钥，一行一个'}
                 onChange={handleInputChange}
                 value={inputs.key}
-                style={{
-                  minHeight: 150,
-                  fontFamily: 'JetBrains Mono, Consolas',
-                }}
+                style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
                 autoComplete='new-password'
               />
-            </Form.Field>
-          ) : (
-            <Form.Field>
+            </Form.Field> : <Form.Field>
               <Form.Input
                 label='密钥'
                 name='key'
                 required
-                placeholder={'请输入密钥'}
+                placeholder={inputs.type === 15 ? "请输入 access token，当前版本暂不支持自动刷新，请每 30 天更新一次" : '请输入渠道对应的鉴权密钥'}
                 onChange={handleInputChange}
                 value={inputs.key}
                 autoComplete='new-password'
               />
             </Form.Field>
-          )}
-          {!isEdit && (
-            <Form.Checkbox
-              checked={batch}
-              label='批量创建'
-              name='batch'
-              onChange={() => setBatch(!batch)}
-            />
-          )}
-          <Button type={isEdit ? 'button' : 'submit'} positive onClick={submit}>
-            提交
-          </Button>
+          }
+          {
+            !isEdit && (
+              <Form.Checkbox
+                checked={batch}
+                label='批量创建'
+                name='batch'
+                onChange={() => setBatch(!batch)}
+              />
+            )
+          }
+          {
+            inputs.type !== 3 && inputs.type !== 8 && (
+              <Form.Field>
+                <Form.Input
+                  label='镜像'
+                  name='base_url'
+                  placeholder={'此项可选，用于通过镜像站来进行 API 调用，请输入镜像站地址，格式为：https://domain.com'}
+                  onChange={handleInputChange}
+                  value={inputs.base_url}
+                  autoComplete='new-password'
+                />
+              </Form.Field>
+            )
+          }
+          <Button type={isEdit ? "button" : "submit"} positive onClick={submit}>提交</Button>
         </Form>
       </Segment>
     </>

web/src/pages/Chat/index.js

@@ -11,4 +11,5 @@ const Chat = () => {
   );
 };
 
+
 export default Chat;

web/src/pages/Home/index.js

@@ -52,8 +52,8 @@ const Home = () => {
   }, []);
   return (
     <>
-      {homePageContentLoaded && homePageContent === '' ? (
-        <>
+      {
+        homePageContentLoaded && homePageContent === '' ? <>
           <Segment>
             <Header as='h3'>系统状况</Header>
             <Grid columns={2} stackable>
@@ -97,12 +97,6 @@ const Home = () => {
                           ? '已启用'
                           : '未启用'}
                       </p>
-                      <p>
-                        Discord 身份验证：
-                        {statusState?.status?.discord_oauth === true
-                          ? '已启用'
-                          : '未启用'}
-                      </p>
                       <p>
                         微信身份验证：
                         {statusState?.status?.wechat_login === true
@@ -121,22 +115,16 @@ const Home = () => {
               </Grid.Column>
             </Grid>
           </Segment>
-        </>
-      ) : (
-        <>
-          {homePageContent.startsWith('https://') ? (
-            <iframe
+        </> : <>
+          {
+            homePageContent.startsWith('https://') ? <iframe
               src={homePageContent}
               style={{ width: '100%', height: '100vh', border: 'none' }}
-            />
-          ) : (
-            <div
-              style={{ fontSize: 'larger' }}
-              dangerouslySetInnerHTML={{ __html: homePageContent }}
-            ></div>
-          )}
+            /> : <div style={{ fontSize: 'larger' }} dangerouslySetInnerHTML={{ __html: homePageContent }}></div>
+          }
         </>
-      )}
+      }
+
     </>
   );
 };

web/src/pages/NotFound/index.js

@@ -5,13 +5,15 @@ const NotFound = () => (
   <>
     <Header
       block
-      as='h4'
-      content='404'
-      attached='top'
-      icon='info'
-      className='small-icon'
+      as="h4"
+      content="404"
+      attached="top"
+      icon="info"
+      className="small-icon"
     />
-    <Segment attached='bottom'>未找到所请求的页面</Segment>
+    <Segment attached="bottom">
+      未找到所请求的页面
+    </Segment>
   </>
 );
 

web/src/pages/Redemption/EditRedemption.js

@@ -12,7 +12,7 @@ const EditRedemption = () => {
   const originInputs = {
     name: '',
     quota: 100000,
-    count: 1,
+    count: 1
   };
   const [inputs, setInputs] = useState(originInputs);
   const { name, quota, count } = inputs;
@@ -44,13 +44,10 @@ const EditRedemption = () => {
     localInputs.quota = parseInt(localInputs.quota);
     let res;
     if (isEdit) {
-      res = await API.put(`/api/redemption/`, {
-        ...localInputs,
-        id: parseInt(redemptionId),
-      });
+      res = await API.put(`/api/redemption/`, { ...localInputs, id: parseInt(redemptionId) });
     } else {
       res = await API.post(`/api/redemption/`, {
-        ...localInputs,
+        ...localInputs
       });
     }
     const { success, message, data } = res.data;
@@ -65,9 +62,9 @@ const EditRedemption = () => {
       showError(message);
     }
     if (!isEdit && data) {
-      let text = '';
+      let text = "";
       for (let i = 0; i < data.length; i++) {
-        text += data[i] + '\n';
+        text += data[i] + "\n";
       }
       downloadTextAsFile(text, `${inputs.name}.txt`);
     }
@@ -100,8 +97,8 @@ const EditRedemption = () => {
               type='number'
             />
           </Form.Field>
-          {!isEdit && (
-            <>
+          {
+            !isEdit && <>
               <Form.Field>
                 <Form.Input
                   label='生成数量'
@@ -114,10 +111,8 @@ const EditRedemption = () => {
                 />
               </Form.Field>
             </>
-          )}
-          <Button positive onClick={submit}>
-            提交
-          </Button>
+          }
+          <Button positive onClick={submit}>提交</Button>
         </Form>
       </Segment>
     </>

web/src/pages/Redemption/index.js

@@ -6,7 +6,7 @@ const Redemption = () => (
   <>
     <Segment>
       <Header as='h3'>管理兑换码</Header>
-      <RedemptionsTable />
+      <RedemptionsTable/>
     </Segment>
   </>
 );

web/src/pages/Setting/index.js

@@ -14,8 +14,8 @@ const Setting = () => {
         <Tab.Pane attached={false}>
           <PersonalSetting />
         </Tab.Pane>
-      ),
-    },
+      )
+    }
   ];
 
   if (isRoot()) {
@@ -25,7 +25,7 @@ const Setting = () => {
         <Tab.Pane attached={false}>
           <OperationSetting />
         </Tab.Pane>
-      ),
+      )
     });
     panes.push({
       menuItem: '系统设置',
@@ -33,7 +33,7 @@ const Setting = () => {
         <Tab.Pane attached={false}>
           <SystemSetting />
         </Tab.Pane>
-      ),
+      )
     });
     panes.push({
       menuItem: '其他设置',
@@ -41,7 +41,7 @@ const Setting = () => {
         <Tab.Pane attached={false}>
           <OtherSetting />
         </Tab.Pane>
-      ),
+      )
     });
   }
 

web/src/pages/Token/EditToken.js

@@ -2,7 +2,7 @@ import React, { useEffect, useState } from 'react';
 import { Button, Form, Header, Message, Segment } from 'semantic-ui-react';
 import { useParams } from 'react-router-dom';
 import { API, showError, showSuccess, timestamp2string } from '../../helpers';
-import { renderQuotaWithPrompt } from '../../helpers/render';
+import { renderQuota, renderQuotaWithPrompt } from '../../helpers/render';
 
 const EditToken = () => {
   const params = useParams();
@@ -13,20 +13,8 @@ const EditToken = () => {
     name: '',
     remain_quota: isEdit ? 0 : 500000,
     expired_time: -1,
-    unlimited_quota: false,
-    models: isEdit
-      ? []
-      : [
-          'gpt-3.5-turbo',
-          'gpt-3.5-turbo-0301',
-          'gpt-3.5-turbo-0613',
-          'gpt-3.5-turbo-16k',
-          'gpt-3.5-turbo-16k-0613',
-        ],
+    unlimited_quota: false
   };
-  const [modelOptions, setModelOptions] = useState([]);
-  const [basicModels, setBasicModels] = useState([]);
-  const [fullModels, setFullModels] = useState([]);
   const [inputs, setInputs] = useState(originInputs);
   const { name, remain_quota, expired_time, unlimited_quota } = inputs;
 
@@ -53,27 +41,6 @@ const EditToken = () => {
     setInputs({ ...inputs, unlimited_quota: !unlimited_quota });
   };
 
-  const fetchModels = async () => {
-    try {
-      let res = await API.get(`/api/channel/models`);
-      setModelOptions(
-        res.data.data.map((model) => ({
-          key: model.id,
-          text: model.id,
-          value: model.id,
-        })),
-      );
-      setFullModels(res.data.data.map((model) => model.id));
-      setBasicModels(
-        res.data.data
-          .filter((model) => !model.id.startsWith('gpt-4'))
-          .map((model) => model.id),
-      );
-    } catch (error) {
-      showError(error.message);
-    }
-  };
-
   const loadToken = async () => {
     let res = await API.get(`/api/token/${tokenId}`);
     const { success, message, data } = res.data;
@@ -81,11 +48,6 @@ const EditToken = () => {
       if (data.expired_time !== -1) {
         data.expired_time = timestamp2string(data.expired_time);
       }
-      if (data.models === '') {
-        data.models = [];
-      } else {
-        data.models = data.models.split(',');
-      }
       setInputs(data);
     } else {
       showError(message);
@@ -110,17 +72,9 @@ const EditToken = () => {
       }
       localInputs.expired_time = Math.ceil(time / 1000);
     }
-    if (inputs.models.length === 0) {
-      showError('请至少选择一个模型！');
-      return;
-    }
-    localInputs.models = localInputs.models.join(',');
     let res;
     if (isEdit) {
-      res = await API.put(`/api/token/`, {
-        ...localInputs,
-        id: parseInt(tokenId),
-      });
+      res = await API.put(`/api/token/`, { ...localInputs, id: parseInt(tokenId) });
     } else {
       res = await API.post(`/api/token/`, localInputs);
     }
@@ -137,10 +91,6 @@ const EditToken = () => {
     }
   };
 
-  useEffect(() => {
-    fetchModels().then();
-  }, []);
-
   return (
     <>
       <Segment loading={loading}>
@@ -161,9 +111,7 @@ const EditToken = () => {
             <Form.Input
               label='过期时间'
               name='expired_time'
-              placeholder={
-                '请输入过期时间，格式为 yyyy-MM-dd HH:mm:ss，-1 表示无限制'
-              }
+              placeholder={'请输入过期时间，格式为 yyyy-MM-dd HH:mm:ss，-1 表示无限制'}
               onChange={handleInputChange}
               value={expired_time}
               autoComplete='new-password'
@@ -171,50 +119,23 @@ const EditToken = () => {
             />
           </Form.Field>
           <div style={{ lineHeight: '40px' }}>
-            <Button
-              type={'button'}
-              onClick={() => {
-                setExpiredTime(0, 0, 0, 0);
-              }}
-            >
-              永不过期
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                setExpiredTime(1, 0, 0, 0);
-              }}
-            >
-              一个月后过期
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                setExpiredTime(0, 1, 0, 0);
-              }}
-            >
-              一天后过期
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                setExpiredTime(0, 0, 1, 0);
-              }}
-            >
-              一小时后过期
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                setExpiredTime(0, 0, 0, 1);
-              }}
-            >
-              一分钟后过期
-            </Button>
+            <Button type={'button'} onClick={() => {
+              setExpiredTime(0, 0, 0, 0);
+            }}>永不过期</Button>
+            <Button type={'button'} onClick={() => {
+              setExpiredTime(1, 0, 0, 0);
+            }}>一个月后过期</Button>
+            <Button type={'button'} onClick={() => {
+              setExpiredTime(0, 1, 0, 0);
+            }}>一天后过期</Button>
+            <Button type={'button'} onClick={() => {
+              setExpiredTime(0, 0, 1, 0);
+            }}>一小时后过期</Button>
+            <Button type={'button'} onClick={() => {
+              setExpiredTime(0, 0, 0, 1);
+            }}>一分钟后过期</Button>
           </div>
-          <Message>
-            注意，令牌的额度仅用于限制令牌本身的最大额度使用量，实际的使用受到账户的剩余额度限制。
-          </Message>
+          <Message>注意，令牌的额度仅用于限制令牌本身的最大额度使用量，实际的使用受到账户的剩余额度限制。</Message>
           <Form.Field>
             <Form.Input
               label={`额度${renderQuotaWithPrompt(remain_quota)}`}
@@ -227,58 +148,10 @@ const EditToken = () => {
               disabled={unlimited_quota}
             />
           </Form.Field>
-          <Button
-            type={'button'}
-            onClick={() => {
-              setUnlimitedQuota();
-            }}
-          >
-            {unlimited_quota ? '取消无限额度' : '设置为无限额度'}
-          </Button>
-          <Form.Field style={{ marginTop: '12px' }}>
-            <Form.Dropdown
-              label='模型'
-              placeholder={'请选择此密钥支持的模型'}
-              name='models'
-              required
-              fluid
-              multiple
-              selection
-              onChange={handleInputChange}
-              value={inputs.models}
-              autoComplete='new-password'
-              options={modelOptions}
-            />
-          </Form.Field>
-          <div style={{ lineHeight: '40px', marginBottom: '12px' }}>
-            <Button
-              type={'button'}
-              onClick={() => {
-                handleInputChange(null, { name: 'models', value: basicModels });
-              }}
-            >
-              填入基础模型
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                handleInputChange(null, { name: 'models', value: fullModels });
-              }}
-            >
-              填入所有模型
-            </Button>
-            <Button
-              type={'button'}
-              onClick={() => {
-                handleInputChange(null, { name: 'models', value: [] });
-              }}
-            >
-              清除所有模型
-            </Button>
-          </div>
-          <Button positive onClick={submit}>
-            提交
-          </Button>
+          <Button type={'button'} onClick={() => {
+            setUnlimitedQuota();
+          }}>{unlimited_quota ? '取消无限额度' : '设置为无限额度'}</Button>
+          <Button positive onClick={submit}>提交</Button>
         </Form>
       </Segment>
     </>

web/src/pages/Token/index.js

@@ -6,7 +6,7 @@ const Token = () => (
   <>
     <Segment>
       <Header as='h3'>我的令牌</Header>
-      <TokensTable />
+      <TokensTable/>
     </Segment>
   </>
 );

web/src/pages/TopUp/index.js

@@ -1,12 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Grid,
-  Header,
-  Segment,
-  Statistic,
-} from 'semantic-ui-react';
+import { Button, Form, Grid, Header, Segment, Statistic } from 'semantic-ui-react';
 import { API, showError, showInfo, showSuccess } from '../../helpers';
 import { renderQuota } from '../../helpers/render';
 
@@ -14,24 +7,32 @@ const TopUp = () => {
   const [redemptionCode, setRedemptionCode] = useState('');
   const [topUpLink, setTopUpLink] = useState('');
   const [userQuota, setUserQuota] = useState(0);
+  const [isSubmitting, setIsSubmitting] = useState(false);
 
   const topUp = async () => {
     if (redemptionCode === '') {
-      showInfo('请输入充值码！');
+      showInfo('请输入充值码！')
       return;
     }
-    const res = await API.post('/api/user/topup', {
-      key: redemptionCode,
-    });
-    const { success, message, data } = res.data;
-    if (success) {
-      showSuccess('充值成功！');
-      setUserQuota((quota) => {
-        return quota + data;
+    setIsSubmitting(true);
+    try {
+      const res = await API.post('/api/user/topup', {
+        key: redemptionCode
       });
-      setRedemptionCode('');
-    } else {
-      showError(message);
+      const { success, message, data } = res.data;
+      if (success) {
+        showSuccess('充值成功！');
+        setUserQuota((quota) => {
+          return quota + data;
+        });
+        setRedemptionCode('');
+      } else {
+        showError(message);
+      }
+    } catch (err) {
+      showError('请求失败');
+    } finally {
+      setIsSubmitting(false); 
     }
   };
 
@@ -43,15 +44,15 @@ const TopUp = () => {
     window.open(topUpLink, '_blank');
   };
 
-  const getUserQuota = async () => {
-    let res = await API.get(`/api/user/self`);
-    const { success, message, data } = res.data;
+  const getUserQuota = async ()=>{
+    let res  = await API.get(`/api/user/self`);
+    const {success, message, data} = res.data;
     if (success) {
       setUserQuota(data.quota);
     } else {
       showError(message);
     }
-  };
+  }
 
   useEffect(() => {
     let status = localStorage.getItem('status');
@@ -81,8 +82,8 @@ const TopUp = () => {
             <Button color='green' onClick={openTopUpLink}>
               获取兑换码
             </Button>
-            <Button color='yellow' onClick={topUp}>
-              充值
+            <Button color='yellow' onClick={topUp} disabled={isSubmitting}>
+                {isSubmitting ? '兑换中...' : '兑换'}
             </Button>
           </Form>
         </Grid.Column>
@@ -99,4 +100,4 @@ const TopUp = () => {
   );
 };
 
-export default TopUp;
+export default TopUp;

web/src/pages/User/AddUser.js

@@ -30,38 +30,38 @@ const AddUser = () => {
   return (
     <>
       <Segment>
-        <Header as='h3'>创建新用户账户</Header>
-        <Form autoComplete='off'>
+        <Header as="h3">创建新用户账户</Header>
+        <Form autoComplete="off">
           <Form.Field>
             <Form.Input
-              label='用户名'
-              name='username'
+              label="用户名"
+              name="username"
               placeholder={'请输入用户名'}
               onChange={handleInputChange}
               value={username}
-              autoComplete='off'
+              autoComplete="off"
               required
             />
           </Form.Field>
           <Form.Field>
             <Form.Input
-              label='显示名称'
-              name='display_name'
+              label="显示名称"
+              name="display_name"
               placeholder={'请输入显示名称'}
               onChange={handleInputChange}
               value={display_name}
-              autoComplete='off'
+              autoComplete="off"
             />
           </Form.Field>
           <Form.Field>
             <Form.Input
-              label='密码'
-              name='password'
+              label="密码"
+              name="password"
               type={'password'}
               placeholder={'请输入密码'}
               onChange={handleInputChange}
               value={password}
-              autoComplete='off'
+              autoComplete="off"
               required
             />
           </Form.Field>

web/src/pages/User/EditUser.js

@@ -13,36 +13,25 @@ const EditUser = () => {
     display_name: '',
     password: '',
     github_id: '',
-    discord_id: '',
     wechat_id: '',
     email: '',
     quota: 0,
-    group: 'default',
+    group: 'default'
   });
   const [groupOptions, setGroupOptions] = useState([]);
-  const {
-    username,
-    display_name,
-    password,
-    github_id,
-    wechat_id,
-    email,
-    quota,
-    discord_id,
-  } = inputs;
+  const { username, display_name, password, github_id, wechat_id, email, quota, group } =
+    inputs;
   const handleInputChange = (e, { name, value }) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
   const fetchGroups = async () => {
     try {
       let res = await API.get(`/api/group/`);
-      setGroupOptions(
-        res.data.data.map((group) => ({
-          key: group,
-          text: group,
-          value: group,
-        })),
-      );
+      setGroupOptions(res.data.data.map((group) => ({
+        key: group,
+        text: group,
+        value: group,
+      })));
     } catch (error) {
       showError(error.message);
     }
@@ -126,8 +115,8 @@ const EditUser = () => {
               autoComplete='new-password'
             />
           </Form.Field>
-          {userId && (
-            <>
+          {
+            userId && <>
               <Form.Field>
                 <Form.Dropdown
                   label='分组'
@@ -156,7 +145,7 @@ const EditUser = () => {
                 />
               </Form.Field>
             </>
-          )}
+          }
           <Form.Field>
             <Form.Input
               label='已绑定的 GitHub 账户'
@@ -167,16 +156,6 @@ const EditUser = () => {
               readOnly
             />
           </Form.Field>
-          <Form.Field>
-            <Form.Input
-              label='已绑定的 Discord 账户'
-              name='discord_id'
-              value={discord_id}
-              autoComplete='new-password'
-              placeholder='此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改'
-              readOnly
-            />
-          </Form.Field>
           <Form.Field>
             <Form.Input
               label='已绑定的微信账户'
@@ -197,9 +176,7 @@ const EditUser = () => {
               readOnly
             />
           </Form.Field>
-          <Button positive onClick={submit}>
-            提交
-          </Button>
+          <Button positive onClick={submit}>提交</Button>
         </Form>
       </Segment>
     </>

web/src/pages/User/index.js

@@ -6,7 +6,7 @@ const User = () => (
   <>
     <Segment>
       <Header as='h3'>管理用户</Header>
-      <UsersTable />
+      <UsersTable/>
     </Segment>
   </>
 );