mirror of
https://gh-proxy.org/https://github.com/klinsmaya/new-api.git
synced 2026-11-08 01:17:09 +08:00
* feat(i18n): translate web console messages in the frontend and AI-client errors in the backend
Chinese text was hard-coded in API messages, stored log content, emails and
server logs, so it reached users of every interface language.
Text is now translated where its reader is:
- Web console APIs return the English source text as message_key with
message_params, and the web console translates it in all seven languages.
message keeps the English text for other API callers.
- Errors returned to AI clients, emails and notifications are translated by
the backend (en, zh-CN, zh-TW) in the language saved on the account, then
the language of the request's Accept-Language header.
- A reader who states no language still gets the original Chinese text of the
messages that were Chinese before, word for word. Gateways that use another
new-api as their upstream match that text, for example to disable a channel
whose account ran out of quota.
- Usage, top-up and system log content is stored as content_parts (key and
params) and rendered in the viewer's language. Task fail reasons and refund
reasons written by the gateway are English keys. Rows written earlier are
shown as before.
- Server logs are English.
Also:
- The saved interface language zhTW, and zh-HK, zh-MO and zh-Hant, now select
Traditional Chinese in the backend instead of Simplified Chinese.
- The built-in group descriptions are translated; descriptions an
administrator saved are shown as written.
- .agents/rules/i18n.md records the conventions. Tests in i18n/ fail on a
non-English string literal, on a web console message without translations
and on a locale key without a constant.
* feat(i18n): print server logs in Chinese when LOG_LANGUAGE asks for it
Server log lines are English by default. With LOG_LANGUAGE=zh-CN, the lines
that were Chinese before print their original Chinese text.
common.LogText formats a log line from its English format, which is also the
key of its Chinese text in common/log_text.zh-CN.json. A line without an entry
prints in English. go vet checks the arguments of every call, and
TestServerLogTexts checks that each entry still matches a call and has the
same verbs as its key.
* docs: list LOG_LANGUAGE in the docker compose example
* feat(i18n): translate every server log line and add DEFAULT_LANGUAGE
Every line the gateway prints goes through common.LogText. With
DEFAULT_LANGUAGE=zh-CN, the lines that have a Chinese text in
common/log_text.zh-CN.json print it and the others print English.
DEFAULT_LANGUAGE replaces LOG_LANGUAGE. It also sets the language of
backend messages, emails and notifications for a reader who states no
language: en, zh-CN or zh-TW, English when unset. The list of messages
that stayed Chinese for such readers is removed.
Review fixes:
- Channel test logs store the token name "Model test"; the console shows
it in the interface language.
- Task fail reasons written by the gateway are fixed sentences the console
translates. The HTTP status and the upstream detail go to the server log
when a polled task is failed.
- The auto-disable reason of a slow channel is written in DEFAULT_LANGUAGE.
Also:
- Drop the repository-scanning lint tests, the i18n rules file and its
read gate. AGENTS.md keeps the conventions in four lines.
- Payment error toasts keep their previous text and only add the
translated message key.
- Remove guards and helpers that no caller needs.
* fix(i18n): address review on language lookup, notices and error responses
- Relay requests no longer load the user a second time to find the
language: the settings TokenAuth put into the request are used as they
are, also when they hold no language.
- Upstream model update notices are rendered in each recipient's saved
language, DEFAULT_LANGUAGE when none.
- /api/usage/token and /api/log/token answer with backend-translated
messages again, with the keys and status codes used before this PR.
Their callers are scripts, not the web console.
- Webhook notifications fill {{value}} placeholders like the other
senders. Running the rendered text through Sprintf appended
%!(EXTRA ...) and broke %2F in links.
- RootUserLanguage reads the setting of the root user it already loaded.
- zh_TW and zh_HK are read as Traditional Chinese.
- Add common.ApiErrorStatus for error responses under another HTTP status
and use it where those responses were built by hand.
- Remove middleware.GetLanguage, which had no callers.
179 lines
5.8 KiB
Go
179 lines
5.8 KiB
Go
package model
|
||
|
||
import (
|
||
"math/rand"
|
||
"time"
|
||
|
||
"github.com/QuantumNous/new-api/common"
|
||
"github.com/QuantumNous/new-api/setting/operation_setting"
|
||
"gorm.io/gorm"
|
||
)
|
||
|
||
// Checkin 签到记录
|
||
type Checkin struct {
|
||
Id int `json:"id" gorm:"primaryKey;autoIncrement"`
|
||
UserId int `json:"user_id" gorm:"not null;uniqueIndex:idx_user_checkin_date"`
|
||
CheckinDate string `json:"checkin_date" gorm:"type:varchar(10);not null;uniqueIndex:idx_user_checkin_date"` // 格式: YYYY-MM-DD
|
||
QuotaAwarded int `json:"quota_awarded" gorm:"not null"`
|
||
CreatedAt int64 `json:"created_at" gorm:"bigint"`
|
||
}
|
||
|
||
// CheckinRecord 用于API返回的签到记录(不包含敏感字段)
|
||
type CheckinRecord struct {
|
||
CheckinDate string `json:"checkin_date"`
|
||
QuotaAwarded int `json:"quota_awarded"`
|
||
}
|
||
|
||
func (Checkin) TableName() string {
|
||
return "checkins"
|
||
}
|
||
|
||
// GetUserCheckinRecords 获取用户在指定日期范围内的签到记录
|
||
func GetUserCheckinRecords(userId int, startDate, endDate string) ([]Checkin, error) {
|
||
var records []Checkin
|
||
err := DB.Where("user_id = ? AND checkin_date >= ? AND checkin_date <= ?",
|
||
userId, startDate, endDate).
|
||
Order("checkin_date DESC").
|
||
Find(&records).Error
|
||
return records, err
|
||
}
|
||
|
||
// HasCheckedInToday 检查用户今天是否已签到
|
||
func HasCheckedInToday(userId int) (bool, error) {
|
||
today := time.Now().Format("2006-01-02")
|
||
var count int64
|
||
err := DB.Model(&Checkin{}).
|
||
Where("user_id = ? AND checkin_date = ?", userId, today).
|
||
Count(&count).Error
|
||
return count > 0, err
|
||
}
|
||
|
||
// UserCheckin 执行用户签到
|
||
// MySQL 和 PostgreSQL 使用事务保证原子性
|
||
// SQLite 不支持嵌套事务,使用顺序操作 + 手动回滚
|
||
func UserCheckin(userId int) (*Checkin, error) {
|
||
setting := operation_setting.GetCheckinSetting()
|
||
if !setting.Enabled {
|
||
return nil, common.NewMessage("Check-in feature is not enabled")
|
||
}
|
||
|
||
// 检查今天是否已签到
|
||
hasChecked, err := HasCheckedInToday(userId)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
if hasChecked {
|
||
return nil, common.NewMessage("Already checked in today")
|
||
}
|
||
|
||
// 计算随机额度奖励
|
||
quotaAwarded := setting.MinQuota
|
||
if setting.MaxQuota > setting.MinQuota {
|
||
quotaAwarded = setting.MinQuota + rand.Intn(setting.MaxQuota-setting.MinQuota+1)
|
||
}
|
||
|
||
today := time.Now().Format("2006-01-02")
|
||
checkin := &Checkin{
|
||
UserId: userId,
|
||
CheckinDate: today,
|
||
QuotaAwarded: quotaAwarded,
|
||
CreatedAt: time.Now().Unix(),
|
||
}
|
||
|
||
// 根据数据库类型选择不同的策略
|
||
if common.UsingMainDatabase(common.DatabaseTypeSQLite) {
|
||
// SQLite 不支持嵌套事务,使用顺序操作 + 手动回滚
|
||
return userCheckinWithoutTransaction(checkin, userId, quotaAwarded)
|
||
}
|
||
|
||
// MySQL 和 PostgreSQL 支持事务,使用事务保证原子性
|
||
return userCheckinWithTransaction(checkin, userId, quotaAwarded)
|
||
}
|
||
|
||
// userCheckinWithTransaction 使用事务执行签到(适用于 MySQL 和 PostgreSQL)
|
||
func userCheckinWithTransaction(checkin *Checkin, userId int, quotaAwarded int) (*Checkin, error) {
|
||
err := DB.Transaction(func(tx *gorm.DB) error {
|
||
// 步骤1: 创建签到记录
|
||
// 数据库有唯一约束 (user_id, checkin_date),可以防止并发重复签到
|
||
if err := tx.Create(checkin).Error; err != nil {
|
||
return common.NewMessage("Check-in failed, please try again later")
|
||
}
|
||
|
||
// 步骤2: 在事务中增加用户额度
|
||
if err := tx.Model(&User{}).Where("id = ?", userId).
|
||
Update("quota", gorm.Expr("quota + ?", quotaAwarded)).Error; err != nil {
|
||
return common.NewMessage("Check-in failed: quota update error")
|
||
}
|
||
|
||
return nil
|
||
})
|
||
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
// 事务成功后,异步更新缓存
|
||
go func() {
|
||
_ = cacheIncrUserQuota(userId, int64(quotaAwarded))
|
||
}()
|
||
|
||
return checkin, nil
|
||
}
|
||
|
||
// userCheckinWithoutTransaction 不使用事务执行签到(适用于 SQLite)
|
||
func userCheckinWithoutTransaction(checkin *Checkin, userId int, quotaAwarded int) (*Checkin, error) {
|
||
// 步骤1: 创建签到记录
|
||
// 数据库有唯一约束 (user_id, checkin_date),可以防止并发重复签到
|
||
if err := DB.Create(checkin).Error; err != nil {
|
||
return nil, common.NewMessage("Check-in failed, please try again later")
|
||
}
|
||
|
||
// 步骤2: 增加用户额度
|
||
// 使用 db=true 强制直接写入数据库,不使用批量更新
|
||
if err := IncreaseUserQuota(userId, quotaAwarded, true); err != nil {
|
||
// 如果增加额度失败,需要回滚签到记录
|
||
DB.Delete(checkin)
|
||
return nil, common.NewMessage("Check-in failed: quota update error")
|
||
}
|
||
|
||
return checkin, nil
|
||
}
|
||
|
||
// GetUserCheckinStats 获取用户签到统计信息
|
||
func GetUserCheckinStats(userId int, month string) (map[string]any, error) {
|
||
// 获取指定月份的所有签到记录
|
||
startDate := month + "-01"
|
||
endDate := month + "-31"
|
||
|
||
records, err := GetUserCheckinRecords(userId, startDate, endDate)
|
||
if err != nil {
|
||
return nil, err
|
||
}
|
||
|
||
// 转换为不包含敏感字段的记录
|
||
checkinRecords := make([]CheckinRecord, len(records))
|
||
for i, r := range records {
|
||
checkinRecords[i] = CheckinRecord{
|
||
CheckinDate: r.CheckinDate,
|
||
QuotaAwarded: r.QuotaAwarded,
|
||
}
|
||
}
|
||
|
||
// 检查今天是否已签到
|
||
hasCheckedToday, _ := HasCheckedInToday(userId)
|
||
|
||
// 获取用户所有时间的签到统计
|
||
var totalCheckins int64
|
||
var totalQuota int64
|
||
DB.Model(&Checkin{}).Where("user_id = ?", userId).Count(&totalCheckins)
|
||
DB.Model(&Checkin{}).Where("user_id = ?", userId).Select("COALESCE(SUM(quota_awarded), 0)").Scan(&totalQuota)
|
||
|
||
return map[string]any{
|
||
"total_quota": totalQuota, // 所有时间累计获得的额度
|
||
"total_checkins": totalCheckins, // 所有时间累计签到次数
|
||
"checkin_count": len(records), // 本月签到次数
|
||
"checked_in_today": hasCheckedToday, // 今天是否已签到
|
||
"records": checkinRecords, // 本月签到记录详情(不含id和user_id)
|
||
}, nil
|
||
}
|