Merge e9d4226e7d into 7c8628bd95

.github/workflows/ci.yml

@@ -1,17 +1,19 @@
 name: CI
 
 # This setup assumes that you run the unit tests with code coverage in the same
-# workflow that will also print the coverage report as comment to the pull request.
+# workflow that will also print the coverage report as comment to the pull request. 
 # Therefore, you need to trigger this workflow when a pull request is (re)opened or
 # when new code is pushed to the branch of the pull request. In addition, you also
-# need to trigger this workflow when new code is pushed to the main branch because
+# need to trigger this workflow when new code is pushed to the main branch because 
 # we need to upload the code coverage results as artifact for the main branch as
 # well since it will be the baseline code coverage.
-#
+# 
 # We do not want to trigger the workflow for pushes to *any* branch because this
 # would trigger our jobs twice on pull requests (once from "push" event and once
 # from "pull_request->synchronize")
 on:
+  pull_request:
+    types: [opened, reopened, synchronize]
   push:
     branches:
       - 'main'
@@ -29,7 +31,7 @@ jobs:
         with:
           go-version: ^1.22
 
-      # When you execute your unit tests, make sure to use the "-coverprofile" flag to write a
+      # When you execute your unit tests, make sure to use the "-coverprofile" flag to write a 
       # coverage profile to a file. You will need the name of the file (e.g. "coverage.txt")
       # in the next step as well as the next job.
       - name: Test

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

@@ -0,0 +1,64 @@
+name: Publish Docker image (English)
+
+on:
+  push:
+    tags:
+      - 'v*.*.*'
+  workflow_dispatch:
+    inputs:
+      name:
+        description: 'reason'
+        required: false
+jobs:
+  push_to_registries:
+    name: Push Docker image to multiple registries
+    runs-on: ubuntu-latest
+    permissions:
+      packages: write
+      contents: read
+    steps:
+      - name: Check out the repo
+        uses: actions/checkout@v3
+
+      - name: Check repository URL
+        run: |
+          REPO_URL=$(git config --get remote.origin.url)
+          if [[ $REPO_URL == *"pro" ]]; then
+            exit 1
+          fi      
+
+      - name: Save version info
+        run: |
+          git describe --tags > VERSION 
+
+      - name: Translate
+        run: |
+          python ./i18n/translate.py --repository_path . --json_file_path ./i18n/en.json
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Extract metadata (tags, labels) for Docker
+        id: meta
+        uses: docker/metadata-action@v4
+        with:
+          images: |
+            justsong/one-api-en
+
+      - name: Build and push Docker images
+        uses: docker/build-push-action@v3
+        with:
+          context: .
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}

.github/workflows/docker-image.yml

@@ -55,15 +55,14 @@ jobs:
         uses: docker/metadata-action@v4
         with:
           images: |
-            ${{ contains(github.ref, 'alpha') && 'justsong/one-api-alpha' || 'justsong/one-api' }}
-            ${{ contains(github.ref, 'alpha') && format('ghcr.io/{0}-alpha', github.repository) || format('ghcr.io/{0}', github.repository) }}
+            justsong/one-api
+            ghcr.io/${{ github.repository }}
 
       - name: Build and push Docker images
         uses: docker/build-push-action@v3
         with:
           context: .
-          #          platforms: linux/amd64,linux/arm64
-          platforms: linux/amd64 # TODO disable arm64 for now, because it cause error
+          platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -9,5 +9,4 @@ logs
 data
 /web/node_modules
 cmd.md
-.env
-/one-api
+.env

Dockerfile

@@ -4,48 +4,41 @@ WORKDIR /web
 COPY ./VERSION .
 COPY ./web .
 
-RUN npm install --prefix /web/default & \
-    npm install --prefix /web/berry & \
-    npm install --prefix /web/air & \
-    wait
+WORKDIR /web/default
+RUN npm install
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
 
-RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/default/VERSION) npm run build --prefix /web/default & \
-    DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/berry/VERSION) npm run build --prefix /web/berry & \
-    DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat /web/air/VERSION) npm run build --prefix /web/air & \
-    wait
+WORKDIR /web/berry
+RUN npm install
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
 
-FROM golang AS builder2
+WORKDIR /web/air
+RUN npm install
+RUN DISABLE_ESLINT_PLUGIN='true' REACT_APP_VERSION=$(cat VERSION) npm run build
 
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential \
-    sqlite3 libsqlite3-dev \
-    && rm -rf /var/lib/apt/lists/*
+FROM golang:alpine AS builder2
+
+RUN apk add --no-cache g++
 
 ENV GO111MODULE=on \
     CGO_ENABLED=1 \
-    GOOS=linux \
-    CGO_CFLAGS="-I/usr/include" \
-    CGO_LDFLAGS="-L/usr/lib"
+    GOOS=linux
 
 WORKDIR /build
-
 ADD go.mod go.sum ./
 RUN go mod download
-
 COPY . .
 COPY --from=builder /web/build ./web/build
+RUN go build -trimpath -ldflags "-s -w -X 'github.com/songquanpeng/one-api/common.Version=$(cat VERSION)' -extldflags '-static'" -o one-api
 
-RUN go build -trimpath -ldflags "-s -w -X 'github.com/songquanpeng/one-api/common.Version=$(cat VERSION)'" -o one-api
+FROM alpine
 
-# Final runtime image
-FROM ubuntu:22.04
-
-RUN apt-get update && apt-get install -y --no-install-recommends \
-    ca-certificates tzdata bash \
-    && rm -rf /var/lib/apt/lists/*
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache ca-certificates tzdata \
+    && update-ca-certificates 2>/dev/null || true
 
 COPY --from=builder2 /build/one-api /
-
 EXPOSE 3000
 WORKDIR /data
 ENTRYPOINT ["/one-api"]

README.md

@@ -115,8 +115,8 @@ _✨ 通过标准的 OpenAI API 格式访问所有的大模型，开箱即用
 21. 支持 Cloudflare Turnstile 用户校验。
 22. 支持用户管理，支持**多种用户登录注册方式**：
     + 邮箱登录注册（支持注册邮箱白名单）以及通过邮箱进行密码重置。
-    + 支持[飞书授权登录](https://open.feishu.cn/document/uAjLw4CM/ukTMukTMukTM/reference/authen-v1/authorize/get)（[这里有 One API 的实现细节阐述供参考](https://iamazing.cn/page/feishu-oauth-login)）。
-    + 支持 [GitHub 授权登录](https://github.com/settings/applications/new)。
+    + 支持使用飞书进行授权登录。
+    + [GitHub 开放授权](https://github.com/settings/applications/new)。
     + 微信公众号授权（需要额外部署 [WeChat Server](https://github.com/songquanpeng/wechat-server)）。
 23. 支持主题切换，设置环境变量 `THEME` 即可，默认为 `default`，欢迎 PR 更多主题，具体参考[此处](./web/README.md)。
 24. 配合 [Message Pusher](https://github.com/songquanpeng/message-pusher) 可将报警信息推送到多种 App 上。
@@ -175,10 +175,6 @@ sudo service nginx restart
 
 初始账号用户名为 `root`，密码为 `123456`。
 
-### 通过宝塔面板进行一键部署
-1. 安装宝塔面板9.2.0及以上版本，前往 [宝塔面板](https://www.bt.cn/new/download.html?r=dk_oneapi) 官网，选择正式版的脚本下载安装；
-2. 安装后登录宝塔面板，在左侧菜单栏中点击 `Docker`，首次进入会提示安装 `Docker` 服务，点击立即安装，按提示完成安装；
-3. 安装完成后在应用商店中搜索 `One-API`，点击安装，配置域名等基本信息即可完成安装；
 
 ### 基于 Docker Compose 进行部署
 
@@ -222,7 +218,7 @@ docker-compose ps
 3. 所有从服务器必须设置 `NODE_TYPE` 为 `slave`，不设置则默认为主服务器。
 4. 设置 `SYNC_FREQUENCY` 后服务器将定期从数据库同步配置，在使用远程数据库的情况下，推荐设置该项并启用 Redis，无论主从。
 5. 从服务器可以选择设置 `FRONTEND_BASE_URL`，以重定向页面请求到主服务器。
-6. 从服务器上**分别**装好 Redis，设置好 `REDIS_CONN_STRING`，这样可以做到在缓存未过期的情况下数据库零访问，可以减少延迟（Redis 集群或者哨兵模式的支持请参考环境变量说明）。
+6. 从服务器上**分别**装好 Redis，设置好 `REDIS_CONN_STRING`，这样可以做到在缓存未过期的情况下数据库零访问，可以减少延迟。
 7. 如果主服务器访问数据库延迟也比较高，则也需要启用 Redis，并设置 `SYNC_FREQUENCY`，以定期从数据库同步配置。
 
 环境变量的具体使用方法详见[此处](#环境变量)。
@@ -351,11 +347,6 @@ graph LR
 1. `REDIS_CONN_STRING`：设置之后将使用 Redis 作为缓存使用。
    + 例子：`REDIS_CONN_STRING=redis://default:redispw@localhost:49153`
    + 如果数据库访问延迟很低，没有必要启用 Redis，启用后反而会出现数据滞后的问题。
-   + 如果需要使用哨兵或者集群模式：
-     + 则需要把该环境变量设置为节点列表，例如：`localhost:49153,localhost:49154,localhost:49155`。
-     + 除此之外还需要设置以下环境变量：
-       + `REDIS_PASSWORD`：Redis 集群或者哨兵模式下的密码设置。
-       + `REDIS_MASTER_NAME`：Redis 哨兵模式下主节点的名称。
 2. `SESSION_SECRET`：设置之后将使用固定的会话密钥，这样系统重新启动后已登录用户的 cookie 将依旧有效。
    + 例子：`SESSION_SECRET=random_string`
 3. `SQL_DSN`：设置之后将使用指定数据库而非 SQLite，请使用 MySQL 或 PostgreSQL。
@@ -410,7 +401,6 @@ graph LR
 27. `INITIAL_ROOT_TOKEN`：如果设置了该值，则在系统首次启动时会自动创建一个值为该环境变量值的 root 用户令牌。
 28. `INITIAL_ROOT_ACCESS_TOKEN`：如果设置了该值，则在系统首次启动时会自动创建一个值为该环境变量的 root 用户创建系统管理令牌。
 29. `ENFORCE_INCLUDE_USAGE`：是否强制在 stream 模型下返回 usage，默认不开启，可选值为 `true` 和 `false`。
-30. `TEST_PROMPT`：测试模型时的用户 prompt，默认为 `Print your model name exactly and do not output without any other text.`。
 
 ### 命令行参数
 1. `--port <port_number>`: 指定服务器监听的端口号，默认为 `3000`。

common/config/config.go

@@ -1,14 +1,13 @@
 package config
 
 import (
+	"github.com/songquanpeng/one-api/common/env"
 	"os"
 	"strconv"
 	"strings"
 	"sync"
 	"time"
 
-	"github.com/songquanpeng/one-api/common/env"
-
 	"github.com/google/uuid"
 )
 
@@ -163,4 +162,3 @@ var UserContentRequestProxy = env.String("USER_CONTENT_REQUEST_PROXY", "")
 var UserContentRequestTimeout = env.Int("USER_CONTENT_REQUEST_TIMEOUT", 30)
 
 var EnforceIncludeUsage = env.Bool("ENFORCE_INCLUDE_USAGE", false)
-var TestPrompt = env.String("TEST_PROMPT", "Print your model name exactly and do not output without any other text.")

common/helper/helper.go

@@ -1,8 +1,9 @@
 package helper
 
 import (
-	"context"
 	"fmt"
+	"github.com/gin-gonic/gin"
+	"github.com/songquanpeng/one-api/common/random"
 	"html/template"
 	"log"
 	"net"
@@ -10,10 +11,6 @@ import (
 	"runtime"
 	"strconv"
 	"strings"
-
-	"github.com/gin-gonic/gin"
-
-	"github.com/songquanpeng/one-api/common/random"
 )
 
 func OpenBrowser(url string) {
@@ -109,18 +106,6 @@ func GenRequestID() string {
 	return GetTimeString() + random.GetRandomNumberString(8)
 }
 
-func SetRequestID(ctx context.Context, id string) context.Context {
-	return context.WithValue(ctx, RequestIdKey, id)
-}
-
-func GetRequestID(ctx context.Context) string {
-	rawRequestId := ctx.Value(RequestIdKey)
-	if rawRequestId == nil {
-		return ""
-	}
-	return rawRequestId.(string)
-}
-
 func GetResponseID(c *gin.Context) string {
 	logID := c.GetString(RequestIdKey)
 	return fmt.Sprintf("chatcmpl-%s", logID)

common/helper/time.go

@@ -13,8 +13,3 @@ func GetTimeString() string {
 	now := time.Now()
 	return fmt.Sprintf("%s%d", now.Format("20060102150405"), now.UnixNano()%1e9)
 }
-
-// CalcElapsedTime return the elapsed time in milliseconds (ms)
-func CalcElapsedTime(start time.Time) int64 {
-	return time.Now().Sub(start).Milliseconds()
-}

common/logger/logger.go

@@ -7,25 +7,19 @@ import (
 	"log"
 	"os"
 	"path/filepath"
-	"runtime"
-	"strings"
 	"sync"
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 )
 
-type loggerLevel string
-
 const (
-	loggerDEBUG loggerLevel = "DEBUG"
-	loggerINFO  loggerLevel = "INFO"
-	loggerWarn  loggerLevel = "WARN"
-	loggerError loggerLevel = "ERROR"
-	loggerFatal loggerLevel = "FATAL"
+	loggerDEBUG = "DEBUG"
+	loggerINFO  = "INFO"
+	loggerWarn  = "WARN"
+	loggerError = "ERR"
 )
 
 var setupLogOnce sync.Once
@@ -50,26 +44,27 @@ func SetupLogger() {
 }
 
 func SysLog(s string) {
-	logHelper(nil, loggerINFO, s)
+	t := time.Now()
+	_, _ = fmt.Fprintf(gin.DefaultWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
 }
 
 func SysLogf(format string, a ...any) {
-	logHelper(nil, loggerINFO, fmt.Sprintf(format, a...))
+	SysLog(fmt.Sprintf(format, a...))
 }
 
 func SysError(s string) {
-	logHelper(nil, loggerError, s)
+	t := time.Now()
+	_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[SYS] %v | %s \n", t.Format("2006/01/02 - 15:04:05"), s)
 }
 
 func SysErrorf(format string, a ...any) {
-	logHelper(nil, loggerError, fmt.Sprintf(format, a...))
+	SysError(fmt.Sprintf(format, a...))
 }
 
 func Debug(ctx context.Context, msg string) {
-	if !config.DebugEnabled {
-		return
+	if config.DebugEnabled {
+		logHelper(ctx, loggerDEBUG, msg)
 	}
-	logHelper(ctx, loggerDEBUG, msg)
 }
 
 func Info(ctx context.Context, msg string) {
@@ -85,65 +80,37 @@ func Error(ctx context.Context, msg string) {
 }
 
 func Debugf(ctx context.Context, format string, a ...any) {
-	logHelper(ctx, loggerDEBUG, fmt.Sprintf(format, a...))
+	Debug(ctx, fmt.Sprintf(format, a...))
 }
 
 func Infof(ctx context.Context, format string, a ...any) {
-	logHelper(ctx, loggerINFO, fmt.Sprintf(format, a...))
+	Info(ctx, fmt.Sprintf(format, a...))
 }
 
 func Warnf(ctx context.Context, format string, a ...any) {
-	logHelper(ctx, loggerWarn, fmt.Sprintf(format, a...))
+	Warn(ctx, fmt.Sprintf(format, a...))
 }
 
 func Errorf(ctx context.Context, format string, a ...any) {
-	logHelper(ctx, loggerError, fmt.Sprintf(format, a...))
+	Error(ctx, fmt.Sprintf(format, a...))
 }
 
-func FatalLog(s string) {
-	logHelper(nil, loggerFatal, s)
-}
-
-func FatalLogf(format string, a ...any) {
-	logHelper(nil, loggerFatal, fmt.Sprintf(format, a...))
-}
-
-func logHelper(ctx context.Context, level loggerLevel, msg string) {
+func logHelper(ctx context.Context, level string, msg string) {
 	writer := gin.DefaultErrorWriter
 	if level == loggerINFO {
 		writer = gin.DefaultWriter
 	}
-	var requestId string
-	if ctx != nil {
-		rawRequestId := helper.GetRequestID(ctx)
-		if rawRequestId != "" {
-			requestId = fmt.Sprintf(" | %s", rawRequestId)
-		}
+	id := ctx.Value(helper.RequestIdKey)
+	if id == nil {
+		id = helper.GenRequestID()
 	}
-	lineInfo, funcName := getLineInfo()
 	now := time.Now()
-	_, _ = fmt.Fprintf(writer, "[%s] %v%s%s %s%s \n", level, now.Format("2006/01/02 - 15:04:05"), requestId, lineInfo, funcName, msg)
+	_, _ = fmt.Fprintf(writer, "[%s] %v | %s | %s \n", level, now.Format("2006/01/02 - 15:04:05"), id, msg)
 	SetupLogger()
-	if level == loggerFatal {
-		os.Exit(1)
-	}
 }
 
-func getLineInfo() (string, string) {
-	funcName := "[unknown] "
-	pc, file, line, ok := runtime.Caller(3)
-	if ok {
-		if fn := runtime.FuncForPC(pc); fn != nil {
-			parts := strings.Split(fn.Name(), ".")
-			funcName = "[" + parts[len(parts)-1] + "] "
-		}
-	} else {
-		file = "unknown"
-		line = 0
-	}
-	parts := strings.Split(file, "one-api/")
-	if len(parts) > 1 {
-		file = parts[1]
-	}
-	return fmt.Sprintf(" | %s:%d", file, line), funcName
+func FatalLog(v ...any) {
+	t := time.Now()
+	_, _ = fmt.Fprintf(gin.DefaultErrorWriter, "[FATAL] %v | %v \n", t.Format("2006/01/02 - 15:04:05"), v)
+	os.Exit(1)
 }

common/redis.go

@@ -2,15 +2,13 @@ package common
 
 import (
 	"context"
-	"os"
-	"strings"
-	"time"
-
 	"github.com/go-redis/redis/v8"
 	"github.com/songquanpeng/one-api/common/logger"
+	"os"
+	"time"
 )
 
-var RDB redis.Cmdable
+var RDB *redis.Client
 var RedisEnabled = true
 
 // InitRedisClient This function is called after init()
@@ -25,23 +23,13 @@ func InitRedisClient() (err error) {
 		logger.SysLog("SYNC_FREQUENCY not set, Redis is disabled")
 		return nil
 	}
-	redisConnString := os.Getenv("REDIS_CONN_STRING")
-	if os.Getenv("REDIS_MASTER_NAME") == "" {
-		logger.SysLog("Redis is enabled")
-		opt, err := redis.ParseURL(redisConnString)
-		if err != nil {
-			logger.FatalLog("failed to parse Redis connection string: " + err.Error())
-		}
-		RDB = redis.NewClient(opt)
-	} else {
-		// cluster mode
-		logger.SysLog("Redis cluster mode enabled")
-		RDB = redis.NewUniversalClient(&redis.UniversalOptions{
-			Addrs:      strings.Split(redisConnString, ","),
-			Password:   os.Getenv("REDIS_PASSWORD"),
-			MasterName: os.Getenv("REDIS_MASTER_NAME"),
-		})
+	logger.SysLog("Redis is enabled")
+	opt, err := redis.ParseURL(os.Getenv("REDIS_CONN_STRING"))
+	if err != nil {
+		logger.FatalLog("failed to parse Redis connection string: " + err.Error())
 	}
+	RDB = redis.NewClient(opt)
+
 	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
 	defer cancel()
 

common/render/render.go

@@ -3,10 +3,9 @@ package render
 import (
 	"encoding/json"
 	"fmt"
-	"strings"
-
 	"github.com/gin-gonic/gin"
 	"github.com/songquanpeng/one-api/common"
+	"strings"
 )
 
 func StringData(c *gin.Context, str string) {

controller/auth/github.go

@@ -5,18 +5,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
-	"strconv"
-	"time"
-
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/random"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
+	"net/http"
+	"strconv"
+	"time"
 )
 
 type GitHubOAuthResponse struct {
@@ -83,7 +81,6 @@ func getGitHubUserInfoByCode(code string) (*GitHubUser, error) {
 }
 
 func GitHubOAuth(c *gin.Context) {
-	ctx := c.Request.Context()
 	session := sessions.Default(c)
 	state := c.Query("state")
 	if state == "" || session.Get("oauth_state") == nil || state != session.Get("oauth_state").(string) {
@@ -139,7 +136,7 @@ func GitHubOAuth(c *gin.Context) {
 			user.Role = model.RoleCommonUser
 			user.Status = model.UserStatusEnabled
 
-			if err := user.Insert(ctx, 0); err != nil {
+			if err := user.Insert(0); err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,
 					"message": err.Error(),

controller/auth/lark.go

@@ -5,17 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
-	"strconv"
-	"time"
-
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
+	"net/http"
+	"strconv"
+	"time"
 )
 
 type LarkOAuthResponse struct {
@@ -42,7 +40,7 @@ func getLarkUserInfoByCode(code string) (*LarkUser, error) {
 	if err != nil {
 		return nil, err
 	}
-	req, err := http.NewRequest("POST", "https://open.feishu.cn/open-apis/authen/v2/oauth/token", bytes.NewBuffer(jsonData))
+	req, err := http.NewRequest("POST", "https://passport.feishu.cn/suite/passport/oauth/token", bytes.NewBuffer(jsonData))
 	if err != nil {
 		return nil, err
 	}
@@ -81,7 +79,6 @@ func getLarkUserInfoByCode(code string) (*LarkUser, error) {
 }
 
 func LarkOAuth(c *gin.Context) {
-	ctx := c.Request.Context()
 	session := sessions.Default(c)
 	state := c.Query("state")
 	if state == "" || session.Get("oauth_state") == nil || state != session.Get("oauth_state").(string) {
@@ -128,7 +125,7 @@ func LarkOAuth(c *gin.Context) {
 			user.Role = model.RoleCommonUser
 			user.Status = model.UserStatusEnabled
 
-			if err := user.Insert(ctx, 0); err != nil {
+			if err := user.Insert(0); err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,
 					"message": err.Error(),

controller/auth/oidc.go

@@ -5,17 +5,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
-	"strconv"
-	"time"
-
 	"github.com/gin-contrib/sessions"
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
+	"net/http"
+	"strconv"
+	"time"
 )
 
 type OidcResponse struct {
@@ -89,7 +87,6 @@ func getOidcUserInfoByCode(code string) (*OidcUser, error) {
 }
 
 func OidcAuth(c *gin.Context) {
-	ctx := c.Request.Context()
 	session := sessions.Default(c)
 	state := c.Query("state")
 	if state == "" || session.Get("oauth_state") == nil || state != session.Get("oauth_state").(string) {
@@ -145,7 +142,7 @@ func OidcAuth(c *gin.Context) {
 			} else {
 				user.DisplayName = "OIDC User"
 			}
-			err := user.Insert(ctx, 0)
+			err := user.Insert(0)
 			if err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,

controller/auth/wechat.go

@@ -4,16 +4,14 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"net/http"
-	"strconv"
-	"time"
-
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/controller"
 	"github.com/songquanpeng/one-api/model"
+	"net/http"
+	"strconv"
+	"time"
 )
 
 type wechatLoginResponse struct {
@@ -54,7 +52,6 @@ func getWeChatIdByCode(code string) (string, error) {
 }
 
 func WeChatAuth(c *gin.Context) {
-	ctx := c.Request.Context()
 	if !config.WeChatAuthEnabled {
 		c.JSON(http.StatusOK, gin.H{
 			"message": "管理员未开启通过微信登录以及注册",
@@ -90,7 +87,7 @@ func WeChatAuth(c *gin.Context) {
 			user.Role = model.RoleCommonUser
 			user.Status = model.UserStatusEnabled
 
-			if err := user.Insert(ctx, 0); err != nil {
+			if err := user.Insert(0); err != nil {
 				c.JSON(http.StatusOK, gin.H{
 					"success": false,
 					"message": err.Error(),

controller/channel-billing.go

@@ -4,17 +4,16 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"time"
-
 	"github.com/songquanpeng/one-api/common/client"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/monitor"
 	"github.com/songquanpeng/one-api/relay/channeltype"
+	"io"
+	"net/http"
+	"strconv"
+	"time"
 
 	"github.com/gin-gonic/gin"
 )
@@ -102,16 +101,6 @@ type SiliconFlowUsageResponse struct {
 	} `json:"data"`
 }
 
-type DeepSeekUsageResponse struct {
-	IsAvailable  bool `json:"is_available"`
-	BalanceInfos []struct {
-		Currency        string `json:"currency"`
-		TotalBalance    string `json:"total_balance"`
-		GrantedBalance  string `json:"granted_balance"`
-		ToppedUpBalance string `json:"topped_up_balance"`
-	} `json:"balance_infos"`
-}
-
 // GetAuthHeader get auth header
 func GetAuthHeader(token string) http.Header {
 	h := http.Header{}
@@ -248,36 +237,7 @@ func updateChannelSiliconFlowBalance(channel *model.Channel) (float64, error) {
 	if response.Code != 20000 {
 		return 0, fmt.Errorf("code: %d, message: %s", response.Code, response.Message)
 	}
-	balance, err := strconv.ParseFloat(response.Data.TotalBalance, 64)
-	if err != nil {
-		return 0, err
-	}
-	channel.UpdateBalance(balance)
-	return balance, nil
-}
-
-func updateChannelDeepSeekBalance(channel *model.Channel) (float64, error) {
-	url := "https://api.deepseek.com/user/balance"
-	body, err := GetResponseBody("GET", url, channel, GetAuthHeader(channel.Key))
-	if err != nil {
-		return 0, err
-	}
-	response := DeepSeekUsageResponse{}
-	err = json.Unmarshal(body, &response)
-	if err != nil {
-		return 0, err
-	}
-	index := -1
-	for i, balanceInfo := range response.BalanceInfos {
-		if balanceInfo.Currency == "CNY" {
-			index = i
-			break
-		}
-	}
-	if index == -1 {
-		return 0, errors.New("currency CNY not found")
-	}
-	balance, err := strconv.ParseFloat(response.BalanceInfos[index].TotalBalance, 64)
+	balance, err := strconv.ParseFloat(response.Data.Balance, 64)
 	if err != nil {
 		return 0, err
 	}
@@ -311,8 +271,6 @@ func updateChannelBalance(channel *model.Channel) (float64, error) {
 		return updateChannelAIGC2DBalance(channel)
 	case channeltype.SiliconFlow:
 		return updateChannelSiliconFlowBalance(channel)
-	case channeltype.DeepSeek:
-		return updateChannelDeepSeekBalance(channel)
 	default:
 		return 0, errors.New("尚未实现")
 	}

controller/channel-test.go

@@ -2,7 +2,6 @@ package controller
 
 import (
 	"bytes"
-	"context"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -16,17 +15,14 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/ctxkey"
-	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/message"
 	"github.com/songquanpeng/one-api/middleware"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/monitor"
-	"github.com/songquanpeng/one-api/relay"
-	"github.com/songquanpeng/one-api/relay/adaptor/openai"
+	relay "github.com/songquanpeng/one-api/relay"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 	"github.com/songquanpeng/one-api/relay/controller"
 	"github.com/songquanpeng/one-api/relay/meta"
@@ -39,34 +35,18 @@ func buildTestRequest(model string) *relaymodel.GeneralOpenAIRequest {
 		model = "gpt-3.5-turbo"
 	}
 	testRequest := &relaymodel.GeneralOpenAIRequest{
-		Model: model,
+		MaxTokens: 2,
+		Model:     model,
 	}
 	testMessage := relaymodel.Message{
 		Role:    "user",
-		Content: config.TestPrompt,
+		Content: "hi",
 	}
 	testRequest.Messages = append(testRequest.Messages, testMessage)
 	return testRequest
 }
 
-func parseTestResponse(resp string) (*openai.TextResponse, string, error) {
-	var response openai.TextResponse
-	err := json.Unmarshal([]byte(resp), &response)
-	if err != nil {
-		return nil, "", err
-	}
-	if len(response.Choices) == 0 {
-		return nil, "", errors.New("response has no choices")
-	}
-	stringContent, ok := response.Choices[0].Content.(string)
-	if !ok {
-		return nil, "", errors.New("response content is not string")
-	}
-	return &response, stringContent, nil
-}
-
-func testChannel(ctx context.Context, channel *model.Channel, request *relaymodel.GeneralOpenAIRequest) (responseMessage string, err error, openaiErr *relaymodel.Error) {
-	startTime := time.Now()
+func testChannel(channel *model.Channel, request *relaymodel.GeneralOpenAIRequest) (err error, openaiErr *relaymodel.Error) {
 	w := httptest.NewRecorder()
 	c, _ := gin.CreateTestContext(w)
 	c.Request = &http.Request{
@@ -86,7 +66,7 @@ func testChannel(ctx context.Context, channel *model.Channel, request *relaymode
 	apiType := channeltype.ToAPIType(channel.Type)
 	adaptor := relay.GetAdaptor(apiType)
 	if adaptor == nil {
-		return "", fmt.Errorf("invalid api type: %d, adaptor is nil", apiType), nil
+		return fmt.Errorf("invalid api type: %d, adaptor is nil", apiType), nil
 	}
 	adaptor.Init(meta)
 	modelName := request.Model
@@ -104,69 +84,41 @@ func testChannel(ctx context.Context, channel *model.Channel, request *relaymode
 	request.Model = modelName
 	convertedRequest, err := adaptor.ConvertRequest(c, relaymode.ChatCompletions, request)
 	if err != nil {
-		return "", err, nil
+		return err, nil
 	}
 	jsonData, err := json.Marshal(convertedRequest)
 	if err != nil {
-		return "", err, nil
+		return err, nil
 	}
-	defer func() {
-		logContent := fmt.Sprintf("渠道 %s 测试成功，响应：%s", channel.Name, responseMessage)
-		if err != nil || openaiErr != nil {
-			errorMessage := ""
-			if err != nil {
-				errorMessage = err.Error()
-			} else {
-				errorMessage = openaiErr.Message
-			}
-			logContent = fmt.Sprintf("渠道 %s 测试失败，错误：%s", channel.Name, errorMessage)
-		}
-		go model.RecordTestLog(ctx, &model.Log{
-			ChannelId:   channel.Id,
-			ModelName:   modelName,
-			Content:     logContent,
-			ElapsedTime: helper.CalcElapsedTime(startTime),
-		})
-	}()
 	logger.SysLog(string(jsonData))
 	requestBody := bytes.NewBuffer(jsonData)
 	c.Request.Body = io.NopCloser(requestBody)
 	resp, err := adaptor.DoRequest(c, meta, requestBody)
 	if err != nil {
-		return "", err, nil
+		return err, nil
 	}
 	if resp != nil && resp.StatusCode != http.StatusOK {
 		err := controller.RelayErrorHandler(resp)
-		errorMessage := err.Error.Message
-		if errorMessage != "" {
-			errorMessage = ", error message: " + errorMessage
-		}
-		return "", fmt.Errorf("http status code: %d%s", resp.StatusCode, errorMessage), &err.Error
+		return fmt.Errorf("status code %d: %s", resp.StatusCode, err.Error.Message), &err.Error
 	}
 	usage, respErr := adaptor.DoResponse(c, resp, meta)
 	if respErr != nil {
-		return "", fmt.Errorf("%s", respErr.Error.Message), &respErr.Error
+		return fmt.Errorf("%s", respErr.Error.Message), &respErr.Error
 	}
 	if usage == nil {
-		return "", errors.New("usage is nil"), nil
-	}
-	rawResponse := w.Body.String()
-	_, responseMessage, err = parseTestResponse(rawResponse)
-	if err != nil {
-		return "", err, nil
+		return errors.New("usage is nil"), nil
 	}
 	result := w.Result()
 	// print result.Body
 	respBody, err := io.ReadAll(result.Body)
 	if err != nil {
-		return "", err, nil
+		return err, nil
 	}
 	logger.SysLog(fmt.Sprintf("testing channel #%d, response: \n%s", channel.Id, string(respBody)))
-	return responseMessage, nil, nil
+	return nil, nil
 }
 
 func TestChannel(c *gin.Context) {
-	ctx := c.Request.Context()
 	id, err := strconv.Atoi(c.Param("id"))
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
@@ -183,10 +135,10 @@ func TestChannel(c *gin.Context) {
 		})
 		return
 	}
-	modelName := c.Query("model")
-	testRequest := buildTestRequest(modelName)
+	model := c.Query("model")
+	testRequest := buildTestRequest(model)
 	tik := time.Now()
-	responseMessage, err, _ := testChannel(ctx, channel, testRequest)
+	err, _ = testChannel(channel, testRequest)
 	tok := time.Now()
 	milliseconds := tok.Sub(tik).Milliseconds()
 	if err != nil {
@@ -196,18 +148,18 @@ func TestChannel(c *gin.Context) {
 	consumedTime := float64(milliseconds) / 1000.0
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
-			"success":   false,
-			"message":   err.Error(),
-			"time":      consumedTime,
-			"modelName": modelName,
+			"success": false,
+			"message": err.Error(),
+			"time":    consumedTime,
+			"model":   model,
 		})
 		return
 	}
 	c.JSON(http.StatusOK, gin.H{
-		"success":   true,
-		"message":   responseMessage,
-		"time":      consumedTime,
-		"modelName": modelName,
+		"success": true,
+		"message": "",
+		"time":    consumedTime,
+		"model":   model,
 	})
 	return
 }
@@ -215,7 +167,7 @@ func TestChannel(c *gin.Context) {
 var testAllChannelsLock sync.Mutex
 var testAllChannelsRunning bool = false
 
-func testChannels(ctx context.Context, notify bool, scope string) error {
+func testChannels(notify bool, scope string) error {
 	if config.RootUserEmail == "" {
 		config.RootUserEmail = model.GetRootUserEmail()
 	}
@@ -239,7 +191,7 @@ func testChannels(ctx context.Context, notify bool, scope string) error {
 			isChannelEnabled := channel.Status == model.ChannelStatusEnabled
 			tik := time.Now()
 			testRequest := buildTestRequest("")
-			_, err, openaiErr := testChannel(ctx, channel, testRequest)
+			err, openaiErr := testChannel(channel, testRequest)
 			tok := time.Now()
 			milliseconds := tok.Sub(tik).Milliseconds()
 			if isChannelEnabled && milliseconds > disableThreshold {
@@ -273,12 +225,11 @@ func testChannels(ctx context.Context, notify bool, scope string) error {
 }
 
 func TestChannels(c *gin.Context) {
-	ctx := c.Request.Context()
 	scope := c.Query("scope")
 	if scope == "" {
 		scope = "all"
 	}
-	err := testChannels(ctx, true, scope)
+	err := testChannels(true, scope)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
@@ -294,11 +245,10 @@ func TestChannels(c *gin.Context) {
 }
 
 func AutomaticallyTestChannels(frequency int) {
-	ctx := context.Background()
 	for {
 		time.Sleep(time.Duration(frequency) * time.Minute)
 		logger.SysLog("testing all channels")
-		_ = testChannels(ctx, false, "all")
+		_ = testChannels(false, "all")
 		logger.SysLog("channel test finished")
 	}
 }

controller/relay.go

@@ -60,7 +60,7 @@ func Relay(c *gin.Context) {
 	channelName := c.GetString(ctxkey.ChannelName)
 	group := c.GetString(ctxkey.Group)
 	originalModel := c.GetString(ctxkey.OriginalModel)
-	go processChannelRelayError(ctx, userId, channelId, channelName, *bizErr)
+	go processChannelRelayError(ctx, userId, channelId, channelName, bizErr)
 	requestId := c.GetString(helper.RequestIdKey)
 	retryTimes := config.RetryTimes
 	if !shouldRetry(c, bizErr.StatusCode) {
@@ -87,7 +87,8 @@ func Relay(c *gin.Context) {
 		channelId := c.GetInt(ctxkey.ChannelId)
 		lastFailedChannelId = channelId
 		channelName := c.GetString(ctxkey.ChannelName)
-		go processChannelRelayError(ctx, userId, channelId, channelName, *bizErr)
+		// BUG: bizErr is in race condition
+		go processChannelRelayError(ctx, userId, channelId, channelName, bizErr)
 	}
 	if bizErr != nil {
 		if bizErr.StatusCode == http.StatusTooManyRequests {
@@ -121,7 +122,7 @@ func shouldRetry(c *gin.Context, statusCode int) bool {
 	return true
 }
 
-func processChannelRelayError(ctx context.Context, userId int, channelId int, channelName string, err model.ErrorWithStatusCode) {
+func processChannelRelayError(ctx context.Context, userId int, channelId int, channelName string, err *model.ErrorWithStatusCode) {
 	logger.Errorf(ctx, "relay error (channel id %d, user id: %d): %s", channelId, userId, err.Message)
 	// https://platform.openai.com/docs/guides/error-codes/api-errors
 	if monitor.ShouldDisableChannel(&err.Error, err.StatusCode) {

controller/user.go

@@ -109,7 +109,6 @@ func Logout(c *gin.Context) {
 }
 
 func Register(c *gin.Context) {
-	ctx := c.Request.Context()
 	if !config.RegisterEnabled {
 		c.JSON(http.StatusOK, gin.H{
 			"message": "管理员关闭了新用户注册",
@@ -167,7 +166,7 @@ func Register(c *gin.Context) {
 	if config.EmailVerificationEnabled {
 		cleanUser.Email = user.Email
 	}
-	if err := cleanUser.Insert(ctx, inviterId); err != nil {
+	if err := cleanUser.Insert(inviterId); err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": err.Error(),
@@ -363,7 +362,6 @@ func GetSelf(c *gin.Context) {
 }
 
 func UpdateUser(c *gin.Context) {
-	ctx := c.Request.Context()
 	var updatedUser model.User
 	err := json.NewDecoder(c.Request.Body).Decode(&updatedUser)
 	if err != nil || updatedUser.Id == 0 {
@@ -418,7 +416,7 @@ func UpdateUser(c *gin.Context) {
 		return
 	}
 	if originUser.Quota != updatedUser.Quota {
-		model.RecordLog(ctx, originUser.Id, model.LogTypeManage, fmt.Sprintf("管理员将用户额度从 %s修改为 %s", common.LogQuota(originUser.Quota), common.LogQuota(updatedUser.Quota)))
+		model.RecordLog(originUser.Id, model.LogTypeManage, fmt.Sprintf("管理员将用户额度从 %s修改为 %s", common.LogQuota(originUser.Quota), common.LogQuota(updatedUser.Quota)))
 	}
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,
@@ -537,7 +535,6 @@ func DeleteSelf(c *gin.Context) {
 }
 
 func CreateUser(c *gin.Context) {
-	ctx := c.Request.Context()
 	var user model.User
 	err := json.NewDecoder(c.Request.Body).Decode(&user)
 	if err != nil || user.Username == "" || user.Password == "" {
@@ -571,7 +568,7 @@ func CreateUser(c *gin.Context) {
 		Password:    user.Password,
 		DisplayName: user.DisplayName,
 	}
-	if err := cleanUser.Insert(ctx, 0); err != nil {
+	if err := cleanUser.Insert(0); err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
 			"message": err.Error(),
@@ -750,7 +747,6 @@ type topUpRequest struct {
 }
 
 func TopUp(c *gin.Context) {
-	ctx := c.Request.Context()
 	req := topUpRequest{}
 	err := c.ShouldBindJSON(&req)
 	if err != nil {
@@ -761,7 +757,7 @@ func TopUp(c *gin.Context) {
 		return
 	}
 	id := c.GetInt("id")
-	quota, err := model.Redeem(ctx, req.Key, id)
+	quota, err := model.Redeem(req.Key, id)
 	if err != nil {
 		c.JSON(http.StatusOK, gin.H{
 			"success": false,
@@ -784,7 +780,6 @@ type adminTopUpRequest struct {
 }
 
 func AdminTopUp(c *gin.Context) {
-	ctx := c.Request.Context()
 	req := adminTopUpRequest{}
 	err := c.ShouldBindJSON(&req)
 	if err != nil {
@@ -805,7 +800,7 @@ func AdminTopUp(c *gin.Context) {
 	if req.Remark == "" {
 		req.Remark = fmt.Sprintf("通过 API 充值 %s", common.LogQuota(int64(req.Quota)))
 	}
-	model.RecordTopupLog(ctx, req.UserId, req.Remark, req.Quota)
+	model.RecordTopupLog(req.UserId, req.Remark, req.Quota)
 	c.JSON(http.StatusOK, gin.H{
 		"success": true,
 		"message": "",

go.mod

@@ -1,5 +1,6 @@
 module github.com/songquanpeng/one-api
 
+// +heroku goVersion go1.18
 go 1.20
 
 require (
@@ -24,13 +25,12 @@ require (
 	github.com/pkoukk/tiktoken-go v0.1.7
 	github.com/smartystreets/goconvey v1.8.1
 	github.com/stretchr/testify v1.9.0
-	golang.org/x/crypto v0.31.0
+	golang.org/x/crypto v0.24.0
 	golang.org/x/image v0.18.0
-	golang.org/x/sync v0.10.0
 	google.golang.org/api v0.187.0
 	gorm.io/driver/mysql v1.5.6
 	gorm.io/driver/postgres v1.5.7
-	gorm.io/driver/sqlite v1.5.1
+	gorm.io/driver/sqlite v1.5.5
 	gorm.io/gorm v1.25.10
 )
 
@@ -82,7 +82,7 @@ require (
 	github.com/kr/text v0.2.0 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-sqlite3 v1.14.24 // indirect
+	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
@@ -99,8 +99,9 @@ require (
 	golang.org/x/arch v0.8.0 // indirect
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/oauth2 v0.21.0 // indirect
-	golang.org/x/sys v0.28.0 // indirect
-	golang.org/x/text v0.21.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/text v0.16.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
 	google.golang.org/genproto/googleapis/api v0.0.0-20240617180043-68d350f18fd4 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240624140628-dc46fd24d27d // indirect

go.sum

@@ -163,8 +163,8 @@ github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
 github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-sqlite3 v1.14.24 h1:tpSp2G2KyMnnQu99ngJ47EIkWVmliIizyZBfPrBWDRM=
-github.com/mattn/go-sqlite3 v1.14.24/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -222,8 +222,8 @@ golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
 golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
-golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
-golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.24.0 h1:mnl8DM0o513X8fdIkmyFE/5hTYxbwYOjDS/+rK6qpRI=
+golang.org/x/crypto v0.24.0/go.mod h1:Z1PMYSOR5nyMcyAVAIQSKCDwalqy85Aqn1x3Ws4L5DM=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
 golang.org/x/image v0.18.0 h1:jGzIakQa/ZXI1I0Fxvaa9W7yP25TqT6cHIHn+6CqvSQ=
 golang.org/x/image v0.18.0/go.mod h1:4yyo5vMFQjVjUcVk4jEQcU9MGy/rulF5WvUILseCM2E=
@@ -244,20 +244,20 @@ golang.org/x/oauth2 v0.21.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbht
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
-golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+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-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
-golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
+golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
-golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4=
+golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI=
 golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk=
 golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -306,8 +306,8 @@ gorm.io/driver/mysql v1.5.6 h1:Ld4mkIickM+EliaQZQx3uOJDJHtrd70MxAUqWqlx3Y8=
 gorm.io/driver/mysql v1.5.6/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
 gorm.io/driver/postgres v1.5.7 h1:8ptbNJTDbEmhdr62uReG5BGkdQyeasu/FZHxI0IMGnM=
 gorm.io/driver/postgres v1.5.7/go.mod h1:3e019WlBaYI5o5LIdNV+LyxCMNtLOQETBXL2h4chKpA=
-gorm.io/driver/sqlite v1.5.1 h1:hYyrLkAWE71bcarJDPdZNTLWtr8XrSjOWyjUYI6xdL4=
-gorm.io/driver/sqlite v1.5.1/go.mod h1:7MZZ2Z8bqyfSQA1gYEV6MagQWj3cpUkJj9Z+d1HEMEQ=
+gorm.io/driver/sqlite v1.5.5 h1:7MDMtUZhV065SilG62E0MquljeArQZNfJnjd9i9gx3E=
+gorm.io/driver/sqlite v1.5.5/go.mod h1:6NgQ7sQWAIFsPrJJl1lSNSu2TABh0ZZ/zm5fosATavE=
 gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s=
 gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=

middleware/distributor.go

@@ -2,15 +2,13 @@ package middleware
 
 import (
 	"fmt"
-	"net/http"
-	"strconv"
-
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/relay/channeltype"
+	"net/http"
+	"strconv"
 )
 
 type ModelRequest struct {
@@ -19,7 +17,6 @@ type ModelRequest struct {
 
 func Distribute() func(c *gin.Context) {
 	return func(c *gin.Context) {
-		ctx := c.Request.Context()
 		userId := c.GetInt(ctxkey.Id)
 		userGroup, _ := model.CacheGetUserGroup(userId)
 		c.Set(ctxkey.Group, userGroup)
@@ -55,7 +52,6 @@ func Distribute() func(c *gin.Context) {
 				return
 			}
 		}
-		logger.Debugf(ctx, "user id %d, user group: %s, request model: %s, using channel #%d", userId, userGroup, requestModel, channel.Id)
 		SetupContextForSelectedChannel(c, channel, requestModel)
 		c.Next()
 	}

middleware/rate-limit.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 )
@@ -72,7 +71,7 @@ func memoryRateLimiter(c *gin.Context, maxRequestNum int, duration int64, mark s
 }
 
 func rateLimitFactory(maxRequestNum int, duration int64, mark string) func(c *gin.Context) {
-	if maxRequestNum == 0 || config.DebugEnabled {
+	if maxRequestNum == 0 {
 		return func(c *gin.Context) {
 			c.Next()
 		}

middleware/request-id.go

@@ -1,8 +1,8 @@
 package middleware
 
 import (
+	"context"
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/helper"
 )
 
@@ -10,7 +10,7 @@ func RequestId() func(c *gin.Context) {
 	return func(c *gin.Context) {
 		id := helper.GenRequestID()
 		c.Set(helper.RequestIdKey, id)
-		ctx := helper.SetRequestID(c.Request.Context(), id)
+		ctx := context.WithValue(c.Request.Context(), helper.RequestIdKey, id)
 		c.Request = c.Request.WithContext(ctx)
 		c.Header(helper.RequestIdKey, id)
 		c.Next()

model/log.go

@@ -4,31 +4,26 @@ import (
 	"context"
 	"fmt"
 
-	"gorm.io/gorm"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
+	"gorm.io/gorm"
 )
 
 type Log struct {
-	Id                int    `json:"id"`
-	UserId            int    `json:"user_id" gorm:"index"`
-	CreatedAt         int64  `json:"created_at" gorm:"bigint;index:idx_created_at_type"`
-	Type              int    `json:"type" gorm:"index:idx_created_at_type"`
-	Content           string `json:"content"`
-	Username          string `json:"username" gorm:"index:index_username_model_name,priority:2;default:''"`
-	TokenName         string `json:"token_name" gorm:"index;default:''"`
-	ModelName         string `json:"model_name" gorm:"index;index:index_username_model_name,priority:1;default:''"`
-	Quota             int    `json:"quota" gorm:"default:0"`
-	PromptTokens      int    `json:"prompt_tokens" gorm:"default:0"`
-	CompletionTokens  int    `json:"completion_tokens" gorm:"default:0"`
-	ChannelId         int    `json:"channel" gorm:"index"`
-	RequestId         string `json:"request_id" gorm:"default:''"`
-	ElapsedTime       int64  `json:"elapsed_time" gorm:"default:0"` // unit is ms
-	IsStream          bool   `json:"is_stream" gorm:"default:false"`
-	SystemPromptReset bool   `json:"system_prompt_reset" gorm:"default:false"`
+	Id               int    `json:"id"`
+	UserId           int    `json:"user_id" gorm:"index"`
+	CreatedAt        int64  `json:"created_at" gorm:"bigint;index:idx_created_at_type"`
+	Type             int    `json:"type" gorm:"index:idx_created_at_type"`
+	Content          string `json:"content"`
+	Username         string `json:"username" gorm:"index:index_username_model_name,priority:2;default:''"`
+	TokenName        string `json:"token_name" gorm:"index;default:''"`
+	ModelName        string `json:"model_name" gorm:"index;index:index_username_model_name,priority:1;default:''"`
+	Quota            int    `json:"quota" gorm:"default:0"`
+	PromptTokens     int    `json:"prompt_tokens" gorm:"default:0"`
+	CompletionTokens int    `json:"completion_tokens" gorm:"default:0"`
+	ChannelId        int    `json:"channel" gorm:"index"`
 }
 
 const (
@@ -37,21 +32,9 @@ const (
 	LogTypeConsume
 	LogTypeManage
 	LogTypeSystem
-	LogTypeTest
 )
 
-func recordLogHelper(ctx context.Context, log *Log) {
-	requestId := helper.GetRequestID(ctx)
-	log.RequestId = requestId
-	err := LOG_DB.Create(log).Error
-	if err != nil {
-		logger.Error(ctx, "failed to record log: "+err.Error())
-		return
-	}
-	logger.Infof(ctx, "record log: %+v", log)
-}
-
-func RecordLog(ctx context.Context, userId int, logType int, content string) {
+func RecordLog(userId int, logType int, content string) {
 	if logType == LogTypeConsume && !config.LogConsumeEnabled {
 		return
 	}
@@ -62,10 +45,13 @@ func RecordLog(ctx context.Context, userId int, logType int, content string) {
 		Type:      logType,
 		Content:   content,
 	}
-	recordLogHelper(ctx, log)
+	err := LOG_DB.Create(log).Error
+	if err != nil {
+		logger.SysError("failed to record log: " + err.Error())
+	}
 }
 
-func RecordTopupLog(ctx context.Context, userId int, content string, quota int) {
+func RecordTopupLog(userId int, content string, quota int) {
 	log := &Log{
 		UserId:    userId,
 		Username:  GetUsernameById(userId),
@@ -74,23 +60,34 @@ func RecordTopupLog(ctx context.Context, userId int, content string, quota int)
 		Content:   content,
 		Quota:     quota,
 	}
-	recordLogHelper(ctx, log)
+	err := LOG_DB.Create(log).Error
+	if err != nil {
+		logger.SysError("failed to record log: " + err.Error())
+	}
 }
 
-func RecordConsumeLog(ctx context.Context, log *Log) {
+func RecordConsumeLog(ctx context.Context, userId int, channelId int, promptTokens int, completionTokens int, modelName string, tokenName string, quota int64, content string) {
+	logger.Info(ctx, fmt.Sprintf("record consume log: userId=%d, channelId=%d, promptTokens=%d, completionTokens=%d, modelName=%s, tokenName=%s, quota=%d, content=%s", userId, channelId, promptTokens, completionTokens, modelName, tokenName, quota, content))
 	if !config.LogConsumeEnabled {
 		return
 	}
-	log.Username = GetUsernameById(log.UserId)
-	log.CreatedAt = helper.GetTimestamp()
-	log.Type = LogTypeConsume
-	recordLogHelper(ctx, log)
-}
-
-func RecordTestLog(ctx context.Context, log *Log) {
-	log.CreatedAt = helper.GetTimestamp()
-	log.Type = LogTypeTest
-	recordLogHelper(ctx, log)
+	log := &Log{
+		UserId:           userId,
+		Username:         GetUsernameById(userId),
+		CreatedAt:        helper.GetTimestamp(),
+		Type:             LogTypeConsume,
+		Content:          content,
+		PromptTokens:     promptTokens,
+		CompletionTokens: completionTokens,
+		TokenName:        tokenName,
+		ModelName:        modelName,
+		Quota:            int(quota),
+		ChannelId:        channelId,
+	}
+	err := LOG_DB.Create(log).Error
+	if err != nil {
+		logger.Error(ctx, "failed to record log: "+err.Error())
+	}
 }
 
 func GetAllLogs(logType int, startTimestamp int64, endTimestamp int64, modelName string, username string, tokenName string, startIdx int, num int, channel int) (logs []*Log, err error) {

model/redemption.go

@@ -1,14 +1,11 @@
 package model
 
 import (
-	"context"
 	"errors"
 	"fmt"
-
-	"gorm.io/gorm"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/helper"
+	"gorm.io/gorm"
 )
 
 const (
@@ -51,7 +48,7 @@ func GetRedemptionById(id int) (*Redemption, error) {
 	return &redemption, err
 }
 
-func Redeem(ctx context.Context, key string, userId int) (quota int64, err error) {
+func Redeem(key string, userId int) (quota int64, err error) {
 	if key == "" {
 		return 0, errors.New("未提供兑换码")
 	}
@@ -85,7 +82,7 @@ func Redeem(ctx context.Context, key string, userId int) (quota int64, err error
 	if err != nil {
 		return 0, errors.New("兑换失败，" + err.Error())
 	}
-	RecordLog(ctx, userId, LogTypeTopup, fmt.Sprintf("通过兑换码充值 %s", common.LogQuota(redemption.Quota)))
+	RecordLog(userId, LogTypeTopup, fmt.Sprintf("通过兑换码充值 %s", common.LogQuota(redemption.Quota)))
 	return redemption.Quota, nil
 }
 

model/user.go

@@ -1,19 +1,16 @@
 package model
 
 import (
-	"context"
 	"errors"
 	"fmt"
-	"strings"
-
-	"gorm.io/gorm"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/blacklist"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/random"
+	"gorm.io/gorm"
+	"strings"
 )
 
 const (
@@ -95,7 +92,7 @@ func GetUserById(id int, selectAll bool) (*User, error) {
 	if selectAll {
 		err = DB.First(&user, "id = ?", id).Error
 	} else {
-		err = DB.Omit("password", "access_token").First(&user, "id = ?", id).Error
+		err = DB.Omit("password").First(&user, "id = ?", id).Error
 	}
 	return &user, err
 }
@@ -117,7 +114,7 @@ func DeleteUserById(id int) (err error) {
 	return user.Delete()
 }
 
-func (user *User) Insert(ctx context.Context, inviterId int) error {
+func (user *User) Insert(inviterId int) error {
 	var err error
 	if user.Password != "" {
 		user.Password, err = common.Password2Hash(user.Password)
@@ -133,16 +130,16 @@ func (user *User) Insert(ctx context.Context, inviterId int) error {
 		return result.Error
 	}
 	if config.QuotaForNewUser > 0 {
-		RecordLog(ctx, user.Id, LogTypeSystem, fmt.Sprintf("新用户注册赠送 %s", common.LogQuota(config.QuotaForNewUser)))
+		RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("新用户注册赠送 %s", common.LogQuota(config.QuotaForNewUser)))
 	}
 	if inviterId != 0 {
 		if config.QuotaForInvitee > 0 {
 			_ = IncreaseUserQuota(user.Id, config.QuotaForInvitee)
-			RecordLog(ctx, user.Id, LogTypeSystem, fmt.Sprintf("使用邀请码赠送 %s", common.LogQuota(config.QuotaForInvitee)))
+			RecordLog(user.Id, LogTypeSystem, fmt.Sprintf("使用邀请码赠送 %s", common.LogQuota(config.QuotaForInvitee)))
 		}
 		if config.QuotaForInviter > 0 {
 			_ = IncreaseUserQuota(inviterId, config.QuotaForInviter)
-			RecordLog(ctx, inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", common.LogQuota(config.QuotaForInviter)))
+			RecordLog(inviterId, LogTypeSystem, fmt.Sprintf("邀请用户赠送 %s", common.LogQuota(config.QuotaForInviter)))
 		}
 	}
 	// create default token

monitor/manage.go

@@ -34,7 +34,7 @@ func ShouldDisableChannel(err *model.Error, statusCode int) bool {
 		strings.Contains(lowerMessage, "credit") ||
 		strings.Contains(lowerMessage, "balance") ||
 		strings.Contains(lowerMessage, "permission denied") ||
-		strings.Contains(lowerMessage, "organization has been restricted") || // groq
+  	strings.Contains(lowerMessage, "organization has been restricted") || // groq
 		strings.Contains(lowerMessage, "已欠费") {
 		return true
 	}

relay/adaptor.go

@@ -16,7 +16,6 @@ import (
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
 	"github.com/songquanpeng/one-api/relay/adaptor/palm"
 	"github.com/songquanpeng/one-api/relay/adaptor/proxy"
-	"github.com/songquanpeng/one-api/relay/adaptor/replicate"
 	"github.com/songquanpeng/one-api/relay/adaptor/tencent"
 	"github.com/songquanpeng/one-api/relay/adaptor/vertexai"
 	"github.com/songquanpeng/one-api/relay/adaptor/xunfei"
@@ -62,8 +61,6 @@ func GetAdaptor(apiType int) adaptor.Adaptor {
 		return &vertexai.Adaptor{}
 	case apitype.Proxy:
 		return &proxy.Adaptor{}
-	case apitype.Replicate:
-		return &replicate.Adaptor{}
 	}
 	return nil
 }

relay/adaptor/ali/constants.go

@@ -1,23 +1,7 @@
 package ali
 
 var ModelList = []string{
-	"qwen-turbo", "qwen-turbo-latest",
-	"qwen-plus", "qwen-plus-latest",
-	"qwen-max", "qwen-max-latest",
-	"qwen-max-longcontext",
-	"qwen-vl-max", "qwen-vl-max-latest", "qwen-vl-plus", "qwen-vl-plus-latest",
-	"qwen-vl-ocr", "qwen-vl-ocr-latest",
-	"qwen-audio-turbo",
-	"qwen-math-plus", "qwen-math-plus-latest", "qwen-math-turbo", "qwen-math-turbo-latest",
-	"qwen-coder-plus", "qwen-coder-plus-latest", "qwen-coder-turbo", "qwen-coder-turbo-latest",
-	"qwq-32b-preview", "qwen2.5-72b-instruct", "qwen2.5-32b-instruct", "qwen2.5-14b-instruct", "qwen2.5-7b-instruct", "qwen2.5-3b-instruct", "qwen2.5-1.5b-instruct", "qwen2.5-0.5b-instruct",
-	"qwen2-72b-instruct", "qwen2-57b-a14b-instruct", "qwen2-7b-instruct", "qwen2-1.5b-instruct", "qwen2-0.5b-instruct",
-	"qwen1.5-110b-chat", "qwen1.5-72b-chat", "qwen1.5-32b-chat", "qwen1.5-14b-chat", "qwen1.5-7b-chat", "qwen1.5-1.8b-chat", "qwen1.5-0.5b-chat",
-	"qwen-72b-chat", "qwen-14b-chat", "qwen-7b-chat", "qwen-1.8b-chat", "qwen-1.8b-longcontext-chat",
-	"qwen2-vl-7b-instruct", "qwen2-vl-2b-instruct", "qwen-vl-v1", "qwen-vl-chat-v1",
-	"qwen2-audio-instruct", "qwen-audio-chat",
-	"qwen2.5-math-72b-instruct", "qwen2.5-math-7b-instruct", "qwen2.5-math-1.5b-instruct", "qwen2-math-72b-instruct", "qwen2-math-7b-instruct", "qwen2-math-1.5b-instruct",
-	"qwen2.5-coder-32b-instruct", "qwen2.5-coder-14b-instruct", "qwen2.5-coder-7b-instruct", "qwen2.5-coder-3b-instruct", "qwen2.5-coder-1.5b-instruct", "qwen2.5-coder-0.5b-instruct",
-	"text-embedding-v1", "text-embedding-v3", "text-embedding-v2", "text-embedding-async-v2", "text-embedding-async-v1",
+	"qwen-turbo", "qwen-plus", "qwen-max", "qwen-max-longcontext",
+	"text-embedding-v1",
 	"ali-stable-diffusion-xl", "ali-stable-diffusion-v1.5", "wanx-v1",
 }

relay/adaptor/anthropic/constants.go

@@ -9,4 +9,5 @@ var ModelList = []string{
 	"claude-3-5-sonnet-20240620",
 	"claude-3-5-sonnet-20241022",
 	"claude-3-5-sonnet-latest",
+	"claude-3-5-haiku-20241022",
 }

relay/adaptor/gemini/adaptor.go

@@ -7,6 +7,7 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
+	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/helper"
 	channelhelper "github.com/songquanpeng/one-api/relay/adaptor"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
@@ -23,15 +24,7 @@ func (a *Adaptor) Init(meta *meta.Meta) {
 }
 
 func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
-	var defaultVersion string
-	switch meta.ActualModelName {
-	case "gemini-2.0-flash-exp",
-		"gemini-2.0-flash-thinking-exp",
-		"gemini-2.0-flash-thinking-exp-01-21":
-		defaultVersion = "v1beta"
-	}
-
-	version := helper.AssignOrDefault(meta.Config.APIVersion, defaultVersion)
+	version := helper.AssignOrDefault(meta.Config.APIVersion, config.GeminiVersion)
 	action := ""
 	switch meta.Mode {
 	case relaymode.Embeddings:
@@ -43,7 +36,6 @@ func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
 	if meta.IsStream {
 		action = "streamGenerateContent?alt=sse"
 	}
-
 	return fmt.Sprintf("%s/%s/models/%s:%s", meta.BaseURL, version, meta.ActualModelName, action), nil
 }
 

relay/adaptor/gemini/constants.go

@@ -3,9 +3,5 @@ package gemini
 // https://ai.google.dev/models/gemini
 
 var ModelList = []string{
-	"gemini-pro", "gemini-1.0-pro",
-	"gemini-1.5-flash", "gemini-1.5-pro",
-	"text-embedding-004", "aqa",
-	"gemini-2.0-flash-exp",
-	"gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21",
+	"gemini-pro", "gemini-1.0-pro", "gemini-1.5-flash", "gemini-1.5-pro", "text-embedding-004", "aqa",
 }

relay/adaptor/gemini/main.go

@@ -55,10 +55,6 @@ func ConvertRequest(textRequest model.GeneralOpenAIRequest) *ChatRequest {
 				Category:  "HARM_CATEGORY_DANGEROUS_CONTENT",
 				Threshold: config.GeminiSafetySetting,
 			},
-			{
-				Category:  "HARM_CATEGORY_CIVIC_INTEGRITY",
-				Threshold: config.GeminiSafetySetting,
-			},
 		},
 		GenerationConfig: ChatGenerationConfig{
 			Temperature:     textRequest.Temperature,
@@ -251,14 +247,7 @@ func responseGeminiChat2OpenAI(response *ChatResponse) *openai.TextResponse {
 			if candidate.Content.Parts[0].FunctionCall != nil {
 				choice.Message.ToolCalls = getToolCalls(&candidate)
 			} else {
-				var builder strings.Builder
-				for _, part := range candidate.Content.Parts {
-					if i > 0 {
-						builder.WriteString("\n")
-					}
-					builder.WriteString(part.Text)
-				}
-				choice.Message.Content = builder.String()
+				choice.Message.Content = candidate.Content.Parts[0].Text
 			}
 		} else {
 			choice.Message.Content = ""

relay/adaptor/ollama/main.go

@@ -31,8 +31,8 @@ func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
 			TopP:             request.TopP,
 			FrequencyPenalty: request.FrequencyPenalty,
 			PresencePenalty:  request.PresencePenalty,
-			NumPredict:       request.MaxTokens,
-			NumCtx:           request.NumCtx,
+			NumPredict:  	  request.MaxTokens,
+			NumCtx:  	  request.NumCtx,
 		},
 		Stream: request.Stream,
 	}
@@ -122,7 +122,7 @@ func StreamHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusC
 	for scanner.Scan() {
 		data := scanner.Text()
 		if strings.HasPrefix(data, "}") {
-			data = strings.TrimPrefix(data, "}") + "}"
+		    data = strings.TrimPrefix(data, "}") + "}"
 		}
 
 		var ollamaResponse ChatResponse

relay/adaptor/openai/constants.go

@@ -9,7 +9,6 @@ var ModelList = []string{
 	"gpt-4-turbo-preview", "gpt-4-turbo", "gpt-4-turbo-2024-04-09",
 	"gpt-4o", "gpt-4o-2024-05-13",
 	"gpt-4o-2024-08-06",
-	"gpt-4o-2024-11-20",
 	"chatgpt-4o-latest",
 	"gpt-4o-mini", "gpt-4o-mini-2024-07-18",
 	"gpt-4-vision-preview",
@@ -21,7 +20,4 @@ var ModelList = []string{
 	"dall-e-2", "dall-e-3",
 	"whisper-1",
 	"tts-1", "tts-1-1106", "tts-1-hd", "tts-1-hd-1106",
-	"o1", "o1-2024-12-17",
-	"o1-preview", "o1-preview-2024-09-12",
-	"o1-mini", "o1-mini-2024-09-12",
 }

relay/adaptor/openai/helper.go

@@ -2,16 +2,15 @@ package openai
 
 import (
 	"fmt"
-	"strings"
-
 	"github.com/songquanpeng/one-api/relay/channeltype"
 	"github.com/songquanpeng/one-api/relay/model"
+	"strings"
 )
 
-func ResponseText2Usage(responseText string, modelName string, promptTokens int) *model.Usage {
+func ResponseText2Usage(responseText string, modeName string, promptTokens int) *model.Usage {
 	usage := &model.Usage{}
 	usage.PromptTokens = promptTokens
-	usage.CompletionTokens = CountTokenText(responseText, modelName)
+	usage.CompletionTokens = CountTokenText(responseText, modeName)
 	usage.TotalTokens = usage.PromptTokens + usage.CompletionTokens
 	return usage
 }

relay/adaptor/openai/util.go

@@ -1,16 +1,8 @@
 package openai
 
-import (
-	"context"
-	"fmt"
-
-	"github.com/songquanpeng/one-api/common/logger"
-	"github.com/songquanpeng/one-api/relay/model"
-)
+import "github.com/songquanpeng/one-api/relay/model"
 
 func ErrorWrapper(err error, code string, statusCode int) *model.ErrorWithStatusCode {
-	logger.Error(context.TODO(), fmt.Sprintf("[%s]%+v", code, err))
-
 	Error := model.Error{
 		Message: err.Error(),
 		Type:    "one_api_error",

relay/adaptor/replicate/adaptor.go

@@ -1,136 +0,0 @@
-package replicate
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"slices"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/pkg/errors"
-	"github.com/songquanpeng/one-api/common/logger"
-	"github.com/songquanpeng/one-api/relay/adaptor"
-	"github.com/songquanpeng/one-api/relay/adaptor/openai"
-	"github.com/songquanpeng/one-api/relay/meta"
-	"github.com/songquanpeng/one-api/relay/model"
-	"github.com/songquanpeng/one-api/relay/relaymode"
-)
-
-type Adaptor struct {
-	meta *meta.Meta
-}
-
-// ConvertImageRequest implements adaptor.Adaptor.
-func (*Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
-	return DrawImageRequest{
-		Input: ImageInput{
-			Steps:           25,
-			Prompt:          request.Prompt,
-			Guidance:        3,
-			Seed:            int(time.Now().UnixNano()),
-			SafetyTolerance: 5,
-			NImages:         1, // replicate will always return 1 image
-			Width:           1440,
-			Height:          1440,
-			AspectRatio:     "1:1",
-		},
-	}, nil
-}
-
-func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.GeneralOpenAIRequest) (any, error) {
-	if !request.Stream {
-		// TODO: support non-stream mode
-		return nil, errors.Errorf("replicate models only support stream mode now, please set stream=true")
-	}
-
-	// Build the prompt from OpenAI messages
-	var promptBuilder strings.Builder
-	for _, message := range request.Messages {
-		switch msgCnt := message.Content.(type) {
-		case string:
-			promptBuilder.WriteString(message.Role)
-			promptBuilder.WriteString(": ")
-			promptBuilder.WriteString(msgCnt)
-			promptBuilder.WriteString("\n")
-		default:
-		}
-	}
-
-	replicateRequest := ReplicateChatRequest{
-		Input: ChatInput{
-			Prompt:           promptBuilder.String(),
-			MaxTokens:        request.MaxTokens,
-			Temperature:      1.0,
-			TopP:             1.0,
-			PresencePenalty:  0.0,
-			FrequencyPenalty: 0.0,
-		},
-	}
-
-	// Map optional fields
-	if request.Temperature != nil {
-		replicateRequest.Input.Temperature = *request.Temperature
-	}
-	if request.TopP != nil {
-		replicateRequest.Input.TopP = *request.TopP
-	}
-	if request.PresencePenalty != nil {
-		replicateRequest.Input.PresencePenalty = *request.PresencePenalty
-	}
-	if request.FrequencyPenalty != nil {
-		replicateRequest.Input.FrequencyPenalty = *request.FrequencyPenalty
-	}
-	if request.MaxTokens > 0 {
-		replicateRequest.Input.MaxTokens = request.MaxTokens
-	} else if request.MaxTokens == 0 {
-		replicateRequest.Input.MaxTokens = 500
-	}
-
-	return replicateRequest, nil
-}
-
-func (a *Adaptor) Init(meta *meta.Meta) {
-	a.meta = meta
-}
-
-func (a *Adaptor) GetRequestURL(meta *meta.Meta) (string, error) {
-	if !slices.Contains(ModelList, meta.OriginModelName) {
-		return "", errors.Errorf("model %s not supported", meta.OriginModelName)
-	}
-
-	return fmt.Sprintf("https://api.replicate.com/v1/models/%s/predictions", meta.OriginModelName), nil
-}
-
-func (a *Adaptor) SetupRequestHeader(c *gin.Context, req *http.Request, meta *meta.Meta) error {
-	adaptor.SetupCommonRequestHeader(c, req, meta)
-	req.Header.Set("Authorization", "Bearer "+meta.APIKey)
-	return nil
-}
-
-func (a *Adaptor) DoRequest(c *gin.Context, meta *meta.Meta, requestBody io.Reader) (*http.Response, error) {
-	logger.Info(c, "send request to replicate")
-	return adaptor.DoRequestHelper(a, c, meta, requestBody)
-}
-
-func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Meta) (usage *model.Usage, err *model.ErrorWithStatusCode) {
-	switch meta.Mode {
-	case relaymode.ImagesGenerations:
-		err, usage = ImageHandler(c, resp)
-	case relaymode.ChatCompletions:
-		err, usage = ChatHandler(c, resp)
-	default:
-		err = openai.ErrorWrapper(errors.New("not implemented"), "not_implemented", http.StatusInternalServerError)
-	}
-
-	return
-}
-
-func (a *Adaptor) GetModelList() []string {
-	return ModelList
-}
-
-func (a *Adaptor) GetChannelName() string {
-	return "replicate"
-}

relay/adaptor/replicate/chat.go

@@ -1,191 +0,0 @@
-package replicate
-
-import (
-	"bufio"
-	"encoding/json"
-	"io"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/pkg/errors"
-	"github.com/songquanpeng/one-api/common"
-	"github.com/songquanpeng/one-api/common/render"
-	"github.com/songquanpeng/one-api/relay/adaptor/openai"
-	"github.com/songquanpeng/one-api/relay/meta"
-	"github.com/songquanpeng/one-api/relay/model"
-)
-
-func ChatHandler(c *gin.Context, resp *http.Response) (
-	srvErr *model.ErrorWithStatusCode, usage *model.Usage) {
-	if resp.StatusCode != http.StatusCreated {
-		payload, _ := io.ReadAll(resp.Body)
-		return openai.ErrorWrapper(
-				errors.Errorf("bad_status_code [%d]%s", resp.StatusCode, string(payload)),
-				"bad_status_code", http.StatusInternalServerError),
-			nil
-	}
-
-	respBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return openai.ErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
-	}
-
-	respData := new(ChatResponse)
-	if err = json.Unmarshal(respBody, respData); err != nil {
-		return openai.ErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
-	}
-
-	for {
-		err = func() error {
-			// get task
-			taskReq, err := http.NewRequestWithContext(c.Request.Context(),
-				http.MethodGet, respData.URLs.Get, nil)
-			if err != nil {
-				return errors.Wrap(err, "new request")
-			}
-
-			taskReq.Header.Set("Authorization", "Bearer "+meta.GetByContext(c).APIKey)
-			taskResp, err := http.DefaultClient.Do(taskReq)
-			if err != nil {
-				return errors.Wrap(err, "get task")
-			}
-			defer taskResp.Body.Close()
-
-			if taskResp.StatusCode != http.StatusOK {
-				payload, _ := io.ReadAll(taskResp.Body)
-				return errors.Errorf("bad status code [%d]%s",
-					taskResp.StatusCode, string(payload))
-			}
-
-			taskBody, err := io.ReadAll(taskResp.Body)
-			if err != nil {
-				return errors.Wrap(err, "read task response")
-			}
-
-			taskData := new(ChatResponse)
-			if err = json.Unmarshal(taskBody, taskData); err != nil {
-				return errors.Wrap(err, "decode task response")
-			}
-
-			switch taskData.Status {
-			case "succeeded":
-			case "failed", "canceled":
-				return errors.Errorf("task failed, [%s]%s", taskData.Status, taskData.Error)
-			default:
-				time.Sleep(time.Second * 3)
-				return errNextLoop
-			}
-
-			if taskData.URLs.Stream == "" {
-				return errors.New("stream url is empty")
-			}
-
-			// request stream url
-			responseText, err := chatStreamHandler(c, taskData.URLs.Stream)
-			if err != nil {
-				return errors.Wrap(err, "chat stream handler")
-			}
-
-			ctxMeta := meta.GetByContext(c)
-			usage = openai.ResponseText2Usage(responseText,
-				ctxMeta.ActualModelName, ctxMeta.PromptTokens)
-			return nil
-		}()
-		if err != nil {
-			if errors.Is(err, errNextLoop) {
-				continue
-			}
-
-			return openai.ErrorWrapper(err, "chat_task_failed", http.StatusInternalServerError), nil
-		}
-
-		break
-	}
-
-	return nil, usage
-}
-
-const (
-	eventPrefix = "event: "
-	dataPrefix  = "data: "
-	done        = "[DONE]"
-)
-
-func chatStreamHandler(c *gin.Context, streamUrl string) (responseText string, err error) {
-	// request stream endpoint
-	streamReq, err := http.NewRequestWithContext(c.Request.Context(), http.MethodGet, streamUrl, nil)
-	if err != nil {
-		return "", errors.Wrap(err, "new request to stream")
-	}
-
-	streamReq.Header.Set("Authorization", "Bearer "+meta.GetByContext(c).APIKey)
-	streamReq.Header.Set("Accept", "text/event-stream")
-	streamReq.Header.Set("Cache-Control", "no-store")
-
-	resp, err := http.DefaultClient.Do(streamReq)
-	if err != nil {
-		return "", errors.Wrap(err, "do request to stream")
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		payload, _ := io.ReadAll(resp.Body)
-		return "", errors.Errorf("bad status code [%d]%s", resp.StatusCode, string(payload))
-	}
-
-	scanner := bufio.NewScanner(resp.Body)
-	scanner.Split(bufio.ScanLines)
-
-	common.SetEventStreamHeaders(c)
-	doneRendered := false
-	for scanner.Scan() {
-		line := strings.TrimSpace(scanner.Text())
-		if line == "" {
-			continue
-		}
-
-		// Handle comments starting with ':'
-		if strings.HasPrefix(line, ":") {
-			continue
-		}
-
-		// Parse SSE fields
-		if strings.HasPrefix(line, eventPrefix) {
-			event := strings.TrimSpace(line[len(eventPrefix):])
-			var data string
-			// Read the following lines to get data and id
-			for scanner.Scan() {
-				nextLine := scanner.Text()
-				if nextLine == "" {
-					break
-				}
-				if strings.HasPrefix(nextLine, dataPrefix) {
-					data = nextLine[len(dataPrefix):]
-				} else if strings.HasPrefix(nextLine, "id:") {
-					// id = strings.TrimSpace(nextLine[len("id:"):])
-				}
-			}
-
-			if event == "output" {
-				render.StringData(c, data)
-				responseText += data
-			} else if event == "done" {
-				render.Done(c)
-				doneRendered = true
-				break
-			}
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		return "", errors.Wrap(err, "scan stream")
-	}
-
-	if !doneRendered {
-		render.Done(c)
-	}
-
-	return responseText, nil
-}

relay/adaptor/replicate/constant.go

@@ -1,58 +0,0 @@
-package replicate
-
-// ModelList is a list of models that can be used with Replicate.
-//
-// https://replicate.com/pricing
-var ModelList = []string{
-	// -------------------------------------
-	// image model
-	// -------------------------------------
-	"black-forest-labs/flux-1.1-pro",
-	"black-forest-labs/flux-1.1-pro-ultra",
-	"black-forest-labs/flux-canny-dev",
-	"black-forest-labs/flux-canny-pro",
-	"black-forest-labs/flux-depth-dev",
-	"black-forest-labs/flux-depth-pro",
-	"black-forest-labs/flux-dev",
-	"black-forest-labs/flux-dev-lora",
-	"black-forest-labs/flux-fill-dev",
-	"black-forest-labs/flux-fill-pro",
-	"black-forest-labs/flux-pro",
-	"black-forest-labs/flux-redux-dev",
-	"black-forest-labs/flux-redux-schnell",
-	"black-forest-labs/flux-schnell",
-	"black-forest-labs/flux-schnell-lora",
-	"ideogram-ai/ideogram-v2",
-	"ideogram-ai/ideogram-v2-turbo",
-	"recraft-ai/recraft-v3",
-	"recraft-ai/recraft-v3-svg",
-	"stability-ai/stable-diffusion-3",
-	"stability-ai/stable-diffusion-3.5-large",
-	"stability-ai/stable-diffusion-3.5-large-turbo",
-	"stability-ai/stable-diffusion-3.5-medium",
-	// -------------------------------------
-	// language model
-	// -------------------------------------
-	"ibm-granite/granite-20b-code-instruct-8k",
-	"ibm-granite/granite-3.0-2b-instruct",
-	"ibm-granite/granite-3.0-8b-instruct",
-	"ibm-granite/granite-8b-code-instruct-128k",
-	"meta/llama-2-13b",
-	"meta/llama-2-13b-chat",
-	"meta/llama-2-70b",
-	"meta/llama-2-70b-chat",
-	"meta/llama-2-7b",
-	"meta/llama-2-7b-chat",
-	"meta/meta-llama-3.1-405b-instruct",
-	"meta/meta-llama-3-70b",
-	"meta/meta-llama-3-70b-instruct",
-	"meta/meta-llama-3-8b",
-	"meta/meta-llama-3-8b-instruct",
-	"mistralai/mistral-7b-instruct-v0.2",
-	"mistralai/mistral-7b-v0.1",
-	"mistralai/mixtral-8x7b-instruct-v0.1",
-	// -------------------------------------
-	// video model
-	// -------------------------------------
-	// "minimax/video-01",  // TODO: implement the adaptor
-}

relay/adaptor/replicate/image.go

@@ -1,222 +0,0 @@
-package replicate
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"image"
-	"image/png"
-	"io"
-	"net/http"
-	"sync"
-	"time"
-
-	"github.com/gin-gonic/gin"
-	"github.com/pkg/errors"
-	"github.com/songquanpeng/one-api/common/logger"
-	"github.com/songquanpeng/one-api/relay/adaptor/openai"
-	"github.com/songquanpeng/one-api/relay/meta"
-	"github.com/songquanpeng/one-api/relay/model"
-	"golang.org/x/image/webp"
-	"golang.org/x/sync/errgroup"
-)
-
-// ImagesEditsHandler just copy response body to client
-//
-// https://replicate.com/black-forest-labs/flux-fill-pro
-// func ImagesEditsHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
-// 	c.Writer.WriteHeader(resp.StatusCode)
-// 	for k, v := range resp.Header {
-// 		c.Writer.Header().Set(k, v[0])
-// 	}
-
-// 	if _, err := io.Copy(c.Writer, resp.Body); err != nil {
-// 		return ErrorWrapper(err, "copy_response_body_failed", http.StatusInternalServerError), nil
-// 	}
-// 	defer resp.Body.Close()
-
-// 	return nil, nil
-// }
-
-var errNextLoop = errors.New("next_loop")
-
-func ImageHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
-	if resp.StatusCode != http.StatusCreated {
-		payload, _ := io.ReadAll(resp.Body)
-		return openai.ErrorWrapper(
-				errors.Errorf("bad_status_code [%d]%s", resp.StatusCode, string(payload)),
-				"bad_status_code", http.StatusInternalServerError),
-			nil
-	}
-
-	respBody, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return openai.ErrorWrapper(err, "read_response_body_failed", http.StatusInternalServerError), nil
-	}
-
-	respData := new(ImageResponse)
-	if err = json.Unmarshal(respBody, respData); err != nil {
-		return openai.ErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
-	}
-
-	for {
-		err = func() error {
-			// get task
-			taskReq, err := http.NewRequestWithContext(c.Request.Context(),
-				http.MethodGet, respData.URLs.Get, nil)
-			if err != nil {
-				return errors.Wrap(err, "new request")
-			}
-
-			taskReq.Header.Set("Authorization", "Bearer "+meta.GetByContext(c).APIKey)
-			taskResp, err := http.DefaultClient.Do(taskReq)
-			if err != nil {
-				return errors.Wrap(err, "get task")
-			}
-			defer taskResp.Body.Close()
-
-			if taskResp.StatusCode != http.StatusOK {
-				payload, _ := io.ReadAll(taskResp.Body)
-				return errors.Errorf("bad status code [%d]%s",
-					taskResp.StatusCode, string(payload))
-			}
-
-			taskBody, err := io.ReadAll(taskResp.Body)
-			if err != nil {
-				return errors.Wrap(err, "read task response")
-			}
-
-			taskData := new(ImageResponse)
-			if err = json.Unmarshal(taskBody, taskData); err != nil {
-				return errors.Wrap(err, "decode task response")
-			}
-
-			switch taskData.Status {
-			case "succeeded":
-			case "failed", "canceled":
-				return errors.Errorf("task failed: %s", taskData.Status)
-			default:
-				time.Sleep(time.Second * 3)
-				return errNextLoop
-			}
-
-			output, err := taskData.GetOutput()
-			if err != nil {
-				return errors.Wrap(err, "get output")
-			}
-			if len(output) == 0 {
-				return errors.New("response output is empty")
-			}
-
-			var mu sync.Mutex
-			var pool errgroup.Group
-			respBody := &openai.ImageResponse{
-				Created: taskData.CompletedAt.Unix(),
-				Data:    []openai.ImageData{},
-			}
-
-			for _, imgOut := range output {
-				imgOut := imgOut
-				pool.Go(func() error {
-					// download image
-					downloadReq, err := http.NewRequestWithContext(c.Request.Context(),
-						http.MethodGet, imgOut, nil)
-					if err != nil {
-						return errors.Wrap(err, "new request")
-					}
-
-					imgResp, err := http.DefaultClient.Do(downloadReq)
-					if err != nil {
-						return errors.Wrap(err, "download image")
-					}
-					defer imgResp.Body.Close()
-
-					if imgResp.StatusCode != http.StatusOK {
-						payload, _ := io.ReadAll(imgResp.Body)
-						return errors.Errorf("bad status code [%d]%s",
-							imgResp.StatusCode, string(payload))
-					}
-
-					imgData, err := io.ReadAll(imgResp.Body)
-					if err != nil {
-						return errors.Wrap(err, "read image")
-					}
-
-					imgData, err = ConvertImageToPNG(imgData)
-					if err != nil {
-						return errors.Wrap(err, "convert image")
-					}
-
-					mu.Lock()
-					respBody.Data = append(respBody.Data, openai.ImageData{
-						B64Json: fmt.Sprintf("data:image/png;base64,%s",
-							base64.StdEncoding.EncodeToString(imgData)),
-					})
-					mu.Unlock()
-
-					return nil
-				})
-			}
-
-			if err := pool.Wait(); err != nil {
-				if len(respBody.Data) == 0 {
-					return errors.WithStack(err)
-				}
-
-				logger.Error(c, fmt.Sprintf("some images failed to download: %+v", err))
-			}
-
-			c.JSON(http.StatusOK, respBody)
-			return nil
-		}()
-		if err != nil {
-			if errors.Is(err, errNextLoop) {
-				continue
-			}
-
-			return openai.ErrorWrapper(err, "image_task_failed", http.StatusInternalServerError), nil
-		}
-
-		break
-	}
-
-	return nil, nil
-}
-
-// ConvertImageToPNG converts a WebP image to PNG format
-func ConvertImageToPNG(webpData []byte) ([]byte, error) {
-	// bypass if it's already a PNG image
-	if bytes.HasPrefix(webpData, []byte("\x89PNG")) {
-		return webpData, nil
-	}
-
-	// check if is jpeg, convert to png
-	if bytes.HasPrefix(webpData, []byte("\xff\xd8\xff")) {
-		img, _, err := image.Decode(bytes.NewReader(webpData))
-		if err != nil {
-			return nil, errors.Wrap(err, "decode jpeg")
-		}
-
-		var pngBuffer bytes.Buffer
-		if err := png.Encode(&pngBuffer, img); err != nil {
-			return nil, errors.Wrap(err, "encode png")
-		}
-
-		return pngBuffer.Bytes(), nil
-	}
-
-	// Decode the WebP image
-	img, err := webp.Decode(bytes.NewReader(webpData))
-	if err != nil {
-		return nil, errors.Wrap(err, "decode webp")
-	}
-
-	// Encode the image as PNG
-	var pngBuffer bytes.Buffer
-	if err := png.Encode(&pngBuffer, img); err != nil {
-		return nil, errors.Wrap(err, "encode png")
-	}
-
-	return pngBuffer.Bytes(), nil
-}

relay/adaptor/replicate/model.go

@@ -1,159 +0,0 @@
-package replicate
-
-import (
-	"time"
-
-	"github.com/pkg/errors"
-)
-
-// DrawImageRequest draw image by fluxpro
-//
-// https://replicate.com/black-forest-labs/flux-pro?prediction=kg1krwsdf9rg80ch1sgsrgq7h8&output=json
-type DrawImageRequest struct {
-	Input ImageInput `json:"input"`
-}
-
-// ImageInput is input of DrawImageByFluxProRequest
-//
-// https://replicate.com/black-forest-labs/flux-1.1-pro/api/schema
-type ImageInput struct {
-	Steps           int    `json:"steps" binding:"required,min=1"`
-	Prompt          string `json:"prompt" binding:"required,min=5"`
-	ImagePrompt     string `json:"image_prompt"`
-	Guidance        int    `json:"guidance" binding:"required,min=2,max=5"`
-	Interval        int    `json:"interval" binding:"required,min=1,max=4"`
-	AspectRatio     string `json:"aspect_ratio" binding:"required,oneof=1:1 16:9 2:3 3:2 4:5 5:4 9:16"`
-	SafetyTolerance int    `json:"safety_tolerance" binding:"required,min=1,max=5"`
-	Seed            int    `json:"seed"`
-	NImages         int    `json:"n_images" binding:"required,min=1,max=8"`
-	Width           int    `json:"width" binding:"required,min=256,max=1440"`
-	Height          int    `json:"height" binding:"required,min=256,max=1440"`
-}
-
-// InpaintingImageByFlusReplicateRequest is request to inpainting image by flux pro
-//
-// https://replicate.com/black-forest-labs/flux-fill-pro/api/schema
-type InpaintingImageByFlusReplicateRequest struct {
-	Input FluxInpaintingInput `json:"input"`
-}
-
-// FluxInpaintingInput is input of DrawImageByFluxProRequest
-//
-// https://replicate.com/black-forest-labs/flux-fill-pro/api/schema
-type FluxInpaintingInput struct {
-	Mask             string `json:"mask" binding:"required"`
-	Image            string `json:"image" binding:"required"`
-	Seed             int    `json:"seed"`
-	Steps            int    `json:"steps" binding:"required,min=1"`
-	Prompt           string `json:"prompt" binding:"required,min=5"`
-	Guidance         int    `json:"guidance" binding:"required,min=2,max=5"`
-	OutputFormat     string `json:"output_format"`
-	SafetyTolerance  int    `json:"safety_tolerance" binding:"required,min=1,max=5"`
-	PromptUnsampling bool   `json:"prompt_unsampling"`
-}
-
-// ImageResponse is response of DrawImageByFluxProRequest
-//
-// https://replicate.com/black-forest-labs/flux-pro?prediction=kg1krwsdf9rg80ch1sgsrgq7h8&output=json
-type ImageResponse struct {
-	CompletedAt time.Time        `json:"completed_at"`
-	CreatedAt   time.Time        `json:"created_at"`
-	DataRemoved bool             `json:"data_removed"`
-	Error       string           `json:"error"`
-	ID          string           `json:"id"`
-	Input       DrawImageRequest `json:"input"`
-	Logs        string           `json:"logs"`
-	Metrics     FluxMetrics      `json:"metrics"`
-	// Output could be `string` or `[]string`
-	Output    any       `json:"output"`
-	StartedAt time.Time `json:"started_at"`
-	Status    string    `json:"status"`
-	URLs      FluxURLs  `json:"urls"`
-	Version   string    `json:"version"`
-}
-
-func (r *ImageResponse) GetOutput() ([]string, error) {
-	switch v := r.Output.(type) {
-	case string:
-		return []string{v}, nil
-	case []string:
-		return v, nil
-	case nil:
-		return nil, nil
-	case []interface{}:
-		// convert []interface{} to []string
-		ret := make([]string, len(v))
-		for idx, vv := range v {
-			if vvv, ok := vv.(string); ok {
-				ret[idx] = vvv
-			} else {
-				return nil, errors.Errorf("unknown output type: [%T]%v", vv, vv)
-			}
-		}
-
-		return ret, nil
-	default:
-		return nil, errors.Errorf("unknown output type: [%T]%v", r.Output, r.Output)
-	}
-}
-
-// FluxMetrics is metrics of ImageResponse
-type FluxMetrics struct {
-	ImageCount  int     `json:"image_count"`
-	PredictTime float64 `json:"predict_time"`
-	TotalTime   float64 `json:"total_time"`
-}
-
-// FluxURLs is urls of ImageResponse
-type FluxURLs struct {
-	Get    string `json:"get"`
-	Cancel string `json:"cancel"`
-}
-
-type ReplicateChatRequest struct {
-	Input ChatInput `json:"input" form:"input" binding:"required"`
-}
-
-// ChatInput is input of ChatByReplicateRequest
-//
-// https://replicate.com/meta/meta-llama-3.1-405b-instruct/api/schema
-type ChatInput struct {
-	TopK             int     `json:"top_k"`
-	TopP             float64 `json:"top_p"`
-	Prompt           string  `json:"prompt"`
-	MaxTokens        int     `json:"max_tokens"`
-	MinTokens        int     `json:"min_tokens"`
-	Temperature      float64 `json:"temperature"`
-	SystemPrompt     string  `json:"system_prompt"`
-	StopSequences    string  `json:"stop_sequences"`
-	PromptTemplate   string  `json:"prompt_template"`
-	PresencePenalty  float64 `json:"presence_penalty"`
-	FrequencyPenalty float64 `json:"frequency_penalty"`
-}
-
-// ChatResponse is response of ChatByReplicateRequest
-//
-// https://replicate.com/meta/meta-llama-3.1-405b-instruct/examples?input=http&output=json
-type ChatResponse struct {
-	CompletedAt time.Time   `json:"completed_at"`
-	CreatedAt   time.Time   `json:"created_at"`
-	DataRemoved bool        `json:"data_removed"`
-	Error       string      `json:"error"`
-	ID          string      `json:"id"`
-	Input       ChatInput   `json:"input"`
-	Logs        string      `json:"logs"`
-	Metrics     FluxMetrics `json:"metrics"`
-	// Output could be `string` or `[]string`
-	Output    []string        `json:"output"`
-	StartedAt time.Time       `json:"started_at"`
-	Status    string          `json:"status"`
-	URLs      ChatResponseUrl `json:"urls"`
-	Version   string          `json:"version"`
-}
-
-// ChatResponseUrl is task urls of ChatResponse
-type ChatResponseUrl struct {
-	Stream string `json:"stream"`
-	Get    string `json:"get"`
-	Cancel string `json:"cancel"`
-}

relay/adaptor/tencent/adaptor.go

@@ -2,19 +2,16 @@ package tencent
 
 import (
 	"errors"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/relay/adaptor"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
 	"github.com/songquanpeng/one-api/relay/meta"
 	"github.com/songquanpeng/one-api/relay/model"
-	"github.com/songquanpeng/one-api/relay/relaymode"
+	"io"
+	"net/http"
+	"strconv"
+	"strings"
 )
 
 // https://cloud.tencent.com/document/api/1729/101837
@@ -55,18 +52,10 @@ func (a *Adaptor) ConvertRequest(c *gin.Context, relayMode int, request *model.G
 	if err != nil {
 		return nil, err
 	}
-	var convertedRequest any
-	switch relayMode {
-	case relaymode.Embeddings:
-		a.Action = "GetEmbedding"
-		convertedRequest = ConvertEmbeddingRequest(*request)
-	default:
-		a.Action = "ChatCompletions"
-		convertedRequest = ConvertRequest(*request)
-	}
+	tencentRequest := ConvertRequest(*request)
 	// we have to calculate the sign here
-	a.Sign = GetSign(convertedRequest, a, secretId, secretKey)
-	return convertedRequest, nil
+	a.Sign = GetSign(*tencentRequest, a, secretId, secretKey)
+	return tencentRequest, nil
 }
 
 func (a *Adaptor) ConvertImageRequest(request *model.ImageRequest) (any, error) {
@@ -86,12 +75,7 @@ func (a *Adaptor) DoResponse(c *gin.Context, resp *http.Response, meta *meta.Met
 		err, responseText = StreamHandler(c, resp)
 		usage = openai.ResponseText2Usage(responseText, meta.ActualModelName, meta.PromptTokens)
 	} else {
-		switch meta.Mode {
-		case relaymode.Embeddings:
-			err, usage = EmbeddingHandler(c, resp)
-		default:
-			err, usage = Handler(c, resp)
-		}
+		err, usage = Handler(c, resp)
 	}
 	return
 }

relay/adaptor/tencent/constants.go

@@ -6,5 +6,4 @@ var ModelList = []string{
 	"hunyuan-standard-256K",
 	"hunyuan-pro",
 	"hunyuan-vision",
-	"hunyuan-embedding",
 }

relay/adaptor/tencent/main.go

@@ -8,6 +8,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
+	"github.com/songquanpeng/one-api/common/render"
 	"io"
 	"net/http"
 	"strconv"
@@ -15,14 +16,11 @@ import (
 	"time"
 
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/conv"
-	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/helper"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/common/random"
-	"github.com/songquanpeng/one-api/common/render"
 	"github.com/songquanpeng/one-api/relay/adaptor/openai"
 	"github.com/songquanpeng/one-api/relay/constant"
 	"github.com/songquanpeng/one-api/relay/model"
@@ -46,68 +44,8 @@ func ConvertRequest(request model.GeneralOpenAIRequest) *ChatRequest {
 	}
 }
 
-func ConvertEmbeddingRequest(request model.GeneralOpenAIRequest) *EmbeddingRequest {
-	return &EmbeddingRequest{
-		InputList: request.ParseInput(),
-	}
-}
-
-func EmbeddingHandler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *model.Usage) {
-	var tencentResponseP EmbeddingResponseP
-	err := json.NewDecoder(resp.Body).Decode(&tencentResponseP)
-	if err != nil {
-		return openai.ErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
-	}
-
-	err = resp.Body.Close()
-	if err != nil {
-		return openai.ErrorWrapper(err, "close_response_body_failed", http.StatusInternalServerError), nil
-	}
-
-	tencentResponse := tencentResponseP.Response
-	if tencentResponse.Error.Code != "" {
-		return &model.ErrorWithStatusCode{
-			Error: model.Error{
-				Message: tencentResponse.Error.Message,
-				Code:    tencentResponse.Error.Code,
-			},
-			StatusCode: resp.StatusCode,
-		}, nil
-	}
-	requestModel := c.GetString(ctxkey.RequestModel)
-	fullTextResponse := embeddingResponseTencent2OpenAI(&tencentResponse)
-	fullTextResponse.Model = requestModel
-	jsonResponse, err := json.Marshal(fullTextResponse)
-	if err != nil {
-		return openai.ErrorWrapper(err, "marshal_response_body_failed", http.StatusInternalServerError), nil
-	}
-	c.Writer.Header().Set("Content-Type", "application/json")
-	c.Writer.WriteHeader(resp.StatusCode)
-	_, err = c.Writer.Write(jsonResponse)
-	return nil, &fullTextResponse.Usage
-}
-
-func embeddingResponseTencent2OpenAI(response *EmbeddingResponse) *openai.EmbeddingResponse {
-	openAIEmbeddingResponse := openai.EmbeddingResponse{
-		Object: "list",
-		Data:   make([]openai.EmbeddingResponseItem, 0, len(response.Data)),
-		Model:  "hunyuan-embedding",
-		Usage:  model.Usage{TotalTokens: response.EmbeddingUsage.TotalTokens},
-	}
-
-	for _, item := range response.Data {
-		openAIEmbeddingResponse.Data = append(openAIEmbeddingResponse.Data, openai.EmbeddingResponseItem{
-			Object:    item.Object,
-			Index:     item.Index,
-			Embedding: item.Embedding,
-		})
-	}
-	return &openAIEmbeddingResponse
-}
-
 func responseTencent2OpenAI(response *ChatResponse) *openai.TextResponse {
 	fullTextResponse := openai.TextResponse{
-		Id:      response.ReqID,
 		Object:  "chat.completion",
 		Created: helper.GetTimestamp(),
 		Usage: model.Usage{
@@ -210,7 +148,7 @@ func Handler(c *gin.Context, resp *http.Response) (*model.ErrorWithStatusCode, *
 		return openai.ErrorWrapper(err, "unmarshal_response_body_failed", http.StatusInternalServerError), nil
 	}
 	TencentResponse = responseP.Response
-	if TencentResponse.Error.Code != "" {
+	if TencentResponse.Error.Code != 0 {
 		return &model.ErrorWithStatusCode{
 			Error: model.Error{
 				Message: TencentResponse.Error.Message,
@@ -257,7 +195,7 @@ func hmacSha256(s, key string) string {
 	return string(hashed.Sum(nil))
 }
 
-func GetSign(req any, adaptor *Adaptor, secId, secKey string) string {
+func GetSign(req ChatRequest, adaptor *Adaptor, secId, secKey string) string {
 	// build canonical request string
 	host := "hunyuan.tencentcloudapi.com"
 	httpRequestMethod := "POST"

relay/adaptor/tencent/model.go

@@ -35,16 +35,16 @@ type ChatRequest struct {
 	// 1. 影响输出文本的多样性，取值越大，生成文本的多样性越强。
 	// 2. 取值区间为 [0.0, 1.0]，未传值时使用各模型推荐值。
 	// 3. 非必要不建议使用，不合理的取值会影响效果。
-	TopP *float64 `json:"TopP,omitempty"`
+	TopP *float64 `json:"TopP"`
 	// 说明：
 	// 1. 较高的数值会使输出更加随机，而较低的数值会使其更加集中和确定。
 	// 2. 取值区间为 [0.0, 2.0]，未传值时使用各模型推荐值。
 	// 3. 非必要不建议使用，不合理的取值会影响效果。
-	Temperature *float64 `json:"Temperature,omitempty"`
+	Temperature *float64 `json:"Temperature"`
 }
 
 type Error struct {
-	Code    string `json:"Code"`
+	Code    int    `json:"Code"`
 	Message string `json:"Message"`
 }
 
@@ -61,41 +61,15 @@ type ResponseChoices struct {
 }
 
 type ChatResponse struct {
-	Choices []ResponseChoices `json:"Choices,omitempty"`   // 结果
-	Created int64             `json:"Created,omitempty"`   // unix 时间戳的字符串
-	Id      string            `json:"Id,omitempty"`        // 会话 id
-	Usage   Usage             `json:"Usage,omitempty"`     // token 数量
-	Error   Error             `json:"Error,omitempty"`     // 错误信息 注意：此字段可能返回 null，表示取不到有效值
-	Note    string            `json:"Note,omitempty"`      // 注释
-	ReqID   string            `json:"RequestId,omitempty"` // 唯一请求 Id，每次请求都会返回。用于反馈接口入参
+	Choices []ResponseChoices `json:"Choices,omitempty"` // 结果
+	Created int64             `json:"Created,omitempty"` // unix 时间戳的字符串
+	Id      string            `json:"Id,omitempty"`      // 会话 id
+	Usage   Usage             `json:"Usage,omitempty"`   // token 数量
+	Error   Error             `json:"Error,omitempty"`   // 错误信息 注意：此字段可能返回 null，表示取不到有效值
+	Note    string            `json:"Note,omitempty"`    // 注释
+	ReqID   string            `json:"Req_id,omitempty"`  // 唯一请求 Id，每次请求都会返回。用于反馈接口入参
 }
 
 type ChatResponseP struct {
 	Response ChatResponse `json:"Response,omitempty"`
 }
-
-type EmbeddingRequest struct {
-	InputList []string `json:"InputList"`
-}
-
-type EmbeddingData struct {
-	Embedding []float64 `json:"Embedding"`
-	Index     int       `json:"Index"`
-	Object    string    `json:"Object"`
-}
-
-type EmbeddingUsage struct {
-	PromptTokens int `json:"PromptTokens"`
-	TotalTokens  int `json:"TotalTokens"`
-}
-
-type EmbeddingResponse struct {
-	Data           []EmbeddingData `json:"Data"`
-	EmbeddingUsage EmbeddingUsage  `json:"Usage,omitempty"`
-	RequestId      string          `json:"RequestId,omitempty"`
-	Error          Error           `json:"Error,omitempty"`
-}
-
-type EmbeddingResponseP struct {
-	Response EmbeddingResponse `json:"Response,omitempty"`
-}

relay/adaptor/vertexai/gemini/adapter.go

@@ -15,11 +15,7 @@ import (
 )
 
 var ModelList = []string{
-	"gemini-pro", "gemini-pro-vision",
-	"gemini-1.5-pro-001", "gemini-1.5-flash-001",
-	"gemini-1.5-pro-002", "gemini-1.5-flash-002",
-	"gemini-2.0-flash-exp",
-	"gemini-2.0-flash-thinking-exp", "gemini-2.0-flash-thinking-exp-01-21",
+	"gemini-1.5-pro-001", "gemini-1.5-flash-001", "gemini-pro", "gemini-pro-vision", "gemini-1.5-pro-002", "gemini-1.5-flash-002", 
 }
 
 type Adaptor struct {

relay/apitype/define.go

@@ -19,7 +19,6 @@ const (
 	DeepL
 	VertexAI
 	Proxy
-	Replicate
 
 	Dummy // this one is only for count, do not add any channel after this
 )

relay/billing/billing.go

@@ -3,7 +3,6 @@ package billing
 import (
 	"context"
 	"fmt"
-
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/model"
 )
@@ -32,17 +31,8 @@ func PostConsumeQuota(ctx context.Context, tokenId int, quotaDelta int64, totalQ
 	}
 	// totalQuota is total quota consumed
 	if totalQuota != 0 {
-		logContent := fmt.Sprintf("倍率：%.2f × %.2f", modelRatio, groupRatio)
-		model.RecordConsumeLog(ctx, &model.Log{
-			UserId:           userId,
-			ChannelId:        channelId,
-			PromptTokens:     int(totalQuota),
-			CompletionTokens: 0,
-			ModelName:        modelName,
-			TokenName:        tokenName,
-			Quota:            int(totalQuota),
-			Content:          logContent,
-		})
+		logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+		model.RecordConsumeLog(ctx, userId, channelId, int(totalQuota), 0, modelName, tokenName, totalQuota, logContent)
 		model.UpdateUserUsedQuotaAndRequestCount(userId, totalQuota)
 		model.UpdateChannelUsedQuota(channelId, totalQuota)
 	}

relay/billing/ratio/model.go

@@ -9,10 +9,9 @@ import (
 )
 
 const (
-	USD2RMB   = 7
-	USD       = 500 // $0.002 = 1 -> $1 = 500
-	MILLI_USD = 1.0 / 1000 * USD
-	RMB       = USD / USD2RMB
+	USD2RMB = 7
+	USD     = 500 // $0.002 = 1 -> $1 = 500
+	RMB     = USD / USD2RMB
 )
 
 // ModelRatio
@@ -38,7 +37,6 @@ var ModelRatio = map[string]float64{
 	"chatgpt-4o-latest":       2.5,   // $0.005 / 1K tokens
 	"gpt-4o-2024-05-13":       2.5,   // $0.005 / 1K tokens
 	"gpt-4o-2024-08-06":       1.25,  // $0.0025 / 1K tokens
-	"gpt-4o-2024-11-20":       1.25,  // $0.0025 / 1K tokens
 	"gpt-4o-mini":             0.075, // $0.00015 / 1K tokens
 	"gpt-4o-mini-2024-07-18":  0.075, // $0.00015 / 1K tokens
 	"gpt-4-vision-preview":    5,     // $0.01 / 1K tokens
@@ -50,14 +48,8 @@ var ModelRatio = map[string]float64{
 	"gpt-3.5-turbo-instruct":  0.75, // $0.0015 / 1K tokens
 	"gpt-3.5-turbo-1106":      0.5,  // $0.001 / 1K tokens
 	"gpt-3.5-turbo-0125":      0.25, // $0.0005 / 1K tokens
-	"o1":                      7.5,  // $15.00 / 1M input tokens
-	"o1-2024-12-17":           7.5,
-	"o1-preview":              7.5, // $15.00 / 1M input tokens
-	"o1-preview-2024-09-12":   7.5,
-	"o1-mini":                 1.5, // $3.00 / 1M input tokens
-	"o1-mini-2024-09-12":      1.5,
-	"davinci-002":             1,   // $0.002 / 1K tokens
-	"babbage-002":             0.2, // $0.0004 / 1K tokens
+	"davinci-002":             1,    // $0.002 / 1K tokens
+	"babbage-002":             0.2,  // $0.0004 / 1K tokens
 	"text-ada-001":            0.2,
 	"text-babbage-001":        0.25,
 	"text-curie-001":          1,
@@ -110,16 +102,11 @@ var ModelRatio = map[string]float64{
 	"bge-large-en":       0.002 * RMB,
 	"tao-8k":             0.002 * RMB,
 	// https://ai.google.dev/pricing
-	"gemini-pro":                          1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
-	"gemini-1.0-pro":                      1,
-	"gemini-1.5-pro":                      1,
-	"gemini-1.5-pro-001":                  1,
-	"gemini-1.5-flash":                    1,
-	"gemini-1.5-flash-001":                1,
-	"gemini-2.0-flash-exp":                1,
-	"gemini-2.0-flash-thinking-exp":       1,
-	"gemini-2.0-flash-thinking-exp-01-21": 1,
-	"aqa":                                 1,
+	"gemini-pro":       1, // $0.00025 / 1k characters -> $0.001 / 1k tokens
+	"gemini-1.0-pro":   1,
+	"gemini-1.5-flash": 1,
+	"gemini-1.5-pro":   1,
+	"aqa":              1,
 	// https://open.bigmodel.cn/pricing
 	"glm-4":         0.1 * RMB,
 	"glm-4v":        0.1 * RMB,
@@ -131,94 +118,29 @@ var ModelRatio = map[string]float64{
 	"chatglm_lite":  0.1429, // ￥0.002 / 1k tokens
 	"cogview-3":     0.25 * RMB,
 	// https://help.aliyun.com/zh/dashscope/developer-reference/tongyi-thousand-questions-metering-and-billing
-	"qwen-turbo":                  1.4286, // ￥0.02 / 1k tokens
-	"qwen-turbo-latest":           1.4286,
-	"qwen-plus":                   1.4286,
-	"qwen-plus-latest":            1.4286,
-	"qwen-max":                    1.4286,
-	"qwen-max-latest":             1.4286,
-	"qwen-max-longcontext":        1.4286,
-	"qwen-vl-max":                 1.4286,
-	"qwen-vl-max-latest":          1.4286,
-	"qwen-vl-plus":                1.4286,
-	"qwen-vl-plus-latest":         1.4286,
-	"qwen-vl-ocr":                 1.4286,
-	"qwen-vl-ocr-latest":          1.4286,
-	"qwen-audio-turbo":            1.4286,
-	"qwen-math-plus":              1.4286,
-	"qwen-math-plus-latest":       1.4286,
-	"qwen-math-turbo":             1.4286,
-	"qwen-math-turbo-latest":      1.4286,
-	"qwen-coder-plus":             1.4286,
-	"qwen-coder-plus-latest":      1.4286,
-	"qwen-coder-turbo":            1.4286,
-	"qwen-coder-turbo-latest":     1.4286,
-	"qwq-32b-preview":             1.4286,
-	"qwen2.5-72b-instruct":        1.4286,
-	"qwen2.5-32b-instruct":        1.4286,
-	"qwen2.5-14b-instruct":        1.4286,
-	"qwen2.5-7b-instruct":         1.4286,
-	"qwen2.5-3b-instruct":         1.4286,
-	"qwen2.5-1.5b-instruct":       1.4286,
-	"qwen2.5-0.5b-instruct":       1.4286,
-	"qwen2-72b-instruct":          1.4286,
-	"qwen2-57b-a14b-instruct":     1.4286,
-	"qwen2-7b-instruct":           1.4286,
-	"qwen2-1.5b-instruct":         1.4286,
-	"qwen2-0.5b-instruct":         1.4286,
-	"qwen1.5-110b-chat":           1.4286,
-	"qwen1.5-72b-chat":            1.4286,
-	"qwen1.5-32b-chat":            1.4286,
-	"qwen1.5-14b-chat":            1.4286,
-	"qwen1.5-7b-chat":             1.4286,
-	"qwen1.5-1.8b-chat":           1.4286,
-	"qwen1.5-0.5b-chat":           1.4286,
-	"qwen-72b-chat":               1.4286,
-	"qwen-14b-chat":               1.4286,
-	"qwen-7b-chat":                1.4286,
-	"qwen-1.8b-chat":              1.4286,
-	"qwen-1.8b-longcontext-chat":  1.4286,
-	"qwen2-vl-7b-instruct":        1.4286,
-	"qwen2-vl-2b-instruct":        1.4286,
-	"qwen-vl-v1":                  1.4286,
-	"qwen-vl-chat-v1":             1.4286,
-	"qwen2-audio-instruct":        1.4286,
-	"qwen-audio-chat":             1.4286,
-	"qwen2.5-math-72b-instruct":   1.4286,
-	"qwen2.5-math-7b-instruct":    1.4286,
-	"qwen2.5-math-1.5b-instruct":  1.4286,
-	"qwen2-math-72b-instruct":     1.4286,
-	"qwen2-math-7b-instruct":      1.4286,
-	"qwen2-math-1.5b-instruct":    1.4286,
-	"qwen2.5-coder-32b-instruct":  1.4286,
-	"qwen2.5-coder-14b-instruct":  1.4286,
-	"qwen2.5-coder-7b-instruct":   1.4286,
-	"qwen2.5-coder-3b-instruct":   1.4286,
-	"qwen2.5-coder-1.5b-instruct": 1.4286,
-	"qwen2.5-coder-0.5b-instruct": 1.4286,
-	"text-embedding-v1":           0.05, // ￥0.0007 / 1k tokens
-	"text-embedding-v3":           0.05,
-	"text-embedding-v2":           0.05,
-	"text-embedding-async-v2":     0.05,
-	"text-embedding-async-v1":     0.05,
-	"ali-stable-diffusion-xl":     8.00,
-	"ali-stable-diffusion-v1.5":   8.00,
-	"wanx-v1":                     8.00,
-	"SparkDesk":                   1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v1.1":              1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v2.1":              1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v3.1":              1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v3.1-128K":         1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v3.5":              1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v3.5-32K":          1.2858, // ￥0.018 / 1k tokens
-	"SparkDesk-v4.0":              1.2858, // ￥0.018 / 1k tokens
-	"360GPT_S2_V9":                0.8572, // ¥0.012 / 1k tokens
-	"embedding-bert-512-v1":       0.0715, // ¥0.001 / 1k tokens
-	"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
-	"ChatStd":                     0.01 * RMB,
-	"ChatPro":                     0.1 * RMB,
+	"qwen-turbo":                0.5715, // ￥0.008 / 1k tokens
+	"qwen-plus":                 1.4286, // ￥0.02 / 1k tokens
+	"qwen-max":                  1.4286, // ￥0.02 / 1k tokens
+	"qwen-max-longcontext":      1.4286, // ￥0.02 / 1k tokens
+	"text-embedding-v1":         0.05,   // ￥0.0007 / 1k tokens
+	"ali-stable-diffusion-xl":   8,
+	"ali-stable-diffusion-v1.5": 8,
+	"wanx-v1":                   8,
+	"SparkDesk":                 1.2858, // ￥0.018 / 1k tokens
+	"SparkDesk-v1.1":            1.2858, // ￥0.018 / 1k tokens
+	"SparkDesk-v2.1":            1.2858, // ￥0.018 / 1k tokens
+	"SparkDesk-v3.1":            1.2858, // ￥0.018 / 1k tokens
+	"SparkDesk-v3.1-128K":       1.2858, // ￥0.018 / 1k tokens
+	"SparkDesk-v3.5":            1.2858, // ￥0.018 / 1k tokens
+	"SparkDesk-v3.5-32K":        1.2858, // ￥0.018 / 1k tokens
+	"SparkDesk-v4.0":            1.2858, // ￥0.018 / 1k tokens
+	"360GPT_S2_V9":              0.8572, // ¥0.012 / 1k tokens
+	"embedding-bert-512-v1":     0.0715, // ¥0.001 / 1k tokens
+	"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
+	"ChatStd":                   0.01 * RMB,
+	"ChatPro":                   0.1 * RMB,
 	// https://platform.moonshot.cn/pricing
 	"moonshot-v1-8k":   0.012 * RMB,
 	"moonshot-v1-32k":  0.024 * RMB,
@@ -281,69 +203,20 @@ var ModelRatio = map[string]float64{
 	"command-r":             0.5 / 1000 * USD,
 	"command-r-plus":        3.0 / 1000 * USD,
 	// https://platform.deepseek.com/api-docs/pricing/
-	"deepseek-chat":     0.14 * MILLI_USD,
-	"deepseek-reasoner": 0.55 * MILLI_USD,
+	"deepseek-chat":  1.0 / 1000 * RMB,
+	"deepseek-coder": 1.0 / 1000 * RMB,
 	// https://www.deepl.com/pro?cta=header-prices
 	"deepl-zh": 25.0 / 1000 * USD,
 	"deepl-en": 25.0 / 1000 * USD,
 	"deepl-ja": 25.0 / 1000 * USD,
 	// https://console.x.ai/
 	"grok-beta": 5.0 / 1000 * USD,
-	// replicate charges based on the number of generated images
-	// https://replicate.com/pricing
-	"black-forest-labs/flux-1.1-pro":                0.04 * USD,
-	"black-forest-labs/flux-1.1-pro-ultra":          0.06 * USD,
-	"black-forest-labs/flux-canny-dev":              0.025 * USD,
-	"black-forest-labs/flux-canny-pro":              0.05 * USD,
-	"black-forest-labs/flux-depth-dev":              0.025 * USD,
-	"black-forest-labs/flux-depth-pro":              0.05 * USD,
-	"black-forest-labs/flux-dev":                    0.025 * USD,
-	"black-forest-labs/flux-dev-lora":               0.032 * USD,
-	"black-forest-labs/flux-fill-dev":               0.04 * USD,
-	"black-forest-labs/flux-fill-pro":               0.05 * USD,
-	"black-forest-labs/flux-pro":                    0.055 * USD,
-	"black-forest-labs/flux-redux-dev":              0.025 * USD,
-	"black-forest-labs/flux-redux-schnell":          0.003 * USD,
-	"black-forest-labs/flux-schnell":                0.003 * USD,
-	"black-forest-labs/flux-schnell-lora":           0.02 * USD,
-	"ideogram-ai/ideogram-v2":                       0.08 * USD,
-	"ideogram-ai/ideogram-v2-turbo":                 0.05 * USD,
-	"recraft-ai/recraft-v3":                         0.04 * USD,
-	"recraft-ai/recraft-v3-svg":                     0.08 * USD,
-	"stability-ai/stable-diffusion-3":               0.035 * USD,
-	"stability-ai/stable-diffusion-3.5-large":       0.065 * USD,
-	"stability-ai/stable-diffusion-3.5-large-turbo": 0.04 * USD,
-	"stability-ai/stable-diffusion-3.5-medium":      0.035 * USD,
-	// replicate chat models
-	"ibm-granite/granite-20b-code-instruct-8k":  0.100 * USD,
-	"ibm-granite/granite-3.0-2b-instruct":       0.030 * USD,
-	"ibm-granite/granite-3.0-8b-instruct":       0.050 * USD,
-	"ibm-granite/granite-8b-code-instruct-128k": 0.050 * USD,
-	"meta/llama-2-13b":                          0.100 * USD,
-	"meta/llama-2-13b-chat":                     0.100 * USD,
-	"meta/llama-2-70b":                          0.650 * USD,
-	"meta/llama-2-70b-chat":                     0.650 * USD,
-	"meta/llama-2-7b":                           0.050 * USD,
-	"meta/llama-2-7b-chat":                      0.050 * USD,
-	"meta/meta-llama-3.1-405b-instruct":         9.500 * USD,
-	"meta/meta-llama-3-70b":                     0.650 * USD,
-	"meta/meta-llama-3-70b-instruct":            0.650 * USD,
-	"meta/meta-llama-3-8b":                      0.050 * USD,
-	"meta/meta-llama-3-8b-instruct":             0.050 * USD,
-	"mistralai/mistral-7b-instruct-v0.2":        0.050 * USD,
-	"mistralai/mistral-7b-v0.1":                 0.050 * USD,
-	"mistralai/mixtral-8x7b-instruct-v0.1":      0.300 * USD,
 }
 
 var CompletionRatio = map[string]float64{
 	// aws llama3
 	"llama3-8b-8192(33)":  0.0006 / 0.0003,
 	"llama3-70b-8192(33)": 0.0035 / 0.00265,
-	// whisper
-	"whisper-1": 0, // only count input tokens
-	// deepseek
-	"deepseek-chat":     0.28 / 0.14,
-	"deepseek-reasoner": 2.19 / 0.55,
 }
 
 var (
@@ -461,22 +334,16 @@ func GetCompletionRatio(name string, channelType int) float64 {
 		return 4.0 / 3.0
 	}
 	if strings.HasPrefix(name, "gpt-4") {
-		if strings.HasPrefix(name, "gpt-4o") {
-			if name == "gpt-4o-2024-05-13" {
-				return 3
-			}
+		if strings.HasPrefix(name, "gpt-4o-mini") || name == "gpt-4o-2024-08-06" {
 			return 4
 		}
 		if strings.HasPrefix(name, "gpt-4-turbo") ||
+			strings.HasPrefix(name, "gpt-4o") ||
 			strings.HasSuffix(name, "preview") {
 			return 3
 		}
 		return 2
 	}
-	// including o1, o1-preview, o1-mini
-	if strings.HasPrefix(name, "o1") {
-		return 4
-	}
 	if name == "chatgpt-4o-latest" {
 		return 3
 	}
@@ -495,7 +362,6 @@ func GetCompletionRatio(name string, channelType int) float64 {
 	if strings.HasPrefix(name, "deepseek-") {
 		return 2
 	}
-
 	switch name {
 	case "llama2-70b-4096":
 		return 0.8 / 0.64
@@ -511,35 +377,6 @@ func GetCompletionRatio(name string, channelType int) float64 {
 		return 5
 	case "grok-beta":
 		return 3
-	// Replicate Models
-	// https://replicate.com/pricing
-	case "ibm-granite/granite-20b-code-instruct-8k":
-		return 5
-	case "ibm-granite/granite-3.0-2b-instruct":
-		return 8.333333333333334
-	case "ibm-granite/granite-3.0-8b-instruct",
-		"ibm-granite/granite-8b-code-instruct-128k":
-		return 5
-	case "meta/llama-2-13b",
-		"meta/llama-2-13b-chat",
-		"meta/llama-2-7b",
-		"meta/llama-2-7b-chat",
-		"meta/meta-llama-3-8b",
-		"meta/meta-llama-3-8b-instruct":
-		return 5
-	case "meta/llama-2-70b",
-		"meta/llama-2-70b-chat",
-		"meta/meta-llama-3-70b",
-		"meta/meta-llama-3-70b-instruct":
-		return 2.750 / 0.650 // ≈4.230769
-	case "meta/meta-llama-3.1-405b-instruct":
-		return 1
-	case "mistralai/mistral-7b-instruct-v0.2",
-		"mistralai/mistral-7b-v0.1":
-		return 5
-	case "mistralai/mixtral-8x7b-instruct-v0.1":
-		return 1.000 / 0.300 // ≈3.333333
 	}
-
 	return 1
 }

relay/channeltype/define.go

@@ -47,6 +47,5 @@ const (
 	Proxy
 	SiliconFlow
 	XAI
-	Replicate
 	Dummy
 )

relay/channeltype/helper.go

@@ -37,8 +37,6 @@ func ToAPIType(channelType int) int {
 		apiType = apitype.DeepL
 	case VertextAI:
 		apiType = apitype.VertexAI
-	case Replicate:
-		apiType = apitype.Replicate
 	case Proxy:
 		apiType = apitype.Proxy
 	}

relay/channeltype/url.go

@@ -47,7 +47,6 @@ var ChannelBaseURLs = []string{
 	"",                                          // 43
 	"https://api.siliconflow.cn",                // 44
 	"https://api.x.ai",                          // 45
-	"https://api.replicate.com/v1/models/",      // 46
 }
 
 func init() {

relay/controller/audio.go

@@ -71,9 +71,9 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 		return openai.ErrorWrapper(err, "get_user_quota_failed", http.StatusInternalServerError)
 	}
 
-	// Check if user quota is enough
+	// Check if user quota is enough Message prompts the user to use Chinese
 	if userQuota-preConsumedQuota < 0 {
-		return openai.ErrorWrapper(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden)
+		return openai.ErrorWrapper(errors.New("请移步充值页面进行充值,可在日志中查阅使用明细"), "insufficient_user_quota", http.StatusForbidden)
 	}
 	err = model.CacheDecreaseUserQuota(userId, preConsumedQuota)
 	if err != nil {
@@ -110,9 +110,16 @@ func RelayAudioHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 	}()
 
 	// map model name
-	modelMapping := c.GetStringMapString(ctxkey.ModelMapping)
-	if modelMapping != nil && modelMapping[audioModel] != "" {
-		audioModel = modelMapping[audioModel]
+	modelMapping := c.GetString(ctxkey.ModelMapping)
+	if modelMapping != "" {
+		modelMap := make(map[string]string)
+		err := json.Unmarshal([]byte(modelMapping), &modelMap)
+		if err != nil {
+			return openai.ErrorWrapper(err, "unmarshal_model_mapping_failed", http.StatusInternalServerError)
+		}
+		if modelMap[audioModel] != "" {
+			audioModel = modelMap[audioModel]
+		}
 	}
 
 	baseURL := channeltype.ChannelBaseURLs[channelType]

relay/controller/helper.go

@@ -4,15 +4,12 @@ import (
 	"context"
 	"errors"
 	"fmt"
+	"github.com/songquanpeng/one-api/relay/constant/role"
 	"math"
 	"net/http"
 	"strings"
 
-	"github.com/songquanpeng/one-api/common/helper"
-	"github.com/songquanpeng/one-api/relay/constant/role"
-
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
@@ -72,8 +69,10 @@ func preConsumeQuota(ctx context.Context, textRequest *relaymodel.GeneralOpenAIR
 	if err != nil {
 		return preConsumedQuota, openai.ErrorWrapper(err, "get_user_quota_failed", http.StatusInternalServerError)
 	}
+	// Check if user quota is enough Message prompts the user to use Chinese
 	if userQuota-preConsumedQuota < 0 {
-		return preConsumedQuota, openai.ErrorWrapper(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden)
+		return preConsumedQuota, openai.ErrorWrapper(errors.New("请移步充值页面进行充值,可在日志中查阅使用明细"), "insufficient_user_quota", http.StatusForbidden)
+
 	}
 	err = model.CacheDecreaseUserQuota(meta.UserId, preConsumedQuota)
 	if err != nil {
@@ -122,20 +121,12 @@ func postConsumeQuota(ctx context.Context, usage *relaymodel.Usage, meta *meta.M
 	if err != nil {
 		logger.Error(ctx, "error update user quota cache: "+err.Error())
 	}
-	logContent := fmt.Sprintf("倍率：%.2f × %.2f × %.2f", modelRatio, groupRatio, completionRatio)
-	model.RecordConsumeLog(ctx, &model.Log{
-		UserId:            meta.UserId,
-		ChannelId:         meta.ChannelId,
-		PromptTokens:      promptTokens,
-		CompletionTokens:  completionTokens,
-		ModelName:         textRequest.Model,
-		TokenName:         meta.TokenName,
-		Quota:             int(quota),
-		Content:           logContent,
-		IsStream:          meta.IsStream,
-		ElapsedTime:       helper.CalcElapsedTime(meta.StartTime),
-		SystemPromptReset: systemPromptReset,
-	})
+	var extraLog string
+	if systemPromptReset {
+		extraLog = " （注意系统提示词已被重置）"
+	}
+	logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f，补全倍率 %.2f%s", modelRatio, groupRatio, completionRatio, extraLog)
+	model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, promptTokens, completionTokens, textRequest.Model, meta.TokenName, quota, logContent)
 	model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
 	model.UpdateChannelUsedQuota(meta.ChannelId, quota)
 }
@@ -158,20 +149,14 @@ func isErrorHappened(meta *meta.Meta, resp *http.Response) bool {
 		}
 		return true
 	}
-	if resp.StatusCode != http.StatusOK &&
-		// replicate return 201 to create a task
-		resp.StatusCode != http.StatusCreated {
+	if resp.StatusCode != http.StatusOK {
 		return true
 	}
 	if meta.ChannelType == channeltype.DeepL {
 		// skip stream check for deepl
 		return false
 	}
-
-	if meta.IsStream && strings.HasPrefix(resp.Header.Get("Content-Type"), "application/json") &&
-		// Even if stream mode is enabled, replicate will first return a task info in JSON format,
-		// requiring the client to request the stream endpoint in the task info
-		meta.ChannelType != channeltype.Replicate {
+	if meta.IsStream && strings.HasPrefix(resp.Header.Get("Content-Type"), "application/json") {
 		return true
 	}
 	return false

relay/controller/image.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common"
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/common/logger"
@@ -23,7 +22,7 @@ import (
 	relaymodel "github.com/songquanpeng/one-api/relay/model"
 )
 
-func getImageRequest(c *gin.Context, _ int) (*relaymodel.ImageRequest, error) {
+func getImageRequest(c *gin.Context, relayMode int) (*relaymodel.ImageRequest, error) {
 	imageRequest := &relaymodel.ImageRequest{}
 	err := common.UnmarshalBodyReusable(c, imageRequest)
 	if err != nil {
@@ -66,7 +65,7 @@ func getImageSizeRatio(model string, size string) float64 {
 	return 1
 }
 
-func validateImageRequest(imageRequest *relaymodel.ImageRequest, _ *meta.Meta) *relaymodel.ErrorWithStatusCode {
+func validateImageRequest(imageRequest *relaymodel.ImageRequest, meta *meta.Meta) *relaymodel.ErrorWithStatusCode {
 	// check prompt length
 	if imageRequest.Prompt == "" {
 		return openai.ErrorWrapper(errors.New("prompt is required"), "prompt_missing", http.StatusBadRequest)
@@ -151,12 +150,12 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 	}
 	adaptor.Init(meta)
 
-	// these adaptors need to convert the request
 	switch meta.ChannelType {
-	case channeltype.Zhipu,
-		channeltype.Ali,
-		channeltype.Replicate,
-		channeltype.Baidu:
+	case channeltype.Ali:
+		fallthrough
+	case channeltype.Baidu:
+		fallthrough
+	case channeltype.Zhipu:
 		finalRequest, err := adaptor.ConvertImageRequest(imageRequest)
 		if err != nil {
 			return openai.ErrorWrapper(err, "convert_image_request_failed", http.StatusInternalServerError)
@@ -173,17 +172,10 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 	ratio := modelRatio * groupRatio
 	userQuota, err := model.CacheGetUserQuota(ctx, meta.UserId)
 
-	var quota int64
-	switch meta.ChannelType {
-	case channeltype.Replicate:
-		// replicate always return 1 image
-		quota = int64(ratio * imageCostRatio * 1000)
-	default:
-		quota = int64(ratio*imageCostRatio*1000) * int64(imageRequest.N)
-	}
-
+	quota := int64(ratio*imageCostRatio*1000) * int64(imageRequest.N)
+	// Check if user quota is enough Message prompts the user to use Chinese
 	if userQuota-quota < 0 {
-		return openai.ErrorWrapper(errors.New("user quota is not enough"), "insufficient_user_quota", http.StatusForbidden)
+		return openai.ErrorWrapper(errors.New("请移步充值页面进行充值,可在日志中查阅使用明细"), "insufficient_user_quota", http.StatusForbidden)
 	}
 
 	// do request
@@ -194,9 +186,7 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 	}
 
 	defer func(ctx context.Context) {
-		if resp != nil &&
-			resp.StatusCode != http.StatusCreated && // replicate returns 201
-			resp.StatusCode != http.StatusOK {
+		if resp != nil && resp.StatusCode != http.StatusOK {
 			return
 		}
 
@@ -210,17 +200,8 @@ func RelayImageHelper(c *gin.Context, relayMode int) *relaymodel.ErrorWithStatus
 		}
 		if quota != 0 {
 			tokenName := c.GetString(ctxkey.TokenName)
-			logContent := fmt.Sprintf("倍率：%.2f × %.2f", modelRatio, groupRatio)
-			model.RecordConsumeLog(ctx, &model.Log{
-				UserId:           meta.UserId,
-				ChannelId:        meta.ChannelId,
-				PromptTokens:     0,
-				CompletionTokens: 0,
-				ModelName:        imageRequest.Model,
-				TokenName:        tokenName,
-				Quota:            int(quota),
-				Content:          logContent,
-			})
+			logContent := fmt.Sprintf("模型倍率 %.2f，分组倍率 %.2f", modelRatio, groupRatio)
+			model.RecordConsumeLog(ctx, meta.UserId, meta.ChannelId, 0, 0, imageRequest.Model, tokenName, quota, logContent)
 			model.UpdateUserUsedQuotaAndRequestCount(meta.UserId, quota)
 			channelId := c.GetInt(ctxkey.ChannelId)
 			model.UpdateChannelUsedQuota(channelId, quota)

relay/controller/text.go

@@ -4,12 +4,11 @@ import (
 	"bytes"
 	"encoding/json"
 	"fmt"
+	"github.com/songquanpeng/one-api/common/config"
 	"io"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
-
-	"github.com/songquanpeng/one-api/common/config"
 	"github.com/songquanpeng/one-api/common/logger"
 	"github.com/songquanpeng/one-api/relay"
 	"github.com/songquanpeng/one-api/relay/adaptor"

relay/meta/relay_meta.go

@@ -1,15 +1,12 @@
 package meta
 
 import (
-	"strings"
-	"time"
-
 	"github.com/gin-gonic/gin"
-
 	"github.com/songquanpeng/one-api/common/ctxkey"
 	"github.com/songquanpeng/one-api/model"
 	"github.com/songquanpeng/one-api/relay/channeltype"
 	"github.com/songquanpeng/one-api/relay/relaymode"
+	"strings"
 )
 
 type Meta struct {
@@ -34,7 +31,6 @@ type Meta struct {
 	RequestURLPath  string
 	PromptTokens    int // only for DoResponse
 	SystemPrompt    string
-	StartTime       time.Time
 }
 
 func GetByContext(c *gin.Context) *Meta {
@@ -52,7 +48,6 @@ func GetByContext(c *gin.Context) *Meta {
 		APIKey:          strings.TrimPrefix(c.Request.Header.Get("Authorization"), "Bearer "),
 		RequestURLPath:  c.Request.URL.String(),
 		SystemPrompt:    c.GetString(ctxkey.SystemPrompt),
-		StartTime:       time.Now(),
 	}
 	cfg, ok := c.Get(ctxkey.Config)
 	if ok {

web/air/src/components/LogsTable.js

@@ -28,8 +28,6 @@ function renderType(type) {
       return <Tag color="orange" size="large"> 管理 </Tag>;
     case 4:
       return <Tag color="purple" size="large"> 系统 </Tag>;
-    case 5:
-      return <Tag color="violet" size="large"> 测试 </Tag>;
     default:
       return <Tag color="black" size="large"> 未知 </Tag>;
   }

web/air/src/constants/channel.constants.js

@@ -31,7 +31,6 @@ export const CHANNEL_OPTIONS = [
   { key: 43, text: 'Proxy', value: 43, color: 'blue' },
   { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
   { key: 45, text: 'xAI', value: 45, color: 'blue' },
-  { key: 46, text: 'Replicate', value: 46, color: 'blue' },
   { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
   { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
   { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },

web/berry/src/constants/ChannelConstants.js

@@ -185,12 +185,6 @@ export const CHANNEL_OPTIONS = {
     value: 45,
     color: 'primary'
   },
-  45: {
-    key: 46,
-    text: 'Replicate',
-    value: 46,
-    color: 'primary'
-  },
   41: {
     key: 41,
     text: 'Novita',

web/berry/src/utils/common.js

@@ -1,260 +1,247 @@
-import {enqueueSnackbar} from 'notistack';
-import {snackbarConstants} from 'constants/SnackbarConstants';
-import {API} from './api';
+import { enqueueSnackbar } from 'notistack';
+import { snackbarConstants } from 'constants/SnackbarConstants';
+import { API } from './api';
 
 export function getSystemName() {
-    let system_name = localStorage.getItem('system_name');
-    if (!system_name) return 'One API';
-    return system_name;
+  let system_name = localStorage.getItem('system_name');
+  if (!system_name) return 'One API';
+  return system_name;
 }
 
 export function isMobile() {
-    return window.innerWidth <= 600;
+  return window.innerWidth <= 600;
 }
 
 // eslint-disable-next-line
-export function SnackbarHTMLContent({htmlContent}) {
-    return <div dangerouslySetInnerHTML={{__html: htmlContent}}/>;
+export function SnackbarHTMLContent({ htmlContent }) {
+  return <div dangerouslySetInnerHTML={{ __html: htmlContent }} />;
 }
 
 export function getSnackbarOptions(variant) {
-    let options = snackbarConstants.Common[variant];
-    if (isMobile()) {
-        // 合并 options 和 snackbarConstants.Mobile
-        options = {...options, ...snackbarConstants.Mobile};
-    }
-    return options;
+  let options = snackbarConstants.Common[variant];
+  if (isMobile()) {
+    // 合并 options 和 snackbarConstants.Mobile
+    options = { ...options, ...snackbarConstants.Mobile };
+  }
+  return options;
 }
 
 export function showError(error) {
-    if (error.message) {
-        if (error.name === 'AxiosError') {
-            switch (error.response.status) {
-                case 429:
-                    enqueueSnackbar('错误：请求次数过多，请稍后再试！', getSnackbarOptions('ERROR'));
-                    break;
-                case 500:
-                    enqueueSnackbar('错误：服务器内部错误，请联系管理员！', getSnackbarOptions('ERROR'));
-                    break;
-                case 405:
-                    enqueueSnackbar('本站仅作演示之用，无服务端！', getSnackbarOptions('INFO'));
-                    break;
-                default:
-                    enqueueSnackbar('错误：' + error.message, getSnackbarOptions('ERROR'));
-            }
-            return;
-        }
-    } else {
-        enqueueSnackbar('错误：' + error, getSnackbarOptions('ERROR'));
+  if (error.message) {
+    if (error.name === 'AxiosError') {
+      switch (error.response.status) {
+        case 429:
+          enqueueSnackbar('错误：请求次数过多，请稍后再试！', getSnackbarOptions('ERROR'));
+          break;
+        case 500:
+          enqueueSnackbar('错误：服务器内部错误，请联系管理员！', getSnackbarOptions('ERROR'));
+          break;
+        case 405:
+          enqueueSnackbar('本站仅作演示之用，无服务端！', getSnackbarOptions('INFO'));
+          break;
+        default:
+          enqueueSnackbar('错误：' + error.message, getSnackbarOptions('ERROR'));
+      }
+      return;
     }
+  } else {
+    enqueueSnackbar('错误：' + error, getSnackbarOptions('ERROR'));
+  }
 }
 
 export function showNotice(message, isHTML = false) {
-    if (isHTML) {
-        enqueueSnackbar(<SnackbarHTMLContent htmlContent={message}/>, getSnackbarOptions('NOTICE'));
-    } else {
-        enqueueSnackbar(message, getSnackbarOptions('NOTICE'));
-    }
+  if (isHTML) {
+    enqueueSnackbar(<SnackbarHTMLContent htmlContent={message} />, getSnackbarOptions('NOTICE'));
+  } else {
+    enqueueSnackbar(message, getSnackbarOptions('NOTICE'));
+  }
 }
 
 export function showWarning(message) {
-    enqueueSnackbar(message, getSnackbarOptions('WARNING'));
+  enqueueSnackbar(message, getSnackbarOptions('WARNING'));
 }
 
 export function showSuccess(message) {
-    enqueueSnackbar(message, getSnackbarOptions('SUCCESS'));
+  enqueueSnackbar(message, getSnackbarOptions('SUCCESS'));
 }
 
 export function showInfo(message) {
-    enqueueSnackbar(message, getSnackbarOptions('INFO'));
+  enqueueSnackbar(message, getSnackbarOptions('INFO'));
 }
 
 export async function getOAuthState() {
-    const res = await API.get('/api/oauth/state');
-    const {success, message, data} = res.data;
-    if (success) {
-        return data;
-    } else {
-        showError(message);
-        return '';
-    }
+  const res = await API.get('/api/oauth/state');
+  const { success, message, data } = res.data;
+  if (success) {
+    return data;
+  } else {
+    showError(message);
+    return '';
+  }
 }
 
 export async function onGitHubOAuthClicked(github_client_id, openInNewTab = false) {
-    const state = await getOAuthState();
-    if (!state) return;
-    let url = `https://github.com/login/oauth/authorize?client_id=${github_client_id}&state=${state}&scope=user:email`;
-    if (openInNewTab) {
-        window.open(url);
-    } else {
-        window.location.href = url;
-    }
+  const state = await getOAuthState();
+  if (!state) return;
+  let url = `https://github.com/login/oauth/authorize?client_id=${github_client_id}&state=${state}&scope=user:email`;
+  if (openInNewTab) {
+    window.open(url);
+  } else {
+    window.location.href = url;
+  }
 }
 
 export async function onLarkOAuthClicked(lark_client_id) {
-    const state = await getOAuthState();
-    if (!state) return;
-    let redirect_uri = `${window.location.origin}/oauth/lark`;
-    window.open(`https://accounts.feishu.cn/open-apis/authen/v1/authorize?redirect_uri=${redirect_uri}&client_id=${lark_client_id}&state=${state}`);
+  const state = await getOAuthState();
+  if (!state) return;
+  let redirect_uri = `${window.location.origin}/oauth/lark`;
+  window.open(`https://open.feishu.cn/open-apis/authen/v1/index?redirect_uri=${redirect_uri}&app_id=${lark_client_id}&state=${state}`);
 }
 
 export async function onOidcClicked(auth_url, client_id, openInNewTab = false) {
-    const state = await getOAuthState();
-    if (!state) return;
-    const redirect_uri = `${window.location.origin}/oauth/oidc`;
-    const response_type = "code";
-    const scope = "openid profile email";
-    const url = `${auth_url}?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=${response_type}&scope=${scope}&state=${state}`;
-    if (openInNewTab) {
-        window.open(url);
-    } else {
-        window.location.href = url;
-    }
+  const state = await getOAuthState();
+  if (!state) return;
+  const redirect_uri = `${window.location.origin}/oauth/oidc`;
+  const response_type = "code";
+  const scope = "openid profile email";
+  const url = `${auth_url}?client_id=${client_id}&redirect_uri=${redirect_uri}&response_type=${response_type}&scope=${scope}&state=${state}`;
+  if (openInNewTab) {
+    window.open(url);
+  } else
+  {
+    window.location.href = url;
+  }
 }
 
 export function isAdmin() {
-    let user = localStorage.getItem('user');
-    if (!user) return false;
-    user = JSON.parse(user);
-    return user.role >= 10;
+  let user = localStorage.getItem('user');
+  if (!user) return false;
+  user = JSON.parse(user);
+  return user.role >= 10;
 }
 
 export function timestamp2string(timestamp) {
-    let date = new Date(timestamp * 1000);
-    let year = date.getFullYear().toString();
-    let month = (date.getMonth() + 1).toString();
-    let day = date.getDate().toString();
-    let hour = date.getHours().toString();
-    let minute = date.getMinutes().toString();
-    let second = date.getSeconds().toString();
-    if (month.length === 1) {
-        month = '0' + month;
-    }
-    if (day.length === 1) {
-        day = '0' + day;
-    }
-    if (hour.length === 1) {
-        hour = '0' + hour;
-    }
-    if (minute.length === 1) {
-        minute = '0' + minute;
-    }
-    if (second.length === 1) {
-        second = '0' + second;
-    }
-    return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
+  let date = new Date(timestamp * 1000);
+  let year = date.getFullYear().toString();
+  let month = (date.getMonth() + 1).toString();
+  let day = date.getDate().toString();
+  let hour = date.getHours().toString();
+  let minute = date.getMinutes().toString();
+  let second = date.getSeconds().toString();
+  if (month.length === 1) {
+    month = '0' + month;
+  }
+  if (day.length === 1) {
+    day = '0' + day;
+  }
+  if (hour.length === 1) {
+    hour = '0' + hour;
+  }
+  if (minute.length === 1) {
+    minute = '0' + minute;
+  }
+  if (second.length === 1) {
+    second = '0' + second;
+  }
+  return year + '-' + month + '-' + day + ' ' + hour + ':' + minute + ':' + second;
 }
 
 export function calculateQuota(quota, digits = 2) {
-    let quotaPerUnit = localStorage.getItem('quota_per_unit');
-    quotaPerUnit = parseFloat(quotaPerUnit);
+  let quotaPerUnit = localStorage.getItem('quota_per_unit');
+  quotaPerUnit = parseFloat(quotaPerUnit);
 
-    return (quota / quotaPerUnit).toFixed(digits);
+  return (quota / quotaPerUnit).toFixed(digits);
 }
 
 export function renderQuota(quota, digits = 2) {
-    let displayInCurrency = localStorage.getItem('display_in_currency');
-    displayInCurrency = displayInCurrency === 'true';
-    if (displayInCurrency) {
-        return '$' + calculateQuota(quota, digits);
-    }
-    return renderNumber(quota);
+  let displayInCurrency = localStorage.getItem('display_in_currency');
+  displayInCurrency = displayInCurrency === 'true';
+  if (displayInCurrency) {
+    return '$' + calculateQuota(quota, digits);
+  }
+  return renderNumber(quota);
 }
 
 export const verifyJSON = (str) => {
-    try {
-        JSON.parse(str);
-    } catch (e) {
-        return false;
-    }
-    return true;
+  try {
+    JSON.parse(str);
+  } catch (e) {
+    return false;
+  }
+  return true;
 };
 
 export function renderNumber(num) {
-    if (num >= 1000000000) {
-        return (num / 1000000000).toFixed(1) + 'B';
-    } else if (num >= 1000000) {
-        return (num / 1000000).toFixed(1) + 'M';
-    } else if (num >= 10000) {
-        return (num / 1000).toFixed(1) + 'k';
-    } else {
-        return num;
-    }
+  if (num >= 1000000000) {
+    return (num / 1000000000).toFixed(1) + 'B';
+  } else if (num >= 1000000) {
+    return (num / 1000000).toFixed(1) + 'M';
+  } else if (num >= 10000) {
+    return (num / 1000).toFixed(1) + 'k';
+  } else {
+    return num;
+  }
 }
 
 export function renderQuotaWithPrompt(quota, digits) {
-    let displayInCurrency = localStorage.getItem('display_in_currency');
-    displayInCurrency = displayInCurrency === 'true';
-    if (displayInCurrency) {
-        return `（等价金额：${renderQuota(quota, digits)}）`;
-    }
-    return '';
+  let displayInCurrency = localStorage.getItem('display_in_currency');
+  displayInCurrency = displayInCurrency === 'true';
+  if (displayInCurrency) {
+    return `（等价金额：${renderQuota(quota, digits)}）`;
+  }
+  return '';
 }
 
 export function downloadTextAsFile(text, filename) {
-    let blob = new Blob([text], {type: 'text/plain;charset=utf-8'});
-    let url = URL.createObjectURL(blob);
-    let a = document.createElement('a');
-    a.href = url;
-    a.download = filename;
-    a.click();
+  let blob = new Blob([text], { type: 'text/plain;charset=utf-8' });
+  let url = URL.createObjectURL(blob);
+  let a = document.createElement('a');
+  a.href = url;
+  a.download = filename;
+  a.click();
 }
 
 export function removeTrailingSlash(url) {
-    if (url.endsWith('/')) {
-        return url.slice(0, -1);
-    } else {
-        return url;
-    }
+  if (url.endsWith('/')) {
+    return url.slice(0, -1);
+  } else {
+    return url;
+  }
 }
 
 let channelModels = undefined;
-
 export async function loadChannelModels() {
-    const res = await API.get('/api/models');
-    const {success, data} = res.data;
-    if (!success) {
-        return;
-    }
-    channelModels = data;
-    localStorage.setItem('channel_models', JSON.stringify(data));
+  const res = await API.get('/api/models');
+  const { success, data } = res.data;
+  if (!success) {
+    return;
+  }
+  channelModels = data;
+  localStorage.setItem('channel_models', JSON.stringify(data));
 }
 
 export function getChannelModels(type) {
-    if (channelModels !== undefined && type in channelModels) {
-        return channelModels[type];
-    }
-    let models = localStorage.getItem('channel_models');
-    if (!models) {
-        return [];
-    }
-    channelModels = JSON.parse(models);
-    if (type in channelModels) {
-        return channelModels[type];
-    }
+  if (channelModels !== undefined && type in channelModels) {
+    return channelModels[type];
+  }
+  let models = localStorage.getItem('channel_models');
+  if (!models) {
     return [];
+  }
+  channelModels = JSON.parse(models);
+  if (type in channelModels) {
+    return channelModels[type];
+  }
+  return [];
 }
 
 export function copy(text, name = '') {
-    if (navigator.clipboard && navigator.clipboard.writeText) {
-        navigator.clipboard.writeText(text).then(() => {
-            showNotice(`复制${name}成功！`, true);
-        }, () => {
-            text = `复制${name}失败，请手动复制：<br /><br />${text}`;
-            enqueueSnackbar(<SnackbarHTMLContent htmlContent={text}/>, getSnackbarOptions('COPY'));
-        });
-    } else {
-        const textArea = document.createElement("textarea");
-        textArea.value = text;
-        document.body.appendChild(textArea);
-        textArea.select();
-        try {
-            document.execCommand('copy');
-            showNotice(`复制${name}成功！`, true);
-        } catch (err) {
-            text = `复制${name}失败，请手动复制：<br /><br />${text}`;
-            enqueueSnackbar(<SnackbarHTMLContent htmlContent={text}/>, getSnackbarOptions('COPY'));
-        }
-        document.body.removeChild(textArea);
-    }
+  try {
+    navigator.clipboard.writeText(text);
+  } catch (error) {
+    text = `复制${name}失败，请手动复制：<br /><br />${text}`;
+    enqueueSnackbar(<SnackbarHTMLContent htmlContent={text} />, getSnackbarOptions('COPY'));
+    return;
+  }
+  showSuccess(`复制${name}成功！`);
 }

web/berry/src/views/Channel/component/TableRow.js

@@ -268,8 +268,6 @@ function renderBalance(type, balance) {
       return <span>¥{balance.toFixed(2)}</span>;
     case 13: // AIGC2D
       return <span>{renderNumber(balance)}</span>;
-    case 36: // DeepSeek
-      return <span>¥{balance.toFixed(2)}</span>;
     case 44: // SiliconFlow
       return <span>¥{balance.toFixed(2)}</span>;
     default:

web/berry/src/views/Log/type/LogType.js

@@ -3,8 +3,7 @@ const LOG_TYPE = {
   1: { value: '1', text: '充值', color: 'primary' },
   2: { value: '2', text: '消费', color: 'orange' },
   3: { value: '3', text: '管理', color: 'default' },
-  4: { value: '4', text: '系统', color: 'secondary' },
-  5: { value: '5', text: '测试', color: 'secondary' },
+  4: { value: '4', text: '系统', color: 'secondary' }
 };
 
 export default LOG_TYPE;

web/default/package.json

@@ -5,20 +5,14 @@
   "dependencies": {
     "axios": "^0.27.2",
     "history": "^5.3.0",
-    "i18next": "^24.2.2",
-    "i18next-browser-languagedetector": "^8.0.2",
-    "i18next-http-backend": "^3.0.2",
     "marked": "^4.1.1",
-    "moment": "^2.30.1",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-dropzone": "^14.2.3",
-    "react-i18next": "^15.4.0",
     "react-router-dom": "^6.3.0",
     "react-scripts": "5.0.1",
     "react-toastify": "^9.0.8",
     "react-turnstile": "^1.0.5",
-    "recharts": "^2.15.1",
     "semantic-ui-css": "^2.5.0",
     "semantic-ui-react": "^2.1.3"
   },

web/default/public/locales/en/translation.json

@@ -1,758 +0,0 @@
-{
-  "header": {
-    "home": "Home",
-    "channel": "Channel",
-    "token": "Token",
-    "redemption": "Redemption",
-    "topup": "Top Up",
-    "user": "User",
-    "dashboard": "Dashboard",
-    "log": "Log",
-    "setting": "Settings",
-    "about": "About",
-    "chat": "Chat",
-    "login": "Login",
-    "logout": "Logout",
-    "register": "Register"
-  },
-  "topup": {
-    "title": "Top Up Center",
-    "get_code": {
-      "title": "Get Redemption Code",
-      "current_quota": "Current Available Quota",
-      "button": "Get Code Now"
-    },
-    "redeem_code": {
-      "title": "Redeem Code",
-      "placeholder": "Please enter redemption code",
-      "paste": "Paste",
-      "paste_error": "Cannot access clipboard, please paste manually",
-      "submit": "Redeem Now",
-      "submitting": "Redeeming...",
-      "empty_code": "Please enter the redemption code!",
-      "success": "Top up successful!",
-      "request_failed": "Request failed",
-      "no_link": "Admin has not set up the top-up link!"
-    }
-  },
-  "channel": {
-    "title": "Channel Management",
-    "search": "Search channels by ID, name and key...",
-    "balance_notice": "OpenAI channels no longer support getting balance via key, so balance shows as 0. For supported channel types, click balance to refresh.",
-    "test_notice": "Channel testing only supports chat models, preferring gpt-3.5-turbo. If unavailable, uses the first model in your configured list.",
-    "detail_notice": "Click the detail button below to show balance and set additional test models.",
-    "table": {
-      "id": "ID",
-      "name": "Name",
-      "group": "Group",
-      "type": "Type",
-      "status": "Status",
-      "response_time": "Response Time",
-      "balance": "Balance",
-      "priority": "Priority",
-      "test_model": "Test Model",
-      "actions": "Actions",
-      "no_name": "None",
-      "status_enabled": "Enabled",
-      "status_disabled": "Disabled",
-      "status_auto_disabled": "Disabled",
-      "status_disabled_tip": "This channel is manually disabled",
-      "status_auto_disabled_tip": "This channel is automatically disabled",
-      "status_unknown": "Unknown Status",
-      "not_tested": "Not Tested",
-      "priority_tip": "Channel selection priority, higher is preferred",
-      "select_test_model": "Please select test model",
-      "click_to_update": "Click to update"
-    },
-    "buttons": {
-      "test": "Test",
-      "delete": "Delete",
-      "confirm_delete": "Delete Channel",
-      "enable": "Enable",
-      "disable": "Disable",
-      "edit": "Edit",
-      "add": "Add New Channel",
-      "test_all": "Test All Channels",
-      "test_disabled": "Test Disabled Channels",
-      "delete_disabled": "Delete Disabled Channels",
-      "confirm_delete_disabled": "Confirm Delete",
-      "refresh": "Refresh",
-      "show_detail": "Details",
-      "hide_detail": "Hide Details"
-    },
-    "messages": {
-      "test_success": "Channel {{name}} test successful, model {{model}}, time {{time}}s, output: {{message}}",
-      "test_all_started": "Channel testing started successfully, please refresh page to see results.",
-      "delete_disabled_success": "Deleted all disabled channels, total: {{count}}",
-      "balance_update_success": "Channel {{name}} balance updated successfully!",
-      "all_balance_updated": "All enabled channel balances have been updated!"
-    },
-    "edit": {
-      "title_edit": "Update Channel Information",
-      "title_create": "Create New Channel",
-      "type": "Type",
-      "name": "Name",
-      "name_placeholder": "Please enter name",
-      "group": "Group",
-      "group_placeholder": "Please select groups that can use this channel",
-      "group_addition": "Please edit group multipliers in system settings to add new group:",
-      "models": "Models",
-      "models_placeholder": "Please select models supported by this channel",
-      "model_mapping": "Model Mapping",
-      "model_mapping_placeholder": "Optional, used to modify model names in request body. A JSON string where keys are request model names and values are target model names",
-      "system_prompt": "System Prompt",
-      "system_prompt_placeholder": "Optional, used to force set system prompt. Use with custom model & model mapping. First create a unique custom model name above, then map it to a natively supported model",
-      "base_url": "Proxy",
-      "base_url_placeholder": "Optional, used for API calls through proxy. Enter proxy address in format: https://domain.com",
-      "key": "Key",
-      "key_placeholder": "Please enter key",
-      "batch": "Batch Create",
-      "batch_placeholder": "Please enter keys, one per line",
-      "buttons": {
-        "cancel": "Cancel",
-        "submit": "Submit",
-        "fill_models": "Fill Related Models",
-        "fill_all": "Fill All Models",
-        "clear": "Clear All Models",
-        "add_custom": "Add",
-        "custom_placeholder": "Enter custom model name"
-      },
-      "messages": {
-        "name_required": "Please enter channel name and key!",
-        "models_required": "Please select at least one model!",
-        "model_mapping_invalid": "Model mapping must be valid JSON format!",
-        "update_success": "Channel updated successfully!",
-        "create_success": "Channel created successfully!"
-      },
-      "spark_version": "Model Version",
-      "spark_version_placeholder": "Please enter Spark model version from API URL, e.g.: v2.1",
-      "knowledge_id": "Knowledge Base ID",
-      "knowledge_id_placeholder": "Please enter knowledge base ID, e.g.: 123456",
-      "plugin_param": "Plugin Parameter",
-      "plugin_param_placeholder": "Please enter plugin parameter (X-DashScope-Plugin header value)",
-      "coze_notice": "For Coze, model name is the Bot ID. You can add prefix `bot-`, e.g.: `bot-123456`.",
-      "douban_notice": "For Douban, you need to go to",
-      "douban_notice_link": "Model Inference Page",
-      "douban_notice_2": "to create an inference endpoint, and use the endpoint name as model name, e.g.: `ep-20240608051426-tkxvl`.",
-      "aws_region_placeholder": "region, e.g.: us-west-2",
-      "aws_ak_placeholder": "AWS IAM Access Key",
-      "aws_sk_placeholder": "AWS IAM Secret Key",
-      "vertex_region_placeholder": "Vertex AI Region, e.g.: us-east5",
-      "vertex_project_id": "Vertex AI Project ID",
-      "vertex_project_id_placeholder": "Vertex AI Project ID",
-      "vertex_credentials": "Google Cloud Application Default Credentials JSON",
-      "vertex_credentials_placeholder": "Google Cloud Application Default Credentials JSON",
-      "user_id": "User ID",
-      "user_id_placeholder": "User ID who generated this key",
-      "key_prompts": {
-        "default": "Please enter the authentication key for this channel",
-        "zhipu": "Enter in format: APIKey|SecretKey",
-        "spark": "Enter in format: APPID|APISecret|APIKey",
-        "fastgpt": "Enter in format: APIKey-AppId, e.g.: fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041",
-        "tencent": "Enter in format: AppId|SecretId|SecretKey"
-      }
-    }
-  },
-  "token": {
-    "title": "Token Management",
-    "search": "Search tokens by name ...",
-    "table": {
-      "name": "Name",
-      "status": "Status",
-      "used_quota": "Used Quota",
-      "remain_quota": "Remaining Quota",
-      "created_time": "Created Time",
-      "expired_time": "Expiry Time",
-      "actions": "Actions",
-      "no_name": "None",
-      "never_expire": "Never Expires",
-      "unlimited": "Unlimited",
-      "status_enabled": "Enabled",
-      "status_disabled": "Disabled",
-      "status_expired": "Expired",
-      "status_depleted": "Depleted",
-      "status_unknown": "Unknown Status"
-    },
-    "buttons": {
-      "copy": "Copy",
-      "chat": "Chat",
-      "delete": "Delete",
-      "confirm_delete": "Delete Token",
-      "enable": "Enable",
-      "disable": "Disable",
-      "edit": "Edit",
-      "add": "Add New Token",
-      "refresh": "Refresh"
-    },
-    "edit": {
-      "title_edit": "Update Token Information",
-      "title_create": "Create New Token",
-      "name": "Name",
-      "name_placeholder": "Please enter name",
-      "models": "Model Scope",
-      "models_placeholder": "Please select allowed models, leave empty for no restrictions",
-      "ip_limit": "IP Restriction",
-      "ip_limit_placeholder": "Please enter allowed subnets, e.g.: 192.168.0.0/24, use commas to separate multiple subnets",
-      "expire_time": "Expiry Time",
-      "expire_time_placeholder": "Please enter expiry time in yyyy-MM-dd HH:mm:ss format, -1 for no limit",
-      "quota_notice": "Note: Token quota only limits the maximum usage of the token itself, actual usage is subject to account remaining quota.",
-      "quota": "Quota",
-      "quota_placeholder": "Please enter quota",
-      "buttons": {
-        "never_expire": "Never Expire",
-        "expire_1_month": "Expire in 1 Month",
-        "expire_1_day": "Expire in 1 Day",
-        "expire_1_hour": "Expire in 1 Hour",
-        "expire_1_minute": "Expire in 1 Minute",
-        "unlimited_quota": "Set Unlimited Quota",
-        "cancel_unlimited": "Cancel Unlimited Quota",
-        "submit": "Submit",
-        "cancel": "Cancel"
-      },
-      "messages": {
-        "update_success": "Token updated successfully!",
-        "create_success": "Token created successfully, please copy it from the list page!",
-        "expire_time_invalid": "Invalid expiry time format!"
-      }
-    },
-    "copy_options": {
-      "raw": "Copy Raw Token",
-      "ama": "Copy AMA Link",
-      "opencat": "Copy OpenCat Link",
-      "next": "Copy NextChat Link",
-      "lobe": "Copy LobeChat Link"
-    },
-    "messages": {
-      "copy_success": "Copied to clipboard!",
-      "copy_failed": "Unable to copy to clipboard, please copy manually. Token has been filled in the search box.",
-      "operation_success": "Operation completed successfully!"
-    },
-    "sort": {
-      "placeholder": "Sort By",
-      "default": "Default Order",
-      "by_remain": "Sort by Remaining Quota",
-      "by_used": "Sort by Used Quota"
-    }
-  },
-  "common": {
-    "quota": {
-      "display": "Equivalent: ${{amount}}",
-      "display_short": "${{amount}}",
-      "unit": "$"
-    }
-  },
-  "redemption": {
-    "title": "Redemption Management",
-    "search": "Search redemption codes by ID and name ...",
-    "table": {
-      "id": "ID",
-      "name": "Name",
-      "status": "Status",
-      "quota": "Quota",
-      "created_time": "Created Time",
-      "redeemed_time": "Redeemed Time",
-      "actions": "Actions",
-      "no_name": "None",
-      "not_redeemed": "Not Redeemed"
-    },
-    "buttons": {
-      "copy": "Copy",
-      "delete": "Delete",
-      "confirm_delete": "Confirm Delete",
-      "enable": "Enable",
-      "disable": "Disable",
-      "edit": "Edit",
-      "add": "Add New Code",
-      "refresh": "Refresh"
-    },
-    "status": {
-      "unused": "Unused",
-      "disabled": "Disabled",
-      "used": "Used",
-      "unknown": "Unknown"
-    },
-    "edit": {
-      "title_edit": "Update Redemption Code",
-      "title_create": "Create New Redemption Code",
-      "name": "Name",
-      "name_placeholder": "Please enter name",
-      "quota": "Quota",
-      "quota_placeholder": "Please enter quota per redemption code",
-      "count": "Generate Count",
-      "count_placeholder": "Please enter number of codes to generate",
-      "buttons": {
-        "submit": "Submit",
-        "cancel": "Cancel"
-      }
-    },
-    "messages": {
-      "update_success": "Redemption code updated successfully!",
-      "create_success": "Redemption code created successfully!"
-    }
-  },
-  "log": {
-    "title": "Operation Log",
-    "search": "Search logs...",
-    "usage_details": "Usage Details",
-    "total_quota": "Total Quota Used",
-    "click_to_view": "Click to View",
-    "type": {
-      "select": "Select Log Type",
-      "all": "All",
-      "topup": "Top Up",
-      "usage": "Usage",
-      "admin": "Admin",
-      "system": "System",
-      "test": "Test"
-    },
-    "table": {
-      "time": "Time",
-      "channel": "Channel",
-      "type": "Type",
-      "model": "Model",
-      "username": "Username",
-      "token_name": "Token Name",
-      "token_name_placeholder": "Optional",
-      "model_name": "Model Name",
-      "model_name_placeholder": "Optional",
-      "start_time": "Start Time",
-      "end_time": "End Time",
-      "channel_id": "Channel ID",
-      "channel_id_placeholder": "Optional",
-      "username_placeholder": "Optional",
-      "prompt_tokens": "Prompt Tokens",
-      "completion_tokens": "Completion Tokens",
-      "quota": "Quota",
-      "detail": "Detail"
-    },
-    "buttons": {
-      "query": "Action",
-      "submit": "Query",
-      "refresh": "Refresh"
-    }
-  },
-  "user": {
-    "title": "User Management",
-    "edit": {
-      "title": "Update User Information",
-      "username": "Username",
-      "username_placeholder": "Please enter new username",
-      "password": "Password",
-      "password_placeholder": "Please enter new password, minimum 8 characters",
-      "display_name": "Display Name",
-      "display_name_placeholder": "Please enter new display name",
-      "group": "Group",
-      "group_placeholder": "Please select group",
-      "group_addition": "Please edit group multipliers in system settings to add new group:",
-      "quota": "Remaining Quota",
-      "quota_placeholder": "Please enter new remaining quota",
-      "github_id": "Linked GitHub Account",
-      "github_id_placeholder": "Read-only, user must link through personal settings page, cannot be modified directly",
-      "wechat_id": "Linked WeChat Account",
-      "wechat_id_placeholder": "Read-only, user must link through personal settings page, cannot be modified directly",
-      "email": "Linked Email Account",
-      "email_placeholder": "Read-only, user must link through personal settings page, cannot be modified directly",
-      "buttons": {
-        "submit": "Submit",
-        "cancel": "Cancel"
-      }
-    },
-    "add": {
-      "title": "Create New User Account"
-    },
-    "messages": {
-      "update_success": "User information updated successfully!",
-      "create_success": "User account created successfully!",
-      "operation_success": "Operation completed successfully!"
-    },
-    "search": "Search users...",
-    "table": {
-      "id": "ID",
-      "username": "Username",
-      "group": "Group",
-      "quota": "Quota",
-      "role_text": "Role",
-      "status_text": "Status",
-      "actions": "Actions",
-      "remaining_quota": "Remaining Quota",
-      "used_quota": "Used Quota",
-      "request_count": "Request Count",
-      "role_types": {
-        "normal": "Normal User",
-        "admin": "Admin",
-        "super_admin": "Super Admin",
-        "unknown": "Unknown Role"
-      },
-      "status_types": {
-        "activated": "Activated",
-        "banned": "Banned",
-        "unknown": "Unknown Status"
-      },
-      "sort": {
-        "default": "Default Order",
-        "by_quota": "Sort by Remaining Quota",
-        "by_used_quota": "Sort by Used Quota",
-        "by_request_count": "Sort by Request Count"
-      },
-      "sort_by": "Sort By"
-    },
-    "buttons": {
-      "add": "Add New User",
-      "delete": "Delete",
-      "delete_user": "Delete User",
-      "enable": "Enable",
-      "disable": "Disable",
-      "edit": "Edit",
-      "promote": "Promote",
-      "demote": "Demote"
-    }
-  },
-  "dashboard": {
-    "charts": {
-      "requests": {
-        "title": "Model Request Trend",
-        "tooltip": "Request Count"
-      },
-      "quota": {
-        "title": "Quota Usage Trend",
-        "tooltip": "Quota Used"
-      },
-      "tokens": {
-        "title": "Token Usage Trend",
-        "tooltip": "Token Count"
-      }
-    },
-    "statistics": {
-      "title": "Statistics",
-      "tooltip": {
-        "date": "Date",
-        "value": "Value"
-      }
-    }
-  },
-  "setting": {
-    "title": "System Settings",
-    "tabs": {
-      "personal": "Personal Settings",
-      "operation": "Operation Settings",
-      "system": "System Settings",
-      "other": "Other Settings"
-    },
-    "personal": {
-      "general": {
-        "title": "General Settings",
-        "system_token_notice": "Note: The token generated here is for system management, not for requesting OpenAI related services.",
-        "buttons": {
-          "update_profile": "Update Profile",
-          "generate_token": "Generate System Token",
-          "copy_invite": "Copy Invite Link",
-          "delete_account": "Delete Account"
-        }
-      },
-      "binding": {
-        "title": "Account Binding",
-        "buttons": {
-          "bind_wechat": "Bind WeChat Account",
-          "bind_github": "Bind GitHub Account",
-          "bind_email": "Bind Email Address",
-          "bind_lark": "Bind Lark Account"
-        },
-        "wechat": {
-          "title": "WeChat Binding",
-          "description": "Scan QR code to follow the official account, enter 'verification code' to get the code (valid for 3 minutes)",
-          "verification_code": "Verification Code",
-          "bind": "Bind"
-        },
-        "email": {
-          "title": "Bind Email Address",
-          "email_placeholder": "Enter email address",
-          "code_placeholder": "Verification code",
-          "get_code": "Get Code",
-          "get_code_retry": "Resend({{countdown}})",
-          "bind": "Confirm Binding",
-          "cancel": "Cancel"
-        }
-      },
-      "delete_account": {
-        "title": "Dangerous Operation",
-        "warning": "You are deleting your account. All data will be cleared and cannot be recovered",
-        "confirm_placeholder": "Enter your username {{username}} to confirm deletion",
-        "buttons": {
-          "confirm": "Confirm Delete",
-          "cancel": "Cancel"
-        }
-      }
-    },
-    "system": {
-      "general": {
-        "title": "General Settings",
-        "server_address": "Server Address",
-        "server_address_placeholder": "e.g.: https://yourdomain.com",
-        "buttons": {
-          "update": "Update Server Address"
-        }
-      },
-      "login": {
-        "title": "Login & Registration Settings",
-        "password_login": "Allow Password Login",
-        "password_register": "Allow Password Registration",
-        "email_verification": "Require Email Verification for Password Registration",
-        "github_oauth": "Allow GitHub OAuth Login & Registration",
-        "wechat_login": "Allow WeChat Login & Registration",
-        "registration": "Allow New User Registration (When disabled, new users cannot register by any means)",
-        "turnstile": "Enable Turnstile User Verification"
-      },
-      "email_restriction": {
-        "title": "Email Domain Whitelist",
-        "subtitle": "Used to prevent malicious users from batch registering using temporary emails",
-        "enable": "Enable Email Domain Whitelist",
-        "allowed_domains": "Allowed Email Domains",
-        "add_domain": "Add New Allowed Email Domain",
-        "add_domain_placeholder": "Enter new allowed email domain",
-        "buttons": {
-          "fill": "Fill",
-          "save": "Save Email Domain Whitelist Settings"
-        }
-      },
-      "smtp": {
-        "title": "SMTP Configuration",
-        "subtitle": "Used to support system email sending",
-        "server": "SMTP Server Address",
-        "server_placeholder": "e.g.: smtp.gmail.com",
-        "port": "SMTP Port",
-        "port_placeholder": "Default: 587",
-        "account": "SMTP Account",
-        "account_placeholder": "Usually your email address",
-        "from": "SMTP Sender Email",
-        "from_placeholder": "Usually same as email address",
-        "token": "SMTP Access Token",
-        "token_placeholder": "Sensitive information will not be sent to frontend",
-        "buttons": {
-          "save": "Save SMTP Settings"
-        }
-      },
-      "github": {
-        "title": "GitHub OAuth App Configuration",
-        "subtitle": "Used to support GitHub login and registration",
-        "manage_link": "Click here",
-        "manage_text": "to manage your GitHub OAuth Apps",
-        "url_notice": "Set Homepage URL to {{server_url}}, and Authorization callback URL to {{callback_url}}",
-        "client_id": "GitHub Client ID",
-        "client_id_placeholder": "Enter your registered GitHub OAuth APP ID",
-        "client_secret": "GitHub Client Secret",
-        "client_secret_placeholder": "Sensitive information will not be sent to frontend",
-        "buttons": {
-          "save": "Save GitHub OAuth Settings"
-        }
-      },
-      "lark": {
-        "title": "Lark OAuth Configuration",
-        "subtitle": "Used to support Lark login and registration",
-        "manage_link": "Click here",
-        "manage_text": "to manage your Lark applications",
-        "url_notice": "Set Homepage URL to {{server_url}}, and Redirect URL to {{callback_url}}",
-        "client_id": "App ID",
-        "client_id_placeholder": "Enter App ID",
-        "client_secret": "App Secret",
-        "client_secret_placeholder": "Sensitive information will not be sent to frontend",
-        "buttons": {
-          "save": "Save Lark OAuth Settings"
-        }
-      },
-      "wechat": {
-        "title": "WeChat Server Configuration",
-        "subtitle": "Used to support WeChat login and registration",
-        "learn_more": "Learn about WeChat Server",
-        "server_address": "WeChat Server Address",
-        "server_address_placeholder": "e.g.: https://yourdomain.com",
-        "token": "WeChat Server Access Token",
-        "token_placeholder": "Sensitive information will not be sent to frontend",
-        "qrcode": "WeChat Official Account QR Code Image URL",
-        "qrcode_placeholder": "Enter an image URL",
-        "buttons": {
-          "save": "Save WeChat Server Settings"
-        }
-      },
-      "turnstile": {
-        "title": "Turnstile Configuration",
-        "subtitle": "Used to support user verification",
-        "manage_link": "Click here",
-        "manage_text": "to manage your Turnstile Sites, Invisible Widget Type recommended",
-        "site_key": "Turnstile Site Key",
-        "site_key_placeholder": "Enter your registered Turnstile Site Key",
-        "secret_key": "Turnstile Secret Key",
-        "secret_key_placeholder": "Sensitive information will not be sent to frontend",
-        "buttons": {
-          "save": "Save Turnstile Settings"
-        }
-      },
-      "password_login": {
-        "warning": {
-          "title": "Warning",
-          "content": "Disabling password login will prevent all users (including administrators) who haven't bound other login methods from logging in via password. Confirm disable?",
-          "buttons": {
-            "confirm": "Confirm",
-            "cancel": "Cancel"
-          }
-        }
-      }
-    },
-    "operation": {
-      "quota": {
-        "title": "Quota Settings",
-        "new_user": "Initial Quota for New Users",
-        "new_user_placeholder": "e.g.: 100",
-        "pre_consume": "Pre-consumed Quota per Request",
-        "pre_consume_placeholder": "Refund or charge difference after request",
-        "inviter_reward": "Reward Quota for Inviter",
-        "inviter_reward_placeholder": "e.g.: 2000",
-        "invitee_reward": "Reward Quota for Using Invite Code",
-        "invitee_reward_placeholder": "e.g.: 1000",
-        "buttons": {
-          "save": "Save Quota Settings"
-        }
-      },
-      "ratio": {
-        "title": "Ratio Settings",
-        "model": {
-          "title": "Model Ratio",
-          "placeholder": "A JSON text where keys are model names and values are ratios"
-        },
-        "completion": {
-          "title": "Completion Ratio",
-          "placeholder": "A JSON text where keys are model names and values are ratios. These ratios are the proportion of completion to prompt ratio, which can override One API's internal ratios"
-        },
-        "group": {
-          "title": "Group Ratio",
-          "placeholder": "A JSON text where keys are group names and values are ratios"
-        },
-        "buttons": {
-          "save": "Save Ratio Settings"
-        }
-      },
-      "log": {
-        "title": "Log Settings",
-        "enable_consume": "Enable Quota Consumption Logging",
-        "target_time": "Target Time",
-        "buttons": {
-          "clean": "Clean Historical Logs"
-        }
-      },
-      "monitor": {
-        "title": "Monitor Settings",
-        "max_response_time": "Maximum Response Time",
-        "max_response_time_placeholder": "In seconds, channels exceeding this time during testing will be automatically disabled",
-        "quota_reminder": "Quota Reminder Threshold",
-        "quota_reminder_placeholder": "Users will receive email reminders when quota falls below this value",
-        "auto_disable": "Automatically Disable Channel on Failure",
-        "auto_enable": "Automatically Enable Channel on Success",
-        "buttons": {
-          "save": "Save Monitor Settings"
-        }
-      },
-      "general": {
-        "title": "General Settings",
-        "topup_link": "Top-up Link",
-        "topup_link_placeholder": "e.g.: Card selling website purchase link",
-        "chat_link": "Chat Page Link",
-        "chat_link_placeholder": "e.g.: ChatGPT Next Web deployment address",
-        "quota_per_unit": "Quota per Dollar",
-        "quota_per_unit_placeholder": "Quota exchangeable per unit of currency",
-        "retry_times": "Retry Times on Failure",
-        "retry_times_placeholder": "Number of retry attempts on failure",
-        "display_in_currency": "Display Quota in Currency Format",
-        "display_token_stat": "Show Token Quota Instead of User Quota in Billing APIs",
-        "approximate_token": "Use Approximate Method to Estimate Token Count",
-        "buttons": {
-          "save": "Save General Settings"
-        }
-      }
-    },
-    "other": {
-      "notice": {
-        "title": "Notice Settings",
-        "content": "Notice Content",
-        "content_placeholder": "Enter new notice content here, supports Markdown & HTML code",
-        "buttons": {
-          "save": "Save Notice"
-        }
-      },
-      "system": {
-        "title": "System Settings",
-        "name": "System Name",
-        "name_placeholder": "Please enter system name",
-        "logo": "Logo Image URL",
-        "logo_placeholder": "Enter Logo image URL here",
-        "theme": {
-          "title": "Theme Name",
-          "link": "Available Themes",
-          "placeholder": "Please enter theme name"
-        },
-        "buttons": {
-          "save_name": "Set System Name",
-          "save_logo": "Set Logo",
-          "save_theme": "Set Theme (Restart Required)"
-        }
-      },
-      "content": {
-        "title": "Content Settings",
-        "homepage": {
-          "title": "Homepage Content",
-          "placeholder": "Enter homepage content here, supports Markdown & HTML code. Status information will not be shown after setting. If a link is entered, it will be used as the src attribute of an iframe, allowing you to set any webpage as homepage."
-        },
-        "about": {
-          "title": "About System",
-          "description": "You can set about content in settings page, supports HTML & Markdown",
-          "repository": "Project Repository:",
-          "loading_failed": "Failed to load about content..."
-        },
-        "footer": {
-          "title": "Footer",
-          "placeholder": "Enter new footer here, leave empty to use default footer, supports HTML code"
-        },
-        "buttons": {
-          "save_homepage": "Save Homepage Content",
-          "save_about": "Save About",
-          "save_footer": "Set Footer"
-        }
-      },
-      "copyright": {
-        "notice": "Removing One API's copyright notice requires authorization. Project maintenance requires significant effort, if this project is meaningful to you, please actively support it."
-      }
-    }
-  },
-  "footer": {
-    "built_by": "built by",
-    "built_by_name": "JustSong",
-    "license": ", source code is licensed under the",
-    "mit": "MIT License"
-  },
-  "home": {
-    "welcome": {
-      "title": "Welcome to One API",
-      "description": "One API is a LLM API management and distribution system that helps you better manage and use LLM APIs from various providers.",
-      "login_notice": "To use the service, please login or register first."
-    },
-    "system_status": {
-      "title": "System Status",
-      "info": {
-        "title": "System Information",
-        "name": "Name: ",
-        "version": "Version: ",
-        "source": "Source: ",
-        "source_link": "GitHub Repository",
-        "start_time": "Start Time: "
-      },
-      "config": {
-        "title": "System Configuration",
-        "email_verify": "Email Verification: ",
-        "github_oauth": "GitHub OAuth: ",
-        "wechat_login": "WeChat Login: ",
-        "turnstile": "Turnstile Check: ",
-        "enabled": "Enabled",
-        "disabled": "Disabled"
-      }
-    },
-    "loading_failed": "Failed to load homepage content..."
-  }
-}

web/default/public/locales/zh/translation.json

@@ -1,762 +0,0 @@
-{
-  "header": {
-    "home": "首页",
-    "channel": "渠道",
-    "token": "令牌",
-    "redemption": "兑换",
-    "topup": "充值",
-    "user": "用户",
-    "dashboard": "总览",
-    "log": "日志",
-    "setting": "设置",
-    "about": "关于",
-    "chat": "聊天",
-    "login": "登录",
-    "logout": "注销",
-    "register": "注册"
-  },
-  "topup": {
-    "title": "充值中心",
-    "get_code": {
-      "title": "获取兑换码",
-      "current_quota": "当前可用额度",
-      "button": "立即获取兑换码"
-    },
-    "redeem_code": {
-      "title": "兑换码充值",
-      "placeholder": "请输入兑换码",
-      "paste": "粘贴",
-      "paste_error": "无法访问剪贴板，请手动粘贴",
-      "submit": "立即兑换",
-      "submitting": "兑换中...",
-      "empty_code": "请输入兑换码！",
-      "success": "充值成功！",
-      "request_failed": "请求失败",
-      "no_link": "超级管理员未设置充值链接！"
-    }
-  },
-  "channel": {
-    "title": "管理渠道",
-    "search": "搜索渠道的 ID，名称和密钥 ...",
-    "balance_notice": "OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。",
-    "test_notice": "渠道测试仅支持 chat 模型，优先使用 gpt-3.5-turbo，如果该模型不可用则使用你所配置的模型列表中的第一个模型。",
-    "detail_notice": "点击下方详情按钮可以显示余额以及设置额外的测试模型。",
-    "table": {
-      "id": "ID",
-      "name": "名称",
-      "group": "分组",
-      "type": "类型",
-      "status": "状态",
-      "response_time": "响应时间",
-      "balance": "余额",
-      "priority": "优先级",
-      "test_model": "测试模型",
-      "actions": "操作",
-      "no_name": "无",
-      "status_enabled": "已启用",
-      "status_disabled": "已禁用",
-      "status_auto_disabled": "已禁用",
-      "status_disabled_tip": "本渠道被手动禁用",
-      "status_auto_disabled_tip": "本渠道被程序自动禁用",
-      "status_unknown": "未知状态",
-      "not_tested": "未测试",
-      "priority_tip": "渠道选择优先级，越高越优先",
-      "select_test_model": "请选择测试模型",
-      "click_to_update": "点击更新"
-    },
-    "buttons": {
-      "test": "测试",
-      "delete": "删除",
-      "confirm_delete": "删除渠道",
-      "enable": "启用",
-      "disable": "禁用",
-      "edit": "编辑",
-      "add": "添加新的渠道",
-      "test_all": "测试所有渠道",
-      "test_disabled": "测试禁用渠道",
-      "delete_disabled": "删除禁用渠道",
-      "confirm_delete_disabled": "确认删除",
-      "refresh": "刷新",
-      "show_detail": "详情",
-      "hide_detail": "隐藏详情"
-    },
-    "messages": {
-      "test_success": "渠道 {{name}} 测试成功，模型 {{model}}，耗时 {{time}} 秒，模型输出：{{message}}",
-      "test_all_started": "已成功开始测试渠道，请刷新页面查看结果。",
-      "delete_disabled_success": "已删除所有禁用渠道，共计 {{count}} 个",
-      "balance_update_success": "渠道 {{name}} 余额更新成功！",
-      "all_balance_updated": "已更新完毕所有已启用渠道余额！"
-    },
-    "edit": {
-      "title_edit": "更新渠道信息",
-      "title_create": "创建新的渠道",
-      "type": "类型",
-      "name": "名称",
-      "name_placeholder": "请输入名称",
-      "group": "分组",
-      "group_placeholder": "请选择可以使用该渠道的分组",
-      "group_addition": "请在系统设置页面编辑分组倍率以添加新的分组：",
-      "models": "模型",
-      "models_placeholder": "请选择该渠道所支持的模型",
-      "model_mapping": "模型重定向",
-      "model_mapping_placeholder": "此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称",
-      "system_prompt": "系统提示词",
-      "system_prompt_placeholder": "此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型",
-      "base_url": "代理",
-      "base_url_placeholder": "此项可选，用于通过代理站来进行 API 调用，请输入代理站地址，格式为：https://domain.com",
-      "key": "密钥",
-      "key_placeholder": "请输入密钥",
-      "batch": "批量创建",
-      "batch_placeholder": "请输入密钥，一行一个",
-      "buttons": {
-        "cancel": "取消",
-        "submit": "提交",
-        "fill_models": "填入相关模型",
-        "fill_all": "填入所有模型",
-        "clear": "清除所有模型",
-        "add_custom": "填入",
-        "custom_placeholder": "输入自定义模型名称"
-      },
-      "messages": {
-        "name_required": "请填写渠道名称和渠道密钥！",
-        "models_required": "请至少选择一个模型！",
-        "model_mapping_invalid": "模型映射必须是合法的 JSON 格式！",
-        "update_success": "渠道更新成功！",
-        "create_success": "渠道创建成功！"
-      },
-      "spark_version": "模型版本",
-      "spark_version_placeholder": "请输入星火大模型版本，注意是接口地址中的版本号，例如：v2.1",
-      "knowledge_id": "知识库 ID",
-      "knowledge_id_placeholder": "请输入知识库 ID，例如：123456",
-      "plugin_param": "插件参数",
-      "plugin_param_placeholder": "请输入插件参数，即 X-DashScope-Plugin 请求头的取值",
-      "coze_notice": "对于 Coze 而言，模型名称即 Bot ID，你可以添加一个前缀 `bot-`，例如：`bot-123456`。",
-      "douban_notice": "对于豆包而言，需要手动去",
-      "douban_notice_link": "模型推理页面",
-      "douban_notice_2": "创建推理接入点，以接入点名称作为模型名称，例如：`ep-20240608051426-tkxvl`。",
-      "aws_region_placeholder": "region，例如：us-west-2",
-      "aws_ak_placeholder": "AWS IAM Access Key",
-      "aws_sk_placeholder": "AWS IAM Secret Key",
-      "vertex_region_placeholder": "Vertex AI Region，例如：us-east5",
-      "vertex_project_id": "Vertex AI Project ID",
-      "vertex_project_id_placeholder": "Vertex AI Project ID",
-      "vertex_credentials": "Google Cloud Application Default Credentials JSON",
-      "vertex_credentials_placeholder": "Google Cloud Application Default Credentials JSON",
-      "user_id": "User ID",
-      "user_id_placeholder": "生成该密钥的用户 ID",
-      "key_prompts": {
-        "default": "请输入渠道对应的鉴权密钥",
-        "zhipu": "按照如下格式输入：APIKey|SecretKey",
-        "spark": "按照如下格式输入：APPID|APISecret|APIKey",
-        "fastgpt": "按照如下格式输入：APIKey-AppId，例如：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041",
-        "tencent": "按照如下格式输入：AppId|SecretId|SecretKey"
-      }
-    }
-  },
-  "token": {
-    "title": "令牌管理",
-    "search": "搜索令牌的名称 ...",
-    "table": {
-      "name": "名称",
-      "status": "状态",
-      "used_quota": "已用额度",
-      "remain_quota": "剩余额度",
-      "created_time": "创建时间",
-      "expired_time": "过期时间",
-      "actions": "操作",
-      "no_name": "无",
-      "never_expire": "永不过期",
-      "unlimited": "无限制",
-      "status_enabled": "已启用",
-      "status_disabled": "已禁用",
-      "status_expired": "已过期",
-      "status_depleted": "已耗尽",
-      "status_unknown": "未知状态"
-    },
-    "buttons": {
-      "copy": "复制",
-      "chat": "聊天",
-      "delete": "删除",
-      "confirm_delete": "删除令牌",
-      "enable": "启用",
-      "disable": "禁用",
-      "edit": "编辑",
-      "add": "添加新的令牌",
-      "refresh": "刷新"
-    },
-    "edit": {
-      "title_edit": "更新令牌信息",
-      "title_create": "创建新的令牌",
-      "name": "名称",
-      "name_placeholder": "请输入名称",
-      "models": "模型范围",
-      "models_placeholder": "请选择允许使用的模型，留空则不进行限制",
-      "ip_limit": "IP 限制",
-      "ip_limit_placeholder": "请输入允许访问的网段，例如：192.168.0.0/24，请使用英文逗号分隔多个网段",
-      "expire_time": "过期时间",
-      "expire_time_placeholder": "请输入过期时间，格式为 yyyy-MM-dd HH:mm:ss，-1 表示无限制",
-      "quota_notice": "注意，令牌的额度仅用于限制令牌本身的最大额度使用量，实际的使用受到账户的剩余额度限制。",
-      "quota": "额度",
-      "quota_placeholder": "请输入额度",
-      "buttons": {
-        "never_expire": "永不过期",
-        "expire_1_month": "一个月后过期",
-        "expire_1_day": "一天后过期",
-        "expire_1_hour": "一小时后过期",
-        "expire_1_minute": "一分钟后过期",
-        "unlimited_quota": "设为无限额度",
-        "cancel_unlimited": "取消无限额度",
-        "submit": "提交",
-        "cancel": "取消"
-      },
-      "messages": {
-        "update_success": "令牌更新成功！",
-        "create_success": "令牌创建成功，请在列表页面点击复制获取令牌！",
-        "expire_time_invalid": "过期时间格式错误！"
-      }
-    },
-    "copy_options": {
-      "raw": "复制原始令牌",
-      "ama": "复制 AMA 链接",
-      "opencat": "复制 OpenCat 链接",
-      "next": "复制 NextChat 链接",
-      "lobe": "复制 LobeChat 链接"
-    },
-    "messages": {
-      "copy_success": "已复制到剪贴板！",
-      "copy_failed": "无法复制到剪贴板，请手动复制，已将令牌填入搜索框。",
-      "operation_success": "操作成功完成！"
-    },
-    "sort": {
-      "placeholder": "排序方式",
-      "default": "默认排序",
-      "by_remain": "按剩余额度排序",
-      "by_used": "按已用额度排序"
-    }
-  },
-  "common": {
-    "quota": {
-      "display": "等价金额：${{amount}}",
-      "display_short": "${{amount}}",
-      "unit": "$"
-    }
-  },
-  "redemption": {
-    "title": "兑换管理",
-    "search": "搜索兑换码的 ID 和名称 ...",
-    "table": {
-      "id": "ID",
-      "name": "名称",
-      "status": "状态",
-      "quota": "额度",
-      "created_time": "创建时间",
-      "redeemed_time": "兑换时间",
-      "actions": "操作",
-      "no_name": "无",
-      "not_redeemed": "尚未兑换"
-    },
-    "buttons": {
-      "copy": "复制",
-      "delete": "删除",
-      "confirm_delete": "确认删除",
-      "enable": "启用",
-      "disable": "禁用",
-      "edit": "编辑",
-      "add": "添加新的兑换码",
-      "refresh": "刷新"
-    },
-    "status": {
-      "unused": "未使用",
-      "disabled": "已禁用",
-      "used": "已使用",
-      "unknown": "未知状态"
-    },
-    "edit": {
-      "title_edit": "更新兑换码信息",
-      "title_create": "创建新的兑换码",
-      "name": "名称",
-      "name_placeholder": "请输入名称",
-      "quota": "额度",
-      "quota_placeholder": "请输入单个兑换码中包含的额度",
-      "count": "生成数量",
-      "count_placeholder": "请输入生成数量",
-      "buttons": {
-        "submit": "提交",
-        "cancel": "取消"
-      }
-    },
-    "messages": {
-      "update_success": "兑换码更新成功！",
-      "create_success": "兑换码创建成功！"
-    }
-  },
-  "log": {
-    "title": "操作日志",
-    "search": "搜索日志...",
-    "usage_details": "使用明细",
-    "total_quota": "总消耗额度",
-    "click_to_view": "点击查看",
-    "type": {
-      "select": "选择明细分类",
-      "all": "全部",
-      "topup": "充值",
-      "usage": "消费",
-      "admin": "管理",
-      "system": "系统",
-      "test": "测试"
-    },
-    "table": {
-      "time": "时间",
-      "channel": "渠道",
-      "type": "类型",
-      "model": "模型",
-      "username": "用户名",
-      "token_name": "令牌名称",
-      "token_name_placeholder": "可选值",
-      "model_name": "模型名称",
-      "model_name_placeholder": "可选值",
-      "start_time": "起始时间",
-      "end_time": "结束时间",
-      "channel_id": "渠道 ID",
-      "channel_id_placeholder": "可选值",
-      "username_placeholder": "可选值",
-      "prompt_tokens": "提示词消耗",
-      "completion_tokens": "补全消耗",
-      "quota": "额度",
-      "detail": "详情"
-    },
-    "buttons": {
-      "query": "操作",
-      "submit": "查询",
-      "refresh": "刷新"
-    }
-  },
-  "user": {
-    "title": "用户管理",
-    "edit": {
-      "title": "更新用户信息",
-      "username": "用户名",
-      "username_placeholder": "请输入新的用户名",
-      "password": "密码",
-      "password_placeholder": "请输入新的密码，最短 8 位",
-      "display_name": "显示名称",
-      "display_name_placeholder": "请输入新的显示名称",
-      "group": "分组",
-      "group_placeholder": "请选择分组",
-      "group_addition": "请在系统设置页面编辑分组倍率以添加新的分组：",
-      "quota": "剩余额度",
-      "quota_placeholder": "请输入新的剩余额度",
-      "github_id": "已绑定的 GitHub 账户",
-      "github_id_placeholder": "此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改",
-      "wechat_id": "已绑定的微信账户",
-      "wechat_id_placeholder": "此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改",
-      "email": "已绑定的邮箱账户",
-      "email_placeholder": "此项只读，需要用户通过个人设置页面的相关绑定按钮进行绑定，不可直接修改",
-      "buttons": {
-        "submit": "提交",
-        "cancel": "取消"
-      }
-    },
-    "add": {
-      "title": "创建新用户账户"
-    },
-    "messages": {
-      "update_success": "用户信息更新成功！",
-      "create_success": "用户账户创建成功！",
-      "operation_success": "操作成功完成！"
-    },
-    "search": "搜索用户...",
-    "table": {
-      "id": "ID",
-      "username": "用户名",
-      "group": "分组",
-      "quota": "额度",
-      "role_text": "角色",
-      "status_text": "状态",
-      "actions": "操作",
-      "remaining_quota": "剩余额度",
-      "used_quota": "已用额度",
-      "request_count": "请求次数",
-      "role_types": {
-        "normal": "普通用户",
-        "admin": "管理员",
-        "super_admin": "超级管理员",
-        "unknown": "未知身份"
-      },
-      "status_types": {
-        "activated": "已激活",
-        "banned": "已封禁",
-        "unknown": "未知状态"
-      },
-      "sort": {
-        "default": "默认排序",
-        "by_quota": "按剩余额度排序",
-        "by_used_quota": "按已用额度排序",
-        "by_request_count": "按请求次数排序"
-      },
-      "sort_by": "排序方式"
-    },
-    "buttons": {
-      "add": "添加新的用户",
-      "delete": "删除",
-      "delete_user": "删除用户",
-      "enable": "启用",
-      "disable": "禁用",
-      "edit": "编辑",
-      "promote": "提升",
-      "demote": "降级"
-    }
-  },
-  "dashboard": {
-    "charts": {
-      "requests": {
-        "title": "模型请求趋势",
-        "tooltip": "请求次数"
-      },
-      "quota": {
-        "title": "额度消费趋势",
-        "tooltip": "消费额度"
-      },
-      "tokens": {
-        "title": "Token 消费趋势",
-        "tooltip": "Token 数量"
-      }
-    },
-    "statistics": {
-      "title": "统计",
-      "tooltip": {
-        "date": "日期",
-        "value": "数值"
-      }
-    }
-  },
-  "setting": {
-    "title": "系统设置",
-    "tabs": {
-      "personal": "个人设置",
-      "operation": "运营设置",
-      "system": "系统设置",
-      "other": "其他设置"
-    },
-    "personal": {
-      "general": {
-        "title": "通用设置",
-        "system_token_notice": "注意，此处生成的令牌用于系统管理，而非用于请求 OpenAI 相关的服务，请知悉。",
-        "buttons": {
-          "update_profile": "更新个人信息",
-          "generate_token": "生成系统访问令牌",
-          "copy_invite": "复制邀请链接",
-          "delete_account": "删除个人账户"
-        }
-      },
-      "binding": {
-        "title": "账号绑定",
-        "buttons": {
-          "bind_wechat": "绑定微信账号",
-          "bind_github": "绑定 GitHub 账号",
-          "bind_email": "绑定邮箱地址",
-          "bind_lark": "绑定飞书账号"
-        },
-        "wechat": {
-          "title": "微信绑定",
-          "description": "微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效）",
-          "verification_code": "验证码",
-          "bind": "绑定"
-        },
-        "email": {
-          "title": "绑定邮箱地址",
-          "email_placeholder": "输入邮箱地址",
-          "code_placeholder": "验证码",
-          "get_code": "获取验证码",
-          "get_code_retry": "重新发送({{countdown}})",
-          "bind": "确认绑定",
-          "cancel": "取消"
-        }
-      },
-      "delete_account": {
-        "title": "危险操作",
-        "warning": "您正在删除自己的帐户，将清空所有数据且不可恢复",
-        "confirm_placeholder": "输入你的账户名 {{username}} 以确认删除",
-        "buttons": {
-          "confirm": "确认删除",
-          "cancel": "取消"
-        }
-      }
-    },
-    "system": {
-      "general": {
-        "title": "通用设置",
-        "server_address": "服务器地址",
-        "server_address_placeholder": "例如：https://yourdomain.com",
-        "buttons": {
-          "update": "更新服务器地址"
-        }
-      },
-      "login": {
-        "title": "配置登录注册",
-        "password_login": "允许通过密码进行登录",
-        "password_register": "允许通过密码进行注册",
-        "email_verification": "通过密码注册时需要进行邮箱验证",
-        "github_oauth": "允许通过 GitHub 账户登录 & 注册",
-        "wechat_login": "允许通过微信登录 & 注册",
-        "registration": "允许新用户注册（此项为否时，新用户将无法以任何方式进行注册）",
-        "turnstile": "启用 Turnstile 用户校验"
-      },
-      "email_restriction": {
-        "title": "配置邮箱域名白名单",
-        "subtitle": "用以防止恶意用户利用临时邮箱批量注册",
-        "enable": "启用邮箱域名白名单",
-        "allowed_domains": "允许的邮箱域名",
-        "add_domain": "添加新的允许的邮箱域名",
-        "add_domain_placeholder": "输入新的允许的邮箱域名",
-        "buttons": {
-          "fill": "填入",
-          "save": "保存邮箱域名白名单设置"
-        }
-      },
-      "smtp": {
-        "title": "配置 SMTP",
-        "subtitle": "用以支持系统的邮件发送",
-        "server": "SMTP 服务器地址",
-        "server_placeholder": "例如：smtp.qq.com",
-        "port": "SMTP 端口",
-        "port_placeholder": "默认: 587",
-        "account": "SMTP 账户",
-        "account_placeholder": "通常是邮箱地址",
-        "from": "SMTP 发送者邮箱",
-        "from_placeholder": "通常和邮箱地址保持一致",
-        "token": "SMTP 访问凭证",
-        "token_placeholder": "敏感信息不会发送到前端显示",
-        "buttons": {
-          "save": "保存 SMTP 设置"
-        }
-      },
-      "github": {
-        "title": "配置 GitHub OAuth App",
-        "subtitle": "用以支持通过 GitHub 进行登录注册",
-        "manage_link": "点击此处",
-        "manage_text": "管理你的 GitHub OAuth App",
-        "url_notice": "Homepage URL 填 {{server_url}}，Authorization callback URL 填 {{callback_url}}",
-        "client_id": "GitHub Client ID",
-        "client_id_placeholder": "输入你注册的 GitHub OAuth APP 的 ID",
-        "client_secret": "GitHub Client Secret",
-        "client_secret_placeholder": "敏感信息不会发送到前端显示",
-        "buttons": {
-          "save": "保存 GitHub OAuth 设置"
-        }
-      },
-      "lark": {
-        "title": "配置飞书授权登录",
-        "subtitle": "用以支持通过飞书进行登录注册",
-        "manage_link": "点击此处",
-        "manage_text": "管理你的飞书应用",
-        "url_notice": "主页链接填 {{server_url}}，重定向 URL 填 {{callback_url}}",
-        "client_id": "App ID",
-        "client_id_placeholder": "输入 App ID",
-        "client_secret": "App Secret",
-        "client_secret_placeholder": "敏感信息不会发送到前端显示",
-        "buttons": {
-          "save": "保存飞书 OAuth 设置"
-        }
-      },
-      "wechat": {
-        "title": "配置 WeChat Server",
-        "subtitle": "用以支持通过微信进行登录注册",
-        "learn_more": "了解 WeChat Server",
-        "server_address": "WeChat Server 服务器地址",
-        "server_address_placeholder": "例如：https://yourdomain.com",
-        "token": "WeChat Server 访问凭证",
-        "token_placeholder": "敏感信息不会发送到前端显示",
-        "qrcode": "微信公众号二维码图片链接",
-        "qrcode_placeholder": "输入一个图片链接",
-        "buttons": {
-          "save": "保存 WeChat Server 设置"
-        }
-      },
-      "turnstile": {
-        "title": "配置 Turnstile",
-        "subtitle": "用以支持用户校验",
-        "manage_link": "点击此处",
-        "manage_text": "管理你的 Turnstile Sites，推荐选择 Invisible Widget Type",
-        "site_key": "Turnstile Site Key",
-        "site_key_placeholder": "输入你注册的 Turnstile Site Key",
-        "secret_key": "Turnstile Secret Key",
-        "secret_key_placeholder": "敏感信息不会发送到前端显示",
-        "buttons": {
-          "save": "保存 Turnstile 设置"
-        }
-      },
-      "password_login": {
-        "warning": {
-          "title": "警告",
-          "content": "取消密码登录将导致所有未绑定其他登录方式的用户（包括管理员）无法通过密码登录，确认取消？",
-          "buttons": {
-            "confirm": "确定",
-            "cancel": "取消"
-          }
-        }
-      }
-    },
-    "operation": {
-      "quota": {
-        "title": "额度设置",
-        "new_user": "新用户初始额度",
-        "new_user_placeholder": "例如：100",
-        "pre_consume": "请求预扣费额度",
-        "pre_consume_placeholder": "请求结束后多退少补",
-        "inviter_reward": "邀请新用户奖励额度",
-        "inviter_reward_placeholder": "例如：2000",
-        "invitee_reward": "新用户使用邀请码奖励额度",
-        "invitee_reward_placeholder": "例如：1000",
-        "buttons": {
-          "save": "保存额度设置"
-        }
-      },
-      "ratio": {
-        "title": "倍率设置",
-        "model": {
-          "title": "模型倍率",
-          "placeholder": "为一个 JSON 文本，键为模型名称，值为倍率"
-        },
-        "completion": {
-          "title": "补全倍率",
-          "placeholder": "为一个 JSON 文本，键为模型名称，值为倍率，此处的倍率设置是模型补全倍率相较于提示倍率的比例，使用该设置可强制覆盖 One API 的内部比例"
-        },
-        "group": {
-          "title": "分组倍率",
-          "placeholder": "为一个 JSON 文本，键为分组名称，值为倍率"
-        },
-        "buttons": {
-          "save": "保存倍率设置"
-        }
-      },
-      "log": {
-        "title": "日志设置",
-        "enable_consume": "启用额度消费日志记录",
-        "target_time": "目标时间",
-        "buttons": {
-          "clean": "清理历史日志"
-        }
-      },
-      "monitor": {
-        "title": "监控设置",
-        "max_response_time": "最长响应时间",
-        "max_response_time_placeholder": "单位秒，当运行渠道全部测试时，超过此时间将自动禁用渠道",
-        "quota_reminder": "额度提醒阈值",
-        "quota_reminder_placeholder": "低于此额度时将发送邮件提醒用户",
-        "auto_disable": "失败时自动禁用渠道",
-        "auto_enable": "成功时自动启用渠道",
-        "buttons": {
-          "save": "保存监控设置"
-        }
-      },
-      "general": {
-        "title": "通用设置",
-        "topup_link": "充值链接",
-        "topup_link_placeholder": "例如发卡网站的购买链接",
-        "chat_link": "聊天页面链接",
-        "chat_link_placeholder": "例如 ChatGPT Next Web 的部署地址",
-        "quota_per_unit": "单位美元额度",
-        "quota_per_unit_placeholder": "一单位货币能兑换的额度",
-        "retry_times": "失败重试次数",
-        "retry_times_placeholder": "失败重试次数",
-        "display_in_currency": "以货币形式显示额度",
-        "display_token_stat": "Billing 相关 API 显示令牌额度而非用户额度",
-        "approximate_token": "使用近似的方式估算 token 数以减少计算量",
-        "buttons": {
-          "save": "保存通用设置"
-        }
-      }
-    },
-    "other": {
-      "notice": {
-        "title": "公告设置",
-        "content": "公告内容",
-        "content_placeholder": "在此输入新的公告内容，支持 Markdown & HTML 代码",
-        "buttons": {
-          "save": "保存公告"
-        }
-      },
-      "system": {
-        "title": "系统设置",
-        "name": "系统名称",
-        "name_placeholder": "请输入系统名称",
-        "logo": "Logo 图片地址",
-        "logo_placeholder": "在此输入 Logo 图片地址",
-        "theme": {
-          "title": "主题名称",
-          "link": "当前可用主题",
-          "placeholder": "请输入主题名称"
-        },
-        "buttons": {
-          "save_name": "设置系统名称",
-          "save_logo": "设置 Logo",
-          "save_theme": "设置主题（重启生效）"
-        }
-      },
-      "content": {
-        "title": "内容设置",
-        "homepage": {
-          "title": "首页内容",
-          "placeholder": "在此输入首页内容，支持 Markdown & HTML 代码，设置后首页的状态信息将不再显示。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为首页。"
-        },
-        "about": {
-          "title": "关于",
-          "placeholder": "在此输入新的关于内容，支持 Markdown & HTML 代码。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为关于页面。"
-        },
-        "footer": {
-          "title": "页脚",
-          "placeholder": "在此输入新的页脚，留空则使用默认页脚，支持 HTML 代码"
-        },
-        "buttons": {
-          "save_homepage": "保存首页内容",
-          "save_about": "保存关于",
-          "save_footer": "设置页脚"
-        }
-      },
-      "copyright": {
-        "notice": "移除 One API 的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目。"
-      }
-    }
-  },
-  "about": {
-    "title": "关于系统",
-    "description": "可在设置页面设置关于内容，支持 HTML & Markdown",
-    "repository": "项目仓库地址：",
-    "loading_failed": "加载关于内容失败..."
-  },
-  "footer": {
-    "built_by": "由",
-    "built_by_name": "JustSong",
-    "license": "构建，源代码遵循",
-    "mit": "MIT 协议"
-  },
-  "home": {
-    "welcome": {
-      "title": "欢迎使用 One API",
-      "description": "One API 是一个 LLM API 接口管理和分发系统，可以帮助您更好地管理和使用各大厂商的 LLM API。",
-      "login_notice": "如需使用，请先登录或注册。"
-    },
-    "system_status": {
-      "title": "系统状况",
-      "info": {
-        "title": "系统信息",
-        "name": "名称：",
-        "version": "版本：",
-        "source": "源码：",
-        "source_link": "GitHub 仓库",
-        "start_time": "启动时间："
-      },
-      "config": {
-        "title": "系统配置",
-        "email_verify": "邮箱验证：",
-        "github_oauth": "GitHub 身份验证：",
-        "wechat_login": "微信身份验证：",
-        "turnstile": "Turnstile 校验：",
-        "enabled": "已启用",
-        "disabled": "未启用"
-      }
-    },
-    "loading_failed": "加载首页内容失败..."
-  }
-}

web/default/src/App.js

@@ -25,7 +25,6 @@ import TopUp from './pages/TopUp';
 import Log from './pages/Log';
 import Chat from './pages/Chat';
 import LarkOAuth from './components/LarkOAuth';
-import Dashboard from './pages/Dashboard';
 
 const Home = lazy(() => import('./pages/Home'));
 const About = lazy(() => import('./pages/About'));
@@ -42,37 +41,32 @@ function App() {
     }
   };
   const loadStatus = async () => {
-    try {
-      const res = await API.get('/api/status');
-      const { success, message, data } = res.data || {}; // Add default empty object
-      if (success && data) {
-        // Check data exists
-        localStorage.setItem('status', JSON.stringify(data));
-        statusDispatch({ type: 'set', payload: data });
-        localStorage.setItem('system_name', data.system_name);
-        localStorage.setItem('logo', data.logo);
-        localStorage.setItem('footer_html', data.footer_html);
-        localStorage.setItem('quota_per_unit', data.quota_per_unit);
-        localStorage.setItem('display_in_currency', data.display_in_currency);
-        if (data.chat_link) {
-          localStorage.setItem('chat_link', data.chat_link);
-        } else {
-          localStorage.removeItem('chat_link');
-        }
-        if (
-          data.version !== process.env.REACT_APP_VERSION &&
-          data.version !== 'v0.0.0' &&
-          process.env.REACT_APP_VERSION !== ''
-        ) {
-          showNotice(
-            `新版本可用：${data.version}，请使用快捷键 Shift + F5 刷新页面`
-          );
-        }
+    const res = await API.get('/api/status');
+    const { success, data } = res.data;
+    if (success) {
+      localStorage.setItem('status', JSON.stringify(data));
+      statusDispatch({ type: 'set', payload: data });
+      localStorage.setItem('system_name', data.system_name);
+      localStorage.setItem('logo', data.logo);
+      localStorage.setItem('footer_html', data.footer_html);
+      localStorage.setItem('quota_per_unit', data.quota_per_unit);
+      localStorage.setItem('display_in_currency', data.display_in_currency);
+      if (data.chat_link) {
+        localStorage.setItem('chat_link', data.chat_link);
       } else {
-        showError(message || '无法正常连接至服务器！');
+        localStorage.removeItem('chat_link');
       }
-    } catch (error) {
-      showError(error.message || '无法正常连接至服务器！');
+      if (
+        data.version !== process.env.REACT_APP_VERSION &&
+        data.version !== 'v0.0.0' &&
+        process.env.REACT_APP_VERSION !== ''
+      ) {
+        showNotice(
+          `新版本可用：${data.version}，请使用快捷键 Shift + F5 刷新页面`
+        );
+      }
+    } else {
+      showError('无法正常连接至服务器！');
     }
   };
 
@@ -267,11 +261,11 @@ function App() {
       <Route
         path='/topup'
         element={
-          <PrivateRoute>
-            <Suspense fallback={<Loading></Loading>}>
-              <TopUp />
-            </Suspense>
-          </PrivateRoute>
+        <PrivateRoute>
+          <Suspense fallback={<Loading></Loading>}>
+            <TopUp />
+          </Suspense>
+        </PrivateRoute>
         }
       />
       <Route
@@ -298,15 +292,9 @@ function App() {
           </Suspense>
         }
       />
-      <Route
-        path='/dashboard'
-        element={
-          <PrivateRoute>
-            <Dashboard />
-          </PrivateRoute>
-        }
-      />
-      <Route path='*' element={<NotFound />} />
+      <Route path='*' element={
+          <NotFound />
+      } />
     </Routes>
   );
 }

web/default/src/components/ChannelsTable.js

@@ -1,16 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Dropdown,
-  Form,
-  Input,
-  Label,
-  Message,
-  Pagination,
-  Popup,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Dropdown, Form, Input, Label, Message, Pagination, Popup, Table } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import {
   API,
@@ -20,38 +9,34 @@ import {
   showError,
   showInfo,
   showSuccess,
-  timestamp2string,
+  timestamp2string
 } from '../helpers';
 
 import { CHANNEL_OPTIONS, ITEMS_PER_PAGE } from '../constants';
 import { renderGroup, renderNumber } from '../helpers/render';
 
 function renderTimestamp(timestamp) {
-  return <>{timestamp2string(timestamp)}</>;
+  return (
+    <>
+      {timestamp2string(timestamp)}
+    </>
+  );
 }
 
 let type2label = undefined;
 
-function renderType(type, t) {
+function renderType(type) {
   if (!type2label) {
-    type2label = new Map();
+    type2label = new Map;
     for (let i = 0; i < CHANNEL_OPTIONS.length; i++) {
       type2label[CHANNEL_OPTIONS[i].value] = CHANNEL_OPTIONS[i];
     }
-    type2label[0] = {
-      value: 0,
-      text: t('channel.table.status_unknown'),
-      color: 'grey',
-    };
+    type2label[0] = { value: 0, text: '未知类型', color: 'grey' };
   }
-  return (
-    <Label basic color={type2label[type]?.color}>
-      {type2label[type] ? type2label[type].text : type}
-    </Label>
-  );
+  return <Label basic color={type2label[type]?.color}>{type2label[type] ? type2label[type].text : type}</Label>;
 }
 
-function renderBalance(type, balance, t) {
+function renderBalance(type, balance) {
   switch (type) {
     case 1: // OpenAI
       return <span>${balance.toFixed(2)}</span>;
@@ -67,23 +52,20 @@ function renderBalance(type, balance, t) {
       return <span>¥{balance.toFixed(2)}</span>;
     case 13: // AIGC2D
       return <span>{renderNumber(balance)}</span>;
-    case 36: // DeepSeek
-      return <span>¥{balance.toFixed(2)}</span>;
     case 44: // SiliconFlow
       return <span>¥{balance.toFixed(2)}</span>;
     default:
-      return <span>{t('channel.table.balance_not_supported')}</span>;
+      return <span>不支持</span>;
   }
 }
 
 function isShowDetail() {
-  return localStorage.getItem('show_detail') === 'true';
+  return localStorage.getItem("show_detail") === "true";
 }
 
-const promptID = 'detail';
+const promptID = "detail"
 
 const ChannelsTable = () => {
-  const { t } = useTranslation();
   const [channels, setChannels] = useState([]);
   const [loading, setLoading] = useState(true);
   const [activePage, setActivePage] = useState(1);
@@ -97,37 +79,33 @@ const ChannelsTable = () => {
     const res = await API.get(`/api/channel/?p=${startIdx}`);
     const { success, message, data } = res.data;
     if (success) {
-      let localChannels = data.map((channel) => {
-        if (channel.models === '') {
-          channel.models = [];
-          channel.test_model = '';
+        let localChannels = data.map((channel) => {
+            if (channel.models === '') {
+                channel.models = [];
+                channel.test_model = "";
+            } else {
+                channel.models = channel.models.split(',');
+                if (channel.models.length > 0) {
+                    channel.test_model = channel.models[0];
+                }
+                channel.model_options = channel.models.map((model) => {
+                    return {
+                        key: model,
+                        text: model,
+                        value: model,
+                    }
+                })
+                console.log('channel', channel)
+            }
+            return channel;
+        });
+        if (startIdx === 0) {
+            setChannels(localChannels);
         } else {
-          channel.models = channel.models.split(',');
-          if (channel.models.length > 0) {
-            channel.test_model = channel.models[0];
-          }
-          channel.model_options = channel.models.map((model) => {
-            return {
-              key: model,
-              text: model,
-              value: model,
-            };
-          });
-          console.log('channel', channel);
+            let newChannels = [...channels];
+            newChannels.splice(startIdx * ITEMS_PER_PAGE, data.length, ...localChannels);
+            setChannels(newChannels);
         }
-        return channel;
-      });
-      if (startIdx === 0) {
-        setChannels(localChannels);
-      } else {
-        let newChannels = [...channels];
-        newChannels.splice(
-          startIdx * ITEMS_PER_PAGE,
-          data.length,
-          ...localChannels
-        );
-        setChannels(newChannels);
-      }
     } else {
       showError(message);
     }
@@ -151,8 +129,8 @@ const ChannelsTable = () => {
 
   const toggleShowDetail = () => {
     setShowDetail(!showDetail);
-    localStorage.setItem('show_detail', (!showDetail).toString());
-  };
+    localStorage.setItem("show_detail", (!showDetail).toString());
+  }
 
   useEffect(() => {
     loadChannels(0)
@@ -198,7 +176,7 @@ const ChannelsTable = () => {
     }
     const { success, message } = res.data;
     if (success) {
-      showSuccess(t('channel.messages.operation_success'));
+      showSuccess('操作成功完成！');
       let channel = res.data.data;
       let newChannels = [...channels];
       let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -213,80 +191,52 @@ const ChannelsTable = () => {
     }
   };
 
-  const renderStatus = (status, t) => {
+  const renderStatus = (status) => {
     switch (status) {
       case 1:
-        return (
-          <Label basic color='green'>
-            {t('channel.table.status_enabled')}
-          </Label>
-        );
+        return <Label basic color='green'>已启用</Label>;
       case 2:
         return (
           <Popup
-            trigger={
-              <Label basic color='red'>
-                {t('channel.table.status_disabled')}
-              </Label>
-            }
-            content={t('channel.table.status_disabled_tip')}
+            trigger={<Label basic color='red'>
+              已禁用
+            </Label>}
+            content='本渠道被手动禁用'
             basic
           />
         );
       case 3:
         return (
           <Popup
-            trigger={
-              <Label basic color='yellow'>
-                {t('channel.table.status_auto_disabled')}
-              </Label>
-            }
-            content={t('channel.table.status_auto_disabled_tip')}
+            trigger={<Label basic color='yellow'>
+              已禁用
+            </Label>}
+            content='本渠道被程序自动禁用'
             basic
           />
         );
       default:
         return (
           <Label basic color='grey'>
-            {t('channel.table.status_unknown')}
+            未知状态
           </Label>
         );
     }
   };
 
-  const renderResponseTime = (responseTime, t) => {
+  const renderResponseTime = (responseTime) => {
     let time = responseTime / 1000;
-    time = time.toFixed(2) + 's';
+    time = time.toFixed(2) + ' 秒';
     if (responseTime === 0) {
-      return (
-        <Label basic color='grey'>
-          {t('channel.table.not_tested')}
-        </Label>
-      );
+      return <Label basic color='grey'>未测试</Label>;
     } else if (responseTime <= 1000) {
-      return (
-        <Label basic color='green'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='green'>{time}</Label>;
     } else if (responseTime <= 3000) {
-      return (
-        <Label basic color='olive'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='olive'>{time}</Label>;
     } else if (responseTime <= 5000) {
-      return (
-        <Label basic color='yellow'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='yellow'>{time}</Label>;
     } else {
-      return (
-        <Label basic color='red'>
-          {time}
-        </Label>
-      );
+      return <Label basic color='red'>{time}</Label>;
     }
   };
 
@@ -325,9 +275,7 @@ const ChannelsTable = () => {
       newChannels[realIdx].response_time = time * 1000;
       newChannels[realIdx].test_time = Date.now() / 1000;
       setChannels(newChannels);
-      showSuccess(
-        t('channel.messages.test_success', { name, model, time, message })
-      );
+      showInfo(`渠道 ${name} 测试成功，模型 ${model}，耗时 ${time.toFixed(2)} 秒。`);
     } else {
       showError(message);
     }
@@ -342,7 +290,7 @@ const ChannelsTable = () => {
     const res = await API.get(`/api/channel/test?scope=${scope}`);
     const { success, message } = res.data;
     if (success) {
-      showInfo(t('channel.messages.test_all_started'));
+      showInfo('已成功开始测试渠道，请刷新页面查看结果。');
     } else {
       showError(message);
     }
@@ -352,9 +300,7 @@ const ChannelsTable = () => {
     const res = await API.delete(`/api/channel/disabled`);
     const { success, message, data } = res.data;
     if (success) {
-      showSuccess(
-        t('channel.messages.delete_disabled_success', { count: data })
-      );
+      showSuccess(`已删除所有禁用渠道，共计 ${data} 个`);
       await refresh();
     } else {
       showError(message);
@@ -370,7 +316,7 @@ const ChannelsTable = () => {
       newChannels[realIdx].balance = balance;
       newChannels[realIdx].balance_updated_time = Date.now() / 1000;
       setChannels(newChannels);
-      showSuccess(t('channel.messages.balance_update_success', { name }));
+      showInfo(`渠道 ${name} 余额更新成功！`);
     } else {
       showError(message);
     }
@@ -381,7 +327,7 @@ const ChannelsTable = () => {
     const res = await API.get(`/api/channel/update_balance`);
     const { success, message } = res.data;
     if (success) {
-      showInfo(t('channel.messages.all_balance_updated'));
+      showInfo('已更新完毕所有已启用渠道余额！');
     } else {
       showError(message);
     }
@@ -412,6 +358,7 @@ const ChannelsTable = () => {
     setLoading(false);
   };
 
+
   return (
     <>
       <Form onSubmit={searchChannels}>
@@ -419,27 +366,27 @@ const ChannelsTable = () => {
           icon='search'
           fluid
           iconPosition='left'
-          placeholder={t('channel.search')}
+          placeholder='搜索渠道的 ID，名称和密钥 ...'
           value={searchKeyword}
           loading={searching}
           onChange={handleKeywordChange}
         />
       </Form>
-      {showPrompt && (
-        <Message
-          onDismiss={() => {
+      {
+        showPrompt && (
+          <Message onDismiss={() => {
             setShowPrompt(false);
             setPromptShown(promptID);
-          }}
-        >
-          {t('channel.balance_notice')}
-          <br />
-          {t('channel.test_notice')}
-          <br />
-          {t('channel.detail_notice')}
-        </Message>
-      )}
-      <Table basic={'very'} compact size='small'>
+          }}>
+            OpenAI 渠道已经不再支持通过 key 获取余额，因此余额显示为 0。对于支持的渠道类型，请点击余额进行刷新。
+            <br/>
+            渠道测试仅支持 chat 模型，优先使用 gpt-3.5-turbo，如果该模型不可用则使用你所配置的模型列表中的第一个模型。
+            <br/>
+            点击下方详情按钮可以显示余额以及设置额外的测试模型。
+          </Message>
+        )
+      }
+      <Table basic compact size='small'>
         <Table.Header>
           <Table.Row>
             <Table.HeaderCell
@@ -448,7 +395,7 @@ const ChannelsTable = () => {
                 sortChannel('id');
               }}
             >
-              {t('channel.table.id')}
+              ID
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -456,7 +403,7 @@ const ChannelsTable = () => {
                 sortChannel('name');
               }}
             >
-              {t('channel.table.name')}
+              名称
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -464,7 +411,7 @@ const ChannelsTable = () => {
                 sortChannel('group');
               }}
             >
-              {t('channel.table.group')}
+              分组
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -472,7 +419,7 @@ const ChannelsTable = () => {
                 sortChannel('type');
               }}
             >
-              {t('channel.table.type')}
+              类型
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -480,7 +427,7 @@ const ChannelsTable = () => {
                 sortChannel('status');
               }}
             >
-              {t('channel.table.status')}
+              状态
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -488,7 +435,7 @@ const ChannelsTable = () => {
                 sortChannel('response_time');
               }}
             >
-              {t('channel.table.response_time')}
+              响应时间
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -497,7 +444,7 @@ const ChannelsTable = () => {
               }}
               hidden={!showDetail}
             >
-              {t('channel.table.balance')}
+              余额
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -505,12 +452,10 @@ const ChannelsTable = () => {
                 sortChannel('priority');
               }}
             >
-              {t('channel.table.priority')}
+              优先级
             </Table.HeaderCell>
-            <Table.HeaderCell hidden={!showDetail}>
-              {t('channel.table.test_model')}
-            </Table.HeaderCell>
-            <Table.HeaderCell>{t('channel.table.actions')}</Table.HeaderCell>
+            <Table.HeaderCell hidden={!showDetail}>测试模型</Table.HeaderCell>
+            <Table.HeaderCell>操作</Table.HeaderCell>
           </Table.Row>
         </Table.Header>
 
@@ -525,65 +470,48 @@ const ChannelsTable = () => {
               return (
                 <Table.Row key={channel.id}>
                   <Table.Cell>{channel.id}</Table.Cell>
-                  <Table.Cell>
-                    {channel.name ? channel.name : t('channel.table.no_name')}
-                  </Table.Cell>
+                  <Table.Cell>{channel.name ? channel.name : '无'}</Table.Cell>
                   <Table.Cell>{renderGroup(channel.group)}</Table.Cell>
-                  <Table.Cell>{renderType(channel.type, t)}</Table.Cell>
-                  <Table.Cell>{renderStatus(channel.status, t)}</Table.Cell>
+                  <Table.Cell>{renderType(channel.type)}</Table.Cell>
+                  <Table.Cell>{renderStatus(channel.status)}</Table.Cell>
                   <Table.Cell>
                     <Popup
-                      content={
-                        channel.test_time
-                          ? renderTimestamp(channel.test_time)
-                          : t('channel.table.not_tested')
-                      }
+                      content={channel.test_time ? renderTimestamp(channel.test_time) : '未测试'}
                       key={channel.id}
-                      trigger={renderResponseTime(channel.response_time, t)}
+                      trigger={renderResponseTime(channel.response_time)}
                       basic
                     />
                   </Table.Cell>
                   <Table.Cell hidden={!showDetail}>
                     <Popup
-                      trigger={
-                        <span
-                          onClick={() => {
-                            updateChannelBalance(channel.id, channel.name, idx);
-                          }}
-                          style={{ cursor: 'pointer' }}
-                        >
-                          {renderBalance(channel.type, channel.balance, t)}
-                        </span>
-                      }
-                      content={t('channel.table.click_to_update')}
+                      trigger={<span onClick={() => {
+                        updateChannelBalance(channel.id, channel.name, idx);
+                      }} style={{ cursor: 'pointer' }}>
+                      {renderBalance(channel.type, channel.balance)}
+                    </span>}
+                      content='点击更新'
                       basic
                     />
                   </Table.Cell>
                   <Table.Cell>
                     <Popup
-                      trigger={
-                        <Input
-                          type='number'
-                          defaultValue={channel.priority}
-                          onBlur={(event) => {
-                            manageChannel(
-                              channel.id,
-                              'priority',
-                              idx,
-                              event.target.value
-                            );
-                          }}
-                        >
-                          <input style={{ maxWidth: '60px' }} />
-                        </Input>
-                      }
-                      content={t('channel.table.priority_tip')}
+                      trigger={<Input type='number' defaultValue={channel.priority} onBlur={(event) => {
+                        manageChannel(
+                          channel.id,
+                          'priority',
+                          idx,
+                          event.target.value
+                        );
+                      }}>
+                        <input style={{ maxWidth: '60px' }} />
+                      </Input>}
+                      content='渠道选择优先级，越高越优先'
                       basic
                     />
                   </Table.Cell>
                   <Table.Cell hidden={!showDetail}>
                     <Dropdown
-                      placeholder={t('channel.table.select_test_model')}
+                      placeholder='请选择测试模型'
                       selection
                       options={channel.model_options}
                       defaultValue={channel.test_model}
@@ -595,23 +523,28 @@ const ChannelsTable = () => {
                   <Table.Cell>
                     <div>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         positive
                         onClick={() => {
-                          testChannel(
-                            channel.id,
-                            channel.name,
-                            idx,
-                            channel.test_model
-                          );
+                          testChannel(channel.id, channel.name, idx, channel.test_model);
                         }}
                       >
-                        {t('channel.buttons.test')}
+                        测试
                       </Button>
+                      {/*<Button*/}
+                      {/*  size={'small'}*/}
+                      {/*  positive*/}
+                      {/*  loading={updatingBalance}*/}
+                      {/*  onClick={() => {*/}
+                      {/*    updateChannelBalance(channel.id, channel.name, idx);*/}
+                      {/*  }}*/}
+                      {/*>*/}
+                      {/*  更新余额*/}
+                      {/*</Button>*/}
                       <Popup
                         trigger={
-                          <Button size='tiny' negative>
-                            {t('channel.buttons.delete')}
+                          <Button size='small' negative>
+                            删除
                           </Button>
                         }
                         on='click'
@@ -619,17 +552,16 @@ const ChannelsTable = () => {
                         hoverable
                       >
                         <Button
-                          size={'tiny'}
                           negative
                           onClick={() => {
                             manageChannel(channel.id, 'delete', idx);
                           }}
                         >
-                          {t('channel.buttons.confirm_delete')} {channel.name}
+                          删除渠道 {channel.name}
                         </Button>
                       </Popup>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         onClick={() => {
                           manageChannel(
                             channel.id,
@@ -638,16 +570,14 @@ const ChannelsTable = () => {
                           );
                         }}
                       >
-                        {channel.status === 1
-                          ? t('channel.buttons.disable')
-                          : t('channel.buttons.enable')}
+                        {channel.status === 1 ? '禁用' : '启用'}
                       </Button>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         as={Link}
                         to={'/channel/edit/' + channel.id}
                       >
-                        {t('channel.buttons.edit')}
+                        编辑
                       </Button>
                     </div>
                   </Table.Cell>
@@ -658,66 +588,45 @@ const ChannelsTable = () => {
 
         <Table.Footer>
           <Table.Row>
-            <Table.HeaderCell colSpan={showDetail ? '10' : '8'}>
-              <Button size='tiny' as={Link} to='/channel/add' loading={loading}>
-                {t('channel.buttons.add')}
+            <Table.HeaderCell colSpan={showDetail ? "10" : "8"}>
+              <Button size='small' as={Link} to='/channel/add' loading={loading}>
+                添加新的渠道
               </Button>
-              <Button
-                size='tiny'
-                loading={loading}
-                onClick={() => {
-                  testChannels('all');
-                }}
-              >
-                {t('channel.buttons.test_all')}
+              <Button size='small' loading={loading} onClick={()=>{testChannels("all")}}>
+                测试所有渠道
               </Button>
-              <Button
-                size='tiny'
-                loading={loading}
-                onClick={() => {
-                  testChannels('disabled');
-                }}
-              >
-                {t('channel.buttons.test_disabled')}
+              <Button size='small' loading={loading} onClick={()=>{testChannels("disabled")}}>
+                测试禁用渠道
               </Button>
+              {/*<Button size='small' onClick={updateAllChannelsBalance}*/}
+              {/*        loading={loading || updatingBalance}>更新已启用渠道余额</Button>*/}
               <Popup
                 trigger={
-                  <Button size='tiny' loading={loading}>
-                    {t('channel.buttons.delete_disabled')}
+                  <Button size='small' loading={loading}>
+                    删除禁用渠道
                   </Button>
                 }
                 on='click'
                 flowing
                 hoverable
               >
-                <Button
-                  size='tiny'
-                  loading={loading}
-                  negative
-                  onClick={deleteAllDisabledChannels}
-                >
-                  {t('channel.buttons.confirm_delete_disabled')}
+                <Button size='small' loading={loading} negative onClick={deleteAllDisabledChannels}>
+                  确认删除
                 </Button>
               </Popup>
               <Pagination
                 floated='right'
                 activePage={activePage}
                 onPageChange={onPaginationChange}
-                size='tiny'
+                size='small'
                 siblingRange={1}
                 totalPages={
                   Math.ceil(channels.length / ITEMS_PER_PAGE) +
                   (channels.length % ITEMS_PER_PAGE === 0 ? 1 : 0)
                 }
               />
-              <Button size='tiny' onClick={refresh} loading={loading}>
-                {t('channel.buttons.refresh')}
-              </Button>
-              <Button size='tiny' onClick={toggleShowDetail}>
-                {showDetail
-                  ? t('channel.buttons.hide_detail')
-                  : t('channel.buttons.show_detail')}
-              </Button>
+              <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
+              <Button size='small' onClick={toggleShowDetail}>{showDetail ? "隐藏详情" : "详情"}</Button>
             </Table.HeaderCell>
           </Table.Row>
         </Table.Footer>

web/default/src/components/Footer.js

@@ -1,10 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
+
 import { Container, Segment } from 'semantic-ui-react';
 import { getFooterHTML, getSystemName } from '../helpers';
 
 const Footer = () => {
-  const { t } = useTranslation();
   const systemName = getSystemName();
   const [footer, setFooter] = useState(getFooterHTML());
   let remainCheckTimes = 5;
@@ -30,7 +29,7 @@ const Footer = () => {
 
   return (
     <Segment vertical>
-      <Container textAlign='center' style={{ color: '#666666' }}>
+      <Container textAlign='center'>
         {footer ? (
           <div
             className='custom-footer'
@@ -38,16 +37,19 @@ const Footer = () => {
           ></div>
         ) : (
           <div className='custom-footer'>
-            <a href='https://github.com/songquanpeng/one-api' target='_blank'>
+            <a
+              href='https://github.com/songquanpeng/one-api'
+              target='_blank'
+            >
               {systemName} {process.env.REACT_APP_VERSION}{' '}
             </a>
-            {t('footer.built_by')}{' '}
+            由{' '}
             <a href='https://github.com/songquanpeng' target='_blank'>
-              {t('footer.built_by_name')}
+              JustSong
             </a>{' '}
-            {t('footer.license')}{' '}
+            构建，源代码遵循{' '}
             <a href='https://opensource.org/licenses/mit-license.php'>
-              {t('footer.mit')}
+              MIT 协议
             </a>
           </div>
         )}

web/default/src/components/Header.js

@@ -1,88 +1,72 @@
 import React, { useContext, useState } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { UserContext } from '../context/User';
-import { useTranslation } from 'react-i18next';
 
-import {
-  Button,
-  Container,
-  Dropdown,
-  Icon,
-  Menu,
-  Segment,
-} from 'semantic-ui-react';
-import {
-  API,
-  getLogo,
-  getSystemName,
-  isAdmin,
-  isMobile,
-  showSuccess,
-} from '../helpers';
+import { Button, Container, Dropdown, Icon, Menu, Segment } from 'semantic-ui-react';
+import { API, getLogo, getSystemName, isAdmin, isMobile, showSuccess } from '../helpers';
 import '../index.css';
 
 // Header Buttons
 let headerButtons = [
   {
-    name: 'header.channel',
+    name: '首页',
+    to: '/',
+    icon: 'home'
+  },
+  {
+    name: '渠道',
     to: '/channel',
     icon: 'sitemap',
-    admin: true,
+    admin: true
   },
   {
-    name: 'header.token',
+    name: '令牌',
     to: '/token',
-    icon: 'key',
+    icon: 'key'
   },
   {
-    name: 'header.redemption',
+    name: '兑换',
     to: '/redemption',
     icon: 'dollar sign',
-    admin: true,
+    admin: true
   },
   {
-    name: 'header.topup',
+    name: '充值',
     to: '/topup',
-    icon: 'cart',
+    icon: 'cart'
   },
   {
-    name: 'header.user',
+    name: '用户',
     to: '/user',
     icon: 'user',
-    admin: true,
+    admin: true
   },
   {
-    name: 'header.dashboard',
-    to: '/dashboard',
-    icon: 'chart bar',
-  },
-  {
-    name: 'header.log',
+    name: '日志',
     to: '/log',
-    icon: 'book',
+    icon: 'book'
   },
   {
-    name: 'header.setting',
+    name: '设置',
     to: '/setting',
-    icon: 'setting',
+    icon: 'setting'
   },
   {
-    name: 'header.about',
+    name: '关于',
     to: '/about',
-    icon: 'info circle',
-  },
+    icon: 'info circle'
+  }
 ];
 
 if (localStorage.getItem('chat_link')) {
   headerButtons.splice(1, 0, {
-    name: 'header.chat',
+    name: '聊天',
     to: '/chat',
-    icon: 'comments',
+    icon: 'comments'
   });
 }
 
 const Header = () => {
-  const { t, i18n } = useTranslation();
   const [userState, userDispatch] = useContext(UserContext);
   let navigate = useNavigate();
 
@@ -109,45 +93,24 @@ const Header = () => {
       if (isMobile) {
         return (
           <Menu.Item
-            key={button.name}
             onClick={() => {
               navigate(button.to);
               setShowSidebar(false);
             }}
-            style={{ fontSize: '15px' }}
           >
-            {t(button.name)}
+            {button.name}
           </Menu.Item>
         );
       }
       return (
-        <Menu.Item
-          key={button.name}
-          as={Link}
-          to={button.to}
-          style={{
-            fontSize: '15px',
-            fontWeight: '400',
-            color: '#666',
-          }}
-        >
-          <Icon name={button.icon} style={{ marginRight: '4px' }} />
-          {t(button.name)}
+        <Menu.Item key={button.name} as={Link} to={button.to}>
+          <Icon name={button.icon} />
+          {button.name}
         </Menu.Item>
       );
     });
   };
 
-  // Add language switcher dropdown
-  const languageOptions = [
-    { key: 'zh', text: '中文', value: 'zh' },
-    { key: 'en', text: 'English', value: 'en' },
-  ];
-
-  const changeLanguage = (language) => {
-    i18n.changeLanguage(language);
-  };
-
   if (isMobile()) {
     return (
       <>
@@ -157,23 +120,21 @@ const Header = () => {
           style={
             showSidebar
               ? {
-                  borderBottom: 'none',
-                  marginBottom: '0',
-                  borderTop: 'none',
-                  height: '51px',
-                }
+                borderBottom: 'none',
+                marginBottom: '0',
+                borderTop: 'none',
+                height: '51px'
+              }
               : { borderTop: 'none', height: '52px' }
           }
         >
-          <Container
-            style={{
-              width: '100%',
-              maxWidth: isMobile() ? '100%' : '1200px',
-              padding: isMobile() ? '0 10px' : '0 20px',
-            }}
-          >
+          <Container>
             <Menu.Item as={Link} to='/'>
-              <img src={logo} alt='logo' style={{ marginRight: '0.75em' }} />
+              <img
+                src={logo}
+                alt='logo'
+                style={{ marginRight: '0.75em' }}
+              />
               <div style={{ fontSize: '20px' }}>
                 <b>{systemName}</b>
               </div>
@@ -189,25 +150,9 @@ const Header = () => {
           <Segment style={{ marginTop: 0, borderTop: '0' }}>
             <Menu secondary vertical style={{ width: '100%', margin: 0 }}>
               {renderButtons(true)}
-              <Menu.Item>
-                <Dropdown
-                  selection
-                  trigger={
-                    <Icon
-                      name='language'
-                      style={{ margin: 0, fontSize: '18px' }}
-                    />
-                  }
-                  options={languageOptions}
-                  value={i18n.language}
-                  onChange={(_, { value }) => changeLanguage(value)}
-                />
-              </Menu.Item>
               <Menu.Item>
                 {userState.user ? (
-                  <Button onClick={logout} style={{ color: '#666666' }}>
-                    {t('header.logout')}
-                  </Button>
+                  <Button onClick={logout}>注销</Button>
                 ) : (
                   <>
                     <Button
@@ -216,7 +161,7 @@ const Header = () => {
                         navigate('/login');
                       }}
                     >
-                      {t('header.login')}
+                      登录
                     </Button>
                     <Button
                       onClick={() => {
@@ -224,7 +169,7 @@ const Header = () => {
                         navigate('/register');
                       }}
                     >
-                      {t('header.register')}
+                      注册
                     </Button>
                   </>
                 )}
@@ -240,85 +185,32 @@ const Header = () => {
 
   return (
     <>
-      <Menu
-        borderless
-        style={{
-          borderTop: 'none',
-          boxShadow: 'rgba(0, 0, 0, 0.04) 0px 2px 12px 0px',
-          border: 'none',
-        }}
-      >
-        <Container
-          style={{
-            width: '100%',
-            maxWidth: isMobile() ? '100%' : '1200px',
-            padding: isMobile() ? '0 10px' : '0 20px',
-          }}
-        >
+      <Menu borderless style={{ borderTop: 'none' }}>
+        <Container>
           <Menu.Item as={Link} to='/' className={'hide-on-mobile'}>
             <img src={logo} alt='logo' style={{ marginRight: '0.75em' }} />
-            <div
-              style={{
-                fontSize: '18px',
-                fontWeight: '500',
-                color: '#333',
-              }}
-            >
-              {systemName}
+            <div style={{ fontSize: '20px' }}>
+              <b>{systemName}</b>
             </div>
           </Menu.Item>
           {renderButtons(false)}
           <Menu.Menu position='right'>
-            <Dropdown
-              item
-              trigger={
-                <Icon name='language' style={{ margin: 0, fontSize: '18px' }} />
-              }
-              options={languageOptions}
-              value={i18n.language}
-              onChange={(_, { value }) => changeLanguage(value)}
-              style={{
-                fontSize: '16px',
-                fontWeight: '400',
-                color: '#666',
-                padding: '0 10px',
-              }}
-            />
             {userState.user ? (
               <Dropdown
                 text={userState.user.username}
                 pointing
                 className='link item'
-                style={{
-                  fontSize: '15px',
-                  fontWeight: '400',
-                  color: '#666',
-                }}
               >
                 <Dropdown.Menu>
-                  <Dropdown.Item
-                    onClick={logout}
-                    style={{
-                      fontSize: '15px',
-                      fontWeight: '400',
-                      color: '#666',
-                    }}
-                  >
-                    {t('header.logout')}
-                  </Dropdown.Item>
+                  <Dropdown.Item onClick={logout}>注销</Dropdown.Item>
                 </Dropdown.Menu>
               </Dropdown>
             ) : (
               <Menu.Item
-                name={t('header.login')}
+                name='登录'
                 as={Link}
                 to='/login'
                 className='btn btn-link'
-                style={{
-                  fontSize: '15px',
-                  fontWeight: '400',
-                  color: '#666',
-                }}
               />
             )}
           </Menu.Menu>

web/default/src/components/LoginForm.js

@@ -1,16 +1,5 @@
 import React, { useContext, useEffect, useState } from 'react';
-import {
-  Button,
-  Divider,
-  Form,
-  Grid,
-  Header,
-  Image,
-  Message,
-  Modal,
-  Segment,
-  Card,
-} from 'semantic-ui-react';
+import { Button, Divider, Form, Grid, Header, Image, Message, Modal, Segment } from 'semantic-ui-react';
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import { UserContext } from '../context/User';
 import { API, getLogo, showError, showSuccess, showWarning } from '../helpers';
@@ -21,7 +10,7 @@ const LoginForm = () => {
   const [inputs, setInputs] = useState({
     username: '',
     password: '',
-    wechat_verification_code: '',
+    wechat_verification_code: ''
   });
   const [searchParams, setSearchParams] = useSearchParams();
   const [submitted, setSubmitted] = useState(false);
@@ -74,7 +63,7 @@ const LoginForm = () => {
     if (username && password) {
       const res = await API.post(`/api/user/login`, {
         username,
-        password,
+        password
       });
       const { success, message, data } = res.data;
       if (success) {
@@ -97,149 +86,95 @@ const LoginForm = () => {
   return (
     <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
-        <Card
-          fluid
-          className='chart-card'
-          style={{ boxShadow: '0 1px 3px rgba(0,0,0,0.12)' }}
-        >
-          <Card.Content>
-            <Card.Header>
-              <Header
-                as='h2'
-                textAlign='center'
-                style={{ marginBottom: '1.5em' }}
-              >
-                <Image src={logo} style={{ marginBottom: '10px' }} />
-                <Header.Content>用户登录</Header.Content>
-              </Header>
-            </Card.Header>
-            <Form size='large'>
-              <Form.Input
-                fluid
-                icon='user'
-                iconPosition='left'
-                placeholder='用户名 / 邮箱地址'
-                name='username'
-                value={username}
-                onChange={handleChange}
-                style={{ marginBottom: '1em' }}
-              />
-              <Form.Input
-                fluid
-                icon='lock'
-                iconPosition='left'
-                placeholder='密码'
-                name='password'
-                type='password'
-                value={password}
-                onChange={handleChange}
-                style={{ marginBottom: '1.5em' }}
-              />
-              <Button
-                fluid
-                size='large'
-                style={{
-                  background: '#2F73FF', // 使用更现代的蓝色
-                  color: 'white',
-                  marginBottom: '1.5em',
+        <Header as='h2' color='' textAlign='center'>
+          <Image src={logo} /> 用户登录
+        </Header>
+        <Form size='large'>
+          <Segment>
+            <Form.Input
+              fluid
+              icon='user'
+              iconPosition='left'
+              placeholder='用户名 / 邮箱地址'
+              name='username'
+              value={username}
+              onChange={handleChange}
+            />
+            <Form.Input
+              fluid
+              icon='lock'
+              iconPosition='left'
+              placeholder='密码'
+              name='password'
+              type='password'
+              value={password}
+              onChange={handleChange}
+            />
+            <Button color='green' fluid size='large' onClick={handleSubmit}>
+              登录
+            </Button>
+          </Segment>
+        </Form>
+        <Message>
+          忘记密码？
+          <Link to='/reset' className='btn btn-link'>
+            点击重置
+          </Link>
+          ； 没有账户？
+          <Link to='/register' className='btn btn-link'>
+            点击注册
+          </Link>
+        </Message>
+        {status.github_oauth || status.wechat_login || status.lark_client_id ? (
+          <>
+            <Divider horizontal>Or</Divider>
+            <div style={{ display: "flex", justifyContent: "center" }}>
+              {status.github_oauth ? (
+                <Button
+                  circular
+                  color='black'
+                  icon='github'
+                  onClick={() => onGitHubOAuthClicked(status.github_client_id)}
+                />
+              ) : (
+                <></>
+              )}
+              {status.wechat_login ? (
+                <Button
+                  circular
+                  color='green'
+                  icon='wechat'
+                  onClick={onWeChatLoginClicked}
+                />
+              ) : (
+                <></>
+              )}
+              {status.lark_client_id ? (
+                <div style={{
+                  background: "radial-gradient(circle, #FFFFFF, #FFFFFF, #00D6B9, #2F73FF, #0a3A9C)",
+                  width: "36px",
+                  height: "36px",
+                  borderRadius: "10em",
+                  display: "flex",
+                  cursor: "pointer"
                 }}
-                onClick={handleSubmit}
-              >
-                登录
-              </Button>
-            </Form>
-
-            <Divider />
-            <Message style={{ background: 'transparent', boxShadow: 'none' }}>
-              <div
-                style={{
-                  display: 'flex',
-                  justifyContent: 'space-between',
-                  fontSize: '0.9em',
-                  color: '#666',
-                }}
-              >
-                <div>
-                  忘记密码？
-                  <Link to='/reset' style={{ color: '#2185d0' }}>
-                    点击重置
-                  </Link>
-                </div>
-                <div>
-                  没有账户？
-                  <Link to='/register' style={{ color: '#2185d0' }}>
-                    点击注册
-                  </Link>
-                </div>
-              </div>
-            </Message>
-
-            {(status.github_oauth ||
-              status.wechat_login ||
-              status.lark_client_id) && (
-              <>
-                <Divider
-                  horizontal
-                  style={{ color: '#666', fontSize: '0.9em' }}
+                  onClick={() => onLarkOAuthClicked(status.lark_client_id)}
                 >
-                  使用其他方式登录
-                </Divider>
-                <div
-                  style={{
-                    display: 'flex',
-                    justifyContent: 'center',
-                    gap: '1em',
-                    marginTop: '1em',
-                  }}
-                >
-                  {status.github_oauth && (
-                    <Button
-                      circular
-                      color='black'
-                      icon='github'
-                      onClick={() =>
-                        onGitHubOAuthClicked(status.github_client_id)
-                      }
-                    />
-                  )}
-                  {status.wechat_login && (
-                    <Button
-                      circular
-                      color='green'
-                      icon='wechat'
-                      onClick={onWeChatLoginClicked}
-                    />
-                  )}
-                  {status.lark_client_id && (
-                    <div
-                      style={{
-                        background:
-                          'radial-gradient(circle, #FFFFFF, #FFFFFF, #FFFFFF, #FFFFFF, #FFFFFF)',
-                        width: '36px',
-                        height: '36px',
-                        borderRadius: '10em',
-                        display: 'flex',
-                        cursor: 'pointer',
-                      }}
-                      onClick={() => onLarkOAuthClicked(status.lark_client_id)}
-                    >
-                      <Image
-                        src={larkIcon}
-                        avatar
-                        style={{
-                          width: '36px',
-                          height: '36px',
-                          cursor: 'pointer',
-                          margin: 'auto',
-                        }}
-                      />
-                    </div>
-                  )}
+                  <Image
+                    src={larkIcon}
+                    avatar
+                    style={{ width: "16px", height: "16px", cursor: "pointer", margin: "auto" }}
+                    onClick={() => onLarkOAuthClicked(status.lark_client_id)}
+                  />
                 </div>
-              </>
-            )}
-          </Card.Content>
-        </Card>
+              ) : (
+                <></>
+              )}
+            </div>
+          </>
+        ) : (
+          <></>
+        )}
         <Modal
           onClose={() => setShowWeChatLoginModal(false)}
           onOpen={() => setShowWeChatLoginModal(true)}
@@ -263,13 +198,9 @@ const LoginForm = () => {
                   onChange={handleChange}
                 />
                 <Button
+                  color=''
                   fluid
                   size='large'
-                  style={{
-                    background: '#2F73FF', // 使用更现代的蓝色
-                    color: 'white',
-                    marginBottom: '1.5em',
-                  }}
                   onClick={onSubmitWeChatVerificationCode}
                 >
                   登录

web/default/src/components/LogsTable.js

@@ -1,136 +1,47 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Header,
-  Label,
-  Pagination,
-  Segment,
-  Select,
-  Table,
-  Popup,
-} from 'semantic-ui-react';
-import {
-  API,
-  copy,
-  isAdmin,
-  showError,
-  showSuccess,
-  showWarning,
-  timestamp2string,
-} from '../helpers';
-import { useTranslation } from 'react-i18next';
+import { Button, Form, Header, Label, Pagination, Segment, Select, Table } from 'semantic-ui-react';
+import { API, isAdmin, showError, timestamp2string } from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
-import { renderColorLabel, renderQuota } from '../helpers/render';
-import { Link } from 'react-router-dom';
+import { renderQuota } from '../helpers/render';
 
-function renderTimestamp(timestamp, request_id) {
+function renderTimestamp(timestamp) {
   return (
-    <code
-      onClick={async () => {
-        if (await copy(request_id)) {
-          showSuccess(`已复制请求 ID：${request_id}`);
-        } else {
-          showWarning(`请求 ID 复制失败：${request_id}`);
-        }
-      }}
-      style={{ cursor: 'pointer' }}
-    >
+    <>
       {timestamp2string(timestamp)}
-    </code>
+    </>
   );
 }
 
 const MODE_OPTIONS = [
   { key: 'all', text: '全部用户', value: 'all' },
-  { key: 'self', text: '当前用户', value: 'self' },
+  { key: 'self', text: '当前用户', value: 'self' }
+];
+
+const LOG_OPTIONS = [
+  { key: '0', text: '全部', value: 0 },
+  { key: '1', text: '充值', value: 1 },
+  { key: '2', text: '消费', value: 2 },
+  { key: '3', text: '管理', value: 3 },
+  { key: '4', text: '系统', value: 4 }
 ];
 
 function renderType(type) {
   switch (type) {
     case 1:
-      return (
-        <Label basic color='green'>
-          充值
-        </Label>
-      );
+      return <Label basic color='green'> 充值 </Label>;
     case 2:
-      return (
-        <Label basic color='olive'>
-          消费
-        </Label>
-      );
+      return <Label basic color='olive'> 消费 </Label>;
     case 3:
-      return (
-        <Label basic color='orange'>
-          管理
-        </Label>
-      );
+      return <Label basic color='orange'> 管理 </Label>;
     case 4:
-      return (
-        <Label basic color='purple'>
-          系统
-        </Label>
-      );
-    case 5:
-      return (
-        <Label basic color='violet'>
-          测试
-        </Label>
-      );
+      return <Label basic color='purple'> 系统 </Label>;
     default:
-      return (
-        <Label basic color='black'>
-          未知
-        </Label>
-      );
+      return <Label basic color='black'> 未知 </Label>;
   }
 }
 
-function getColorByElapsedTime(elapsedTime) {
-  if (elapsedTime === undefined || 0) return 'black';
-  if (elapsedTime < 1000) return 'green';
-  if (elapsedTime < 3000) return 'olive';
-  if (elapsedTime < 5000) return 'yellow';
-  if (elapsedTime < 10000) return 'orange';
-  return 'red';
-}
-
-function renderDetail(log) {
-  return (
-    <>
-      {log.content}
-      <br />
-      {log.elapsed_time && (
-        <Label
-          basic
-          size={'mini'}
-          color={getColorByElapsedTime(log.elapsed_time)}
-        >
-          {log.elapsed_time} ms
-        </Label>
-      )}
-      {log.is_stream && (
-        <>
-          <Label size={'mini'} color='pink'>
-            Stream
-          </Label>
-        </>
-      )}
-      {log.system_prompt_reset && (
-        <>
-          <Label basic size={'mini'} color='red'>
-            System Prompt Reset
-          </Label>
-        </>
-      )}
-    </>
-  );
-}
-
 const LogsTable = () => {
-  const { t } = useTranslation();
   const [logs, setLogs] = useState([]);
   const [showStat, setShowStat] = useState(false);
   const [loading, setLoading] = useState(true);
@@ -146,31 +57,15 @@ const LogsTable = () => {
     model_name: '',
     start_timestamp: timestamp2string(0),
     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,
+    token: 0
   });
 
-  const LOG_OPTIONS = [
-    { key: '0', text: t('log.type.all'), value: 0 },
-    { key: '1', text: t('log.type.topup'), value: 1 },
-    { key: '2', text: t('log.type.usage'), value: 2 },
-    { key: '3', text: t('log.type.admin'), value: 3 },
-    { key: '4', text: t('log.type.system'), value: 4 },
-    { key: '5', text: t('log.type.test'), value: 5 },
-  ];
-
   const handleInputChange = (e, { name, value }) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
@@ -178,9 +73,7 @@ const LogsTable = () => {
   const getLogSelfStat = async () => {
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
     let localEndTimestamp = Date.parse(end_timestamp) / 1000;
-    let res = await API.get(
-      `/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`
-    );
+    let res = await API.get(`/api/log/self/stat?type=${logType}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}`);
     const { success, message, data } = res.data;
     if (success) {
       setStat(data);
@@ -192,9 +85,7 @@ const LogsTable = () => {
   const getLogStat = async () => {
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
     let localEndTimestamp = Date.parse(end_timestamp) / 1000;
-    let res = await API.get(
-      `/api/log/stat?type=${logType}&username=${username}&token_name=${token_name}&model_name=${model_name}&start_timestamp=${localStartTimestamp}&end_timestamp=${localEndTimestamp}&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);
@@ -214,10 +105,6 @@ const LogsTable = () => {
     setShowStat(!showStat);
   };
 
-  const showUserTokenQuota = () => {
-    return logType !== 5;
-  };
-
   const loadLogs = async (startIdx) => {
     let url = '';
     let localStartTimestamp = Date.parse(start_timestamp) / 1000;
@@ -310,295 +197,205 @@ const LogsTable = () => {
 
   return (
     <>
-      <Header as='h3'>
-        {t('log.usage_details')}（{t('log.total_quota')}：
-        {showStat && renderQuota(stat.quota, t)}
-        {!showStat && (
-          <span
-            onClick={handleEyeClick}
-            style={{ cursor: 'pointer', color: 'gray' }}
-          >
-            {t('log.click_to_view')}
-          </span>
-        )}
-        ）
-      </Header>
-      <Form>
-        <Form.Group>
-          <Form.Input
-            fluid
-            label={t('log.table.token_name')}
-            width={3}
-            value={token_name}
-            placeholder={t('log.table.token_name_placeholder')}
-            name='token_name'
-            onChange={handleInputChange}
-          />
-          <Form.Input
-            fluid
-            label={t('log.table.model_name')}
-            width={3}
-            value={model_name}
-            placeholder={t('log.table.model_name_placeholder')}
-            name='model_name'
-            onChange={handleInputChange}
-          />
-          <Form.Input
-            fluid
-            label={t('log.table.start_time')}
-            width={4}
-            value={start_timestamp}
-            type='datetime-local'
-            name='start_timestamp'
-            onChange={handleInputChange}
-          />
-          <Form.Input
-            fluid
-            label={t('log.table.end_time')}
-            width={4}
-            value={end_timestamp}
-            type='datetime-local'
-            name='end_timestamp'
-            onChange={handleInputChange}
-          />
-          <Form.Button
-            fluid
-            label={t('log.buttons.query')}
-            width={2}
-            onClick={refresh}
-          >
-            {t('log.buttons.submit')}
-          </Form.Button>
-        </Form.Group>
-        {isAdminUser && (
-          <>
-            <Form.Group>
-              <Form.Input
-                fluid
-                label={t('log.table.channel_id')}
-                width={3}
-                value={channel}
-                placeholder={t('log.table.channel_id_placeholder')}
-                name='channel'
-                onChange={handleInputChange}
-              />
-              <Form.Input
-                fluid
-                label={t('log.table.username')}
-                width={3}
-                value={username}
-                placeholder={t('log.table.username_placeholder')}
-                name='username'
-                onChange={handleInputChange}
-              />
-            </Form.Group>
-          </>
-        )}
-        <Form.Input
-          icon='search'
-          placeholder={t('log.search')}
-          value={searchKeyword}
-          onChange={(e, { value }) => setSearchKeyword(value)}
-        />
-      </Form>
-      <Table basic={'very'} compact size='small'>
-        <Table.Header>
-          <Table.Row>
-            <Table.HeaderCell
-              style={{ cursor: 'pointer' }}
-              onClick={() => {
-                sortLog('created_time');
-              }}
-              width={3}
-            >
-              {t('log.table.time')}
-            </Table.HeaderCell>
-            {isAdminUser && (
+      <Segment>
+        <Header as='h3'>
+          使用明细（总消耗额度：
+          {showStat && renderQuota(stat.quota)}
+          {!showStat && <span onClick={handleEyeClick} style={{ cursor: 'pointer', color: 'gray' }}>点击查看</span>}
+          ）
+        </Header>
+        <Form>
+          <Form.Group>
+            <Form.Input fluid label={'令牌名称'} width={3} value={token_name}
+                        placeholder={'可选值'} name='token_name' onChange={handleInputChange} />
+            <Form.Input fluid label='模型名称' width={3} value={model_name} placeholder='可选值'
+                        name='model_name'
+                        onChange={handleInputChange} />
+            <Form.Input fluid label='起始时间' width={4} value={start_timestamp} type='datetime-local'
+                        name='start_timestamp'
+                        onChange={handleInputChange} />
+            <Form.Input fluid label='结束时间' width={4} value={end_timestamp} type='datetime-local'
+                        name='end_timestamp'
+                        onChange={handleInputChange} />
+            <Form.Button fluid label='操作' width={2} onClick={refresh}>查询</Form.Button>
+          </Form.Group>
+          {
+            isAdminUser && <>
+              <Form.Group>
+                <Form.Input fluid label={'渠道 ID'} width={3} value={channel}
+                            placeholder='可选值' name='channel'
+                            onChange={handleInputChange} />
+                <Form.Input fluid label={'用户名称'} width={3} value={username}
+                            placeholder={'可选值'} name='username'
+                            onChange={handleInputChange} />
+
+              </Form.Group>
+            </>
+          }
+        </Form>
+        <Table basic compact size='small'>
+          <Table.Header>
+            <Table.Row>
               <Table.HeaderCell
                 style={{ cursor: 'pointer' }}
                 onClick={() => {
-                  sortLog('channel');
+                  sortLog('created_time');
+                }}
+                width={3}
+              >
+                时间
+              </Table.HeaderCell>
+              {
+                isAdminUser && <Table.HeaderCell
+                  style={{ cursor: 'pointer' }}
+                  onClick={() => {
+                    sortLog('channel');
+                  }}
+                  width={1}
+                >
+                  渠道
+                </Table.HeaderCell>
+              }
+              {
+                isAdminUser && <Table.HeaderCell
+                  style={{ cursor: 'pointer' }}
+                  onClick={() => {
+                    sortLog('username');
+                  }}
+                  width={1}
+                >
+                  用户
+                </Table.HeaderCell>
+              }
+              <Table.HeaderCell
+                style={{ cursor: 'pointer' }}
+                onClick={() => {
+                  sortLog('token_name');
                 }}
                 width={1}
               >
-                {t('log.table.channel')}
+                令牌
               </Table.HeaderCell>
-            )}
-            <Table.HeaderCell
-              style={{ cursor: 'pointer' }}
-              onClick={() => {
-                sortLog('type');
-              }}
-              width={1}
-            >
-              {t('log.table.type')}
-            </Table.HeaderCell>
-            <Table.HeaderCell
-              style={{ cursor: 'pointer' }}
-              onClick={() => {
-                sortLog('model_name');
-              }}
-              width={2}
-            >
-              {t('log.table.model')}
-            </Table.HeaderCell>
-            {showUserTokenQuota() && (
-              <>
-                {isAdminUser && (
-                  <Table.HeaderCell
-                    style={{ cursor: 'pointer' }}
-                    onClick={() => {
-                      sortLog('username');
-                    }}
-                    width={2}
-                  >
-                    {t('log.table.username')}
-                  </Table.HeaderCell>
-                )}
-                <Table.HeaderCell
-                  style={{ cursor: 'pointer' }}
-                  onClick={() => {
-                    sortLog('token_name');
-                  }}
-                  width={2}
-                >
-                  {t('log.table.token_name')}
-                </Table.HeaderCell>
-                <Table.HeaderCell
-                  style={{ cursor: 'pointer' }}
-                  onClick={() => {
-                    sortLog('prompt_tokens');
-                  }}
-                  width={1}
-                >
-                  {t('log.table.prompt_tokens')}
-                </Table.HeaderCell>
-                <Table.HeaderCell
-                  style={{ cursor: 'pointer' }}
-                  onClick={() => {
-                    sortLog('completion_tokens');
-                  }}
-                  width={1}
-                >
-                  {t('log.table.completion_tokens')}
-                </Table.HeaderCell>
-                <Table.HeaderCell
-                  style={{ cursor: 'pointer' }}
-                  onClick={() => {
-                    sortLog('quota');
-                  }}
-                  width={1}
-                >
-                  {t('log.table.quota')}
-                </Table.HeaderCell>
-              </>
-            )}
-            <Table.HeaderCell>{t('log.table.detail')}</Table.HeaderCell>
-          </Table.Row>
-        </Table.Header>
-
-        <Table.Body>
-          {logs
-            .slice(
-              (activePage - 1) * ITEMS_PER_PAGE,
-              activePage * ITEMS_PER_PAGE
-            )
-            .map((log, idx) => {
-              if (log.deleted) return <></>;
-              return (
-                <Table.Row key={log.id}>
-                  <Table.Cell>
-                    {renderTimestamp(log.created_at, log.request_id)}
-                  </Table.Cell>
-                  {isAdminUser && (
-                    <Table.Cell>
-                      {log.channel ? (
-                        <Label
-                          basic
-                          as={Link}
-                          to={`/channel/edit/${log.channel}`}
-                        >
-                          {log.channel}
-                        </Label>
-                      ) : (
-                        ''
-                      )}
-                    </Table.Cell>
-                  )}
-                  <Table.Cell>{renderType(log.type)}</Table.Cell>
-                  <Table.Cell>
-                    {log.model_name ? renderColorLabel(log.model_name) : ''}
-                  </Table.Cell>
-                  {showUserTokenQuota() && (
-                    <>
-                      {isAdminUser && (
-                        <Table.Cell>
-                          {log.username ? (
-                            <Label
-                              basic
-                              as={Link}
-                              to={`/user/edit/${log.user_id}`}
-                            >
-                              {log.username}
-                            </Label>
-                          ) : (
-                            ''
-                          )}
-                        </Table.Cell>
-                      )}
-                      <Table.Cell>
-                        {log.token_name ? renderColorLabel(log.token_name) : ''}
-                      </Table.Cell>
-
-                      <Table.Cell>
-                        {log.prompt_tokens ? log.prompt_tokens : ''}
-                      </Table.Cell>
-                      <Table.Cell>
-                        {log.completion_tokens ? log.completion_tokens : ''}
-                      </Table.Cell>
-                      <Table.Cell>
-                        {log.quota ? renderQuota(log.quota, t, 6) : ''}
-                      </Table.Cell>
-                    </>
-                  )}
-
-                  <Table.Cell>{renderDetail(log)}</Table.Cell>
-                </Table.Row>
-              );
-            })}
-        </Table.Body>
-
-        <Table.Footer>
-          <Table.Row>
-            <Table.HeaderCell colSpan={'10'}>
-              <Select
-                placeholder={t('log.type.select')}
-                options={LOG_OPTIONS}
-                style={{ marginRight: '8px' }}
-                name='logType'
-                value={logType}
-                onChange={(e, { name, value }) => {
-                  setLogType(value);
+              <Table.HeaderCell
+                style={{ cursor: 'pointer' }}
+                onClick={() => {
+                  sortLog('type');
                 }}
-              />
-              <Button size='small' onClick={refresh} loading={loading}>
-                {t('log.buttons.refresh')}
-              </Button>
-              <Pagination
-                floated='right'
-                activePage={activePage}
-                onPageChange={onPaginationChange}
-                size='small'
-                siblingRange={1}
-                totalPages={
-                  Math.ceil(logs.length / ITEMS_PER_PAGE) +
-                  (logs.length % ITEMS_PER_PAGE === 0 ? 1 : 0)
-                }
-              />
-            </Table.HeaderCell>
-          </Table.Row>
-        </Table.Footer>
-      </Table>
+                width={1}
+              >
+                类型
+              </Table.HeaderCell>
+              <Table.HeaderCell
+                style={{ cursor: 'pointer' }}
+                onClick={() => {
+                  sortLog('model_name');
+                }}
+                width={2}
+              >
+                模型
+              </Table.HeaderCell>
+              <Table.HeaderCell
+                style={{ cursor: 'pointer' }}
+                onClick={() => {
+                  sortLog('prompt_tokens');
+                }}
+                width={1}
+              >
+                提示
+              </Table.HeaderCell>
+              <Table.HeaderCell
+                style={{ cursor: 'pointer' }}
+                onClick={() => {
+                  sortLog('completion_tokens');
+                }}
+                width={1}
+              >
+                补全
+              </Table.HeaderCell>
+              <Table.HeaderCell
+                style={{ cursor: 'pointer' }}
+                onClick={() => {
+                  sortLog('quota');
+                }}
+                width={1}
+              >
+                额度
+              </Table.HeaderCell>
+              <Table.HeaderCell
+                style={{ cursor: 'pointer' }}
+                onClick={() => {
+                  sortLog('content');
+                }}
+                width={isAdminUser ? 4 : 6}
+              >
+                详情
+              </Table.HeaderCell>
+            </Table.Row>
+          </Table.Header>
+
+          <Table.Body>
+            {logs
+              .slice(
+                (activePage - 1) * ITEMS_PER_PAGE,
+                activePage * ITEMS_PER_PAGE
+              )
+              .map((log, idx) => {
+                if (log.deleted) return <></>;
+                return (
+                  <Table.Row key={log.id}>
+                    <Table.Cell>{renderTimestamp(log.created_at)}</Table.Cell>
+                    {
+                      isAdminUser && (
+                        <Table.Cell>{log.channel ? <Label basic>{log.channel}</Label> : ''}</Table.Cell>
+                      )
+                    }
+                    {
+                      isAdminUser && (
+                        <Table.Cell>{log.username ? <Label>{log.username}</Label> : ''}</Table.Cell>
+                      )
+                    }
+                    <Table.Cell>{log.token_name ? <Label basic>{log.token_name}</Label> : ''}</Table.Cell>
+                    <Table.Cell>{renderType(log.type)}</Table.Cell>
+                    <Table.Cell>{log.model_name ? <Label basic>{log.model_name}</Label> : ''}</Table.Cell>
+                    <Table.Cell>{log.prompt_tokens ? log.prompt_tokens : ''}</Table.Cell>
+                    <Table.Cell>{log.completion_tokens ? log.completion_tokens : ''}</Table.Cell>
+                    <Table.Cell>{log.quota ? renderQuota(log.quota, 6) : ''}</Table.Cell>
+                    <Table.Cell>{log.content}</Table.Cell>
+                  </Table.Row>
+                );
+              })}
+          </Table.Body>
+
+          <Table.Footer>
+            <Table.Row>
+              <Table.HeaderCell colSpan={'10'}>
+                <Select
+                  placeholder='选择明细分类'
+                  options={LOG_OPTIONS}
+                  style={{ marginRight: '8px' }}
+                  name='logType'
+                  value={logType}
+                  onChange={(e, { name, value }) => {
+                    setLogType(value);
+                  }}
+                />
+                <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
+                <Pagination
+                  floated='right'
+                  activePage={activePage}
+                  onPageChange={onPaginationChange}
+                  size='small'
+                  siblingRange={1}
+                  totalPages={
+                    Math.ceil(logs.length / ITEMS_PER_PAGE) +
+                    (logs.length % ITEMS_PER_PAGE === 0 ? 1 : 0)
+                  }
+                />
+              </Table.HeaderCell>
+            </Table.Row>
+          </Table.Footer>
+        </Table>
+      </Segment>
     </>
   );
 };

web/default/src/components/OperationSetting.js

@@ -1,16 +1,8 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 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 = () => {
-  const { t } = useTranslation();
   let now = new Date();
   let [inputs, setInputs] = useState({
     QuotaForNewUser: 0,
@@ -31,13 +23,11 @@ const OperationSetting = () => {
     DisplayInCurrencyEnabled: '',
     DisplayTokenStatEnabled: '',
     ApproximateTokenEnabled: '',
-    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 getOptions = async () => {
     const res = await API.get('/api/option/');
@@ -45,11 +35,7 @@ const OperationSetting = () => {
     if (success) {
       let newInputs = {};
       data.forEach((item) => {
-        if (
-          item.key === 'ModelRatio' ||
-          item.key === 'GroupRatio' ||
-          item.key === 'CompletionRatio'
-        ) {
+        if (item.key === 'ModelRatio' || item.key === 'GroupRatio' || item.key === 'CompletionRatio') {
           item.value = JSON.stringify(JSON.parse(item.value), null, 2);
         }
         if (item.value === '{}') {
@@ -75,7 +61,7 @@ const OperationSetting = () => {
     }
     const res = await API.put('/api/option/', {
       key,
-      value,
+      value
     });
     const { success, message } = res.data;
     if (success) {
@@ -97,22 +83,11 @@ const OperationSetting = () => {
   const submitConfig = async (group) => {
     switch (group) {
       case 'monitor':
-        if (
-          originInputs['ChannelDisableThreshold'] !==
-          inputs.ChannelDisableThreshold
-        ) {
-          await updateOption(
-            'ChannelDisableThreshold',
-            inputs.ChannelDisableThreshold
-          );
+        if (originInputs['ChannelDisableThreshold'] !== inputs.ChannelDisableThreshold) {
+          await updateOption('ChannelDisableThreshold', inputs.ChannelDisableThreshold);
         }
-        if (
-          originInputs['QuotaRemindThreshold'] !== inputs.QuotaRemindThreshold
-        ) {
-          await updateOption(
-            'QuotaRemindThreshold',
-            inputs.QuotaRemindThreshold
-          );
+        if (originInputs['QuotaRemindThreshold'] !== inputs.QuotaRemindThreshold) {
+          await updateOption('QuotaRemindThreshold', inputs.QuotaRemindThreshold);
         }
         break;
       case 'ratio':
@@ -171,9 +146,7 @@ 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} 条日志已清理！`);
@@ -186,218 +159,40 @@ const OperationSetting = () => {
     <Grid columns={1}>
       <Grid.Column>
         <Form loading={loading}>
-          <Header as='h3'>{t('setting.operation.quota.title')}</Header>
-          <Form.Group widths='equal'>
-            <Form.Input
-              label={t('setting.operation.quota.new_user')}
-              name='QuotaForNewUser'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.QuotaForNewUser}
-              type='number'
-              min='0'
-              placeholder={t('setting.operation.quota.new_user_placeholder')}
-            />
-            <Form.Input
-              label={t('setting.operation.quota.pre_consume')}
-              name='PreConsumedQuota'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.PreConsumedQuota}
-              type='number'
-              min='0'
-              placeholder={t('setting.operation.quota.pre_consume_placeholder')}
-            />
-            <Form.Input
-              label={t('setting.operation.quota.inviter_reward')}
-              name='QuotaForInviter'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.QuotaForInviter}
-              type='number'
-              min='0'
-              placeholder={t(
-                'setting.operation.quota.inviter_reward_placeholder'
-              )}
-            />
-            <Form.Input
-              label={t('setting.operation.quota.invitee_reward')}
-              name='QuotaForInvitee'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.QuotaForInvitee}
-              type='number'
-              min='0'
-              placeholder={t(
-                'setting.operation.quota.invitee_reward_placeholder'
-              )}
-            />
-          </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('quota').then();
-            }}
-          >
-            {t('setting.operation.quota.buttons.save')}
-          </Form.Button>
-          <Divider />
-          <Header as='h3'>{t('setting.operation.ratio.title')}</Header>
-          <Form.Group widths='equal'>
-            <Form.TextArea
-              label={t('setting.operation.ratio.model.title')}
-              name='ModelRatio'
-              onChange={handleInputChange}
-              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete='new-password'
-              value={inputs.ModelRatio}
-              placeholder={t('setting.operation.ratio.model.placeholder')}
-            />
-          </Form.Group>
-          <Form.Group widths='equal'>
-            <Form.TextArea
-              label={t('setting.operation.ratio.completion.title')}
-              name='CompletionRatio'
-              onChange={handleInputChange}
-              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete='new-password'
-              value={inputs.CompletionRatio}
-              placeholder={t('setting.operation.ratio.completion.placeholder')}
-            />
-          </Form.Group>
-          <Form.Group widths='equal'>
-            <Form.TextArea
-              label={t('setting.operation.ratio.group.title')}
-              name='GroupRatio'
-              onChange={handleInputChange}
-              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
-              autoComplete='new-password'
-              value={inputs.GroupRatio}
-              placeholder={t('setting.operation.ratio.group.placeholder')}
-            />
-          </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('ratio').then();
-            }}
-          >
-            {t('setting.operation.ratio.buttons.save')}
-          </Form.Button>
-          <Divider />
-          <Header as='h3'>{t('setting.operation.log.title')}</Header>
-          <Form.Group inline>
-            <Form.Checkbox
-              checked={inputs.LogConsumeEnabled === 'true'}
-              label={t('setting.operation.log.enable_consume')}
-              name='LogConsumeEnabled'
-              onChange={handleInputChange}
-            />
-          </Form.Group>
+          <Header as='h3'>
+            通用设置
+          </Header>
           <Form.Group widths={4}>
             <Form.Input
-              label={t('setting.operation.log.target_time')}
-              value={historyTimestamp}
-              type='datetime-local'
-              name='history_timestamp'
-              onChange={(e, { name, value }) => {
-                setHistoryTimestamp(value);
-              }}
-            />
-          </Form.Group>
-          <Form.Button
-            onClick={() => {
-              deleteHistoryLogs().then();
-            }}
-          >
-            {t('setting.operation.log.buttons.clean')}
-          </Form.Button>
-
-          <Divider />
-          <Header as='h3'>{t('setting.operation.monitor.title')}</Header>
-          <Form.Group widths={3}>
-            <Form.Input
-              label={t('setting.operation.monitor.max_response_time')}
-              name='ChannelDisableThreshold'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.ChannelDisableThreshold}
-              type='number'
-              min='0'
-              placeholder={t(
-                'setting.operation.monitor.max_response_time_placeholder'
-              )}
-            />
-            <Form.Input
-              label={t('setting.operation.monitor.quota_reminder')}
-              name='QuotaRemindThreshold'
-              onChange={handleInputChange}
-              autoComplete='new-password'
-              value={inputs.QuotaRemindThreshold}
-              type='number'
-              min='0'
-              placeholder={t(
-                'setting.operation.monitor.quota_reminder_placeholder'
-              )}
-            />
-          </Form.Group>
-          <Form.Group inline>
-            <Form.Checkbox
-              checked={inputs.AutomaticDisableChannelEnabled === 'true'}
-              label={t('setting.operation.monitor.auto_disable')}
-              name='AutomaticDisableChannelEnabled'
-              onChange={handleInputChange}
-            />
-            <Form.Checkbox
-              checked={inputs.AutomaticEnableChannelEnabled === 'true'}
-              label={t('setting.operation.monitor.auto_enable')}
-              name='AutomaticEnableChannelEnabled'
-              onChange={handleInputChange}
-            />
-          </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('monitor').then();
-            }}
-          >
-            {t('setting.operation.monitor.buttons.save')}
-          </Form.Button>
-
-          <Divider />
-          <Header as='h3'>{t('setting.operation.general.title')}</Header>
-          <Form.Group widths={4}>
-            <Form.Input
-              label={t('setting.operation.general.topup_link')}
+              label='充值链接'
               name='TopUpLink'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.TopUpLink}
               type='link'
-              placeholder={t(
-                'setting.operation.general.topup_link_placeholder'
-              )}
+              placeholder='例如发卡网站的购买链接'
             />
             <Form.Input
-              label={t('setting.operation.general.chat_link')}
+              label='聊天页面链接'
               name='ChatLink'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.ChatLink}
               type='link'
-              placeholder={t('setting.operation.general.chat_link_placeholder')}
+              placeholder='例如 ChatGPT Next Web 的部署地址'
             />
             <Form.Input
-              label={t('setting.operation.general.quota_per_unit')}
+              label='单位美元额度'
               name='QuotaPerUnit'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.QuotaPerUnit}
               type='number'
               step='0.01'
-              placeholder={t(
-                'setting.operation.general.quota_per_unit_placeholder'
-              )}
+              placeholder='一单位货币能兑换的额度'
             />
             <Form.Input
-              label={t('setting.operation.general.retry_times')}
+              label='失败重试次数'
               name='RetryTimes'
               type={'number'}
               step='1'
@@ -405,38 +200,186 @@ const OperationSetting = () => {
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.RetryTimes}
-              placeholder={t(
-                'setting.operation.general.retry_times_placeholder'
-              )}
+              placeholder='失败重试次数'
             />
           </Form.Group>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.DisplayInCurrencyEnabled === 'true'}
-              label={t('setting.operation.general.display_in_currency')}
+              label='以货币形式显示额度'
               name='DisplayInCurrencyEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.DisplayTokenStatEnabled === 'true'}
-              label={t('setting.operation.general.display_token_stat')}
+              label='Billing 相关 API 显示令牌额度而非用户额度'
               name='DisplayTokenStatEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.ApproximateTokenEnabled === 'true'}
-              label={t('setting.operation.general.approximate_token')}
+              label='使用近似的方式估算 token 数以减少计算量'
               name='ApproximateTokenEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button
-            onClick={() => {
-              submitConfig('general').then();
-            }}
-          >
-            {t('setting.operation.general.buttons.save')}
-          </Form.Button>
+          <Form.Button onClick={() => {
+            submitConfig('general').then();
+          }}>保存通用设置</Form.Button>
+          <Divider />
+          <Header as='h3'>
+            日志设置
+          </Header>
+          <Form.Group inline>
+            <Form.Checkbox
+              checked={inputs.LogConsumeEnabled === 'true'}
+              label='启用额度消费日志记录'
+              name='LogConsumeEnabled'
+              onChange={handleInputChange}
+            />
+          </Form.Group>
+          <Form.Group widths={4}>
+            <Form.Input label='目标时间' value={historyTimestamp} type='datetime-local'
+                        name='history_timestamp'
+                        onChange={(e, { name, value }) => {
+                          setHistoryTimestamp(value);
+                        }} />
+          </Form.Group>
+          <Form.Button onClick={() => {
+            deleteHistoryLogs().then();
+          }}>清理历史日志</Form.Button>
+          <Divider />
+          <Header as='h3'>
+            监控设置
+          </Header>
+          <Form.Group widths={3}>
+            <Form.Input
+              label='最长响应时间'
+              name='ChannelDisableThreshold'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.ChannelDisableThreshold}
+              type='number'
+              min='0'
+              placeholder='单位秒，当运行渠道全部测试时，超过此时间将自动禁用渠道'
+            />
+            <Form.Input
+              label='额度提醒阈值'
+              name='QuotaRemindThreshold'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.QuotaRemindThreshold}
+              type='number'
+              min='0'
+              placeholder='低于此额度时将发送邮件提醒用户'
+            />
+          </Form.Group>
+          <Form.Group inline>
+            <Form.Checkbox
+              checked={inputs.AutomaticDisableChannelEnabled === 'true'}
+              label='失败时自动禁用渠道'
+              name='AutomaticDisableChannelEnabled'
+              onChange={handleInputChange}
+            />
+            <Form.Checkbox
+              checked={inputs.AutomaticEnableChannelEnabled === 'true'}
+              label='成功时自动启用渠道'
+              name='AutomaticEnableChannelEnabled'
+              onChange={handleInputChange}
+            />
+          </Form.Group>
+          <Form.Button onClick={() => {
+            submitConfig('monitor').then();
+          }}>保存监控设置</Form.Button>
+          <Divider />
+          <Header as='h3'>
+            额度设置
+          </Header>
+          <Form.Group widths={4}>
+            <Form.Input
+              label='新用户初始额度'
+              name='QuotaForNewUser'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.QuotaForNewUser}
+              type='number'
+              min='0'
+              placeholder='例如：100'
+            />
+            <Form.Input
+              label='请求预扣费额度'
+              name='PreConsumedQuota'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.PreConsumedQuota}
+              type='number'
+              min='0'
+              placeholder='请求结束后多退少补'
+            />
+            <Form.Input
+              label='邀请新用户奖励额度'
+              name='QuotaForInviter'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.QuotaForInviter}
+              type='number'
+              min='0'
+              placeholder='例如：2000'
+            />
+            <Form.Input
+              label='新用户使用邀请码奖励额度'
+              name='QuotaForInvitee'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.QuotaForInvitee}
+              type='number'
+              min='0'
+              placeholder='例如：1000'
+            />
+          </Form.Group>
+          <Form.Button onClick={() => {
+            submitConfig('quota').then();
+          }}>保存额度设置</Form.Button>
+          <Divider />
+          <Header as='h3'>
+            倍率设置
+          </Header>
+          <Form.Group widths='equal'>
+            <Form.TextArea
+              label='模型倍率'
+              name='ModelRatio'
+              onChange={handleInputChange}
+              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
+              autoComplete='new-password'
+              value={inputs.ModelRatio}
+              placeholder='为一个 JSON 文本，键为模型名称，值为倍率'
+            />
+          </Form.Group>
+          <Form.Group widths='equal'>
+            <Form.TextArea
+              label='补全倍率'
+              name='CompletionRatio'
+              onChange={handleInputChange}
+              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
+              autoComplete='new-password'
+              value={inputs.CompletionRatio}
+              placeholder='为一个 JSON 文本，键为模型名称，值为倍率，此处的倍率设置是模型补全倍率相较于提示倍率的比例，使用该设置可强制覆盖 One API 的内部比例'
+            />
+          </Form.Group>
+          <Form.Group widths='equal'>
+            <Form.TextArea
+              label='分组倍率'
+              name='GroupRatio'
+              onChange={handleInputChange}
+              style={{ minHeight: 250, fontFamily: 'JetBrains Mono, Consolas' }}
+              autoComplete='new-password'
+              value={inputs.GroupRatio}
+              placeholder='为一个 JSON 文本，键为分组名称，值为倍率'
+            />
+          </Form.Group>
+          <Form.Button onClick={() => {
+            submitConfig('ratio').then();
+          }}>保存倍率设置</Form.Button>
         </Form>
       </Grid.Column>
     </Grid>

web/default/src/components/OtherSetting.js

@@ -1,20 +1,10 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Divider,
-  Form,
-  Grid,
-  Header,
-  Message,
-  Modal,
-} from 'semantic-ui-react';
-import { Link } from 'react-router-dom';
-import { API, showError, showSuccess, verifyJSON } from '../helpers';
+import { Button, Divider, Form, Grid, Header, Message, Modal } from 'semantic-ui-react';
+import { API, showError, showSuccess } from '../helpers';
 import { marked } from 'marked';
+import { Link } from 'react-router-dom';
 
 const OtherSetting = () => {
-  const { t } = useTranslation();
   let [inputs, setInputs] = useState({
     Footer: '',
     Notice: '',
@@ -22,13 +12,13 @@ const OtherSetting = () => {
     SystemName: '',
     Logo: '',
     HomePageContent: '',
-    Theme: '',
+    Theme: ''
   });
   let [loading, setLoading] = useState(false);
   const [showUpdateModal, setShowUpdateModal] = useState(false);
   const [updateData, setUpdateData] = useState({
     tag_name: '',
-    content: '',
+    content: ''
   });
 
   const getOptions = async () => {
@@ -55,7 +45,7 @@ const OtherSetting = () => {
     setLoading(true);
     const res = await API.put('/api/option/', {
       key,
-      value,
+      value
     });
     const { success, message } = res.data;
     if (success) {
@@ -74,6 +64,10 @@ const OtherSetting = () => {
     await updateOption('Notice', inputs.Notice);
   };
 
+  const submitFooter = async () => {
+    await updateOption('Footer', inputs.Footer);
+  };
+
   const submitSystemName = async () => {
     await updateOption('SystemName', inputs.SystemName);
   };
@@ -95,7 +89,8 @@ const OtherSetting = () => {
   };
 
   const openGitHubRelease = () => {
-    window.location = 'https://github.com/songquanpeng/one-api/releases/latest';
+    window.location =
+      'https://github.com/songquanpeng/one-api/releases/latest';
   };
 
   const checkUpdate = async () => {
@@ -108,7 +103,7 @@ const OtherSetting = () => {
     } else {
       setUpdateData({
         tag_name: tag_name,
-        content: marked.parse(body),
+        content: marked.parse(body)
       });
       setShowUpdateModal(true);
     }
@@ -118,110 +113,87 @@ const OtherSetting = () => {
     <Grid columns={1}>
       <Grid.Column>
         <Form loading={loading}>
-          <Header as='h3'>{t('setting.other.notice.title')}</Header>
+          <Header as='h3'>通用设置</Header>
+          <Form.Button onClick={checkUpdate}>检查更新</Form.Button>
           <Form.Group widths='equal'>
             <Form.TextArea
-              label={t('setting.other.notice.content')}
-              placeholder={t('setting.other.notice.content_placeholder')}
+              label='公告'
+              placeholder='在此输入新的公告内容，支持 Markdown & HTML 代码'
               value={inputs.Notice}
               name='Notice'
               onChange={handleInputChange}
-              style={{ minHeight: 100, fontFamily: 'JetBrains Mono, Consolas' }}
+              style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
             />
           </Form.Group>
-          <Form.Button onClick={submitNotice}>
-            {t('setting.other.notice.buttons.save')}
-          </Form.Button>
-
+          <Form.Button onClick={submitNotice}>保存公告</Form.Button>
           <Divider />
-          <Header as='h3'>{t('setting.other.system.title')}</Header>
+          <Header as='h3'>个性化设置</Header>
           <Form.Group widths='equal'>
             <Form.Input
-              label={t('setting.other.system.name')}
-              placeholder={t('setting.other.system.name_placeholder')}
+              label='系统名称'
+              placeholder='在此输入系统名称'
               value={inputs.SystemName}
               name='SystemName'
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button onClick={submitSystemName}>
-            {t('setting.other.system.buttons.save_name')}
-          </Form.Button>
+          <Form.Button onClick={submitSystemName}>设置系统名称</Form.Button>
           <Form.Group widths='equal'>
             <Form.Input
-              label={
-                <label>
-                  {t('setting.other.system.theme.title')}（
-                  <Link to='https://github.com/songquanpeng/one-api/blob/main/web/README.md'>
-                    {t('setting.other.system.theme.link')}
-                  </Link>
-                  ）
-                </label>
-              }
-              placeholder={t('setting.other.system.theme.placeholder')}
+              label={<label>主题名称（<Link
+                to='https://github.com/songquanpeng/one-api/blob/main/web/README.md'>当前可用主题</Link>）</label>}
+              placeholder='请输入主题名称'
               value={inputs.Theme}
               name='Theme'
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button onClick={submitTheme}>
-            {t('setting.other.system.buttons.save_theme')}
-          </Form.Button>
+          <Form.Button onClick={submitTheme}>设置主题（重启生效）</Form.Button>
           <Form.Group widths='equal'>
             <Form.Input
-              label={t('setting.other.system.logo')}
-              placeholder={t('setting.other.system.logo_placeholder')}
+              label='Logo 图片地址'
+              placeholder='在此输入 Logo 图片地址'
               value={inputs.Logo}
               name='Logo'
               type='url'
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button onClick={submitLogo}>
-            {t('setting.other.system.buttons.save_logo')}
-          </Form.Button>
-
-          <Divider />
-          <Header as='h3'>{t('setting.other.content.title')}</Header>
+          <Form.Button onClick={submitLogo}>设置 Logo</Form.Button>
           <Form.Group widths='equal'>
             <Form.TextArea
-              label={t('setting.other.content.homepage.title')}
-              placeholder={t('setting.other.content.homepage.placeholder')}
+              label='首页内容'
+              placeholder='在此输入首页内容，支持 Markdown & HTML 代码，设置后首页的状态信息将不再显示。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为首页。'
               value={inputs.HomePageContent}
               name='HomePageContent'
               onChange={handleInputChange}
               style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
             />
           </Form.Group>
-          <Form.Button onClick={() => submitOption('HomePageContent')}>
-            {t('setting.other.content.buttons.save_homepage')}
-          </Form.Button>
+          <Form.Button onClick={() => submitOption('HomePageContent')}>保存首页内容</Form.Button>
           <Form.Group widths='equal'>
             <Form.TextArea
-              label={t('setting.other.content.about.title')}
-              placeholder={t('setting.other.content.about.placeholder')}
+              label='关于'
+              placeholder='在此输入新的关于内容，支持 Markdown & HTML 代码。如果输入的是一个链接，则会使用该链接作为 iframe 的 src 属性，这允许你设置任意网页作为关于页面。'
               value={inputs.About}
               name='About'
               onChange={handleInputChange}
               style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
             />
           </Form.Group>
-          <Form.Button onClick={submitAbout}>
-            {t('setting.other.content.buttons.save_about')}
-          </Form.Button>
-          <Message>{t('setting.other.copyright.notice')}</Message>
+          <Form.Button onClick={submitAbout}>保存关于</Form.Button>
+          <Message>移除 One API
+            的版权标识必须首先获得授权，项目维护需要花费大量精力，如果本项目对你有意义，请主动支持本项目。</Message>
           <Form.Group widths='equal'>
             <Form.Input
-              label={t('setting.other.content.footer.title')}
-              placeholder={t('setting.other.content.footer.placeholder')}
+              label='页脚'
+              placeholder='在此输入新的页脚，留空则使用默认页脚，支持 HTML 代码'
               value={inputs.Footer}
               name='Footer'
               onChange={handleInputChange}
             />
           </Form.Group>
-          <Form.Button onClick={() => submitOption('Footer')}>
-            {t('setting.other.content.buttons.save_footer')}
-          </Form.Button>
+          <Form.Button onClick={submitFooter}>设置页脚</Form.Button>
         </Form>
       </Grid.Column>
       <Modal

web/default/src/components/PasswordResetConfirm.js

@@ -1,21 +1,6 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Grid,
-  Header,
-  Image,
-  Card,
-  Message,
-} from 'semantic-ui-react';
-import {
-  API,
-  copy,
-  showError,
-  showInfo,
-  showNotice,
-  showSuccess,
-} from '../helpers';
+import { Button, Form, Grid, Header, Image, Segment } from 'semantic-ui-react';
+import { API, copy, showError, showInfo, showNotice, showSuccess } from '../helpers';
 import { useSearchParams } from 'react-router-dom';
 
 const PasswordResetConfirm = () => {
@@ -52,7 +37,7 @@ const PasswordResetConfirm = () => {
       setDisableButton(false);
       setCountdown(30);
     }
-    return () => clearInterval(countdownInterval);
+    return () => clearInterval(countdownInterval); 
   }, [disableButton, countdown]);
 
   async function handleSubmit(e) {
@@ -74,86 +59,55 @@ const PasswordResetConfirm = () => {
     }
     setLoading(false);
   }
-
+  
   return (
     <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
-        <Card
-          fluid
-          className='chart-card'
-          style={{ boxShadow: '0 1px 3px rgba(0,0,0,0.12)' }}
-        >
-          <Card.Content>
-            <Card.Header>
-              <Header
-                as='h2'
-                textAlign='center'
-                style={{ marginBottom: '1.5em' }}
-              >
-                <Image src='/logo.png' style={{ marginBottom: '10px' }} />
-                <Header.Content>密码重置确认</Header.Content>
-              </Header>
-            </Card.Header>
-            <Form size='large'>
-              <Form.Input
-                fluid
-                icon='mail'
-                iconPosition='left'
-                placeholder='邮箱地址'
-                name='email'
-                value={email}
-                readOnly
-                style={{ marginBottom: '1em' }}
-              />
-              {newPassword && (
-                <Form.Input
-                  fluid
-                  icon='lock'
-                  iconPosition='left'
-                  placeholder='新密码'
-                  name='newPassword'
-                  value={newPassword}
-                  readOnly
-                  style={{
-                    marginBottom: '1em',
-                    cursor: 'pointer',
-                    backgroundColor: '#f8f9fa',
-                  }}
-                  onClick={(e) => {
-                    e.target.select();
-                    navigator.clipboard.writeText(newPassword);
-                    showNotice(`密码已复制到剪贴板：${newPassword}`);
-                  }}
-                />
-              )}
-              <Button
-                color='blue'
-                fluid
-                size='large'
-                onClick={handleSubmit}
-                loading={loading}
-                disabled={disableButton}
-                style={{
-                  background: '#2F73FF', // 使用更现代的蓝色
-                  color: 'white',
-                  marginBottom: '1.5em',
-                }}
-              >
-                {disableButton ? '密码重置完成' : '提交'}
-              </Button>
-            </Form>
+        <Header as='h2' color='' textAlign='center'>
+          <Image src='/logo.png' /> 密码重置确认
+        </Header>
+        <Form size='large'>
+          <Segment>
+            <Form.Input
+              fluid
+              icon='mail'
+              iconPosition='left'
+              placeholder='邮箱地址'
+              name='email'
+              value={email}
+              readOnly
+            />
             {newPassword && (
-              <Message style={{ background: 'transparent', boxShadow: 'none' }}>
-                <p style={{ fontSize: '0.9em', color: '#666' }}>
-                  新密码已生成，请点击密码框或上方按钮复制。请及时登录并修改密码！
-                </p>
-              </Message>
+              <Form.Input
+              fluid
+              icon='lock'
+              iconPosition='left'
+              placeholder='新密码'
+              name='newPassword'
+              value={newPassword}
+              readOnly
+              onClick={(e) => {
+                e.target.select();
+                navigator.clipboard.writeText(newPassword);
+                showNotice(`密码已复制到剪贴板：${newPassword}`);
+              }}
+            />            
             )}
-          </Card.Content>
-        </Card>
+            <Button
+              color='green'
+              fluid
+              size='large'
+              onClick={handleSubmit}
+              loading={loading}
+              disabled={disableButton}
+            >
+              {disableButton ? `密码重置完成` : '提交'}
+            </Button>
+          </Segment>
+        </Form>
       </Grid.Column>
     </Grid>
-  );
+  );  
 };
 
 export default PasswordResetConfirm;

web/default/src/components/PasswordResetForm.js

@@ -1,19 +1,11 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Grid,
-  Header,
-  Image,
-  Card,
-  Message,
-} from 'semantic-ui-react';
+import { Button, Form, Grid, Header, Image, Segment } from 'semantic-ui-react';
 import { API, showError, showInfo, showSuccess } from '../helpers';
 import Turnstile from 'react-turnstile';
 
 const PasswordResetForm = () => {
   const [inputs, setInputs] = useState({
-    email: '',
+    email: ''
   });
   const { email } = inputs;
 
@@ -50,7 +42,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) {
@@ -77,72 +69,42 @@ const PasswordResetForm = () => {
   return (
     <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
-        <Card
-          fluid
-          className='chart-card'
-          style={{ boxShadow: '0 1px 3px rgba(0,0,0,0.12)' }}
-        >
-          <Card.Content>
-            <Card.Header>
-              <Header
-                as='h2'
-                textAlign='center'
-                style={{ marginBottom: '1.5em' }}
-              >
-                <Image src='/logo.png' style={{ marginBottom: '10px' }} />
-                <Header.Content>密码重置</Header.Content>
-              </Header>
-            </Card.Header>
-            <Form size='large'>
-              <Form.Input
-                fluid
-                icon='mail'
-                iconPosition='left'
-                placeholder='邮箱地址'
-                name='email'
-                value={email}
-                onChange={handleChange}
-                style={{ marginBottom: '1em' }}
-              />
-              {turnstileEnabled && (
-                <div
-                  style={{
-                    marginBottom: '1em',
-                    display: 'flex',
-                    justifyContent: 'center',
-                  }}
-                >
-                  <Turnstile
-                    sitekey={turnstileSiteKey}
-                    onVerify={(token) => {
-                      setTurnstileToken(token);
-                    }}
-                  />
-                </div>
-              )}
-              <Button
-                color='blue'
-                fluid
-                size='large'
-                onClick={handleSubmit}
-                loading={loading}
-                disabled={disableButton}
-                style={{
-                  background: '#2F73FF', // 使用更现代的蓝色
-                  color: 'white',
-                  marginBottom: '1.5em',
+        <Header as='h2' color='' textAlign='center'>
+          <Image src='/logo.png' /> 密码重置
+        </Header>
+        <Form size='large'>
+          <Segment>
+            <Form.Input
+              fluid
+              icon='mail'
+              iconPosition='left'
+              placeholder='邮箱地址'
+              name='email'
+              value={email}
+              onChange={handleChange}
+            />
+            {turnstileEnabled ? (
+              <Turnstile
+                sitekey={turnstileSiteKey}
+                onVerify={(token) => {
+                  setTurnstileToken(token);
                 }}
-              >
-                {disableButton ? `重试 (${countdown})` : '提交'}
-              </Button>
-            </Form>
-            <Message style={{ background: 'transparent', boxShadow: 'none' }}>
-              <p style={{ fontSize: '0.9em', color: '#666' }}>
-                系统将向您的邮箱发送一封包含重置链接的邮件，请注意查收。
-              </p>
-            </Message>
-          </Card.Content>
-        </Card>
+              />
+            ) : (
+              <></>
+            )}
+            <Button
+              color='green'
+              fluid
+              size='large'
+              onClick={handleSubmit}
+              loading={loading}
+              disabled={disableButton}
+            >
+              {disableButton ? `重试 (${countdown})` : '提交'}
+            </Button>
+          </Segment>
+        </Form>
       </Grid.Column>
     </Grid>
   );

web/default/src/components/PersonalSetting.js

@@ -1,29 +1,12 @@
 import React, { useContext, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Divider,
-  Form,
-  Header,
-  Image,
-  Message,
-  Modal,
-} from 'semantic-ui-react';
+import { Button, Divider, Form, Header, Image, Message, Modal } from 'semantic-ui-react';
 import { Link, useNavigate } from 'react-router-dom';
-import {
-  API,
-  copy,
-  showError,
-  showInfo,
-  showNotice,
-  showSuccess,
-} from '../helpers';
+import { API, copy, showError, showInfo, showNotice, showSuccess } from '../helpers';
 import Turnstile from 'react-turnstile';
 import { UserContext } from '../context/User';
 import { onGitHubOAuthClicked, onLarkOAuthClicked } from './utils';
 
 const PersonalSetting = () => {
-  const { t } = useTranslation();
   const [userState, userDispatch] = useContext(UserContext);
   let navigate = useNavigate();
 
@@ -31,7 +14,7 @@ const PersonalSetting = () => {
     wechat_verification_code: '',
     email_verification_code: '',
     email: '',
-    self_account_deletion_confirmation: '',
+    self_account_deletion_confirmation: ''
   });
   const [status, setStatus] = useState({});
   const [showWeChatBindModal, setShowWeChatBindModal] = useState(false);
@@ -43,8 +26,8 @@ const PersonalSetting = () => {
   const [loading, setLoading] = useState(false);
   const [disableButton, setDisableButton] = useState(false);
   const [countdown, setCountdown] = useState(30);
-  const [affLink, setAffLink] = useState('');
-  const [systemToken, setSystemToken] = useState('');
+  const [affLink, setAffLink] = useState("");
+  const [systemToken, setSystemToken] = useState("");
 
   useEffect(() => {
     let status = localStorage.getItem('status');
@@ -80,7 +63,7 @@ const PersonalSetting = () => {
     const { success, message, data } = res.data;
     if (success) {
       setSystemToken(data);
-      setAffLink('');
+      setAffLink(""); 
       await copy(data);
       showSuccess(`令牌已重置并已复制到剪贴板`);
     } else {
@@ -94,7 +77,7 @@ const PersonalSetting = () => {
     if (success) {
       let link = `${window.location.origin}/register?aff=${data}`;
       setAffLink(link);
-      setSystemToken('');
+      setSystemToken("");
       await copy(link);
       showSuccess(`邀请链接已复制到剪切板`);
     } else {
@@ -186,50 +169,50 @@ const PersonalSetting = () => {
 
   return (
     <div style={{ lineHeight: '40px' }}>
-      <Header as='h3'>{t('setting.personal.general.title')}</Header>
-      <Message>{t('setting.personal.general.system_token_notice')}</Message>
+      <Header as='h3'>通用设置</Header>
+      <Message>
+        注意，此处生成的令牌用于系统管理，而非用于请求 OpenAI 相关的服务，请知悉。
+      </Message>
       <Button as={Link} to={`/user/edit/`}>
-        {t('setting.personal.general.buttons.update_profile')}
+        更新个人信息
       </Button>
-      <Button onClick={generateAccessToken}>
-        {t('setting.personal.general.buttons.generate_token')}
-      </Button>
-      <Button onClick={getAffLink}>
-        {t('setting.personal.general.buttons.copy_invite')}
-      </Button>
-      <Button
-        onClick={() => {
-          setShowAccountDeleteModal(true);
-        }}
-      >
-        {t('setting.personal.general.buttons.delete_account')}
-      </Button>
-
+      <Button onClick={generateAccessToken}>生成系统访问令牌</Button>
+      <Button onClick={getAffLink}>复制邀请链接</Button>
+      <Button onClick={() => {
+        setShowAccountDeleteModal(true);
+      }}>删除个人账户</Button>
+      
       {systemToken && (
-        <Form.Input
-          fluid
-          readOnly
-          value={systemToken}
+        <Form.Input 
+          fluid 
+          readOnly 
+          value={systemToken} 
           onClick={handleSystemTokenClick}
           style={{ marginTop: '10px' }}
         />
       )}
       {affLink && (
-        <Form.Input
-          fluid
-          readOnly
-          value={affLink}
+        <Form.Input 
+          fluid 
+          readOnly 
+          value={affLink} 
           onClick={handleAffLinkClick}
           style={{ marginTop: '10px' }}
         />
       )}
       <Divider />
-      <Header as='h3'>{t('setting.personal.binding.title')}</Header>
-      {status.wechat_login && (
-        <Button onClick={() => setShowWeChatBindModal(true)}>
-          {t('setting.personal.binding.buttons.bind_wechat')}
-        </Button>
-      )}
+      <Header as='h3'>账号绑定</Header>
+      {
+        status.wechat_login && (
+          <Button
+            onClick={() => {
+              setShowWeChatBindModal(true);
+            }}
+          >
+            绑定微信账号
+          </Button>
+        )
+      }
       <Modal
         onClose={() => setShowWeChatBindModal(false)}
         onOpen={() => setShowWeChatBindModal(true)}
@@ -240,37 +223,41 @@ const PersonalSetting = () => {
           <Modal.Description>
             <Image src={status.wechat_qrcode} fluid />
             <div style={{ textAlign: 'center' }}>
-              <p>{t('setting.personal.binding.wechat.description')}</p>
+              <p>
+                微信扫码关注公众号，输入「验证码」获取验证码（三分钟内有效）
+              </p>
             </div>
             <Form size='large'>
               <Form.Input
                 fluid
-                placeholder={t(
-                  'setting.personal.binding.wechat.verification_code'
-                )}
+                placeholder='验证码'
                 name='wechat_verification_code'
                 value={inputs.wechat_verification_code}
                 onChange={handleInputChange}
               />
               <Button color='' fluid size='large' onClick={bindWeChat}>
-                {t('setting.personal.binding.wechat.bind')}
+                绑定
               </Button>
             </Form>
           </Modal.Description>
         </Modal.Content>
       </Modal>
-      {status.github_oauth && (
-        <Button onClick={() => onGitHubOAuthClicked(status.github_client_id)}>
-          {t('setting.personal.binding.buttons.bind_github')}
-        </Button>
-      )}
-      {status.lark_client_id && (
-        <Button onClick={() => onLarkOAuthClicked(status.lark_client_id)}>
-          {t('setting.personal.binding.buttons.bind_lark')}
-        </Button>
-      )}
-      <Button onClick={() => setShowEmailBindModal(true)}>
-        {t('setting.personal.binding.buttons.bind_email')}
+      {
+        status.github_oauth && (
+          <Button onClick={()=>{onGitHubOAuthClicked(status.github_client_id)}}>绑定 GitHub 账号</Button>
+        )
+      }
+      {
+        status.lark_client_id && (
+          <Button onClick={()=>{onLarkOAuthClicked(status.lark_client_id)}}>绑定飞书账号</Button>
+        )
+      }
+      <Button
+        onClick={() => {
+          setShowEmailBindModal(true);
+        }}
+      >
+        绑定邮箱地址
       </Button>
       <Modal
         onClose={() => setShowEmailBindModal(false)}
@@ -279,72 +266,57 @@ const PersonalSetting = () => {
         size={'tiny'}
         style={{ maxWidth: '450px' }}
       >
-        <Modal.Header>{t('setting.personal.binding.email.title')}</Modal.Header>
+        <Modal.Header>绑定邮箱地址</Modal.Header>
         <Modal.Content>
           <Modal.Description>
             <Form size='large'>
               <Form.Input
                 fluid
-                placeholder={t(
-                  'setting.personal.binding.email.email_placeholder'
-                )}
+                placeholder='输入邮箱地址'
                 onChange={handleInputChange}
                 name='email'
                 type='email'
                 action={
-                  <Button
-                    onClick={sendVerificationCode}
-                    disabled={disableButton || loading}
-                  >
-                    {disableButton
-                      ? t('setting.personal.binding.email.get_code_retry', {
-                          countdown,
-                        })
-                      : t('setting.personal.binding.email.get_code')}
+                  <Button onClick={sendVerificationCode} disabled={disableButton || loading}>
+                    {disableButton ? `重新发送(${countdown})` : '获取验证码'}
                   </Button>
                 }
               />
               <Form.Input
                 fluid
-                placeholder={t(
-                  'setting.personal.binding.email.code_placeholder'
-                )}
+                placeholder='验证码'
                 name='email_verification_code'
                 value={inputs.email_verification_code}
                 onChange={handleInputChange}
               />
-              {turnstileEnabled && (
+              {turnstileEnabled ? (
                 <Turnstile
                   sitekey={turnstileSiteKey}
                   onVerify={(token) => {
                     setTurnstileToken(token);
                   }}
                 />
+              ) : (
+                <></>
               )}
-              <div
-                style={{
-                  display: 'flex',
-                  justifyContent: 'space-between',
-                  marginTop: '1rem',
-                }}
+              <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '1rem' }}>
+              <Button
+                color=''
+                fluid
+                size='large'
+                onClick={bindEmail}
+                loading={loading}
               >
-                <Button
-                  color=''
-                  fluid
-                  size='large'
-                  onClick={bindEmail}
-                  loading={loading}
-                >
-                  {t('setting.personal.binding.email.bind')}
-                </Button>
-                <div style={{ width: '1rem' }}></div>
-                <Button
-                  fluid
-                  size='large'
-                  onClick={() => setShowEmailBindModal(false)}
-                >
-                  {t('setting.personal.binding.email.cancel')}
-                </Button>
+                确认绑定
+              </Button>
+              <div style={{ width: '1rem' }}></div> 
+              <Button
+                fluid
+                size='large'
+                onClick={() => setShowEmailBindModal(false)}
+              >
+                取消
+              </Button>
               </div>
             </Form>
           </Modal.Description>
@@ -357,40 +329,29 @@ const PersonalSetting = () => {
         size={'tiny'}
         style={{ maxWidth: '450px' }}
       >
-        <Modal.Header>
-          {t('setting.personal.delete_account.title')}
-        </Modal.Header>
+        <Modal.Header>危险操作</Modal.Header>
         <Modal.Content>
-          <Message>{t('setting.personal.delete_account.warning')}</Message>
+        <Message>您正在删除自己的帐户，将清空所有数据且不可恢复</Message>
           <Modal.Description>
             <Form size='large'>
               <Form.Input
                 fluid
-                placeholder={t(
-                  'setting.personal.delete_account.confirm_placeholder',
-                  {
-                    username: userState?.user?.username,
-                  }
-                )}
+                placeholder={`输入你的账户名 ${userState?.user?.username} 以确认删除`}
                 name='self_account_deletion_confirmation'
                 value={inputs.self_account_deletion_confirmation}
                 onChange={handleInputChange}
               />
-              {turnstileEnabled && (
+              {turnstileEnabled ? (
                 <Turnstile
                   sitekey={turnstileSiteKey}
                   onVerify={(token) => {
                     setTurnstileToken(token);
                   }}
                 />
+              ) : (
+                <></>
               )}
-              <div
-                style={{
-                  display: 'flex',
-                  justifyContent: 'space-between',
-                  marginTop: '1rem',
-                }}
-              >
+              <div style={{ display: 'flex', justifyContent: 'space-between', marginTop: '1rem' }}>
                 <Button
                   color='red'
                   fluid
@@ -398,7 +359,7 @@ const PersonalSetting = () => {
                   onClick={deleteAccount}
                   loading={loading}
                 >
-                  {t('setting.personal.delete_account.buttons.confirm')}
+                  确认删除
                 </Button>
                 <div style={{ width: '1rem' }}></div>
                 <Button
@@ -406,7 +367,7 @@ const PersonalSetting = () => {
                   size='large'
                   onClick={() => setShowAccountDeleteModal(false)}
                 >
-                  {t('setting.personal.delete_account.buttons.cancel')}
+                  取消
                 </Button>
               </div>
             </Form>

web/default/src/components/RedemptionsTable.js

@@ -1,62 +1,33 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Form,
-  Label,
-  Popup,
-  Pagination,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Form, Label, Popup, Pagination, Table } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
-import {
-  API,
-  copy,
-  showError,
-  showInfo,
-  showSuccess,
-  showWarning,
-  timestamp2string,
-} from '../helpers';
+import { API, copy, showError, showInfo, showSuccess, showWarning, timestamp2string } from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderQuota } from '../helpers/render';
 
 function renderTimestamp(timestamp) {
-  return <>{timestamp2string(timestamp)}</>;
+  return (
+    <>
+      {timestamp2string(timestamp)}
+    </>
+  );
 }
 
-function renderStatus(status, t) {
+function renderStatus(status) {
   switch (status) {
     case 1:
-      return (
-        <Label basic color='green'>
-          {t('redemption.status.unused')}
-        </Label>
-      );
+      return <Label basic color='green'>未使用</Label>;
     case 2:
-      return (
-        <Label basic color='red'>
-          {t('redemption.status.disabled')}
-        </Label>
-      );
+      return <Label basic color='red'> 已禁用 </Label>;
     case 3:
-      return (
-        <Label basic color='grey'>
-          {t('redemption.status.used')}
-        </Label>
-      );
+      return <Label basic color='grey'> 已使用 </Label>;
     default:
-      return (
-        <Label basic color='black'>
-          {t('redemption.status.unknown')}
-        </Label>
-      );
+      return <Label basic color='black'> 未知状态 </Label>;
   }
 }
 
 const RedemptionsTable = () => {
-  const { t } = useTranslation();
   const [redemptions, setRedemptions] = useState([]);
   const [loading, setLoading] = useState(true);
   const [activePage, setActivePage] = useState(1);
@@ -116,7 +87,7 @@ const RedemptionsTable = () => {
     }
     const { success, message } = res.data;
     if (success) {
-      showSuccess(t('token.messages.operation_success'));
+      showSuccess('操作成功完成！');
       let redemption = res.data.data;
       let newRedemptions = [...redemptions];
       let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -139,9 +110,7 @@ const RedemptionsTable = () => {
       return;
     }
     setSearching(true);
-    const res = await API.get(
-      `/api/redemption/search?keyword=${searchKeyword}`
-    );
+    const res = await API.get(`/api/redemption/search?keyword=${searchKeyword}`);
     const { success, message, data } = res.data;
     if (success) {
       setRedemptions(data);
@@ -176,12 +145,6 @@ const RedemptionsTable = () => {
     setLoading(false);
   };
 
-  const refresh = async () => {
-    setLoading(true);
-    await loadRedemptions(0);
-    setActivePage(1);
-  };
-
   return (
     <>
       <Form onSubmit={searchRedemptions}>
@@ -189,14 +152,14 @@ const RedemptionsTable = () => {
           icon='search'
           fluid
           iconPosition='left'
-          placeholder={t('redemption.search')}
+          placeholder='搜索兑换码的 ID 和名称 ...'
           value={searchKeyword}
           loading={searching}
           onChange={handleKeywordChange}
         />
       </Form>
 
-      <Table basic={'very'} compact size='small'>
+      <Table basic compact size='small'>
         <Table.Header>
           <Table.Row>
             <Table.HeaderCell
@@ -205,7 +168,7 @@ const RedemptionsTable = () => {
                 sortRedemption('id');
               }}
             >
-              {t('redemption.table.id')}
+              ID
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -213,7 +176,7 @@ const RedemptionsTable = () => {
                 sortRedemption('name');
               }}
             >
-              {t('redemption.table.name')}
+              名称
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -221,7 +184,7 @@ const RedemptionsTable = () => {
                 sortRedemption('status');
               }}
             >
-              {t('redemption.table.status')}
+              状态
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -229,7 +192,7 @@ const RedemptionsTable = () => {
                 sortRedemption('quota');
               }}
             >
-              {t('redemption.table.quota')}
+              额度
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -237,7 +200,7 @@ const RedemptionsTable = () => {
                 sortRedemption('created_time');
               }}
             >
-              {t('redemption.table.created_time')}
+              创建时间
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -245,9 +208,9 @@ const RedemptionsTable = () => {
                 sortRedemption('redeemed_time');
               }}
             >
-              {t('redemption.table.redeemed_time')}
+              兑换时间
             </Table.HeaderCell>
-            <Table.HeaderCell>{t('redemption.table.actions')}</Table.HeaderCell>
+            <Table.HeaderCell>操作</Table.HeaderCell>
           </Table.Row>
         </Table.Header>
 
@@ -262,39 +225,31 @@ const RedemptionsTable = () => {
               return (
                 <Table.Row key={redemption.id}>
                   <Table.Cell>{redemption.id}</Table.Cell>
-                  <Table.Cell>
-                    {redemption.name ? redemption.name : t('redemption.table.no_name')}
-                  </Table.Cell>
-                  <Table.Cell>{renderStatus(redemption.status, t)}</Table.Cell>
-                  <Table.Cell>{renderQuota(redemption.quota, t)}</Table.Cell>
-                  <Table.Cell>
-                    {renderTimestamp(redemption.created_time)}
-                  </Table.Cell>
-                  <Table.Cell>
-                    {redemption.redeemed_time
-                      ? renderTimestamp(redemption.redeemed_time)
-                      : t('redemption.table.not_redeemed')}{' '}
-                  </Table.Cell>
+                  <Table.Cell>{redemption.name ? redemption.name : '无'}</Table.Cell>
+                  <Table.Cell>{renderStatus(redemption.status)}</Table.Cell>
+                  <Table.Cell>{renderQuota(redemption.quota)}</Table.Cell>
+                  <Table.Cell>{renderTimestamp(redemption.created_time)}</Table.Cell>
+                  <Table.Cell>{redemption.redeemed_time ? renderTimestamp(redemption.redeemed_time) : "尚未兑换"} </Table.Cell>
                   <Table.Cell>
                     <div>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         positive
                         onClick={async () => {
                           if (await copy(redemption.key)) {
-                            showSuccess(t('token.messages.copy_success'));
+                            showSuccess('已复制到剪贴板！');
                           } else {
-                            showWarning(t('token.messages.copy_failed'));
+                            showWarning('无法复制到剪贴板，请手动复制，已将兑换码填入搜索框。')
                             setSearchKeyword(redemption.key);
                           }
                         }}
                       >
-                        {t('redemption.buttons.copy')}
+                        复制
                       </Button>
                       <Popup
                         trigger={
-                          <Button size='tiny' negative>
-                            {t('redemption.buttons.delete')}
+                          <Button size='small' negative>
+                            删除
                           </Button>
                         }
                         on='click'
@@ -307,12 +262,12 @@ const RedemptionsTable = () => {
                             manageRedemption(redemption.id, 'delete', idx);
                           }}
                         >
-                          {t('redemption.buttons.confirm_delete')}
+                          确认删除
                         </Button>
                       </Popup>
                       <Button
-                        size={'tiny'}
-                        disabled={redemption.status === 3} // used
+                        size={'small'}
+                        disabled={redemption.status === 3}  // used
                         onClick={() => {
                           manageRedemption(
                             redemption.id,
@@ -321,16 +276,14 @@ const RedemptionsTable = () => {
                           );
                         }}
                       >
-                        {redemption.status === 1
-                          ? t('redemption.buttons.disable')
-                          : t('redemption.buttons.enable')}
+                        {redemption.status === 1 ? '禁用' : '启用'}
                       </Button>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         as={Link}
                         to={'/redemption/edit/' + redemption.id}
                       >
-                        {t('redemption.buttons.edit')}
+                        编辑
                       </Button>
                     </div>
                   </Table.Cell>
@@ -341,17 +294,9 @@ const RedemptionsTable = () => {
 
         <Table.Footer>
           <Table.Row>
-            <Table.HeaderCell colSpan='7'>
-              <Button
-                size='small'
-                as={Link}
-                to='/redemption/add'
-                loading={loading}
-              >
-                {t('redemption.buttons.add')}
-              </Button>
-              <Button size='small' onClick={refresh} loading={loading}>
-                {t('redemption.buttons.refresh')}
+            <Table.HeaderCell colSpan='8'>
+              <Button size='small' as={Link} to='/redemption/add' loading={loading}>
+                添加新的兑换码
               </Button>
               <Pagination
                 floated='right'

web/default/src/components/RegisterForm.js

@@ -1,15 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Grid,
-  Header,
-  Image,
-  Message,
-  Segment,
-  Card,
-  Divider,
-} 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';
@@ -20,7 +10,7 @@ const RegisterForm = () => {
     password: '',
     password2: '',
     email: '',
-    verification_code: '',
+    verification_code: ''
   });
   const { username, password, password2 } = inputs;
   const [showEmailVerification, setShowEmailVerification] = useState(false);
@@ -110,135 +100,92 @@ const RegisterForm = () => {
   return (
     <Grid textAlign='center' style={{ marginTop: '48px' }}>
       <Grid.Column style={{ maxWidth: 450 }}>
-        <Card
-          fluid
-          className='chart-card'
-          style={{ boxShadow: '0 1px 3px rgba(0,0,0,0.12)' }}
-        >
-          <Card.Content>
-            <Card.Header>
-              <Header
-                as='h2'
-                textAlign='center'
-                style={{ marginBottom: '1.5em' }}
-              >
-                <Image src={logo} style={{ marginBottom: '10px' }} />
-                <Header.Content>新用户注册</Header.Content>
-              </Header>
-            </Card.Header>
-            <Form size='large'>
-              <Form.Input
-                fluid
-                icon='user'
-                iconPosition='left'
-                placeholder='输入用户名，最长 12 位'
-                onChange={handleChange}
-                name='username'
-                style={{ marginBottom: '1em' }}
-              />
-              <Form.Input
-                fluid
-                icon='lock'
-                iconPosition='left'
-                placeholder='输入密码，最短 8 位，最长 20 位'
-                onChange={handleChange}
-                name='password'
-                type='password'
-                style={{ marginBottom: '1em' }}
-              />
-              <Form.Input
-                fluid
-                icon='lock'
-                iconPosition='left'
-                placeholder='再次输入密码'
-                onChange={handleChange}
-                name='password2'
-                type='password'
-                style={{ marginBottom: '1em' }}
-              />
-
-              {showEmailVerification && (
-                <>
-                  <Form.Input
-                    fluid
-                    icon='mail'
-                    iconPosition='left'
-                    placeholder='输入邮箱地址'
-                    onChange={handleChange}
-                    name='email'
-                    type='email'
-                    action={
-                      <Button
-                        onClick={sendVerificationCode}
-                        disabled={loading}
-                        // style={{ backgroundColor: '#2F73FF', color: 'white' }}
-                      >
-                        获取验证码
-                      </Button>
-                    }
-                    style={{ marginBottom: '1em' }}
-                  />
-                  <Form.Input
-                    fluid
-                    icon='lock'
-                    iconPosition='left'
-                    placeholder='输入验证码'
-                    onChange={handleChange}
-                    name='verification_code'
-                    style={{ marginBottom: '1em' }}
-                  />
-                </>
-              )}
-
-              {turnstileEnabled && (
-                <div
-                  style={{
-                    marginBottom: '1em',
-                    display: 'flex',
-                    justifyContent: 'center',
-                  }}
-                >
-                  <Turnstile
-                    sitekey={turnstileSiteKey}
-                    onVerify={(token) => {
-                      setTurnstileToken(token);
-                    }}
-                  />
-                </div>
-              )}
-
-              <Button
-                fluid
-                size='large'
-                onClick={handleSubmit}
-                style={{
-                  background: '#2F73FF', // 使用更现代的蓝色
-                  color: 'white',
-                  marginBottom: '1.5em',
+        <Header as='h2' color='' textAlign='center'>
+          <Image src={logo} /> 新用户注册
+        </Header>
+        <Form size='large'>
+          <Segment>
+            <Form.Input
+              fluid
+              icon='user'
+              iconPosition='left'
+              placeholder='输入用户名，最长 12 位'
+              onChange={handleChange}
+              name='username'
+            />
+            <Form.Input
+              fluid
+              icon='lock'
+              iconPosition='left'
+              placeholder='输入密码，最短 8 位，最长 20 位'
+              onChange={handleChange}
+              name='password'
+              type='password'
+            />
+            <Form.Input
+              fluid
+              icon='lock'
+              iconPosition='left'
+              placeholder='输入密码，最短 8 位，最长 20 位'
+              onChange={handleChange}
+              name='password2'
+              type='password'
+            />
+            {showEmailVerification ? (
+              <>
+                <Form.Input
+                  fluid
+                  icon='mail'
+                  iconPosition='left'
+                  placeholder='输入邮箱地址'
+                  onChange={handleChange}
+                  name='email'
+                  type='email'
+                  action={
+                    <Button onClick={sendVerificationCode} disabled={loading}>
+                      获取验证码
+                    </Button>
+                  }
+                />
+                <Form.Input
+                  fluid
+                  icon='lock'
+                  iconPosition='left'
+                  placeholder='输入验证码'
+                  onChange={handleChange}
+                  name='verification_code'
+                />
+              </>
+            ) : (
+              <></>
+            )}
+            {turnstileEnabled ? (
+              <Turnstile
+                sitekey={turnstileSiteKey}
+                onVerify={(token) => {
+                  setTurnstileToken(token);
                 }}
-                loading={loading}
-              >
-                注册
-              </Button>
-            </Form>
-
-            <Divider />
-            <Message style={{ background: 'transparent', boxShadow: 'none' }}>
-              <div
-                style={{
-                  textAlign: 'center',
-                  fontSize: '0.9em',
-                  color: '#666',
-                }}
-              >
-                已有账户？
-                <Link to='/login' style={{ color: '#2185d0' }}>
-                  点击登录
-                </Link>
-              </div>
-            </Message>
-          </Card.Content>
-        </Card>
+              />
+            ) : (
+              <></>
+            )}
+            <Button
+              color='green'
+              fluid
+              size='large'
+              onClick={handleSubmit}
+              loading={loading}
+            >
+              注册
+            </Button>
+          </Segment>
+        </Form>
+        <Message>
+          已有账户？
+          <Link to='/login' className='btn btn-link'>
+            点击登录
+          </Link>
+        </Message>
       </Grid.Column>
     </Grid>
   );

web/default/src/components/SystemSetting.js

@@ -1,18 +1,8 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Divider,
-  Form,
-  Grid,
-  Header,
-  Modal,
-  Message,
-} from 'semantic-ui-react';
+import { Button, Divider, Form, Grid, Header, Modal, Message } from 'semantic-ui-react';
 import { API, removeTrailingSlash, showError } from '../helpers';
 
 const SystemSetting = () => {
-  const { t } = useTranslation();
   let [inputs, setInputs] = useState({
     PasswordLoginEnabled: '',
     PasswordRegisterEnabled: '',
@@ -41,14 +31,13 @@ const SystemSetting = () => {
     TurnstileSecretKey: '',
     RegisterEnabled: '',
     EmailDomainRestrictionEnabled: '',
-    EmailDomainWhitelist: '',
+    EmailDomainWhitelist: ''
   });
   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/');
@@ -60,15 +49,13 @@ const SystemSetting = () => {
       });
       setInputs({
         ...newInputs,
-        EmailDomainWhitelist: newInputs.EmailDomainWhitelist.split(','),
+        EmailDomainWhitelist: newInputs.EmailDomainWhitelist.split(',')
       });
       setOriginInputs(newInputs);
 
-      setEmailDomainWhitelist(
-        newInputs.EmailDomainWhitelist.split(',').map((item) => {
-          return { key: item, text: item, value: item };
-        })
-      );
+      setEmailDomainWhitelist(newInputs.EmailDomainWhitelist.split(',').map((item) => {
+        return { key: item, text: item, value: item };
+      }));
     } else {
       showError(message);
     }
@@ -96,7 +83,7 @@ const SystemSetting = () => {
     }
     const res = await API.put('/api/option/', {
       key,
-      value,
+      value
     });
     const { success, message } = res.data;
     if (success) {
@@ -104,8 +91,7 @@ const SystemSetting = () => {
         value = value.split(',');
       }
       setInputs((inputs) => ({
-        ...inputs,
-        [key]: value,
+        ...inputs, [key]: value
       }));
     } else {
       showError(message);
@@ -169,16 +155,13 @@ 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(','));
     }
   };
 
@@ -233,7 +216,7 @@ const SystemSetting = () => {
     }
   };
 
-  const submitLarkOAuth = async () => {
+   const submitLarkOAuth = async () => {
     if (originInputs['LarkClientId'] !== inputs.LarkClientId) {
       await updateOption('LarkClientId', inputs.LarkClientId);
     }
@@ -259,71 +242,60 @@ const SystemSetting = () => {
 
   const submitNewRestrictedDomain = () => {
     const localDomainList = inputs.EmailDomainWhitelist;
-    if (
-      restrictedDomainInput !== '' &&
-      !localDomainList.includes(restrictedDomainInput)
-    ) {
+    if (restrictedDomainInput !== '' && !localDomainList.includes(restrictedDomainInput)) {
       setRestrictedDomainInput('');
       setInputs({
         ...inputs,
         EmailDomainWhitelist: [...localDomainList, restrictedDomainInput],
       });
-      setEmailDomainWhitelist([
-        ...EmailDomainWhitelist,
-        {
-          key: restrictedDomainInput,
-          text: restrictedDomainInput,
-          value: restrictedDomainInput,
-        },
-      ]);
+      setEmailDomainWhitelist([...EmailDomainWhitelist, {
+        key: restrictedDomainInput,
+        text: restrictedDomainInput,
+        value: restrictedDomainInput,
+      }]);
     }
-  };
+  }
 
   return (
     <Grid columns={1}>
       <Grid.Column>
         <Form loading={loading}>
-          <Header as='h3'>{t('setting.system.general.title')}</Header>
+          <Header as='h3'>通用设置</Header>
           <Form.Group widths='equal'>
             <Form.Input
-              label={t('setting.system.general.server_address')}
-              placeholder={t(
-                'setting.system.general.server_address_placeholder'
-              )}
+              label='服务器地址'
+              placeholder='例如：https://yourdomain.com'
               value={inputs.ServerAddress}
               name='ServerAddress'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Form.Button onClick={submitServerAddress}>
-            {t('setting.system.general.buttons.update')}
+            更新服务器地址
           </Form.Button>
           <Divider />
-          <Header as='h3'>{t('setting.system.login.title')}</Header>
+          <Header as='h3'>配置登录注册</Header>
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.PasswordLoginEnabled === 'true'}
-              label={t('setting.system.login.password_login')}
+              label='允许通过密码进行登录'
               name='PasswordLoginEnabled'
               onChange={handleInputChange}
             />
-            {showPasswordWarningModal && (
+            {
+              showPasswordWarningModal &&
               <Modal
                 open={showPasswordWarningModal}
                 onClose={() => setShowPasswordWarningModal(false)}
                 size={'tiny'}
                 style={{ maxWidth: '450px' }}
               >
-                <Modal.Header>
-                  {t('setting.system.password_login.warning.title')}
-                </Modal.Header>
+                <Modal.Header>警告</Modal.Header>
                 <Modal.Content>
-                  <p>{t('setting.system.password_login.warning.content')}</p>
+                  <p>取消密码登录将导致所有未绑定其他登录方式的用户（包括管理员）无法通过密码登录，确认取消？</p>
                 </Modal.Content>
                 <Modal.Actions>
-                  <Button onClick={() => setShowPasswordWarningModal(false)}>
-                    {t('setting.system.password_login.warning.buttons.cancel')}
-                  </Button>
+                  <Button onClick={() => setShowPasswordWarningModal(false)}>取消</Button>
                   <Button
                     color='yellow'
                     onClick={async () => {
@@ -331,32 +303,32 @@ const SystemSetting = () => {
                       await updateOption('PasswordLoginEnabled', 'false');
                     }}
                   >
-                    {t('setting.system.password_login.warning.buttons.confirm')}
+                    确定
                   </Button>
                 </Modal.Actions>
               </Modal>
-            )}
+            }
             <Form.Checkbox
               checked={inputs.PasswordRegisterEnabled === 'true'}
-              label={t('setting.system.login.password_register')}
+              label='允许通过密码进行注册'
               name='PasswordRegisterEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.EmailVerificationEnabled === 'true'}
-              label={t('setting.system.login.email_verification')}
+              label='通过密码注册时需要进行邮箱验证'
               name='EmailVerificationEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.GitHubOAuthEnabled === 'true'}
-              label={t('setting.system.login.github_oauth')}
+              label='允许通过 GitHub 账户登录 & 注册'
               name='GitHubOAuthEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.WeChatAuthEnabled === 'true'}
-              label={t('setting.system.login.wechat_login')}
+              label='允许通过微信登录 & 注册'
               name='WeChatAuthEnabled'
               onChange={handleInputChange}
             />
@@ -364,295 +336,304 @@ const SystemSetting = () => {
           <Form.Group inline>
             <Form.Checkbox
               checked={inputs.RegisterEnabled === 'true'}
-              label={t('setting.system.login.registration')}
+              label='允许新用户注册（此项为否时，新用户将无法以任何方式进行注册）'
               name='RegisterEnabled'
               onChange={handleInputChange}
             />
             <Form.Checkbox
               checked={inputs.TurnstileCheckEnabled === 'true'}
-              label={t('setting.system.login.turnstile')}
+              label='启用 Turnstile 用户校验'
               name='TurnstileCheckEnabled'
               onChange={handleInputChange}
             />
           </Form.Group>
           <Divider />
-          <Header as='h3'>{t('setting.system.email_restriction.title')}</Header>
-          <Message>{t('setting.system.email_restriction.subtitle')}</Message>
-          <Form.Group inline>
+          <Header as='h3'>
+            配置邮箱域名白名单
+            <Header.Subheader>用以防止恶意用户利用临时邮箱批量注册</Header.Subheader>
+          </Header>
+          <Form.Group widths={3}>
             <Form.Checkbox
-              checked={inputs.EmailDomainRestrictionEnabled === 'true'}
-              label={t('setting.system.email_restriction.enable')}
+              label='启用邮箱域名白名单'
               name='EmailDomainRestrictionEnabled'
               onChange={handleInputChange}
+              checked={inputs.EmailDomainRestrictionEnabled === 'true'}
             />
           </Form.Group>
-          <Form.Group widths={3}>
+          <Form.Group widths={2}>
+            <Form.Dropdown
+              label='允许的邮箱域名'
+              placeholder='允许的邮箱域名'
+              name='EmailDomainWhitelist'
+              required
+              fluid
+              multiple
+              selection
+              onChange={handleInputChange}
+              value={inputs.EmailDomainWhitelist}
+              autoComplete='new-password'
+              options={EmailDomainWhitelist}
+            />
             <Form.Input
-              label={t('setting.system.email_restriction.add_domain')}
-              placeholder={t(
-                'setting.system.email_restriction.add_domain_placeholder'
-              )}
+              label='添加新的允许的邮箱域名'
+              action={
+                <Button type='button' onClick={() => {
+                  submitNewRestrictedDomain();
+                }}>填入</Button>
+              }
+              onKeyDown={(e) => {
+                if (e.key === 'Enter') {
+                  submitNewRestrictedDomain();
+                }
+              }}
+              autoComplete='new-password'
+              placeholder='输入新的允许的邮箱域名'
               value={restrictedDomainInput}
               onChange={(e, { value }) => {
                 setRestrictedDomainInput(value);
               }}
-              action={
-                <Button
-                  onClick={() => {
-                    if (restrictedDomainInput === '') return;
-                    setEmailDomainWhitelist([
-                      ...EmailDomainWhitelist,
-                      {
-                        key: restrictedDomainInput,
-                        text: restrictedDomainInput,
-                        value: restrictedDomainInput,
-                      },
-                    ]);
-                    setRestrictedDomainInput('');
-                  }}
-                >
-                  {t('setting.system.email_restriction.buttons.fill')}
-                </Button>
-              }
             />
           </Form.Group>
-          <Form.Dropdown
-            label={t('setting.system.email_restriction.allowed_domains')}
-            placeholder={t('setting.system.email_restriction.allowed_domains')}
-            fluid
-            multiple
-            search
-            selection
-            allowAdditions
-            value={EmailDomainWhitelist.map((item) => item.value)}
-            options={EmailDomainWhitelist}
-            onAddItem={(e, { value }) => {
-              setEmailDomainWhitelist([
-                ...EmailDomainWhitelist,
-                {
-                  key: value,
-                  text: value,
-                  value: value,
-                },
-              ]);
-            }}
-            onChange={(e, { value }) => {
-              let newEmailDomainWhitelist = [];
-              value.forEach((item) => {
-                newEmailDomainWhitelist.push({
-                  key: item,
-                  text: item,
-                  value: item,
-                });
-              });
-              setEmailDomainWhitelist(newEmailDomainWhitelist);
-            }}
-          />
-          <Form.Button onClick={submitEmailDomainWhitelist}>
-            {t('setting.system.email_restriction.buttons.save')}
-          </Form.Button>
-
+          <Form.Button onClick={submitEmailDomainWhitelist}>保存邮箱域名白名单设置</Form.Button>
           <Divider />
-          <Header as='h3'>{t('setting.system.smtp.title')}</Header>
-          <Message>{t('setting.system.smtp.subtitle')}</Message>
+          <Header as='h3'>
+            配置 SMTP
+            <Header.Subheader>用以支持系统的邮件发送</Header.Subheader>
+          </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label={t('setting.system.smtp.server')}
-              placeholder={t('setting.system.smtp.server_placeholder')}
+              label='SMTP 服务器地址'
               name='SMTPServer'
               onChange={handleInputChange}
+              autoComplete='new-password'
               value={inputs.SMTPServer}
+              placeholder='例如：smtp.qq.com'
             />
             <Form.Input
-              label={t('setting.system.smtp.port')}
-              placeholder={t('setting.system.smtp.port_placeholder')}
+              label='SMTP 端口'
               name='SMTPPort'
               onChange={handleInputChange}
+              autoComplete='new-password'
               value={inputs.SMTPPort}
+              placeholder='默认: 587'
             />
             <Form.Input
-              label={t('setting.system.smtp.account')}
-              placeholder={t('setting.system.smtp.account_placeholder')}
+              label='SMTP 账户'
               name='SMTPAccount'
               onChange={handleInputChange}
+              autoComplete='new-password'
               value={inputs.SMTPAccount}
+              placeholder='通常是邮箱地址'
             />
           </Form.Group>
           <Form.Group widths={3}>
             <Form.Input
-              label={t('setting.system.smtp.from')}
-              placeholder={t('setting.system.smtp.from_placeholder')}
+              label='SMTP 发送者邮箱'
               name='SMTPFrom'
               onChange={handleInputChange}
+              autoComplete='new-password'
               value={inputs.SMTPFrom}
+              placeholder='通常和邮箱地址保持一致'
             />
             <Form.Input
-              label={t('setting.system.smtp.token')}
-              placeholder={t('setting.system.smtp.token_placeholder')}
+              label='SMTP 访问凭证'
               name='SMTPToken'
               onChange={handleInputChange}
               type='password'
-              value={inputs.SMTPToken}
+              autoComplete='new-password'
+              checked={inputs.RegisterEnabled === 'true'}
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
-          <Form.Button onClick={submitSMTP}>
-            {t('setting.system.smtp.buttons.save')}
-          </Form.Button>
-
-          <Divider />
-          <Header as='h3'>{t('setting.system.github.title')}</Header>
-          <Message>
-            {t('setting.system.github.subtitle')}
-            <a href='https://github.com/settings/developers' target='_blank'>
-              {t('setting.system.github.manage_link')}
-            </a>
-            {t('setting.system.github.manage_text')}
-          </Message>
-          <Message>
-            {t('setting.system.github.url_notice', {
-              server_url: originInputs.ServerAddress,
-              callback_url: `${originInputs.ServerAddress}/oauth/github`,
-            })}
-          </Message>
-          <Form.Group widths={3}>
-            <Form.Input
-              label={t('setting.system.github.client_id')}
-              placeholder={t('setting.system.github.client_id_placeholder')}
-              name='GitHubClientId'
-              onChange={handleInputChange}
-              value={inputs.GitHubClientId}
-            />
-            <Form.Input
-              label={t('setting.system.github.client_secret')}
-              placeholder={t('setting.system.github.client_secret_placeholder')}
-              name='GitHubClientSecret'
-              onChange={handleInputChange}
-              type='password'
-              value={inputs.GitHubClientSecret}
-            />
-          </Form.Group>
-          <Form.Button onClick={submitGitHubOAuth}>
-            {t('setting.system.github.buttons.save')}
-          </Form.Button>
-
+          <Form.Button onClick={submitSMTP}>保存 SMTP 设置</Form.Button>
           <Divider />
           <Header as='h3'>
-            {t('setting.system.lark.title')}
+            配置 GitHub OAuth App
             <Header.Subheader>
-              {t('setting.system.lark.subtitle')}
-              <a href='https://open.feishu.cn/app' target='_blank'>
-                {t('setting.system.lark.manage_link')}
+              用以支持通过 GitHub 进行登录注册，
+              <a href='https://github.com/settings/developers' target='_blank'>
+                点击此处
               </a>
-              {t('setting.system.lark.manage_text')}
+              管理你的 GitHub OAuth App
             </Header.Subheader>
           </Header>
           <Message>
-            {t('setting.system.lark.url_notice', {
-              server_url: inputs.ServerAddress,
-              callback_url: `${inputs.ServerAddress}/oauth/lark`,
-            })}
+            Homepage URL 填 <code>{inputs.ServerAddress}</code>
+            ，Authorization callback URL 填{' '}
+            <code>{`${inputs.ServerAddress}/oauth/github`}</code>
           </Message>
           <Form.Group widths={3}>
             <Form.Input
-              label={t('setting.system.lark.client_id')}
+              label='GitHub Client ID'
+              name='GitHubClientId'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.GitHubClientId}
+              placeholder='输入你注册的 GitHub OAuth APP 的 ID'
+            />
+            <Form.Input
+              label='GitHub Client Secret'
+              name='GitHubClientSecret'
+              onChange={handleInputChange}
+              type='password'
+              autoComplete='new-password'
+              value={inputs.GitHubClientSecret}
+              placeholder='敏感信息不会发送到前端显示'
+            />
+          </Form.Group>
+          <Form.Button onClick={submitGitHubOAuth}>
+            保存 GitHub OAuth 设置
+          </Form.Button>
+          <Divider />
+          <Header as='h3'>
+            配置飞书授权登录
+            <Header.Subheader>
+              用以支持通过飞书进行登录注册，
+              <a href='https://open.feishu.cn/app' target='_blank'>
+                点击此处
+              </a>
+              管理你的飞书应用
+            </Header.Subheader>
+          </Header>
+          <Message>
+            主页链接填 <code>{inputs.ServerAddress}</code>
+            ，重定向 URL 填{' '}
+            <code>{`${inputs.ServerAddress}/oauth/lark`}</code>
+          </Message>
+          <Form.Group widths={3}>
+            <Form.Input
+              label='App ID'
               name='LarkClientId'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.LarkClientId}
-              placeholder={t('setting.system.lark.client_id_placeholder')}
+              placeholder='输入 App ID'
             />
             <Form.Input
-              label={t('setting.system.lark.client_secret')}
+              label='App Secret'
               name='LarkClientSecret'
               onChange={handleInputChange}
               type='password'
               autoComplete='new-password'
               value={inputs.LarkClientSecret}
-              placeholder={t('setting.system.lark.client_secret_placeholder')}
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
           <Form.Button onClick={submitLarkOAuth}>
-            {t('setting.system.lark.buttons.save')}
+            保存飞书 OAuth 设置
           </Form.Button>
-
           <Divider />
           <Header as='h3'>
-            {t('setting.system.wechat.title')}
+            配置 WeChat Server
             <Header.Subheader>
-              {t('setting.system.wechat.subtitle')}
+              用以支持通过微信进行登录注册，
               <a
                 href='https://github.com/songquanpeng/wechat-server'
                 target='_blank'
               >
-                {t('setting.system.wechat.learn_more')}
+                点击此处
               </a>
+              了解 WeChat Server
             </Header.Subheader>
           </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label={t('setting.system.wechat.server_address')}
+              label='WeChat Server 服务器地址'
               name='WeChatServerAddress'
+              placeholder='例如：https://yourdomain.com'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.WeChatServerAddress}
-              placeholder={t(
-                'setting.system.wechat.server_address_placeholder'
-              )}
             />
             <Form.Input
-              label={t('setting.system.wechat.token')}
+              label='WeChat Server 访问凭证'
               name='WeChatServerToken'
-              onChange={handleInputChange}
               type='password'
+              onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.WeChatServerToken}
-              placeholder={t('setting.system.wechat.token_placeholder')}
+              placeholder='敏感信息不会发送到前端显示'
             />
             <Form.Input
-              label={t('setting.system.wechat.qrcode')}
+              label='微信公众号二维码图片链接'
               name='WeChatAccountQRCodeImageURL'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.WeChatAccountQRCodeImageURL}
-              placeholder={t('setting.system.wechat.qrcode_placeholder')}
+              placeholder='输入一个图片链接'
             />
           </Form.Group>
           <Form.Button onClick={submitWeChat}>
-            {t('setting.system.wechat.buttons.save')}
+            保存 WeChat Server 设置
           </Form.Button>
-
           <Divider />
           <Header as='h3'>
-            {t('setting.system.turnstile.title')}
+            配置 Message Pusher
             <Header.Subheader>
-              {t('setting.system.turnstile.subtitle')}
-              <a href='https://dash.cloudflare.com/' target='_blank'>
-                {t('setting.system.turnstile.manage_link')}
+              用以推送报警信息，
+              <a
+                href='https://github.com/songquanpeng/message-pusher'
+                target='_blank'
+              >
+                点击此处
               </a>
-              {t('setting.system.turnstile.manage_text')}
+              了解 Message Pusher
             </Header.Subheader>
           </Header>
           <Form.Group widths={3}>
             <Form.Input
-              label={t('setting.system.turnstile.site_key')}
+              label='Message Pusher 推送地址'
+              name='MessagePusherAddress'
+              placeholder='例如：https://msgpusher.com/push/your_username'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.MessagePusherAddress}
+            />
+            <Form.Input
+              label='Message Pusher 访问凭证'
+              name='MessagePusherToken'
+              type='password'
+              onChange={handleInputChange}
+              autoComplete='new-password'
+              value={inputs.MessagePusherToken}
+              placeholder='敏感信息不会发送到前端显示'
+            />
+          </Form.Group>
+          <Form.Button onClick={submitMessagePusher}>
+            保存 Message Pusher 设置
+          </Form.Button>
+          <Divider />
+          <Header as='h3'>
+            配置 Turnstile
+            <Header.Subheader>
+              用以支持用户校验，
+              <a href='https://dash.cloudflare.com/' target='_blank'>
+                点击此处
+              </a>
+              管理你的 Turnstile Sites，推荐选择 Invisible Widget Type
+            </Header.Subheader>
+          </Header>
+          <Form.Group widths={3}>
+            <Form.Input
+              label='Turnstile Site Key'
               name='TurnstileSiteKey'
               onChange={handleInputChange}
               autoComplete='new-password'
               value={inputs.TurnstileSiteKey}
-              placeholder={t('setting.system.turnstile.site_key_placeholder')}
+              placeholder='输入你注册的 Turnstile Site Key'
             />
             <Form.Input
-              label={t('setting.system.turnstile.secret_key')}
+              label='Turnstile Secret Key'
               name='TurnstileSecretKey'
               onChange={handleInputChange}
               type='password'
               autoComplete='new-password'
               value={inputs.TurnstileSecretKey}
-              placeholder={t('setting.system.turnstile.secret_key_placeholder')}
+              placeholder='敏感信息不会发送到前端显示'
             />
           </Form.Group>
           <Form.Button onClick={submitTurnstile}>
-            {t('setting.system.turnstile.buttons.save')}
+            保存 Turnstile 设置
           </Form.Button>
         </Form>
       </Grid.Column>

web/default/src/components/TokensTable.js

@@ -1,84 +1,49 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Dropdown,
-  Form,
-  Label,
-  Pagination,
-  Popup,
-  Table,
-} from 'semantic-ui-react';
+import { Button, Dropdown, Form, Label, Pagination, Popup, Table } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
-import {
-  API,
-  copy,
-  showError,
-  showSuccess,
-  showWarning,
-  timestamp2string,
-} from '../helpers';
+import { API, copy, showError, showSuccess, showWarning, timestamp2string } from '../helpers';
 
 import { ITEMS_PER_PAGE } from '../constants';
 import { renderQuota } from '../helpers/render';
 
+const COPY_OPTIONS = [
+  { key: 'next', text: 'ChatGPT Next Web', value: 'next' },
+  { key: 'ama', text: 'BotGem', value: 'ama' },
+  { key: 'opencat', text: 'OpenCat', value: 'opencat' },
+  { key: 'lobechat', text: 'LobeChat', value: 'lobechat' },
+];
+
+const OPEN_LINK_OPTIONS = [
+  { key: 'next', text: 'ChatGPT Next Web', value: 'next' },
+  { key: 'ama', text: 'BotGem', value: 'ama' },
+  { key: 'opencat', text: 'OpenCat', value: 'opencat' },
+  { key: 'lobechat', text: 'LobeChat', value: 'lobechat' },
+];
+
 function renderTimestamp(timestamp) {
-  return <>{timestamp2string(timestamp)}</>;
+  return (
+    <>
+      {timestamp2string(timestamp)}
+    </>
+  );
 }
 
-function renderStatus(status, t) {
+function renderStatus(status) {
   switch (status) {
     case 1:
-      return (
-        <Label basic color='green'>
-          {t('token.table.status_enabled')}
-        </Label>
-      );
+      return <Label basic color='green'>已启用</Label>;
     case 2:
-      return (
-        <Label basic color='red'>
-          {t('token.table.status_disabled')}
-        </Label>
-      );
+      return <Label basic color='red'> 已禁用 </Label>;
     case 3:
-      return (
-        <Label basic color='yellow'>
-          {t('token.table.status_expired')}
-        </Label>
-      );
+      return <Label basic color='yellow'> 已过期 </Label>;
     case 4:
-      return (
-        <Label basic color='grey'>
-          {t('token.table.status_depleted')}
-        </Label>
-      );
+      return <Label basic color='grey'> 已耗尽 </Label>;
     default:
-      return (
-        <Label basic color='black'>
-          {t('token.table.status_unknown')}
-        </Label>
-      );
+      return <Label basic color='black'> 未知状态 </Label>;
   }
 }
 
 const TokensTable = () => {
-  const { t } = useTranslation();
-
-  const COPY_OPTIONS = [
-    { key: 'raw', text: t('token.copy_options.raw'), value: '' },
-    { key: 'next', text: t('token.copy_options.next'), value: 'next' },
-    { key: 'ama', text: t('token.copy_options.ama'), value: 'ama' },
-    { key: 'opencat', text: t('token.copy_options.opencat'), value: 'opencat' },
-    { key: 'lobe', text: t('token.copy_options.lobe'), value: 'lobechat' },
-  ];
-
-  const OPEN_LINK_OPTIONS = [
-    { key: 'next', text: t('token.copy_options.next'), value: 'next' },
-    { key: 'ama', text: t('token.copy_options.ama'), value: 'ama' },
-    { key: 'opencat', text: t('token.copy_options.opencat'), value: 'opencat' },
-    { key: 'lobe', text: t('token.copy_options.lobe'), value: 'lobechat' },
-  ];
-
   const [tokens, setTokens] = useState([]);
   const [loading, setLoading] = useState(true);
   const [activePage, setActivePage] = useState(1);
@@ -133,10 +98,9 @@ const TokensTable = () => {
     let encodedServerAddress = encodeURIComponent(serverAddress);
     const nextLink = localStorage.getItem('chat_link');
     let nextUrl;
-
+  
     if (nextLink) {
-      nextUrl =
-        nextLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+      nextUrl = nextLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
     } else {
       nextUrl = `https://app.nextchat.dev/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
     }
@@ -153,17 +117,15 @@ const TokensTable = () => {
         url = nextUrl;
         break;
       case 'lobechat':
-        url =
-          nextLink +
-          `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = nextLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
         break;
       default:
         url = `sk-${key}`;
     }
     if (await copy(url)) {
-      showSuccess(t('token.messages.copy_success'));
+      showSuccess('已复制到剪贴板！');
     } else {
-      showWarning(t('token.messages.copy_failed'));
+      showWarning('无法复制到剪贴板，请手动复制，已将令牌填入搜索框。');
       setSearchKeyword(url);
     }
   };
@@ -173,7 +135,7 @@ const TokensTable = () => {
     let serverAddress = '';
     if (status) {
       status = JSON.parse(status);
-      serverAddress = status.server_address;
+      serverAddress = status.server_address; 
     }
     if (serverAddress === '') {
       serverAddress = window.location.origin;
@@ -181,10 +143,9 @@ const TokensTable = () => {
     let encodedServerAddress = encodeURIComponent(serverAddress);
     const chatLink = localStorage.getItem('chat_link');
     let defaultUrl;
-
+  
     if (chatLink) {
-      defaultUrl =
-        chatLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
+      defaultUrl = chatLink + `/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
     } else {
       defaultUrl = `https://app.nextchat.dev/#/?settings={"key":"sk-${key}","url":"${serverAddress}"}`;
     }
@@ -193,23 +154,21 @@ const TokensTable = () => {
       case 'ama':
         url = `ama://set-api-key?server=${encodedServerAddress}&key=sk-${key}`;
         break;
-
+  
       case 'opencat':
         url = `opencat://team/join?domain=${encodedServerAddress}&token=sk-${key}`;
         break;
 
       case 'lobechat':
-        url =
-          chatLink +
-          `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
+        url = chatLink + `/?settings={"keyVaults":{"openai":{"apiKey":"sk-${key}","baseURL":"${serverAddress}/v1"}}}`;
         break;
 
       default:
         url = defaultUrl;
     }
-
+  
     window.open(url, '_blank');
-  };
+  }
 
   useEffect(() => {
     loadTokens(0, orderBy)
@@ -237,7 +196,7 @@ const TokensTable = () => {
     }
     const { success, message } = res.data;
     if (success) {
-      showSuccess(t('token.messages.operation_success'));
+      showSuccess('操作成功完成！');
       let token = res.data.data;
       let newTokens = [...tokens];
       let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -308,14 +267,14 @@ const TokensTable = () => {
           icon='search'
           fluid
           iconPosition='left'
-          placeholder={t('token.search')}
+          placeholder='搜索令牌的名称 ...'
           value={searchKeyword}
           loading={searching}
           onChange={handleKeywordChange}
         />
       </Form>
 
-      <Table basic={'very'} compact size='small'>
+      <Table basic compact size='small'>
         <Table.Header>
           <Table.Row>
             <Table.HeaderCell
@@ -324,7 +283,7 @@ const TokensTable = () => {
                 sortToken('name');
               }}
             >
-              {t('token.table.name')}
+              名称
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -332,7 +291,7 @@ const TokensTable = () => {
                 sortToken('status');
               }}
             >
-              {t('token.table.status')}
+              状态
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -340,7 +299,7 @@ const TokensTable = () => {
                 sortToken('used_quota');
               }}
             >
-              {t('token.table.used_quota')}
+              已用额度
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -348,7 +307,7 @@ const TokensTable = () => {
                 sortToken('remain_quota');
               }}
             >
-              {t('token.table.remain_quota')}
+              剩余额度
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -356,7 +315,7 @@ const TokensTable = () => {
                 sortToken('created_time');
               }}
             >
-              {t('token.table.created_time')}
+              创建时间
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -364,9 +323,9 @@ const TokensTable = () => {
                 sortToken('expired_time');
               }}
             >
-              {t('token.table.expired_time')}
+              过期时间
             </Table.HeaderCell>
-            <Table.HeaderCell>{t('token.table.actions')}</Table.HeaderCell>
+            <Table.HeaderCell>操作</Table.HeaderCell>
           </Table.Row>
         </Table.Header>
 
@@ -378,77 +337,65 @@ const TokensTable = () => {
             )
             .map((token, idx) => {
               if (token.deleted) return <></>;
-
-              const copyOptionsWithHandlers = COPY_OPTIONS.map((option) => ({
-                ...option,
-                onClick: async () => {
-                  await onCopy(option.value, token.key);
-                },
-              }));
-
-              const openLinkOptionsWithHandlers = OPEN_LINK_OPTIONS.map(
-                (option) => ({
-                  ...option,
-                  onClick: async () => {
-                    await onOpenLink(option.value, token.key);
-                  },
-                })
-              );
-
               return (
                 <Table.Row key={token.id}>
-                  <Table.Cell>
-                    {token.name ? token.name : t('token.table.no_name')}
-                  </Table.Cell>
-                  <Table.Cell>{renderStatus(token.status, t)}</Table.Cell>
-                  <Table.Cell>{renderQuota(token.used_quota, t)}</Table.Cell>
-                  <Table.Cell>
-                    {token.unlimited_quota
-                      ? t('token.table.unlimited')
-                      : renderQuota(token.remain_quota, t, 2)}
-                  </Table.Cell>
+                  <Table.Cell>{token.name ? token.name : '无'}</Table.Cell>
+                  <Table.Cell>{renderStatus(token.status)}</Table.Cell>
+                  <Table.Cell>{renderQuota(token.used_quota)}</Table.Cell>
+                  <Table.Cell>{token.unlimited_quota ? '无限制' : renderQuota(token.remain_quota, 2)}</Table.Cell>
                   <Table.Cell>{renderTimestamp(token.created_time)}</Table.Cell>
-                  <Table.Cell>
-                    {token.expired_time === -1
-                      ? t('token.table.never_expire')
-                      : renderTimestamp(token.expired_time)}
-                  </Table.Cell>
+                  <Table.Cell>{token.expired_time === -1 ? '永不过期' : renderTimestamp(token.expired_time)}</Table.Cell>
                   <Table.Cell>
                     <div>
-                      <Button.Group color='green' size={'mini'}>
+                    <Button.Group color='green' size={'small'}>
                         <Button
-                          size={'mini'}
+                          size={'small'}
                           positive
-                          onClick={async () => await onCopy('', token.key)}
+                          onClick={async () => {
+                            await onCopy('', token.key);
+                          }}
                         >
-                          {t('token.buttons.copy')}
+                          复制
                         </Button>
                         <Dropdown
                           className='button icon'
                           floating
-                          options={copyOptionsWithHandlers}
+                          options={COPY_OPTIONS.map(option => ({
+                            ...option,
+                            onClick: async () => {
+                              await onCopy(option.value, token.key);
+                            }
+                          }))}
                           trigger={<></>}
                         />
-                      </Button.Group>{' '}
-                      <Button.Group color='blue' size={'mini'}>
+                      </Button.Group>
+                      {' '}
+                      <Button.Group color='blue' size={'small'}>
                         <Button
-                          size={'mini'}
-                          positive
-                          onClick={() => onOpenLink('', token.key)}
-                        >
-                          {t('token.buttons.chat')}
-                        </Button>
-                        <Dropdown
-                          className='button icon'
-                          floating
-                          options={openLinkOptionsWithHandlers}
-                          trigger={<></>}
-                        />
-                      </Button.Group>{' '}
+                            size={'small'}
+                            positive
+                            onClick={() => {     
+                              onOpenLink('', token.key);       
+                            }}>
+                            聊天
+                          </Button>
+                          <Dropdown   
+                            className="button icon"       
+                            floating
+                            options={OPEN_LINK_OPTIONS.map(option => ({
+                              ...option,
+                              onClick: async () => {
+                                await onOpenLink(option.value, token.key);
+                              }
+                            }))}       
+                            trigger={<></>}   
+                          />
+                      </Button.Group>
+                      {' '}
                       <Popup
                         trigger={
-                          <Button size='mini' negative>
-                            {t('token.buttons.delete')}
+                          <Button size='small' negative>
+                            删除
                           </Button>
                         }
                         on='click'
@@ -456,17 +403,16 @@ const TokensTable = () => {
                         hoverable
                       >
                         <Button
-                          size={'mini'}
                           negative
                           onClick={() => {
                             manageToken(token.id, 'delete', idx);
                           }}
                         >
-                          {t('token.buttons.confirm_delete')} {token.name}
+                          删除令牌 {token.name}
                         </Button>
                       </Popup>
                       <Button
-                        size={'mini'}
+                        size={'small'}
                         onClick={() => {
                           manageToken(
                             token.id,
@@ -475,16 +421,14 @@ const TokensTable = () => {
                           );
                         }}
                       >
-                        {token.status === 1
-                          ? t('token.buttons.disable')
-                          : t('token.buttons.enable')}
+                        {token.status === 1 ? '禁用' : '启用'}
                       </Button>
                       <Button
-                        size={'mini'}
+                        size={'small'}
                         as={Link}
                         to={'/token/edit/' + token.id}
                       >
-                        {t('token.buttons.edit')}
+                        编辑
                       </Button>
                     </div>
                   </Table.Cell>
@@ -497,26 +441,16 @@ const TokensTable = () => {
           <Table.Row>
             <Table.HeaderCell colSpan='7'>
               <Button size='small' as={Link} to='/token/add' loading={loading}>
-                {t('token.buttons.add')}
-              </Button>
-              <Button size='small' onClick={refresh} loading={loading}>
-                {t('token.buttons.refresh')}
+                添加新的令牌
               </Button>
+              <Button size='small' onClick={refresh} loading={loading}>刷新</Button>
               <Dropdown
-                placeholder={t('token.sort.placeholder')}
+                placeholder='排序方式'
                 selection
                 options={[
-                  { key: '', text: t('token.sort.default'), value: '' },
-                  {
-                    key: 'remain_quota',
-                    text: t('token.sort.by_remain'),
-                    value: 'remain_quota',
-                  },
-                  {
-                    key: 'used_quota',
-                    text: t('token.sort.by_used'),
-                    value: 'used_quota',
-                  },
+                  { key: '', text: '默认排序', value: '' },
+                  { key: 'remain_quota', text: '按剩余额度排序', value: 'remain_quota' },
+                  { key: 'used_quota', text: '按已用额度排序', value: 'used_quota' },
                 ]}
                 value={orderBy}
                 onChange={handleOrderByChange}

web/default/src/components/UsersTable.js

@@ -1,42 +1,25 @@
 import React, { useEffect, useState } from 'react';
-import {
-  Button,
-  Form,
-  Label,
-  Pagination,
-  Popup,
-  Table,
-  Dropdown,
-} from 'semantic-ui-react';
+import { Button, Form, Label, Pagination, Popup, Table, Dropdown } from 'semantic-ui-react';
 import { Link } from 'react-router-dom';
 import { API, showError, showSuccess } from '../helpers';
-import { useTranslation } from 'react-i18next';
 
 import { ITEMS_PER_PAGE } from '../constants';
-import {
-  renderGroup,
-  renderNumber,
-  renderQuota,
-  renderText,
-} from '../helpers/render';
+import { renderGroup, renderNumber, renderQuota, renderText } from '../helpers/render';
 
-function renderRole(role, t) {
+function renderRole(role) {
   switch (role) {
     case 1:
-      return <Label>{t('user.table.role_types.normal')}</Label>;
+      return <Label>普通用户</Label>;
     case 10:
-      return <Label color='yellow'>{t('user.table.role_types.admin')}</Label>;
+      return <Label color='yellow'>管理员</Label>;
     case 100:
-      return (
-        <Label color='orange'>{t('user.table.role_types.super_admin')}</Label>
-      );
+      return <Label color='orange'>超级管理员</Label>;
     default:
-      return <Label color='red'>{t('user.table.role_types.unknown')}</Label>;
+      return <Label color='red'>未知身份</Label>;
   }
 }
 
 const UsersTable = () => {
-  const { t } = useTranslation();
   const [users, setUsers] = useState([]);
   const [loading, setLoading] = useState(true);
   const [activePage, setActivePage] = useState(1);
@@ -83,11 +66,11 @@ const UsersTable = () => {
     (async () => {
       const res = await API.post('/api/user/manage', {
         username,
-        action,
+        action
       });
       const { success, message } = res.data;
       if (success) {
-        showSuccess(t('user.messages.operation_success'));
+        showSuccess('操作成功完成！');
         let user = res.data.data;
         let newUsers = [...users];
         let realIdx = (activePage - 1) * ITEMS_PER_PAGE + idx;
@@ -107,17 +90,17 @@ const UsersTable = () => {
   const renderStatus = (status) => {
     switch (status) {
       case 1:
-        return <Label basic>{t('user.table.status_types.activated')}</Label>;
+        return <Label basic>已激活</Label>;
       case 2:
         return (
           <Label basic color='red'>
-            {t('user.table.status_types.banned')}
+            已封禁
           </Label>
         );
       default:
         return (
           <Label basic color='grey'>
-            {t('user.table.status_types.unknown')}
+            未知状态
           </Label>
         );
     }
@@ -179,14 +162,14 @@ const UsersTable = () => {
           icon='search'
           fluid
           iconPosition='left'
-          placeholder={t('user.search')}
+          placeholder='搜索用户的 ID，用户名，显示名称，以及邮箱地址 ...'
           value={searchKeyword}
           loading={searching}
           onChange={handleKeywordChange}
         />
       </Form>
 
-      <Table basic={'very'} compact size='small'>
+      <Table basic compact size='small'>
         <Table.Header>
           <Table.Row>
             <Table.HeaderCell
@@ -195,7 +178,7 @@ const UsersTable = () => {
                 sortUser('id');
               }}
             >
-              {t('user.table.id')}
+              ID
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -203,7 +186,7 @@ const UsersTable = () => {
                 sortUser('username');
               }}
             >
-              {t('user.table.username')}
+              用户名
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -211,7 +194,7 @@ const UsersTable = () => {
                 sortUser('group');
               }}
             >
-              {t('user.table.group')}
+              分组
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -219,7 +202,7 @@ const UsersTable = () => {
                 sortUser('quota');
               }}
             >
-              {t('user.table.quota')}
+              统计信息
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -227,7 +210,7 @@ const UsersTable = () => {
                 sortUser('role');
               }}
             >
-              {t('user.table.role_text')}
+              用户角色
             </Table.HeaderCell>
             <Table.HeaderCell
               style={{ cursor: 'pointer' }}
@@ -235,9 +218,9 @@ const UsersTable = () => {
                 sortUser('status');
               }}
             >
-              {t('user.table.status_text')}
+              状态
             </Table.HeaderCell>
-            <Table.HeaderCell>{t('user.table.actions')}</Table.HeaderCell>
+            <Table.HeaderCell>操作</Table.HeaderCell>
           </Table.Row>
         </Table.Header>
 
@@ -256,9 +239,7 @@ const UsersTable = () => {
                     <Popup
                       content={user.email ? user.email : '未绑定邮箱地址'}
                       key={user.username}
-                      header={
-                        user.display_name ? user.display_name : user.username
-                      }
+                      header={user.display_name ? user.display_name : user.username}
                       trigger={<span>{renderText(user.username, 15)}</span>}
                       hoverable
                     />
@@ -268,57 +249,38 @@ const UsersTable = () => {
                   {/*  {user.email ? <Popup hoverable content={user.email} trigger={<span>{renderText(user.email, 24)}</span>} /> : '无'}*/}
                   {/*</Table.Cell>*/}
                   <Table.Cell>
-                    <Popup
-                      content={t('user.table.remaining_quota')}
-                      trigger={
-                        <Label basic>{renderQuota(user.quota, t)}</Label>
-                      }
-                    />
-                    <Popup
-                      content={t('user.table.used_quota')}
-                      trigger={
-                        <Label basic>{renderQuota(user.used_quota, t)}</Label>
-                      }
-                    />
-                    <Popup
-                      content={t('user.table.request_count')}
-                      trigger={
-                        <Label basic>{renderNumber(user.request_count)}</Label>
-                      }
-                    />
+                    <Popup content='剩余额度' trigger={<Label basic>{renderQuota(user.quota)}</Label>} />
+                    <Popup content='已用额度' trigger={<Label basic>{renderQuota(user.used_quota)}</Label>} />
+                    <Popup content='请求次数' trigger={<Label basic>{renderNumber(user.request_count)}</Label>} />
                   </Table.Cell>
-                  <Table.Cell>{renderRole(user.role, t)}</Table.Cell>
+                  <Table.Cell>{renderRole(user.role)}</Table.Cell>
                   <Table.Cell>{renderStatus(user.status)}</Table.Cell>
                   <Table.Cell>
                     <div>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         positive
                         onClick={() => {
                           manageUser(user.username, 'promote', idx);
                         }}
                         disabled={user.role === 100}
                       >
-                        {t('user.buttons.promote')}
+                        提升
                       </Button>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         color={'yellow'}
                         onClick={() => {
                           manageUser(user.username, 'demote', idx);
                         }}
                         disabled={user.role === 100}
                       >
-                        {t('user.buttons.demote')}
+                        降级
                       </Button>
                       <Popup
                         trigger={
-                          <Button
-                            size='tiny'
-                            negative
-                            disabled={user.role === 100}
-                          >
-                            {t('user.buttons.delete')}
+                          <Button size='small' negative disabled={user.role === 100}>
+                            删除
                           </Button>
                         }
                         on='click'
@@ -327,16 +289,15 @@ const UsersTable = () => {
                       >
                         <Button
                           negative
-                          size={'tiny'}
                           onClick={() => {
                             manageUser(user.username, 'delete', idx);
                           }}
                         >
-                          {t('user.buttons.delete_user')} {user.username}
+                          删除用户 {user.username}
                         </Button>
                       </Popup>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         onClick={() => {
                           manageUser(
                             user.username,
@@ -346,16 +307,14 @@ const UsersTable = () => {
                         }}
                         disabled={user.role === 100}
                       >
-                        {user.status === 1
-                          ? t('user.buttons.disable')
-                          : t('user.buttons.enable')}
+                        {user.status === 1 ? '禁用' : '启用'}
                       </Button>
                       <Button
-                        size={'tiny'}
+                        size={'small'}
                         as={Link}
                         to={'/user/edit/' + user.id}
                       >
-                        {t('user.buttons.edit')}
+                        编辑
                       </Button>
                     </div>
                   </Table.Cell>
@@ -368,28 +327,16 @@ const UsersTable = () => {
           <Table.Row>
             <Table.HeaderCell colSpan='7'>
               <Button size='small' as={Link} to='/user/add' loading={loading}>
-                {t('user.buttons.add')}
+                添加新的用户
               </Button>
               <Dropdown
-                placeholder={t('user.table.sort_by')}
+                placeholder='排序方式'
                 selection
                 options={[
-                  { key: '', text: t('user.table.sort.default'), value: '' },
-                  {
-                    key: 'quota',
-                    text: t('user.table.sort.by_quota'),
-                    value: 'quota',
-                  },
-                  {
-                    key: 'used_quota',
-                    text: t('user.table.sort.by_used_quota'),
-                    value: 'used_quota',
-                  },
-                  {
-                    key: 'request_count',
-                    text: t('user.table.sort.by_request_count'),
-                    value: 'request_count',
-                  },
+                  { key: '', text: '默认排序', value: '' },
+                  { key: 'quota', text: '按剩余额度排序', value: 'quota' },
+                  { key: 'used_quota', text: '按已用额度排序', value: 'used_quota' },
+                  { key: 'request_count', text: '按请求次数排序', value: 'request_count' },
                 ]}
                 value={orderBy}
                 onChange={handleOrderByChange}

web/default/src/constants/channel.constants.js

@@ -31,7 +31,6 @@ export const CHANNEL_OPTIONS = [
     { key: 43, text: 'Proxy', value: 43, color: 'blue' },
     { key: 44, text: 'SiliconFlow', value: 44, color: 'blue' },
     { key: 45, text: 'xAI', value: 45, color: 'blue' },
-    { key: 46, text: 'Replicate', value: 46, color: 'blue' },
     { key: 8, text: '自定义渠道', value: 8, color: 'pink' },
     { key: 22, text: '知识库：FastGPT', value: 22, color: 'blue' },
     { key: 21, text: '知识库：AI Proxy', value: 21, color: 'purple' },

web/default/src/helpers/render.js

@@ -1,5 +1,4 @@
 import { Label } from 'semantic-ui-react';
-import { useTranslation } from 'react-i18next';
 
 export function renderText(text, limit) {
   if (text.length > limit) {
@@ -14,18 +13,16 @@ export function renderGroup(group) {
   }
   let groups = group.split(',');
   groups.sort();
-  return (
-    <>
-      {groups.map((group) => {
-        if (group === 'vip' || group === 'pro') {
-          return <Label color='yellow'>{group}</Label>;
-        } else if (group === 'svip' || group === 'premium') {
-          return <Label color='red'>{group}</Label>;
-        }
-        return <Label>{group}</Label>;
-      })}
-    </>
-  );
+  return <>
+    {groups.map((group) => {
+      if (group === 'vip' || group === 'pro') {
+        return <Label color='yellow'>{group}</Label>;
+      } else if (group === 'svip' || group === 'premium') {
+        return <Label color='red'>{group}</Label>;
+      }
+      return <Label>{group}</Label>;
+    })}
+  </>;
 }
 
 export function renderNumber(num) {
@@ -40,61 +37,22 @@ export function renderNumber(num) {
   }
 }
 
-export function renderQuota(quota, t, precision = 2) {
-  const displayInCurrency =
-    localStorage.getItem('display_in_currency') === 'true';
-  const quotaPerUnit = parseFloat(
-    localStorage.getItem('quota_per_unit') || '1'
-  );
-
+export function renderQuota(quota, digits = 2) {
+  let quotaPerUnit = localStorage.getItem('quota_per_unit');
+  let displayInCurrency = localStorage.getItem('display_in_currency');
+  quotaPerUnit = parseFloat(quotaPerUnit);
+  displayInCurrency = displayInCurrency === 'true';
   if (displayInCurrency) {
-    const amount = (quota / quotaPerUnit).toFixed(precision);
-    return t('common.quota.display_short', { amount });
+    return '$' + (quota / quotaPerUnit).toFixed(digits);
   }
-
   return renderNumber(quota);
 }
 
-export function renderQuotaWithPrompt(quota, t) {
-  const displayInCurrency =
-    localStorage.getItem('display_in_currency') === 'true';
-  const quotaPerUnit = parseFloat(
-    localStorage.getItem('quota_per_unit') || '1'
-  );
-
+export function renderQuotaWithPrompt(quota, digits) {
+  let displayInCurrency = localStorage.getItem('display_in_currency');
+  displayInCurrency = displayInCurrency === 'true';
   if (displayInCurrency) {
-    const amount = (quota / quotaPerUnit).toFixed(2);
-    return ` (${t('common.quota.display', { amount })})`;
+    return `（等价金额：${renderQuota(quota, digits)}）`;
   }
-
   return '';
-}
-
-const colors = [
-  'red',
-  'orange',
-  'yellow',
-  'olive',
-  'green',
-  'teal',
-  'blue',
-  'violet',
-  'purple',
-  'pink',
-  'brown',
-  'grey',
-  'black',
-];
-
-export function renderColorLabel(text) {
-  let hash = 0;
-  for (let i = 0; i < text.length; i++) {
-    hash = text.charCodeAt(i) + ((hash << 5) - hash);
-  }
-  let index = Math.abs(hash % colors.length);
-  return (
-    <Label basic color={colors[index]}>
-      {text}
-    </Label>
-  );
-}
+}

web/default/src/i18n.js

@@ -1,23 +0,0 @@
-import i18n from 'i18next';
-import { initReactI18next } from 'react-i18next';
-import Backend from 'i18next-http-backend';
-import LanguageDetector from 'i18next-browser-languagedetector';
-
-i18n
-  .use(Backend)
-  .use(LanguageDetector)
-  .use(initReactI18next)
-  .init({
-    fallbackLng: 'zh',
-    debug: process.env.NODE_ENV === 'development',
-
-    interpolation: {
-      escapeValue: false,
-    },
-
-    backend: {
-      loadPath: '/locales/{{lng}}/{{ns}}.json',
-    },
-  });
-
-export default i18n;

web/default/src/index.css

@@ -33,85 +33,3 @@ code {
         display: none !important;
     }
 }
-
-@media screen and (max-width: 768px) {
-  .ui.container {
-    width: 100% !important;
-    margin-left: 0 !important;
-    margin-right: 0 !important;
-    padding: 0 10px !important;
-  }
-
-  .ui.card, 
-  .ui.cards,
-  .ui.segment {
-    margin-left: 0 !important;
-    margin-right: 0 !important;
-  }
-
-  .ui.table {
-    padding-left: 0 !important;
-    padding-right: 0 !important;
-  }
-}
-
-/* 小屏笔记本 (13-14寸) */
-@media screen and (min-width: 769px) and (max-width: 1366px) {
-  .ui.container {
-    width: auto !important;
-    max-width: 100% !important;
-    margin-left: auto !important;
-    margin-right: auto !important;
-    padding: 0 24px !important;
-  }
-
-  /* 调整表格显示 */
-  .ui.table {
-    font-size: 0.9em;
-  }
-
-  /* 调整卡片布局 */
-  .ui.cards {
-    margin-left: -0.5em !important;
-    margin-right: -0.5em !important;
-  }
-
-  .ui.cards > .card {
-    margin: 0.5em !important;
-    width: calc(50% - 1em) !important;
-  }
-}
-
-/* 大屏幕 */
-@media screen and (min-width: 1367px) {
-  .ui.container {
-    width: 1200px !important;
-    margin-left: auto !important;
-    margin-right: auto !important;
-    padding: 0 !important;
-  }
-}
-
-/* 优化 Dashboard 网格布局 */
-@media screen and (max-width: 1366px) {
-  .charts-grid {
-    margin: 0 -0.5em !important;
-  }
-
-  .charts-grid .column {
-    padding: 0.5em !important;
-  }
-
-  .chart-card {
-    margin: 0 !important;
-  }
-
-  /* 调整字体大小 */
-  .ui.header {
-    font-size: 1.1em !important;
-  }
-
-  .stat-value {
-    font-size: 0.9em !important;
-  }
-}

web/default/src/index.js

@@ -11,7 +11,6 @@ import { UserProvider } from './context/User';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 import { StatusProvider } from './context/Status';
-import './i18n';
 
 const root = ReactDOM.createRoot(document.getElementById('root'));
 root.render(

web/default/src/pages/About/index.js

@@ -1,11 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Card } from 'semantic-ui-react';
+import { Header, Segment } from 'semantic-ui-react';
 import { API, showError } from '../../helpers';
 import { marked } from 'marked';
 
 const About = () => {
-  const { t } = useTranslation();
   const [about, setAbout] = useState('');
   const [aboutLoaded, setAboutLoaded] = useState(false);
 
@@ -22,7 +20,7 @@ const About = () => {
       localStorage.setItem('about', aboutContent);
     } else {
       showError(message);
-      setAbout(t('about.loading_failed'));
+      setAbout('加载关于内容失败...');
     }
     setAboutLoaded(true);
   };
@@ -33,36 +31,28 @@ const About = () => {
 
   return (
     <>
-      {aboutLoaded && about === '' ? (
-        <div className='dashboard-container'>
-          <Card fluid className='chart-card'>
-            <Card.Content>
-              <Card.Header className='header'>{t('about.title')}</Card.Header>
-              <p>{t('about.description')}</p>
-              {t('about.repository')}
-              <a href='https://github.com/songquanpeng/one-api'>
-                https://github.com/songquanpeng/one-api
-              </a>
-            </Card.Content>
-          </Card>
-        </div>
-      ) : (
-        <>
-          {about.startsWith('https://') ? (
-            <iframe
+      {
+        aboutLoaded && about === '' ? <>
+          <Segment>
+            <Header as='h3'>关于</Header>
+            <p>可在设置页面设置关于内容，支持 HTML & Markdown</p>
+            项目仓库地址：
+            <a href='https://github.com/songquanpeng/one-api'>
+              https://github.com/songquanpeng/one-api
+            </a>
+          </Segment>
+        </> : <>
+          {
+            about.startsWith('https://') ? <iframe
               src={about}
               style={{ width: '100%', height: '100vh', border: 'none' }}
-            />
-          ) : (
-            <div
-              style={{ fontSize: 'larger' }}
-              dangerouslySetInnerHTML={{ __html: about }}
-            ></div>
-          )}
+            /> : <div style={{ fontSize: 'larger' }} dangerouslySetInnerHTML={{ __html: about }}></div>
+          }
         </>
-      )}
+      }
     </>
   );
 };
 
+
 export default About;

web/default/src/pages/Channel/EditChannel.js

@@ -1,49 +1,32 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import {
-  Button,
-  Form,
-  Header,
-  Input,
-  Message,
-  Segment,
-  Card,
-} from 'semantic-ui-react';
+import { Button, Form, Header, Input, Message, Segment } from 'semantic-ui-react';
 import { useNavigate, useParams } from 'react-router-dom';
-import {
-  API,
-  copy,
-  getChannelModels,
-  showError,
-  showInfo,
-  showSuccess,
-  verifyJSON,
-} from '../../helpers';
+import { API, copy, getChannelModels, showError, showInfo, showSuccess, verifyJSON } from '../../helpers';
 import { CHANNEL_OPTIONS } from '../../constants';
 
 const MODEL_MAPPING_EXAMPLE = {
   'gpt-3.5-turbo-0301': 'gpt-3.5-turbo',
   'gpt-4-0314': 'gpt-4',
-  'gpt-4-32k-0314': 'gpt-4-32k',
+  'gpt-4-32k-0314': 'gpt-4-32k'
 };
 
-function type2secretPrompt(type, t) {
+function type2secretPrompt(type) {
+  // inputs.type === 15 ? '按照如下格式输入：APIKey|SecretKey' : (inputs.type === 18 ? '按照如下格式输入：APPID|APISecret|APIKey' : '请输入渠道对应的鉴权密钥')
   switch (type) {
     case 15:
-      return t('channel.edit.key_prompts.zhipu');
+      return '按照如下格式输入：APIKey|SecretKey';
     case 18:
-      return t('channel.edit.key_prompts.spark');
+      return '按照如下格式输入：APPID|APISecret|APIKey';
     case 22:
-      return t('channel.edit.key_prompts.fastgpt');
+      return '按照如下格式输入：APIKey-AppId，例如：fastgpt-0sp2gtvfdgyi4k30jwlgwf1i-64f335d84283f05518e9e041';
     case 23:
-      return t('channel.edit.key_prompts.tencent');
+      return '按照如下格式输入：AppId|SecretId|SecretKey';
     default:
-      return t('channel.edit.key_prompts.default');
+      return '请输入渠道对应的鉴权密钥';
   }
 }
 
 const EditChannel = () => {
-  const { t } = useTranslation();
   const params = useParams();
   const navigate = useNavigate();
   const channelId = params.id;
@@ -62,7 +45,7 @@ const EditChannel = () => {
     model_mapping: '',
     system_prompt: '',
     models: [],
-    groups: ['default'],
+    groups: ['default']
   };
   const [batch, setBatch] = useState(false);
   const [inputs, setInputs] = useState(originInputs);
@@ -78,7 +61,7 @@ const EditChannel = () => {
     ak: '',
     user_id: '',
     vertex_ai_project_id: '',
-    vertex_ai_adc: '',
+    vertex_ai_adc: ''
   });
   const handleInputChange = (e, { name, value }) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
@@ -110,11 +93,7 @@ const EditChannel = () => {
         data.groups = data.group.split(',');
       }
       if (data.model_mapping !== '') {
-        data.model_mapping = JSON.stringify(
-          JSON.parse(data.model_mapping),
-          null,
-          2
-        );
+        data.model_mapping = JSON.stringify(JSON.parse(data.model_mapping), null, 2);
       }
       setInputs(data);
       if (data.config !== '') {
@@ -133,7 +112,7 @@ const EditChannel = () => {
       let localModelOptions = res.data.data.map((model) => ({
         key: model.id,
         text: model.id,
-        value: model.id,
+        value: model.id
       }));
       setOriginModelOptions(localModelOptions);
       setFullModels(res.data.data.map((model) => model.id));
@@ -145,13 +124,11 @@ const EditChannel = () => {
   const fetchGroups = async () => {
     try {
       let res = await API.get(`/api/group/`);
-      setGroupOptions(
-        res.data.data.map((group) => ({
-          key: group,
-          text: group,
-          value: group,
-        }))
-      );
+      setGroupOptions(res.data.data.map((group) => ({
+        key: group,
+        text: group,
+        value: group
+      })));
     } catch (error) {
       showError(error.message);
     }
@@ -164,7 +141,7 @@ const EditChannel = () => {
         localModelOptions.push({
           key: model,
           text: model,
-          value: model,
+          value: model
         });
       }
     });
@@ -186,32 +163,25 @@ const EditChannel = () => {
     if (inputs.key === '') {
       if (config.ak !== '' && config.sk !== '' && config.region !== '') {
         inputs.key = `${config.ak}|${config.sk}|${config.region}`;
-      } else if (
-        config.region !== '' &&
-        config.vertex_ai_project_id !== '' &&
-        config.vertex_ai_adc !== ''
-      ) {
+      } else if (config.region !== '' && config.vertex_ai_project_id !== '' && config.vertex_ai_adc !== '') {
         inputs.key = `${config.region}|${config.vertex_ai_project_id}|${config.vertex_ai_adc}`;
       }
     }
     if (!isEdit && (inputs.name === '' || inputs.key === '')) {
-      showInfo(t('channel.edit.messages.name_required'));
+      showInfo('请填写渠道名称和渠道密钥！');
       return;
     }
     if (inputs.type !== 43 && inputs.models.length === 0) {
-      showInfo(t('channel.edit.messages.models_required'));
+      showInfo('请至少选择一个模型！');
       return;
     }
     if (inputs.model_mapping !== '' && !verifyJSON(inputs.model_mapping)) {
-      showInfo(t('channel.edit.messages.model_mapping_invalid'));
+      showInfo('模型映射必须是合法的 JSON 格式！');
       return;
     }
-    let localInputs = { ...inputs };
+    let localInputs = {...inputs};
     if (localInputs.base_url && localInputs.base_url.endsWith('/')) {
-      localInputs.base_url = localInputs.base_url.slice(
-        0,
-        localInputs.base_url.length - 1
-      );
+      localInputs.base_url = localInputs.base_url.slice(0, localInputs.base_url.length - 1);
     }
     if (localInputs.type === 3 && localInputs.other === '') {
       localInputs.other = '2024-03-01-preview';
@@ -221,19 +191,16 @@ const EditChannel = () => {
     localInputs.group = localInputs.groups.join(',');
     localInputs.config = JSON.stringify(config);
     if (isEdit) {
-      res = await API.put(`/api/channel/`, {
-        ...localInputs,
-        id: parseInt(channelId),
-      });
+      res = await API.put(`/api/channel/`, { ...localInputs, id: parseInt(channelId) });
     } else {
       res = await API.post(`/api/channel/`, localInputs);
     }
     const { success, message } = res.data;
     if (success) {
       if (isEdit) {
-        showSuccess(t('channel.edit.messages.update_success'));
+        showSuccess('渠道更新成功！');
       } else {
-        showSuccess(t('channel.edit.messages.create_success'));
+        showSuccess('渠道创建成功！');
         setInputs(originInputs);
       }
     } else {
@@ -250,9 +217,9 @@ const EditChannel = () => {
     localModelOptions.push({
       key: customModel,
       text: customModel,
-      value: customModel,
+      value: customModel
     });
-    setModelOptions((modelOptions) => {
+    setModelOptions(modelOptions => {
       return [...modelOptions, ...localModelOptions];
     });
     setCustomModel('');
@@ -260,74 +227,34 @@ const EditChannel = () => {
   };
 
   return (
-    <div className='dashboard-container'>
-      <Card fluid className='chart-card'>
-        <Card.Content>
-          <Card.Header className='header'>
-            {isEdit
-              ? t('channel.edit.title_edit')
-              : t('channel.edit.title_create')}
-          </Card.Header>
-          <Form loading={loading} autoComplete='new-password'>
-            <Form.Field>
-              <Form.Select
-                label={t('channel.edit.type')}
-                name='type'
-                required
-                search
-                options={CHANNEL_OPTIONS}
-                value={inputs.type}
-                onChange={handleInputChange}
-              />
-            </Form.Field>
-            <Form.Field>
-              <Form.Input
-                label={t('channel.edit.name')}
-                name='name'
-                placeholder={t('channel.edit.name_placeholder')}
-                onChange={handleInputChange}
-                value={inputs.name}
-                required
-              />
-            </Form.Field>
-            <Form.Field>
-              <Form.Dropdown
-                label={t('channel.edit.group')}
-                placeholder={t('channel.edit.group_placeholder')}
-                name='groups'
-                required
-                fluid
-                multiple
-                selection
-                allowAdditions
-                additionLabel={t('channel.edit.group_addition')}
-                onChange={handleInputChange}
-                value={inputs.groups}
-                autoComplete='new-password'
-                options={groupOptions}
-              />
-            </Form.Field>
-
-            {/* Azure OpenAI specific fields */}
-            {inputs.type === 3 && (
+    <>
+      <Segment loading={loading}>
+        <Header as='h3'>{isEdit ? '更新渠道信息' : '创建新的渠道'}</Header>
+        <Form autoComplete='new-password'>
+          <Form.Field>
+            <Form.Select
+              label='类型'
+              name='type'
+              required
+              search
+              options={CHANNEL_OPTIONS}
+              value={inputs.type}
+              onChange={handleInputChange}
+            />
+          </Form.Field>
+          {
+            inputs.type === 3 && (
               <>
                 <Message>
-                  注意，<strong>模型部署名称必须和模型名称保持一致</strong>
-                  ，因为 One API 会把请求体中的 model
-                  参数替换为你的部署名称（模型名称中的点会被剔除），
-                  <a
-                    target='_blank'
-                    href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'
-                  >
-                    图片演示
-                  </a>
-                  。
+                  注意，<strong>模型部署名称必须和模型名称保持一致</strong>，因为 One API 会把请求体中的 model
+                  参数替换为你的部署名称（模型名称中的点会被剔除），<a target='_blank'
+                                                                    href='https://github.com/songquanpeng/one-api/issues/133?notification_referrer_id=NT_kwDOAmJSYrM2NjIwMzI3NDgyOjM5OTk4MDUw#issuecomment-1571602271'>图片演示</a>。
                 </Message>
                 <Form.Field>
                   <Form.Input
                     label='AZURE_OPENAI_ENDPOINT'
                     name='base_url'
-                    placeholder='请输入 AZURE_OPENAI_ENDPOINT，例如：https://docs-test-001.openai.azure.com'
+                    placeholder={'请输入 AZURE_OPENAI_ENDPOINT，例如：https://docs-test-001.openai.azure.com'}
                     onChange={handleInputChange}
                     value={inputs.base_url}
                     autoComplete='new-password'
@@ -337,85 +264,119 @@ const EditChannel = () => {
                   <Form.Input
                     label='默认 API 版本'
                     name='other'
-                    placeholder='请输入默认 API 版本，例如：2024-03-01-preview，该配置可以被实际的请求查询参数所覆盖'
+                    placeholder={'请输入默认 API 版本，例如：2024-03-01-preview，该配置可以被实际的请求查询参数所覆盖'}
                     onChange={handleInputChange}
                     value={inputs.other}
                     autoComplete='new-password'
                   />
                 </Form.Field>
               </>
-            )}
-
-            {/* Custom base URL field */}
-            {inputs.type === 8 && (
+            )
+          }
+          {
+            inputs.type === 8 && (
               <Form.Field>
                 <Form.Input
-                  label={t('channel.edit.base_url')}
+                  label='Base URL'
                   name='base_url'
-                  placeholder={t('channel.edit.base_url_placeholder')}
+                  placeholder={'请输入自定义渠道的 Base URL，例如：https://openai.justsong.cn'}
                   onChange={handleInputChange}
                   value={inputs.base_url}
                   autoComplete='new-password'
                 />
               </Form.Field>
-            )}
-
-            {inputs.type === 18 && (
+            )
+          }
+          <Form.Field>
+            <Form.Input
+              label='名称'
+              required
+              name='name'
+              placeholder={'请为渠道命名'}
+              onChange={handleInputChange}
+              value={inputs.name}
+              autoComplete='new-password'
+            />
+          </Form.Field>
+          <Form.Field>
+            <Form.Dropdown
+              label='分组'
+              placeholder={'请选择可以使用该渠道的分组'}
+              name='groups'
+              required
+              fluid
+              multiple
+              selection
+              allowAdditions
+              additionLabel={'请在系统设置页面编辑分组倍率以添加新的分组：'}
+              onChange={handleInputChange}
+              value={inputs.groups}
+              autoComplete='new-password'
+              options={groupOptions}
+            />
+          </Form.Field>
+          {
+            inputs.type === 18 && (
               <Form.Field>
                 <Form.Input
-                  label={t('channel.edit.spark_version')}
+                  label='模型版本'
                   name='other'
-                  placeholder={t('channel.edit.spark_version_placeholder')}
+                  placeholder={'请输入星火大模型版本，注意是接口地址中的版本号，例如：v2.1'}
                   onChange={handleInputChange}
                   value={inputs.other}
                   autoComplete='new-password'
                 />
               </Form.Field>
-            )}
-            {inputs.type === 21 && (
+            )
+          }
+          {
+            inputs.type === 21 && (
               <Form.Field>
                 <Form.Input
-                  label={t('channel.edit.knowledge_id')}
+                  label='知识库 ID'
                   name='other'
-                  placeholder={t('channel.edit.knowledge_id_placeholder')}
+                  placeholder={'请输入知识库 ID，例如：123456'}
                   onChange={handleInputChange}
                   value={inputs.other}
                   autoComplete='new-password'
                 />
               </Form.Field>
-            )}
-            {inputs.type === 17 && (
+            )
+          }
+          {
+            inputs.type === 17 && (
               <Form.Field>
                 <Form.Input
-                  label={t('channel.edit.plugin_param')}
+                  label='插件参数'
                   name='other'
-                  placeholder={t('channel.edit.plugin_param_placeholder')}
+                  placeholder={'请输入插件参数，即 X-DashScope-Plugin 请求头的取值'}
                   onChange={handleInputChange}
                   value={inputs.other}
                   autoComplete='new-password'
                 />
               </Form.Field>
-            )}
-            {inputs.type === 34 && (
-              <Message>{t('channel.edit.coze_notice')}</Message>
-            )}
-            {inputs.type === 40 && (
+            )
+          }
+          {
+            inputs.type === 34 && (
               <Message>
-                {t('channel.edit.douban_notice')}
-                <a
-                  target='_blank'
-                  href='https://console.volcengine.com/ark/region:ark+cn-beijing/endpoint'
-                >
-                  {t('channel.edit.douban_notice_link')}
-                </a>
-                {t('channel.edit.douban_notice_2')}
+                对于 Coze 而言，模型名称即 Bot ID，你可以添加一个前缀 `bot-`，例如：`bot-123456`。
               </Message>
-            )}
-            {inputs.type !== 43 && (
+            )
+          }
+          {
+            inputs.type === 40 && (
+              <Message>
+                对于豆包而言，需要手动去 <a target="_blank" href="https://console.volcengine.com/ark/region:ark+cn-beijing/endpoint">模型推理页面</a> 创建推理接入点，以接入点名称作为模型名称，例如：`ep-20240608051426-tkxvl`。
+              </Message>
+            )
+          }
+          {
+            inputs.type !== 43 && (
               <Form.Field>
                 <Form.Dropdown
-                  label={t('channel.edit.models')}
-                  placeholder={t('channel.edit.models_placeholder')}
+                  label='模型'
+                  placeholder={'请选择该渠道所支持的模型'}
                   name='models'
                   required
                   fluid
@@ -431,46 +392,25 @@ const EditChannel = () => {
                   options={modelOptions}
                 />
               </Form.Field>
-            )}
-            {inputs.type !== 43 && (
+            )
+          }
+          {
+            inputs.type !== 43 && (
               <div style={{ lineHeight: '40px', marginBottom: '12px' }}>
-                <Button
-                  type={'button'}
-                  onClick={() => {
-                    handleInputChange(null, {
-                      name: 'models',
-                      value: basicModels,
-                    });
-                  }}
-                >
-                  {t('channel.edit.buttons.fill_models')}
-                </Button>
-                <Button
-                  type={'button'}
-                  onClick={() => {
-                    handleInputChange(null, {
-                      name: 'models',
-                      value: fullModels,
-                    });
-                  }}
-                >
-                  {t('channel.edit.buttons.fill_all')}
-                </Button>
-                <Button
-                  type={'button'}
-                  onClick={() => {
-                    handleInputChange(null, { name: 'models', value: [] });
-                  }}
-                >
-                  {t('channel.edit.buttons.clear')}
-                </Button>
+                <Button type={'button'} onClick={() => {
+                  handleInputChange(null, { name: 'models', value: basicModels });
+                }}>填入相关模型</Button>
+                <Button type={'button'} onClick={() => {
+                  handleInputChange(null, { name: 'models', value: fullModels });
+                }}>填入所有模型</Button>
+                <Button type={'button'} onClick={() => {
+                  handleInputChange(null, { name: 'models', value: [] });
+                }}>清除所有模型</Button>
                 <Input
                   action={
-                    <Button type={'button'} onClick={addCustomModel}>
-                      {t('channel.edit.buttons.add_custom')}
-                    </Button>
+                    <Button type={'button'} onClick={addCustomModel}>填入</Button>
                   }
-                  placeholder={t('channel.edit.buttons.custom_placeholder')}
+                  placeholder='输入自定义模型名称'
                   value={customModel}
                   onChange={(e, { value }) => {
                     setCustomModel(value);
@@ -483,48 +423,43 @@ const EditChannel = () => {
                   }}
                 />
               </div>
-            )}
-            {inputs.type !== 43 && (
-              <>
-                <Form.Field>
-                  <Form.TextArea
-                    label={t('channel.edit.model_mapping')}
-                    placeholder={`${t(
-                      'channel.edit.model_mapping_placeholder'
-                    )}\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`}
-                    name='model_mapping'
-                    onChange={handleInputChange}
-                    value={inputs.model_mapping}
-                    style={{
-                      minHeight: 150,
-                      fontFamily: 'JetBrains Mono, Consolas',
-                    }}
-                    autoComplete='new-password'
-                  />
-                </Form.Field>
-                <Form.Field>
-                  <Form.TextArea
-                    label={t('channel.edit.system_prompt')}
-                    placeholder={t('channel.edit.system_prompt_placeholder')}
-                    name='system_prompt'
-                    onChange={handleInputChange}
-                    value={inputs.system_prompt}
-                    style={{
-                      minHeight: 150,
-                      fontFamily: 'JetBrains Mono, Consolas',
-                    }}
-                    autoComplete='new-password'
-                  />
-                </Form.Field>
+            )
+          }
+          {
+          inputs.type !== 43 && (<>
+              <Form.Field>
+                <Form.TextArea
+                  label='模型重定向'
+                  placeholder={`此项可选，用于修改请求体中的模型名称，为一个 JSON 字符串，键为请求中模型名称，值为要替换的模型名称，例如：\n${JSON.stringify(MODEL_MAPPING_EXAMPLE, null, 2)}`}
+                  name='model_mapping'
+                  onChange={handleInputChange}
+                  value={inputs.model_mapping}
+                  style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
+                  autoComplete='new-password'
+                />
+              </Form.Field>
+            <Form.Field>
+                <Form.TextArea
+                  label='系统提示词'
+                  placeholder={`此项可选，用于强制设置给定的系统提示词，请配合自定义模型 & 模型重定向使用，首先创建一个唯一的自定义模型名称并在上面填入，之后将该自定义模型重定向映射到该渠道一个原生支持的模型`}
+                  name='system_prompt'
+                  onChange={handleInputChange}
+                  value={inputs.system_prompt}
+                  style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
+                  autoComplete='new-password'
+                />
+              </Form.Field>
               </>
-            )}
-            {inputs.type === 33 && (
+            )
+          }
+          {
+            inputs.type === 33 && (
               <Form.Field>
                 <Form.Input
                   label='Region'
                   name='region'
                   required
-                  placeholder={t('channel.edit.aws_region_placeholder')}
+                  placeholder={'region，e.g. us-west-2'}
                   onChange={handleConfigChange}
                   value={config.region}
                   autoComplete=''
@@ -533,7 +468,7 @@ const EditChannel = () => {
                   label='AK'
                   name='ak'
                   required
-                  placeholder={t('channel.edit.aws_ak_placeholder')}
+                  placeholder={'AWS IAM Access Key'}
                   onChange={handleConfigChange}
                   value={config.ak}
                   autoComplete=''
@@ -542,137 +477,141 @@ const EditChannel = () => {
                   label='SK'
                   name='sk'
                   required
-                  placeholder={t('channel.edit.aws_sk_placeholder')}
+                  placeholder={'AWS IAM Secret Key'}
                   onChange={handleConfigChange}
                   value={config.sk}
                   autoComplete=''
                 />
               </Form.Field>
-            )}
-            {inputs.type === 42 && (
+            )
+          }
+          {
+            inputs.type === 42 && (
               <Form.Field>
                 <Form.Input
                   label='Region'
                   name='region'
                   required
-                  placeholder={t('channel.edit.vertex_region_placeholder')}
+                  placeholder={'Vertex AI Region.g. us-east5'}
                   onChange={handleConfigChange}
                   value={config.region}
                   autoComplete=''
                 />
                 <Form.Input
-                  label={t('channel.edit.vertex_project_id')}
+                  label='Vertex AI Project ID'
                   name='vertex_ai_project_id'
                   required
-                  placeholder={t('channel.edit.vertex_project_id_placeholder')}
+                  placeholder={'Vertex AI Project ID'}
                   onChange={handleConfigChange}
                   value={config.vertex_ai_project_id}
                   autoComplete=''
                 />
                 <Form.Input
-                  label={t('channel.edit.vertex_credentials')}
+                  label='Google Cloud Application Default Credentials JSON'
                   name='vertex_ai_adc'
                   required
-                  placeholder={t('channel.edit.vertex_credentials_placeholder')}
+                  placeholder={'Google Cloud Application Default Credentials JSON'}
                   onChange={handleConfigChange}
                   value={config.vertex_ai_adc}
                   autoComplete=''
                 />
               </Form.Field>
-            )}
-            {inputs.type === 34 && (
+            )
+          }
+          {
+            inputs.type === 34 && (
               <Form.Input
-                label={t('channel.edit.user_id')}
+                label='User ID'
                 name='user_id'
                 required
-                placeholder={t('channel.edit.user_id_placeholder')}
+                placeholder={'生成该密钥的用户 ID'}
                 onChange={handleConfigChange}
                 value={config.user_id}
                 autoComplete=''
+              />)
+          }
+          {
+            inputs.type !== 33 && inputs.type !== 42 && (batch ? <Form.Field>
+              <Form.TextArea
+                label='密钥'
+                name='key'
+                required
+                placeholder={'请输入密钥，一行一个'}
+                onChange={handleInputChange}
+                value={inputs.key}
+                style={{ minHeight: 150, fontFamily: 'JetBrains Mono, Consolas' }}
+                autoComplete='new-password'
               />
-            )}
-            {inputs.type !== 33 &&
-              inputs.type !== 42 &&
-              (batch ? (
-                <Form.Field>
-                  <Form.TextArea
-                    label={t('channel.edit.key')}
-                    name='key'
-                    required
-                    placeholder={t('channel.edit.batch_placeholder')}
-                    onChange={handleInputChange}
-                    value={inputs.key}
-                    style={{
-                      minHeight: 150,
-                      fontFamily: 'JetBrains Mono, Consolas',
-                    }}
-                    autoComplete='new-password'
-                  />
-                </Form.Field>
-              ) : (
-                <Form.Field>
-                  <Form.Input
-                    label={t('channel.edit.key')}
-                    name='key'
-                    required
-                    placeholder={type2secretPrompt(inputs.type, t)}
-                    onChange={handleInputChange}
-                    value={inputs.key}
-                    autoComplete='new-password'
-                  />
-                </Form.Field>
-              ))}
-            {inputs.type !== 33 && !isEdit && (
+            </Form.Field> : <Form.Field>
+              <Form.Input
+                label='密钥'
+                name='key'
+                required
+                placeholder={type2secretPrompt(inputs.type)}
+                onChange={handleInputChange}
+                value={inputs.key}
+                autoComplete='new-password'
+              />
+            </Form.Field>)
+          }
+          {
+            inputs.type === 37 && (
+              <Form.Field>
+                <Form.Input
+                  label='Account ID'
+                  name='user_id'
+                  required
+                  placeholder={'请输入 Account ID，例如：d8d7c61dbc334c32d3ced580e4bf42b4'}
+                  onChange={handleConfigChange}
+                  value={config.user_id}
+                  autoComplete=''
+                />
+              </Form.Field>
+            )
+          }
+          {
+            inputs.type !== 33 && !isEdit && (
               <Form.Checkbox
                 checked={batch}
-                label={t('channel.edit.batch')}
+                label='批量创建'
                 name='batch'
                 onChange={() => setBatch(!batch)}
               />
-            )}
-            {inputs.type !== 3 &&
-              inputs.type !== 33 &&
-              inputs.type !== 8 &&
-              inputs.type !== 22 && (
-                <Form.Field>
-                  <Form.Input
-                    label={t('channel.edit.base_url')}
-                    name='base_url'
-                    placeholder={t('channel.edit.base_url_placeholder')}
-                    onChange={handleInputChange}
-                    value={inputs.base_url}
-                    autoComplete='new-password'
-                  />
-                </Form.Field>
-              )}
-            {inputs.type === 22 && (
+            )
+          }
+          {
+            inputs.type !== 3 && inputs.type !== 33 && inputs.type !== 8 && inputs.type !== 22 && (
               <Form.Field>
                 <Form.Input
-                  label='私有部署地址'
+                  label='代理'
                   name='base_url'
-                  placeholder={
-                    '请输入私有部署地址，格式为：https://fastgpt.run/api/openapi'
-                  }
+                  placeholder={'此项可选，用于通过代理站来进行 API 调用，请输入代理站地址，格式为：https://domain.com'}
                   onChange={handleInputChange}
                   value={inputs.base_url}
                   autoComplete='new-password'
                 />
               </Form.Field>
-            )}
-            <Button onClick={handleCancel}>
-              {t('channel.edit.buttons.cancel')}
-            </Button>
-            <Button
-              type={isEdit ? 'button' : 'submit'}
-              positive
-              onClick={submit}
-            >
-              {t('channel.edit.buttons.submit')}
-            </Button>
-          </Form>
-        </Card.Content>
-      </Card>
-    </div>
+            )
+          }
+          {
+            inputs.type === 22 && (
+              <Form.Field>
+                <Form.Input
+                  label='私有部署地址'
+                  name='base_url'
+                  placeholder={'请输入私有部署地址，格式为：https://fastgpt.run/api/openapi'}
+                  onChange={handleInputChange}
+                  value={inputs.base_url}
+                  autoComplete='new-password'
+                />
+              </Form.Field>
+            )
+          }
+          <Button onClick={handleCancel}>取消</Button>
+          <Button type={isEdit ? 'button' : 'submit'} positive onClick={submit}>提交</Button>
+        </Form>
+      </Segment>
+    </>
   );
 };
 

web/default/src/pages/Channel/index.js

@@ -1,21 +1,14 @@
 import React from 'react';
-import { Card } from 'semantic-ui-react';
+import { Header, Segment } from 'semantic-ui-react';
 import ChannelsTable from '../../components/ChannelsTable';
-import { useTranslation } from 'react-i18next';
 
-const Channel = () => {
-  const { t } = useTranslation();
-
-  return (
-    <div className='dashboard-container'>
-      <Card fluid className='chart-card'>
-        <Card.Content>
-          <Card.Header className='header'>{t('channel.title')}</Card.Header>
-          <ChannelsTable />
-        </Card.Content>
-      </Card>
-    </div>
-  );
-};
+const Channel = () => (
+  <>
+    <Segment>
+      <Header as='h3'>管理渠道</Header>
+      <ChannelsTable />
+    </Segment>
+  </>
+);
 
 export default Channel;

web/default/src/pages/Dashboard/Dashboard.css

@@ -1,109 +0,0 @@
-.dashboard-container {
-    padding: 20px 24px 40px;
-    background-color: #ffffff;
-    margin-top: -15px; /* 减小与导航栏的间距 */
-    max-width: 1600px;        /* 设置最大宽度 */
-    margin-left: auto;        /* 水平居中 */
-    margin-right: auto;
-}
-
-.stat-card {
-    background: linear-gradient(135deg, #2185d0 0%, #1678c2 100%) !important;
-    color: white !important;
-    box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1) !important;
-    transition: transform 0.2s ease !important;
-    margin-bottom: 1rem !important;
-}
-
-.stat-card:hover {
-    transform: translateY(-5px);
-}
-
-.stat-card .statistic {
-    color: white !important;
-}
-
-.charts-grid {
-    margin-bottom: 1rem !important;
-}
-
-.charts-grid .column {
-    padding: 0.5rem !important;
-}
-
-.chart-card {
-    height: 100%;
-    box-shadow: 0 2px 12px rgba(0, 0, 0, 0.04) !important;
-    border: none !important;
-    border-radius: 16px !important;
-    padding-top: 8px!important;
-}
-
-.chart-container {
-    margin-top: 2px;
-    padding: 16px;
-    background-color: white;
-    border-radius: 12px;
-}
-
-.ui.card > .content > .header {
-    color: #2B3674;
-    font-size: 1.2em;
-    margin-bottom: 15px;
-    display: flex;
-    justify-content: space-between;
-    align-items: center;
-    font-weight: 600;
-    gap: 12px; /* 增加标题和数值之间的间距 */
-}
-
-.stat-value {
-    color: #4318FF;
-    font-weight: bold;
-    font-size: 1.1em;
-    background: rgba(67, 24, 255, 0.1);
-    padding: 4px 12px;
-    border-radius: 8px;
-    white-space: nowrap; /* 防止数值换行 */
-    margin-left: 16px;
-}
-
-/* 优化图表响应式布局 */
-@media (max-width: 768px) {
-    .dashboard-container {
-        padding: 10px 16px;   /* 移动端也相应减小内边距 */
-        max-width: 100%;      /* 移动端占满全宽 */
-    }
-    
-    .chart-container {
-        padding: 12px;
-    }
-    
-    .charts-grid .column {
-        padding: 0.25rem !important;
-    }
-}
-
-/* 设置页面的 Tab 样式 */
-.settings-tab {
-    margin-top: 1rem !important;
-    border-bottom: none !important;
-}
-
-.settings-tab .item {
-    color: #2B3674 !important;
-    font-weight: 500 !important;
-    padding: 0.8rem 1.2rem !important;
-}
-
-.settings-tab .active.item {
-    color: #4318FF !important;
-    font-weight: 600 !important;
-    border-color: #4318FF !important;
-}
-
-.ui.tab.segment {
-    border: none !important;
-    box-shadow: none !important;
-    padding: 1rem 0 !important;
-} 

web/default/src/pages/Dashboard/index.js

@@ -1,454 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Card, Grid, Header, Segment, Statistic } from 'semantic-ui-react';
-import { API, showError } from '../../helpers';
-import moment from 'moment';
-import {
-  LineChart,
-  Line,
-  XAxis,
-  YAxis,
-  CartesianGrid,
-  Tooltip,
-  ResponsiveContainer,
-  BarChart,
-  Bar,
-  Legend,
-} from 'recharts';
-import axios from 'axios';
-import './Dashboard.css';
-
-// 在 Dashboard 组件内添加自定义配置
-const chartConfig = {
-  lineChart: {
-    style: {
-      background: '#fff',
-      borderRadius: '8px',
-    },
-    line: {
-      strokeWidth: 2,
-      dot: false,
-      activeDot: { r: 4 },
-    },
-    grid: {
-      vertical: false,
-      horizontal: true,
-      opacity: 0.1,
-    },
-  },
-  colors: {
-    requests: '#4318FF',
-    quota: '#00B5D8',
-    tokens: '#6C63FF',
-  },
-  barColors: [
-    '#4318FF', // 深紫色
-    '#00B5D8', // 青色
-    '#6C63FF', // 紫色
-    '#05CD99', // 绿色
-    '#FFB547', // 橙色
-    '#FF5E7D', // 粉色
-    '#41B883', // 翠绿
-    '#7983FF', // 淡紫
-    '#FF8F6B', // 珊瑚色
-    '#49BEFF', // 天蓝
-  ],
-};
-
-const Dashboard = () => {
-  const { t } = useTranslation();
-  const [data, setData] = useState([]);
-  const [summaryData, setSummaryData] = useState({
-    todayRequests: 0,
-    todayQuota: 0,
-    todayTokens: 0,
-  });
-
-  useEffect(() => {
-    fetchDashboardData();
-  }, []);
-
-  const fetchDashboardData = async () => {
-    try {
-      const response = await axios.get('/api/user/dashboard');
-      if (response.data.success) {
-        const dashboardData = response.data.data || [];
-        setData(dashboardData);
-        calculateSummary(dashboardData);
-      }
-    } catch (error) {
-      console.error('Failed to fetch dashboard data:', error);
-      setData([]);
-      calculateSummary([]);
-    }
-  };
-
-  const calculateSummary = (dashboardData) => {
-    if (!Array.isArray(dashboardData) || dashboardData.length === 0) {
-      setSummaryData({
-        todayRequests: 0,
-        todayQuota: 0,
-        todayTokens: 0,
-      });
-      return;
-    }
-
-    const today = new Date().toISOString().split('T')[0];
-    const todayData = dashboardData.filter((item) => item.Day === today);
-
-    const summary = {
-      todayRequests: todayData.reduce(
-        (sum, item) => sum + item.RequestCount,
-        0
-      ),
-      todayQuota:
-        todayData.reduce((sum, item) => sum + item.Quota, 0) / 1000000,
-      todayTokens: todayData.reduce(
-        (sum, item) => sum + item.PromptTokens + item.CompletionTokens,
-        0
-      ),
-    };
-
-    setSummaryData(summary);
-  };
-
-  // 处理数据以供折线图使用，补充缺失的日期
-  const processTimeSeriesData = () => {
-    const dailyData = {};
-
-    // 获取日期范围
-    const dates = data.map((item) => item.Day);
-    const maxDate = new Date(); // 总是使用今天作为最后一天
-    let minDate =
-      dates.length > 0
-        ? new Date(Math.min(...dates.map((d) => new Date(d))))
-        : new Date();
-
-    // 确保至少显示5天的数据
-    const fiveDaysAgo = new Date();
-    fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天
-    if (minDate > fiveDaysAgo) {
-      minDate = fiveDaysAgo;
-    }
-
-    // 生成所有日期
-    for (let d = new Date(minDate); d <= maxDate; d.setDate(d.getDate() + 1)) {
-      const dateStr = d.toISOString().split('T')[0];
-      dailyData[dateStr] = {
-        date: dateStr,
-        requests: 0,
-        quota: 0,
-        tokens: 0,
-      };
-    }
-
-    // 填充实际数据
-    data.forEach((item) => {
-      dailyData[item.Day].requests += item.RequestCount;
-      dailyData[item.Day].quota += item.Quota / 1000000;
-      dailyData[item.Day].tokens += item.PromptTokens + item.CompletionTokens;
-    });
-
-    return Object.values(dailyData).sort((a, b) =>
-      a.date.localeCompare(b.date)
-    );
-  };
-
-  // 处理数据以供堆叠柱状图使用
-  const processModelData = () => {
-    const timeData = {};
-
-    // 获取日期范围
-    const dates = data.map((item) => item.Day);
-    const maxDate = new Date(); // 总是使用今天作为最后一天
-    let minDate =
-      dates.length > 0
-        ? new Date(Math.min(...dates.map((d) => new Date(d))))
-        : new Date();
-
-    // 确保至少显示5天的数据
-    const fiveDaysAgo = new Date();
-    fiveDaysAgo.setDate(fiveDaysAgo.getDate() - 4); // -4是因为包含今天
-    if (minDate > fiveDaysAgo) {
-      minDate = fiveDaysAgo;
-    }
-
-    // 生成所有日期
-    for (let d = new Date(minDate); d <= maxDate; d.setDate(d.getDate() + 1)) {
-      const dateStr = d.toISOString().split('T')[0];
-      timeData[dateStr] = {
-        date: dateStr,
-      };
-
-      // 初始化所有模型的数据为0
-      const models = [...new Set(data.map((item) => item.ModelName))];
-      models.forEach((model) => {
-        timeData[dateStr][model] = 0;
-      });
-    }
-
-    // 填充实际数据
-    data.forEach((item) => {
-      timeData[item.Day][item.ModelName] =
-        item.PromptTokens + item.CompletionTokens;
-    });
-
-    return Object.values(timeData).sort((a, b) => a.date.localeCompare(b.date));
-  };
-
-  // 获取所有唯一的模型名称
-  const getUniqueModels = () => {
-    return [...new Set(data.map((item) => item.ModelName))];
-  };
-
-  const timeSeriesData = processTimeSeriesData();
-  const modelData = processModelData();
-  const models = getUniqueModels();
-
-  // 生成随机颜色
-  const getRandomColor = (index) => {
-    return chartConfig.barColors[index % chartConfig.barColors.length];
-  };
-
-  // 添加一个日期格式化函数
-  const formatDate = (dateStr) => {
-    const date = new Date(dateStr);
-    return date.toLocaleDateString('zh-CN', {
-      month: 'numeric',
-      day: 'numeric',
-    });
-  };
-
-  // 修改所有 XAxis 配置
-  const xAxisConfig = {
-    dataKey: 'date',
-    axisLine: false,
-    tickLine: false,
-    tick: {
-      fontSize: 12,
-      fill: '#A3AED0',
-      textAnchor: 'middle', // 文本居中对齐
-    },
-    tickFormatter: formatDate,
-    interval: 0,
-    minTickGap: 5,
-    padding: { left: 30, right: 30 }, // 增加两侧的内边距，确保首尾标签完整显示
-  };
-
-  return (
-    <div className='dashboard-container'>
-      {/* 三个并排的折线图 */}
-      <Grid columns={3} stackable className='charts-grid'>
-        <Grid.Column>
-          <Card fluid className='chart-card'>
-            <Card.Content>
-              <Card.Header>
-                {t('dashboard.charts.requests.title')}
-                <span className='stat-value'>{summaryData.todayRequests}</span>
-              </Card.Header>
-              <div className='chart-container'>
-                <ResponsiveContainer
-                  width='100%'
-                  height={120}
-                  margin={{ left: 10, right: 10 }} // 调整容器边距
-                >
-                  <LineChart data={timeSeriesData}>
-                    <CartesianGrid
-                      strokeDasharray='3 3'
-                      vertical={chartConfig.lineChart.grid.vertical}
-                      horizontal={chartConfig.lineChart.grid.horizontal}
-                      opacity={chartConfig.lineChart.grid.opacity}
-                    />
-                    <XAxis {...xAxisConfig} />
-                    <YAxis hide={true} />
-                    <Tooltip
-                      contentStyle={{
-                        background: '#fff',
-                        border: 'none',
-                        borderRadius: '4px',
-                        boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
-                      }}
-                      formatter={(value) => [
-                        value,
-                        t('dashboard.charts.requests.tooltip'),
-                      ]}
-                      labelFormatter={(label) =>
-                        `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
-                      }
-                    />
-                    <Line
-                      type='monotone'
-                      dataKey='requests'
-                      stroke={chartConfig.colors.requests}
-                      strokeWidth={chartConfig.lineChart.line.strokeWidth}
-                      dot={chartConfig.lineChart.line.dot}
-                      activeDot={chartConfig.lineChart.line.activeDot}
-                    />
-                  </LineChart>
-                </ResponsiveContainer>
-              </div>
-            </Card.Content>
-          </Card>
-        </Grid.Column>
-
-        <Grid.Column>
-          <Card fluid className='chart-card'>
-            <Card.Content>
-              <Card.Header>
-                {t('dashboard.charts.quota.title')}
-                <span className='stat-value'>
-                  ${summaryData.todayQuota.toFixed(3)}
-                </span>
-              </Card.Header>
-              <div className='chart-container'>
-                <ResponsiveContainer
-                  width='100%'
-                  height={120}
-                  margin={{ left: 10, right: 10 }} // 调整容器边距
-                >
-                  <LineChart data={timeSeriesData}>
-                    <CartesianGrid
-                      strokeDasharray='3 3'
-                      vertical={chartConfig.lineChart.grid.vertical}
-                      horizontal={chartConfig.lineChart.grid.horizontal}
-                      opacity={chartConfig.lineChart.grid.opacity}
-                    />
-                    <XAxis {...xAxisConfig} />
-                    <YAxis hide={true} />
-                    <Tooltip
-                      contentStyle={{
-                        background: '#fff',
-                        border: 'none',
-                        borderRadius: '4px',
-                        boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
-                      }}
-                      formatter={(value) => [
-                        value,
-                        t('dashboard.charts.quota.tooltip'),
-                      ]}
-                      labelFormatter={(label) =>
-                        `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
-                      }
-                    />
-                    <Line
-                      type='monotone'
-                      dataKey='quota'
-                      stroke={chartConfig.colors.quota}
-                      strokeWidth={chartConfig.lineChart.line.strokeWidth}
-                      dot={chartConfig.lineChart.line.dot}
-                      activeDot={chartConfig.lineChart.line.activeDot}
-                    />
-                  </LineChart>
-                </ResponsiveContainer>
-              </div>
-            </Card.Content>
-          </Card>
-        </Grid.Column>
-
-        <Grid.Column>
-          <Card fluid className='chart-card'>
-            <Card.Content>
-              <Card.Header>
-                {t('dashboard.charts.tokens.title')}
-                <span className='stat-value'>{summaryData.todayTokens}</span>
-              </Card.Header>
-              <div className='chart-container'>
-                <ResponsiveContainer
-                  width='100%'
-                  height={120}
-                  margin={{ left: 10, right: 10 }} // 调整容器边距
-                >
-                  <LineChart data={timeSeriesData}>
-                    <CartesianGrid
-                      strokeDasharray='3 3'
-                      vertical={chartConfig.lineChart.grid.vertical}
-                      horizontal={chartConfig.lineChart.grid.horizontal}
-                      opacity={chartConfig.lineChart.grid.opacity}
-                    />
-                    <XAxis {...xAxisConfig} />
-                    <YAxis hide={true} />
-                    <Tooltip
-                      contentStyle={{
-                        background: '#fff',
-                        border: 'none',
-                        borderRadius: '4px',
-                        boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
-                      }}
-                      formatter={(value) => [
-                        value,
-                        t('dashboard.charts.tokens.tooltip'),
-                      ]}
-                      labelFormatter={(label) =>
-                        `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
-                      }
-                    />
-                    <Line
-                      type='monotone'
-                      dataKey='tokens'
-                      stroke={chartConfig.colors.tokens}
-                      strokeWidth={chartConfig.lineChart.line.strokeWidth}
-                      dot={chartConfig.lineChart.line.dot}
-                      activeDot={chartConfig.lineChart.line.activeDot}
-                    />
-                  </LineChart>
-                </ResponsiveContainer>
-              </div>
-            </Card.Content>
-          </Card>
-        </Grid.Column>
-      </Grid>
-
-      {/* 模型使用统计 */}
-      <Card fluid className='chart-card'>
-        <Card.Content>
-          <Card.Header>{t('dashboard.statistics.title')}</Card.Header>
-          <div className='chart-container'>
-            <ResponsiveContainer width='100%' height={300}>
-              <BarChart data={modelData}>
-                <CartesianGrid
-                  strokeDasharray='3 3'
-                  vertical={false}
-                  opacity={0.1}
-                />
-                <XAxis {...xAxisConfig} />
-                <YAxis
-                  axisLine={false}
-                  tickLine={false}
-                  tick={{ fontSize: 12, fill: '#A3AED0' }}
-                />
-                <Tooltip
-                  contentStyle={{
-                    background: '#fff',
-                    border: 'none',
-                    borderRadius: '4px',
-                    boxShadow: '0 2px 8px rgba(0,0,0,0.1)',
-                  }}
-                  labelFormatter={(label) =>
-                    `${t('dashboard.tooltip.date')}: ${formatDate(label)}`
-                  }
-                />
-                <Legend
-                  wrapperStyle={{
-                    paddingTop: '20px',
-                  }}
-                />
-                {models.map((model, index) => (
-                  <Bar
-                    key={model}
-                    dataKey={model}
-                    stackId='a'
-                    fill={getRandomColor(index)}
-                    name={model}
-                    radius={[4, 4, 0, 0]}
-                  />
-                ))}
-              </BarChart>
-            </ResponsiveContainer>
-          </div>
-        </Card.Content>
-      </Card>
-    </div>
-  );
-};
-
-export default Dashboard;

web/default/src/pages/Home/index.js

@@ -1,29 +1,24 @@
 import React, { useContext, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Card, Grid, Header } from 'semantic-ui-react';
+import { Card, Grid, Header, Segment } from 'semantic-ui-react';
 import { API, showError, showNotice, timestamp2string } from '../../helpers';
 import { StatusContext } from '../../context/Status';
 import { marked } from 'marked';
-import { UserContext } from '../../context/User';
-import { Link } from 'react-router-dom';
 
 const Home = () => {
-  const { t } = useTranslation();
   const [statusState, statusDispatch] = useContext(StatusContext);
   const [homePageContentLoaded, setHomePageContentLoaded] = useState(false);
   const [homePageContent, setHomePageContent] = useState('');
-  const [userState] = useContext(UserContext);
 
   const displayNotice = async () => {
     const res = await API.get('/api/notice');
     const { success, message, data } = res.data;
     if (success) {
       let oldNotice = localStorage.getItem('notice');
-      if (data !== oldNotice && data !== '') {
-        const htmlNotice = marked(data);
-        showNotice(htmlNotice, true);
-        localStorage.setItem('notice', data);
-      }
+        if (data !== oldNotice && data !== '') {
+            const htmlNotice = marked(data);
+            showNotice(htmlNotice, true);
+            localStorage.setItem('notice', data);
+        }
     } else {
       showError(message);
     }
@@ -42,7 +37,7 @@ const Home = () => {
       localStorage.setItem('home_page_content', content);
     } else {
       showError(message);
-      setHomePageContent(t('home.loading_failed'));
+      setHomePageContent('加载首页内容失败...');
     }
     setHomePageContentLoaded(true);
   };
@@ -56,242 +51,81 @@ const Home = () => {
     displayNotice().then();
     displayHomePageContent().then();
   }, []);
-
   return (
     <>
-      {homePageContentLoaded && homePageContent === '' ? (
-        <div className='dashboard-container'>
-          <Card fluid className='chart-card'>
-            <Card.Content>
-              <Card.Header className='header'>
-                {t('home.welcome.title')}
-              </Card.Header>
-              <Card.Description style={{ lineHeight: '1.6' }}>
-                <p>{t('home.welcome.description')}</p>
-                {!userState.user && <p>{t('home.welcome.login_notice')}</p>}
-              </Card.Description>
-            </Card.Content>
-          </Card>
-          <Card fluid className='chart-card'>
-            <Card.Content>
-              <Card.Header>
-                <Header as='h3'>{t('home.system_status.title')}</Header>
-              </Card.Header>
-              <Grid columns={2} stackable>
-                <Grid.Column>
-                  <Card
-                    fluid
-                    className='chart-card'
-                    style={{ boxShadow: '0 1px 3px rgba(0,0,0,0.12)' }}
-                  >
-                    <Card.Content>
-                      <Card.Header>
-                        <Header as='h3' style={{ color: '#444' }}>
-                          {t('home.system_status.info.title')}
-                        </Header>
-                      </Card.Header>
-                      <Card.Description
-                        style={{ lineHeight: '2', marginTop: '1em' }}
-                      >
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
+      {
+        homePageContentLoaded && homePageContent === '' ? <>
+          <Segment>
+            <Header as='h3'>系统状况</Header>
+            <Grid columns={2} stackable>
+              <Grid.Column>
+                <Card fluid>
+                  <Card.Content>
+                    <Card.Header>系统信息</Card.Header>
+                    <Card.Meta>系统信息总览</Card.Meta>
+                    <Card.Description>
+                      <p>名称：{statusState?.status?.system_name}</p>
+                      <p>版本：{statusState?.status?.version ? statusState?.status?.version : "unknown"}</p>
+                      <p>
+                        源码：
+                        <a
+                          href='https://github.com/songquanpeng/one-api'
+                          target='_blank'
                         >
-                          <i className='info circle icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.info.name')}
-                          </span>
-                          <span>{statusState?.status?.system_name}</span>
-                        </p>
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
-                        >
-                          <i className='code branch icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.info.version')}
-                          </span>
-                          <span>
-                            {statusState?.status?.version || 'unknown'}
-                          </span>
-                        </p>
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
-                        >
-                          <i className='github icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.info.source')}
-                          </span>
-                          <a
-                            href='https://github.com/songquanpeng/one-api'
-                            target='_blank'
-                            style={{ color: '#2185d0' }}
-                          >
-                            {t('home.system_status.info.source_link')}
-                          </a>
-                        </p>
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
-                        >
-                          <i className='clock outline icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.info.start_time')}
-                          </span>
-                          <span>{getStartTimeString()}</span>
-                        </p>
-                      </Card.Description>
-                    </Card.Content>
-                  </Card>
-                </Grid.Column>
-
-                <Grid.Column>
-                  <Card
-                    fluid
-                    className='chart-card'
-                    style={{ boxShadow: '0 1px 3px rgba(0,0,0,0.12)' }}
-                  >
-                    <Card.Content>
-                      <Card.Header>
-                        <Header as='h3' style={{ color: '#444' }}>
-                          {t('home.system_status.config.title')}
-                        </Header>
-                      </Card.Header>
-                      <Card.Description
-                        style={{ lineHeight: '2', marginTop: '1em' }}
-                      >
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
-                        >
-                          <i className='envelope icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.config.email_verify')}
-                          </span>
-                          <span
-                            style={{
-                              color: statusState?.status?.email_verification
-                                ? '#21ba45'
-                                : '#db2828',
-                              fontWeight: '500',
-                            }}
-                          >
-                            {statusState?.status?.email_verification
-                              ? t('home.system_status.config.enabled')
-                              : t('home.system_status.config.disabled')}
-                          </span>
-                        </p>
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
-                        >
-                          <i className='github icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.config.github_oauth')}
-                          </span>
-                          <span
-                            style={{
-                              color: statusState?.status?.github_oauth
-                                ? '#21ba45'
-                                : '#db2828',
-                              fontWeight: '500',
-                            }}
-                          >
-                            {statusState?.status?.github_oauth
-                              ? t('home.system_status.config.enabled')
-                              : t('home.system_status.config.disabled')}
-                          </span>
-                        </p>
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
-                        >
-                          <i className='wechat icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.config.wechat_login')}
-                          </span>
-                          <span
-                            style={{
-                              color: statusState?.status?.wechat_login
-                                ? '#21ba45'
-                                : '#db2828',
-                              fontWeight: '500',
-                            }}
-                          >
-                            {statusState?.status?.wechat_login
-                              ? t('home.system_status.config.enabled')
-                              : t('home.system_status.config.disabled')}
-                          </span>
-                        </p>
-                        <p
-                          style={{
-                            display: 'flex',
-                            alignItems: 'center',
-                            gap: '0.5em',
-                          }}
-                        >
-                          <i className='shield alternate icon'></i>
-                          <span style={{ fontWeight: 'bold' }}>
-                            {t('home.system_status.config.turnstile')}
-                          </span>
-                          <span
-                            style={{
-                              color: statusState?.status?.turnstile_check
-                                ? '#21ba45'
-                                : '#db2828',
-                              fontWeight: '500',
-                            }}
-                          >
-                            {statusState?.status?.turnstile_check
-                              ? t('home.system_status.config.enabled')
-                              : t('home.system_status.config.disabled')}
-                          </span>
-                        </p>
-                      </Card.Description>
-                    </Card.Content>
-                  </Card>
-                </Grid.Column>
-              </Grid>
-            </Card.Content>
-          </Card>
-        </div>
-      ) : (
-        <>
-          {homePageContent.startsWith('https://') ? (
-            <iframe
+                          https://github.com/songquanpeng/one-api
+                        </a>
+                      </p>
+                      <p>启动时间：{getStartTimeString()}</p>
+                    </Card.Description>
+                  </Card.Content>
+                </Card>
+              </Grid.Column>
+              <Grid.Column>
+                <Card fluid>
+                  <Card.Content>
+                    <Card.Header>系统配置</Card.Header>
+                    <Card.Meta>系统配置总览</Card.Meta>
+                    <Card.Description>
+                      <p>
+                        邮箱验证：
+                        {statusState?.status?.email_verification === true
+                          ? '已启用'
+                          : '未启用'}
+                      </p>
+                      <p>
+                        GitHub 身份验证：
+                        {statusState?.status?.github_oauth === true
+                          ? '已启用'
+                          : '未启用'}
+                      </p>
+                      <p>
+                        微信身份验证：
+                        {statusState?.status?.wechat_login === true
+                          ? '已启用'
+                          : '未启用'}
+                      </p>
+                      <p>
+                        Turnstile 用户校验：
+                        {statusState?.status?.turnstile_check === true
+                          ? '已启用'
+                          : '未启用'}
+                      </p>
+                    </Card.Description>
+                  </Card.Content>
+                </Card>
+              </Grid.Column>
+            </Grid>
+          </Segment>
+        </> : <>
+          {
+            homePageContent.startsWith('https://') ? <iframe
               src={homePageContent}
               style={{ width: '100%', height: '100vh', border: 'none' }}
-            />
-          ) : (
-            <div
-              style={{ fontSize: 'larger' }}
-              dangerouslySetInnerHTML={{ __html: homePageContent }}
-            ></div>
-          )}
+            /> : <div style={{ fontSize: 'larger' }} dangerouslySetInnerHTML={{ __html: homePageContent }}></div>
+          }
         </>
-      )}
+      }
+
     </>
   );
 };

web/default/src/pages/Log/index.js

@@ -1,21 +1,11 @@
 import React from 'react';
-import { Card } from 'semantic-ui-react';
-import { useTranslation } from 'react-i18next';
+import { Header, Segment } from 'semantic-ui-react';
 import LogsTable from '../../components/LogsTable';
 
-const Log = () => {
-  const { t } = useTranslation();
-  
-  return (
-    <div className='dashboard-container'>
-      <Card fluid className='chart-card'>
-        <Card.Content>
-          <Card.Header className='header'>{t('log.title')}</Card.Header>
-          <LogsTable />
-        </Card.Content>
-      </Card>
-    </div>
-  );
-};
+const Token = () => (
+  <>
+    <LogsTable />
+  </>
+);
 
-export default Log;
+export default Token;

web/default/src/pages/Redemption/EditRedemption.js

@@ -1,12 +1,10 @@
 import React, { useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
-import { Button, Form, Card } from 'semantic-ui-react';
+import { Button, Form, Header, Segment } from 'semantic-ui-react';
 import { useParams, useNavigate } from 'react-router-dom';
 import { API, downloadTextAsFile, showError, showSuccess } from '../../helpers';
 import { renderQuota, renderQuotaWithPrompt } from '../../helpers/render';
 
 const EditRedemption = () => {
-  const { t } = useTranslation();
   const params = useParams();
   const navigate = useNavigate();
   const redemptionId = params.id;
@@ -15,7 +13,7 @@ const EditRedemption = () => {
   const originInputs = {
     name: '',
     quota: 100000,
-    count: 1,
+    count: 1
   };
   const [inputs, setInputs] = useState(originInputs);
   const { name, quota, count } = inputs;
@@ -23,7 +21,7 @@ const EditRedemption = () => {
   const handleCancel = () => {
     navigate('/redemption');
   };
-
+  
   const handleInputChange = (e, { name, value }) => {
     setInputs((inputs) => ({ ...inputs, [name]: value }));
   };
@@ -51,90 +49,79 @@ const EditRedemption = () => {
     localInputs.quota = parseInt(localInputs.quota);
     let res;
     if (isEdit) {
-      res = await API.put(`/api/redemption/`, {
-        ...localInputs,
-        id: parseInt(redemptionId),
-      });
+      res = await API.put(`/api/redemption/`, { ...localInputs, id: parseInt(redemptionId) });
     } else {
       res = await API.post(`/api/redemption/`, {
-        ...localInputs,
+        ...localInputs
       });
     }
     const { success, message, data } = res.data;
     if (success) {
       if (isEdit) {
-        showSuccess(t('redemption.messages.update_success'));
+        showSuccess('兑换码更新成功！');
       } else {
-        showSuccess(t('redemption.messages.create_success'));
+        showSuccess('兑换码创建成功！');
         setInputs(originInputs);
       }
     } else {
       showError(message);
     }
     if (!isEdit && data) {
-      let text = '';
+      let text = "";
       for (let i = 0; i < data.length; i++) {
-        text += data[i] + '\n';
+        text += data[i] + "\n";
       }
       downloadTextAsFile(text, `${inputs.name}.txt`);
     }
   };
 
   return (
-    <div className='dashboard-container'>
-      <Card fluid className='chart-card'>
-        <Card.Content>
-          <Card.Header className='header'>
-            {isEdit ? t('redemption.edit.title_edit') : t('redemption.edit.title_create')}
-          </Card.Header>
-          <Form loading={loading} autoComplete='new-password'>
-            <Form.Field>
-              <Form.Input
-                label={t('redemption.edit.name')}
-                name='name'
-                placeholder={t('redemption.edit.name_placeholder')}
-                onChange={handleInputChange}
-                value={name}
-                autoComplete='new-password'
-                required={!isEdit}
-              />
-            </Form.Field>
-            <Form.Field>
-              <Form.Input
-                label={`${t('redemption.edit.quota')}${renderQuotaWithPrompt(quota, t)}`}
-                name='quota'
-                placeholder={t('redemption.edit.quota_placeholder')}
-                onChange={handleInputChange}
-                value={quota}
-                autoComplete='new-password'
-                type='number'
-              />
-            </Form.Field>
-            {!isEdit && (
-              <>
-                <Form.Field>
-                  <Form.Input
-                    label={t('redemption.edit.count')}
-                    name='count'
-                    placeholder={t('redemption.edit.count_placeholder')}
-                    onChange={handleInputChange}
-                    value={count}
-                    autoComplete='new-password'
-                    type='number'
-                  />
-                </Form.Field>
-              </>
-            )}
-            <Button positive onClick={submit}>
-              {t('redemption.edit.buttons.submit')}
-            </Button>
-            <Button onClick={handleCancel}>
-              {t('redemption.edit.buttons.cancel')}
-            </Button>
-          </Form>
-        </Card.Content>
-      </Card>
-    </div>
+    <>
+      <Segment loading={loading}>
+        <Header as='h3'>{isEdit ? '更新兑换码信息' : '创建新的兑换码'}</Header>
+        <Form autoComplete='new-password'>
+          <Form.Field>
+            <Form.Input
+              label='名称'
+              name='name'
+              placeholder={'请输入名称'}
+              onChange={handleInputChange}
+              value={name}
+              autoComplete='new-password'
+              required={!isEdit}
+            />
+          </Form.Field>
+          <Form.Field>
+            <Form.Input
+              label={`额度${renderQuotaWithPrompt(quota)}`}
+              name='quota'
+              placeholder={'请输入单个兑换码中包含的额度'}
+              onChange={handleInputChange}
+              value={quota}
+              autoComplete='new-password'
+              type='number'
+            />
+          </Form.Field>
+          {
+            !isEdit && <>
+              <Form.Field>
+                <Form.Input
+                  label='生成数量'
+                  name='count'
+                  placeholder={'请输入生成数量'}
+                  onChange={handleInputChange}
+                  value={count}
+                  autoComplete='new-password'
+                  type='number'
+                />
+              </Form.Field>
+            </>
+          }
+          <Button positive onClick={submit}>提交</Button>
+          <Button onClick={handleCancel}>取消</Button>
+        </Form>
+      </Segment>
+    </>
   );
 };