update go-epay

perf(Setting): setting tab navigation

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

@@ -4,7 +4,6 @@ on:
   push:
     tags:
       - '*'
-      - '!*-alpha*'
   workflow_dispatch:
     inputs:
       name:

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

@@ -4,7 +4,6 @@ on:
   push:
     tags:
       - '*'
-      - '!*-alpha*'
   workflow_dispatch:
     inputs:
       name:

Dockerfile

@@ -5,7 +5,7 @@ COPY web/package.json .
 RUN npm install
 COPY ./web .
 COPY ./VERSION .
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
+RUN DISABLE_ESLINT_PLUGIN='true' VITE_REACT_APP_VERSION=$(cat VERSION) npm run build
 
 FROM golang AS builder2
 
@@ -17,7 +17,7 @@ WORKDIR /build
 ADD go.mod go.sum ./
 RUN go mod download
 COPY . .
-COPY --from=builder /build/build ./web/build
+COPY --from=builder /build/dist ./web/dist
 RUN go build -ldflags "-s -w -X 'one-api/common.Version=$(cat VERSION)' -extldflags '-static'" -o one-api
 
 FROM alpine

README.md

@@ -55,9 +55,20 @@
 3. Anthropic Claude 3 (claude-3-opus-20240229, claude-3-sonnet-20240229)
 4. [Ollama](https://github.com/ollama/ollama?tab=readme-ov-file)，添加渠道时，密钥可以随便填写，默认的请求地址是[http://localhost:11434](http://localhost:11434)，如果需要修改请在渠道中修改
 5. [Midjourney-Proxy(Plus)](https://github.com/novicezk/midjourney-proxy)接口，[对接文档](Midjourney.md)
+6. [零一万物](https://platform.lingyiwanwu.com/)
 
 您可以在渠道中添加自定义模型gpt-4-gizmo-*，此模型并非OpenAI官方模型，而是第三方模型，使用官方key无法调用。
 
+## 渠道重试
+渠道重试功能已经实现，可以在`设置->运营设置->通用设置`设置重试次数，建议开启缓存功能。  
+如果开启了重试功能，第一次重试使用同优先级，第二次重试使用下一个优先级，以此类推。  
+### 缓存设置方法
+1. `REDIS_CONN_STRING`：设置之后将使用 Redis 作为缓存使用。
+    + 例子：`REDIS_CONN_STRING=redis://default:redispw@localhost:49153`
+2. `MEMORY_CACHE_ENABLED`：启用内存缓存（如果设置了`REDIS_CONN_STRING`，则无需手动设置），会导致用户额度的更新存在一定的延迟，可选值为 `true` 和 `false`，未设置则默认为 `false`。
+    + 例子：`MEMORY_CACHE_ENABLED=true`
+
+
 ## 部署
 ### 基于 Docker 进行部署
 ```shell

common/constants.go

@@ -55,7 +55,8 @@ var TelegramOAuthEnabled = false
 var TurnstileCheckEnabled = false
 var RegisterEnabled = true
 
-var EmailDomainRestrictionEnabled = false
+var EmailDomainRestrictionEnabled = false // 是否启用邮箱域名限制
+var EmailAliasRestrictionEnabled = false  // 是否启用邮箱别名限制
 var EmailDomainWhitelist = []string{
 	"gmail.com",
 	"163.com",
@@ -75,6 +76,7 @@ var LogConsumeEnabled = true
 
 var SMTPServer = ""
 var SMTPPort = 587
+var SMTPSSLEnabled = false
 var SMTPAccount = ""
 var SMTPFrom = ""
 var SMTPToken = ""
@@ -110,7 +112,7 @@ var IsMasterNode = os.Getenv("NODE_TYPE") != "slave"
 var requestInterval, _ = strconv.Atoi(os.Getenv("POLLING_INTERVAL"))
 var RequestInterval = time.Duration(requestInterval) * time.Second
 
-var SyncFrequency = GetOrDefault("SYNC_FREQUENCY", 10*60) // unit is second
+var SyncFrequency = GetOrDefault("SYNC_FREQUENCY", 60) // unit is second
 
 var BatchUpdateEnabled = false
 var BatchUpdateInterval = GetOrDefault("BATCH_UPDATE_INTERVAL", 5)
@@ -212,6 +214,7 @@ const (
 	ChannelTypeMoonshot       = 25
 	ChannelTypeZhipu_v4       = 26
 	ChannelTypePerplexity     = 27
+	ChannelTypeLingYiWanWu    = 31
 )
 
 var ChannelBaseURLs = []string{
@@ -243,4 +246,8 @@ var ChannelBaseURLs = []string{
 	"https://api.moonshot.cn",                   //25
 	"https://open.bigmodel.cn",                  //26
 	"https://api.perplexity.ai",                 //27
+	"",                                          //28
+	"",                                          //29
+	"",                                          //30
+	"https://api.lingyiwanwu.com",               //31
 }

common/email.go

@@ -24,7 +24,7 @@ func SendEmail(subject string, receiver string, content string) error {
 	addr := fmt.Sprintf("%s:%d", SMTPServer, SMTPPort)
 	to := strings.Split(receiver, ";")
 	var err error
-	if SMTPPort == 465 {
+	if SMTPPort == 465 || SMTPSSLEnabled {
 		tlsConfig := &tls.Config{
 			InsecureSkipVerify: true,
 			ServerName:         SMTPServer,

common/gin.go

@@ -5,18 +5,37 @@ import (
 	"encoding/json"
 	"github.com/gin-gonic/gin"
 	"io"
+	"strings"
 )
 
-func UnmarshalBodyReusable(c *gin.Context, v any) error {
+const KeyRequestBody = "key_request_body"
+
+func GetRequestBody(c *gin.Context) ([]byte, error) {
+	requestBody, _ := c.Get(KeyRequestBody)
+	if requestBody != nil {
+		return requestBody.([]byte), nil
+	}
 	requestBody, err := io.ReadAll(c.Request.Body)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	err = c.Request.Body.Close()
+	_ = c.Request.Body.Close()
+	c.Set(KeyRequestBody, requestBody)
+	return requestBody.([]byte), nil
+}
+
+func UnmarshalBodyReusable(c *gin.Context, v any) error {
+	requestBody, err := GetRequestBody(c)
 	if err != nil {
 		return err
 	}
-	err = json.Unmarshal(requestBody, &v)
+	contentType := c.Request.Header.Get("Content-Type")
+	if strings.HasPrefix(contentType, "application/json") {
+		err = json.Unmarshal(requestBody, &v)
+	} else {
+		// skip for now
+		// TODO: someday non json request have variant model, we will need to implementation this
+	}
 	if err != nil {
 		return err
 	}

common/model-ratio.go

@@ -3,10 +3,9 @@ package common
 import (
 	"encoding/json"
 	"strings"
-	"time"
 )
 
-// ModelRatio
+// modelRatio
 // https://platform.openai.com/docs/models/model-endpoint-compatibility
 // https://cloud.baidu.com/doc/WENXINWORKSHOP/s/Blfmc9dlf
 // https://openai.com/pricing
@@ -27,7 +26,7 @@ var DefaultModelRatio = map[string]float64{
 	"gpt-4-turbo-preview":       5,    // $0.01 / 1K tokens
 	"gpt-4-vision-preview":      5,    // $0.01 / 1K tokens
 	"gpt-4-1106-vision-preview": 5,    // $0.01 / 1K tokens
-	"gpt-3.5-turbo":             0.75, // $0.0015 / 1K tokens
+	"gpt-3.5-turbo":             0.25, // $0.0015 / 1K tokens
 	"gpt-3.5-turbo-0301":        0.75,
 	"gpt-3.5-turbo-0613":        0.75,
 	"gpt-3.5-turbo-16k":         1.5, // $0.003 / 1K tokens
@@ -72,8 +71,11 @@ var DefaultModelRatio = map[string]float64{
 	"ERNIE-Bot-4":               8.572,  // ￥0.12 / 1k tokens
 	"Embedding-V1":              0.1429, // ￥0.002 / 1k tokens
 	"PaLM-2":                    1,
-	"gemini-pro":                1,      // $0.00025 / 1k characters -> $0.001 / 1k tokens
+	"gemini-pro":                1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
-	"gemini-pro-vision":         1,      // $0.00025 / 1k characters -> $0.001 / 1k tokens
+	"gemini-pro-vision":         1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
+	"gemini-1.0-pro-vision-001": 1,
+	"gemini-1.0-pro-001":        1,
+	"gemini-1.5-pro":            1,
 	"chatglm_turbo":             0.3572, // ￥0.005 / 1k tokens
 	"chatglm_pro":               0.7143, // ￥0.01 / 1k tokens
 	"chatglm_std":               0.3572, // ￥0.005 / 1k tokens
@@ -93,6 +95,11 @@ var DefaultModelRatio = map[string]float64{
 	"embedding_s1_v1":           0.0715, // ¥0.001 / 1k tokens
 	"semantic_similarity_s1_v1": 0.0715, // ¥0.001 / 1k tokens
 	"hunyuan":                   7.143,  // ¥0.1 / 1k tokens  // https://cloud.tencent.com/document/product/1729/97731#e0e6be58-60c8-469f-bdeb-6c264ce3b4d0
+	// https://platform.lingyiwanwu.com/docs#-计费单元
+	// 已经按照 7.2 来换算美元价格
+	"yi-34b-chat-0205": 0.018,
+	"yi-34b-chat-200k": 0.0864,
+	"yi-vl-plus":       0.0432,
 }
 
 var DefaultModelPrice = map[string]float64{
@@ -114,14 +121,14 @@ var DefaultModelPrice = map[string]float64{
 	"swap_face":         0.05,
 }
 
-var ModelPrice = map[string]float64{}
+var modelPrice map[string]float64 = nil
-var ModelRatio = map[string]float64{}
+var modelRatio map[string]float64 = nil
 
 func ModelPrice2JSONString() string {
-	if len(ModelPrice) == 0 {
+	if modelPrice == nil {
-		ModelPrice = DefaultModelPrice
+		modelPrice = DefaultModelPrice
 	}
-	jsonBytes, err := json.Marshal(ModelPrice)
+	jsonBytes, err := json.Marshal(modelPrice)
 	if err != nil {
 		SysError("error marshalling model price: " + err.Error())
 	}
@@ -129,18 +136,18 @@ func ModelPrice2JSONString() string {
 }
 
 func UpdateModelPriceByJSONString(jsonStr string) error {
-	ModelPrice = make(map[string]float64)
+	modelPrice = make(map[string]float64)
-	return json.Unmarshal([]byte(jsonStr), &ModelPrice)
+	return json.Unmarshal([]byte(jsonStr), &modelPrice)
 }
 
 func GetModelPrice(name string, printErr bool) float64 {
-	if len(ModelPrice) == 0 {
+	if modelPrice == nil {
-		ModelPrice = DefaultModelPrice
+		modelPrice = DefaultModelPrice
 	}
 	if strings.HasPrefix(name, "gpt-4-gizmo") {
 		name = "gpt-4-gizmo-*"
 	}
-	price, ok := ModelPrice[name]
+	price, ok := modelPrice[name]
 	if !ok {
 		if printErr {
 			SysError("model price not found: " + name)
@@ -151,10 +158,10 @@ func GetModelPrice(name string, printErr bool) float64 {
 }
 
 func ModelRatio2JSONString() string {
-	if len(ModelRatio) == 0 {
+	if modelRatio == nil {
-		ModelRatio = DefaultModelRatio
+		modelRatio = DefaultModelRatio
 	}
-	jsonBytes, err := json.Marshal(ModelRatio)
+	jsonBytes, err := json.Marshal(modelRatio)
 	if err != nil {
 		SysError("error marshalling model ratio: " + err.Error())
 	}
@@ -162,18 +169,18 @@ func ModelRatio2JSONString() string {
 }
 
 func UpdateModelRatioByJSONString(jsonStr string) error {
-	ModelRatio = make(map[string]float64)
+	modelRatio = make(map[string]float64)
-	return json.Unmarshal([]byte(jsonStr), &ModelRatio)
+	return json.Unmarshal([]byte(jsonStr), &modelRatio)
 }
 
 func GetModelRatio(name string) float64 {
-	if len(ModelRatio) == 0 {
+	if modelRatio == nil {
-		ModelRatio = DefaultModelRatio
+		modelRatio = DefaultModelRatio
 	}
 	if strings.HasPrefix(name, "gpt-4-gizmo") {
 		name = "gpt-4-gizmo-*"
 	}
-	ratio, ok := ModelRatio[name]
+	ratio, ok := modelRatio[name]
 	if !ok {
 		SysError("model ratio not found: " + name)
 		return 30
@@ -183,22 +190,15 @@ func GetModelRatio(name string) float64 {
 
 func GetCompletionRatio(name string) float64 {
 	if strings.HasPrefix(name, "gpt-3.5") {
-		if strings.HasSuffix(name, "0125") {
+		if name == "gpt-3.5-turbo" || strings.HasSuffix(name, "0125") {
+			// https://openai.com/blog/new-embedding-models-and-api-updates
+			// Updated GPT-3.5 Turbo model and lower pricing
 			return 3
 		}
 		if strings.HasSuffix(name, "1106") {
 			return 2
 		}
-		if name == "gpt-3.5-turbo" || name == "gpt-3.5-turbo-16k" {
+		return 4.0 / 3.0
-			// TODO: clear this after 2023-12-11
-			now := time.Now()
-			// https://platform.openai.com/docs/models/continuous-model-upgrades
-			// if after 2023-12-11, use 2
-			if now.After(time.Date(2023, 12, 11, 0, 0, 0, 0, time.UTC)) {
-				return 2
-			}
-		}
-		return 1.333333
 	}
 	if strings.HasPrefix(name, "gpt-4") {
 		if strings.HasSuffix(name, "preview") {
@@ -213,5 +213,15 @@ func GetCompletionRatio(name string) float64 {
 	} else if strings.HasPrefix(name, "claude-3") {
 		return 5
 	}
+	if strings.HasPrefix(name, "mistral-") {
+		return 3
+	}
+	if strings.HasPrefix(name, "gemini-") {
+		return 3
+	}
+	switch name {
+	case "llama2-70b-4096":
+		return 0.8 / 0.7
+	}
 	return 1
 }

common/redis.go

@@ -18,9 +18,8 @@ func InitRedisClient() (err error) {
 		return nil
 	}
 	if os.Getenv("SYNC_FREQUENCY") == "" {
-		RedisEnabled = false
+		SysLog("SYNC_FREQUENCY not set, use default value 60")
-		SysLog("SYNC_FREQUENCY not set, Redis is disabled")
+		SyncFrequency = 60
-		return nil
 	}
 	SysLog("Redis is enabled")
 	opt, err := redis.ParseURL(os.Getenv("REDIS_CONN_STRING"))

common/utils.go

@@ -236,3 +236,8 @@ func StringToByteSlice(s string) []byte {
 	tmp2 := [3]uintptr{tmp1[0], tmp1[1], tmp1[1]}
 	return *(*[]byte)(unsafe.Pointer(&tmp2))
 }
+
+func RandomSleep() {
+	// Sleep for 0-3000 ms
+	time.Sleep(time.Duration(rand.Intn(3000)) * time.Millisecond)
+}

constant/sensitive.go

@@ -4,7 +4,8 @@ import "strings"
 
 var CheckSensitiveEnabled = true
 var CheckSensitiveOnPromptEnabled = true
-var CheckSensitiveOnCompletionEnabled = true
+
+//var CheckSensitiveOnCompletionEnabled = true
 
 // StopOnSensitiveEnabled 如果检测到敏感词，是否立刻停止生成，否则替换敏感词
 var StopOnSensitiveEnabled = true
@@ -37,6 +38,6 @@ func ShouldCheckPromptSensitive() bool {
 	return CheckSensitiveEnabled && CheckSensitiveOnPromptEnabled
 }
 
-func ShouldCheckCompletionSensitive() bool {
+//func ShouldCheckCompletionSensitive() bool {
-	return CheckSensitiveEnabled && CheckSensitiveOnCompletionEnabled
+//	return CheckSensitiveEnabled && CheckSensitiveOnCompletionEnabled
-}
+//}

controller/channel-test.go

@@ -27,7 +27,6 @@ func testChannel(channel *model.Channel, testModel string) (err error, openaiErr
 	if channel.Type == common.ChannelTypeMidjourney {
 		return errors.New("midjourney channel test is not supported"), nil
 	}
-	common.SysLog(fmt.Sprintf("testing channel %d with model %s", channel.Id, testModel))
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Request = &http.Request{
@@ -60,12 +59,16 @@ func testChannel(channel *model.Channel, testModel string) (err error, openaiErr
 		return fmt.Errorf("invalid api type: %d, adaptor is nil", apiType), nil
 	}
 	if testModel == "" {
-		testModel = adaptor.GetModelList()[0]
+		if channel.TestModel != nil && *channel.TestModel != "" {
-		meta.UpstreamModelName = testModel
+			testModel = *channel.TestModel
+		} else {
+			testModel = adaptor.GetModelList()[0]
+		}
 	}
 	request := buildTestRequest()
 	request.Model = testModel
 	meta.UpstreamModelName = testModel
+	common.SysLog(fmt.Sprintf("testing channel %d with model %s", channel.Id, testModel))
 
 	adaptor.Init(meta, *request)
 
@@ -87,7 +90,7 @@ func testChannel(channel *model.Channel, testModel string) (err error, openaiErr
 		err := relaycommon.RelayErrorHandler(resp)
 		return fmt.Errorf("status code %d: %s", resp.StatusCode, err.Error.Message), &err.Error
 	}
-	usage, respErr, _ := adaptor.DoResponse(c, resp, meta)
+	usage, respErr := adaptor.DoResponse(c, resp, meta)
 	if respErr != nil {
 		return fmt.Errorf("%s", respErr.Error.Message), &respErr.Error
 	}
@@ -108,6 +111,7 @@ func buildTestRequest() *dto.GeneralOpenAIRequest {
 	testRequest := &dto.GeneralOpenAIRequest{
 		Model:     "", // this will be set later
 		MaxTokens: 1,
+		Stream:    false,
 	}
 	content, _ := json.Marshal("hi")
 	testMessage := dto.Message{

controller/midjourney.go

@@ -147,7 +147,7 @@ func UpdateMidjourneyTaskBulk() {
 					task.Buttons = string(buttonStr)
 				}
 
-				if task.Progress != "100%" && responseItem.FailReason != "" {
+				if (task.Progress != "100%" && responseItem.FailReason != "") || (task.Progress == "100%" && task.Status == "FAILURE") {
 					common.LogInfo(ctx, task.MjId+" 构建失败，"+task.FailReason)
 					task.Progress = "100%"
 					err = model.CacheUpdateUserQuota(task.UserId)

controller/misc.go

@@ -120,10 +120,20 @@ func SendEmailVerification(c *gin.Context) {
 		})
 		return
 	}
+	parts := strings.Split(email, "@")
+	if len(parts) != 2 {
+		c.JSON(http.StatusOK, gin.H{
+			"success": false,
+			"message": "无效的邮箱地址",
+		})
+		return
+	}
+	localPart := parts[0]
+	domainPart := parts[1]
 	if common.EmailDomainRestrictionEnabled {
 		allowed := false
 		for _, domain := range common.EmailDomainWhitelist {
-			if strings.HasSuffix(email, "@"+domain) {
+			if domainPart == domain {
 				allowed = true
 				break
 			}
@@ -131,11 +141,22 @@ func SendEmailVerification(c *gin.Context) {
 		if !allowed {
 			c.JSON(http.StatusOK, gin.H{
 				"success": false,
-				"message": "管理员启用了邮箱域名白名单，您的邮箱地址的域名不在白名单中",
+				"message": "The administrator has enabled the email domain name whitelist, and your email address is not allowed due to special symbols or it's not in the whitelist.",
 			})
 			return
 		}
 	}
+	if common.EmailAliasRestrictionEnabled {
+		containsSpecialSymbols := strings.Contains(localPart, "+") || strings.Count(localPart, ".") > 1
+		if containsSpecialSymbols {
+			c.JSON(http.StatusOK, gin.H{
+				"success": false,
+				"message": "管理员已启用邮箱地址别名限制，您的邮箱地址由于包含特殊符号而被拒绝。",
+			})
+			return
+		}
+	}
+
 	if model.IsEmailAlreadyTaken(email) {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,

controller/model.go

@@ -10,6 +10,7 @@ import (
 	"one-api/relay"
 	"one-api/relay/channel/ai360"
 	"one-api/relay/channel/moonshot"
+	"one-api/relay/channel/lingyiwanwu"
 	relayconstant "one-api/relay/constant"
 )
 
@@ -101,6 +102,17 @@ func init() {
 			Parent:     nil,
 		})
 	}
+	for _, modelName := range lingyiwanwu.ModelList {
+		openAIModels = append(openAIModels, OpenAIModels{
+			Id:         modelName,
+			Object:     "model",
+			Created:    1626777600,
+			OwnedBy:    "lingyiwanwu",
+			Permission: permission,
+			Root:       modelName,
+			Parent:     nil,
+		})
+	}
 	for modelName, _ := range constant.MidjourneyModel2Action {
 		openAIModels = append(openAIModels, OpenAIModels{
 			Id:         modelName,

controller/relay.go

@@ -1,21 +1,23 @@
 package controller
 
 import (
+	"bytes"
 	"fmt"
 	"github.com/gin-gonic/gin"
+	"io"
 	"log"
 	"net/http"
 	"one-api/common"
 	"one-api/dto"
+	"one-api/middleware"
+	"one-api/model"
 	"one-api/relay"
 	"one-api/relay/constant"
 	relayconstant "one-api/relay/constant"
 	"one-api/service"
-	"strconv"
 )
 
-func Relay(c *gin.Context) {
+func relayHandler(c *gin.Context, relayMode int) *dto.OpenAIErrorWithStatusCode {
-	relayMode := constant.Path2RelayMode(c.Request.URL.Path)
 	var err *dto.OpenAIErrorWithStatusCode
 	switch relayMode {
 	case relayconstant.RelayModeImagesGenerations:
@@ -29,33 +31,92 @@ func Relay(c *gin.Context) {
 	default:
 		err = relay.TextHelper(c)
 	}
-	if err != nil {
+	return err
-		requestId := c.GetString(common.RequestIdKey)
+}
-		retryTimesStr := c.Query("retry")
+
-		retryTimes, _ := strconv.Atoi(retryTimesStr)
+func Relay(c *gin.Context) {
-		if retryTimesStr == "" {
+	relayMode := constant.Path2RelayMode(c.Request.URL.Path)
-			retryTimes = common.RetryTimes
+	retryTimes := common.RetryTimes
+	requestId := c.GetString(common.RequestIdKey)
+	channelId := c.GetInt("channel_id")
+	group := c.GetString("group")
+	originalModel := c.GetString("original_model")
+	openaiErr := relayHandler(c, relayMode)
+	retryLogStr := fmt.Sprintf("重试：%d", channelId)
+	if openaiErr != nil {
+		go processChannelError(c, channelId, openaiErr)
+	} else {
+		retryTimes = 0
+	}
+	for i := 0; shouldRetry(c, channelId, openaiErr, retryTimes) && i < retryTimes; i++ {
+		channel, err := model.CacheGetRandomSatisfiedChannel(group, originalModel, i)
+		if err != nil {
+			common.LogError(c.Request.Context(), fmt.Sprintf("CacheGetRandomSatisfiedChannel failed: %s", err.Error()))
+			break
 		}
-		if retryTimes > 0 {
+		channelId = channel.Id
-			c.Redirect(http.StatusTemporaryRedirect, fmt.Sprintf("%s?retry=%d", c.Request.URL.Path, retryTimes-1))
+		retryLogStr += fmt.Sprintf("->%d", channel.Id)
-		} else {
+		common.LogInfo(c.Request.Context(), fmt.Sprintf("using channel #%d to retry (remain times %d)", channel.Id, i))
-			if err.StatusCode == http.StatusTooManyRequests {
+		middleware.SetupContextForSelectedChannel(c, channel, originalModel)
-				//err.Error.Message = "当前分组上游负载已饱和，请稍后再试"
+
-			}
+		requestBody, err := common.GetRequestBody(c)
-			err.Error.Message = common.MessageWithRequestId(err.Error.Message, requestId)
+		c.Request.Body = io.NopCloser(bytes.NewBuffer(requestBody))
-			c.JSON(err.StatusCode, gin.H{
+		openaiErr = relayHandler(c, relayMode)
-				"error": err.Error,
+		if openaiErr != nil {
-			})
+			go processChannelError(c, channelId, openaiErr)
 		}
-		channelId := c.GetInt("channel_id")
+	}
-		autoBan := c.GetBool("auto_ban")
+	common.LogInfo(c.Request.Context(), retryLogStr)
-		common.LogError(c.Request.Context(), fmt.Sprintf("relay error (channel #%d): %s", channelId, err.Error.Message))
+
-		// https://platform.openai.com/docs/guides/error-codes/api-errors
+	if openaiErr != nil {
-		if service.ShouldDisableChannel(&err.Error, err.StatusCode) && autoBan {
+		if openaiErr.StatusCode == http.StatusTooManyRequests {
-			channelId := c.GetInt("channel_id")
+			openaiErr.Error.Message = "当前分组上游负载已饱和，请稍后再试"
-			channelName := c.GetString("channel_name")
-			service.DisableChannel(channelId, channelName, err.Error.Message)
 		}
+		openaiErr.Error.Message = common.MessageWithRequestId(openaiErr.Error.Message, requestId)
+		c.JSON(openaiErr.StatusCode, gin.H{
+			"error": openaiErr.Error,
+		})
+	}
+}
+
+func shouldRetry(c *gin.Context, channelId int, openaiErr *dto.OpenAIErrorWithStatusCode, retryTimes int) bool {
+	if openaiErr == nil {
+		return false
+	}
+	if retryTimes <= 0 {
+		return false
+	}
+	if _, ok := c.Get("specific_channel_id"); ok {
+		return false
+	}
+	if openaiErr.StatusCode == http.StatusTooManyRequests {
+		return true
+	}
+	if openaiErr.StatusCode/100 == 5 {
+		// 超时不重试
+		if openaiErr.StatusCode == 504 || openaiErr.StatusCode == 524 {
+			return false
+		}
+		return true
+	}
+	if openaiErr.StatusCode == http.StatusBadRequest {
+		return false
+	}
+	if openaiErr.LocalError {
+		return false
+	}
+	if openaiErr.StatusCode/100 == 2 {
+		return false
+	}
+	return true
+}
+
+func processChannelError(c *gin.Context, channelId int, err *dto.OpenAIErrorWithStatusCode) {
+	autoBan := c.GetBool("auto_ban")
+	common.LogError(c.Request.Context(), fmt.Sprintf("relay error (channel #%d): %s", channelId, err.Error.Message))
+	if service.ShouldDisableChannel(&err.Error, err.StatusCode) && autoBan {
+		channelName := c.GetString("channel_name")
+		service.DisableChannel(channelId, channelName, err.Error.Message)
 	}
 }
 

controller/topup.go

@@ -2,9 +2,10 @@ package controller
 
 import (
 	"fmt"
+	"github.com/Calcium-Ion/go-epay/epay"
 	"github.com/gin-gonic/gin"
 	"github.com/samber/lo"
-	epay "github.com/star-horizon/go-epay"
+
 	"log"
 	"net/url"
 	"one-api/common"
@@ -30,7 +31,7 @@ func GetEpayClient() *epay.Client {
 	if common.PayAddress == "" || common.EpayId == "" || common.EpayKey == "" {
 		return nil
 	}
-	withUrl, err := epay.NewClientWithUrl(&epay.Config{
+	withUrl, err := epay.NewClient(&epay.Config{
 		PartnerID: common.EpayId,
 		Key:       common.EpayKey,
 	}, common.PayAddress)
@@ -40,31 +41,46 @@ func GetEpayClient() *epay.Client {
 	return withUrl
 }
 
-func GetAmount(count float64, user model.User) float64 {
+func getPayMoney(amount float64, user model.User) float64 {
+	if !common.DisplayInCurrencyEnabled {
+		amount = amount / common.QuotaPerUnit
+	}
 	// 别问为什么用float64，问就是这么点钱没必要
 	topupGroupRatio := common.GetTopupGroupRatio(user.Group)
 	if topupGroupRatio == 0 {
 		topupGroupRatio = 1
 	}
-	amount := count * common.Price * topupGroupRatio
+	payMoney := amount * common.Price * topupGroupRatio
-	return amount
+	return payMoney
+}
+
+func getMinTopup() int {
+	minTopup := common.MinTopUp
+	if !common.DisplayInCurrencyEnabled {
+		minTopup = minTopup * int(common.QuotaPerUnit)
+	}
+	return minTopup
 }
 
 func RequestEpay(c *gin.Context) {
 	var req EpayRequest
 	err := c.ShouldBindJSON(&req)
 	if err != nil {
-		c.JSON(200, gin.H{"message": err.Error(), "data": 10})
+		c.JSON(200, gin.H{"message": "error", "data": "参数错误"})
 		return
 	}
-	if req.Amount < common.MinTopUp {
+	if req.Amount < getMinTopup() {
-		c.JSON(200, gin.H{"message": fmt.Sprintf("充值数量不能小于 %d", common.MinTopUp), "data": 10})
+		c.JSON(200, gin.H{"message": "error", "data": fmt.Sprintf("充值数量不能小于 %d", getMinTopup())})
 		return
 	}
 
 	id := c.GetInt("id")
 	user, _ := model.GetUserById(id, false)
-	payMoney := GetAmount(float64(req.Amount), *user)
+	payMoney := getPayMoney(float64(req.Amount), *user)
+	if payMoney < 0.01 {
+		c.JSON(200, gin.H{"message": "error", "data": "充值金额过低"})
+		return
+	}
 
 	var payType epay.PurchaseType
 	if req.PaymentMethod == "zfb" {
@@ -96,9 +112,13 @@ func RequestEpay(c *gin.Context) {
 		c.JSON(200, gin.H{"message": "error", "data": "拉起支付失败"})
 		return
 	}
+	amount := req.Amount
+	if !common.DisplayInCurrencyEnabled {
+		amount = amount / int(common.QuotaPerUnit)
+	}
 	topUp := &model.TopUp{
 		UserId:     id,
-		Amount:     req.Amount,
+		Amount:     amount,
 		Money:      payMoney,
 		TradeNo:    "A" + tradeNo,
 		CreateTime: time.Now().Unix(),
@@ -186,13 +206,13 @@ func EpayNotify(c *gin.Context) {
 			}
 			//user, _ := model.GetUserById(topUp.UserId, false)
 			//user.Quota += topUp.Amount * 500000
-			err = model.IncreaseUserQuota(topUp.UserId, topUp.Amount*500000)
+			err = model.IncreaseUserQuota(topUp.UserId, topUp.Amount*int(common.QuotaPerUnit))
 			if err != nil {
 				log.Printf("易支付回调更新用户失败: %v", topUp)
 				return
 			}
 			log.Printf("易支付回调更新用户成功 %v", topUp)
-			model.RecordLog(topUp.UserId, model.LogTypeTopup, fmt.Sprintf("使用在线充值成功，充值金额: %v，支付金额：%f", common.LogQuota(topUp.Amount*500000), topUp.Money))
+			model.RecordLog(topUp.UserId, model.LogTypeTopup, fmt.Sprintf("使用在线充值成功，充值金额: %v，支付金额：%f", common.LogQuota(topUp.Amount*int(common.QuotaPerUnit)), topUp.Money))
 		}
 	} else {
 		log.Printf("易支付异常回调: %v", verifyInfo)
@@ -206,12 +226,17 @@ func RequestAmount(c *gin.Context) {
 		c.JSON(200, gin.H{"message": "error", "data": "参数错误"})
 		return
 	}
-	if req.Amount < common.MinTopUp {
+
-		c.JSON(200, gin.H{"message": "error", "data": fmt.Sprintf("充值数量不能小于 %d", common.MinTopUp)})
+	if req.Amount < getMinTopup() {
+		c.JSON(200, gin.H{"message": "error", "data": fmt.Sprintf("充值数量不能小于 %d", getMinTopup())})
 		return
 	}
 	id := c.GetInt("id")
 	user, _ := model.GetUserById(id, false)
-	payMoney := GetAmount(float64(req.Amount), *user)
+	payMoney := getPayMoney(float64(req.Amount), *user)
+	if payMoney <= 0.01 {
+		c.JSON(200, gin.H{"message": "error", "data": "充值金额过低"})
+		return
+	}
 	c.JSON(200, gin.H{"message": "success", "data": strconv.FormatFloat(payMoney, 'f', 2, 64)})
 }

controller/user.go

@@ -7,6 +7,7 @@ import (
 	"one-api/common"
 	"one-api/model"
 	"strconv"
+	"sync"
 
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
@@ -724,7 +725,7 @@ func ManageUser(c *gin.Context) {
 		user.Role = common.RoleCommonUser
 	}
 
-	if err := user.Update(false); err != nil {
+	if err := user.UpdateAll(false); err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": err.Error(),
@@ -789,7 +790,11 @@ type topUpRequest struct {
 	Key string `json:"key"`
 }
 
+var lock = sync.Mutex{}
+
 func TopUp(c *gin.Context) {
+	lock.Lock()
+	defer lock.Unlock()
 	req := topUpRequest{}
 	err := c.ShouldBindJSON(&req)
 	if err != nil {

dto/error.go

@@ -10,6 +10,7 @@ type OpenAIError struct {
 type OpenAIErrorWithStatusCode struct {
 	Error      OpenAIError `json:"error"`
 	StatusCode int         `json:"status_code"`
+	LocalError bool
 }
 
 type GeneralErrorResponse struct {

dto/text_response.go

@@ -11,6 +11,12 @@ type TextResponseWithError struct {
 	Error   OpenAIError `json:"error"`
 }
 
+type SimpleResponse struct {
+	Usage   `json:"usage"`
+	Error   OpenAIError                `json:"error"`
+	Choices []OpenAITextResponseChoice `json:"choices"`
+}
+
 type TextResponse struct {
 	Id      string                     `json:"id"`
 	Object  string                     `json:"object"`

go.mod

@@ -4,6 +4,7 @@ module one-api
 go 1.18
 
 require (
+	github.com/Calcium-Ion/go-epay v0.0.2
 	github.com/anknown/ahocorasick v0.0.0-20190904063843-d75dbd5169c0
 	github.com/gin-contrib/cors v1.4.0
 	github.com/gin-contrib/gzip v0.0.6
@@ -16,9 +17,8 @@ require (
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/websocket v1.5.0
 	github.com/pkoukk/tiktoken-go v0.1.6
-	github.com/samber/lo v1.38.1
+	github.com/samber/lo v1.39.0
 	github.com/shirou/gopsutil v3.21.11+incompatible
-	github.com/star-horizon/go-epay v0.0.0-20230204124159-fa2e2293fdc2
 	golang.org/x/crypto v0.21.0
 	golang.org/x/image v0.15.0
 	gorm.io/driver/mysql v1.4.3
@@ -65,9 +65,9 @@ require (
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 // indirect
+	golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 // indirect
 	golang.org/x/net v0.21.0 // indirect
-	golang.org/x/sync v0.1.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect

go.sum

@@ -1,3 +1,7 @@
+github.com/Calcium-Ion/go-epay v0.0.1 h1:cRCvwNTkPmmLM5od0p4w0cTcYcAPaAVLYr41ujseDcc=
+github.com/Calcium-Ion/go-epay v0.0.1/go.mod h1:cxo/ZOg8ClvE3VAnCmEzbuyAZINSq7kFEN9oHj5WQ2U=
+github.com/Calcium-Ion/go-epay v0.0.2 h1:3knFBuaBFpHzsGeGQU/QxUqZSHh5s0+jGo0P62pJzWc=
+github.com/Calcium-Ion/go-epay v0.0.2/go.mod h1:cxo/ZOg8ClvE3VAnCmEzbuyAZINSq7kFEN9oHj5WQ2U=
 github.com/anknown/ahocorasick v0.0.0-20190904063843-d75dbd5169c0 h1:onfun1RA+KcxaMk1lfrRnwCd1UUuOjJM/lri5eM1qMs=
 github.com/anknown/ahocorasick v0.0.0-20190904063843-d75dbd5169c0/go.mod h1:4yg+jNTYlDEzBjhGS96v+zjyA3lfXlFd5CiTLIkPBLI=
 github.com/anknown/darts v0.0.0-20151216065714-83ff685239e6 h1:HblK3eJHq54yET63qPCTJnks3loDse5xRmmqHgHzwoI=
@@ -137,6 +141,8 @@ github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUA
 github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE=
 github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
 github.com/samber/lo v1.38.1/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
+github.com/samber/lo v1.39.0 h1:4gTz1wUhNYLhFSKl6O+8peW0v2F4BCY034GRpU9WnuA=
+github.com/samber/lo v1.39.0/go.mod h1:+m/ZKRl6ClXCE2Lgf3MsQlWfh4bn1bz6CXEOxnEXnEA=
 github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/star-horizon/go-epay v0.0.0-20230204124159-fa2e2293fdc2 h1:avbt5a8F/zbYwFzTugrqWOBJe/K1cJj6+xpr+x1oVAI=
@@ -175,6 +181,8 @@ golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
 golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM=
 golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE=
+golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0 h1:985EYyeCOxTpcgOTJpflJUwOeEz0CQOdPt73OzpE9F8=
+golang.org/x/exp v0.0.0-20240404231335-c0f41cb1a7a0/go.mod h1:/lliqkxwWAhPjf5oSOIJup2XcqJaw8RGS6k3TGEc7GI=
 golang.org/x/image v0.15.0 h1:kOELfmgrmJlw4Cdb7g/QGuB3CvDrXbqEIww/pNtNBm8=
 golang.org/x/image v0.15.0/go.mod h1:HUYqC05R2ZcZ3ejNQsIHQDQiwWM4JBqmm6MKANTp4LE=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
@@ -182,6 +190,8 @@ golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
 golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 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=

main.go

@@ -20,10 +20,10 @@ import (
 	_ "net/http/pprof"
 )
 
-//go:embed web/build
+//go:embed web/dist
 var buildFS embed.FS
 
-//go:embed web/build/index.html
+//go:embed web/dist/index.html
 var indexPage []byte
 
 func main() {

middleware/auth.go

@@ -127,7 +127,7 @@ func TokenAuth() func(c *gin.Context) {
 		}
 		if len(parts) > 1 {
 			if model.IsAdmin(token.UserId) {
-				c.Set("channelId", parts[1])
+				c.Set("specific_channel_id", parts[1])
 			} else {
 				abortWithOpenAiMessage(c, http.StatusForbidden, "普通用户不支持指定渠道")
 				return

middleware/distributor.go

@@ -23,7 +23,7 @@ func Distribute() func(c *gin.Context) {
 	return func(c *gin.Context) {
 		userId := c.GetInt("id")
 		var channel *model.Channel
-		channelId, ok := c.Get("channelId")
+		channelId, ok := c.Get("specific_channel_id")
 		if ok {
 			id, err := strconv.Atoi(channelId.(string))
 			if err != nil {
@@ -44,7 +44,7 @@ func Distribute() func(c *gin.Context) {
 			// Select a channel for the user
 			var modelRequest ModelRequest
 			var err error
-			if strings.HasPrefix(c.Request.URL.Path, "/mj") {
+			if strings.Contains(c.Request.URL.Path, "/mj/") {
 				relayMode := relayconstant.Path2RelayModeMidjourney(c.Request.URL.Path)
 				if relayMode == relayconstant.RelayModeMidjourneyTaskFetch ||
 					relayMode == relayconstant.RelayModeMidjourneyTaskFetchByCondition ||
@@ -131,7 +131,7 @@ func Distribute() func(c *gin.Context) {
 			userGroup, _ := model.CacheGetUserGroup(userId)
 			c.Set("group", userGroup)
 			if shouldSelectChannel {
-				channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model)
+				channel, err = model.CacheGetRandomSatisfiedChannel(userGroup, modelRequest.Model, 0)
 				if err != nil {
 					message := fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道", userGroup, modelRequest.Model)
 					// 如果错误，但是渠道不为空，说明是数据库一致性问题
@@ -147,36 +147,41 @@ func Distribute() func(c *gin.Context) {
 					abortWithOpenAiMessage(c, http.StatusServiceUnavailable, fmt.Sprintf("当前分组 %s 下对于模型 %s 无可用渠道（数据库一致性已被破坏）", userGroup, modelRequest.Model))
 					return
 				}
-				c.Set("channel", channel.Type)
+				SetupContextForSelectedChannel(c, channel, modelRequest.Model)
-				c.Set("channel_id", channel.Id)
-				c.Set("channel_name", channel.Name)
-				ban := true
-				// parse *int to bool
-				if channel.AutoBan != nil && *channel.AutoBan == 0 {
-					ban = false
-				}
-				if nil != channel.OpenAIOrganization {
-					c.Set("channel_organization", *channel.OpenAIOrganization)
-				}
-				c.Set("auto_ban", ban)
-				c.Set("model_mapping", channel.GetModelMapping())
-				c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key))
-				c.Set("base_url", channel.GetBaseURL())
-				// TODO: api_version统一
-				switch channel.Type {
-				case common.ChannelTypeAzure:
-					c.Set("api_version", channel.Other)
-				case common.ChannelTypeXunfei:
-					c.Set("api_version", channel.Other)
-				//case common.ChannelTypeAIProxyLibrary:
-				//	c.Set("library_id", channel.Other)
-				case common.ChannelTypeGemini:
-					c.Set("api_version", channel.Other)
-				case common.ChannelTypeAli:
-					c.Set("plugin", channel.Other)
-				}
 			}
 		}
 		c.Next()
 	}
 }
+
+func SetupContextForSelectedChannel(c *gin.Context, channel *model.Channel, modelName string) {
+	c.Set("channel", channel.Type)
+	c.Set("channel_id", channel.Id)
+	c.Set("channel_name", channel.Name)
+	ban := true
+	// parse *int to bool
+	if channel.AutoBan != nil && *channel.AutoBan == 0 {
+		ban = false
+	}
+	if nil != channel.OpenAIOrganization && "" != *channel.OpenAIOrganization {
+		c.Set("channel_organization", *channel.OpenAIOrganization)
+	}
+	c.Set("auto_ban", ban)
+	c.Set("model_mapping", channel.GetModelMapping())
+	c.Set("original_model", modelName) // for retry
+	c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key))
+	c.Set("base_url", channel.GetBaseURL())
+	// TODO: api_version统一
+	switch channel.Type {
+	case common.ChannelTypeAzure:
+		c.Set("api_version", channel.Other)
+	case common.ChannelTypeXunfei:
+		c.Set("api_version", channel.Other)
+	//case common.ChannelTypeAIProxyLibrary:
+	//	c.Set("library_id", channel.Other)
+	case common.ChannelTypeGemini:
+		c.Set("api_version", channel.Other)
+	case common.ChannelTypeAli:
+		c.Set("plugin", channel.Other)
+	}
+}

model/ability.go

@@ -3,6 +3,7 @@ package model
 import (
 	"errors"
 	"fmt"
+	"gorm.io/gorm"
 	"one-api/common"
 	"strings"
 )
@@ -27,8 +28,7 @@ func GetGroupModels(group string) []string {
 	return models
 }
 
-func GetRandomSatisfiedChannel(group string, model string) (*Channel, error) {
+func getPriority(group string, model string, retry int) (int, error) {
-	var abilities []Ability
 	groupCol := "`group`"
 	trueVal := "1"
 	if common.UsingPostgreSQL {
@@ -36,9 +36,55 @@ func GetRandomSatisfiedChannel(group string, model string) (*Channel, error) {
 		trueVal = "true"
 	}
 
-	var err error = nil
+	var priorities []int
+	err := DB.Model(&Ability{}).
+		Select("DISTINCT(priority)").
+		Where(groupCol+" = ? and model = ? and enabled = "+trueVal, group, model).
+		Order("priority DESC").              // 按优先级降序排序
+		Pluck("priority", &priorities).Error // Pluck用于将查询的结果直接扫描到一个切片中
+
+	if err != nil {
+		// 处理错误
+		return 0, err
+	}
+
+	// 确定要使用的优先级
+	var priorityToUse int
+	if retry >= len(priorities) {
+		// 如果重试次数大于优先级数，则使用最小的优先级
+		priorityToUse = priorities[len(priorities)-1]
+	} else {
+		priorityToUse = priorities[retry]
+	}
+	return priorityToUse, nil
+}
+
+func getChannelQuery(group string, model string, retry int) *gorm.DB {
+	groupCol := "`group`"
+	trueVal := "1"
+	if common.UsingPostgreSQL {
+		groupCol = `"group"`
+		trueVal = "true"
+	}
 	maxPrioritySubQuery := DB.Model(&Ability{}).Select("MAX(priority)").Where(groupCol+" = ? and model = ? and enabled = "+trueVal, group, model)
 	channelQuery := DB.Where(groupCol+" = ? and model = ? and enabled = "+trueVal+" and priority = (?)", group, model, maxPrioritySubQuery)
+	if retry != 0 {
+		priority, err := getPriority(group, model, retry)
+		if err != nil {
+			common.SysError(fmt.Sprintf("Get priority failed: %s", err.Error()))
+		} else {
+			channelQuery = DB.Where(groupCol+" = ? and model = ? and enabled = "+trueVal+" and priority = ?", group, model, priority)
+		}
+	}
+
+	return channelQuery
+}
+
+func GetRandomSatisfiedChannel(group string, model string, retry int) (*Channel, error) {
+	var abilities []Ability
+
+	var err error = nil
+	channelQuery := getChannelQuery(group, model, retry)
 	if common.UsingSQLite || common.UsingPostgreSQL {
 		err = channelQuery.Order("weight DESC").Find(&abilities).Error
 	} else {
@@ -52,21 +98,16 @@ func GetRandomSatisfiedChannel(group string, model string) (*Channel, error) {
 		// Randomly choose one
 		weightSum := uint(0)
 		for _, ability_ := range abilities {
-			weightSum += ability_.Weight
+			weightSum += ability_.Weight + 10
 		}
-		if weightSum == 0 {
+		// Randomly choose one
-			// All weight is 0, randomly choose one
+		weight := common.GetRandomInt(int(weightSum))
-			channel.Id = abilities[common.GetRandomInt(len(abilities))].ChannelId
+		for _, ability_ := range abilities {
-		} else {
+			weight -= int(ability_.Weight) + 10
-			// Randomly choose one
+			//log.Printf("weight: %d, ability weight: %d", weight, *ability_.Weight)
-			weight := common.GetRandomInt(int(weightSum))
+			if weight <= 0 {
-			for _, ability_ := range abilities {
+				channel.Id = ability_.ChannelId
-				weight -= int(ability_.Weight)
+				break
-				//log.Printf("weight: %d, ability weight: %d", weight, *ability_.Weight)
-				if weight <= 0 {
-					channel.Id = ability_.ChannelId
-					break
-				}
 			}
 		}
 	} else {

model/cache.go

@@ -265,14 +265,14 @@ func SyncChannelCache(frequency int) {
 	}
 }
 
-func CacheGetRandomSatisfiedChannel(group string, model string) (*Channel, error) {
+func CacheGetRandomSatisfiedChannel(group string, model string, retry int) (*Channel, error) {
 	if strings.HasPrefix(model, "gpt-4-gizmo") {
 		model = "gpt-4-gizmo-*"
 	}
 
 	// if memory cache is disabled, get channel directly from database
 	if !common.MemoryCacheEnabled {
-		return GetRandomSatisfiedChannel(group, model)
+		return GetRandomSatisfiedChannel(group, model, retry)
 	}
 	channelSyncLock.RLock()
 	defer channelSyncLock.RUnlock()
@@ -280,15 +280,27 @@ func CacheGetRandomSatisfiedChannel(group string, model string) (*Channel, error
 	if len(channels) == 0 {
 		return nil, errors.New("channel not found")
 	}
-	endIdx := len(channels)
+
-	// choose by priority
+	uniquePriorities := make(map[int]bool)
-	firstChannel := channels[0]
+	for _, channel := range channels {
-	if firstChannel.GetPriority() > 0 {
+		uniquePriorities[int(channel.GetPriority())] = true
-		for i := range channels {
+	}
-			if channels[i].GetPriority() != firstChannel.GetPriority() {
+	var sortedUniquePriorities []int
-				endIdx = i
+	for priority := range uniquePriorities {
-				break
+		sortedUniquePriorities = append(sortedUniquePriorities, priority)
-			}
+	}
+	sort.Sort(sort.Reverse(sort.IntSlice(sortedUniquePriorities)))
+
+	if retry >= len(uniquePriorities) {
+		retry = len(uniquePriorities) - 1
+	}
+	targetPriority := int64(sortedUniquePriorities[retry])
+
+	// get the priority for the given retry number
+	var targetChannels []*Channel
+	for _, channel := range channels {
+		if channel.GetPriority() == targetPriority {
+			targetChannels = append(targetChannels, channel)
 		}
 	}
 
@@ -296,20 +308,14 @@ func CacheGetRandomSatisfiedChannel(group string, model string) (*Channel, error
 	smoothingFactor := 10
 	// Calculate the total weight of all channels up to endIdx
 	totalWeight := 0
-	for _, channel := range channels[:endIdx] {
+	for _, channel := range targetChannels {
 		totalWeight += channel.GetWeight() + smoothingFactor
 	}
-
-	//if totalWeight == 0 {
-	//	// If all weights are 0, select a channel randomly
-	//	return channels[rand.Intn(endIdx)], nil
-	//}
-
 	// Generate a random value in the range [0, totalWeight)
 	randomWeight := rand.Intn(totalWeight)
 
 	// Find a channel based on its weight
-	for _, channel := range channels[:endIdx] {
+	for _, channel := range targetChannels {
 		randomWeight -= channel.GetWeight() + smoothingFactor
 		if randomWeight < 0 {
 			return channel, nil

model/channel.go

@@ -10,6 +10,7 @@ type Channel struct {
 	Type               int     `json:"type" gorm:"default:0"`
 	Key                string  `json:"key" gorm:"not null"`
 	OpenAIOrganization *string `json:"openai_organization"`
+	TestModel          *string `json:"test_model"`
 	Status             int     `json:"status" gorm:"default:1"`
 	Name               string  `json:"name" gorm:"index"`
 	Weight             *uint   `json:"weight" gorm:"default:0"`

model/option.go

@@ -44,12 +44,14 @@ func InitOptionMap() {
 	common.OptionMap["DataExportEnabled"] = strconv.FormatBool(common.DataExportEnabled)
 	common.OptionMap["ChannelDisableThreshold"] = strconv.FormatFloat(common.ChannelDisableThreshold, 'f', -1, 64)
 	common.OptionMap["EmailDomainRestrictionEnabled"] = strconv.FormatBool(common.EmailDomainRestrictionEnabled)
+	common.OptionMap["EmailAliasRestrictionEnabled"] = strconv.FormatBool(common.EmailAliasRestrictionEnabled)
 	common.OptionMap["EmailDomainWhitelist"] = strings.Join(common.EmailDomainWhitelist, ",")
 	common.OptionMap["SMTPServer"] = ""
 	common.OptionMap["SMTPFrom"] = ""
 	common.OptionMap["SMTPPort"] = strconv.Itoa(common.SMTPPort)
 	common.OptionMap["SMTPAccount"] = ""
 	common.OptionMap["SMTPToken"] = ""
+	common.OptionMap["SMTPSSLEnabled"] = strconv.FormatBool(common.SMTPSSLEnabled)
 	common.OptionMap["Notice"] = ""
 	common.OptionMap["About"] = ""
 	common.OptionMap["HomePageContent"] = ""
@@ -92,7 +94,7 @@ func InitOptionMap() {
 	common.OptionMap["MjNotifyEnabled"] = strconv.FormatBool(constant.MjNotifyEnabled)
 	common.OptionMap["CheckSensitiveEnabled"] = strconv.FormatBool(constant.CheckSensitiveEnabled)
 	common.OptionMap["CheckSensitiveOnPromptEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnPromptEnabled)
-	common.OptionMap["CheckSensitiveOnCompletionEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnCompletionEnabled)
+	//common.OptionMap["CheckSensitiveOnCompletionEnabled"] = strconv.FormatBool(constant.CheckSensitiveOnCompletionEnabled)
 	common.OptionMap["StopOnSensitiveEnabled"] = strconv.FormatBool(constant.StopOnSensitiveEnabled)
 	common.OptionMap["SensitiveWords"] = constant.SensitiveWordsToString()
 	common.OptionMap["StreamCacheQueueLength"] = strconv.Itoa(constant.StreamCacheQueueLength)
@@ -173,6 +175,8 @@ func updateOptionMap(key string, value string) (err error) {
 			common.RegisterEnabled = boolValue
 		case "EmailDomainRestrictionEnabled":
 			common.EmailDomainRestrictionEnabled = boolValue
+		case "EmailAliasRestrictionEnabled":
+			common.EmailAliasRestrictionEnabled = boolValue
 		case "AutomaticDisableChannelEnabled":
 			common.AutomaticDisableChannelEnabled = boolValue
 		case "AutomaticEnableChannelEnabled":
@@ -195,10 +199,12 @@ func updateOptionMap(key string, value string) (err error) {
 			constant.CheckSensitiveEnabled = boolValue
 		case "CheckSensitiveOnPromptEnabled":
 			constant.CheckSensitiveOnPromptEnabled = boolValue
-		case "CheckSensitiveOnCompletionEnabled":
+		//case "CheckSensitiveOnCompletionEnabled":
-			constant.CheckSensitiveOnCompletionEnabled = boolValue
+		//	constant.CheckSensitiveOnCompletionEnabled = boolValue
 		case "StopOnSensitiveEnabled":
 			constant.StopOnSensitiveEnabled = boolValue
+		case "SMTPSSLEnabled":
+			common.SMTPSSLEnabled = boolValue
 		}
 	}
 	switch key {

model/redemption.go

@@ -56,7 +56,7 @@ func Redeem(key string, userId int) (quota int, err error) {
 	if common.UsingPostgreSQL {
 		keyCol = `"key"`
 	}
-
+	common.RandomSleep()
 	err = DB.Transaction(func(tx *gorm.DB) error {
 		err := tx.Set("gorm:query_option", "FOR UPDATE").Where(keyCol+" = ?", key).First(redemption).Error
 		if err != nil {

model/user.go

@@ -4,6 +4,7 @@ import (
 	"errors"
 	"fmt"
 	"one-api/common"
+	"strconv"
 	"strings"
 	"time"
 
@@ -72,8 +73,26 @@ func GetAllUsers(startIdx int, num int) (users []*User, err error) {
 	return users, err
 }
 
-func SearchUsers(keyword string) (users []*User, err error) {
+func SearchUsers(keyword string) ([]*User, error) {
-	err = DB.Omit("password").Where("id = ? or username LIKE ? or email LIKE ? or display_name LIKE ?", keyword, keyword+"%", keyword+"%", keyword+"%").Find(&users).Error
+	var users []*User
+	var err error
+
+	// 尝试将关键字转换为整数ID
+	keywordInt, err := strconv.Atoi(keyword)
+	if err == nil {
+		// 如果转换成功，按照ID搜索用户
+		err = DB.Unscoped().Omit("password").Where("id = ?", keywordInt).Find(&users).Error
+		if err != nil || len(users) > 0 {
+			// 如果依据ID找到用户或者发生错误，返回结果或错误
+			return users, err
+		}
+	}
+
+	// 如果ID转换失败或者没有找到用户，依据其他字段进行模糊搜索
+	err = DB.Unscoped().Omit("password").
+		Where("username LIKE ? OR email LIKE ? OR display_name LIKE ?", keyword+"%", keyword+"%", keyword+"%").
+		Find(&users).Error
+
 	return users, err
 }
 
@@ -210,6 +229,27 @@ func (user *User) Update(updatePassword bool) error {
 	if err == nil {
 		if common.RedisEnabled {
 			_ = common.RedisSet(fmt.Sprintf("user_group:%d", user.Id), user.Group, time.Duration(UserId2GroupCacheSeconds)*time.Second)
+			_ = common.RedisSet(fmt.Sprintf("user_quota:%d", user.Id), strconv.Itoa(user.Quota), time.Duration(UserId2QuotaCacheSeconds)*time.Second)
+		}
+	}
+	return err
+}
+
+func (user *User) UpdateAll(updatePassword bool) error {
+	var err error
+	if updatePassword {
+		user.Password, err = common.Password2Hash(user.Password)
+		if err != nil {
+			return err
+		}
+	}
+	newUser := *user
+	DB.First(&user, user.Id)
+	err = DB.Model(user).Select("*").Updates(newUser).Error
+	if err == nil {
+		if common.RedisEnabled {
+			_ = common.RedisSet(fmt.Sprintf("user_group:%d", user.Id), user.Group, time.Duration(UserId2GroupCacheSeconds)*time.Second)
+			_ = common.RedisSet(fmt.Sprintf("user_quota:%d", user.Id), strconv.Itoa(user.Quota), time.Duration(UserId2QuotaCacheSeconds)*time.Second)
 		}
 	}
 	return err

relay/channel/adapter.go

@@ -15,7 +15,7 @@ type Adaptor interface {
 	SetupRequestHeader(c *gin.Context, req *http.Request, info *relaycommon.RelayInfo) error
 	ConvertRequest(c *gin.Context, relayMode int, request *dto.GeneralOpenAIRequest) (any, error)
 	DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error)
-	DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse)
+	DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode)
 	GetModelList() []string
 	GetChannelName() string
 }

relay/channel/ali/adaptor.go

@@ -57,7 +57,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		err, usage = aliStreamHandler(c, resp)
 	} else {

relay/channel/baidu/adaptor.go

@@ -69,7 +69,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		err, usage = baiduStreamHandler(c, resp)
 	} else {

relay/channel/claude/adaptor.go

@@ -63,7 +63,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		err, usage = claudeStreamHandler(a.RequestMode, info.UpstreamModelName, info.PromptTokens, c, resp)
 	} else {

relay/channel/claude/relay-claude.go

@@ -8,7 +8,6 @@ import (
 	"io"
 	"net/http"
 	"one-api/common"
-	"one-api/constant"
 	"one-api/dto"
 	"one-api/service"
 	"strings"
@@ -35,6 +34,7 @@ func requestOpenAI2ClaudeComplete(textRequest dto.GeneralOpenAIRequest) *ClaudeR
 		StopSequences:     nil,
 		Temperature:       textRequest.Temperature,
 		TopP:              textRequest.TopP,
+		TopK:              textRequest.TopK,
 		Stream:            textRequest.Stream,
 	}
 	if claudeRequest.MaxTokensToSample == 0 {
@@ -64,6 +64,7 @@ func requestOpenAI2ClaudeMessage(textRequest dto.GeneralOpenAIRequest) (*ClaudeR
 		StopSequences: nil,
 		Temperature:   textRequest.Temperature,
 		TopP:          textRequest.TopP,
+		TopK:          textRequest.TopK,
 		Stream:        textRequest.Stream,
 	}
 	if claudeRequest.MaxTokens == 0 {
@@ -317,7 +318,7 @@ func claudeHandler(requestMode int, c *gin.Context, resp *http.Response, promptT
 		}, nil
 	}
 	fullTextResponse := responseClaude2OpenAI(requestMode, &claudeResponse)
-	completionTokens, err, _ := service.CountTokenText(claudeResponse.Completion, model, constant.ShouldCheckCompletionSensitive())
+	completionTokens, err, _ := service.CountTokenText(claudeResponse.Completion, model, false)
 	if err != nil {
 		return service.OpenAIErrorWrapper(err, "count_token_text_failed", http.StatusInternalServerError), nil
 	}

relay/channel/gemini/adaptor.go

@@ -47,7 +47,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		var responseText string
 		err, responseText = geminiChatStreamHandler(c, resp)

relay/channel/gemini/constant.go

@@ -5,8 +5,8 @@ const (
 )
 
 var ModelList = []string{
-	"gemini-pro",
+	"gemini-pro", "gemini-1.0-pro-001", "gemini-1.5-pro",
-	"gemini-pro-vision",
+	"gemini-pro-vision", "gemini-1.0-pro-vision-001",
 }
 
 var ChannelName = "google gemini"

relay/channel/gemini/relay-gemini.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 	"one-api/common"
-	"one-api/constant"
 	"one-api/dto"
 	relaycommon "one-api/relay/common"
 	"one-api/service"
@@ -257,7 +256,7 @@ func geminiChatHandler(c *gin.Context, resp *http.Response, promptTokens int, mo
 		}, nil
 	}
 	fullTextResponse := responseGeminiChat2OpenAI(&geminiResponse)
-	completionTokens, _, _ := service.CountTokenText(geminiResponse.GetResponseText(), model, constant.ShouldCheckCompletionSensitive())
+	completionTokens, _, _ := service.CountTokenText(geminiResponse.GetResponseText(), model, false)
 	usage := dto.Usage{
 		PromptTokens:     promptTokens,
 		CompletionTokens: completionTokens,

relay/channel/lingyiwanwu/constrants.go

@@ -0,0 +1,9 @@
+package lingyiwanwu
+
+// https://platform.lingyiwanwu.com/docs
+
+var ModelList = []string{
+	"yi-34b-chat-0205",
+	"yi-34b-chat-200k",
+	"yi-vl-plus",
+}

relay/channel/ollama/adaptor.go

@@ -2,7 +2,6 @@ package ollama
 
 import (
 	"errors"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"io"
 	"net/http"
@@ -10,6 +9,7 @@ import (
 	"one-api/relay/channel"
 	"one-api/relay/channel/openai"
 	relaycommon "one-api/relay/common"
+	relayconstant "one-api/relay/constant"
 	"one-api/service"
 )
 
@@ -20,7 +20,12 @@ func (a *Adaptor) Init(info *relaycommon.RelayInfo, request dto.GeneralOpenAIReq
 }
 
 func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
-	return fmt.Sprintf("%s/api/chat", info.BaseUrl), nil
+	switch info.RelayMode {
+	case relayconstant.RelayModeEmbeddings:
+		return info.BaseUrl + "/api/embeddings", nil
+	default:
+		return relaycommon.GetFullRequestURL(info.BaseUrl, info.RequestURLPath, info.ChannelType), nil
+	}
 }
 
 func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, info *relaycommon.RelayInfo) error {
@@ -32,20 +37,29 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *dto.Gen
 	if request == nil {
 		return nil, errors.New("request is nil")
 	}
-	return requestOpenAI2Ollama(*request), nil
+	switch relayMode {
+	case relayconstant.RelayModeEmbeddings:
+		return requestOpenAI2Embeddings(*request), nil
+	default:
+		return requestOpenAI2Ollama(*request), nil
+	}
 }
 
 func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, requestBody io.Reader) (*http.Response, error) {
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		var responseText string
 		err, responseText = openai.OpenaiStreamHandler(c, resp, info.RelayMode)
 		usage, _ = service.ResponseText2Usage(responseText, info.UpstreamModelName, info.PromptTokens)
 	} else {
-		err, usage, sensitiveResp = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName, info.RelayMode)
+		if info.RelayMode == relayconstant.RelayModeEmbeddings {
+			err, usage = ollamaEmbeddingHandler(c, resp, info.PromptTokens, info.UpstreamModelName, info.RelayMode)
+		} else {
+			err, usage = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName)
+		}
 	}
 	return
 }

relay/channel/ollama/dto.go

@@ -3,16 +3,24 @@ package ollama
 import "one-api/dto"
 
 type OllamaRequest struct {
-	Model    string         `json:"model,omitempty"`
+	Model       string        `json:"model,omitempty"`
-	Messages []dto.Message  `json:"messages,omitempty"`
+	Messages    []dto.Message `json:"messages,omitempty"`
-	Stream   bool           `json:"stream,omitempty"`
+	Stream      bool          `json:"stream,omitempty"`
-	Options  *OllamaOptions `json:"options,omitempty"`
+	Temperature float64       `json:"temperature,omitempty"`
+	Seed        float64       `json:"seed,omitempty"`
+	Topp        float64       `json:"top_p,omitempty"`
+	TopK        int           `json:"top_k,omitempty"`
+	Stop        any           `json:"stop,omitempty"`
 }
 
-type OllamaOptions struct {
+type OllamaEmbeddingRequest struct {
-	Temperature float64 `json:"temperature,omitempty"`
+	Model  string `json:"model,omitempty"`
-	Seed        float64 `json:"seed,omitempty"`
+	Prompt any    `json:"prompt,omitempty"`
-	Topp        float64 `json:"top_p,omitempty"`
-	TopK        int     `json:"top_k,omitempty"`
-	Stop        any     `json:"stop,omitempty"`
 }
+
+type OllamaEmbeddingResponse struct {
+	Embedding []float64 `json:"embedding,omitempty"`
+}
+
+//type OllamaOptions struct {
+//}

relay/channel/ollama/relay-ollama.go

@@ -1,6 +1,15 @@
 package ollama
 
-import "one-api/dto"
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"github.com/gin-gonic/gin"
+	"io"
+	"net/http"
+	"one-api/dto"
+	"one-api/service"
+)
 
 func requestOpenAI2Ollama(request dto.GeneralOpenAIRequest) *OllamaRequest {
 	messages := make([]dto.Message, 0, len(request.Messages))
@@ -18,15 +27,82 @@ func requestOpenAI2Ollama(request dto.GeneralOpenAIRequest) *OllamaRequest {
 		Stop, _ = request.Stop.([]string)
 	}
 	return &OllamaRequest{
-		Model:    request.Model,
+		Model:       request.Model,
-		Messages: messages,
+		Messages:    messages,
-		Stream:   request.Stream,
+		Stream:      request.Stream,
-		Options: &OllamaOptions{
+		Temperature: request.Temperature,
-			Temperature: request.Temperature,
+		Seed:        request.Seed,
-			Seed:        request.Seed,
+		Topp:        request.TopP,
-			Topp:        request.TopP,
+		TopK:        request.TopK,
-			TopK:        request.TopK,
+		Stop:        Stop,
-			Stop:        Stop,
-		},
 	}
 }
+
+func requestOpenAI2Embeddings(request dto.GeneralOpenAIRequest) *OllamaEmbeddingRequest {
+	return &OllamaEmbeddingRequest{
+		Model:  request.Model,
+		Prompt: request.Input,
+	}
+}
+
+func ollamaEmbeddingHandler(c *gin.Context, resp *http.Response, promptTokens int, model string, relayMode int) (*dto.OpenAIErrorWithStatusCode, *dto.Usage) {
+	var ollamaEmbeddingResponse OllamaEmbeddingResponse
+	responseBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return service.OpenAIErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = json.Unmarshal(responseBody, &ollamaEmbeddingResponse)
+	if err != nil {
+		return service.OpenAIErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	data := make([]dto.OpenAIEmbeddingResponseItem, 0, 1)
+	data = append(data, dto.OpenAIEmbeddingResponseItem{
+		Embedding: ollamaEmbeddingResponse.Embedding,
+		Object:    "embedding",
+	})
+	usage := &dto.Usage{
+		TotalTokens:      promptTokens,
+		CompletionTokens: 0,
+		PromptTokens:     promptTokens,
+	}
+	embeddingResponse := &dto.OpenAIEmbeddingResponse{
+		Object: "list",
+		Data:   data,
+		Model:  model,
+		Usage:  *usage,
+	}
+	doResponseBody, err := json.Marshal(embeddingResponse)
+	if err != nil {
+		return service.OpenAIErrorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
+	}
+	resp.Body = io.NopCloser(bytes.NewBuffer(doResponseBody))
+	// 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.
+	// Copy headers
+	for k, v := range resp.Header {
+		// 删除任何现有的相同头部，以防止重复添加头部
+		c.Writer.Header().Del(k)
+		for _, vv := range v {
+			c.Writer.Header().Add(k, vv)
+		}
+	}
+	// reset content length
+	c.Writer.Header().Del("Content-Length")
+	c.Writer.Header().Set("Content-Length", fmt.Sprintf("%d", len(doResponseBody)))
+	c.Writer.WriteHeader(resp.StatusCode)
+	_, err = io.Copy(c.Writer, resp.Body)
+	if err != nil {
+		return service.OpenAIErrorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
+	}
+	return nil, usage
+}

relay/channel/openai/adaptor.go

@@ -10,6 +10,7 @@ import (
 	"one-api/dto"
 	"one-api/relay/channel"
 	"one-api/relay/channel/ai360"
+	"one-api/relay/channel/lingyiwanwu"
 	"one-api/relay/channel/moonshot"
 	relaycommon "one-api/relay/common"
 	"one-api/service"
@@ -33,9 +34,6 @@ func (a *Adaptor) GetRequestURL(info *relaycommon.RelayInfo) (string, error) {
 		model_ := info.UpstreamModelName
 		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")
 
 		requestURL = fmt.Sprintf("/openai/deployments/%s/%s", model_, task)
 		return relaycommon.GetFullRequestURL(info.BaseUrl, requestURL, info.ChannelType), nil
@@ -71,13 +69,13 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		var responseText string
 		err, responseText = OpenaiStreamHandler(c, resp, info.RelayMode)
 		usage, _ = service.ResponseText2Usage(responseText, info.UpstreamModelName, info.PromptTokens)
 	} else {
-		err, usage, sensitiveResp = OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName, info.RelayMode)
+		err, usage = OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName)
 	}
 	return
 }
@@ -88,6 +86,8 @@ func (a *Adaptor) GetModelList() []string {
 		return ai360.ModelList
 	case common.ChannelTypeMoonshot:
 		return moonshot.ModelList
+	case common.ChannelTypeLingYiWanWu:
+		return lingyiwanwu.ModelList
 	default:
 		return ModelList
 	}

relay/channel/openai/relay-openai.go

@@ -4,14 +4,10 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
-	"errors"
-	"fmt"
 	"github.com/gin-gonic/gin"
 	"io"
-	"log"
 	"net/http"
 	"one-api/common"
-	"one-api/constant"
 	"one-api/dto"
 	relayconstant "one-api/relay/constant"
 	"one-api/service"
@@ -21,7 +17,7 @@ import (
 )
 
 func OpenaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*dto.OpenAIErrorWithStatusCode, string) {
-	checkSensitive := constant.ShouldCheckCompletionSensitive()
+	//checkSensitive := constant.ShouldCheckCompletionSensitive()
 	var responseTextBuilder strings.Builder
 	scanner := bufio.NewScanner(resp.Body)
 	scanner.Split(func(data []byte, atEOF bool) (advance int, token []byte, err error) {
@@ -53,20 +49,11 @@ func OpenaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*d
 			if data[:6] != "data: " && data[:6] != "[DONE]" {
 				continue
 			}
-			sensitive := false
-			if checkSensitive {
-				// check sensitive
-				sensitive, _, data = service.SensitiveWordReplace(data, false)
-			}
 			dataChan <- data
 			data = data[6:]
 			if !strings.HasPrefix(data, "[DONE]") {
 				streamItems = append(streamItems, data)
 			}
-			if sensitive && constant.StopOnSensitiveEnabled {
-				dataChan <- "data: [DONE]"
-				break
-			}
 		}
 		streamResp := "[" + strings.Join(streamItems, ",") + "]"
 		switch relayMode {
@@ -75,11 +62,20 @@ func OpenaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*d
 			err := json.Unmarshal(common.StringToByteSlice(streamResp), &streamResponses)
 			if err != nil {
 				common.SysError("error unmarshalling stream response: " + err.Error())
-				return // just ignore the error
+				for _, item := range streamItems {
-			}
+					var streamResponse dto.ChatCompletionsStreamResponseSimple
-			for _, streamResponse := range streamResponses {
+					err := json.Unmarshal(common.StringToByteSlice(item), &streamResponse)
-				for _, choice := range streamResponse.Choices {
+					if err == nil {
-					responseTextBuilder.WriteString(choice.Delta.Content)
+						for _, choice := range streamResponse.Choices {
+							responseTextBuilder.WriteString(choice.Delta.Content)
+						}
+					}
+				}
+			} else {
+				for _, streamResponse := range streamResponses {
+					for _, choice := range streamResponse.Choices {
+						responseTextBuilder.WriteString(choice.Delta.Content)
+					}
 				}
 			}
 		case relayconstant.RelayModeCompletions:
@@ -87,11 +83,20 @@ func OpenaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*d
 			err := json.Unmarshal(common.StringToByteSlice(streamResp), &streamResponses)
 			if err != nil {
 				common.SysError("error unmarshalling stream response: " + err.Error())
-				return // just ignore the error
+				for _, item := range streamItems {
-			}
+					var streamResponse dto.CompletionsStreamResponse
-			for _, streamResponse := range streamResponses {
+					err := json.Unmarshal(common.StringToByteSlice(item), &streamResponse)
-				for _, choice := range streamResponse.Choices {
+					if err == nil {
-					responseTextBuilder.WriteString(choice.Text)
+						for _, choice := range streamResponse.Choices {
+							responseTextBuilder.WriteString(choice.Text)
+						}
+					}
+				}
+			} else {
+				for _, streamResponse := range streamResponses {
+					for _, choice := range streamResponse.Choices {
+						responseTextBuilder.WriteString(choice.Text)
+					}
 				}
 			}
 		}
@@ -124,118 +129,56 @@ func OpenaiStreamHandler(c *gin.Context, resp *http.Response, relayMode int) (*d
 	return nil, responseTextBuilder.String()
 }
 
-func OpenaiHandler(c *gin.Context, resp *http.Response, promptTokens int, model string, relayMode int) (*dto.OpenAIErrorWithStatusCode, *dto.Usage, *dto.SensitiveResponse) {
+func OpenaiHandler(c *gin.Context, resp *http.Response, promptTokens int, model string) (*dto.OpenAIErrorWithStatusCode, *dto.Usage) {
-	var responseWithError dto.TextResponseWithError
+	var simpleResponse dto.SimpleResponse
 	responseBody, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return service.OpenAIErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil, nil
+		return service.OpenAIErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
 	}
 	err = resp.Body.Close()
 	if err != nil {
-		return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil, nil
+		return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
 	}
-	err = json.Unmarshal(responseBody, &responseWithError)
+	err = json.Unmarshal(responseBody, &simpleResponse)
 	if err != nil {
-		log.Printf("unmarshal_response_body_failed: body: %s, err: %v", string(responseBody), err)
+		return service.OpenAIErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
-		return service.OpenAIErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil, nil
 	}
-	if responseWithError.Error.Type != "" {
+	if simpleResponse.Error.Type != "" {
 		return &dto.OpenAIErrorWithStatusCode{
-			Error:      responseWithError.Error,
+			Error:      simpleResponse.Error,
 			StatusCode: resp.StatusCode,
-		}, nil, nil
+		}, 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 service.OpenAIErrorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError), nil
+	}
+	err = resp.Body.Close()
+	if err != nil {
+		return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
 	}
 
-	checkSensitive := constant.ShouldCheckCompletionSensitive()
+	if simpleResponse.Usage.TotalTokens == 0 {
-	sensitiveWords := make([]string, 0)
+		completionTokens := 0
-	triggerSensitive := false
+		for _, choice := range simpleResponse.Choices {
-
+			ctkm, _, _ := service.CountTokenText(string(choice.Message.Content), model, false)
-	usage := &responseWithError.Usage
+			completionTokens += ctkm
-
-	//textResponse := &dto.TextResponse{
-	//	Choices: responseWithError.Choices,
-	//	Usage:   responseWithError.Usage,
-	//}
-	var doResponseBody []byte
-
-	switch relayMode {
-	case relayconstant.RelayModeEmbeddings:
-		embeddingResponse := &dto.OpenAIEmbeddingResponse{
-			Object: responseWithError.Object,
-			Data:   responseWithError.Data,
-			Model:  responseWithError.Model,
-			Usage:  *usage,
 		}
-		doResponseBody, err = json.Marshal(embeddingResponse)
+		simpleResponse.Usage = dto.Usage{
-	default:
+			PromptTokens:     promptTokens,
-		if responseWithError.Usage.TotalTokens == 0 || checkSensitive {
+			CompletionTokens: completionTokens,
-			completionTokens := 0
+			TotalTokens:      promptTokens + completionTokens,
-			for i, choice := range responseWithError.Choices {
-				stringContent := string(choice.Message.Content)
-				ctkm, _, _ := service.CountTokenText(stringContent, model, false)
-				completionTokens += ctkm
-				if checkSensitive {
-					sensitive, words, stringContent := service.SensitiveWordReplace(stringContent, false)
-					if sensitive {
-						triggerSensitive = true
-						msg := choice.Message
-						msg.Content = common.StringToByteSlice(stringContent)
-						responseWithError.Choices[i].Message = msg
-						sensitiveWords = append(sensitiveWords, words...)
-					}
-				}
-			}
-			responseWithError.Usage = dto.Usage{
-				PromptTokens:     promptTokens,
-				CompletionTokens: completionTokens,
-				TotalTokens:      promptTokens + completionTokens,
-			}
-		}
-		textResponse := &dto.TextResponse{
-			Id:      responseWithError.Id,
-			Created: responseWithError.Created,
-			Object:  responseWithError.Object,
-			Choices: responseWithError.Choices,
-			Model:   responseWithError.Model,
-			Usage:   *usage,
-		}
-		doResponseBody, err = json.Marshal(textResponse)
-	}
-
-	if checkSensitive && triggerSensitive && constant.StopOnSensitiveEnabled {
-		sensitiveWords = common.RemoveDuplicate(sensitiveWords)
-		return service.OpenAIErrorWrapper(errors.New(fmt.Sprintf("sensitive words detected on response: %s",
-				strings.Join(sensitiveWords, ", "))), "sensitive_words_detected", http.StatusBadRequest),
-			usage, &dto.SensitiveResponse{
-				SensitiveWords: sensitiveWords,
-			}
-	} else {
-		// Reset response body
-		resp.Body = io.NopCloser(bytes.NewBuffer(doResponseBody))
-		// 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.
-		// Copy headers
-		for k, v := range resp.Header {
-			// 删除任何现有的相同头部，以防止重复添加头部
-			c.Writer.Header().Del(k)
-			for _, vv := range v {
-				c.Writer.Header().Add(k, vv)
-			}
-		}
-		// reset content length
-		c.Writer.Header().Del("Content-Length")
-		c.Writer.Header().Set("Content-Length", fmt.Sprintf("%d", len(doResponseBody)))
-		c.Writer.WriteHeader(resp.StatusCode)
-		_, err = io.Copy(c.Writer, resp.Body)
-		if err != nil {
-			return service.OpenAIErrorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError), nil, nil
-		}
-		err = resp.Body.Close()
-		if err != nil {
-			return service.OpenAIErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil, nil
 		}
 	}
-	return nil, usage, nil
+	return nil, &simpleResponse.Usage
 }

relay/channel/palm/adaptor.go

@@ -39,7 +39,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		var responseText string
 		err, responseText = palmStreamHandler(c, resp)

relay/channel/palm/relay-palm.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"net/http"
 	"one-api/common"
-	"one-api/constant"
 	"one-api/dto"
 	relaycommon "one-api/relay/common"
 	"one-api/service"
@@ -157,7 +156,7 @@ func palmHandler(c *gin.Context, resp *http.Response, promptTokens int, model st
 		}, nil
 	}
 	fullTextResponse := responsePaLM2OpenAI(&palmResponse)
-	completionTokens, _, _ := service.CountTokenText(palmResponse.Candidates[0].Content, model, constant.ShouldCheckCompletionSensitive())
+	completionTokens, _, _ := service.CountTokenText(palmResponse.Candidates[0].Content, model, false)
 	usage := dto.Usage{
 		PromptTokens:     promptTokens,
 		CompletionTokens: completionTokens,

relay/channel/perplexity/adaptor.go

@@ -43,13 +43,13 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		var responseText string
 		err, responseText = openai.OpenaiStreamHandler(c, resp, info.RelayMode)
 		usage, _ = service.ResponseText2Usage(responseText, info.UpstreamModelName, info.PromptTokens)
 	} else {
-		err, usage, sensitiveResp = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName, info.RelayMode)
+		err, usage = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName)
 	}
 	return
 }

relay/channel/tencent/adaptor.go

@@ -53,7 +53,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		var responseText string
 		err, responseText = tencentStreamHandler(c, resp)

relay/channel/xunfei/adaptor.go

@@ -43,13 +43,13 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return dummyResp, nil
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	splits := strings.Split(info.ApiKey, "|")
 	if len(splits) != 3 {
-		return nil, service.OpenAIErrorWrapper(errors.New("invalid auth"), "invalid_auth", http.StatusBadRequest), nil
+		return nil, service.OpenAIErrorWrapper(errors.New("invalid auth"), "invalid_auth", http.StatusBadRequest)
 	}
 	if a.request == nil {
-		return nil, service.OpenAIErrorWrapper(errors.New("request is nil"), "request_is_nil", http.StatusBadRequest), nil
+		return nil, service.OpenAIErrorWrapper(errors.New("request is nil"), "request_is_nil", http.StatusBadRequest)
 	}
 	if info.IsStream {
 		err, usage = xunfeiStreamHandler(c, *a.request, splits[0], splits[1], splits[2])

relay/channel/zhipu/adaptor.go

@@ -46,7 +46,7 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		err, usage = zhipuStreamHandler(c, resp)
 	} else {

relay/channel/zhipu_4v/adaptor.go

@@ -44,13 +44,13 @@ func (a *Adaptor) DoRequest(c *gin.Context, info *relaycommon.RelayInfo, request
 	return channel.DoApiRequest(a, c, info, requestBody)
 }
 
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode, sensitiveResp *dto.SensitiveResponse) {
+func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, info *relaycommon.RelayInfo) (usage *dto.Usage, err *dto.OpenAIErrorWithStatusCode) {
 	if info.IsStream {
 		var responseText string
 		err, responseText = openai.OpenaiStreamHandler(c, resp, info.RelayMode)
 		usage, _ = service.ResponseText2Usage(responseText, info.UpstreamModelName, info.PromptTokens)
 	} else {
-		err, usage, sensitiveResp = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName, info.RelayMode)
+		err, usage = openai.OpenaiHandler(c, resp, info.PromptTokens, info.UpstreamModelName)
 	}
 	return
 }

relay/channel/zhipu_4v/relay-zhipu_v4.go

@@ -74,6 +74,25 @@ func getZhipuToken(apikey string) string {
 func requestOpenAI2Zhipu(request dto.GeneralOpenAIRequest) *dto.GeneralOpenAIRequest {
 	messages := make([]dto.Message, 0, len(request.Messages))
 	for _, message := range request.Messages {
+		if !message.IsStringContent() {
+			mediaMessages := message.ParseContent()
+			for j, mediaMessage := range mediaMessages {
+				if mediaMessage.Type == dto.ContentTypeImageURL {
+					imageUrl := mediaMessage.ImageUrl.(dto.MessageImageUrl)
+					// check if base64
+					if strings.HasPrefix(imageUrl.Url, "data:image/") {
+						// 去除base64数据的URL前缀（如果有）
+						if idx := strings.Index(imageUrl.Url, ","); idx != -1 {
+							imageUrl.Url = imageUrl.Url[idx+1:]
+						}
+					}
+					mediaMessage.ImageUrl = imageUrl
+					mediaMessages[j] = mediaMessage
+				}
+			}
+			messageRaw, _ := json.Marshal(mediaMessages)
+			message.Content = messageRaw
+		}
 		messages = append(messages, dto.Message{
 			Role:       message.Role,
 			Content:    message.Content,
@@ -138,7 +157,7 @@ func streamResponseZhipu2OpenAI(zhipuResponse *ZhipuV4StreamResponse) *dto.ChatC
 		Id:      zhipuResponse.Id,
 		Object:  "chat.completion.chunk",
 		Created: zhipuResponse.Created,
-		Model:   "glm-4",
+		Model:   "glm-4v",
 		Choices: []dto.ChatCompletionsStreamResponseChoice{choice},
 	}
 	return &response

relay/common/relay_info.go

@@ -31,6 +31,7 @@ type RelayInfo struct {
 func GenRelayInfo(c *gin.Context) *RelayInfo {
 	channelType := c.GetInt("channel")
 	channelId := c.GetInt("channel_id")
+
 	tokenId := c.GetInt("token_id")
 	userId := c.GetInt("id")
 	group := c.GetString("group")

relay/constant/relay_mode.go

@@ -56,29 +56,29 @@ func Path2RelayMode(path string) int {
 
 func Path2RelayModeMidjourney(path string) int {
 	relayMode := RelayModeUnknown
-	if strings.HasPrefix(path, "/mj/submit/action") {
+	if strings.HasSuffix(path, "/mj/submit/action") {
 		// midjourney plus
 		relayMode = RelayModeMidjourneyAction
-	} else if strings.HasPrefix(path, "/mj/submit/modal") {
+	} else if strings.HasSuffix(path, "/mj/submit/modal") {
 		// midjourney plus
 		relayMode = RelayModeMidjourneyModal
-	} else if strings.HasPrefix(path, "/mj/submit/shorten") {
+	} else if strings.HasSuffix(path, "/mj/submit/shorten") {
 		// midjourney plus
 		relayMode = RelayModeMidjourneyShorten
-	} else if strings.HasPrefix(path, "/mj/insight-face/swap") {
+	} else if strings.HasSuffix(path, "/mj/insight-face/swap") {
 		// midjourney plus
 		relayMode = RelayModeSwapFace
-	} else if strings.HasPrefix(path, "/mj/submit/imagine") {
+	} else if strings.HasSuffix(path, "/mj/submit/imagine") {
 		relayMode = RelayModeMidjourneyImagine
-	} else if strings.HasPrefix(path, "/mj/submit/blend") {
+	} else if strings.HasSuffix(path, "/mj/submit/blend") {
 		relayMode = RelayModeMidjourneyBlend
-	} else if strings.HasPrefix(path, "/mj/submit/describe") {
+	} else if strings.HasSuffix(path, "/mj/submit/describe") {
 		relayMode = RelayModeMidjourneyDescribe
-	} else if strings.HasPrefix(path, "/mj/notify") {
+	} else if strings.HasSuffix(path, "/mj/notify") {
 		relayMode = RelayModeMidjourneyNotify
-	} else if strings.HasPrefix(path, "/mj/submit/change") {
+	} else if strings.HasSuffix(path, "/mj/submit/change") {
 		relayMode = RelayModeMidjourneyChange
-	} else if strings.HasPrefix(path, "/mj/submit/simple-change") {
+	} else if strings.HasSuffix(path, "/mj/submit/simple-change") {
 		relayMode = RelayModeMidjourneyChange
 	} else if strings.HasSuffix(path, "/fetch") {
 		relayMode = RelayModeMidjourneyTaskFetch

relay/relay-audio.go

@@ -173,7 +173,7 @@ func AudioHelper(c *gin.Context, relayMode int) *dto.OpenAIErrorWithStatusCode {
 			if strings.HasPrefix(audioRequest.Model, "tts-1") {
 				quota = promptTokens
 			} else {
-				quota, err, _ = service.CountAudioToken(audioResponse.Text, audioRequest.Model, constant.ShouldCheckCompletionSensitive())
+				quota, err, _ = service.CountAudioToken(audioResponse.Text, audioRequest.Model, false)
 			}
 			quota = int(float64(quota) * ratio)
 			if ratio != 0 && quota <= 0 {

relay/relay-mj.go

@@ -180,7 +180,7 @@ func RelaySwapFace(c *gin.Context) *dto.MidjourneyResponse {
 			Description: "quota_not_enough",
 		}
 	}
-	requestURL := c.Request.URL.String()
+	requestURL := getMjRequestPath(c.Request.URL.String())
 	baseURL := c.GetString("base_url")
 	fullRequestURL := fmt.Sprintf("%s%s", baseURL, requestURL)
 	mjResp, _, err := service.DoMidjourneyHttpRequest(c, time.Second*60, fullRequestURL)
@@ -260,7 +260,7 @@ func RelayMidjourneyTaskImageSeed(c *gin.Context) *dto.MidjourneyResponse {
 	c.Set("channel_id", originTask.ChannelId)
 	c.Request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", channel.Key))
 
-	requestURL := c.Request.URL.String()
+	requestURL := getMjRequestPath(c.Request.URL.String())
 	fullRequestURL := fmt.Sprintf("%s%s", channel.GetBaseURL(), requestURL)
 	midjResponseWithStatus, _, err := service.DoMidjourneyHttpRequest(c, time.Second*30, fullRequestURL)
 	if err != nil {
@@ -440,7 +440,7 @@ func RelayMidjourneySubmit(c *gin.Context, relayMode int) *dto.MidjourneyRespons
 	}
 
 	//baseURL := common.ChannelBaseURLs[channelType]
-	requestURL := c.Request.URL.String()
+	requestURL := getMjRequestPath(c.Request.URL.String())
 
 	baseURL := c.GetString("base_url")
 
@@ -605,3 +605,15 @@ type taskChangeParams struct {
 	Action string
 	Index  int
 }
+
+func getMjRequestPath(path string) string {
+	requestURL := path
+	if strings.Contains(requestURL, "/mj-") {
+		urls := strings.Split(requestURL, "/mj/")
+		if len(urls) < 2 {
+			return requestURL
+		}
+		requestURL = "/mj/" + urls[1]
+	}
+	return requestURL
+}

relay/relay-text.go

@@ -72,7 +72,7 @@ func TextHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode {
 	textRequest, err := getAndValidateTextRequest(c, relayInfo)
 	if err != nil {
 		common.LogError(c, fmt.Sprintf("getAndValidateTextRequest failed: %s", err.Error()))
-		return service.OpenAIErrorWrapper(err, "invalid_text_request", http.StatusBadRequest)
+		return service.OpenAIErrorWrapperLocal(err, "invalid_text_request", http.StatusBadRequest)
 	}
 
 	// map model name
@@ -82,7 +82,7 @@ func TextHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode {
 		modelMap := make(map[string]string)
 		err := json.Unmarshal([]byte(modelMapping), &modelMap)
 		if err != nil {
-			return service.OpenAIErrorWrapper(err, "unmarshal_model_mapping_failed", http.StatusInternalServerError)
+			return service.OpenAIErrorWrapperLocal(err, "unmarshal_model_mapping_failed", http.StatusInternalServerError)
 		}
 		if modelMap[textRequest.Model] != "" {
 			textRequest.Model = modelMap[textRequest.Model]
@@ -103,7 +103,7 @@ func TextHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode {
 	// count messages token error 计算promptTokens错误
 	if err != nil {
 		if sensitiveTrigger {
-			return service.OpenAIErrorWrapper(err, "sensitive_words_detected", http.StatusBadRequest)
+			return service.OpenAIErrorWrapperLocal(err, "sensitive_words_detected", http.StatusBadRequest)
 		}
 		return service.OpenAIErrorWrapper(err, "count_token_messages_failed", http.StatusInternalServerError)
 	}
@@ -165,21 +165,12 @@ func TextHelper(c *gin.Context) *dto.OpenAIErrorWithStatusCode {
 		return service.RelayErrorHandler(resp)
 	}
 
-	usage, openaiErr, sensitiveResp := adaptor.DoResponse(c, resp, relayInfo)
+	usage, openaiErr := adaptor.DoResponse(c, resp, relayInfo)
 	if openaiErr != nil {
-		if sensitiveResp == nil { // 如果没有敏感词检查结果
+		returnPreConsumedQuota(c, relayInfo.TokenId, userQuota, preConsumedQuota)
-			returnPreConsumedQuota(c, relayInfo.TokenId, userQuota, preConsumedQuota)
+		return openaiErr
-			return openaiErr
-		} else {
-			// 如果有敏感词检查结果，不返回预消耗配额，继续消耗配额
-			postConsumeQuota(c, relayInfo, *textRequest, usage, ratio, preConsumedQuota, userQuota, modelRatio, groupRatio, modelPrice, sensitiveResp)
-			if constant.StopOnSensitiveEnabled { // 是否直接返回错误
-				return openaiErr
-			}
-			return nil
-		}
 	}
-	postConsumeQuota(c, relayInfo, *textRequest, usage, ratio, preConsumedQuota, userQuota, modelRatio, groupRatio, modelPrice, nil)
+	postConsumeQuota(c, relayInfo, *textRequest, usage, ratio, preConsumedQuota, userQuota, modelRatio, groupRatio, modelPrice)
 	return nil
 }
 
@@ -209,14 +200,14 @@ func getPromptTokens(textRequest *dto.GeneralOpenAIRequest, info *relaycommon.Re
 func preConsumeQuota(c *gin.Context, preConsumedQuota int, relayInfo *relaycommon.RelayInfo) (int, int, *dto.OpenAIErrorWithStatusCode) {
 	userQuota, err := model.CacheGetUserQuota(relayInfo.UserId)
 	if err != nil {
-		return 0, 0, service.OpenAIErrorWrapper(err, "get_user_quota_failed", http.StatusInternalServerError)
+		return 0, 0, service.OpenAIErrorWrapperLocal(err, "get_user_quota_failed", http.StatusInternalServerError)
 	}
 	if userQuota <= 0 || userQuota-preConsumedQuota < 0 {
-		return 0, 0, service.OpenAIErrorWrapper(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden)
+		return 0, 0, service.OpenAIErrorWrapperLocal(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden)
 	}
 	err = model.CacheDecreaseUserQuota(relayInfo.UserId, preConsumedQuota)
 	if err != nil {
-		return 0, 0, service.OpenAIErrorWrapper(err, "decrease_user_quota_failed", http.StatusInternalServerError)
+		return 0, 0, service.OpenAIErrorWrapperLocal(err, "decrease_user_quota_failed", http.StatusInternalServerError)
 	}
 	if userQuota > 100*preConsumedQuota {
 		// 用户额度充足，判断令牌额度是否充足
@@ -238,7 +229,7 @@ func preConsumeQuota(c *gin.Context, preConsumedQuota int, relayInfo *relaycommo
 	if preConsumedQuota > 0 {
 		userQuota, err = model.PreConsumeTokenQuota(relayInfo.TokenId, preConsumedQuota)
 		if err != nil {
-			return 0, 0, service.OpenAIErrorWrapper(err, "pre_consume_token_quota_failed", http.StatusForbidden)
+			return 0, 0, service.OpenAIErrorWrapperLocal(err, "pre_consume_token_quota_failed", http.StatusForbidden)
 		}
 	}
 	return preConsumedQuota, userQuota, nil
@@ -258,7 +249,7 @@ func returnPreConsumedQuota(c *gin.Context, tokenId int, userQuota int, preConsu
 
 func postConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, textRequest dto.GeneralOpenAIRequest,
 	usage *dto.Usage, ratio float64, preConsumedQuota int, userQuota int, modelRatio float64, groupRatio float64,
-	modelPrice float64, sensitiveResp *dto.SensitiveResponse) {
+	modelPrice float64) {
 
 	useTimeSeconds := time.Now().Unix() - relayInfo.StartTime.Unix()
 	promptTokens := usage.PromptTokens
@@ -293,15 +284,17 @@ func postConsumeQuota(ctx *gin.Context, relayInfo *relaycommon.RelayInfo, textRe
 		logContent += fmt.Sprintf("（可能是上游超时）")
 		common.LogError(ctx, fmt.Sprintf("total tokens is 0, cannot consume quota, userId %d, channelId %d, tokenId %d, model %s， pre-consumed quota %d", relayInfo.UserId, relayInfo.ChannelId, relayInfo.TokenId, textRequest.Model, preConsumedQuota))
 	} else {
-		if sensitiveResp != nil {
+		//if sensitiveResp != nil {
-			logContent += fmt.Sprintf("，敏感词：%s", strings.Join(sensitiveResp.SensitiveWords, ", "))
+		//	logContent += fmt.Sprintf("，敏感词：%s", strings.Join(sensitiveResp.SensitiveWords, ", "))
-		}
+		//}
 		quotaDelta := quota - preConsumedQuota
-		err := model.PostConsumeTokenQuota(relayInfo.TokenId, userQuota, quotaDelta, preConsumedQuota, true)
+		if quotaDelta != 0 {
-		if err != nil {
+			err := model.PostConsumeTokenQuota(relayInfo.TokenId, userQuota, quotaDelta, preConsumedQuota, true)
-			common.LogError(ctx, "error consuming token remain quota: "+err.Error())
+			if err != nil {
+				common.LogError(ctx, "error consuming token remain quota: "+err.Error())
+			}
 		}
-		err = model.CacheUpdateUserQuota(relayInfo.UserId)
+		err := model.CacheUpdateUserQuota(relayInfo.UserId)
 		if err != nil {
 			common.LogError(ctx, "error update user quota cache: "+err.Error())
 		}

router/api-router.go

@@ -17,7 +17,7 @@ func SetApiRouter(router *gin.Engine) {
 		apiRouter.GET("/status/test", middleware.AdminAuth(), controller.TestStatus)
 		apiRouter.GET("/notice", controller.GetNotice)
 		apiRouter.GET("/about", controller.GetAbout)
-		apiRouter.GET("/midjourney", controller.GetMidjourney)
+		//apiRouter.GET("/midjourney", controller.GetMidjourney)
 		apiRouter.GET("/home_page_content", controller.GetHomePageContent)
 		apiRouter.GET("/verification", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendEmailVerification)
 		apiRouter.GET("/reset_password", middleware.CriticalRateLimit(), middleware.TurnstileCheck(), controller.SendPasswordResetEmail)

router/relay-router.go

@@ -43,7 +43,16 @@ func SetRelayRouter(router *gin.Engine) {
 		relayV1Router.DELETE("/models/:model", controller.RelayNotImplemented)
 		relayV1Router.POST("/moderations", controller.Relay)
 	}
+
 	relayMjRouter := router.Group("/mj")
+	registerMjRouterGroup(relayMjRouter)
+
+	relayMjModeRouter := router.Group("/:mode/mj")
+	registerMjRouterGroup(relayMjModeRouter)
+	//relayMjRouter.Use()
+}
+
+func registerMjRouterGroup(relayMjRouter *gin.RouterGroup) {
 	relayMjRouter.GET("/image/:id", relay.RelayMidjourneyImage)
 	relayMjRouter.Use(middleware.TokenAuth(), middleware.Distribute())
 	{
@@ -61,5 +70,4 @@ func SetRelayRouter(router *gin.Engine) {
 		relayMjRouter.POST("/task/list-by-condition", controller.RelayMidjourney)
 		relayMjRouter.POST("/insight-face/swap", controller.RelayMidjourney)
 	}
-	//relayMjRouter.Use()
 }

router/web-router.go

@@ -16,9 +16,9 @@ func SetWebRouter(router *gin.Engine, buildFS embed.FS, indexPage []byte) {
 	router.Use(gzip.Gzip(gzip.DefaultCompression))
 	router.Use(middleware.GlobalWebRateLimit())
 	router.Use(middleware.Cache())
-	router.Use(static.Serve("/", common.EmbedFolder(buildFS, "web/build")))
+	router.Use(static.Serve("/", common.EmbedFolder(buildFS, "web/dist")))
 	router.NoRoute(func(c *gin.Context) {
-		if strings.HasPrefix(c.Request.RequestURI, "/v1") || strings.HasPrefix(c.Request.RequestURI, "/api") {
+		if strings.HasPrefix(c.Request.RequestURI, "/v1") || strings.HasPrefix(c.Request.RequestURI, "/api") || strings.HasPrefix(c.Request.RequestURI, "/assets") {
 			controller.RelayNotFound(c)
 			return
 		}

service/channel.go

@@ -6,6 +6,7 @@ import (
 	"one-api/common"
 	relaymodel "one-api/dto"
 	"one-api/model"
+	"strings"
 )
 
 // disable & notify
@@ -33,7 +34,28 @@ func ShouldDisableChannel(err *relaymodel.OpenAIError, statusCode int) bool {
 	if statusCode == http.StatusUnauthorized {
 		return true
 	}
-	if err.Type == "insufficient_quota" || err.Code == "invalid_api_key" || err.Code == "account_deactivated" || err.Code == "billing_not_active" {
+	switch err.Code {
+	case "invalid_api_key":
+		return true
+	case "account_deactivated":
+		return true
+	case "billing_not_active":
+		return true
+	}
+	switch err.Type {
+	case "insufficient_quota":
+		return true
+	// https://docs.anthropic.com/claude/reference/errors
+	case "authentication_error":
+		return true
+	case "permission_error":
+		return true
+	case "forbidden":
+		return true
+	}
+	if strings.HasPrefix(err.Message, "Your credit balance is too low") { // anthropic
+		return true
+	} else if strings.HasPrefix(err.Message, "This organization has been disabled.") {
 		return true
 	}
 	return false

service/error.go

@@ -29,7 +29,7 @@ func MidjourneyErrorWithStatusCodeWrapper(code int, desc string, statusCode int)
 func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
 	text := err.Error()
 	// 定义一个正则表达式匹配URL
-	if strings.Contains(text, "Post") {
+	if strings.Contains(text, "Post") || strings.Contains(text, "dial") {
 		common.SysLog(fmt.Sprintf("error: %s", text))
 		text = "请求上游地址失败"
 	}
@@ -46,6 +46,12 @@ func OpenAIErrorWrapper(err error, code string, statusCode int) *dto.OpenAIError
 	}
 }
 
+func OpenAIErrorWrapperLocal(err error, code string, statusCode int) *dto.OpenAIErrorWithStatusCode {
+	openaiErr := OpenAIErrorWrapper(err, code, statusCode)
+	openaiErr.LocalError = true
+	return openaiErr
+}
+
 func RelayErrorHandler(resp *http.Response) (errWithStatusCode *dto.OpenAIErrorWithStatusCode) {
 	errWithStatusCode = &dto.OpenAIErrorWithStatusCode{
 		StatusCode: resp.StatusCode,

service/midjourney.go

@@ -188,7 +188,6 @@ func DoMidjourneyHttpRequest(c *gin.Context, timeout time.Duration, fullRequestU
 	auth := c.Request.Header.Get("Authorization")
 	if auth != "" {
 		auth = strings.TrimPrefix(auth, "Bearer ")
-		auth = strings.Split(auth, "-")[0]
 		req.Header.Set("mj-api-secret", auth)
 	}
 	defer cancel()

service/token_counter.go

@@ -29,7 +29,7 @@ func InitTokenEncoders() {
 	if err != nil {
 		common.FatalLog(fmt.Sprintf("failed to get gpt-4 token encoder: %s", err.Error()))
 	}
-	for model, _ := range common.ModelRatio {
+	for model, _ := range common.DefaultModelRatio {
 		if strings.HasPrefix(model, "gpt-3.5") {
 			tokenEncoderMap[model] = gpt35TokenEncoder
 		} else if strings.HasPrefix(model, "gpt-4") {
@@ -208,7 +208,7 @@ func CountTokenInput(input any, model string, check bool) (int, error, bool) {
 		}
 		return CountTokenText(text, model, check)
 	}
-	return 0, errors.New("unsupported input type"), false
+	return CountTokenInput(fmt.Sprintf("%v", input), model, check)
 }
 
 func CountAudioToken(text string, model string, check bool) (int, error, bool) {

web/.prettierrc.mjs

@@ -0,0 +1 @@
+module.exports = require("@so1ve/prettier-config");

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/index.html

@@ -0,0 +1,19 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <link rel="icon" href="/logo.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="theme-color" content="#ffffff" />
+    <meta
+      name="description"
+      content="OpenAI 接口聚合管理，支持多种渠道包括 Azure，可用于二次分发管理 key，仅单可执行文件，已打包好 Docker 镜像，一键部署，开箱即用"
+    />
+    <title>New API</title>
+  </head>
+  <body>
+    <noscript>You need to enable JavaScript to run this app.</noscript>
+    <div id="root"></div>
+    <script type="module" src="/src/index.js"></script>
+  </body>
+</html>

web/package.json

@@ -2,6 +2,7 @@
   "name": "react-template",
   "version": "0.1.0",
   "private": true,
+  "type": "module",
   "dependencies": {
     "@douyinfe/semi-icons": "^2.46.1",
     "@douyinfe/semi-ui": "^2.46.1",
@@ -16,19 +17,18 @@
     "react-dropzone": "^14.2.3",
     "react-fireworks": "^1.0.4",
     "react-router-dom": "^6.3.0",
-    "react-scripts": "5.0.1",
     "react-telegram-login": "^1.1.2",
     "react-toastify": "^9.0.8",
     "react-turnstile": "^1.0.5",
-    "semantic-ui-css": "^2.5.0",
+    "semantic-ui-offline": "^2.5.0",
-    "semantic-ui-react": "^2.1.3",
+    "semantic-ui-react": "^2.1.3"
-    "usehooks-ts": "^2.9.1"
   },
   "scripts": {
-    "start": "react-scripts start",
+    "dev": "vite",
-    "build": "react-scripts build",
+    "build": "vite build",
-    "test": "react-scripts test",
+    "lint": "prettier . --check",
-    "eject": "react-scripts eject"
+    "lint:fix": "prettier . --write",
+    "preview": "vite preview"
   },
   "eslintConfig": {
     "extends": [
@@ -49,8 +49,11 @@
     ]
   },
   "devDependencies": {
-    "prettier": "2.8.8",
+    "@so1ve/prettier-config": "^2.0.0",
-    "typescript": "4.4.2"
+    "@vitejs/plugin-react": "^4.2.1",
+    "prettier": "^3.0.0",
+    "typescript": "4.4.2",
+    "vite": "^5.2.0"
   },
   "prettier": {
     "singleQuote": true,

web/public/index.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="utf-8" />
-  <link rel="icon" href="logo.png" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="theme-color" content="#ffffff" />
-  <meta
-          name="description"
-          content="OpenAI 接口聚合管理，支持多种渠道包括 Azure，可用于二次分发管理 key，仅单可执行文件，已打包好 Docker 镜像，一键部署，开箱即用"
-  />
-  <title>New API</title>
-</head>
-<body>
-<noscript>You need to enable JavaScript to run this app.</noscript>
-<div id="root"></div>
-</body>
-</html>

web/src/App.js

@@ -22,9 +22,10 @@ import Log from './pages/Log';
 import Chat from './pages/Chat';
 import { Layout } from '@douyinfe/semi-ui';
 import Midjourney from './pages/Midjourney';
-import Detail from './pages/Detail';
+// import Detail from './pages/Detail';
 
 const Home = lazy(() => import('./pages/Home'));
+const Detail = lazy(() => import('./pages/Detail'));
 const About = lazy(() => import('./pages/About'));
 
 function App() {
@@ -47,7 +48,7 @@ function App() {
     }
     let logo = getLogo();
     if (logo) {
-      let linkElement = document.querySelector('link[rel~=\'icon\']');
+      let linkElement = document.querySelector("link[rel~='icon']");
       if (linkElement) {
         linkElement.href = logo;
       }
@@ -59,7 +60,7 @@ function App() {
       <Layout.Content>
         <Routes>
           <Route
-            path="/"
+            path='/'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <Home />
@@ -67,7 +68,7 @@ function App() {
             }
           />
           <Route
-            path="/channel"
+            path='/channel'
             element={
               <PrivateRoute>
                 <Channel />
@@ -75,7 +76,7 @@ function App() {
             }
           />
           <Route
-            path="/channel/edit/:id"
+            path='/channel/edit/:id'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <EditChannel />
@@ -83,7 +84,7 @@ function App() {
             }
           />
           <Route
-            path="/channel/add"
+            path='/channel/add'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <EditChannel />
@@ -91,7 +92,7 @@ function App() {
             }
           />
           <Route
-            path="/token"
+            path='/token'
             element={
               <PrivateRoute>
                 <Token />
@@ -99,7 +100,7 @@ function App() {
             }
           />
           <Route
-            path="/redemption"
+            path='/redemption'
             element={
               <PrivateRoute>
                 <Redemption />
@@ -107,7 +108,7 @@ function App() {
             }
           />
           <Route
-            path="/user"
+            path='/user'
             element={
               <PrivateRoute>
                 <User />
@@ -115,7 +116,7 @@ function App() {
             }
           />
           <Route
-            path="/user/edit/:id"
+            path='/user/edit/:id'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <EditUser />
@@ -123,7 +124,7 @@ function App() {
             }
           />
           <Route
-            path="/user/edit"
+            path='/user/edit'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <EditUser />
@@ -131,7 +132,7 @@ function App() {
             }
           />
           <Route
-            path="/user/reset"
+            path='/user/reset'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <PasswordResetConfirm />
@@ -139,7 +140,7 @@ function App() {
             }
           />
           <Route
-            path="/login"
+            path='/login'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <LoginForm />
@@ -147,7 +148,7 @@ function App() {
             }
           />
           <Route
-            path="/register"
+            path='/register'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <RegisterForm />
@@ -155,7 +156,7 @@ function App() {
             }
           />
           <Route
-            path="/reset"
+            path='/reset'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <PasswordResetForm />
@@ -163,7 +164,7 @@ function App() {
             }
           />
           <Route
-            path="/oauth/github"
+            path='/oauth/github'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <GitHubOAuth />
@@ -171,7 +172,7 @@ function App() {
             }
           />
           <Route
-            path="/setting"
+            path='/setting'
             element={
               <PrivateRoute>
                 <Suspense fallback={<Loading></Loading>}>
@@ -181,7 +182,7 @@ function App() {
             }
           />
           <Route
-            path="/topup"
+            path='/topup'
             element={
               <PrivateRoute>
                 <Suspense fallback={<Loading></Loading>}>
@@ -191,7 +192,7 @@ function App() {
             }
           />
           <Route
-            path="/log"
+            path='/log'
             element={
               <PrivateRoute>
                 <Log />
@@ -199,23 +200,27 @@ function App() {
             }
           />
           <Route
-            path="/detail"
+            path='/detail'
             element={
               <PrivateRoute>
-                <Detail />
+                <Suspense fallback={<Loading></Loading>}>
+                  <Detail />
+                </Suspense>
               </PrivateRoute>
             }
           />
           <Route
-            path="/midjourney"
+            path='/midjourney'
             element={
               <PrivateRoute>
-                <Midjourney />
+                <Suspense fallback={<Loading></Loading>}>
+                  <Midjourney />
+                </Suspense>
               </PrivateRoute>
             }
           />
           <Route
-            path="/about"
+            path='/about'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <About />
@@ -223,16 +228,14 @@ function App() {
             }
           />
           <Route
-            path="/chat"
+            path='/chat'
             element={
               <Suspense fallback={<Loading></Loading>}>
                 <Chat />
               </Suspense>
             }
           />
-          <Route path="*" element={
+          <Route path='*' element={<NotFound />} />
-            <NotFound />
-          } />
         </Routes>
       </Layout.Content>
     </Layout>

web/src/components/ChannelsTable.js

@@ -1,31 +1,39 @@
 import React, { useEffect, useState } from 'react';
-import { API, isMobile, shouldShowPrompt, showError, showInfo, showSuccess, timestamp2string } from '../helpers';
+import {
+  API,
+  isMobile,
+  shouldShowPrompt,
+  showError,
+  showInfo,
+  showSuccess,
+  timestamp2string,
+} from '../helpers';
 
 import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants';
-import { renderGroup, renderNumberWithPoint, renderQuota } from '../helpers/render';
 import {
-    Button,
+  renderGroup,
-    Dropdown,
+  renderNumberWithPoint,
-    Form,
+  renderQuota,
-    InputNumber,
+} from '../helpers/render';
-    Popconfirm,
+import {
-    Space,
+  Button,
-    SplitButtonGroup,
+  Dropdown,
-    Switch,
+  Form,
-    Table,
+  InputNumber,
-    Tag,
+  Popconfirm,
-    Tooltip,
+  Space,
-    Typography
+  SplitButtonGroup,
+  Switch,
+  Table,
+  Tag,
+  Tooltip,
+  Typography,
 } from '@douyinfe/semi-ui';
 import EditChannel from '../pages/Channel/EditChannel';
 import { IconTreeTriangleDown } from '@douyinfe/semi-icons';
 
 function renderTimestamp(timestamp) {
-  return (
+  return <>{timestamp2string(timestamp)}</>;
-    <>
-      {timestamp2string(timestamp)}
-    </>
-  );
 }
 
 let type2label = undefined;
@@ -38,7 +46,11 @@ function renderType(type) {
     }
     type2label[0] = { value: 0, text: '未知类型', color: 'grey' };
   }
-  return <Tag size="large" color={type2label[type]?.color}>{type2label[type]?.text}</Tag>;
+  return (
+    <Tag size='large' color={type2label[type]?.color}>
+      {type2label[type]?.text}
+    </Tag>
+  );
 }
 
 const ChannelsTable = () => {
@@ -50,11 +62,11 @@ const ChannelsTable = () => {
     // },
     {
       title: 'ID',
-      dataIndex: 'id'
+      dataIndex: 'id',
     },
     {
       title: '名称',
-      dataIndex: 'name'
+      dataIndex: 'name',
     },
     {
       title: '分组',
@@ -63,48 +75,34 @@ const ChannelsTable = () => {
         return (
           <div>
             <Space spacing={2}>
-              {
+              {text.split(',').map((item, index) => {
-                text.split(',').map((item, index) => {
+                return renderGroup(item);
-                  return (renderGroup(item));
+              })}
-                })
-              }
             </Space>
           </div>
         );
-      }
+      },
     },
     {
       title: '类型',
       dataIndex: 'type',
       render: (text, record, index) => {
-        return (
+        return <div>{renderType(text)}</div>;
-          <div>
+      },
-            {renderType(text)}
-          </div>
-        );
-      }
     },
     {
       title: '状态',
       dataIndex: 'status',
       render: (text, record, index) => {
-        return (
+        return <div>{renderStatus(text)}</div>;
-          <div>
+      },
-            {renderStatus(text)}
-          </div>
-        );
-      }
     },
     {
       title: '响应时间',
       dataIndex: 'response_time',
       render: (text, record, index) => {
-        return (
+        return <div>{renderResponseTime(text)}</div>;
-          <div>
+      },
-            {renderResponseTime(text)}
-          </div>
-        );
-      }
     },
     {
       title: '已用/剩余',
@@ -114,17 +112,26 @@ const ChannelsTable = () => {
           <div>
             <Space spacing={1}>
               <Tooltip content={'已用额度'}>
-                <Tag color="white" type="ghost" size="large">{renderQuota(record.used_quota)}</Tag>
+                <Tag color='white' type='ghost' size='large'>
+                  {renderQuota(record.used_quota)}
+                </Tag>
               </Tooltip>
               <Tooltip content={'剩余额度' + record.balance + '，点击更新'}>
-                <Tag color="white" type="ghost" size="large" onClick={() => {
+                <Tag
-                  updateChannelBalance(record);
+                  color='white'
-                }}>${renderNumberWithPoint(record.balance)}</Tag>
+                  type='ghost'
+                  size='large'
+                  onClick={() => {
+                    updateChannelBalance(record);
+                  }}
+                >
+                  ${renderNumberWithPoint(record.balance)}
+                </Tag>
               </Tooltip>
             </Space>
           </div>
         );
-      }
+      },
     },
     {
       title: '优先级',
@@ -134,8 +141,8 @@ const ChannelsTable = () => {
           <div>
             <InputNumber
               style={{ width: 70 }}
-              name="priority"
+              name='priority'
-              onBlur={e => {
+              onBlur={(e) => {
                 manageChannel(record.id, 'priority', record, e.target.value);
               }}
               keepFocus={true}
@@ -145,7 +152,7 @@ const ChannelsTable = () => {
             />
           </div>
         );
-      }
+      },
     },
     {
       title: '权重',
@@ -155,8 +162,8 @@ const ChannelsTable = () => {
           <div>
             <InputNumber
               style={{ width: 70 }}
-              name="weight"
+              name='weight'
-              onBlur={e => {
+              onBlur={(e) => {
                 manageChannel(record.id, 'weight', record, e.target.value);
               }}
               keepFocus={true}
@@ -166,68 +173,90 @@ const ChannelsTable = () => {
             />
           </div>
         );
-      }
+      },
     },
     {
       title: '',
       dataIndex: 'operate',
       render: (text, record, index) => (
         <div>
-          <SplitButtonGroup style={{ marginRight: 1 }} aria-label="测试操作项目组">
+          <SplitButtonGroup
-            <Button theme="light" onClick={() => {
+            style={{ marginRight: 1 }}
-              testChannel(record, '');
+            aria-label='测试操作项目组'
-            }}>测试</Button>
+          >
-            <Dropdown trigger="click" position="bottomRight" menu={record.test_models}
+            <Button
+              theme='light'
+              onClick={() => {
+                testChannel(record, '');
+              }}
             >
-              <Button style={{ padding: '8px 4px' }} type="primary" icon={<IconTreeTriangleDown />}></Button>
+              测试
+            </Button>
+            <Dropdown
+              trigger='click'
+              position='bottomRight'
+              menu={record.test_models}
+            >
+              <Button
+                style={{ padding: '8px 4px' }}
+                type='primary'
+                icon={<IconTreeTriangleDown />}
+              ></Button>
             </Dropdown>
           </SplitButtonGroup>
           {/*<Button theme='light' type='primary' style={{marginRight: 1}} onClick={()=>testChannel(record)}>测试</Button>*/}
           <Popconfirm
-            title="确定是否要删除此渠道？"
+            title='确定是否要删除此渠道？'
-            content="此修改将不可逆"
+            content='此修改将不可逆'
             okType={'danger'}
             position={'left'}
             onConfirm={() => {
-              manageChannel(record.id, 'delete', record).then(
+              manageChannel(record.id, 'delete', record).then(() => {
-                () => {
+                removeRecord(record.id);
-                  removeRecord(record.id);
+              });
-                }
-              );
             }}
           >
-            <Button theme="light" type="danger" style={{ marginRight: 1 }}>删除</Button>
+            <Button theme='light' type='danger' style={{ marginRight: 1 }}>
+              删除
+            </Button>
           </Popconfirm>
-          {
+          {record.status === 1 ? (
-            record.status === 1 ?
+            <Button
-              <Button theme="light" type="warning" style={{ marginRight: 1 }} onClick={
+              theme='light'
-                async () => {
+              type='warning'
-                  manageChannel(
+              style={{ marginRight: 1 }}
-                    record.id,
+              onClick={async () => {
-                    'disable',
+                manageChannel(record.id, 'disable', record);
-                    record
+              }}
-                  );
+            >
-                }
+              禁用
-              }>禁用</Button> :
+            </Button>
-              <Button theme="light" type="secondary" style={{ marginRight: 1 }} onClick={
+          ) : (
-                async () => {
+            <Button
-                  manageChannel(
+              theme='light'
-                    record.id,
+              type='secondary'
-                    'enable',
+              style={{ marginRight: 1 }}
-                    record
+              onClick={async () => {
-                  );
+                manageChannel(record.id, 'enable', record);
-                }
+              }}
-              }>启用</Button>
+            >
-          }
+              启用
-          <Button theme="light" type="tertiary" style={{ marginRight: 1 }} onClick={
+            </Button>
-            () => {
+          )}
+          <Button
+            theme='light'
+            type='tertiary'
+            style={{ marginRight: 1 }}
+            onClick={() => {
               setEditingChannel(record);
               setShowEdit(true);
-            }
+            }}
-          }>编辑</Button>
+          >
+            编辑
+          </Button>
         </div>
-      )
+      ),
-    }
+    },
   ];
 
   const [channels, setChannels] = useState([]);
@@ -240,20 +269,22 @@ const ChannelsTable = () => {
   const [searching, setSearching] = useState(false);
   const [updatingBalance, setUpdatingBalance] = useState(false);
   const [pageSize, setPageSize] = useState(ITEMS_PER_PAGE);
-  const [showPrompt, setShowPrompt] = useState(shouldShowPrompt('channel-test'));
+  const [showPrompt, setShowPrompt] = useState(
+    shouldShowPrompt('channel-test'),
+  );
   const [channelCount, setChannelCount] = useState(pageSize);
   const [groupOptions, setGroupOptions] = useState([]);
   const [showEdit, setShowEdit] = useState(false);
   const [enableBatchDelete, setEnableBatchDelete] = useState(false);
   const [editingChannel, setEditingChannel] = useState({
-    id: undefined
+    id: undefined,
   });
   const [selectedChannels, setSelectedChannels] = useState([]);
 
-  const removeRecord = id => {
+  const removeRecord = (id) => {
     let newDataSource = [...channels];
     if (id != null) {
-      let idx = newDataSource.findIndex(data => data.id === id);
+      let idx = newDataSource.findIndex((data) => data.id === id);
 
       if (idx > -1) {
         newDataSource.splice(idx, 1);
@@ -272,7 +303,7 @@ const ChannelsTable = () => {
           name: item,
           onClick: () => {
             testChannel(channels[i], item);
-          }
+          },
         });
       });
       channels[i].test_models = test_models;
@@ -288,7 +319,12 @@ const ChannelsTable = () => {
 
   const loadChannels = async (startIdx, pageSize, idSort) => {
     setLoading(true);
-    const res = await API.get(`/api/channel/?p=${startIdx}&page_size=${pageSize}&id_sort=${idSort}`);
+    const res = await API.get(
+      `/api/channel/?p=${startIdx}&page_size=${pageSize}&id_sort=${idSort}`,
+    );
+    if (res === undefined) {
+      return;
+    }
     const { success, message, data } = res.data;
     if (success) {
       if (startIdx === 0) {
@@ -311,7 +347,8 @@ const ChannelsTable = () => {
   useEffect(() => {
     // console.log('default effect')
     const localIdSort = localStorage.getItem('id-sort') === 'true';
-    const localPageSize = parseInt(localStorage.getItem('page-size')) || ITEMS_PER_PAGE;
+    const localPageSize =
+      parseInt(localStorage.getItem('page-size')) || ITEMS_PER_PAGE;
     setIdSort(localIdSort);
     setPageSize(localPageSize);
     loadChannels(0, localPageSize, localIdSort)
@@ -361,7 +398,6 @@ const ChannelsTable = () => {
       let channel = res.data.data;
       let newChannels = [...channels];
       if (action === 'delete') {
-
       } else {
         record.status = channel.status;
       }
@@ -374,22 +410,26 @@ const ChannelsTable = () => {
   const renderStatus = (status) => {
     switch (status) {
       case 1:
-        return <Tag size="large" color="green">已启用</Tag>;
+        return (
+          <Tag size='large' color='green'>
+            已启用
+          </Tag>
+        );
       case 2:
         return (
-          <Tag size="large" color="yellow">
+          <Tag size='large' color='yellow'>
             已禁用
           </Tag>
         );
       case 3:
         return (
-          <Tag size="large" color="yellow">
+          <Tag size='large' color='yellow'>
             自动禁用
           </Tag>
         );
       default:
         return (
-          <Tag size="large" color="grey">
+          <Tag size='large' color='grey'>
             未知状态
           </Tag>
         );
@@ -400,15 +440,35 @@ const ChannelsTable = () => {
     let time = responseTime / 1000;
     time = time.toFixed(2) + ' 秒';
     if (responseTime === 0) {
-      return <Tag size="large" color="grey">未测试</Tag>;
+      return (
+        <Tag size='large' color='grey'>
+          未测试
+        </Tag>
+      );
     } else if (responseTime <= 1000) {
-      return <Tag size="large" color="green">{time}</Tag>;
+      return (
+        <Tag size='large' color='green'>
+          {time}
+        </Tag>
+      );
     } else if (responseTime <= 3000) {
-      return <Tag size="large" color="lime">{time}</Tag>;
+      return (
+        <Tag size='large' color='lime'>
+          {time}
+        </Tag>
+      );
     } else if (responseTime <= 5000) {
-      return <Tag size="large" color="yellow">{time}</Tag>;
+      return (
+        <Tag size='large' color='yellow'>
+          {time}
+        </Tag>
+      );
     } else {
-      return <Tag size="large" color="red">{time}</Tag>;
+      return (
+        <Tag size='large' color='red'>
+          {time}
+        </Tag>
+      );
     }
   };
 
@@ -420,7 +480,9 @@ const ChannelsTable = () => {
       return;
     }
     setSearching(true);
-    const res = await API.get(`/api/channel/search?keyword=${searchKeyword}&group=${searchGroup}&model=${searchModel}`);
+    const res = await API.get(
+      `/api/channel/search?keyword=${searchKeyword}&group=${searchGroup}&model=${searchModel}`,
+    );
     const { success, message, data } = res.data;
     if (success) {
       setChannels(data);
@@ -520,14 +582,16 @@ const ChannelsTable = () => {
     }
   };
 
-  let pageData = channels.slice((activePage - 1) * pageSize, activePage * pageSize);
+  let pageData = channels.slice(
+    (activePage - 1) * pageSize,
+    activePage * pageSize,
+  );
 
-  const handlePageChange = page => {
+  const handlePageChange = (page) => {
     setActivePage(page);
     if (page === Math.ceil(channels.length / pageSize) + 1) {
       // In this case we have to load more data and then append them.
-      loadChannels(page - 1, pageSize, idSort).then(r => {
+      loadChannels(page - 1, pageSize, idSort).then((r) => {});
-      });
     }
   };
 
@@ -547,10 +611,15 @@ const ChannelsTable = () => {
       let res = await API.get(`/api/group/`);
       // add 'all' option
       // res.data.data.unshift('all');
-      setGroupOptions(res.data.data.map((group) => ({
+      if (res === undefined) {
-        label: group,
+        return;
-        value: group
+      }
-      })));
+      setGroupOptions(
+        res.data.data.map((group) => ({
+          label: group,
+          value: group,
+        })),
+      );
     } catch (error) {
       showError(error.message);
     }
@@ -564,27 +633,34 @@ const ChannelsTable = () => {
     if (record.status !== 1) {
       return {
         style: {
-          background: 'var(--semi-color-disabled-border)'
+          background: 'var(--semi-color-disabled-border)',
-        }
+        },
       };
     } else {
       return {};
     }
   };
 
-
   return (
     <>
-      <EditChannel refresh={refresh} visible={showEdit} handleClose={closeEdit} editingChannel={editingChannel} />
+      <EditChannel
-      <Form onSubmit={() => {
+        refresh={refresh}
-        searchChannels(searchKeyword, searchGroup, searchModel);
+        visible={showEdit}
-      }} labelPosition="left">
+        handleClose={closeEdit}
+        editingChannel={editingChannel}
+      />
+      <Form
+        onSubmit={() => {
+          searchChannels(searchKeyword, searchGroup, searchModel);
+        }}
+        labelPosition='left'
+      >
         <div style={{ display: 'flex' }}>
           <Space>
             <Form.Input
-              field="search_keyword"
+              field='search_keyword'
-              label="搜索渠道关键词"
+              label='搜索渠道关键词'
-              placeholder="ID，名称和密钥 ..."
+              placeholder='ID，名称和密钥 ...'
               value={searchKeyword}
               loading={searching}
               onChange={(v) => {
@@ -592,21 +668,33 @@ const ChannelsTable = () => {
               }}
             />
             <Form.Input
-              field="search_model"
+              field='search_model'
-              label="模型"
+              label='模型'
-              placeholder="模型关键字"
+              placeholder='模型关键字'
               value={searchModel}
               loading={searching}
               onChange={(v) => {
                 setSearchModel(v.trim());
               }}
             />
-            <Form.Select field="group" label="分组" optionList={groupOptions} onChange={(v) => {
+            <Form.Select
-              setSearchGroup(v);
+              field='group'
-              searchChannels(searchKeyword, v, searchModel);
+              label='分组'
-            }} />
+              optionList={groupOptions}
-            <Button label="查询" type="primary" htmlType="submit" className="btn-margin-right"
+              onChange={(v) => {
-                    style={{ marginRight: 8 }}>查询</Button>
+                setSearchGroup(v);
+                searchChannels(searchKeyword, v, searchModel);
+              }}
+            />
+            <Button
+              label='查询'
+              type='primary'
+              htmlType='submit'
+              className='btn-margin-right'
+              style={{ marginRight: 8 }}
+            >
+              查询
+            </Button>
           </Space>
         </div>
       </Form>
@@ -614,80 +702,118 @@ const ChannelsTable = () => {
         <Space>
           <Space>
             <Typography.Text strong>使用ID排序</Typography.Text>
-            <Switch checked={idSort} label="使用ID排序" uncheckedText="关" aria-label="是否用ID排序" onChange={(v) => {
+            <Switch
-              localStorage.setItem('id-sort', v + '');
+              checked={idSort}
-              setIdSort(v);
+              label='使用ID排序'
-              loadChannels(0, pageSize, v)
+              uncheckedText='关'
-                .then()
+              aria-label='是否用ID排序'
-                .catch((reason) => {
+              onChange={(v) => {
-                  showError(reason);
+                localStorage.setItem('id-sort', v + '');
-                });
+                setIdSort(v);
-            }}></Switch>
+                loadChannels(0, pageSize, v)
+                  .then()
+                  .catch((reason) => {
+                    showError(reason);
+                  });
+              }}
+            ></Switch>
           </Space>
         </Space>
       </div>
 
-      <Table className={'channel-table'} style={{ marginTop: 15 }} columns={columns} dataSource={pageData} pagination={{
+      <Table
-        currentPage: activePage,
+        className={'channel-table'}
-        pageSize: pageSize,
+        style={{ marginTop: 15 }}
-        total: channelCount,
+        columns={columns}
-        pageSizeOpts: [10, 20, 50, 100],
+        dataSource={pageData}
-        showSizeChanger: true,
+        pagination={{
-        formatPageText: (page) => '',
+          currentPage: activePage,
-        onPageSizeChange: (size) => {
+          pageSize: pageSize,
-          handlePageSizeChange(size).then();
+          total: channelCount,
-        },
+          pageSizeOpts: [10, 20, 50, 100],
-        onPageChange: handlePageChange
+          showSizeChanger: true,
-      }} loading={loading} onRow={handleRow} rowSelection={
+          formatPageText: (page) => '',
-        enableBatchDelete ?
+          onPageSizeChange: (size) => {
-          {
+            handlePageSizeChange(size).then();
-            onChange: (selectedRowKeys, selectedRows) => {
+          },
-              // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
+          onPageChange: handlePageChange,
-              setSelectedChannels(selectedRows);
+        }}
-            }
+        loading={loading}
-          } : null
+        onRow={handleRow}
-      } />
+        rowSelection={
-      <div style={{
+          enableBatchDelete
-        display: isMobile() ? '' : 'flex',
+            ? {
-        marginTop: isMobile() ? 0 : -45,
+                onChange: (selectedRowKeys, selectedRows) => {
-        zIndex: 999,
+                  // console.log(`selectedRowKeys: ${selectedRowKeys}`, 'selectedRows: ', selectedRows);
-        position: 'relative',
+                  setSelectedChannels(selectedRows);
-        pointerEvents: 'none'
+                },
-      }}>
+              }
-        <Space style={{ pointerEvents: 'auto', marginTop: isMobile() ? 0 : 45 }}>
+            : null
-          <Button theme="light" type="primary" style={{ marginRight: 8 }} onClick={
+        }
-            () => {
+      />
+      <div
+        style={{
+          display: isMobile() ? '' : 'flex',
+          marginTop: isMobile() ? 0 : -45,
+          zIndex: 999,
+          position: 'relative',
+          pointerEvents: 'none',
+        }}
+      >
+        <Space
+          style={{ pointerEvents: 'auto', marginTop: isMobile() ? 0 : 45 }}
+        >
+          <Button
+            theme='light'
+            type='primary'
+            style={{ marginRight: 8 }}
+            onClick={() => {
               setEditingChannel({
-                id: undefined
+                id: undefined,
               });
               setShowEdit(true);
-            }
+            }}
-          }>添加渠道</Button>
+          >
+            添加渠道
+          </Button>
           <Popconfirm
-            title="确定？"
+            title='确定？'
             okType={'warning'}
             onConfirm={testAllChannels}
             position={isMobile() ? 'top' : 'top'}
           >
-            <Button theme="light" type="warning" style={{ marginRight: 8 }}>测试所有通道</Button>
+            <Button theme='light' type='warning' style={{ marginRight: 8 }}>
+              测试所有通道
+            </Button>
           </Popconfirm>
           <Popconfirm
-            title="确定？"
+            title='确定？'
             okType={'secondary'}
             onConfirm={updateAllChannelsBalance}
           >
-            <Button theme="light" type="secondary" style={{ marginRight: 8 }}>更新所有已启用通道余额</Button>
+            <Button theme='light' type='secondary' style={{ marginRight: 8 }}>
+              更新所有已启用通道余额
+            </Button>
           </Popconfirm>
           <Popconfirm
-            title="确定是否要删除禁用通道？"
+            title='确定是否要删除禁用通道？'
-            content="此修改将不可逆"
+            content='此修改将不可逆'
             okType={'danger'}
             onConfirm={deleteAllDisabledChannels}
           >
-            <Button theme="light" type="danger" style={{ marginRight: 8 }}>删除禁用通道</Button>
+            <Button theme='light' type='danger' style={{ marginRight: 8 }}>
+              删除禁用通道
+            </Button>
           </Popconfirm>
 
-          <Button theme="light" type="primary" style={{ marginRight: 8 }} onClick={refresh}>刷新</Button>
+          <Button
+            theme='light'
+            type='primary'
+            style={{ marginRight: 8 }}
+            onClick={refresh}
+          >
+            刷新
+          </Button>
         </Space>
         {/*<div style={{width: '100%', pointerEvents: 'none', position: 'absolute'}}>*/}
 
@@ -696,28 +822,41 @@ const ChannelsTable = () => {
       <div style={{ marginTop: 20 }}>
         <Space>
           <Typography.Text strong>开启批量删除</Typography.Text>
-          <Switch label="开启批量删除" uncheckedText="关" aria-label="是否开启批量删除" onChange={(v) => {
+          <Switch
-            setEnableBatchDelete(v);
+            label='开启批量删除'
-          }}></Switch>
+            uncheckedText='关'
+            aria-label='是否开启批量删除'
+            onChange={(v) => {
+              setEnableBatchDelete(v);
+            }}
+          ></Switch>
           <Popconfirm
-            title="确定是否要删除所选通道？"
+            title='确定是否要删除所选通道？'
-            content="此修改将不可逆"
+            content='此修改将不可逆'
             okType={'danger'}
             onConfirm={batchDeleteChannels}
             disabled={!enableBatchDelete}
             position={'top'}
           >
-            <Button disabled={!enableBatchDelete} theme="light" type="danger"
+            <Button
-                    style={{ marginRight: 8 }}>删除所选通道</Button>
+              disabled={!enableBatchDelete}
+              theme='light'
+              type='danger'
+              style={{ marginRight: 8 }}
+            >
+              删除所选通道
+            </Button>
           </Popconfirm>
           <Popconfirm
-            title="确定是否要修复数据库一致性？"
+            title='确定是否要修复数据库一致性？'
-            content="进行该操作时，可能导致渠道访问错误，请仅在数据库出现问题时使用"
+            content='进行该操作时，可能导致渠道访问错误，请仅在数据库出现问题时使用'
             okType={'warning'}
             onConfirm={fixChannelsAbilities}
             position={'top'}
           >
-            <Button theme="light" type="secondary" style={{ marginRight: 8 }}>修复数据库一致性</Button>
+            <Button theme='light' type='secondary' style={{ marginRight: 8 }}>
+              修复数据库一致性
+            </Button>
           </Popconfirm>
         </Space>
       </div>

web/src/components/Footer.js

@@ -32,27 +32,36 @@ const Footer = () => {
       <Layout.Content style={{ textAlign: 'center' }}>
         {footer ? (
           <div
-            className="custom-footer"
+            className='custom-footer'
             dangerouslySetInnerHTML={{ __html: footer }}
           ></div>
         ) : (
-          <div className="custom-footer">
+          <div className='custom-footer'>
             <a
-              href="https://github.com/Calcium-Ion/new-api"
+              href='https://github.com/Calcium-Ion/new-api'
-              target="_blank" rel="noreferrer"
+              target='_blank'
+              rel='noreferrer'
             >
-              New API {process.env.REACT_APP_VERSION}{' '}
+              New API {import.meta.env.VITE_REACT_APP_VERSION}{' '}
             </a>
             由{' '}
-            <a href="https://github.com/Calcium-Ion" target="_blank" rel="noreferrer">
+            <a
+              href='https://github.com/Calcium-Ion'
+              target='_blank'
+              rel='noreferrer'
+            >
               Calcium-Ion
             </a>{' '}
             开发，基于{' '}
-            <a href="https://github.com/songquanpeng/one-api" target="_blank" rel="noreferrer">
+            <a
+              href='https://github.com/songquanpeng/one-api'
+              target='_blank'
+              rel='noreferrer'
+            >
               One API v0.5.4
             </a>{' '}
             ，本项目根据{' '}
-            <a href="https://opensource.org/licenses/mit-license.php">
+            <a href='https://opensource.org/licenses/mit-license.php'>
               MIT 许可证
             </a>{' '}
             授权

web/src/components/GitHubOAuth.js

@@ -49,7 +49,7 @@ const GitHubOAuth = () => {
   return (
     <Segment style={{ minHeight: '300px' }}>
       <Dimmer active inverted>
-        <Loader size="large">{prompt}</Loader>
+        <Loader size='large'>{prompt}</Loader>
       </Dimmer>
     </Segment>
   );

web/src/components/HeaderBar.js

@@ -17,15 +17,15 @@ let headerButtons = [
     text: '关于',
     itemKey: 'about',
     to: '/about',
-    icon: <IconHelpCircle />
+    icon: <IconHelpCircle />,
-  }
+  },
 ];
 
 if (localStorage.getItem('chat_link')) {
   headerButtons.splice(1, 0, {
     name: '聊天',
     to: '/chat',
-    icon: 'comments'
+    icon: 'comments',
   });
 }
 
@@ -40,7 +40,11 @@ const HeaderBar = () => {
   var themeMode = localStorage.getItem('theme-mode');
   const currentDate = new Date();
   // enable fireworks on new year(1.1 and 2.9-2.24)
-  const isNewYear = (currentDate.getMonth() === 0 && currentDate.getDate() === 1) || (currentDate.getMonth() === 1 && currentDate.getDate() >= 9 && currentDate.getDate() <= 24);
+  const isNewYear =
+    (currentDate.getMonth() === 0 && currentDate.getDate() === 1) ||
+    (currentDate.getMonth() === 1 &&
+      currentDate.getDate() >= 9 &&
+      currentDate.getDate() <= 24);
 
   async function logout() {
     setShowSidebar(false);
@@ -93,7 +97,7 @@ const HeaderBar = () => {
               const routerMap = {
                 about: '/about',
                 login: '/login',
-                register: '/register'
+                register: '/register',
               };
               return (
                 <Link
@@ -106,52 +110,69 @@ const HeaderBar = () => {
             }}
             selectedKeys={[]}
             // items={headerButtons}
-            onSelect={key => {
+            onSelect={(key) => {}}
-
-            }}
             footer={
               <>
-                {isNewYear &&
+                {isNewYear && (
                   // happy new year
                   <Dropdown
-                    position="bottomRight"
+                    position='bottomRight'
                     render={
                       <Dropdown.Menu>
-                        <Dropdown.Item onClick={handleNewYearClick}>Happy New Year!!!</Dropdown.Item>
+                        <Dropdown.Item onClick={handleNewYearClick}>
+                          Happy New Year!!!
+                        </Dropdown.Item>
                       </Dropdown.Menu>
                     }
                   >
                     <Nav.Item itemKey={'new-year'} text={'🏮'} />
                   </Dropdown>
-                }
+                )}
                 <Nav.Item itemKey={'about'} icon={<IconHelpCircle />} />
-                <Switch checkedText="🌞" size={'large'} checked={dark} uncheckedText="🌙" onChange={switchMode} />
+                <Switch
-                {userState.user ?
+                  checkedText='🌞'
+                  size={'large'}
+                  checked={dark}
+                  uncheckedText='🌙'
+                  onChange={switchMode}
+                />
+                {userState.user ? (
                   <>
                     <Dropdown
-                      position="bottomRight"
+                      position='bottomRight'
                       render={
                         <Dropdown.Menu>
                           <Dropdown.Item onClick={logout}>退出</Dropdown.Item>
                         </Dropdown.Menu>
                       }
                     >
-                      <Avatar size="small" color={stringToColor(userState.user.username)} style={{ margin: 4 }}>
+                      <Avatar
+                        size='small'
+                        color={stringToColor(userState.user.username)}
+                        style={{ margin: 4 }}
+                      >
                         {userState.user.username[0]}
                       </Avatar>
                       <span>{userState.user.username}</span>
                     </Dropdown>
                   </>
-                  :
+                ) : (
                   <>
-                    <Nav.Item itemKey={'login'} text={'登录'} icon={<IconKey />} />
+                    <Nav.Item
-                    <Nav.Item itemKey={'register'} text={'注册'} icon={<IconUser />} />
+                      itemKey={'login'}
+                      text={'登录'}
+                      icon={<IconKey />}
+                    />
+                    <Nav.Item
+                      itemKey={'register'}
+                      text={'注册'}
+                      icon={<IconUser />}
+                    />
                   </>
-                }
+                )}
               </>
             }
-          >
+          ></Nav>
-          </Nav>
         </div>
       </Layout>
     </>

web/src/components/Loading.js

@@ -1,13 +1,11 @@
 import React from 'react';
-import { Dimmer, Loader, Segment } from 'semantic-ui-react';
+import { Spin } from '@douyinfe/semi-ui';
 
 const Loading = ({ prompt: name = 'page' }) => {
   return (
-    <Segment style={{ height: 100 }}>
+    <Spin style={{ height: 100 }} spinning={true}>
-      <Dimmer active inverted>
+      加载{name}中...
-        <Loader indeterminate>加载{name}中...</Loader>
+    </Spin>
-      </Dimmer>
-    </Segment>
   );
 };
 

web/src/components/LoginForm.js

@@ -4,7 +4,15 @@ import { UserContext } from '../context/User';
 import { API, getLogo, showError, showInfo, showSuccess } from '../helpers';
 import { onGitHubOAuthClicked } from './utils';
 import Turnstile from 'react-turnstile';
-import { Button, Card, Divider, Form, Icon, Layout, Modal } from '@douyinfe/semi-ui';
+import {
+  Button,
+  Card,
+  Divider,
+  Form,
+  Icon,
+  Layout,
+  Modal,
+} from '@douyinfe/semi-ui';
 import Title from '@douyinfe/semi-ui/lib/es/typography/title';
 import Text from '@douyinfe/semi-ui/lib/es/typography/text';
 import TelegramLoginButton from 'react-telegram-login';
@@ -16,7 +24,7 @@ const LoginForm = () => {
   const [inputs, setInputs] = useState({
     username: '',
     password: '',
-    wechat_verification_code: ''
+    wechat_verification_code: '',
   });
   const [searchParams, setSearchParams] = useSearchParams();
   const [submitted, setSubmitted] = useState(false);
@@ -56,7 +64,7 @@ const LoginForm = () => {
       return;
     }
     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) {
@@ -81,17 +89,24 @@ const LoginForm = () => {
     }
     setSubmitted(true);
     if (username && password) {
-      const res = await API.post(`/api/user/login?turnstile=${turnstileToken}`, {
+      const res = await API.post(
-        username,
+        `/api/user/login?turnstile=${turnstileToken}`,
-        password
+        {
-      });
+          username,
+          password,
+        },
+      );
       const { success, message, data } = res.data;
       if (success) {
         userDispatch({ type: 'login', payload: data });
         localStorage.setItem('user', JSON.stringify(data));
         showSuccess('登录成功！');
         if (username === 'root' && password === '123456') {
-          Modal.error({ title: '您正在使用默认密码！', content: '请立刻修改默认密码！', centered: true });
+          Modal.error({
+            title: '您正在使用默认密码！',
+            content: '请立刻修改默认密码！',
+            centered: true,
+          });
         }
         navigate('/token');
       } else {
@@ -104,7 +119,16 @@ const LoginForm = () => {
 
   // 添加Telegram登录处理函数
   const onTelegramLoginClicked = async (response) => {
-    const fields = ['id', 'first_name', 'last_name', 'username', 'photo_url', 'auth_date', 'hash', 'lang'];
+    const fields = [
+      'id',
+      'first_name',
+      'last_name',
+      'username',
+      'photo_url',
+      'auth_date',
+      'hash',
+      'lang',
+    ];
     const params = {};
     fields.forEach((field) => {
       if (response[field]) {
@@ -126,10 +150,15 @@ const LoginForm = () => {
   return (
     <div>
       <Layout>
-        <Layout.Header>
+        <Layout.Header></Layout.Header>
-        </Layout.Header>
         <Layout.Content>
-          <div style={{ justifyContent: 'center', display: 'flex', marginTop: 120 }}>
+          <div
+            style={{
+              justifyContent: 'center',
+              display: 'flex',
+              marginTop: 120,
+            }}
+          >
             <div style={{ width: 500 }}>
               <Card>
                 <Title heading={2} style={{ textAlign: 'center' }}>
@@ -139,50 +168,72 @@ const LoginForm = () => {
                   <Form.Input
                     field={'username'}
                     label={'用户名'}
-                    placeholder="用户名"
+                    placeholder='用户名'
-                    name="username"
+                    name='username'
                     onChange={(value) => handleChange('username', value)}
                   />
                   <Form.Input
                     field={'password'}
                     label={'密码'}
-                    placeholder="密码"
+                    placeholder='密码'
-                    name="password"
+                    name='password'
-                    type="password"
+                    type='password'
                     onChange={(value) => handleChange('password', value)}
                   />
 
-                  <Button theme="solid" style={{ width: '100%' }} type={'primary'} size="large"
+                  <Button
-                          htmlType={'submit'} onClick={handleSubmit}>
+                    theme='solid'
+                    style={{ width: '100%' }}
+                    type={'primary'}
+                    size='large'
+                    htmlType={'submit'}
+                    onClick={handleSubmit}
+                  >
                     登录
                   </Button>
                 </Form>
-                <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: 20 }}>
+                <div
+                  style={{
+                    display: 'flex',
+                    justifyContent: 'space-between',
+                    marginTop: 20,
+                  }}
+                >
                   <Text>
-                    没有账号请先 <Link to="/register">注册账号</Link>
+                    没有账号请先 <Link to='/register'>注册账号</Link>
                   </Text>
                   <Text>
-                    忘记密码 <Link to="/reset">点击重置</Link>
+                    忘记密码 <Link to='/reset'>点击重置</Link>
                   </Text>
                 </div>
-                {status.github_oauth || status.wechat_login || status.telegram_oauth ? (
+                {status.github_oauth ||
+                status.wechat_login ||
+                status.telegram_oauth ? (
                   <>
-                    <Divider margin="12px" align="center">
+                    <Divider margin='12px' align='center'>
                       第三方登录
                     </Divider>
-                    <div style={{ display: 'flex', justifyContent: 'center', marginTop: 20 }}>
+                    <div
+                      style={{
+                        display: 'flex',
+                        justifyContent: 'center',
+                        marginTop: 20,
+                      }}
+                    >
                       {status.github_oauth ? (
                         <Button
-                          type="primary"
+                          type='primary'
                           icon={<IconGithubLogo />}
-                          onClick={() => onGitHubOAuthClicked(status.github_client_id)}
+                          onClick={() =>
+                            onGitHubOAuthClicked(status.github_client_id)
+                          }
                         />
                       ) : (
                         <></>
                       )}
                       {status.wechat_login ? (
                         <Button
-                          type="primary"
+                          type='primary'
                           style={{ color: 'rgba(var(--semi-green-5), 1)' }}
                           icon={<Icon svg={<WeChatIcon />} />}
                           onClick={onWeChatLoginClicked}
@@ -192,7 +243,10 @@ const LoginForm = () => {
                       )}
 
                       {status.telegram_oauth ? (
-                        <TelegramLoginButton dataOnauth={onTelegramLoginClicked} botName={status.telegram_bot_name} />
+                        <TelegramLoginButton
+                          dataOnauth={onTelegramLoginClicked}
+                          botName={status.telegram_bot_name}
+                        />
                       ) : (
                         <></>
                       )}
@@ -202,7 +256,7 @@ const LoginForm = () => {
                   <></>
                 )}
                 <Modal
-                  title="微信扫码登录"
+                  title='微信扫码登录'
                   visible={showWeChatLoginModal}
                   maskClosable={true}
                   onOk={onSubmitWeChatVerificationCode}
@@ -211,7 +265,13 @@ const LoginForm = () => {
                   size={'small'}
                   centered={true}
                 >
-                  <div style={{ display: 'flex', alignItem: 'center', flexDirection: 'column' }}>
+                  <div
+                    style={{
+                      display: 'flex',
+                      alignItem: 'center',
+                      flexDirection: 'column',
+                    }}
+                  >
                     <img src={status.wechat_qrcode} />
                   </div>
                   <div style={{ textAlign: 'center' }}>
@@ -219,19 +279,27 @@ const LoginForm = () => {
                       微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效）
                     </p>
                   </div>
-                  <Form size="large">
+                  <Form size='large'>
                     <Form.Input
                       field={'wechat_verification_code'}
-                      placeholder="验证码"
+                      placeholder='验证码'
                       label={'验证码'}
                       value={inputs.wechat_verification_code}
-                      onChange={(value) => handleChange('wechat_verification_code', value)}
+                      onChange={(value) =>
+                        handleChange('wechat_verification_code', value)
+                      }
                     />
                   </Form>
                 </Modal>
               </Card>
               {turnstileEnabled ? (
-                <div style={{ display: 'flex', justifyContent: 'center', marginTop: 20 }}>
+                <div
+                  style={{
+                    display: 'flex',
+                    justifyContent: 'center',
+                    marginTop: 20,
+                  }}
+                >
                   <Turnstile
                     sitekey={turnstileSiteKey}
                     onVerify={(token) => {
@@ -244,7 +312,6 @@ const LoginForm = () => {
               )}
             </div>
           </div>
-
         </Layout.Content>
       </Layout>
     </div>

web/src/components/LogsTable.js

@@ -1,7 +1,25 @@
 import React, { useEffect, useState } from 'react';
-import { API, copy, isAdmin, showError, showSuccess, timestamp2string } from '../helpers';
+import {
+  API,
+  copy,
+  isAdmin,
+  showError,
+  showSuccess,
+  timestamp2string,
+} from '../helpers';
 
-import { Avatar, Button, Form, Layout, Modal, Select, Space, Spin, Table, Tag } from '@douyinfe/semi-ui';
+import {
+  Avatar,
+  Button,
+  Form,
+  Layout,
+  Modal,
+  Select,
+  Space,
+  Spin,
+  Table,
+  Tag,
+} from '@douyinfe/semi-ui';
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderNumber, renderQuota, stringToColor } from '../helpers/render';
 import Paragraph from '@douyinfe/semi-ui/lib/es/typography/paragraph';
@@ -9,131 +27,285 @@ import Paragraph from '@douyinfe/semi-ui/lib/es/typography/paragraph';
 const { Header } = Layout;
 
 function renderTimestamp(timestamp) {
-  return (<>
+  return <>{timestamp2string(timestamp)}</>;
-    {timestamp2string(timestamp)}
-  </>);
 }
 
-const MODE_OPTIONS = [{ key: 'all', text: '全部用户', value: 'all' }, { key: 'self', text: '当前用户', value: 'self' }];
+const MODE_OPTIONS = [
+  { key: 'all', text: '全部用户', value: 'all' },
+  { key: 'self', text: '当前用户', value: 'self' },
+];
 
-const colors = ['amber', 'blue', 'cyan', 'green', 'grey', 'indigo', 'light-blue', 'lime', 'orange', 'pink', 'purple', 'red', 'teal', 'violet', 'yellow'];
+const colors = [
+  'amber',
+  'blue',
+  'cyan',
+  'green',
+  'grey',
+  'indigo',
+  'light-blue',
+  'lime',
+  'orange',
+  'pink',
+  'purple',
+  'red',
+  'teal',
+  'violet',
+  'yellow',
+];
 
 function renderType(type) {
   switch (type) {
     case 1:
-      return <Tag color="cyan" size="large"> 充值 </Tag>;
+      return (
+        <Tag color='cyan' size='large'>
+          {' '}
+          充值{' '}
+        </Tag>
+      );
     case 2:
-      return <Tag color="lime" size="large"> 消费 </Tag>;
+      return (
+        <Tag color='lime' size='large'>
+          {' '}
+          消费{' '}
+        </Tag>
+      );
     case 3:
-      return <Tag color="orange" size="large"> 管理 </Tag>;
+      return (
+        <Tag color='orange' size='large'>
+          {' '}
+          管理{' '}
+        </Tag>
+      );
     case 4:
-      return <Tag color="purple" size="large"> 系统 </Tag>;
+      return (
+        <Tag color='purple' size='large'>
+          {' '}
+          系统{' '}
+        </Tag>
+      );
     default:
-      return <Tag color="black" size="large"> 未知 </Tag>;
+      return (
+        <Tag color='black' size='large'>
+          {' '}
+          未知{' '}
+        </Tag>
+      );
   }
 }
 
 function renderIsStream(bool) {
   if (bool) {
-    return <Tag color="blue" size="large">流</Tag>;
+    return (
+      <Tag color='blue' size='large'>
+        流
+      </Tag>
+    );
   } else {
-    return <Tag color="purple" size="large">非流</Tag>;
+    return (
+      <Tag color='purple' size='large'>
+        非流
+      </Tag>
+    );
   }
 }
 
 function renderUseTime(type) {
   const time = parseInt(type);
   if (time < 101) {
-    return <Tag color="green" size="large"> {time} s </Tag>;
+    return (
+      <Tag color='green' size='large'>
+        {' '}
+        {time} s{' '}
+      </Tag>
+    );
   } else if (time < 300) {
-    return <Tag color="orange" size="large"> {time} s </Tag>;
+    return (
+      <Tag color='orange' size='large'>
+        {' '}
+        {time} s{' '}
+      </Tag>
+    );
   } else {
-    return <Tag color="red" size="large"> {time} s </Tag>;
+    return (
+      <Tag color='red' size='large'>
+        {' '}
+        {time} s{' '}
+      </Tag>
+    );
   }
 }
 
 const LogsTable = () => {
-  const columns = [{
+  const columns = [
-    title: '时间', dataIndex: 'timestamp2string'
+    {
-  }, {
+      title: '时间',
-    title: '渠道',
+      dataIndex: 'timestamp2string',
-    dataIndex: 'channel',
+    },
-    className: isAdmin() ? 'tableShow' : 'tableHiddle',
+    {
-    render: (text, record, index) => {
+      title: '渠道',
-      return (isAdminUser ? record.type === 0 || record.type === 2 ? <div>
+      dataIndex: 'channel',
-        {<Tag color={colors[parseInt(text) % colors.length]} size="large"> {text} </Tag>}
+      className: isAdmin() ? 'tableShow' : 'tableHiddle',
-      </div> : <></> : <></>);
+      render: (text, record, index) => {
-    }
+        return isAdminUser ? (
-  }, {
+          record.type === 0 || record.type === 2 ? (
-    title: '用户',
+            <div>
-    dataIndex: 'username',
+              {
-    className: isAdmin() ? 'tableShow' : 'tableHiddle',
+                <Tag
-    render: (text, record, index) => {
+                  color={colors[parseInt(text) % colors.length]}
-      return (isAdminUser ? <div>
+                  size='large'
-        <Avatar size="small" color={stringToColor(text)} style={{ marginRight: 4 }}
+                >
-                onClick={() => showUserInfo(record.user_id)}>
+                  {' '}
-          {typeof text === 'string' && text.slice(0, 1)}
+                  {text}{' '}
-        </Avatar>
+                </Tag>
-        {text}
+              }
-      </div> : <></>);
+            </div>
-    }
+          ) : (
-  }, {
+            <></>
-    title: '令牌', dataIndex: 'token_name', render: (text, record, index) => {
+          )
-      return (record.type === 0 || record.type === 2 ? <div>
+        ) : (
-        <Tag color="grey" size="large" onClick={() => {
+          <></>
-          copyText(text);
+        );
-        }}> {text} </Tag>
+      },
-      </div> : <></>);
+    },
-    }
+    {
-  }, {
+      title: '用户',
-    title: '类型', dataIndex: 'type', render: (text, record, index) => {
+      dataIndex: 'username',
-      return (<div>
+      className: isAdmin() ? 'tableShow' : 'tableHiddle',
-        {renderType(text)}
+      render: (text, record, index) => {
-      </div>);
+        return isAdminUser ? (
-    }
+          <div>
-  }, {
+            <Avatar
-    title: '模型', dataIndex: 'model_name', render: (text, record, index) => {
+              size='small'
-      return (record.type === 0 || record.type === 2 ? <div>
+              color={stringToColor(text)}
-        <Tag color={stringToColor(text)} size="large" onClick={() => {
+              style={{ marginRight: 4 }}
-          copyText(text);
+              onClick={() => showUserInfo(record.user_id)}
-        }}> {text} </Tag>
+            >
-      </div> : <></>);
+              {typeof text === 'string' && text.slice(0, 1)}
-    }
+            </Avatar>
-  }, {
+            {text}
-    title: '用时', dataIndex: 'use_time', render: (text, record, index) => {
+          </div>
-      return (<div>
+        ) : (
-        <Space>
+          <></>
-          {renderUseTime(text)}
+        );
-          {renderIsStream(record.is_stream)}
+      },
-        </Space>
+    },
-      </div>);
+    {
-    }
+      title: '令牌',
-  }, {
+      dataIndex: 'token_name',
-    title: '提示', dataIndex: 'prompt_tokens', render: (text, record, index) => {
+      render: (text, record, index) => {
-      return (record.type === 0 || record.type === 2 ? <div>
+        return record.type === 0 || record.type === 2 ? (
-        {<span> {text} </span>}
+          <div>
-      </div> : <></>);
+            <Tag
-    }
+              color='grey'
-  }, {
+              size='large'
-    title: '补全', dataIndex: 'completion_tokens', render: (text, record, index) => {
+              onClick={() => {
-      return (parseInt(text) > 0 && (record.type === 0 || record.type === 2) ? <div>
+                copyText(text);
-        {<span> {text} </span>}
+              }}
-      </div> : <></>);
+            >
-    }
+              {' '}
-  }, {
+              {text}{' '}
-    title: '花费', dataIndex: 'quota', render: (text, record, index) => {
+            </Tag>
-      return (record.type === 0 || record.type === 2 ? <div>
+          </div>
-        {renderQuota(text, 6)}
+        ) : (
-      </div> : <></>);
+          <></>
-    }
+        );
-  }, {
+      },
-    title: '详情', dataIndex: 'content', render: (text, record, index) => {
+    },
-      return <Paragraph ellipsis={{ rows: 2, showTooltip: { type: 'popover', opts: { style: { width: 240 } } } }}
+    {
-                        style={{ maxWidth: 240 }}>
+      title: '类型',
-        {text}
+      dataIndex: 'type',
-      </Paragraph>;
+      render: (text, record, index) => {
-    }
+        return <div>{renderType(text)}</div>;
-  }];
+      },
+    },
+    {
+      title: '模型',
+      dataIndex: 'model_name',
+      render: (text, record, index) => {
+        return record.type === 0 || record.type === 2 ? (
+          <div>
+            <Tag
+              color={stringToColor(text)}
+              size='large'
+              onClick={() => {
+                copyText(text);
+              }}
+            >
+              {' '}
+              {text}{' '}
+            </Tag>
+          </div>
+        ) : (
+          <></>
+        );
+      },
+    },
+    {
+      title: '用时',
+      dataIndex: 'use_time',
+      render: (text, record, index) => {
+        return (
+          <div>
+            <Space>
+              {renderUseTime(text)}
+              {renderIsStream(record.is_stream)}
+            </Space>
+          </div>
+        );
+      },
+    },
+    {
+      title: '提示',
+      dataIndex: 'prompt_tokens',
+      render: (text, record, index) => {
+        return record.type === 0 || record.type === 2 ? (
+          <div>{<span> {text} </span>}</div>
+        ) : (
+          <></>
+        );
+      },
+    },
+    {
+      title: '补全',
+      dataIndex: 'completion_tokens',
+      render: (text, record, index) => {
+        return parseInt(text) > 0 &&
+          (record.type === 0 || record.type === 2) ? (
+          <div>{<span> {text} </span>}</div>
+        ) : (
+          <></>
+        );
+      },
+    },
+    {
+      title: '花费',
+      dataIndex: 'quota',
+      render: (text, record, index) => {
+        return record.type === 0 || record.type === 2 ? (
+          <div>{renderQuota(text, 6)}</div>
+        ) : (
+          <></>
+        );
+      },
+    },
+    {
+      title: '详情',
+      dataIndex: 'content',
+      render: (text, record, index) => {
+        return (
+          <Paragraph
+            ellipsis={{
+              rows: 2,
+              showTooltip: { type: 'popover', opts: { style: { width: 240 } } },
+            }}
+            style={{ maxWidth: 240 }}
+          >
+            {text}
+          </Paragraph>
+        );
+      },
+    },
+  ];
 
   const [logs, setLogs] = useState([]);
   const [showStat, setShowStat] = useState(false);
@@ -154,12 +326,20 @@ const LogsTable = () => {
     model_name: '',
     start_timestamp: timestamp2string(now.getTime() / 1000 - 86400),
     end_timestamp: timestamp2string(now.getTime() / 1000 + 3600),
-    channel: ''
+    channel: '',
   });
-  const { username, token_name, model_name, start_timestamp, end_timestamp, channel } = inputs;
+  const {
+    username,
+    token_name,
+    model_name,
+    start_timestamp,
+    end_timestamp,
+    channel,
+  } = inputs;
 
   const [stat, setStat] = useState({
-    quota: 0, token: 0
+    quota: 0,
+    token: 0,
   });
 
   const handleInputChange = (value, name) => {
@@ -169,7 +349,9 @@ 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);
@@ -181,7 +363,9 @@ 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}&channel=${channel}`);
+    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}&channel=${channel}`,
+    );
     const { success, message, data } = res.data;
     if (success) {
       setStat(data);
@@ -209,12 +393,16 @@ const LogsTable = () => {
     const { success, message, data } = res.data;
     if (success) {
       Modal.info({
-        title: '用户信息', content: <div style={{ padding: 12 }}>
+        title: '用户信息',
-          <p>用户名: {data.username}</p>
+        content: (
-          <p>余额: {renderQuota(data.quota)}</p>
+          <div style={{ padding: 12 }}>
-          <p>已用额度：{renderQuota(data.used_quota)}</p>
+            <p>用户名: {data.username}</p>
-          <p>请求次数：{renderNumber(data.request_count)}</p>
+            <p>余额: {renderQuota(data.quota)}</p>
-        </div>, centered: true
+            <p>已用额度：{renderQuota(data.used_quota)}</p>
+            <p>请求次数：{renderNumber(data.request_count)}</p>
+          </div>
+        ),
+        centered: true,
       });
     } else {
       showError(message);
@@ -259,14 +447,16 @@ const LogsTable = () => {
     setLoading(false);
   };
 
-  const pageData = logs.slice((activePage - 1) * pageSize, activePage * pageSize);
+  const pageData = logs.slice(
+    (activePage - 1) * pageSize,
+    activePage * pageSize,
+  );
 
-  const handlePageChange = page => {
+  const handlePageChange = (page) => {
     setActivePage(page);
     if (page === Math.ceil(logs.length / pageSize) + 1) {
       // In this case we have to load more data and then append them.
-      loadLogs(page - 1, pageSize, logType).then(r => {
+      loadLogs(page - 1, pageSize, logType).then((r) => {});
-      });
     }
   };
 
@@ -281,10 +471,10 @@ const LogsTable = () => {
       });
   };
 
-  const refresh = async (localLogType) => {
+  const refresh = async () => {
     // setLoading(true);
     setActivePage(1);
-    await loadLogs(0, pageSize, localLogType);
+    await loadLogs(0, pageSize, logType);
   };
 
   const copyText = async (text) => {
@@ -298,7 +488,8 @@ const LogsTable = () => {
 
   useEffect(() => {
     // console.log('default effect')
-    const localPageSize = parseInt(localStorage.getItem('page-size')) || ITEMS_PER_PAGE;
+    const localPageSize =
+      parseInt(localStorage.getItem('page-size')) || ITEMS_PER_PAGE;
     setPageSize(localPageSize);
     loadLogs(0, localPageSize)
       .then()
@@ -326,74 +517,136 @@ const LogsTable = () => {
     setSearching(false);
   };
 
-  return (<>
+  return (
-    <Layout>
+    <>
-      <Header>
+      <Layout>
-        <Spin spinning={loadingStat}>
+        <Header>
-          <h3>使用明细（总消耗额度：
+          <Spin spinning={loadingStat}>
-            <span onClick={handleEyeClick} style={{
+            <h3>
-              cursor: 'pointer', color: 'gray'
+              使用明细（总消耗额度：
-            }}>{showStat ? renderQuota(stat.quota) : '点击查看'}</span>
+              <span
-            ）
+                onClick={handleEyeClick}
-          </h3>
+                style={{
-        </Spin>
+                  cursor: 'pointer',
-      </Header>
+                  color: 'gray',
-      <Form layout="horizontal" style={{ marginTop: 10 }}>
+                }}
-        <>
+              >
-          <Form.Input field="token_name" label="令牌名称" style={{ width: 176 }} value={token_name}
+                {showStat ? renderQuota(stat.quota) : '点击查看'}
-                      placeholder={'可选值'} name="token_name"
+              </span>
-                      onChange={value => handleInputChange(value, 'token_name')} />
+              ）
-          <Form.Input field="model_name" label="模型名称" style={{ width: 176 }} value={model_name}
+            </h3>
-                      placeholder="可选值"
+          </Spin>
-                      name="model_name"
+        </Header>
-                      onChange={value => handleInputChange(value, 'model_name')} />
+        <Form layout='horizontal' style={{ marginTop: 10 }}>
-          <Form.DatePicker field="start_timestamp" label="起始时间" style={{ width: 272 }}
+          <>
-                           initValue={start_timestamp}
+            <Form.Input
-                           value={start_timestamp} type="dateTime"
+              field='token_name'
-                           name="start_timestamp"
+              label='令牌名称'
-                           onChange={value => handleInputChange(value, 'start_timestamp')} />
+              style={{ width: 176 }}
-          <Form.DatePicker field="end_timestamp" fluid label="结束时间" style={{ width: 272 }}
+              value={token_name}
-                           initValue={end_timestamp}
+              placeholder={'可选值'}
-                           value={end_timestamp} type="dateTime"
+              name='token_name'
-                           name="end_timestamp"
+              onChange={(value) => handleInputChange(value, 'token_name')}
-                           onChange={value => handleInputChange(value, 'end_timestamp')} />
+            />
-          {isAdminUser && <>
+            <Form.Input
-            <Form.Input field="channel" label="渠道 ID" style={{ width: 176 }} value={channel}
+              field='model_name'
-                        placeholder="可选值" name="channel"
+              label='模型名称'
-                        onChange={value => handleInputChange(value, 'channel')} />
+              style={{ width: 176 }}
-            <Form.Input field="username" label="用户名称" style={{ width: 176 }} value={username}
+              value={model_name}
-                        placeholder={'可选值'} name="username"
+              placeholder='可选值'
-                        onChange={value => handleInputChange(value, 'username')} />
+              name='model_name'
-          </>}
+              onChange={(value) => handleInputChange(value, 'model_name')}
-          <Form.Section>
+            />
-            <Button label="查询" type="primary" htmlType="submit" className="btn-margin-right"
+            <Form.DatePicker
-                    onClick={refresh} loading={loading}>查询</Button>
+              field='start_timestamp'
-          </Form.Section>
+              label='起始时间'
-        </>
+              style={{ width: 272 }}
-      </Form>
+              initValue={start_timestamp}
-      <Table style={{ marginTop: 5 }} columns={columns} dataSource={pageData} pagination={{
+              value={start_timestamp}
-        currentPage: activePage,
+              type='dateTime'
-        pageSize: pageSize,
+              name='start_timestamp'
-        total: logCount,
+              onChange={(value) => handleInputChange(value, 'start_timestamp')}
-        pageSizeOpts: [10, 20, 50, 100],
+            />
-        showSizeChanger: true,
+            <Form.DatePicker
-        onPageSizeChange: (size) => {
+              field='end_timestamp'
-          handlePageSizeChange(size).then();
+              fluid
-        },
+              label='结束时间'
-        onPageChange: handlePageChange
+              style={{ width: 272 }}
-      }} />
+              initValue={end_timestamp}
-      <Select defaultValue="0" style={{ width: 120 }} onChange={(value) => {
+              value={end_timestamp}
-        setLogType(parseInt(value));
+              type='dateTime'
-        refresh(parseInt(value)).then();
+              name='end_timestamp'
-      }}>
+              onChange={(value) => handleInputChange(value, 'end_timestamp')}
-        <Select.Option value="0">全部</Select.Option>
+            />
-        <Select.Option value="1">充值</Select.Option>
+            {isAdminUser && (
-        <Select.Option value="2">消费</Select.Option>
+              <>
-        <Select.Option value="3">管理</Select.Option>
+                <Form.Input
-        <Select.Option value="4">系统</Select.Option>
+                  field='channel'
-      </Select>
+                  label='渠道 ID'
-    </Layout>
+                  style={{ width: 176 }}
-  </>);
+                  value={channel}
+                  placeholder='可选值'
+                  name='channel'
+                  onChange={(value) => handleInputChange(value, 'channel')}
+                />
+                <Form.Input
+                  field='username'
+                  label='用户名称'
+                  style={{ width: 176 }}
+                  value={username}
+                  placeholder={'可选值'}
+                  name='username'
+                  onChange={(value) => handleInputChange(value, 'username')}
+                />
+              </>
+            )}
+            <Form.Section>
+              <Button
+                label='查询'
+                type='primary'
+                htmlType='submit'
+                className='btn-margin-right'
+                onClick={refresh}
+                loading={loading}
+              >
+                查询
+              </Button>
+            </Form.Section>
+          </>
+        </Form>
+        <Table
+          style={{ marginTop: 5 }}
+          columns={columns}
+          dataSource={pageData}
+          pagination={{
+            currentPage: activePage,
+            pageSize: pageSize,
+            total: logCount,
+            pageSizeOpts: [10, 20, 50, 100],
+            showSizeChanger: true,
+            onPageSizeChange: (size) => {
+              handlePageSizeChange(size).then();
+            },
+            onPageChange: handlePageChange,
+          }}
+        />
+        <Select
+          defaultValue='0'
+          style={{ width: 120 }}
+          onChange={(value) => {
+            setLogType(parseInt(value));
+            loadLogs(0, pageSize, parseInt(value));
+          }}
+        >
+          <Select.Option value='0'>全部</Select.Option>
+          <Select.Option value='1'>充值</Select.Option>
+          <Select.Option value='2'>消费</Select.Option>
+          <Select.Option value='3'>管理</Select.Option>
+          <Select.Option value='4'>系统</Select.Option>
+        </Select>
+      </Layout>
+    </>
+  );
 };
 
 export default LogsTable;

web/src/components/MjLogsTable.js

@@ -1,86 +1,226 @@
 import React, { useEffect, useState } from 'react';
-import { API, copy, isAdmin, showError, showSuccess, timestamp2string } from '../helpers';
+import {
+  API,
+  copy,
+  isAdmin,
+  showError,
+  showSuccess,
+  timestamp2string,
+} from '../helpers';
 
-import { Banner, Button, Form, ImagePreview, Layout, Modal, Progress, Table, Tag, Typography } from '@douyinfe/semi-ui';
+import {
+  Banner,
+  Button,
+  Form,
+  ImagePreview,
+  Layout,
+  Modal,
+  Progress,
+  Table,
+  Tag,
+  Typography,
+} from '@douyinfe/semi-ui';
 import { ITEMS_PER_PAGE } from '../constants';
 
-
+const colors = [
-const colors = ['amber', 'blue', 'cyan', 'green', 'grey', 'indigo',
+  'amber',
-  'light-blue', 'lime', 'orange', 'pink',
+  'blue',
-  'purple', 'red', 'teal', 'violet', 'yellow'
+  'cyan',
+  'green',
+  'grey',
+  'indigo',
+  'light-blue',
+  'lime',
+  'orange',
+  'pink',
+  'purple',
+  'red',
+  'teal',
+  'violet',
+  'yellow',
 ];
 
 function renderType(type) {
   switch (type) {
     case 'IMAGINE':
-      return <Tag color="blue" size="large">绘图</Tag>;
+      return (
+        <Tag color='blue' size='large'>
+          绘图
+        </Tag>
+      );
     case 'UPSCALE':
-      return <Tag color="orange" size="large">放大</Tag>;
+      return (
+        <Tag color='orange' size='large'>
+          放大
+        </Tag>
+      );
     case 'VARIATION':
-      return <Tag color="purple" size="large">变换</Tag>;
+      return (
+        <Tag color='purple' size='large'>
+          变换
+        </Tag>
+      );
     case 'HIGH_VARIATION':
-      return <Tag color="purple" size="large">强变换</Tag>;
+      return (
+        <Tag color='purple' size='large'>
+          强变换
+        </Tag>
+      );
     case 'LOW_VARIATION':
-      return <Tag color="purple" size="large">弱变换</Tag>;
+      return (
+        <Tag color='purple' size='large'>
+          弱变换
+        </Tag>
+      );
     case 'PAN':
-      return <Tag color="cyan" size="large">平移</Tag>;
+      return (
+        <Tag color='cyan' size='large'>
+          平移
+        </Tag>
+      );
     case 'DESCRIBE':
-      return <Tag color="yellow" size="large">图生文</Tag>;
+      return (
+        <Tag color='yellow' size='large'>
+          图生文
+        </Tag>
+      );
     case 'BLEND':
-      return <Tag color="lime" size="large">图混合</Tag>;
+      return (
+        <Tag color='lime' size='large'>
+          图混合
+        </Tag>
+      );
     case 'SHORTEN':
-      return <Tag color="pink" size="large">缩词</Tag>;
+      return (
+        <Tag color='pink' size='large'>
+          缩词
+        </Tag>
+      );
     case 'REROLL':
-      return <Tag color="indigo" size="large">重绘</Tag>;
+      return (
+        <Tag color='indigo' size='large'>
+          重绘
+        </Tag>
+      );
     case 'INPAINT':
-      return <Tag color="violet" size="large">局部重绘-提交</Tag>;
+      return (
+        <Tag color='violet' size='large'>
+          局部重绘-提交
+        </Tag>
+      );
     case 'ZOOM':
-      return <Tag color="teal" size="large">变焦</Tag>;
+      return (
+        <Tag color='teal' size='large'>
+          变焦
+        </Tag>
+      );
     case 'CUSTOM_ZOOM':
-      return <Tag color="teal" size="large">自定义变焦-提交</Tag>;
+      return (
+        <Tag color='teal' size='large'>
+          自定义变焦-提交
+        </Tag>
+      );
     case 'MODAL':
-      return <Tag color="green" size="large">窗口处理</Tag>;
+      return (
+        <Tag color='green' size='large'>
+          窗口处理
+        </Tag>
+      );
     case 'SWAP_FACE':
-      return <Tag color="light-green" size="large">换脸</Tag>;
+      return (
+        <Tag color='light-green' size='large'>
+          换脸
+        </Tag>
+      );
     default:
-      return <Tag color="white" size="large">未知</Tag>;
+      return (
+        <Tag color='white' size='large'>
+          未知
+        </Tag>
+      );
   }
 }
 
-
 function renderCode(code) {
   switch (code) {
     case 1:
-      return <Tag color="green" size="large">已提交</Tag>;
+      return (
+        <Tag color='green' size='large'>
+          已提交
+        </Tag>
+      );
     case 21:
-      return <Tag color="lime" size="large">等待中</Tag>;
+      return (
+        <Tag color='lime' size='large'>
+          等待中
+        </Tag>
+      );
     case 22:
-      return <Tag color="orange" size="large">重复提交</Tag>;
+      return (
+        <Tag color='orange' size='large'>
+          重复提交
+        </Tag>
+      );
     case 0:
-      return <Tag color="yellow" size="large">未提交</Tag>;
+      return (
+        <Tag color='yellow' size='large'>
+          未提交
+        </Tag>
+      );
     default:
-      return <Tag color="white" size="large">未知</Tag>;
+      return (
+        <Tag color='white' size='large'>
+          未知
+        </Tag>
+      );
   }
 }
 
-
 function renderStatus(type) {
   // Ensure all cases are string literals by adding quotes.
   switch (type) {
     case 'SUCCESS':
-      return <Tag color="green" size="large">成功</Tag>;
+      return (
+        <Tag color='green' size='large'>
+          成功
+        </Tag>
+      );
     case 'NOT_START':
-      return <Tag color="grey" size="large">未启动</Tag>;
+      return (
+        <Tag color='grey' size='large'>
+          未启动
+        </Tag>
+      );
     case 'SUBMITTED':
-      return <Tag color="yellow" size="large">队列中</Tag>;
+      return (
+        <Tag color='yellow' size='large'>
+          队列中
+        </Tag>
+      );
     case 'IN_PROGRESS':
-      return <Tag color="blue" size="large">执行中</Tag>;
+      return (
+        <Tag color='blue' size='large'>
+          执行中
+        </Tag>
+      );
     case 'FAILURE':
-      return <Tag color="red" size="large">失败</Tag>;
+      return (
+        <Tag color='red' size='large'>
+          失败
+        </Tag>
+      );
     case 'MODAL':
-      return <Tag color="yellow" size="large">窗口等待</Tag>;
+      return (
+        <Tag color='yellow' size='large'>
+          窗口等待
+        </Tag>
+      );
     default:
-      return <Tag color="white" size="large">未知</Tag>;
+      return (
+        <Tag color='white' size='large'>
+          未知
+        </Tag>
+      );
   }
 }
 
@@ -97,7 +237,6 @@ const renderTimestamp = (timestampInSeconds) => {
   return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`; // 格式化输出
 };
 
-
 const LogsTable = () => {
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [modalContent, setModalContent] = useState('');
@@ -106,12 +245,8 @@ const LogsTable = () => {
       title: '提交时间',
       dataIndex: 'submit_time',
       render: (text, record, index) => {
-        return (
+        return <div>{renderTimestamp(text / 1000)}</div>;
-          <div>
+      },
-            {renderTimestamp(text / 1000)}
-          </div>
-        );
-      }
     },
     {
       title: '渠道',
@@ -119,61 +254,50 @@ const LogsTable = () => {
       className: isAdmin() ? 'tableShow' : 'tableHiddle',
       render: (text, record, index) => {
         return (
-
           <div>
-            <Tag color={colors[parseInt(text) % colors.length]} size="large" onClick={() => {
+            <Tag
-              copyText(text); // 假设copyText是用于文本复制的函数
+              color={colors[parseInt(text) % colors.length]}
-            }}> {text} </Tag>
+              size='large'
+              onClick={() => {
+                copyText(text); // 假设copyText是用于文本复制的函数
+              }}
+            >
+              {' '}
+              {text}{' '}
+            </Tag>
           </div>
-
         );
-      }
+      },
     },
     {
       title: '类型',
       dataIndex: 'action',
       render: (text, record, index) => {
-        return (
+        return <div>{renderType(text)}</div>;
-          <div>
+      },
-            {renderType(text)}
-          </div>
-        );
-      }
     },
     {
       title: '任务ID',
       dataIndex: 'mj_id',
       render: (text, record, index) => {
-        return (
+        return <div>{text}</div>;
-          <div>
+      },
-            {text}
-          </div>
-        );
-      }
     },
     {
       title: '提交结果',
       dataIndex: 'code',
       className: isAdmin() ? 'tableShow' : 'tableHiddle',
       render: (text, record, index) => {
-        return (
+        return <div>{renderCode(text)}</div>;
-          <div>
+      },
-            {renderCode(text)}
-          </div>
-        );
-      }
     },
     {
       title: '任务状态',
       dataIndex: 'status',
       className: isAdmin() ? 'tableShow' : 'tableHiddle',
       render: (text, record, index) => {
-        return (
+        return <div>{renderStatus(text)}</div>;
-          <div>
+      },
-            {renderStatus(text)}
-          </div>
-        );
-      }
     },
     {
       title: '进度',
@@ -183,13 +307,20 @@ const LogsTable = () => {
           <div>
             {
               // 转换例如100%为数字100，如果text未定义，返回0
-              <Progress stroke={record.status === 'FAILURE' ? 'var(--semi-color-warning)' : null}
+              <Progress
-                        percent={text ? parseInt(text.replace('%', '')) : 0} showInfo={true}
+                stroke={
-                        aria-label="drawing progress" />
+                  record.status === 'FAILURE'
+                    ? 'var(--semi-color-warning)'
+                    : null
+                }
+                percent={text ? parseInt(text.replace('%', '')) : 0}
+                showInfo={true}
+                aria-label='drawing progress'
+              />
             }
           </div>
         );
-      }
+      },
     },
     {
       title: '结果图片',
@@ -201,14 +332,14 @@ const LogsTable = () => {
         return (
           <Button
             onClick={() => {
-              setModalImageUrl(text);  // 更新图片URL状态
+              setModalImageUrl(text); // 更新图片URL状态
-              setIsModalOpenurl(true);    // 打开模态框
+              setIsModalOpenurl(true); // 打开模态框
             }}
           >
             查看图片
           </Button>
         );
-      }
+      },
     },
     {
       title: 'Prompt',
@@ -231,7 +362,7 @@ const LogsTable = () => {
             {text}
           </Typography.Text>
         );
-      }
+      },
     },
     {
       title: 'PromptEn',
@@ -254,7 +385,7 @@ const LogsTable = () => {
             {text}
           </Typography.Text>
         );
-      }
+      },
     },
     {
       title: '失败原因',
@@ -277,9 +408,8 @@ const LogsTable = () => {
             {text}
           </Typography.Text>
         );
-      }
+      },
-    }
+    },
-
   ];
 
   const [logs, setLogs] = useState([]);
@@ -299,20 +429,19 @@ const LogsTable = () => {
     channel_id: '',
     mj_id: '',
     start_timestamp: timestamp2string(now.getTime() / 1000 - 2592000),
-    end_timestamp: timestamp2string(now.getTime() / 1000 + 3600)
+    end_timestamp: timestamp2string(now.getTime() / 1000 + 3600),
   });
   const { channel_id, mj_id, start_timestamp, end_timestamp } = inputs;
 
   const [stat, setStat] = useState({
     quota: 0,
-    token: 0
+    token: 0,
   });
 
   const handleInputChange = (value, name) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
 
-
   const setLogsFormat = (logs) => {
     for (let i = 0; i < logs.length; i++) {
       logs[i].timestamp2string = timestamp2string(logs[i].created_at);
@@ -351,14 +480,16 @@ const LogsTable = () => {
     setLoading(false);
   };
 
-  const pageData = logs.slice((activePage - 1) * ITEMS_PER_PAGE, activePage * ITEMS_PER_PAGE);
+  const pageData = logs.slice(
+    (activePage - 1) * ITEMS_PER_PAGE,
+    activePage * ITEMS_PER_PAGE,
+  );
 
-  const handlePageChange = page => {
+  const handlePageChange = (page) => {
     setActivePage(page);
     if (page === Math.ceil(logs.length / ITEMS_PER_PAGE) + 1) {
       // In this case we have to load more data and then append them.
-      loadLogs(page - 1).then(r => {
+      loadLogs(page - 1).then((r) => {});
-      });
     }
   };
 
@@ -390,46 +521,83 @@ const LogsTable = () => {
 
   return (
     <>
-
       <Layout>
-        {isAdminUser && showBanner ? <Banner
+        {isAdminUser && showBanner ? (
-          type="info"
+          <Banner
-          description="当前未开启Midjourney回调，部分项目可能无法获得绘图结果，可在运营设置中开启。"
+            type='info'
-        /> : <></>
+            description='当前未开启Midjourney回调，部分项目可能无法获得绘图结果，可在运营设置中开启。'
-        }
+          />
-        <Form layout="horizontal" style={{ marginTop: 10 }}>
+        ) : (
+          <></>
+        )}
+        <Form layout='horizontal' style={{ marginTop: 10 }}>
           <>
-            <Form.Input field="channel_id" label="渠道 ID" style={{ width: 176 }} value={channel_id}
+            <Form.Input
-                        placeholder={'可选值'} name="channel_id"
+              field='channel_id'
-                        onChange={value => handleInputChange(value, 'channel_id')} />
+              label='渠道 ID'
-            <Form.Input field="mj_id" label="任务 ID" style={{ width: 176 }} value={mj_id}
+              style={{ width: 176 }}
-                        placeholder="可选值"
+              value={channel_id}
-                        name="mj_id"
+              placeholder={'可选值'}
-                        onChange={value => handleInputChange(value, 'mj_id')} />
+              name='channel_id'
-            <Form.DatePicker field="start_timestamp" label="起始时间" style={{ width: 272 }}
+              onChange={(value) => handleInputChange(value, 'channel_id')}
-                             initValue={start_timestamp}
+            />
-                             value={start_timestamp} type="dateTime"
+            <Form.Input
-                             name="start_timestamp"
+              field='mj_id'
-                             onChange={value => handleInputChange(value, 'start_timestamp')} />
+              label='任务 ID'
-            <Form.DatePicker field="end_timestamp" fluid label="结束时间" style={{ width: 272 }}
+              style={{ width: 176 }}
-                             initValue={end_timestamp}
+              value={mj_id}
-                             value={end_timestamp} type="dateTime"
+              placeholder='可选值'
-                             name="end_timestamp"
+              name='mj_id'
-                             onChange={value => handleInputChange(value, 'end_timestamp')} />
+              onChange={(value) => handleInputChange(value, 'mj_id')}
+            />
+            <Form.DatePicker
+              field='start_timestamp'
+              label='起始时间'
+              style={{ width: 272 }}
+              initValue={start_timestamp}
+              value={start_timestamp}
+              type='dateTime'
+              name='start_timestamp'
+              onChange={(value) => handleInputChange(value, 'start_timestamp')}
+            />
+            <Form.DatePicker
+              field='end_timestamp'
+              fluid
+              label='结束时间'
+              style={{ width: 272 }}
+              initValue={end_timestamp}
+              value={end_timestamp}
+              type='dateTime'
+              name='end_timestamp'
+              onChange={(value) => handleInputChange(value, 'end_timestamp')}
+            />
 
             <Form.Section>
-              <Button label="查询" type="primary" htmlType="submit" className="btn-margin-right"
+              <Button
-                      onClick={refresh}>查询</Button>
+                label='查询'
+                type='primary'
+                htmlType='submit'
+                className='btn-margin-right'
+                onClick={refresh}
+              >
+                查询
+              </Button>
             </Form.Section>
           </>
         </Form>
-        <Table style={{ marginTop: 5 }} columns={columns} dataSource={pageData} pagination={{
+        <Table
-          currentPage: activePage,
+          style={{ marginTop: 5 }}
-          pageSize: ITEMS_PER_PAGE,
+          columns={columns}
-          total: logCount,
+          dataSource={pageData}
-          pageSizeOpts: [10, 20, 50, 100],
+          pagination={{
-          onPageChange: handlePageChange
+            currentPage: activePage,
-        }} loading={loading} />
+            pageSize: ITEMS_PER_PAGE,
+            total: logCount,
+            pageSizeOpts: [10, 20, 50, 100],
+            onPageChange: handlePageChange,
+          }}
+          loading={loading}
+        />
         <Modal
           visible={isModalOpen}
           onOk={() => setIsModalOpen(false)}
@@ -445,7 +613,6 @@ const LogsTable = () => {
           visible={isModalOpenurl}
           onVisibleChange={(visible) => setIsModalOpenurl(visible)}
         />
-
       </Layout>
     </>
   );

web/src/components/OperationSetting.js

@@ -1,6 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import { Divider, Form, Grid, Header } from 'semantic-ui-react';
-import { API, showError, showSuccess, timestamp2string, verifyJSON } from '../helpers';
+import {
+  API,
+  showError,
+  showSuccess,
+  timestamp2string,
+  verifyJSON,
+} from '../helpers';
 
 const OperationSetting = () => {
   let now = new Date();
@@ -35,16 +41,18 @@ const OperationSetting = () => {
     DataExportDefaultTime: 'hour',
     DataExportInterval: 5,
     DefaultCollapseSidebar: '', // 默认折叠侧边栏
-    RetryTimes: 0
+    RetryTimes: 0,
   });
   const [originInputs, setOriginInputs] = useState({});
   let [loading, setLoading] = useState(false);
-  let [historyTimestamp, setHistoryTimestamp] = useState(timestamp2string(now.getTime() / 1000 - 30 * 24 * 3600)); // a month ago
+  let [historyTimestamp, setHistoryTimestamp] = useState(
+    timestamp2string(now.getTime() / 1000 - 30 * 24 * 3600),
+  ); // a month ago
   // 精确时间选项（小时，天，周）
   const timeOptions = [
     { key: 'hour', text: '小时', value: 'hour' },
     { key: 'day', text: '天', value: 'day' },
-    { key: 'week', text: '周', value: 'week' }
+    { key: 'week', text: '周', value: 'week' },
   ];
   const getOptions = async () => {
     const res = await API.get('/api/option/');
@@ -52,7 +60,11 @@ const OperationSetting = () => {
     if (success) {
       let newInputs = {};
       data.forEach((item) => {
-        if (item.key === 'ModelRatio' || item.key === 'GroupRatio' || item.key === 'ModelPrice') {
+        if (
+          item.key === 'ModelRatio' ||
+          item.key === 'GroupRatio' ||
+          item.key === 'ModelPrice'
+        ) {
           item.value = JSON.stringify(JSON.parse(item.value), null, 2);
         }
         newInputs[item.key] = item.value;
@@ -79,7 +91,7 @@ const OperationSetting = () => {
     console.log(key, value);
     const res = await API.put('/api/option/', {
       key,
-      value
+      value,
     });
     const { success, message } = res.data;
     if (success) {
@@ -91,7 +103,12 @@ const OperationSetting = () => {
   };
 
   const handleInputChange = async (e, { name, value }) => {
-    if (name.endsWith('Enabled') || name === 'DataExportInterval' || name === 'DataExportDefaultTime' || name === 'DefaultCollapseSidebar') {
+    if (
+      name.endsWith('Enabled') ||
+      name === 'DataExportInterval' ||
+      name === 'DataExportDefaultTime' ||
+      name === 'DefaultCollapseSidebar'
+    ) {
       if (name === 'DataExportDefaultTime') {
         localStorage.setItem('data_export_default_time', value);
       } else if (name === 'MjNotifyEnabled') {
@@ -106,11 +123,22 @@ const OperationSetting = () => {
   const submitConfig = async (group) => {
     switch (group) {
       case 'monitor':
-        if (originInputs['ChannelDisableThreshold'] !== inputs.ChannelDisableThreshold) {
+        if (
-          await updateOption('ChannelDisableThreshold', inputs.ChannelDisableThreshold);
+          originInputs['ChannelDisableThreshold'] !==
+          inputs.ChannelDisableThreshold
+        ) {
+          await updateOption(
+            'ChannelDisableThreshold',
+            inputs.ChannelDisableThreshold,
+          );
         }
-        if (originInputs['QuotaRemindThreshold'] !== inputs.QuotaRemindThreshold) {
+        if (
-          await updateOption('QuotaRemindThreshold', inputs.QuotaRemindThreshold);
+          originInputs['QuotaRemindThreshold'] !== inputs.QuotaRemindThreshold
+        ) {
+          await updateOption(
+            'QuotaRemindThreshold',
+            inputs.QuotaRemindThreshold,
+          );
         }
         break;
       case 'ratio':
@@ -177,7 +205,9 @@ const OperationSetting = () => {
 
   const deleteHistoryLogs = async () => {
     console.log(inputs);
-    const res = await API.delete(`/api/log/?target_timestamp=${Date.parse(historyTimestamp) / 1000}`);
+    const res = await API.delete(
+      `/api/log/?target_timestamp=${Date.parse(historyTimestamp) / 1000}`,
+    );
     const { success, message, data } = res.data;
     if (success) {
       showSuccess(`${data} 条日志已清理！`);
@@ -189,134 +219,132 @@ const OperationSetting = () => {
     <Grid columns={1}>
       <Grid.Column>
         <Form loading={loading}>
-          <Header as="h3">
+          <Header as='h3'>通用设置</Header>
-            通用设置
-          </Header>
           <Form.Group widths={4}>
             <Form.Input
-              label="充值链接"
+              label='充值链接'
-              name="TopUpLink"
+              name='TopUpLink'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.TopUpLink}
-              type="link"
+              type='link'
-              placeholder="例如发卡网站的购买链接"
+              placeholder='例如发卡网站的购买链接'
             />
             <Form.Input
-              label="默认聊天页面链接"
+              label='默认聊天页面链接'
-              name="ChatLink"
+              name='ChatLink'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.ChatLink}
-              type="link"
+              type='link'
-              placeholder="例如 ChatGPT Next Web 的部署地址"
+              placeholder='例如 ChatGPT Next Web 的部署地址'
             />
             <Form.Input
-              label="聊天页面2链接"
+              label='聊天页面2链接'
-              name="ChatLink2"
+              name='ChatLink2'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.ChatLink2}
-              type="link"
+              type='link'
-              placeholder="例如 ChatGPT Web & Midjourney 的部署地址"
+              placeholder='例如 ChatGPT Web & Midjourney 的部署地址'
             />
             <Form.Input
-              label="单位美元额度"
+              label='单位美元额度'
-              name="QuotaPerUnit"
+              name='QuotaPerUnit'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.QuotaPerUnit}
-              type="number"
+              type='number'
-              step="0.01"
+              step='0.01'
-              placeholder="一单位货币能兑换的额度"
+              placeholder='一单位货币能兑换的额度'
             />
             <Form.Input
-              label="失败重试次数"
+              label='失败重试次数'
-              name="RetryTimes"
+              name='RetryTimes'
               type={'number'}
-              step="1"
+              step='1'
-              min="0"
+              min='0'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.RetryTimes}
-              placeholder="失败重试次数"
+              placeholder='失败重试次数'
             />
           </Form.Group>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.DisplayInCurrencyEnabled === 'true'}
-              label="以货币形式显示额度"
+              label='以货币形式显示额度'
-              name="DisplayInCurrencyEnabled"
+              name='DisplayInCurrencyEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.DisplayTokenStatEnabled === 'true'}
-              label="Billing 相关 API 显示令牌额度而非用户额度"
+              label='Billing 相关 API 显示令牌额度而非用户额度'
-              name="DisplayTokenStatEnabled"
+              name='DisplayTokenStatEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.DefaultCollapseSidebar === 'true'}
-              label="默认折叠侧边栏"
+              label='默认折叠侧边栏'
-              name="DefaultCollapseSidebar"
+              name='DefaultCollapseSidebar'
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button onClick={() => {
+          <Form.Button
-            submitConfig('general').then();
+            onClick={() => {
-          }}>保存通用设置</Form.Button>
+              submitConfig('general').then();
+            }}
+          >
+            保存通用设置
+          </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>绘图设置</Header>
-            绘图设置
-          </Header>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.DrawingEnabled === 'true'}
-              label="启用绘图功能"
+              label='启用绘图功能'
-              name="DrawingEnabled"
+              name='DrawingEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.MjNotifyEnabled === 'true'}
-              label="允许回调（会泄露服务器ip地址）"
+              label='允许回调（会泄露服务器ip地址）'
-              name="MjNotifyEnabled"
+              name='MjNotifyEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>屏蔽词过滤设置</Header>
-            屏蔽词过滤设置
-          </Header>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.CheckSensitiveEnabled === 'true'}
-              label="启用屏蔽词过滤功能"
+              label='启用屏蔽词过滤功能'
-              name="CheckSensitiveEnabled"
+              name='CheckSensitiveEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.CheckSensitiveOnPromptEnabled === 'true'}
-              label="启用prompt检查"
+              label='启用prompt检查'
-              name="CheckSensitiveOnPromptEnabled"
+              name='CheckSensitiveOnPromptEnabled'
-              onChange={handleInputChange}
-            />
-            <Form.Checkbox
-              checked={inputs.CheckSensitiveOnCompletionEnabled === 'true'}
-              label="启用生成内容检查"
-              name="CheckSensitiveOnCompletionEnabled"
-              onChange={handleInputChange}
-            />
-          </Form.Group>
-          <Form.Group inline>
-            <Form.Checkbox
-              checked={inputs.StopOnSensitiveEnabled === 'true'}
-              label="在检测到屏蔽词时，立刻停止生成，否则替换屏蔽词"
-              name="StopOnSensitiveEnabled"
               onChange={handleInputChange}
             />
+            {/*<Form.Checkbox*/}
+            {/*  checked={inputs.CheckSensitiveOnCompletionEnabled === 'true'}*/}
+            {/*  label='启用生成内容检查'*/}
+            {/*  name='CheckSensitiveOnCompletionEnabled'*/}
+            {/*  onChange={handleInputChange}*/}
+            {/*/>*/}
           </Form.Group>
+          {/*<Form.Group inline>*/}
+          {/*  <Form.Checkbox*/}
+          {/*    checked={inputs.StopOnSensitiveEnabled === 'true'}*/}
+          {/*    label='在检测到屏蔽词时，立刻停止生成，否则替换屏蔽词'*/}
+          {/*    name='StopOnSensitiveEnabled'*/}
+          {/*    onChange={handleInputChange}*/}
+          {/*  />*/}
+          {/*</Form.Group>*/}
           {/*<Form.Group>*/}
           {/*  <Form.Input*/}
           {/*    label="流模式下缓存队列，默认不缓存，设置越大检测越准确，但是回复会有卡顿感"*/}
@@ -328,210 +356,223 @@ const OperationSetting = () => {
           {/*    placeholder="例如：10"*/}
           {/*  />*/}
           {/*</Form.Group>*/}
-          <Form.Group widths="equal">
+          <Form.Group widths='equal'>
             <Form.TextArea
-              label="屏蔽词列表，一行一个屏蔽词，不需要符号分割"
+              label='屏蔽词列表，一行一个屏蔽词，不需要符号分割'
-              name="SensitiveWords"
+              name='SensitiveWords'
               onChange={handleInputChange}
               style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
               value={inputs.SensitiveWords}
-              placeholder="一行一个屏蔽词"
+              placeholder='一行一个屏蔽词'
             />
           </Form.Group>
-          <Form.Button onClick={() => {
+          <Form.Button
-            submitConfig('words').then();
+            onClick={() => {
-          }}>保存屏蔽词设置</Form.Button>
+              submitConfig('words').then();
+            }}
+          >
+            保存屏蔽词设置
+          </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>日志设置</Header>
-            日志设置
-          </Header>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.LogConsumeEnabled === 'true'}
-              label="启用额度消费日志记录"
+              label='启用额度消费日志记录'
-              name="LogConsumeEnabled"
+              name='LogConsumeEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Form.Group widths={4}>
-            <Form.Input label="目标时间" value={historyTimestamp} type="datetime-local"
+            <Form.Input
-                        name="history_timestamp"
+              label='目标时间'
-                        onChange={(e, { name, value }) => {
+              value={historyTimestamp}
-                          setHistoryTimestamp(value);
+              type='datetime-local'
-                        }} />
+              name='history_timestamp'
+              onChange={(e, { name, value }) => {
+                setHistoryTimestamp(value);
+              }}
+            />
           </Form.Group>
-          <Form.Button onClick={() => {
+          <Form.Button
-            deleteHistoryLogs().then();
+            onClick={() => {
-          }}>清理历史日志</Form.Button>
+              deleteHistoryLogs().then();
+            }}
+          >
+            清理历史日志
+          </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>数据看板</Header>
-            数据看板
-          </Header>
           <Form.Checkbox
             checked={inputs.DataExportEnabled === 'true'}
-            label="启用数据看板（实验性）"
+            label='启用数据看板（实验性）'
-            name="DataExportEnabled"
+            name='DataExportEnabled'
             onChange={handleInputChange}
           />
           <Form.Group>
             <Form.Input
-              label="数据看板更新间隔（分钟，设置过短会影响数据库性能）"
+              label='数据看板更新间隔（分钟，设置过短会影响数据库性能）'
-              name="DataExportInterval"
+              name='DataExportInterval'
               type={'number'}
-              step="1"
+              step='1'
-              min="1"
+              min='1'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.DataExportInterval}
-              placeholder="数据看板更新间隔（分钟，设置过短会影响数据库性能）"
+              placeholder='数据看板更新间隔（分钟，设置过短会影响数据库性能）'
             />
             <Form.Select
-              label="数据看板默认时间粒度（仅修改展示粒度，统计精确到小时）"
+              label='数据看板默认时间粒度（仅修改展示粒度，统计精确到小时）'
               options={timeOptions}
-              name="DataExportDefaultTime"
+              name='DataExportDefaultTime'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.DataExportDefaultTime}
-              placeholder="数据看板默认时间粒度"
+              placeholder='数据看板默认时间粒度'
             />
           </Form.Group>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>监控设置</Header>
-            监控设置
-          </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label="最长响应时间"
+              label='最长响应时间'
-              name="ChannelDisableThreshold"
+              name='ChannelDisableThreshold'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.ChannelDisableThreshold}
-              type="number"
+              type='number'
-              min="0"
+              min='0'
-              placeholder="单位秒，当运行通道全部测试时，超过此时间将自动禁用通道"
+              placeholder='单位秒，当运行通道全部测试时，超过此时间将自动禁用通道'
             />
             <Form.Input
-              label="额度提醒阈值"
+              label='额度提醒阈值'
-              name="QuotaRemindThreshold"
+              name='QuotaRemindThreshold'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.QuotaRemindThreshold}
-              type="number"
+              type='number'
-              min="0"
+              min='0'
-              placeholder="低于此额度时将发送邮件提醒用户"
+              placeholder='低于此额度时将发送邮件提醒用户'
             />
           </Form.Group>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.AutomaticDisableChannelEnabled === 'true'}
-              label="失败时自动禁用通道"
+              label='失败时自动禁用通道'
-              name="AutomaticDisableChannelEnabled"
+              name='AutomaticDisableChannelEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.AutomaticEnableChannelEnabled === 'true'}
-              label="成功时自动启用通道"
+              label='成功时自动启用通道'
-              name="AutomaticEnableChannelEnabled"
+              name='AutomaticEnableChannelEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button onClick={() => {
+          <Form.Button
-            submitConfig('monitor').then();
+            onClick={() => {
-          }}>保存监控设置</Form.Button>
+              submitConfig('monitor').then();
+            }}
+          >
+            保存监控设置
+          </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>额度设置</Header>
-            额度设置
-          </Header>
           <Form.Group widths={4}>
             <Form.Input
-              label="新用户初始额度"
+              label='新用户初始额度'
-              name="QuotaForNewUser"
+              name='QuotaForNewUser'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.QuotaForNewUser}
-              type="number"
+              type='number'
-              min="0"
+              min='0'
-              placeholder="例如：100"
+              placeholder='例如：100'
             />
             <Form.Input
-              label="请求预扣费额度"
+              label='请求预扣费额度'
-              name="PreConsumedQuota"
+              name='PreConsumedQuota'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.PreConsumedQuota}
-              type="number"
+              type='number'
-              min="0"
+              min='0'
-              placeholder="请求结束后多退少补"
+              placeholder='请求结束后多退少补'
             />
             <Form.Input
-              label="邀请新用户奖励额度"
+              label='邀请新用户奖励额度'
-              name="QuotaForInviter"
+              name='QuotaForInviter'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.QuotaForInviter}
-              type="number"
+              type='number'
-              min="0"
+              min='0'
-              placeholder="例如：2000"
+              placeholder='例如：2000'
             />
             <Form.Input
-              label="新用户使用邀请码奖励额度"
+              label='新用户使用邀请码奖励额度'
-              name="QuotaForInvitee"
+              name='QuotaForInvitee'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.QuotaForInvitee}
-              type="number"
+              type='number'
-              min="0"
+              min='0'
-              placeholder="例如：1000"
+              placeholder='例如：1000'
             />
           </Form.Group>
-          <Form.Button onClick={() => {
+          <Form.Button
-            submitConfig('quota').then();
+            onClick={() => {
-          }}>保存额度设置</Form.Button>
+              submitConfig('quota').then();
+            }}
+          >
+            保存额度设置
+          </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>倍率设置</Header>
-            倍率设置
+          <Form.Group widths='equal'>
-          </Header>
-          <Form.Group widths="equal">
             <Form.TextArea
-              label="模型固定价格（一次调用消耗多少刀，优先级大于模型倍率）"
+              label='模型固定价格（一次调用消耗多少刀，优先级大于模型倍率）'
-              name="ModelPrice"
+              name='ModelPrice'
               onChange={handleInputChange}
               style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.ModelPrice}
               placeholder='为一个 JSON 文本，键为模型名称，值为一次调用消耗多少刀，比如 "gpt-4-gizmo-*": 0.1，一次消耗0.1刀'
             />
           </Form.Group>
-          <Form.Group widths="equal">
+          <Form.Group widths='equal'>
             <Form.TextArea
-              label="模型倍率"
+              label='模型倍率'
-              name="ModelRatio"
+              name='ModelRatio'
               onChange={handleInputChange}
               style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.ModelRatio}
-              placeholder="为一个 JSON 文本，键为模型名称，值为倍率"
+              placeholder='为一个 JSON 文本，键为模型名称，值为倍率'
             />
           </Form.Group>
-          <Form.Group widths="equal">
+          <Form.Group widths='equal'>
             <Form.TextArea
-              label="分组倍率"
+              label='分组倍率'
-              name="GroupRatio"
+              name='GroupRatio'
               onChange={handleInputChange}
               style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.GroupRatio}
-              placeholder="为一个 JSON 文本，键为分组名称，值为倍率"
+              placeholder='为一个 JSON 文本，键为分组名称，值为倍率'
             />
           </Form.Group>
-          <Form.Button onClick={() => {
+          <Form.Button
-            submitConfig('ratio').then();
+            onClick={() => {
-          }}>保存倍率设置</Form.Button>
+              submitConfig('ratio').then();
+            }}
+          >
+            保存倍率设置
+          </Form.Button>
         </Form>
       </Grid.Column>
     </Grid>
-  )
+  );
-    ;
 };
 
 export default OperationSetting;

web/src/components/OtherSetting.js

@@ -10,21 +10,20 @@ const OtherSetting = () => {
     Logo: '',
     Footer: '',
     About: '',
-    HomePageContent: ''
+    HomePageContent: '',
   });
   let [loading, setLoading] = useState(false);
   const [showUpdateModal, setShowUpdateModal] = useState(false);
   const [updateData, setUpdateData] = useState({
     tag_name: '',
-    content: ''
+    content: '',
   });
 
-
   const updateOption = async (key, value) => {
     setLoading(true);
     const res = await API.put('/api/option/', {
       key,
-      value
+      value,
     });
     const { success, message } = res.data;
     if (success) {
@@ -41,7 +40,7 @@ const OtherSetting = () => {
     Logo: false,
     HomePageContent: false,
     About: false,
-    Footer: false
+    Footer: false,
   });
   const handleInputChange = async (value, e) => {
     const name = e.target.id;
@@ -68,14 +67,20 @@ const OtherSetting = () => {
   //  个性化设置 - SystemName
   const submitSystemName = async () => {
     try {
-      setLoadingInput((loadingInput) => ({ ...loadingInput, SystemName: true }));
+      setLoadingInput((loadingInput) => ({
+        ...loadingInput,
+        SystemName: true,
+      }));
       await updateOption('SystemName', inputs.SystemName);
       showSuccess('系统名称已更新');
     } catch (error) {
       console.error('系统名称更新失败', error);
       showError('系统名称更新失败');
     } finally {
-      setLoadingInput((loadingInput) => ({ ...loadingInput, SystemName: false }));
+      setLoadingInput((loadingInput) => ({
+        ...loadingInput,
+        SystemName: false,
+      }));
     }
   };
 
@@ -95,14 +100,20 @@ const OtherSetting = () => {
   // 个性化设置 - 首页内容
   const submitOption = async (key) => {
     try {
-      setLoadingInput((loadingInput) => ({ ...loadingInput, HomePageContent: true }));
+      setLoadingInput((loadingInput) => ({
+        ...loadingInput,
+        HomePageContent: true,
+      }));
       await updateOption(key, inputs[key]);
       showSuccess('首页内容已更新');
     } catch (error) {
       console.error('首页内容更新失败', error);
       showError('首页内容更新失败');
     } finally {
-      setLoadingInput((loadingInput) => ({ ...loadingInput, HomePageContent: false }));
+      setLoadingInput((loadingInput) => ({
+        ...loadingInput,
+        HomePageContent: false,
+      }));
     }
   };
   // 个性化设置 - 关于
@@ -132,15 +143,13 @@ const OtherSetting = () => {
     }
   };
 
-
   const openGitHubRelease = () => {
-    window.location =
+    window.location = 'https://github.com/songquanpeng/one-api/releases/latest';
-      '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) {
@@ -148,7 +157,7 @@ const OtherSetting = () => {
     } else {
       setUpdateData({
         tag_name: tag_name,
-        content: marked.parse(body)
+        content: marked.parse(body),
       });
       setShowUpdateModal(true);
     }
@@ -175,13 +184,15 @@ const OtherSetting = () => {
     getOptions();
   }, []);
 
-
   return (
     <Row>
       <Col span={24}>
         {/* 通用设置 */}
-        <Form values={inputs} getFormApi={formAPI => formAPISettingGeneral.current = formAPI}
+        <Form
-              style={{ marginBottom: 15 }}>
+          values={inputs}
+          getFormApi={(formAPI) => (formAPISettingGeneral.current = formAPI)}
+          style={{ marginBottom: 15 }}
+        >
           <Form.Section text={'通用设置'}>
             <Form.TextArea
               label={'公告'}
@@ -191,12 +202,17 @@ const OtherSetting = () => {
               style={{ fontFamily: 'JetBrains Mono, Consolas' }}
               autosize={{ minRows: 6, maxRows: 12 }}
             />
-            <Button onClick={submitNotice} loading={loadingInput['Notice']}>设置公告</Button>
+            <Button onClick={submitNotice} loading={loadingInput['Notice']}>
+              设置公告
+            </Button>
           </Form.Section>
         </Form>
         {/* 个性化设置 */}
-        <Form values={inputs} getFormApi={formAPI => formAPIPersonalization.current = formAPI}
+        <Form
-              style={{ marginBottom: 15 }}>
+          values={inputs}
+          getFormApi={(formAPI) => (formAPIPersonalization.current = formAPI)}
+          style={{ marginBottom: 15 }}
+        >
           <Form.Section text={'个性化设置'}>
             <Form.Input
               label={'系统名称'}
@@ -204,48 +220,69 @@ const OtherSetting = () => {
               field={'SystemName'}
               onChange={handleInputChange}
             />
-            <Button onClick={submitSystemName} loading={loadingInput['SystemName']}>设置系统名称</Button>
+            <Button
+              onClick={submitSystemName}
+              loading={loadingInput['SystemName']}
+            >
+              设置系统名称
+            </Button>
             <Form.Input
               label={'Logo 图片地址'}
               placeholder={'在此输入 Logo 图片地址'}
               field={'Logo'}
               onChange={handleInputChange}
             />
-            <Button onClick={submitLogo} loading={loadingInput['Logo']}>设置 Logo</Button>
+            <Button onClick={submitLogo} loading={loadingInput['Logo']}>
+              设置 Logo
+            </Button>
             <Form.TextArea
               label={'首页内容'}
-              placeholder={'在此输入首页内容，支持 Markdown & HTML 代码，设置后首页的状态信息将不再显示。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为首页。'}
+              placeholder={
+                '在此输入首页内容，支持 Markdown & HTML 代码，设置后首页的状态信息将不再显示。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为首页。'
+              }
               field={'HomePageContent'}
               onChange={handleInputChange}
               style={{ fontFamily: 'JetBrains Mono, Consolas' }}
               autosize={{ minRows: 6, maxRows: 12 }}
             />
-            <Button onClick={() => submitOption('HomePageContent')}
+            <Button
-                    loading={loadingInput['HomePageContent']}>设置首页内容</Button>
+              onClick={() => submitOption('HomePageContent')}
+              loading={loadingInput['HomePageContent']}
+            >
+              设置首页内容
+            </Button>
             <Form.TextArea
               label={'关于'}
-              placeholder={'在此输入新的关于内容，支持 Markdown & HTML 代码。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为关于页面。'}
+              placeholder={
+                '在此输入新的关于内容，支持 Markdown & HTML 代码。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为关于页面。'
+              }
               field={'About'}
               onChange={handleInputChange}
               style={{ fontFamily: 'JetBrains Mono, Consolas' }}
               autosize={{ minRows: 6, maxRows: 12 }}
             />
-            <Button onClick={submitAbout} loading={loadingInput['About']}>设置关于</Button>
+            <Button onClick={submitAbout} loading={loadingInput['About']}>
+              设置关于
+            </Button>
             {/*  */}
             <Banner
               fullMode={false}
-              type="info"
+              type='info'
-              description="移除 One API 的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目。"
+              description='移除 One API 的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目。'
               closeIcon={null}
               style={{ marginTop: 15 }}
             />
             <Form.Input
               label={'页脚'}
-              placeholder={'在此输入新的页脚，留空则使用默认页脚，支持 HTML 代码'}
+              placeholder={
+                '在此输入新的页脚，留空则使用默认页脚，支持 HTML 代码'
+              }
               field={'Footer'}
               onChange={handleInputChange}
             />
-            <Button onClick={submitFooter} loading={loadingInput['Footer']}>设置页脚</Button>
+            <Button onClick={submitFooter} loading={loadingInput['Footer']}>
+              设置页脚
+            </Button>
           </Form.Section>
         </Form>
       </Col>

web/src/components/PasswordResetConfirm.js

@@ -6,7 +6,7 @@ import { useSearchParams } from 'react-router-dom';
 const PasswordResetConfirm = () => {
   const [inputs, setInputs] = useState({
     email: '',
-    token: ''
+    token: '',
   });
   const { email, token } = inputs;
 
@@ -23,7 +23,7 @@ const PasswordResetConfirm = () => {
     let email = searchParams.get('email');
     setInputs({
       token,
-      email
+      email,
     });
   }, []);
 
@@ -46,7 +46,7 @@ const PasswordResetConfirm = () => {
     setLoading(true);
     const res = await API.post(`/api/user/reset`, {
       email,
-      token
+      token,
     });
     const { success, message } = res.data;
     if (success) {
@@ -61,29 +61,29 @@ const PasswordResetConfirm = () => {
   }
 
   return (
-    <Grid textAlign="center" style={{ marginTop: '48px' }}>
+    <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
-        <Header as="h2" color="" textAlign="center">
+        <Header as='h2' color='' textAlign='center'>
-          <Image src="/logo.png" /> 密码重置确认
+          <Image src='/logo.png' /> 密码重置确认
         </Header>
-        <Form size="large">
+        <Form size='large'>
           <Segment>
             <Form.Input
               fluid
-              icon="mail"
+              icon='mail'
-              iconPosition="left"
+              iconPosition='left'
-              placeholder="邮箱地址"
+              placeholder='邮箱地址'
-              name="email"
+              name='email'
               value={email}
               readOnly
             />
             {newPassword && (
               <Form.Input
                 fluid
-                icon="lock"
+                icon='lock'
-                iconPosition="left"
+                iconPosition='left'
-                placeholder="新密码"
+                placeholder='新密码'
-                name="newPassword"
+                name='newPassword'
                 value={newPassword}
                 readOnly
                 onClick={(e) => {
@@ -94,9 +94,9 @@ const PasswordResetConfirm = () => {
               />
             )}
             <Button
-              color="green"
+              color='green'
               fluid
-              size="large"
+              size='large'
               onClick={handleSubmit}
               loading={loading}
               disabled={disableButton}

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;
 
@@ -31,7 +31,7 @@ const PasswordResetForm = () => {
 
   function handleChange(e) {
     const { name, value } = e.target;
-    setInputs(inputs => ({ ...inputs, [name]: value }));
+    setInputs((inputs) => ({ ...inputs, [name]: value }));
   }
 
   async function handleSubmit(e) {
@@ -43,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) {
@@ -56,19 +56,19 @@ const PasswordResetForm = () => {
   }
 
   return (
-    <Grid textAlign="center" style={{ marginTop: '48px' }}>
+    <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
-        <Header as="h2" color="" textAlign="center">
+        <Header as='h2' color='' textAlign='center'>
-          <Image src="/logo.png" /> 密码重置
+          <Image src='/logo.png' /> 密码重置
         </Header>
-        <Form size="large">
+        <Form size='large'>
           <Segment>
             <Form.Input
               fluid
-              icon="mail"
+              icon='mail'
-              iconPosition="left"
+              iconPosition='left'
-              placeholder="邮箱地址"
+              placeholder='邮箱地址'
-              name="email"
+              name='email'
               value={email}
               onChange={handleChange}
             />
@@ -83,9 +83,9 @@ const PasswordResetForm = () => {
               <></>
             )}
             <Button
-              color="green"
+              color='green'
               fluid
-              size="large"
+              size='large'
               onClick={handleSubmit}
               loading={loading}
               disabled={disableButton}

web/src/components/PersonalSetting.js

@@ -1,6 +1,13 @@
 import React, { useContext, useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
-import { API, copy, isRoot, showError, showInfo, showSuccess } from '../helpers';
+import {
+  API,
+  copy,
+  isRoot,
+  showError,
+  showInfo,
+  showSuccess,
+} from '../helpers';
 import Turnstile from 'react-turnstile';
 import { UserContext } from '../context/User';
 import { onGitHubOAuthClicked } from './utils';
@@ -17,9 +24,14 @@ import {
   Modal,
   Space,
   Tag,
-  Typography
+  Typography,
 } from '@douyinfe/semi-ui';
-import { getQuotaPerUnit, renderQuota, renderQuotaWithPrompt, stringToColor } from '../helpers/render';
+import {
+  getQuotaPerUnit,
+  renderQuota,
+  renderQuotaWithPrompt,
+  stringToColor,
+} from '../helpers/render';
 import TelegramLoginButton from 'react-telegram-login';
 
 const PersonalSetting = () => {
@@ -32,7 +44,7 @@ const PersonalSetting = () => {
     email: '',
     self_account_deletion_confirmation: '',
     set_new_password: '',
-    set_new_password_confirmation: ''
+    set_new_password_confirmation: '',
   });
   const [status, setStatus] = useState({});
   const [showChangePasswordModal, setShowChangePasswordModal] = useState(false);
@@ -67,11 +79,9 @@ const PersonalSetting = () => {
         setTurnstileSiteKey(status.turnstile_site_key);
       }
     }
-    getUserData().then(
+    getUserData().then((res) => {
-      (res) => {
+      console.log(userState);
-        console.log(userState);
+    });
-      }
-    );
     loadModels().then();
     getAffLink().then();
     setTransferAmount(getQuotaPerUnit());
@@ -173,7 +183,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) {
@@ -189,12 +199,9 @@ const PersonalSetting = () => {
       showError('两次输入的密码不一致！');
       return;
     }
-    const res = await API.put(
+    const res = await API.put(`/api/user/self`, {
-      `/api/user/self`,
+      password: inputs.set_new_password,
-      {
+    });
-        password: inputs.set_new_password
-      }
-    );
     const { success, message } = res.data;
     if (success) {
       showSuccess('密码修改成功！');
@@ -210,12 +217,9 @@ const PersonalSetting = () => {
       showError('划转金额最低为' + renderQuota(getQuotaPerUnit()));
       return;
     }
-    const res = await API.post(
+    const res = await API.post(`/api/user/aff_transfer`, {
-      `/api/user/aff_transfer`,
+      quota: transferAmount,
-      {
+    });
-        quota: transferAmount
-      }
-    );
     const { success, message } = res.data;
     if (success) {
       showSuccess(message);
@@ -238,7 +242,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) {
@@ -256,7 +260,7 @@ const PersonalSetting = () => {
     }
     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) {
@@ -295,7 +299,7 @@ const PersonalSetting = () => {
       <Layout>
         <Layout.Content>
           <Modal
-            title="请输入要划转的数量"
+            title='请输入要划转的数量'
             visible={openTransfer}
             onOk={transfer}
             onCancel={handleCancel}
@@ -305,13 +309,25 @@ const PersonalSetting = () => {
           >
             <div style={{ marginTop: 20 }}>
               <Typography.Text>{`可用额度${renderQuotaWithPrompt(userState?.user?.aff_quota)}`}</Typography.Text>
-              <Input style={{ marginTop: 5 }} value={userState?.user?.aff_quota} disabled={true}></Input>
+              <Input
+                style={{ marginTop: 5 }}
+                value={userState?.user?.aff_quota}
+                disabled={true}
+              ></Input>
             </div>
             <div style={{ marginTop: 20 }}>
-              <Typography.Text>{`划转额度${renderQuotaWithPrompt(transferAmount)} 最低` + renderQuota(getQuotaPerUnit())}</Typography.Text>
+              <Typography.Text>
+                {`划转额度${renderQuotaWithPrompt(transferAmount)} 最低` +
+                  renderQuota(getQuotaPerUnit())}
+              </Typography.Text>
               <div>
-                <InputNumber min={0} style={{ marginTop: 5 }} value={transferAmount}
+                <InputNumber
-                             onChange={(value) => setTransferAmount(value)} disabled={false}></InputNumber>
+                  min={0}
+                  style={{ marginTop: 5 }}
+                  value={transferAmount}
+                  onChange={(value) => setTransferAmount(value)}
+                  disabled={false}
+                ></InputNumber>
               </div>
             </div>
           </Modal>
@@ -319,27 +335,45 @@ const PersonalSetting = () => {
             <Card
               title={
                 <Card.Meta
-                  avatar={<Avatar size="default" color={stringToColor(getUsername())}
+                  avatar={
-                                  style={{ marginRight: 4 }}>
+                    <Avatar
-                    {typeof getUsername() === 'string' && getUsername().slice(0, 1)}
+                      size='default'
-                  </Avatar>}
+                      color={stringToColor(getUsername())}
+                      style={{ marginRight: 4 }}
+                    >
+                      {typeof getUsername() === 'string' &&
+                        getUsername().slice(0, 1)}
+                    </Avatar>
+                  }
                   title={<Typography.Text>{getUsername()}</Typography.Text>}
-                  description={isRoot() ? <Tag color="red">管理员</Tag> : <Tag color="blue">普通用户</Tag>}
+                  description={
+                    isRoot() ? (
+                      <Tag color='red'>管理员</Tag>
+                    ) : (
+                      <Tag color='blue'>普通用户</Tag>
+                    )
+                  }
                 ></Card.Meta>
               }
               headerExtraContent={
                 <>
-                  <Space vertical align="start">
+                  <Space vertical align='start'>
-                    <Tag color="green">{'ID: ' + userState?.user?.id}</Tag>
+                    <Tag color='green'>{'ID: ' + userState?.user?.id}</Tag>
-                    <Tag color="blue">{userState?.user?.group}</Tag>
+                    <Tag color='blue'>{userState?.user?.group}</Tag>
                   </Space>
                 </>
               }
               footer={
                 <Descriptions row>
-                  <Descriptions.Item itemKey="当前余额">{renderQuota(userState?.user?.quota)}</Descriptions.Item>
+                  <Descriptions.Item itemKey='当前余额'>
-                  <Descriptions.Item itemKey="历史消耗">{renderQuota(userState?.user?.used_quota)}</Descriptions.Item>
+                    {renderQuota(userState?.user?.quota)}
-                  <Descriptions.Item itemKey="请求次数">{userState.user?.request_count}</Descriptions.Item>
+                  </Descriptions.Item>
+                  <Descriptions.Item itemKey='历史消耗'>
+                    {renderQuota(userState?.user?.used_quota)}
+                  </Descriptions.Item>
+                  <Descriptions.Item itemKey='请求次数'>
+                    {userState.user?.request_count}
+                  </Descriptions.Item>
                 </Descriptions>
               }
             >
@@ -347,15 +381,18 @@ const PersonalSetting = () => {
               <div style={{ marginTop: 10 }}>
                 <Space wrap>
                   {models.map((model) => (
-                    <Tag key={model} color="cyan" onClick={() => {
+                    <Tag
-                      copyText(model);
+                      key={model}
-                    }}>
+                      color='cyan'
+                      onClick={() => {
+                        copyText(model);
+                      }}
+                    >
                       {model}
                     </Tag>
                   ))}
                 </Space>
               </div>
-
             </Card>
             <Card
               footer={
@@ -373,18 +410,25 @@ const PersonalSetting = () => {
               <Typography.Title heading={6}>邀请信息</Typography.Title>
               <div style={{ marginTop: 10 }}>
                 <Descriptions row>
-                  <Descriptions.Item itemKey="待使用收益">
+                  <Descriptions.Item itemKey='待使用收益'>
-                                        <span style={{ color: 'rgba(var(--semi-red-5), 1)' }}>
+                    <span style={{ color: 'rgba(var(--semi-red-5), 1)' }}>
-                                            {
+                      {renderQuota(userState?.user?.aff_quota)}
-                                              renderQuota(userState?.user?.aff_quota)
+                    </span>
-                                            }
+                    <Button
-                                        </span>
+                      type={'secondary'}
-                    <Button type={'secondary'} onClick={() => setOpenTransfer(true)} size={'small'}
+                      onClick={() => setOpenTransfer(true)}
-                            style={{ marginLeft: 10 }}>划转</Button>
+                      size={'small'}
+                      style={{ marginLeft: 10 }}
+                    >
+                      划转
+                    </Button>
+                  </Descriptions.Item>
+                  <Descriptions.Item itemKey='总收益'>
+                    {renderQuota(userState?.user?.aff_history_quota)}
+                  </Descriptions.Item>
+                  <Descriptions.Item itemKey='邀请人数'>
+                    {userState?.user?.aff_count}
                   </Descriptions.Item>
-                  <Descriptions.Item
-                    itemKey="总收益">{renderQuota(userState?.user?.aff_history_quota)}</Descriptions.Item>
-                  <Descriptions.Item itemKey="邀请人数">{userState?.user?.aff_count}</Descriptions.Item>
                 </Descriptions>
               </div>
             </Card>
@@ -392,46 +436,71 @@ const PersonalSetting = () => {
               <Typography.Title heading={6}>个人信息</Typography.Title>
               <div style={{ marginTop: 20 }}>
                 <Typography.Text strong>邮箱</Typography.Text>
-                <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+                <div
+                  style={{ display: 'flex', justifyContent: 'space-between' }}
+                >
                   <div>
                     <Input
-                      value={userState.user && userState.user.email !== '' ? userState.user.email : '未绑定'}
+                      value={
+                        userState.user && userState.user.email !== ''
+                          ? userState.user.email
+                          : '未绑定'
+                      }
                       readonly={true}
                     ></Input>
                   </div>
                   <div>
-                    <Button onClick={() => {
+                    <Button
-                      setShowEmailBindModal(true);
+                      onClick={() => {
-                    }}>{
+                        setShowEmailBindModal(true);
-                      userState.user && userState.user.email !== '' ? '修改绑定' : '绑定邮箱'
+                      }}
-                    }</Button>
+                    >
+                      {userState.user && userState.user.email !== ''
+                        ? '修改绑定'
+                        : '绑定邮箱'}
+                    </Button>
                   </div>
                 </div>
               </div>
               <div style={{ marginTop: 10 }}>
                 <Typography.Text strong>微信</Typography.Text>
-                <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+                <div
+                  style={{ display: 'flex', justifyContent: 'space-between' }}
+                >
                   <div>
                     <Input
-                      value={userState.user && userState.user.wechat_id !== '' ? '已绑定' : '未绑定'}
+                      value={
+                        userState.user && userState.user.wechat_id !== ''
+                          ? '已绑定'
+                          : '未绑定'
+                      }
                       readonly={true}
                     ></Input>
                   </div>
                   <div>
-                    <Button disabled={(userState.user && userState.user.wechat_id !== '') || !status.wechat_login}>
+                    <Button
-                      {
+                      disabled={
-                        status.wechat_login ? '绑定' : '未启用'
+                        (userState.user && userState.user.wechat_id !== '') ||
+                        !status.wechat_login
                       }
+                    >
+                      {status.wechat_login ? '绑定' : '未启用'}
                     </Button>
                   </div>
                 </div>
               </div>
               <div style={{ marginTop: 10 }}>
                 <Typography.Text strong>GitHub</Typography.Text>
-                <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+                <div
+                  style={{ display: 'flex', justifyContent: 'space-between' }}
+                >
                   <div>
                     <Input
-                      value={userState.user && userState.user.github_id !== '' ? userState.user.github_id : '未绑定'}
+                      value={
+                        userState.user && userState.user.github_id !== ''
+                          ? userState.user.github_id
+                          : '未绑定'
+                      }
                       readonly={true}
                     ></Input>
                   </div>
@@ -440,11 +509,12 @@ const PersonalSetting = () => {
                       onClick={() => {
                         onGitHubOAuthClicked(status.github_client_id);
                       }}
-                      disabled={(userState.user && userState.user.github_id !== '') || !status.github_oauth}
+                      disabled={
-                    >
+                        (userState.user && userState.user.github_id !== '') ||
-                      {
+                        !status.github_oauth
-                        status.github_oauth ? '绑定' : '未启用'
                       }
+                    >
+                      {status.github_oauth ? '绑定' : '未启用'}
                     </Button>
                   </div>
                 </div>
@@ -452,33 +522,56 @@ const PersonalSetting = () => {
 
               <div style={{ marginTop: 10 }}>
                 <Typography.Text strong>Telegram</Typography.Text>
-                <div style={{ display: 'flex', justifyContent: 'space-between' }}>
+                <div
+                  style={{ display: 'flex', justifyContent: 'space-between' }}
+                >
                   <div>
                     <Input
-                      value={userState.user && userState.user.telegram_id !== '' ? userState.user.telegram_id : '未绑定'}
+                      value={
+                        userState.user && userState.user.telegram_id !== ''
+                          ? userState.user.telegram_id
+                          : '未绑定'
+                      }
                       readonly={true}
                     ></Input>
                   </div>
                   <div>
-                    {status.telegram_oauth ?
+                    {status.telegram_oauth ? (
-                      userState.user.telegram_id !== '' ? <Button disabled={true}>已绑定</Button>
+                      userState.user.telegram_id !== '' ? (
-                        : <TelegramLoginButton dataAuthUrl="/api/oauth/telegram/bind"
+                        <Button disabled={true}>已绑定</Button>
-                                               botName={status.telegram_bot_name} />
+                      ) : (
-                      : <Button disabled={true}>未启用</Button>
+                        <TelegramLoginButton
-                    }
+                          dataAuthUrl='/api/oauth/telegram/bind'
+                          botName={status.telegram_bot_name}
+                        />
+                      )
+                    ) : (
+                      <Button disabled={true}>未启用</Button>
+                    )}
                   </div>
                 </div>
               </div>
 
               <div style={{ marginTop: 10 }}>
                 <Space>
-                  <Button onClick={generateAccessToken}>生成系统访问令牌</Button>
+                  <Button onClick={generateAccessToken}>
-                  <Button onClick={() => {
+                    生成系统访问令牌
-                    setShowChangePasswordModal(true);
+                  </Button>
-                  }}>修改密码</Button>
+                  <Button
-                  <Button type={'danger'} onClick={() => {
+                    onClick={() => {
-                    setShowAccountDeleteModal(true);
+                      setShowChangePasswordModal(true);
-                  }}>删除个人账户</Button>
+                    }}
+                  >
+                    修改密码
+                  </Button>
+                  <Button
+                    type={'danger'}
+                    onClick={() => {
+                      setShowAccountDeleteModal(true);
+                    }}
+                  >
+                    删除个人账户
+                  </Button>
                 </Space>
 
                 {systemToken && (
@@ -489,22 +582,20 @@ const PersonalSetting = () => {
                     style={{ marginTop: '10px' }}
                   />
                 )}
-                {
+                {status.wechat_login && (
-                  status.wechat_login && (
+                  <Button
-                    <Button
+                    onClick={() => {
-                      onClick={() => {
+                      setShowWeChatBindModal(true);
-                        setShowWeChatBindModal(true);
+                    }}
-                      }}
+                  >
-                    >
+                    绑定微信账号
-                      绑定微信账号
+                  </Button>
-                    </Button>
+                )}
-                  )
-                }
                 <Modal
                   onCancel={() => setShowWeChatBindModal(false)}
                   // onOpen={() => setShowWeChatBindModal(true)}
                   visible={showWeChatBindModal}
-                  size={'mini'}
+                  size={'small'}
                 >
                   <Image src={status.wechat_qrcode} />
                   <div style={{ textAlign: 'center' }}>
@@ -513,12 +604,14 @@ const PersonalSetting = () => {
                     </p>
                   </div>
                   <Input
-                    placeholder="验证码"
+                    placeholder='验证码'
-                    name="wechat_verification_code"
+                    name='wechat_verification_code'
                     value={inputs.wechat_verification_code}
-                    onChange={(v) => handleInputChange('wechat_verification_code', v)}
+                    onChange={(v) =>
+                      handleInputChange('wechat_verification_code', v)
+                    }
                   />
-                  <Button color="" fluid size="large" onClick={bindWeChat}>
+                  <Button color='' fluid size='large' onClick={bindWeChat}>
                     绑定
                   </Button>
                 </Modal>
@@ -534,26 +627,36 @@ const PersonalSetting = () => {
               maskClosable={false}
             >
               <Typography.Title heading={6}>绑定邮箱地址</Typography.Title>
-              <div style={{ marginTop: 20, display: 'flex', justifyContent: 'space-between' }}>
+              <div
+                style={{
+                  marginTop: 20,
+                  display: 'flex',
+                  justifyContent: 'space-between',
+                }}
+              >
                 <Input
                   fluid
-                  placeholder="输入邮箱地址"
+                  placeholder='输入邮箱地址'
                   onChange={(value) => handleInputChange('email', value)}
-                  name="email"
+                  name='email'
-                  type="email"
+                  type='email'
                 />
-                <Button onClick={sendVerificationCode}
+                <Button
-                        disabled={disableButton || loading}>
+                  onClick={sendVerificationCode}
-                  {disableButton ? `重新发送(${countdown})` : '获取验证码'}
+                  disabled={disableButton || loading}
+                >
+                  {disableButton ? `重新发送 (${countdown})` : '获取验证码'}
                 </Button>
               </div>
               <div style={{ marginTop: 10 }}>
                 <Input
                   fluid
-                  placeholder="验证码"
+                  placeholder='验证码'
-                  name="email_verification_code"
+                  name='email_verification_code'
                   value={inputs.email_verification_code}
-                  onChange={(value) => handleInputChange('email_verification_code', value)}
+                  onChange={(value) =>
+                    handleInputChange('email_verification_code', value)
+                  }
                 />
               </div>
               {turnstileEnabled ? (
@@ -576,17 +679,22 @@ const PersonalSetting = () => {
             >
               <div style={{ marginTop: 20 }}>
                 <Banner
-                  type="danger"
+                  type='danger'
-                  description="您正在删除自己的帐户，将清空所有数据且不可恢复"
+                  description='您正在删除自己的帐户，将清空所有数据且不可恢复'
                   closeIcon={null}
                 />
               </div>
               <div style={{ marginTop: 20 }}>
                 <Input
                   placeholder={`输入你的账户名 ${userState?.user?.username} 以确认删除`}
-                  name="self_account_deletion_confirmation"
+                  name='self_account_deletion_confirmation'
                   value={inputs.self_account_deletion_confirmation}
-                  onChange={(value) => handleInputChange('self_account_deletion_confirmation', value)}
+                  onChange={(value) =>
+                    handleInputChange(
+                      'self_account_deletion_confirmation',
+                      value,
+                    )
+                  }
                 />
                 {turnstileEnabled ? (
                   <Turnstile
@@ -609,17 +717,21 @@ const PersonalSetting = () => {
             >
               <div style={{ marginTop: 20 }}>
                 <Input
-                  name="set_new_password"
+                  name='set_new_password'
-                  placeholder="新密码"
+                  placeholder='新密码'
                   value={inputs.set_new_password}
-                  onChange={(value) => handleInputChange('set_new_password', value)}
+                  onChange={(value) =>
+                    handleInputChange('set_new_password', value)
+                  }
                 />
                 <Input
                   style={{ marginTop: 20 }}
-                  name="set_new_password_confirmation"
+                  name='set_new_password_confirmation'
-                  placeholder="确认新密码"
+                  placeholder='确认新密码'
                   value={inputs.set_new_password_confirmation}
-                  onChange={(value) => handleInputChange('set_new_password_confirmation', value)}
+                  onChange={(value) =>
+                    handleInputChange('set_new_password_confirmation', value)
+                  }
                 />
                 {turnstileEnabled ? (
                   <Turnstile
@@ -634,7 +746,6 @@ const PersonalSetting = () => {
               </div>
             </Modal>
           </div>
-
         </Layout.Content>
       </Layout>
     </div>

web/src/components/PrivateRoute.js

@@ -2,12 +2,11 @@ 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 }} />;
+    return <Navigate to='/login' state={{ from: history.location }} />;
   }
   return children;
 }
 
-export { PrivateRoute };
+export { PrivateRoute };

web/src/components/RedemptionsTable.js

@@ -1,29 +1,58 @@
 import React, { useEffect, useState } from 'react';
-import { API, copy, showError, showSuccess, timestamp2string } from '../helpers';
+import {
+  API,
+  copy,
+  showError,
+  showSuccess,
+  timestamp2string,
+} from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderQuota } from '../helpers/render';
-import { Button, Form, Modal, Popconfirm, Popover, Table, Tag } from '@douyinfe/semi-ui';
+import {
+  Button,
+  Form,
+  Modal,
+  Popconfirm,
+  Popover,
+  Table,
+  Tag,
+} from '@douyinfe/semi-ui';
 import EditRedemption from '../pages/Redemption/EditRedemption';
 
 function renderTimestamp(timestamp) {
-  return (
+  return <>{timestamp2string(timestamp)}</>;
-    <>
-      {timestamp2string(timestamp)}
-    </>
-  );
 }
 
 function renderStatus(status) {
   switch (status) {
     case 1:
-      return <Tag color="green" size="large">未使用</Tag>;
+      return (
+        <Tag color='green' size='large'>
+          未使用
+        </Tag>
+      );
     case 2:
-      return <Tag color="red" size="large"> 已禁用 </Tag>;
+      return (
+        <Tag color='red' size='large'>
+          {' '}
+          已禁用{' '}
+        </Tag>
+      );
     case 3:
-      return <Tag color="grey" size="large"> 已使用 </Tag>;
+      return (
+        <Tag color='grey' size='large'>
+          {' '}
+          已使用{' '}
+        </Tag>
+      );
     default:
-      return <Tag color="black" size="large"> 未知状态 </Tag>;
+      return (
+        <Tag color='black' size='large'>
+          {' '}
+          未知状态{' '}
+        </Tag>
+      );
   }
 }
 
@@ -31,121 +60,115 @@ const RedemptionsTable = () => {
   const columns = [
     {
       title: 'ID',
-      dataIndex: 'id'
+      dataIndex: 'id',
     },
     {
       title: '名称',
-      dataIndex: 'name'
+      dataIndex: 'name',
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
       render: (text, record, index) => {
-        return (
+        return <div>{renderStatus(text)}</div>;
-          <div>
+      },
-            {renderStatus(text)}
-          </div>
-        );
-      }
     },
     {
       title: '额度',
       dataIndex: 'quota',
       render: (text, record, index) => {
-        return (
+        return <div>{renderQuota(parseInt(text))}</div>;
-          <div>
+      },
-            {renderQuota(parseInt(text))}
-          </div>
-        );
-      }
     },
     {
       title: '创建时间',
       dataIndex: 'created_time',
       render: (text, record, index) => {
-        return (
+        return <div>{renderTimestamp(text)}</div>;
-          <div>
+      },
-            {renderTimestamp(text)}
-          </div>
-        );
-      }
     },
     {
       title: '兑换人ID',
       dataIndex: 'used_user_id',
       render: (text, record, index) => {
-        return (
+        return <div>{text === 0 ? '无' : text}</div>;
-          <div>
+      },
-            {text === 0 ? '无' : text}
-          </div>
-        );
-      }
     },
     {
       title: '',
       dataIndex: 'operate',
       render: (text, record, index) => (
         <div>
-          <Popover
+          <Popover content={record.key} style={{ padding: 20 }} position='top'>
-            content={
+            <Button theme='light' type='tertiary' style={{ marginRight: 1 }}>
-              record.key
+              查看
-            }
+            </Button>
-            style={{ padding: 20 }}
-            position="top"
-          >
-            <Button theme="light" type="tertiary" style={{ marginRight: 1 }}>查看</Button>
           </Popover>
-          <Button theme="light" type="secondary" style={{ marginRight: 1 }}
+          <Button
-                  onClick={async (text) => {
+            theme='light'
-                    await copyText(record.key);
+            type='secondary'
-                  }}
+            style={{ marginRight: 1 }}
-          >复制</Button>
+            onClick={async (text) => {
+              await copyText(record.key);
+            }}
+          >
+            复制
+          </Button>
           <Popconfirm
-            title="确定是否要删除此兑换码？"
+            title='确定是否要删除此兑换码？'
-            content="此修改将不可逆"
+            content='此修改将不可逆'
             okType={'danger'}
             position={'left'}
             onConfirm={() => {
-              manageRedemption(record.id, 'delete', record).then(
+              manageRedemption(record.id, 'delete', record).then(() => {
-                () => {
+                removeRecord(record.key);
-                  removeRecord(record.key);
+              });
-                }
-              );
             }}
           >
-            <Button theme="light" type="danger" style={{ marginRight: 1 }}>删除</Button>
+            <Button theme='light' type='danger' style={{ marginRight: 1 }}>
+              删除
+            </Button>
           </Popconfirm>
-          {
+          {record.status === 1 ? (
-            record.status === 1 ?
+            <Button
-              <Button theme="light" type="warning" style={{ marginRight: 1 }} onClick={
+              theme='light'
-                async () => {
+              type='warning'
-                  manageRedemption(
+              style={{ marginRight: 1 }}
-                    record.id,
+              onClick={async () => {
-                    'disable',
+                manageRedemption(record.id, 'disable', record);
-                    record
+              }}
-                  );
+            >
-                }
+              禁用
-              }>禁用</Button> :
+            </Button>
-              <Button theme="light" type="secondary" style={{ marginRight: 1 }} onClick={
+          ) : (
-                async () => {
+            <Button
-                  manageRedemption(
+              theme='light'
-                    record.id,
+              type='secondary'
-                    'enable',
+              style={{ marginRight: 1 }}
-                    record
+              onClick={async () => {
-                  );
+                manageRedemption(record.id, 'enable', record);
-                }
+              }}
-              } disabled={record.status === 3}>启用</Button>
+              disabled={record.status === 3}
-          }
+            >
-          <Button theme="light" type="tertiary" style={{ marginRight: 1 }} onClick={
+              启用
-            () => {
+            </Button>
+          )}
+          <Button
+            theme='light'
+            type='tertiary'
+            style={{ marginRight: 1 }}
+            onClick={() => {
               setEditingRedemption(record);
               setShowEdit(true);
-            }
+            }}
-          } disabled={record.status !== 1}>编辑</Button>
+            disabled={record.status !== 1}
+          >
+            编辑
+          </Button>
         </div>
-      )
+      ),
-    }
+    },
   ];
 
   const [redemptions, setRedemptions] = useState([]);
@@ -156,7 +179,7 @@ const RedemptionsTable = () => {
   const [tokenCount, setTokenCount] = useState(ITEMS_PER_PAGE);
   const [selectedKeys, setSelectedKeys] = useState([]);
   const [editingRedemption, setEditingRedemption] = useState({
-    id: undefined
+    id: undefined,
   });
   const [showEdit, setShowEdit] = useState(false);
 
@@ -178,7 +201,7 @@ const RedemptionsTable = () => {
     // }
     // data.key = '' + data.id
     setRedemptions(redeptions);
-    if (redeptions.length >= (activePage) * ITEMS_PER_PAGE) {
+    if (redeptions.length >= activePage * ITEMS_PER_PAGE) {
       setTokenCount(redeptions.length + 1);
     } else {
       setTokenCount(redeptions.length);
@@ -202,10 +225,10 @@ const RedemptionsTable = () => {
     setLoading(false);
   };
 
-  const removeRecord = key => {
+  const removeRecord = (key) => {
     let newDataSource = [...redemptions];
     if (key != null) {
-      let idx = newDataSource.findIndex(data => data.key === key);
+      let idx = newDataSource.findIndex((data) => data.key === key);
 
       if (idx > -1) {
         newDataSource.splice(idx, 1);
@@ -268,7 +291,6 @@ const RedemptionsTable = () => {
       let newRedemptions = [...redemptions];
       // let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
       if (action === 'delete') {
-
       } else {
         record.status = redemption.status;
       }
@@ -286,7 +308,9 @@ 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);
@@ -315,32 +339,32 @@ const RedemptionsTable = () => {
     setLoading(false);
   };
 
-  const handlePageChange = page => {
+  const handlePageChange = (page) => {
     setActivePage(page);
     if (page === Math.ceil(redemptions.length / ITEMS_PER_PAGE) + 1) {
       // In this case we have to load more data and then append them.
-      loadRedemptions(page - 1).then(r => {
+      loadRedemptions(page - 1).then((r) => {});
-      });
     }
   };
 
-  let pageData = redemptions.slice((activePage - 1) * ITEMS_PER_PAGE, activePage * ITEMS_PER_PAGE);
+  let pageData = redemptions.slice(
+    (activePage - 1) * ITEMS_PER_PAGE,
+    activePage * ITEMS_PER_PAGE,
+  );
   const rowSelection = {
-    onSelect: (record, selected) => {
+    onSelect: (record, selected) => {},
-    },
+    onSelectAll: (selected, selectedRows) => {},
-    onSelectAll: (selected, selectedRows) => {
-    },
     onChange: (selectedRowKeys, selectedRows) => {
       setSelectedKeys(selectedRows);
-    }
+    },
   };
 
   const handleRow = (record, index) => {
     if (record.status !== 1) {
       return {
         style: {
-          background: 'var(--semi-color-disabled-border)'
+          background: 'var(--semi-color-disabled-border)',
-        }
+        },
       };
     } else {
       return {};
@@ -349,45 +373,64 @@ const RedemptionsTable = () => {
 
   return (
     <>
-      <EditRedemption refresh={refresh} editingRedemption={editingRedemption} visiable={showEdit}
+      <EditRedemption
-                      handleClose={closeEdit}></EditRedemption>
+        refresh={refresh}
+        editingRedemption={editingRedemption}
+        visiable={showEdit}
+        handleClose={closeEdit}
+      ></EditRedemption>
       <Form onSubmit={searchRedemptions}>
         <Form.Input
-          label="搜索关键字"
+          label='搜索关键字'
-          field="keyword"
+          field='keyword'
-          icon="search"
+          icon='search'
-          iconPosition="left"
+          iconPosition='left'
-          placeholder="关键字(id或者名称)"
+          placeholder='关键字(id或者名称)'
           value={searchKeyword}
           loading={searching}
           onChange={handleKeywordChange}
         />
       </Form>
 
-      <Table style={{ marginTop: 20 }} columns={columns} dataSource={pageData} pagination={{
+      <Table
-        currentPage: activePage,
+        style={{ marginTop: 20 }}
-        pageSize: ITEMS_PER_PAGE,
+        columns={columns}
-        total: tokenCount,
+        dataSource={pageData}
-        // showSizeChanger: true,
+        pagination={{
-        // pageSizeOptions: [10, 20, 50, 100],
+          currentPage: activePage,
-        formatPageText: (page) => `第 ${page.currentStart} - ${page.currentEnd} 条，共 ${redemptions.length} 条`,
+          pageSize: ITEMS_PER_PAGE,
-        // onPageSizeChange: (size) => {
+          total: tokenCount,
-        //   setPageSize(size);
+          // showSizeChanger: true,
-        //   setActivePage(1);
+          // pageSizeOptions: [10, 20, 50, 100],
-        // },
+          formatPageText: (page) =>
-        onPageChange: handlePageChange
+            `第 ${page.currentStart} - ${page.currentEnd} 条，共 ${redemptions.length} 条`,
-      }} loading={loading} rowSelection={rowSelection} onRow={handleRow}>
+          // onPageSizeChange: (size) => {
-      </Table>
+          //   setPageSize(size);
-      <Button theme="light" type="primary" style={{ marginRight: 8 }} onClick={
+          //   setActivePage(1);
-        () => {
+          // },
+          onPageChange: handlePageChange,
+        }}
+        loading={loading}
+        rowSelection={rowSelection}
+        onRow={handleRow}
+      ></Table>
+      <Button
+        theme='light'
+        type='primary'
+        style={{ marginRight: 8 }}
+        onClick={() => {
           setEditingRedemption({
-            id: undefined
+            id: undefined,
           });
           setShowEdit(true);
-        }
+        }}
-      }>添加兑换码</Button>
+      >
-      <Button label="复制所选兑换码" type="warning" onClick={
+        添加兑换码
-        async () => {
+      </Button>
+      <Button
+        label='复制所选兑换码'
+        type='warning'
+        onClick={async () => {
           if (selectedKeys.length === 0) {
             showError('请至少选择一个兑换码！');
             return;
@@ -397,8 +440,10 @@ const RedemptionsTable = () => {
             keys += selectedKeys[i].name + '    ' + selectedKeys[i].key + '\n';
           }
           await copyText(keys);
-        }
+        }}
-      }>复制所选兑换码到剪贴板</Button>
+      >
+        复制所选兑换码到剪贴板
+      </Button>
     </>
   );
 };

web/src/components/RegisterForm.js

@@ -1,5 +1,13 @@
 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';
@@ -10,7 +18,7 @@ const RegisterForm = () => {
     password: '',
     password2: '',
     email: '',
-    verification_code: ''
+    verification_code: '',
   });
   const { username, password, password2 } = inputs;
   const [showEmailVerification, setShowEmailVerification] = useState(false);
@@ -65,7 +73,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) {
@@ -86,7 +94,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) {
@@ -98,49 +106,49 @@ const RegisterForm = () => {
   };
 
   return (
-    <Grid textAlign="center" style={{ marginTop: '48px' }}>
+    <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
-        <Header as="h2" color="" textAlign="center">
+        <Header as='h2' color='' textAlign='center'>
           <Image src={logo} /> 新用户注册
         </Header>
-        <Form size="large">
+        <Form size='large'>
           <Segment>
             <Form.Input
               fluid
-              icon="user"
+              icon='user'
-              iconPosition="left"
+              iconPosition='left'
-              placeholder="输入用户名，最长 12 位"
+              placeholder='输入用户名，最长 12 位'
               onChange={handleChange}
-              name="username"
+              name='username'
             />
             <Form.Input
               fluid
-              icon="lock"
+              icon='lock'
-              iconPosition="left"
+              iconPosition='left'
-              placeholder="输入密码，最短 8 位，最长 20 位"
+              placeholder='输入密码，最短 8 位，最长 20 位'
               onChange={handleChange}
-              name="password"
+              name='password'
-              type="password"
+              type='password'
             />
             <Form.Input
               fluid
-              icon="lock"
+              icon='lock'
-              iconPosition="left"
+              iconPosition='left'
-              placeholder="输入密码，最短 8 位，最长 20 位"
+              placeholder='输入密码，最短 8 位，最长 20 位'
               onChange={handleChange}
-              name="password2"
+              name='password2'
-              type="password"
+              type='password'
             />
             {showEmailVerification ? (
               <>
                 <Form.Input
                   fluid
-                  icon="mail"
+                  icon='mail'
-                  iconPosition="left"
+                  iconPosition='left'
-                  placeholder="输入邮箱地址"
+                  placeholder='输入邮箱地址'
                   onChange={handleChange}
-                  name="email"
+                  name='email'
-                  type="email"
+                  type='email'
                   action={
                     <Button onClick={sendVerificationCode} disabled={loading}>
                       获取验证码
@@ -149,11 +157,11 @@ const RegisterForm = () => {
                 />
                 <Form.Input
                   fluid
-                  icon="lock"
+                  icon='lock'
-                  iconPosition="left"
+                  iconPosition='left'
-                  placeholder="输入验证码"
+                  placeholder='输入验证码'
                   onChange={handleChange}
-                  name="verification_code"
+                  name='verification_code'
                 />
               </>
             ) : (
@@ -170,9 +178,9 @@ const RegisterForm = () => {
               <></>
             )}
             <Button
-              color="green"
+              color='green'
               fluid
-              size="large"
+              size='large'
               onClick={handleSubmit}
               loading={loading}
             >
@@ -182,7 +190,7 @@ const RegisterForm = () => {
         </Form>
         <Message>
           已有账户？
-          <Link to="/login" className="btn btn-link">
+          <Link to='/login' className='btn btn-link'>
             点击登录
           </Link>
         </Message>

web/src/components/SiderBar.js

@@ -3,7 +3,14 @@ import { Link, useNavigate } from 'react-router-dom';
 import { UserContext } from '../context/User';
 import { StatusContext } from '../context/Status';
 
-import { API, getLogo, getSystemName, isAdmin, isMobile, showError } from '../helpers';
+import {
+  API,
+  getLogo,
+  getSystemName,
+  isAdmin,
+  isMobile,
+  showError,
+} from '../helpers';
 import '../index.css';
 
 import {
@@ -17,7 +24,7 @@ import {
   IconKey,
   IconLayers,
   IconSetting,
-  IconUser
+  IconUser,
 } from '@douyinfe/semi-icons';
 import { Layout, Nav } from '@douyinfe/semi-ui';
 
@@ -26,7 +33,8 @@ import { Layout, Nav } from '@douyinfe/semi-ui';
 const SiderBar = () => {
   const [userState, userDispatch] = useContext(UserContext);
   const [statusState, statusDispatch] = useContext(StatusContext);
-  const defaultIsCollapsed = isMobile() || localStorage.getItem('default_collapse_sidebar') === 'true';
+  const defaultIsCollapsed =
+    isMobile() || localStorage.getItem('default_collapse_sidebar') === 'true';
 
   let navigate = useNavigate();
   const [selectedKeys, setSelectedKeys] = useState(['home']);
@@ -46,92 +54,111 @@ const SiderBar = () => {
     setting: '/setting',
     about: '/about',
     chat: '/chat',
-    detail: '/detail'
+    detail: '/detail',
   };
 
-  const headerButtons = useMemo(() => [
+  const headerButtons = useMemo(
-    {
+    () => [
-      text: '首页',
+      {
-      itemKey: 'home',
+        text: '首页',
-      to: '/',
+        itemKey: 'home',
-      icon: <IconHome />
+        to: '/',
-    },
+        icon: <IconHome />,
-    {
+      },
-      text: '渠道',
+      {
-      itemKey: 'channel',
+        text: '渠道',
-      to: '/channel',
+        itemKey: 'channel',
-      icon: <IconLayers />,
+        to: '/channel',
-      className: isAdmin() ? 'semi-navigation-item-normal' : 'tableHiddle'
+        icon: <IconLayers />,
-    },
+        className: isAdmin() ? 'semi-navigation-item-normal' : 'tableHiddle',
-    {
+      },
-      text: '聊天',
+      {
-      itemKey: 'chat',
+        text: '聊天',
-      to: '/chat',
+        itemKey: 'chat',
-      icon: <IconComment />,
+        to: '/chat',
-      className: localStorage.getItem('chat_link') ? 'semi-navigation-item-normal' : 'tableHiddle'
+        icon: <IconComment />,
-    },
+        className: localStorage.getItem('chat_link')
-    {
+          ? 'semi-navigation-item-normal'
-      text: '令牌',
+          : 'tableHiddle',
-      itemKey: 'token',
+      },
-      to: '/token',
+      {
-      icon: <IconKey />
+        text: '令牌',
-    },
+        itemKey: 'token',
-    {
+        to: '/token',
-      text: '兑换码',
+        icon: <IconKey />,
-      itemKey: 'redemption',
+      },
-      to: '/redemption',
+      {
-      icon: <IconGift />,
+        text: '兑换码',
-      className: isAdmin() ? 'semi-navigation-item-normal' : 'tableHiddle'
+        itemKey: 'redemption',
-    },
+        to: '/redemption',
-    {
+        icon: <IconGift />,
-      text: '钱包',
+        className: isAdmin() ? 'semi-navigation-item-normal' : 'tableHiddle',
-      itemKey: 'topup',
+      },
-      to: '/topup',
+      {
-      icon: <IconCreditCard />
+        text: '钱包',
-    },
+        itemKey: 'topup',
-    {
+        to: '/topup',
-      text: '用户管理',
+        icon: <IconCreditCard />,
-      itemKey: 'user',
+      },
-      to: '/user',
+      {
-      icon: <IconUser />,
+        text: '用户管理',
-      className: isAdmin() ? 'semi-navigation-item-normal' : 'tableHiddle'
+        itemKey: 'user',
-    },
+        to: '/user',
-    {
+        icon: <IconUser />,
-      text: '日志',
+        className: isAdmin() ? 'semi-navigation-item-normal' : 'tableHiddle',
-      itemKey: 'log',
+      },
-      to: '/log',
+      {
-      icon: <IconHistogram />
+        text: '日志',
-    },
+        itemKey: 'log',
-    {
+        to: '/log',
-      text: '数据看板',
+        icon: <IconHistogram />,
-      itemKey: 'detail',
+      },
-      to: '/detail',
+      {
-      icon: <IconCalendarClock />,
+        text: '数据看板',
-      className: localStorage.getItem('enable_data_export') === 'true' ? 'semi-navigation-item-normal' : 'tableHiddle'
+        itemKey: 'detail',
-    },
+        to: '/detail',
-    {
+        icon: <IconCalendarClock />,
-      text: '绘图',
+        className:
-      itemKey: 'midjourney',
+          localStorage.getItem('enable_data_export') === 'true'
-      to: '/midjourney',
+            ? 'semi-navigation-item-normal'
-      icon: <IconImage />,
+            : 'tableHiddle',
-      className: localStorage.getItem('enable_drawing') === 'true' ? 'semi-navigation-item-normal' : 'tableHiddle'
+      },
-    },
+      {
-    {
+        text: '绘图',
-      text: '设置',
+        itemKey: 'midjourney',
-      itemKey: 'setting',
+        to: '/midjourney',
-      to: '/setting',
+        icon: <IconImage />,
-      icon: <IconSetting />
+        className:
-    }
+          localStorage.getItem('enable_drawing') === 'true'
-    // {
+            ? 'semi-navigation-item-normal'
-    //     text: '关于',
+            : 'tableHiddle',
-    //     itemKey: 'about',
+      },
-    //     to: '/about',
+      {
-    //     icon: <IconAt/>
+        text: '设置',
-    // }
+        itemKey: 'setting',
-  ], [localStorage.getItem('enable_data_export'), localStorage.getItem('enable_drawing'), localStorage.getItem('chat_link'), isAdmin()]);
+        to: '/setting',
+        icon: <IconSetting />,
+      },
+      // {
+      //     text: '关于',
+      //     itemKey: 'about',
+      //     to: '/about',
+      //     icon: <IconAt/>
+      // }
+    ],
+    [
+      localStorage.getItem('enable_data_export'),
+      localStorage.getItem('enable_drawing'),
+      localStorage.getItem('chat_link'),
+      isAdmin(),
+    ],
+  );
 
   const loadStatus = async () => {
     const res = await API.get('/api/status');
+    if (res === undefined) {
+      return;
+    }
     const { success, data } = res.data;
     if (success) {
       localStorage.setItem('status', JSON.stringify(data));
@@ -143,8 +170,14 @@ const SiderBar = () => {
       localStorage.setItem('display_in_currency', data.display_in_currency);
       localStorage.setItem('enable_drawing', data.enable_drawing);
       localStorage.setItem('enable_data_export', data.enable_data_export);
-      localStorage.setItem('data_export_default_time', data.data_export_default_time);
+      localStorage.setItem(
-      localStorage.setItem('default_collapse_sidebar', data.default_collapse_sidebar);
+        'data_export_default_time',
+        data.data_export_default_time,
+      );
+      localStorage.setItem(
+        'default_collapse_sidebar',
+        data.default_collapse_sidebar,
+      );
       localStorage.setItem('mj_notify_enabled', data.mj_notify_enabled);
       if (data.chat_link) {
         localStorage.setItem('chat_link', data.chat_link);
@@ -163,11 +196,14 @@ const SiderBar = () => {
 
   useEffect(() => {
     loadStatus().then(() => {
-      setIsCollapsed(isMobile() || localStorage.getItem('default_collapse_sidebar') === 'true');
+      setIsCollapsed(
+        isMobile() ||
+          localStorage.getItem('default_collapse_sidebar') === 'true',
+      );
     });
-    let localKey = window.location.pathname.split('/')[1]
+    let localKey = window.location.pathname.split('/')[1];
     if (localKey === '') {
-      localKey = 'home'
+      localKey = 'home';
     }
     setSelectedKeys([localKey]);
   }, []);
@@ -179,9 +215,12 @@ const SiderBar = () => {
           <Nav
             // bodyStyle={{ maxWidth: 200 }}
             style={{ maxWidth: 200 }}
-            defaultIsCollapsed={isMobile() || localStorage.getItem('default_collapse_sidebar') === 'true'}
+            defaultIsCollapsed={
+              isMobile() ||
+              localStorage.getItem('default_collapse_sidebar') === 'true'
+            }
             isCollapsed={isCollapsed}
-            onCollapseChange={collapsed => {
+            onCollapseChange={(collapsed) => {
               setIsCollapsed(collapsed);
             }}
             selectedKeys={selectedKeys}
@@ -196,20 +235,20 @@ const SiderBar = () => {
               );
             }}
             items={headerButtons}
-            onSelect={key => {
+            onSelect={(key) => {
               setSelectedKeys([key.itemKey]);
             }}
             header={{
-              logo: <img src={logo} alt="logo" style={{ marginRight: '0.75em' }} />,
+              logo: (
-              text: systemName
+                <img src={logo} alt='logo' style={{ marginRight: '0.75em' }} />
+              ),
+              text: systemName,
             }}
             // footer={{
             //   text: '© 2021 NekoAPI',
             // }}
           >
-
+            <Nav.Footer collapseButton={true}></Nav.Footer>
-            <Nav.Footer collapseButton={true}>
-            </Nav.Footer>
           </Nav>
         </div>
       </Layout>

web/src/components/SystemSetting.js

@@ -1,5 +1,13 @@
 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, removeTrailingSlash, showError, verifyJSON } from '../helpers';
 
 const SystemSetting = () => {
@@ -34,17 +42,20 @@ const SystemSetting = () => {
     TurnstileSecretKey: '',
     RegisterEnabled: '',
     EmailDomainRestrictionEnabled: '',
-    EmailDomainWhitelist: '',
+    EmailAliasRestrictionEnabled: '',
+    SMTPSSLEnabled: '',
+    EmailDomainWhitelist: [],
     // telegram login
     TelegramOAuthEnabled: '',
     TelegramBotToken: '',
-    TelegramBotName: ''
+    TelegramBotName: '',
   });
   const [originInputs, setOriginInputs] = useState({});
   let [loading, setLoading] = useState(false);
   const [EmailDomainWhitelist, setEmailDomainWhitelist] = useState([]);
   const [restrictedDomainInput, setRestrictedDomainInput] = useState('');
-  const [showPasswordWarningModal, setShowPasswordWarningModal] = useState(false);
+  const [showPasswordWarningModal, setShowPasswordWarningModal] =
+    useState(false);
 
   const getOptions = async () => {
     const res = await API.get('/api/option/');
@@ -59,13 +70,15 @@ const SystemSetting = () => {
       });
       setInputs({
         ...newInputs,
-        EmailDomainWhitelist: newInputs.EmailDomainWhitelist.split(',')
+        EmailDomainWhitelist: newInputs.EmailDomainWhitelist.split(','),
       });
       setOriginInputs(newInputs);
 
-      setEmailDomainWhitelist(newInputs.EmailDomainWhitelist.split(',').map((item) => {
+      setEmailDomainWhitelist(
-        return { key: item, text: item, value: item };
+        newInputs.EmailDomainWhitelist.split(',').map((item) => {
-      }));
+          return { key: item, text: item, value: item };
+        }),
+      );
     } else {
       showError(message);
     }
@@ -74,6 +87,7 @@ const SystemSetting = () => {
   useEffect(() => {
     getOptions().then();
   }, []);
+  useEffect(() => {}, [inputs.EmailDomainWhitelist]);
 
   const updateOption = async (key, value) => {
     setLoading(true);
@@ -86,6 +100,8 @@ const SystemSetting = () => {
       case 'TelegramOAuthEnabled':
       case 'TurnstileCheckEnabled':
       case 'EmailDomainRestrictionEnabled':
+      case 'EmailAliasRestrictionEnabled':
+      case 'SMTPSSLEnabled':
       case 'RegisterEnabled':
         value = inputs[key] === 'true' ? 'false' : 'true';
         break;
@@ -94,7 +110,7 @@ const SystemSetting = () => {
     }
     const res = await API.put('/api/option/', {
       key,
-      value
+      value,
     });
     const { success, message } = res.data;
     if (success) {
@@ -105,7 +121,8 @@ const SystemSetting = () => {
         value = parseFloat(value);
       }
       setInputs((inputs) => ({
-        ...inputs, [key]: value
+        ...inputs,
+        [key]: value,
       }));
     } else {
       showError(message);
@@ -121,7 +138,7 @@ const SystemSetting = () => {
     }
     if (
       name === 'Notice' ||
-      name.startsWith('SMTP') ||
+      (name.startsWith('SMTP') && name !== 'SMTPSSLEnabled') ||
       name === 'ServerAddress' ||
       name === 'EpayId' ||
       name === 'EpayKey' ||
@@ -197,13 +214,16 @@ const SystemSetting = () => {
     }
   };
 
-
   const submitEmailDomainWhitelist = async () => {
     if (
-      originInputs['EmailDomainWhitelist'] !== inputs.EmailDomainWhitelist.join(',') &&
+      originInputs['EmailDomainWhitelist'] !==
+        inputs.EmailDomainWhitelist.join(',') &&
       inputs.SMTPToken !== ''
     ) {
-      await updateOption('EmailDomainWhitelist', inputs.EmailDomainWhitelist.join(','));
+      await updateOption(
+        'EmailDomainWhitelist',
+        inputs.EmailDomainWhitelist.join(','),
+      );
     }
   };
 
@@ -211,7 +231,7 @@ const SystemSetting = () => {
     if (originInputs['WeChatServerAddress'] !== inputs.WeChatServerAddress) {
       await updateOption(
         'WeChatServerAddress',
-        removeTrailingSlash(inputs.WeChatServerAddress)
+        removeTrailingSlash(inputs.WeChatServerAddress),
       );
     }
     if (
@@ -220,7 +240,7 @@ const SystemSetting = () => {
     ) {
       await updateOption(
         'WeChatAccountQRCodeImageURL',
-        inputs.WeChatAccountQRCodeImageURL
+        inputs.WeChatAccountQRCodeImageURL,
       );
     }
     if (
@@ -263,17 +283,23 @@ const SystemSetting = () => {
 
   const submitNewRestrictedDomain = () => {
     const localDomainList = inputs.EmailDomainWhitelist;
-    if (restrictedDomainInput !== '' && !localDomainList.includes(restrictedDomainInput)) {
+    if (
+      restrictedDomainInput !== '' &&
+      !localDomainList.includes(restrictedDomainInput)
+    ) {
       setRestrictedDomainInput('');
       setInputs({
         ...inputs,
-        EmailDomainWhitelist: [...localDomainList, restrictedDomainInput]
+        EmailDomainWhitelist: [...localDomainList, restrictedDomainInput],
       });
-      setEmailDomainWhitelist([...EmailDomainWhitelist, {
+      setEmailDomainWhitelist([
-        key: restrictedDomainInput,
+        ...EmailDomainWhitelist,
-        text: restrictedDomainInput,
+        {
-        value: restrictedDomainInput
+          key: restrictedDomainInput,
-      }]);
+          text: restrictedDomainInput,
+          value: restrictedDomainInput,
+        },
+      ]);
     }
   };
 
@@ -281,13 +307,13 @@ const SystemSetting = () => {
     <Grid columns={1}>
       <Grid.Column>
         <Form loading={loading}>
-          <Header as="h3">通用设置</Header>
+          <Header as='h3'>通用设置</Header>
-          <Form.Group widths="equal">
+          <Form.Group widths='equal'>
             <Form.Input
-              label="服务器地址"
+              label='服务器地址'
-              placeholder="例如：https://yourdomain.com"
+              placeholder='例如：https://yourdomain.com'
               value={inputs.ServerAddress}
-              name="ServerAddress"
+              name='ServerAddress'
               onChange={handleInputChange}
             />
           </Form.Group>
@@ -295,81 +321,79 @@ const SystemSetting = () => {
             更新服务器地址
           </Form.Button>
           <Divider />
-          <Header as="h3">支付设置（当前仅支持易支付接口，默认使用上方服务器地址作为回调地址！）</Header>
+          <Header as='h3'>
-          <Form.Group widths="equal">
+            支付设置（当前仅支持易支付接口，默认使用上方服务器地址作为回调地址！）
+          </Header>
+          <Form.Group widths='equal'>
             <Form.Input
-              label="支付地址，不填写则不启用在线支付"
+              label='支付地址，不填写则不启用在线支付'
-              placeholder="例如：https://yourdomain.com"
+              placeholder='例如：https://yourdomain.com'
               value={inputs.PayAddress}
-              name="PayAddress"
+              name='PayAddress'
               onChange={handleInputChange}
             />
             <Form.Input
-              label="易支付商户ID"
+              label='易支付商户ID'
-              placeholder="例如：0001"
+              placeholder='例如：0001'
               value={inputs.EpayId}
-              name="EpayId"
+              name='EpayId'
               onChange={handleInputChange}
             />
             <Form.Input
-              label="易支付商户密钥"
+              label='易支付商户密钥'
-              placeholder="例如：dejhfueqhujasjmndbjkqaw"
+              placeholder='例如：dejhfueqhujasjmndbjkqaw'
               value={inputs.EpayKey}
-              name="EpayKey"
+              name='EpayKey'
               onChange={handleInputChange}
             />
-
           </Form.Group>
-          <Form.Group widths="equal">
+          <Form.Group widths='equal'>
             <Form.Input
-              label="回调地址，不填写则使用上方服务器地址作为回调地址"
+              label='回调地址，不填写则使用上方服务器地址作为回调地址'
-              placeholder="例如：https://yourdomain.com"
+              placeholder='例如：https://yourdomain.com'
               value={inputs.CustomCallbackAddress}
-              name="CustomCallbackAddress"
+              name='CustomCallbackAddress'
               onChange={handleInputChange}
             />
             <Form.Input
-              label="充值价格（x元/美金）"
+              label='充值价格（x元/美金）'
-              placeholder="例如：7，就是7元/美金"
+              placeholder='例如：7，就是7元/美金'
               value={inputs.Price}
-              name="Price"
+              name='Price'
               min={0}
               onChange={handleInputChange}
             />
             <Form.Input
-              label="最低充值数量"
+              label='最低充值美元数量（以美金为单位，如果使用额度请自行换算！）'
-              placeholder="例如：2，就是最低充值2$"
+              placeholder='例如：2，就是最低充值2$'
               value={inputs.MinTopUp}
-              name="MinTopUp"
+              name='MinTopUp'
               min={1}
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Group widths="equal">
+          <Form.Group widths='equal'>
             <Form.TextArea
-              label="充值分组倍率"
+              label='充值分组倍率'
-              name="TopupGroupRatio"
+              name='TopupGroupRatio'
               onChange={handleInputChange}
               style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.TopupGroupRatio}
-              placeholder="为一个 JSON 文本，键为组名称，值为倍率"
+              placeholder='为一个 JSON 文本，键为组名称，值为倍率'
             />
           </Form.Group>
-          <Form.Button onClick={submitPayAddress}>
+          <Form.Button onClick={submitPayAddress}>更新支付设置</Form.Button>
-            更新支付设置
-          </Form.Button>
           <Divider />
-          <Header as="h3">配置登录注册</Header>
+          <Header as='h3'>配置登录注册</Header>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.PasswordLoginEnabled === 'true'}
-              label="允许通过密码进行登录"
+              label='允许通过密码进行登录'
-              name="PasswordLoginEnabled"
+              name='PasswordLoginEnabled'
               onChange={handleInputChange}
             />
-            {
+            {showPasswordWarningModal && (
-              showPasswordWarningModal &&
               <Modal
                 open={showPasswordWarningModal}
                 onClose={() => setShowPasswordWarningModal(false)}
@@ -378,12 +402,16 @@ const SystemSetting = () => {
               >
                 <Modal.Header>警告</Modal.Header>
                 <Modal.Content>
-                  <p>取消密码登录将导致所有未绑定其他登录方式的用户（包括管理员）无法通过密码登录，确认取消？</p>
+                  <p>
+                    取消密码登录将导致所有未绑定其他登录方式的用户（包括管理员）无法通过密码登录，确认取消？
+                  </p>
                 </Modal.Content>
                 <Modal.Actions>
-                  <Button onClick={() => setShowPasswordWarningModal(false)}>取消</Button>
+                  <Button onClick={() => setShowPasswordWarningModal(false)}>
+                    取消
+                  </Button>
                   <Button
-                    color="yellow"
+                    color='yellow'
                     onClick={async () => {
                       setShowPasswordWarningModal(false);
                       await updateOption('PasswordLoginEnabled', 'false');
@@ -393,157 +421,186 @@ const SystemSetting = () => {
                   </Button>
                 </Modal.Actions>
               </Modal>
-            }
+            )}
             <Form.Checkbox
               checked={inputs.PasswordRegisterEnabled === 'true'}
-              label="允许通过密码进行注册"
+              label='允许通过密码进行注册'
-              name="PasswordRegisterEnabled"
+              name='PasswordRegisterEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.EmailVerificationEnabled === 'true'}
-              label="通过密码注册时需要进行邮箱验证"
+              label='通过密码注册时需要进行邮箱验证'
-              name="EmailVerificationEnabled"
+              name='EmailVerificationEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.GitHubOAuthEnabled === 'true'}
-              label="允许通过 GitHub 账户登录 & 注册"
+              label='允许通过 GitHub 账户登录 & 注册'
-              name="GitHubOAuthEnabled"
+              name='GitHubOAuthEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.WeChatAuthEnabled === 'true'}
-              label="允许通过微信登录 & 注册"
+              label='允许通过微信登录 & 注册'
-              name="WeChatAuthEnabled"
+              name='WeChatAuthEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.TelegramOAuthEnabled === 'true'}
-              label="允许通过 Telegram 进行登录"
+              label='允许通过 Telegram 进行登录'
-              name="TelegramOAuthEnabled"
+              name='TelegramOAuthEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.RegisterEnabled === 'true'}
-              label="允许新用户注册（此项为否时，新用户将无法以任何方式进行注册）"
+              label='允许新用户注册（此项为否时，新用户将无法以任何方式进行注册）'
-              name="RegisterEnabled"
+              name='RegisterEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.TurnstileCheckEnabled === 'true'}
-              label="启用 Turnstile 用户校验"
+              label='启用 Turnstile 用户校验'
-              name="TurnstileCheckEnabled"
+              name='TurnstileCheckEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>
             配置邮箱域名白名单
-            <Header.Subheader>用以防止恶意用户利用临时邮箱批量注册</Header.Subheader>
+            <Header.Subheader>
+              用以防止恶意用户利用临时邮箱批量注册
+            </Header.Subheader>
           </Header>
           <Form.Group widths={3}>
             <Form.Checkbox
-              label="启用邮箱域名白名单"
+              label='启用邮箱域名白名单'
-              name="EmailDomainRestrictionEnabled"
+              name='EmailDomainRestrictionEnabled'
               onChange={handleInputChange}
               checked={inputs.EmailDomainRestrictionEnabled === 'true'}
             />
           </Form.Group>
+          <Form.Group widths={3}>
+            <Form.Checkbox
+              label='启用邮箱别名限制（例如：ab.cd@gmail.com）'
+              name='EmailAliasRestrictionEnabled'
+              onChange={handleInputChange}
+              checked={inputs.EmailAliasRestrictionEnabled === 'true'}
+            />
+          </Form.Group>
           <Form.Group widths={2}>
             <Form.Dropdown
-              label="允许的邮箱域名"
+              label='允许的邮箱域名'
-              placeholder="允许的邮箱域名"
+              placeholder='允许的邮箱域名'
-              name="EmailDomainWhitelist"
+              name='EmailDomainWhitelist'
               required
               fluid
               multiple
               selection
               onChange={handleInputChange}
               value={inputs.EmailDomainWhitelist}
-              autoComplete="new-password"
+              autoComplete='new-password'
               options={EmailDomainWhitelist}
             />
             <Form.Input
-              label="添加新的允许的邮箱域名"
+              label='添加新的允许的邮箱域名'
               action={
-                <Button type="button" onClick={() => {
+                <Button
-                  submitNewRestrictedDomain();
+                  type='button'
-                }}>填入</Button>
+                  onClick={() => {
+                    submitNewRestrictedDomain();
+                  }}
+                >
+                  填入
+                </Button>
               }
               onKeyDown={(e) => {
                 if (e.key === 'Enter') {
                   submitNewRestrictedDomain();
                 }
               }}
-              autoComplete="new-password"
+              autoComplete='new-password'
-              placeholder="输入新的允许的邮箱域名"
+              placeholder='输入新的允许的邮箱域名'
               value={restrictedDomainInput}
               onChange={(e, { value }) => {
                 setRestrictedDomainInput(value);
               }}
             />
           </Form.Group>
-          <Form.Button onClick={submitEmailDomainWhitelist}>保存邮箱域名白名单设置</Form.Button>
+          <Form.Button onClick={submitEmailDomainWhitelist}>
+            保存邮箱域名白名单设置
+          </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>
             配置 SMTP
             <Header.Subheader>用以支持系统的邮件发送</Header.Subheader>
           </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label="SMTP 服务器地址"
+              label='SMTP 服务器地址'
-              name="SMTPServer"
+              name='SMTPServer'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.SMTPServer}
-              placeholder="例如：smtp.qq.com"
+              placeholder='例如：smtp.qq.com'
             />
             <Form.Input
-              label="SMTP 端口"
+              label='SMTP 端口'
-              name="SMTPPort"
+              name='SMTPPort'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.SMTPPort}
-              placeholder="默认: 587"
+              placeholder='默认: 587'
             />
             <Form.Input
-              label="SMTP 账户"
+              label='SMTP 账户'
-              name="SMTPAccount"
+              name='SMTPAccount'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.SMTPAccount}
-              placeholder="通常是邮箱地址"
+              placeholder='通常是邮箱地址'
             />
           </Form.Group>
           <Form.Group widths={3}>
             <Form.Input
-              label="SMTP 发送者邮箱"
+              label='SMTP 发送者邮箱'
-              name="SMTPFrom"
+              name='SMTPFrom'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.SMTPFrom}
-              placeholder="通常和邮箱地址保持一致"
+              placeholder='通常和邮箱地址保持一致'
             />
             <Form.Input
-              label="SMTP 访问凭证"
+              label='SMTP 访问凭证'
-              name="SMTPToken"
+              name='SMTPToken'
               onChange={handleInputChange}
-              type="password"
+              type='password'
-              autoComplete="new-password"
+              autoComplete='new-password'
               checked={inputs.RegisterEnabled === 'true'}
-              placeholder="敏感信息不会发送到前端显示"
+              placeholder='敏感信息不会发送到前端显示'
+            />
+          </Form.Group>
+          <Form.Group widths={3}>
+            <Form.Checkbox
+              label='启用SMTP SSL（465端口强制开启）'
+              name='SMTPSSLEnabled'
+              onChange={handleInputChange}
+              checked={inputs.SMTPSSLEnabled === 'true'}
             />
           </Form.Group>
           <Form.Button onClick={submitSMTP}>保存 SMTP 设置</Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>
             配置 GitHub OAuth App
             <Header.Subheader>
               用以支持通过 GitHub 进行登录注册，
-              <a href="https://github.com/settings/developers" target="_blank" rel="noreferrer">
+              <a
+                href='https://github.com/settings/developers'
+                target='_blank'
+                rel='noreferrer'
+              >
                 点击此处
               </a>
               管理你的 GitHub OAuth App
@@ -556,34 +613,35 @@ const SystemSetting = () => {
           </Message>
           <Form.Group widths={3}>
             <Form.Input
-              label="GitHub Client ID"
+              label='GitHub Client ID'
-              name="GitHubClientId"
+              name='GitHubClientId'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.GitHubClientId}
-              placeholder="输入你注册的 GitHub OAuth APP 的 ID"
+              placeholder='输入你注册的 GitHub OAuth APP 的 ID'
             />
             <Form.Input
-              label="GitHub Client Secret"
+              label='GitHub Client Secret'
-              name="GitHubClientSecret"
+              name='GitHubClientSecret'
               onChange={handleInputChange}
-              type="password"
+              type='password'
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.GitHubClientSecret}
-              placeholder="敏感信息不会发送到前端显示"
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
           <Form.Button onClick={submitGitHubOAuth}>
             保存 GitHub OAuth 设置
           </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>
             配置 WeChat Server
             <Header.Subheader>
               用以支持通过微信进行登录注册，
               <a
-                href="https://github.com/songquanpeng/wechat-server"
+                href='https://github.com/songquanpeng/wechat-server'
-                target="_blank" rel="noreferrer"
+                target='_blank'
+                rel='noreferrer'
               >
                 点击此处
               </a>
@@ -592,61 +650,65 @@ const SystemSetting = () => {
           </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label="WeChat Server 服务器地址"
+              label='WeChat Server 服务器地址'
-              name="WeChatServerAddress"
+              name='WeChatServerAddress'
-              placeholder="例如：https://yourdomain.com"
+              placeholder='例如：https://yourdomain.com'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.WeChatServerAddress}
             />
             <Form.Input
-              label="WeChat Server 访问凭证"
+              label='WeChat Server 访问凭证'
-              name="WeChatServerToken"
+              name='WeChatServerToken'
-              type="password"
+              type='password'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.WeChatServerToken}
-              placeholder="敏感信息不会发送到前端显示"
+              placeholder='敏感信息不会发送到前端显示'
             />
             <Form.Input
-              label="微信公众号二维码图片链接"
+              label='微信公众号二维码图片链接'
-              name="WeChatAccountQRCodeImageURL"
+              name='WeChatAccountQRCodeImageURL'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.WeChatAccountQRCodeImageURL}
-              placeholder="输入一个图片链接"
+              placeholder='输入一个图片链接'
             />
           </Form.Group>
           <Form.Button onClick={submitWeChat}>
             保存 WeChat Server 设置
           </Form.Button>
           <Divider />
-          <Header as="h3">配置 Telegram 登录</Header>
+          <Header as='h3'>配置 Telegram 登录</Header>
           <Form.Group inline>
             <Form.Input
-              label="Telegram Bot Token"
+              label='Telegram Bot Token'
-              name="TelegramBotToken"
+              name='TelegramBotToken'
               onChange={handleInputChange}
               value={inputs.TelegramBotToken}
-              placeholder="输入你的 Telegram Bot Token"
+              placeholder='输入你的 Telegram Bot Token'
             />
             <Form.Input
-              label="Telegram Bot 名称"
+              label='Telegram Bot 名称'
-              name="TelegramBotName"
+              name='TelegramBotName'
               onChange={handleInputChange}
               value={inputs.TelegramBotName}
-              placeholder="输入你的 Telegram Bot 名称"
+              placeholder='输入你的 Telegram Bot 名称'
             />
           </Form.Group>
           <Form.Button onClick={submitTelegramSettings}>
             保存 Telegram 登录设置
           </Form.Button>
           <Divider />
-          <Header as="h3">
+          <Header as='h3'>
             配置 Turnstile
             <Header.Subheader>
               用以支持用户校验，
-              <a href="https://dash.cloudflare.com/" target="_blank" rel="noreferrer">
+              <a
+                href='https://dash.cloudflare.com/'
+                target='_blank'
+                rel='noreferrer'
+              >
                 点击此处
               </a>
               管理你的 Turnstile Sites，推荐选择 Invisible Widget Type
@@ -654,21 +716,21 @@ const SystemSetting = () => {
           </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label="Turnstile Site Key"
+              label='Turnstile Site Key'
-              name="TurnstileSiteKey"
+              name='TurnstileSiteKey'
               onChange={handleInputChange}
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.TurnstileSiteKey}
-              placeholder="输入你注册的 Turnstile Site Key"
+              placeholder='输入你注册的 Turnstile Site Key'
             />
             <Form.Input
-              label="Turnstile Secret Key"
+              label='Turnstile Secret Key'
-              name="TurnstileSecretKey"
+              name='TurnstileSecretKey'
               onChange={handleInputChange}
-              type="password"
+              type='password'
-              autoComplete="new-password"
+              autoComplete='new-password'
               value={inputs.TurnstileSecretKey}
-              placeholder="敏感信息不会发送到前端显示"
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
           <Form.Button onClick={submitTurnstile}>

web/src/components/TokensTable.js

@@ -1,9 +1,25 @@
 import React, { useEffect, useState } from 'react';
-import { API, copy, showError, showSuccess, timestamp2string } from '../helpers';
+import {
+  API,
+  copy,
+  showError,
+  showSuccess,
+  timestamp2string,
+} from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderQuota } from '../helpers/render';
-import { Button, Dropdown, Form, Modal, Popconfirm, Popover, SplitButtonGroup, Table, Tag } from '@douyinfe/semi-ui';
+import {
+  Button,
+  Dropdown,
+  Form,
+  Modal,
+  Popconfirm,
+  Popover,
+  SplitButtonGroup,
+  Table,
+  Tag,
+} from '@douyinfe/semi-ui';
 
 import { IconTreeTriangleDown } from '@douyinfe/semi-icons';
 import EditToken from '../pages/Token/EditToken';
@@ -11,85 +27,107 @@ import EditToken from '../pages/Token/EditToken';
 const COPY_OPTIONS = [
   { key: 'next', text: 'ChatGPT Next Web', value: 'next' },
   { key: 'ama', text: 'ChatGPT Web & Midjourney', value: 'ama' },
-  { key: 'opencat', text: 'OpenCat', value: 'opencat' }
+  { key: 'opencat', text: 'OpenCat', value: 'opencat' },
 ];
 
 const OPEN_LINK_OPTIONS = [
   { key: 'ama', text: 'ChatGPT Web & Midjourney', value: 'ama' },
-  { key: 'opencat', text: 'OpenCat', value: 'opencat' }
+  { key: 'opencat', text: 'OpenCat', value: 'opencat' },
 ];
 
 function renderTimestamp(timestamp) {
-  return (
+  return <>{timestamp2string(timestamp)}</>;
-    <>
-      {timestamp2string(timestamp)}
-    </>
-  );
 }
 
 function renderStatus(status, model_limits_enabled = false) {
   switch (status) {
     case 1:
       if (model_limits_enabled) {
-        return <Tag color="green" size="large">已启用：限制模型</Tag>;
+        return (
+          <Tag color='green' size='large'>
+            已启用：限制模型
+          </Tag>
+        );
       } else {
-        return <Tag color="green" size="large">已启用</Tag>;
+        return (
+          <Tag color='green' size='large'>
+            已启用
+          </Tag>
+        );
       }
     case 2:
-      return <Tag color="red" size="large"> 已禁用 </Tag>;
+      return (
+        <Tag color='red' size='large'>
+          {' '}
+          已禁用{' '}
+        </Tag>
+      );
     case 3:
-      return <Tag color="yellow" size="large"> 已过期 </Tag>;
+      return (
+        <Tag color='yellow' size='large'>
+          {' '}
+          已过期{' '}
+        </Tag>
+      );
     case 4:
-      return <Tag color="grey" size="large"> 已耗尽 </Tag>;
+      return (
+        <Tag color='grey' size='large'>
+          {' '}
+          已耗尽{' '}
+        </Tag>
+      );
     default:
-      return <Tag color="black" size="large"> 未知状态 </Tag>;
+      return (
+        <Tag color='black' size='large'>
+          {' '}
+          未知状态{' '}
+        </Tag>
+      );
   }
 }
 
 const TokensTable = () => {
-
   const link_menu = [
     {
-      node: 'item', key: 'next', name: 'ChatGPT Next Web', onClick: () => {
+      node: 'item',
+      key: 'next',
+      name: 'ChatGPT Next Web',
+      onClick: () => {
         onOpenLink('next');
-      }
+      },
     },
     { node: 'item', key: 'ama', name: 'AMA 问天', value: 'ama' },
     {
-      node: 'item', key: 'next-mj', name: 'ChatGPT Web & Midjourney', value: 'next-mj', onClick: () => {
+      node: 'item',
+      key: 'next-mj',
+      name: 'ChatGPT Web & Midjourney',
+      value: 'next-mj',
+      onClick: () => {
         onOpenLink('next-mj');
-      }
+      },
     },
-    { node: 'item', key: 'opencat', name: 'OpenCat', value: 'opencat' }
+    { node: 'item', key: 'opencat', name: 'OpenCat', value: 'opencat' },
   ];
 
   const columns = [
     {
       title: '名称',
-      dataIndex: 'name'
+      dataIndex: 'name',
     },
     {
       title: '状态',
       dataIndex: 'status',
       key: 'status',
       render: (text, record, index) => {
-        return (
+        return <div>{renderStatus(text, record.model_limits_enabled)}</div>;
-          <div>
+      },
-            {renderStatus(text, record.model_limits_enabled)}
-          </div>
-        );
-      }
     },
     {
       title: '已用额度',
       dataIndex: 'used_quota',
       render: (text, record, index) => {
-        return (
+        return <div>{renderQuota(parseInt(text))}</div>;
-          <div>
+      },
-            {renderQuota(parseInt(text))}
-          </div>
-        );
-      }
     },
     {
       title: '剩余额度',
@@ -97,22 +135,25 @@ const TokensTable = () => {
       render: (text, record, index) => {
         return (
           <div>
-            {record.unlimited_quota ? <Tag size={'large'} color={'white'}>无限制</Tag> :
+            {record.unlimited_quota ? (
-              <Tag size={'large'} color={'light-blue'}>{renderQuota(parseInt(text))}</Tag>}
+              <Tag size={'large'} color={'white'}>
+                无限制
+              </Tag>
+            ) : (
+              <Tag size={'large'} color={'light-blue'}>
+                {renderQuota(parseInt(text))}
+              </Tag>
+            )}
           </div>
         );
-      }
+      },
     },
     {
       title: '创建时间',
       dataIndex: 'created_time',
       render: (text, record, index) => {
-        return (
+        return <div>{renderTimestamp(text)}</div>;
-          <div>
+      },
-            {renderTimestamp(text)}
-          </div>
-        );
-      }
     },
     {
       title: '过期时间',
@@ -123,7 +164,7 @@ const TokensTable = () => {
             {record.expired_time === -1 ? '永不过期' : renderTimestamp(text)}
           </div>
         );
-      }
+      },
     },
     {
       title: '',
@@ -131,25 +172,41 @@ const TokensTable = () => {
       render: (text, record, index) => (
         <div>
           <Popover
-            content={
+            content={'sk-' + record.key}
-              'sk-' + record.key
-            }
             style={{ padding: 20 }}
-            position="top"
+            position='top'
           >
-            <Button theme="light" type="tertiary" style={{ marginRight: 1 }}>查看</Button>
+            <Button theme='light' type='tertiary' style={{ marginRight: 1 }}>
+              查看
+            </Button>
           </Popover>
-          <Button theme="light" type="secondary" style={{ marginRight: 1 }}
+          <Button
-                  onClick={async (text) => {
+            theme='light'
-                    await copyText('sk-' + record.key);
+            type='secondary'
-                  }}
+            style={{ marginRight: 1 }}
-          >复制</Button>
+            onClick={async (text) => {
-          <SplitButtonGroup style={{ marginRight: 1 }} aria-label="项目操作按钮组">
+              await copyText('sk-' + record.key);
-            <Button theme="light" style={{ color: 'rgba(var(--semi-teal-7), 1)' }} onClick={() => {
+            }}
-              onOpenLink('next', record.key);
+          >
-            }}>聊天</Button>
+            复制
-            <Dropdown trigger="click" position="bottomRight" menu={
+          </Button>
-              [
+          <SplitButtonGroup
+            style={{ marginRight: 1 }}
+            aria-label='项目操作按钮组'
+          >
+            <Button
+              theme='light'
+              style={{ color: 'rgba(var(--semi-teal-7), 1)' }}
+              onClick={() => {
+                onOpenLink('next', record.key);
+              }}
+            >
+              聊天
+            </Button>
+            <Dropdown
+              trigger='click'
+              position='bottomRight'
+              menu={[
                 {
                   node: 'item',
                   key: 'next',
@@ -157,7 +214,7 @@ const TokensTable = () => {
                   name: 'ChatGPT Next Web',
                   onClick: () => {
                     onOpenLink('next', record.key);
-                  }
+                  },
                 },
                 {
                   node: 'item',
@@ -166,70 +223,88 @@ const TokensTable = () => {
                   name: 'ChatGPT Web & Midjourney',
                   onClick: () => {
                     onOpenLink('next-mj', record.key);
-                  }
+                  },
                 },
                 {
-                  node: 'item', key: 'ama', name: 'AMA 问天（BotGem）', onClick: () => {
+                  node: 'item',
+                  key: 'ama',
+                  name: 'AMA 问天（BotGem）',
+                  onClick: () => {
                     onOpenLink('ama', record.key);
-                  }
+                  },
                 },
                 {
-                  node: 'item', key: 'opencat', name: 'OpenCat', onClick: () => {
+                  node: 'item',
+                  key: 'opencat',
+                  name: 'OpenCat',
+                  onClick: () => {
                     onOpenLink('opencat', record.key);
-                  }
+                  },
-                }
+                },
-              ]
+              ]}
-            }
             >
-              <Button style={{ padding: '8px 4px', color: 'rgba(var(--semi-teal-7), 1)' }} type="primary"
+              <Button
-                      icon={<IconTreeTriangleDown />}></Button>
+                style={{
+                  padding: '8px 4px',
+                  color: 'rgba(var(--semi-teal-7), 1)',
+                }}
+                type='primary'
+                icon={<IconTreeTriangleDown />}
+              ></Button>
             </Dropdown>
           </SplitButtonGroup>
           <Popconfirm
-            title="确定是否要删除此令牌？"
+            title='确定是否要删除此令牌？'
-            content="此修改将不可逆"
+            content='此修改将不可逆'
             okType={'danger'}
             position={'left'}
             onConfirm={() => {
-              manageToken(record.id, 'delete', record).then(
+              manageToken(record.id, 'delete', record).then(() => {
-                () => {
+                removeRecord(record.key);
-                  removeRecord(record.key);
+              });
-                }
-              );
             }}
           >
-            <Button theme="light" type="danger" style={{ marginRight: 1 }}>删除</Button>
+            <Button theme='light' type='danger' style={{ marginRight: 1 }}>
+              删除
+            </Button>
           </Popconfirm>
-          {
+          {record.status === 1 ? (
-            record.status === 1 ?
+            <Button
-              <Button theme="light" type="warning" style={{ marginRight: 1 }} onClick={
+              theme='light'
-                async () => {
+              type='warning'
-                  manageToken(
+              style={{ marginRight: 1 }}
-                    record.id,
+              onClick={async () => {
-                    'disable',
+                manageToken(record.id, 'disable', record);
-                    record
+              }}
-                  );
+            >
-                }
+              禁用
-              }>禁用</Button> :
+            </Button>
-              <Button theme="light" type="secondary" style={{ marginRight: 1 }} onClick={
+          ) : (
-                async () => {
+            <Button
-                  manageToken(
+              theme='light'
-                    record.id,
+              type='secondary'
-                    'enable',
+              style={{ marginRight: 1 }}
-                    record
+              onClick={async () => {
-                  );
+                manageToken(record.id, 'enable', record);
-                }
+              }}
-              }>启用</Button>
+            >
-          }
+              启用
-          <Button theme="light" type="tertiary" style={{ marginRight: 1 }} onClick={
+            </Button>
-            () => {
+          )}
+          <Button
+            theme='light'
+            type='tertiary'
+            style={{ marginRight: 1 }}
+            onClick={() => {
               setEditingToken(record);
               setShowEdit(true);
-            }
+            }}
-          }>编辑</Button>
+          >
+            编辑
+          </Button>
         </div>
-      )
+      ),
-    }
+    },
   ];
 
   const [pageSize, setPageSize] = useState(ITEMS_PER_PAGE);
@@ -245,14 +320,14 @@ const TokensTable = () => {
   const [showTopUpModal, setShowTopUpModal] = useState(false);
   const [targetTokenIdx, setTargetTokenIdx] = useState(0);
   const [editingToken, setEditingToken] = useState({
-    id: undefined
+    id: undefined,
   });
 
   const closeEdit = () => {
     setShowEdit(false);
     setTimeout(() => {
       setEditingToken({
-        id: undefined
+        id: undefined,
       });
     }, 500);
   };
@@ -266,7 +341,10 @@ const TokensTable = () => {
     }
   };
 
-  let pageData = tokens.slice((activePage - 1) * pageSize, activePage * pageSize);
+  let pageData = tokens.slice(
+    (activePage - 1) * pageSize,
+    activePage * pageSize,
+  );
   const loadTokens = async (startIdx) => {
     setLoading(true);
     const res = await API.get(`/api/token/?p=${startIdx}&size=${pageSize}`);
@@ -315,7 +393,8 @@ const TokensTable = () => {
     let nextUrl;
 
     if (nextLink) {
-      nextUrl = nextLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+      nextUrl =
+        nextLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
     } else {
       nextUrl = `https://chat.oneapi.pro/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
     }
@@ -323,7 +402,8 @@ const TokensTable = () => {
     let url;
     switch (type) {
       case 'ama':
-        url = mjLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+        url =
+          mjLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
         break;
       case 'opencat':
         url = `opencat://team/join?domain=${encodedServerAddress}&token=sk-${key}`;
@@ -346,8 +426,11 @@ const TokensTable = () => {
     if (await copy(text)) {
       showSuccess('已复制到剪贴板！');
     } else {
-      // setSearchKeyword(text);
+      Modal.error({
-      Modal.error({ title: '无法复制到剪贴板，请手动复制', content: text });
+        title: '无法复制到剪贴板，请手动复制',
+        content: text,
+        size: 'large',
+      });
     }
   };
 
@@ -367,7 +450,8 @@ const TokensTable = () => {
     let defaultUrl;
 
     if (chatLink) {
-      defaultUrl = chatLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+      defaultUrl =
+        chatLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
     }
     let url;
     switch (type) {
@@ -378,7 +462,8 @@ const TokensTable = () => {
         url = `opencat://team/join?domain=${encodedServerAddress}&token=sk-${key}`;
         break;
       case 'next-mj':
-        url = mjLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+        url =
+          mjLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
         break;
       default:
         if (!chatLink) {
@@ -399,10 +484,10 @@ const TokensTable = () => {
       });
   }, [pageSize]);
 
-  const removeRecord = key => {
+  const removeRecord = (key) => {
     let newDataSource = [...tokens];
     if (key != null) {
-      let idx = newDataSource.findIndex(data => data.key === key);
+      let idx = newDataSource.findIndex((data) => data.key === key);
 
       if (idx > -1) {
         newDataSource.splice(idx, 1);
@@ -435,7 +520,6 @@ const TokensTable = () => {
       let newTokens = [...tokens];
       // let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
       if (action === 'delete') {
-
       } else {
         record.status = token.status;
         // newTokens[realIdx].status = token.status;
@@ -455,7 +539,9 @@ const TokensTable = () => {
       return;
     }
     setSearching(true);
-    const res = await API.get(`/api/token/search?keyword=${searchKeyword}&token=${searchToken}`);
+    const res = await API.get(
+      `/api/token/search?keyword=${searchKeyword}&token=${searchToken}`,
+    );
     const { success, message, data } = res.data;
     if (success) {
       setTokensFormat(data);
@@ -488,32 +574,28 @@ const TokensTable = () => {
     setLoading(false);
   };
 
-
+  const handlePageChange = (page) => {
-  const handlePageChange = page => {
     setActivePage(page);
     if (page === Math.ceil(tokens.length / pageSize) + 1) {
       // In this case we have to load more data and then append them.
-      loadTokens(page - 1).then(r => {
+      loadTokens(page - 1).then((r) => {});
-      });
     }
   };
 
   const rowSelection = {
-    onSelect: (record, selected) => {
+    onSelect: (record, selected) => {},
-    },
+    onSelectAll: (selected, selectedRows) => {},
-    onSelectAll: (selected, selectedRows) => {
-    },
     onChange: (selectedRowKeys, selectedRows) => {
       setSelectedKeys(selectedRows);
-    }
+    },
   };
 
   const handleRow = (record, index) => {
     if (record.status !== 1) {
       return {
         style: {
-          background: 'var(--semi-color-disabled-border)'
+          background: 'var(--semi-color-disabled-border)',
-        }
+        },
       };
     } else {
       return {};
@@ -522,63 +604,98 @@ const TokensTable = () => {
 
   return (
     <>
-      <EditToken refresh={refresh} editingToken={editingToken} visiable={showEdit} handleClose={closeEdit}></EditToken>
+      <EditToken
-      <Form layout="horizontal" style={{ marginTop: 10 }} labelPosition={'left'}>
+        refresh={refresh}
+        editingToken={editingToken}
+        visiable={showEdit}
+        handleClose={closeEdit}
+      ></EditToken>
+      <Form
+        layout='horizontal'
+        style={{ marginTop: 10 }}
+        labelPosition={'left'}
+      >
         <Form.Input
-          field="keyword"
+          field='keyword'
-          label="搜索关键字"
+          label='搜索关键字'
-          placeholder="令牌名称"
+          placeholder='令牌名称'
           value={searchKeyword}
           loading={searching}
           onChange={handleKeywordChange}
         />
         <Form.Input
-          field="token"
+          field='token'
-          label="Key"
+          label='Key'
-          placeholder="密钥"
+          placeholder='密钥'
           value={searchToken}
           loading={searching}
           onChange={handleSearchTokenChange}
         />
-        <Button label="查询" type="primary" htmlType="submit" className="btn-margin-right"
+        <Button
-                onClick={searchTokens} style={{ marginRight: 8 }}>查询</Button>
+          label='查询'
+          type='primary'
+          htmlType='submit'
+          className='btn-margin-right'
+          onClick={searchTokens}
+          style={{ marginRight: 8 }}
+        >
+          查询
+        </Button>
       </Form>
 
-      <Table style={{ marginTop: 20 }} columns={columns} dataSource={pageData} pagination={{
+      <Table
-        currentPage: activePage,
+        style={{ marginTop: 20 }}
-        pageSize: pageSize,
+        columns={columns}
-        total: tokenCount,
+        dataSource={pageData}
-        showSizeChanger: true,
+        pagination={{
-        pageSizeOptions: [10, 20, 50, 100],
+          currentPage: activePage,
-        formatPageText: (page) => `第 ${page.currentStart} - ${page.currentEnd} 条，共 ${tokens.length} 条`,
+          pageSize: pageSize,
-        onPageSizeChange: (size) => {
+          total: tokenCount,
-          setPageSize(size);
+          showSizeChanger: true,
-          setActivePage(1);
+          pageSizeOptions: [10, 20, 50, 100],
-        },
+          formatPageText: (page) =>
-        onPageChange: handlePageChange
+            `第 ${page.currentStart} - ${page.currentEnd} 条，共 ${tokens.length} 条`,
-      }} loading={loading} rowSelection={rowSelection} onRow={handleRow}>
+          onPageSizeChange: (size) => {
-      </Table>
+            setPageSize(size);
-      <Button theme="light" type="primary" style={{ marginRight: 8 }} onClick={
+            setActivePage(1);
-        () => {
+          },
+          onPageChange: handlePageChange,
+        }}
+        loading={loading}
+        rowSelection={rowSelection}
+        onRow={handleRow}
+      ></Table>
+      <Button
+        theme='light'
+        type='primary'
+        style={{ marginRight: 8 }}
+        onClick={() => {
           setEditingToken({
-            id: undefined
+            id: undefined,
           });
           setShowEdit(true);
-        }
+        }}
-      }>添加令牌</Button>
+      >
-      <Button label="复制所选令牌" type="warning" onClick={
+        添加令牌
-        async () => {
+      </Button>
+      <Button
+        label='复制所选令牌'
+        type='warning'
+        onClick={async () => {
           if (selectedKeys.length === 0) {
             showError('请至少选择一个令牌！');
             return;
           }
           let keys = '';
           for (let i = 0; i < selectedKeys.length; i++) {
-            keys += selectedKeys[i].name + '    sk-' + selectedKeys[i].key + '\n';
+            keys +=
+              selectedKeys[i].name + '    sk-' + selectedKeys[i].key + '\n';
           }
           await copyText(keys);
-        }
+        }}
-      }>复制所选令牌到剪贴板</Button>
+      >
+        复制所选令牌到剪贴板
+      </Button>
     </>
   );
 };

web/src/components/UsersTable.js

@@ -1,6 +1,14 @@
 import React, { useEffect, useState } from 'react';
 import { API, showError, showSuccess } from '../helpers';
-import { Button, Form, Popconfirm, Space, Table, Tag, Tooltip } from '@douyinfe/semi-ui';
+import {
+  Button,
+  Form,
+  Popconfirm,
+  Space,
+  Table,
+  Tag,
+  Tooltip,
+} from '@douyinfe/semi-ui';
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderGroup, renderNumber, renderQuota } from '../helpers/render';
 import AddUser from '../pages/User/AddUser';
@@ -9,124 +17,218 @@ import EditUser from '../pages/User/EditUser';
 function renderRole(role) {
   switch (role) {
     case 1:
-      return <Tag size="large">普通用户</Tag>;
+      return <Tag size='large'>普通用户</Tag>;
     case 10:
-      return <Tag color="yellow" size="large">管理员</Tag>;
+      return (
+        <Tag color='yellow' size='large'>
+          管理员
+        </Tag>
+      );
     case 100:
-      return <Tag color="orange" size="large">超级管理员</Tag>;
+      return (
+        <Tag color='orange' size='large'>
+          超级管理员
+        </Tag>
+      );
     default:
-      return <Tag color="red" size="large">未知身份</Tag>;
+      return (
+        <Tag color='red' size='large'>
+          未知身份
+        </Tag>
+      );
   }
 }
 
 const UsersTable = () => {
-  const columns = [{
+  const columns = [
-    title: 'ID', dataIndex: 'id'
+    {
-  }, {
+      title: 'ID',
-    title: '用户名', dataIndex: 'username'
+      dataIndex: 'id',
-  }, {
+    },
-    title: '分组', dataIndex: 'group', render: (text, record, index) => {
+    {
-      return (<div>
+      title: '用户名',
-        {renderGroup(text)}
+      dataIndex: 'username',
-      </div>);
+    },
-    }
+    {
-  }, {
+      title: '分组',
-    title: '统计信息', dataIndex: 'info', render: (text, record, index) => {
+      dataIndex: 'group',
-      return (<div>
+      render: (text, record, index) => {
-        <Space spacing={1}>
+        return <div>{renderGroup(text)}</div>;
-          <Tooltip content={'剩余额度'}>
+      },
-            <Tag color="white" size="large">{renderQuota(record.quota)}</Tag>
+    },
-          </Tooltip>
+    {
-          <Tooltip content={'已用额度'}>
+      title: '统计信息',
-            <Tag color="white" size="large">{renderQuota(record.used_quota)}</Tag>
+      dataIndex: 'info',
-          </Tooltip>
+      render: (text, record, index) => {
-          <Tooltip content={'调用次数'}>
+        return (
-            <Tag color="white" size="large">{renderNumber(record.request_count)}</Tag>
+          <div>
-          </Tooltip>
+            <Space spacing={1}>
-        </Space>
+              <Tooltip content={'剩余额度'}>
-      </div>);
+                <Tag color='white' size='large'>
-    }
+                  {renderQuota(record.quota)}
-  }, {
+                </Tag>
-    title: '邀请信息', dataIndex: 'invite', render: (text, record, index) => {
+              </Tooltip>
-      return (<div>
+              <Tooltip content={'已用额度'}>
-        <Space spacing={1}>
+                <Tag color='white' size='large'>
-          <Tooltip content={'邀请人数'}>
+                  {renderQuota(record.used_quota)}
-            <Tag color="white" size="large">{renderNumber(record.aff_count)}</Tag>
+                </Tag>
-          </Tooltip>
+              </Tooltip>
-          <Tooltip content={'邀请总收益'}>
+              <Tooltip content={'调用次数'}>
-            <Tag color="white" size="large">{renderQuota(record.aff_history_quota)}</Tag>
+                <Tag color='white' size='large'>
-          </Tooltip>
+                  {renderNumber(record.request_count)}
-          <Tooltip content={'邀请人ID'}>
+                </Tag>
-            {record.inviter_id === 0 ? <Tag color="white" size="large">无</Tag> :
+              </Tooltip>
-              <Tag color="white" size="large">{record.inviter_id}</Tag>}
+            </Space>
-          </Tooltip>
+          </div>
-        </Space>
+        );
-      </div>);
+      },
-    }
+    },
-  }, {
+    {
-    title: '角色', dataIndex: 'role', render: (text, record, index) => {
+      title: '邀请信息',
-      return (<div>
+      dataIndex: 'invite',
-        {renderRole(text)}
+      render: (text, record, index) => {
-      </div>);
+        return (
-    }
+          <div>
-  }, {
+            <Space spacing={1}>
-    title: '状态', dataIndex: 'status', render: (text, record, index) => {
+              <Tooltip content={'邀请人数'}>
-      return (<div>
+                <Tag color='white' size='large'>
-        {record.DeletedAt !== null ? <Tag color="red">已注销</Tag> : renderStatus(text)}
+                  {renderNumber(record.aff_count)}
-      </div>);
+                </Tag>
-    }
+              </Tooltip>
-  }, {
+              <Tooltip content={'邀请总收益'}>
-    title: '', dataIndex: 'operate', render: (text, record, index) => (<div>
+                <Tag color='white' size='large'>
-      {
+                  {renderQuota(record.aff_history_quota)}
-        record.DeletedAt !== null ? <></> :
+                </Tag>
-          <>
+              </Tooltip>
-            <Popconfirm
+              <Tooltip content={'邀请人ID'}>
-              title="确定？"
+                {record.inviter_id === 0 ? (
-              okType={'warning'}
+                  <Tag color='white' size='large'>
-              onConfirm={() => {
+                    无
-                manageUser(record.username, 'promote', record);
+                  </Tag>
-              }}
+                ) : (
-            >
+                  <Tag color='white' size='large'>
-              <Button theme="light" type="warning" style={{ marginRight: 1 }}>提升</Button>
+                    {record.inviter_id}
-            </Popconfirm>
+                  </Tag>
-            <Popconfirm
+                )}
-              title="确定？"
+              </Tooltip>
-              okType={'warning'}
+            </Space>
-              onConfirm={() => {
+          </div>
-                manageUser(record.username, 'demote', record);
+        );
-              }}
+      },
-            >
+    },
-              <Button theme="light" type="secondary" style={{ marginRight: 1 }}>降级</Button>
+    {
-            </Popconfirm>
+      title: '角色',
-            {record.status === 1 ?
+      dataIndex: 'role',
-              <Button theme="light" type="warning" style={{ marginRight: 1 }} onClick={async () => {
+      render: (text, record, index) => {
-                manageUser(record.username, 'disable', record);
+        return <div>{renderRole(text)}</div>;
-              }}>禁用</Button> :
+      },
-              <Button theme="light" type="secondary" style={{ marginRight: 1 }} onClick={async () => {
+    },
-                manageUser(record.username, 'enable', record);
+    {
-              }} disabled={record.status === 3}>启用</Button>}
+      title: '状态',
-            <Button theme="light" type="tertiary" style={{ marginRight: 1 }} onClick={() => {
+      dataIndex: 'status',
-              setEditingUser(record);
+      render: (text, record, index) => {
-              setShowEditUser(true);
+        return (
-            }}>编辑</Button>
+          <div>
-          </>
+            {record.DeletedAt !== null ? (
-
+              <Tag color='red'>已注销</Tag>
-      }
+            ) : (
-      <Popconfirm
+              renderStatus(text)
-        title="确定是否要删除此用户？"
+            )}
-        content="硬删除，此修改将不可逆"
+          </div>
-        okType={'danger'}
+        );
-        position={'left'}
+      },
-        onConfirm={() => {
+    },
-          manageUser(record.username, 'delete', record).then(() => {
+    {
-            removeRecord(record.id);
+      title: '',
-          });
+      dataIndex: 'operate',
-        }}
+      render: (text, record, index) => (
-      >
+        <div>
-        <Button theme="light" type="danger" style={{ marginRight: 1 }}>删除</Button>
+          {record.DeletedAt !== null ? (
-      </Popconfirm>
+            <></>
-    </div>)
+          ) : (
-  }];
+            <>
+              <Popconfirm
+                title='确定？'
+                okType={'warning'}
+                onConfirm={() => {
+                  manageUser(record.username, 'promote', record);
+                }}
+              >
+                <Button theme='light' type='warning' style={{ marginRight: 1 }}>
+                  提升
+                </Button>
+              </Popconfirm>
+              <Popconfirm
+                title='确定？'
+                okType={'warning'}
+                onConfirm={() => {
+                  manageUser(record.username, 'demote', record);
+                }}
+              >
+                <Button
+                  theme='light'
+                  type='secondary'
+                  style={{ marginRight: 1 }}
+                >
+                  降级
+                </Button>
+              </Popconfirm>
+              {record.status === 1 ? (
+                <Button
+                  theme='light'
+                  type='warning'
+                  style={{ marginRight: 1 }}
+                  onClick={async () => {
+                    manageUser(record.username, 'disable', record);
+                  }}
+                >
+                  禁用
+                </Button>
+              ) : (
+                <Button
+                  theme='light'
+                  type='secondary'
+                  style={{ marginRight: 1 }}
+                  onClick={async () => {
+                    manageUser(record.username, 'enable', record);
+                  }}
+                  disabled={record.status === 3}
+                >
+                  启用
+                </Button>
+              )}
+              <Button
+                theme='light'
+                type='tertiary'
+                style={{ marginRight: 1 }}
+                onClick={() => {
+                  setEditingUser(record);
+                  setShowEditUser(true);
+                }}
+              >
+                编辑
+              </Button>
+            </>
+          )}
+          <Popconfirm
+            title='确定是否要删除此用户？'
+            content='硬删除，此修改将不可逆'
+            okType={'danger'}
+            position={'left'}
+            onConfirm={() => {
+              manageUser(record.username, 'delete', record).then(() => {
+                removeRecord(record.id);
+              });
+            }}
+          >
+            <Button theme='light' type='danger' style={{ marginRight: 1 }}>
+              删除
+            </Button>
+          </Popconfirm>
+        </div>
+      ),
+    },
+  ];
 
   const [users, setUsers] = useState([]);
   const [loading, setLoading] = useState(true);
@@ -137,22 +239,22 @@ const UsersTable = () => {
   const [showAddUser, setShowAddUser] = useState(false);
   const [showEditUser, setShowEditUser] = useState(false);
   const [editingUser, setEditingUser] = useState({
-    id: undefined
+    id: undefined,
   });
 
   const setCount = (data) => {
-    if (data.length >= (activePage) * ITEMS_PER_PAGE) {
+    if (data.length >= activePage * ITEMS_PER_PAGE) {
       setUserCount(data.length + 1);
     } else {
       setUserCount(data.length);
     }
   };
 
-  const removeRecord = key => {
+  const removeRecord = (key) => {
     console.log(key);
     let newDataSource = [...users];
     if (key != null) {
-      let idx = newDataSource.findIndex(data => data.id === key);
+      let idx = newDataSource.findIndex((data) => data.id === key);
 
       if (idx > -1) {
         newDataSource.splice(idx, 1);
@@ -200,7 +302,8 @@ const UsersTable = () => {
 
   const manageUser = async (username, action, record) => {
     const res = await API.post('/api/user/manage', {
-      username, action
+      username,
+      action,
     });
     const { success, message } = res.data;
     if (success) {
@@ -208,7 +311,6 @@ const UsersTable = () => {
       let user = res.data.data;
       let newUsers = [...users];
       if (action === 'delete') {
-
       } else {
         record.status = user.status;
         record.role = user.role;
@@ -222,15 +324,19 @@ const UsersTable = () => {
   const renderStatus = (status) => {
     switch (status) {
       case 1:
-        return <Tag size="large">已激活</Tag>;
+        return <Tag size='large'>已激活</Tag>;
       case 2:
-        return (<Tag size="large" color="red">
+        return (
-          已封禁
+          <Tag size='large' color='red'>
-        </Tag>);
+            已封禁
+          </Tag>
+        );
       default:
-        return (<Tag size="large" color="grey">
+        return (
-          未知状态
+          <Tag size='large' color='grey'>
-        </Tag>);
+            未知状态
+          </Tag>
+        );
     }
   };
 
@@ -271,16 +377,18 @@ const UsersTable = () => {
     setLoading(false);
   };
 
-  const handlePageChange = page => {
+  const handlePageChange = (page) => {
     setActivePage(page);
     if (page === Math.ceil(users.length / ITEMS_PER_PAGE) + 1) {
       // In this case we have to load more data and then append them.
-      loadUsers(page - 1).then(r => {
+      loadUsers(page - 1).then((r) => {});
-      });
     }
   };
 
-  const pageData = users.slice((activePage - 1) * ITEMS_PER_PAGE, activePage * ITEMS_PER_PAGE);
+  const pageData = users.slice(
+    (activePage - 1) * ITEMS_PER_PAGE,
+    activePage * ITEMS_PER_PAGE,
+  );
 
   const closeAddUser = () => {
     setShowAddUser(false);
@@ -289,7 +397,7 @@ const UsersTable = () => {
   const closeEditUser = () => {
     setShowEditUser(false);
     setEditingUser({
-      id: undefined
+      id: undefined,
     });
   };
 
@@ -303,34 +411,52 @@ const UsersTable = () => {
 
   return (
     <>
-      <AddUser refresh={refresh} visible={showAddUser} handleClose={closeAddUser}></AddUser>
+      <AddUser
-      <EditUser refresh={refresh} visible={showEditUser} handleClose={closeEditUser}
+        refresh={refresh}
-                editingUser={editingUser}></EditUser>
+        visible={showAddUser}
+        handleClose={closeAddUser}
+      ></AddUser>
+      <EditUser
+        refresh={refresh}
+        visible={showEditUser}
+        handleClose={closeEditUser}
+        editingUser={editingUser}
+      ></EditUser>
       <Form onSubmit={searchUsers}>
         <Form.Input
-          label="搜索关键字"
+          label='搜索关键字'
-          icon="search"
+          icon='search'
-          field="keyword"
+          field='keyword'
-          iconPosition="left"
+          iconPosition='left'
-          placeholder="搜索用户的 ID，用户名，显示名称，以及邮箱地址 ..."
+          placeholder='搜索用户的 ID，用户名，显示名称，以及邮箱地址 ...'
           value={searchKeyword}
           loading={searching}
-          onChange={value => handleKeywordChange(value)}
+          onChange={(value) => handleKeywordChange(value)}
         />
       </Form>
 
-      <Table columns={columns} dataSource={pageData} pagination={{
+      <Table
-        currentPage: activePage,
+        columns={columns}
-        pageSize: ITEMS_PER_PAGE,
+        dataSource={pageData}
-        total: userCount,
+        pagination={{
-        pageSizeOpts: [10, 20, 50, 100],
+          currentPage: activePage,
-        onPageChange: handlePageChange
+          pageSize: ITEMS_PER_PAGE,
-      }} loading={loading} />
+          total: userCount,
-      <Button theme="light" type="primary" style={{ marginRight: 8 }} onClick={
+          pageSizeOpts: [10, 20, 50, 100],
-        () => {
+          onPageChange: handlePageChange,
+        }}
+        loading={loading}
+      />
+      <Button
+        theme='light'
+        type='primary'
+        style={{ marginRight: 8 }}
+        onClick={() => {
           setShowAddUser(true);
-        }
+        }}
-      }>添加用户</Button>
+      >
+        添加用户
+      </Button>
     </>
   );
 };

web/src/components/WeChatIcon.js

@@ -3,15 +3,27 @@ import { Icon } from '@douyinfe/semi-ui';
 
 const WeChatIcon = () => {
   function CustomIcon() {
-    return <svg t="1709714447384" className="icon" viewBox="0 0 1024 1024" version="1.1"
+    return (
-                xmlns="http://www.w3.org/2000/svg" p-id="5091" width="16" height="16">
+      <svg
-      <path
+        t='1709714447384'
-        d="M690.1 377.4c5.9 0 11.8 0.2 17.6 0.5-24.4-128.7-158.3-227.1-319.9-227.1C209 150.8 64 271.4 64 420.2c0 81.1 43.6 154.2 111.9 203.6 5.5 3.9 9.1 10.3 9.1 17.6 0 2.4-0.5 4.6-1.1 6.9-5.5 20.3-14.2 52.8-14.6 54.3-0.7 2.6-1.7 5.2-1.7 7.9 0 5.9 4.8 10.8 10.8 10.8 2.3 0 4.2-0.9 6.2-2l70.9-40.9c5.3-3.1 11-5 17.2-5 3.2 0 6.4 0.5 9.5 1.4 33.1 9.5 68.8 14.8 105.7 14.8 6 0 11.9-0.1 17.8-0.4-7.1-21-10.9-43.1-10.9-66 0-135.8 132.2-245.8 295.3-245.8z m-194.3-86.5c23.8 0 43.2 19.3 43.2 43.1s-19.3 43.1-43.2 43.1c-23.8 0-43.2-19.3-43.2-43.1s19.4-43.1 43.2-43.1z m-215.9 86.2c-23.8 0-43.2-19.3-43.2-43.1s19.3-43.1 43.2-43.1 43.2 19.3 43.2 43.1-19.4 43.1-43.2 43.1z"
+        className='icon'
-        p-id="5092"></path>
+        viewBox='0 0 1024 1024'
-      <path
+        version='1.1'
-        d="M866.7 792.7c56.9-41.2 93.2-102 93.2-169.7 0-124-120.8-224.5-269.9-224.5-149 0-269.9 100.5-269.9 224.5S540.9 847.5 690 847.5c30.8 0 60.6-4.4 88.1-12.3 2.6-0.8 5.2-1.2 7.9-1.2 5.2 0 9.9 1.6 14.3 4.1l59.1 34c1.7 1 3.3 1.7 5.2 1.7 2.4 0 4.7-0.9 6.4-2.6 1.7-1.7 2.6-4 2.6-6.4 0-2.2-0.9-4.4-1.4-6.6-0.3-1.2-7.6-28.3-12.2-45.3-0.5-1.9-0.9-3.8-0.9-5.7 0.1-5.9 3.1-11.2 7.6-14.5zM600.2 587.2c-19.9 0-36-16.1-36-35.9 0-19.8 16.1-35.9 36-35.9s36 16.1 36 35.9c0 19.8-16.2 35.9-36 35.9z m179.9 0c-19.9 0-36-16.1-36-35.9 0-19.8 16.1-35.9 36-35.9s36 16.1 36 35.9c-0.1 19.8-16.2 35.9-36 35.9z"
+        xmlns='http://www.w3.org/2000/svg'
-        p-id="5093"></path>
+        p-id='5091'
-    </svg>;
+        width='16'
+        height='16'
+      >
+        <path
+          d='M690.1 377.4c5.9 0 11.8 0.2 17.6 0.5-24.4-128.7-158.3-227.1-319.9-227.1C209 150.8 64 271.4 64 420.2c0 81.1 43.6 154.2 111.9 203.6 5.5 3.9 9.1 10.3 9.1 17.6 0 2.4-0.5 4.6-1.1 6.9-5.5 20.3-14.2 52.8-14.6 54.3-0.7 2.6-1.7 5.2-1.7 7.9 0 5.9 4.8 10.8 10.8 10.8 2.3 0 4.2-0.9 6.2-2l70.9-40.9c5.3-3.1 11-5 17.2-5 3.2 0 6.4 0.5 9.5 1.4 33.1 9.5 68.8 14.8 105.7 14.8 6 0 11.9-0.1 17.8-0.4-7.1-21-10.9-43.1-10.9-66 0-135.8 132.2-245.8 295.3-245.8z m-194.3-86.5c23.8 0 43.2 19.3 43.2 43.1s-19.3 43.1-43.2 43.1c-23.8 0-43.2-19.3-43.2-43.1s19.4-43.1 43.2-43.1z m-215.9 86.2c-23.8 0-43.2-19.3-43.2-43.1s19.3-43.1 43.2-43.1 43.2 19.3 43.2 43.1-19.4 43.1-43.2 43.1z'
+          p-id='5092'
+        ></path>
+        <path
+          d='M866.7 792.7c56.9-41.2 93.2-102 93.2-169.7 0-124-120.8-224.5-269.9-224.5-149 0-269.9 100.5-269.9 224.5S540.9 847.5 690 847.5c30.8 0 60.6-4.4 88.1-12.3 2.6-0.8 5.2-1.2 7.9-1.2 5.2 0 9.9 1.6 14.3 4.1l59.1 34c1.7 1 3.3 1.7 5.2 1.7 2.4 0 4.7-0.9 6.4-2.6 1.7-1.7 2.6-4 2.6-6.4 0-2.2-0.9-4.4-1.4-6.6-0.3-1.2-7.6-28.3-12.2-45.3-0.5-1.9-0.9-3.8-0.9-5.7 0.1-5.9 3.1-11.2 7.6-14.5zM600.2 587.2c-19.9 0-36-16.1-36-35.9 0-19.8 16.1-35.9 36-35.9s36 16.1 36 35.9c0 19.8-16.2 35.9-36 35.9z m179.9 0c-19.9 0-36-16.1-36-35.9 0-19.8 16.1-35.9 36-35.9s36 16.1 36 35.9c-0.1 19.8-16.2 35.9-36 35.9z'
+          p-id='5093'
+        ></path>
+      </svg>
+    );
   }
 
   return (

web/src/components/utils.js

@@ -15,6 +15,6 @@ export async function onGitHubOAuthClicked(github_client_id) {
   const state = await getOAuthState();
   if (!state) return;
   window.open(
-    `https://github.com/login/oauth/authorize?client_id=${github_client_id}&state=${state}&scope=user:email`
+    `https://github.com/login/oauth/authorize?client_id=${github_client_id}&state=${state}&scope=user:email`,
   );
-}
+}

web/src/constants/channel.constants.js

@@ -1,21 +1,100 @@
 export const CHANNEL_OPTIONS = [
-    {key: 1, text: 'OpenAI', value: 1, color: 'green', label: 'OpenAI'},
+  { key: 1, text: 'OpenAI', value: 1, color: 'green', label: 'OpenAI' },
-    {key: 2, text: 'Midjourney Proxy', value: 2, color: 'light-blue', label: 'Midjourney Proxy'},
+  {
-    {key: 5, text: 'Midjourney Proxy Plus', value: 5, color: 'blue', label: 'Midjourney Proxy Plus'},
+    key: 2,
-    {key: 4, text: 'Ollama', value: 4, color: 'grey', label: 'Ollama'},
+    text: 'Midjourney Proxy',
-    {key: 14, text: 'Anthropic Claude', value: 14, color: 'indigo', label: 'Anthropic Claude'},
+    value: 2,
-    {key: 3, text: 'Azure OpenAI', value: 3, color: 'teal', label: 'Azure OpenAI'},
+    color: 'light-blue',
-    {key: 11, text: 'Google PaLM2', value: 11, color: 'orange', label: 'Google PaLM2'},
+    label: 'Midjourney Proxy',
-    {key: 24, text: 'Google Gemini', value: 24, color: 'orange', label: 'Google Gemini'},
+  },
-    {key: 15, text: '百度文心千帆', value: 15, color: 'blue', label: '百度文心千帆'},
+  {
-    {key: 17, text: '阿里通义千问', value: 17, color: 'orange', label: '阿里通义千问'},
+    key: 5,
-    {key: 18, text: '讯飞星火认知', value: 18, color: 'blue', label: '讯飞星火认知'},
+    text: 'Midjourney Proxy Plus',
-    {key: 16, text: '智谱 ChatGLM', value: 16, color: 'violet', label: '智谱 ChatGLM'},
+    value: 5,
-    {key: 16, text: '智谱 GLM-4V', value: 26, color: 'purple', label: '智谱 GLM-4V'},
+    color: 'blue',
-    {key: 16, text: 'Moonshot', value: 25, color: 'green', label: 'Moonshot'},
+    label: 'Midjourney Proxy Plus',
-    {key: 19, text: '360 智脑', value: 19, color: 'blue', label: '360 智脑'},
+  },
-    {key: 23, text: '腾讯混元', value: 23, color: 'teal', label: '腾讯混元'},
+  { key: 4, text: 'Ollama', value: 4, color: 'grey', label: 'Ollama' },
-    {key: 8, text: '自定义渠道', value: 8, color: 'pink', label: '自定义渠道'},
+  {
-    {key: 22, text: '知识库：FastGPT', value: 22, color: 'blue', label: '知识库：FastGPT'},
+    key: 14,
-    {key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple', label: '知识库：AI Proxy'},
+    text: 'Anthropic Claude',
+    value: 14,
+    color: 'indigo',
+    label: 'Anthropic Claude',
+  },
+  {
+    key: 3,
+    text: 'Azure OpenAI',
+    value: 3,
+    color: 'teal',
+    label: 'Azure OpenAI',
+  },
+  {
+    key: 11,
+    text: 'Google PaLM2',
+    value: 11,
+    color: 'orange',
+    label: 'Google PaLM2',
+  },
+  {
+    key: 24,
+    text: 'Google Gemini',
+    value: 24,
+    color: 'orange',
+    label: 'Google Gemini',
+  },
+  {
+    key: 15,
+    text: '百度文心千帆',
+    value: 15,
+    color: 'blue',
+    label: '百度文心千帆',
+  },
+  {
+    key: 17,
+    text: '阿里通义千问',
+    value: 17,
+    color: 'orange',
+    label: '阿里通义千问',
+  },
+  {
+    key: 18,
+    text: '讯飞星火认知',
+    value: 18,
+    color: 'blue',
+    label: '讯飞星火认知',
+  },
+  {
+    key: 16,
+    text: '智谱 ChatGLM',
+    value: 16,
+    color: 'violet',
+    label: '智谱 ChatGLM',
+  },
+  {
+    key: 16,
+    text: '智谱 GLM-4V',
+    value: 26,
+    color: 'purple',
+    label: '智谱 GLM-4V',
+  },
+  { key: 16, text: 'Moonshot', value: 25, color: 'green', label: 'Moonshot' },
+  { key: 19, text: '360 智脑', value: 19, color: 'blue', label: '360 智脑' },
+  { key: 23, text: '腾讯混元', value: 23, color: 'teal', label: '腾讯混元' },
+  { key: 31, text: '零一万物', value: 31, color: 'green', label: '零一万物' },
+  { key: 8, text: '自定义渠道', value: 8, color: 'pink', label: '自定义渠道' },
+  {
+    key: 22,
+    text: '知识库：FastGPT',
+    value: 22,
+    color: 'blue',
+    label: '知识库：FastGPT',
+  },
+  {
+    key: 21,
+    text: '知识库：AI Proxy',
+    value: 21,
+    color: 'purple',
+    label: '知识库：AI Proxy',
+  },
 ];

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_REQUEST: 'USERS_REGISTER_REQUEST',
-    REGISTER_SUCCESS: 'USERS_REGISTER_SUCCESS',
+  REGISTER_SUCCESS: 'USERS_REGISTER_SUCCESS',
-    REGISTER_FAILURE: 'USERS_REGISTER_FAILURE',
+  REGISTER_FAILURE: 'USERS_REGISTER_FAILURE',
 
-    LOGIN_REQUEST: 'USERS_LOGIN_REQUEST',
+  LOGIN_REQUEST: 'USERS_LOGIN_REQUEST',
-    LOGIN_SUCCESS: 'USERS_LOGIN_SUCCESS',
+  LOGIN_SUCCESS: 'USERS_LOGIN_SUCCESS',
-    LOGIN_FAILURE: 'USERS_LOGIN_FAILURE',
+  LOGIN_FAILURE: 'USERS_LOGIN_FAILURE',
-    
-    LOGOUT: 'USERS_LOGOUT',
 
-    GETALL_REQUEST: 'USERS_GETALL_REQUEST',
+  LOGOUT: 'USERS_LOGOUT',
-    GETALL_SUCCESS: 'USERS_GETALL_SUCCESS',
-    GETALL_FAILURE: 'USERS_GETALL_FAILURE',
 
-    DELETE_REQUEST: 'USERS_DELETE_REQUEST',
+  GETALL_REQUEST: 'USERS_GETALL_REQUEST',
-    DELETE_SUCCESS: 'USERS_DELETE_SUCCESS',
+  GETALL_SUCCESS: 'USERS_GETALL_SUCCESS',
-    DELETE_FAILURE: 'USERS_DELETE_FAILURE'    
+  GETALL_FAILURE: 'USERS_GETALL_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 React from 'react';
-import { reducer, initialState } from "./reducer"
+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 ]}>
+    <UserContext.Provider value={[state, dispatch]}>
-      { children }
+      {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,
-};
+};