Skip to content

GitLab

"git@web.lueluesay.top:chenxi/sub2api.git" did not exist on "94749b12ac66e4b97c21c4d90bf57abc41046324"
Commit bfcd9501 authored by IanShaw027's avatar IanShaw027
Browse files

merge: 合并 upstream/main 解决 PR #37 冲突 

- 删除 backend/internal/model/account.go 符合重构方向
- 合并最新的项目结构重构
- 包含 SSE 格式解析修复
- 更新依赖和配置文件
parents 9780f0fd 12252c60
Hide whitespace changes
Inline Side-by-side
backend/internal/service/setting.go 0 → 100644
View file @ bfcd9501
package service
import "time"
type Setting struct {
ID int64
Key string
Value string
UpdatedAt time.Time
}
backend/internal/service/setting_service.go
View file @ bfcd9501
...@@ -10,7 +10,6 @@ import ( ...@@ -10,7 +10,6 @@ import (
"github.com/Wei-Shaw/sub2api/internal/config" "github.com/Wei-Shaw/sub2api/internal/config"
infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors" infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors"
"github.com/Wei-Shaw/sub2api/internal/model"
) )
var ( var (
...@@ -19,7 +18,7 @@ var ( ...@@ -19,7 +18,7 @@ var (
) )
type SettingRepository interface { type SettingRepository interface {
Get(ctx context.Context, key string) (*model.Setting, error) Get(ctx context.Context, key string) (*Setting, error)
GetValue(ctx context.Context, key string) (string, error) GetValue(ctx context.Context, key string) (string, error)
Set(ctx context.Context, key, value string) error Set(ctx context.Context, key, value string) error
GetMultiple(ctx context.Context, keys []string) (map[string]string, error) GetMultiple(ctx context.Context, keys []string) (map[string]string, error)
...@@ -43,7 +42,7 @@ func NewSettingService(settingRepo SettingRepository, cfg *config.Config) *Setti ...@@ -43,7 +42,7 @@ func NewSettingService(settingRepo SettingRepository, cfg *config.Config) *Setti
} }
// GetAllSettings 获取所有系统设置 // GetAllSettings 获取所有系统设置
func (s *SettingService) GetAllSettings(ctx context.Context) (*model.SystemSettings, error) { func (s *SettingService) GetAllSettings(ctx context.Context) (*SystemSettings, error) {
settings, err := s.settingRepo.GetAll(ctx) settings, err := s.settingRepo.GetAll(ctx)
if err != nil { if err != nil {
return nil, fmt.Errorf("get all settings: %w", err) return nil, fmt.Errorf("get all settings: %w", err)
...@@ -53,18 +52,18 @@ func (s *SettingService) GetAllSettings(ctx context.Context) (*model.SystemSetti ...@@ -53,18 +52,18 @@ func (s *SettingService) GetAllSettings(ctx context.Context) (*model.SystemSetti
} }
// GetPublicSettings 获取公开设置（无需登录） // GetPublicSettings 获取公开设置（无需登录）
func (s *SettingService) GetPublicSettings(ctx context.Context) (*model.PublicSettings, error) { func (s *SettingService) GetPublicSettings(ctx context.Context) (*PublicSettings, error) {
keys := []string{ keys := []string{
model.SettingKeyRegistrationEnabled, SettingKeyRegistrationEnabled,
model.SettingKeyEmailVerifyEnabled, SettingKeyEmailVerifyEnabled,
model.SettingKeyTurnstileEnabled, SettingKeyTurnstileEnabled,
model.SettingKeyTurnstileSiteKey, SettingKeyTurnstileSiteKey,
model.SettingKeySiteName, SettingKeySiteName,
model.SettingKeySiteLogo, SettingKeySiteLogo,
model.SettingKeySiteSubtitle, SettingKeySiteSubtitle,
model.SettingKeyApiBaseUrl, SettingKeyApiBaseUrl,
model.SettingKeyContactInfo, SettingKeyContactInfo,
model.SettingKeyDocUrl, SettingKeyDocUrl,
} }
settings, err := s.settingRepo.GetMultiple(ctx, keys) settings, err := s.settingRepo.GetMultiple(ctx, keys)
...@@ -72,64 +71,64 @@ func (s *SettingService) GetPublicSettings(ctx context.Context) (*model.PublicSe ...@@ -72,64 +71,64 @@ func (s *SettingService) GetPublicSettings(ctx context.Context) (*model.PublicSe
return nil, fmt.Errorf("get public settings: %w", err) return nil, fmt.Errorf("get public settings: %w", err)
} }
return &model.PublicSettings{ return &PublicSettings{
RegistrationEnabled: settings[model.SettingKeyRegistrationEnabled] == "true", RegistrationEnabled: settings[SettingKeyRegistrationEnabled] == "true",
EmailVerifyEnabled: settings[model.SettingKeyEmailVerifyEnabled] == "true", EmailVerifyEnabled: settings[SettingKeyEmailVerifyEnabled] == "true",
TurnstileEnabled: settings[model.SettingKeyTurnstileEnabled] == "true", TurnstileEnabled: settings[SettingKeyTurnstileEnabled] == "true",
TurnstileSiteKey: settings[model.SettingKeyTurnstileSiteKey], TurnstileSiteKey: settings[SettingKeyTurnstileSiteKey],
SiteName: s.getStringOrDefault(settings, model.SettingKeySiteName, "Sub2API"), SiteName: s.getStringOrDefault(settings, SettingKeySiteName, "Sub2API"),
SiteLogo: settings[model.SettingKeySiteLogo], SiteLogo: settings[SettingKeySiteLogo],
SiteSubtitle: s.getStringOrDefault(settings, model.SettingKeySiteSubtitle, "Subscription to API Conversion Platform"), SiteSubtitle: s.getStringOrDefault(settings, SettingKeySiteSubtitle, "Subscription to API Conversion Platform"),
ApiBaseUrl: settings[model.SettingKeyApiBaseUrl], ApiBaseUrl: settings[SettingKeyApiBaseUrl],
ContactInfo: settings[model.SettingKeyContactInfo], ContactInfo: settings[SettingKeyContactInfo],
DocUrl: settings[model.SettingKeyDocUrl], DocUrl: settings[SettingKeyDocUrl],
}, nil }, nil
} }
// UpdateSettings 更新系统设置 // UpdateSettings 更新系统设置
func (s *SettingService) UpdateSettings(ctx context.Context, settings *model.SystemSettings) error { func (s *SettingService) UpdateSettings(ctx context.Context, settings *SystemSettings) error {
updates := make(map[string]string) updates := make(map[string]string)
// 注册设置 // 注册设置
updates[model.SettingKeyRegistrationEnabled] = strconv.FormatBool(settings.RegistrationEnabled) updates[SettingKeyRegistrationEnabled] = strconv.FormatBool(settings.RegistrationEnabled)
updates[model.SettingKeyEmailVerifyEnabled] = strconv.FormatBool(settings.EmailVerifyEnabled) updates[SettingKeyEmailVerifyEnabled] = strconv.FormatBool(settings.EmailVerifyEnabled)
// 邮件服务设置（只有非空才更新密码） // 邮件服务设置（只有非空才更新密码）
updates[model.SettingKeySmtpHost] = settings.SmtpHost updates[SettingKeySmtpHost] = settings.SmtpHost
updates[model.SettingKeySmtpPort] = strconv.Itoa(settings.SmtpPort) updates[SettingKeySmtpPort] = strconv.Itoa(settings.SmtpPort)
updates[model.SettingKeySmtpUsername] = settings.SmtpUsername updates[SettingKeySmtpUsername] = settings.SmtpUsername
if settings.SmtpPassword != "" { if settings.SmtpPassword != "" {
updates[model.SettingKeySmtpPassword] = settings.SmtpPassword updates[SettingKeySmtpPassword] = settings.SmtpPassword
} }
updates[model.SettingKeySmtpFrom] = settings.SmtpFrom updates[SettingKeySmtpFrom] = settings.SmtpFrom
updates[model.SettingKeySmtpFromName] = settings.SmtpFromName updates[SettingKeySmtpFromName] = settings.SmtpFromName
updates[model.SettingKeySmtpUseTLS] = strconv.FormatBool(settings.SmtpUseTLS) updates[SettingKeySmtpUseTLS] = strconv.FormatBool(settings.SmtpUseTLS)
// Cloudflare Turnstile 设置（只有非空才更新密钥） // Cloudflare Turnstile 设置（只有非空才更新密钥）
updates[model.SettingKeyTurnstileEnabled] = strconv.FormatBool(settings.TurnstileEnabled) updates[SettingKeyTurnstileEnabled] = strconv.FormatBool(settings.TurnstileEnabled)
updates[model.SettingKeyTurnstileSiteKey] = settings.TurnstileSiteKey updates[SettingKeyTurnstileSiteKey] = settings.TurnstileSiteKey
if settings.TurnstileSecretKey != "" { if settings.TurnstileSecretKey != "" {
updates[model.SettingKeyTurnstileSecretKey] = settings.TurnstileSecretKey updates[SettingKeyTurnstileSecretKey] = settings.TurnstileSecretKey
} }
// OEM设置 // OEM设置
updates[model.SettingKeySiteName] = settings.SiteName updates[SettingKeySiteName] = settings.SiteName
updates[model.SettingKeySiteLogo] = settings.SiteLogo updates[SettingKeySiteLogo] = settings.SiteLogo
updates[model.SettingKeySiteSubtitle] = settings.SiteSubtitle updates[SettingKeySiteSubtitle] = settings.SiteSubtitle
updates[model.SettingKeyApiBaseUrl] = settings.ApiBaseUrl updates[SettingKeyApiBaseUrl] = settings.ApiBaseUrl
updates[model.SettingKeyContactInfo] = settings.ContactInfo updates[SettingKeyContactInfo] = settings.ContactInfo
updates[model.SettingKeyDocUrl] = settings.DocUrl updates[SettingKeyDocUrl] = settings.DocUrl
// 默认配置 // 默认配置
updates[model.SettingKeyDefaultConcurrency] = strconv.Itoa(settings.DefaultConcurrency) updates[SettingKeyDefaultConcurrency] = strconv.Itoa(settings.DefaultConcurrency)
updates[model.SettingKeyDefaultBalance] = strconv.FormatFloat(settings.DefaultBalance, 'f', 8, 64) updates[SettingKeyDefaultBalance] = strconv.FormatFloat(settings.DefaultBalance, 'f', 8, 64)
return s.settingRepo.SetMultiple(ctx, updates) return s.settingRepo.SetMultiple(ctx, updates)
} }
// IsRegistrationEnabled 检查是否开放注册 // IsRegistrationEnabled 检查是否开放注册
func (s *SettingService) IsRegistrationEnabled(ctx context.Context) bool { func (s *SettingService) IsRegistrationEnabled(ctx context.Context) bool {
value, err := s.settingRepo.GetValue(ctx, model.SettingKeyRegistrationEnabled) value, err := s.settingRepo.GetValue(ctx, SettingKeyRegistrationEnabled)
if err != nil { if err != nil {
// 默认开放注册 // 默认开放注册
return true return true
...@@ -139,7 +138,7 @@ func (s *SettingService) IsRegistrationEnabled(ctx context.Context) bool { ...@@ -139,7 +138,7 @@ func (s *SettingService) IsRegistrationEnabled(ctx context.Context) bool {
// IsEmailVerifyEnabled 检查是否开启邮件验证 // IsEmailVerifyEnabled 检查是否开启邮件验证
func (s *SettingService) IsEmailVerifyEnabled(ctx context.Context) bool { func (s *SettingService) IsEmailVerifyEnabled(ctx context.Context) bool {
value, err := s.settingRepo.GetValue(ctx, model.SettingKeyEmailVerifyEnabled) value, err := s.settingRepo.GetValue(ctx, SettingKeyEmailVerifyEnabled)
if err != nil { if err != nil {
return false return false
} }
...@@ -148,7 +147,7 @@ func (s *SettingService) IsEmailVerifyEnabled(ctx context.Context) bool { ...@@ -148,7 +147,7 @@ func (s *SettingService) IsEmailVerifyEnabled(ctx context.Context) bool {
// GetSiteName 获取网站名称 // GetSiteName 获取网站名称
func (s *SettingService) GetSiteName(ctx context.Context) string { func (s *SettingService) GetSiteName(ctx context.Context) string {
value, err := s.settingRepo.GetValue(ctx, model.SettingKeySiteName) value, err := s.settingRepo.GetValue(ctx, SettingKeySiteName)
if err != nil || value == "" { if err != nil || value == "" {
return "Sub2API" return "Sub2API"
} }
...@@ -157,7 +156,7 @@ func (s *SettingService) GetSiteName(ctx context.Context) string { ...@@ -157,7 +156,7 @@ func (s *SettingService) GetSiteName(ctx context.Context) string {
// GetDefaultConcurrency 获取默认并发量 // GetDefaultConcurrency 获取默认并发量
func (s *SettingService) GetDefaultConcurrency(ctx context.Context) int { func (s *SettingService) GetDefaultConcurrency(ctx context.Context) int {
value, err := s.settingRepo.GetValue(ctx, model.SettingKeyDefaultConcurrency) value, err := s.settingRepo.GetValue(ctx, SettingKeyDefaultConcurrency)
if err != nil { if err != nil {
return s.cfg.Default.UserConcurrency return s.cfg.Default.UserConcurrency
} }
...@@ -169,7 +168,7 @@ func (s *SettingService) GetDefaultConcurrency(ctx context.Context) int { ...@@ -169,7 +168,7 @@ func (s *SettingService) GetDefaultConcurrency(ctx context.Context) int {
// GetDefaultBalance 获取默认余额 // GetDefaultBalance 获取默认余额
func (s *SettingService) GetDefaultBalance(ctx context.Context) float64 { func (s *SettingService) GetDefaultBalance(ctx context.Context) float64 {
value, err := s.settingRepo.GetValue(ctx, model.SettingKeyDefaultBalance) value, err := s.settingRepo.GetValue(ctx, SettingKeyDefaultBalance)
if err != nil { if err != nil {
return s.cfg.Default.UserBalance return s.cfg.Default.UserBalance
} }
...@@ -182,7 +181,7 @@ func (s *SettingService) GetDefaultBalance(ctx context.Context) float64 { ...@@ -182,7 +181,7 @@ func (s *SettingService) GetDefaultBalance(ctx context.Context) float64 {
// InitializeDefaultSettings 初始化默认设置 // InitializeDefaultSettings 初始化默认设置
func (s *SettingService) InitializeDefaultSettings(ctx context.Context) error { func (s *SettingService) InitializeDefaultSettings(ctx context.Context) error {
// 检查是否已有设置 // 检查是否已有设置
_, err := s.settingRepo.GetValue(ctx, model.SettingKeyRegistrationEnabled) _, err := s.settingRepo.GetValue(ctx, SettingKeyRegistrationEnabled)
if err == nil { if err == nil {
// 已有设置，不需要初始化 // 已有设置，不需要初始化
return nil return nil
...@@ -193,62 +192,62 @@ func (s *SettingService) InitializeDefaultSettings(ctx context.Context) error { ...@@ -193,62 +192,62 @@ func (s *SettingService) InitializeDefaultSettings(ctx context.Context) error {
// 初始化默认设置 // 初始化默认设置
defaults := map[string]string{ defaults := map[string]string{
model.SettingKeyRegistrationEnabled: "true", SettingKeyRegistrationEnabled: "true",
model.SettingKeyEmailVerifyEnabled: "false", SettingKeyEmailVerifyEnabled: "false",
model.SettingKeySiteName: "Sub2API", SettingKeySiteName: "Sub2API",
model.SettingKeySiteLogo: "", SettingKeySiteLogo: "",
model.SettingKeyDefaultConcurrency: strconv.Itoa(s.cfg.Default.UserConcurrency), SettingKeyDefaultConcurrency: strconv.Itoa(s.cfg.Default.UserConcurrency),
model.SettingKeyDefaultBalance: strconv.FormatFloat(s.cfg.Default.UserBalance, 'f', 8, 64), SettingKeyDefaultBalance: strconv.FormatFloat(s.cfg.Default.UserBalance, 'f', 8, 64),
model.SettingKeySmtpPort: "587", SettingKeySmtpPort: "587",
model.SettingKeySmtpUseTLS: "false", SettingKeySmtpUseTLS: "false",
} }
return s.settingRepo.SetMultiple(ctx, defaults) return s.settingRepo.SetMultiple(ctx, defaults)
} }
// parseSettings 解析设置到结构体 // parseSettings 解析设置到结构体
func (s *SettingService) parseSettings(settings map[string]string) *model.SystemSettings { func (s *SettingService) parseSettings(settings map[string]string) *SystemSettings {
result := &model.SystemSettings{ result := &SystemSettings{
RegistrationEnabled: settings[model.SettingKeyRegistrationEnabled] == "true", RegistrationEnabled: settings[SettingKeyRegistrationEnabled] == "true",
EmailVerifyEnabled: settings[model.SettingKeyEmailVerifyEnabled] == "true", EmailVerifyEnabled: settings[SettingKeyEmailVerifyEnabled] == "true",
SmtpHost: settings[model.SettingKeySmtpHost], SmtpHost: settings[SettingKeySmtpHost],
SmtpUsername: settings[model.SettingKeySmtpUsername], SmtpUsername: settings[SettingKeySmtpUsername],
SmtpFrom: settings[model.SettingKeySmtpFrom], SmtpFrom: settings[SettingKeySmtpFrom],
SmtpFromName: settings[model.SettingKeySmtpFromName], SmtpFromName: settings[SettingKeySmtpFromName],
SmtpUseTLS: settings[model.SettingKeySmtpUseTLS] == "true", SmtpUseTLS: settings[SettingKeySmtpUseTLS] == "true",
TurnstileEnabled: settings[model.SettingKeyTurnstileEnabled] == "true", TurnstileEnabled: settings[SettingKeyTurnstileEnabled] == "true",
TurnstileSiteKey: settings[model.SettingKeyTurnstileSiteKey], TurnstileSiteKey: settings[SettingKeyTurnstileSiteKey],
SiteName: s.getStringOrDefault(settings, model.SettingKeySiteName, "Sub2API"), SiteName: s.getStringOrDefault(settings, SettingKeySiteName, "Sub2API"),
SiteLogo: settings[model.SettingKeySiteLogo], SiteLogo: settings[SettingKeySiteLogo],
SiteSubtitle: s.getStringOrDefault(settings, model.SettingKeySiteSubtitle, "Subscription to API Conversion Platform"), SiteSubtitle: s.getStringOrDefault(settings, SettingKeySiteSubtitle, "Subscription to API Conversion Platform"),
ApiBaseUrl: settings[model.SettingKeyApiBaseUrl], ApiBaseUrl: settings[SettingKeyApiBaseUrl],
ContactInfo: settings[model.SettingKeyContactInfo], ContactInfo: settings[SettingKeyContactInfo],
DocUrl: settings[model.SettingKeyDocUrl], DocUrl: settings[SettingKeyDocUrl],
} }
// 解析整数类型 // 解析整数类型
if port, err := strconv.Atoi(settings[model.SettingKeySmtpPort]); err == nil { if port, err := strconv.Atoi(settings[SettingKeySmtpPort]); err == nil {
result.SmtpPort = port result.SmtpPort = port
} else { } else {
result.SmtpPort = 587 result.SmtpPort = 587
} }
if concurrency, err := strconv.Atoi(settings[model.SettingKeyDefaultConcurrency]); err == nil { if concurrency, err := strconv.Atoi(settings[SettingKeyDefaultConcurrency]); err == nil {
result.DefaultConcurrency = concurrency result.DefaultConcurrency = concurrency
} else { } else {
result.DefaultConcurrency = s.cfg.Default.UserConcurrency result.DefaultConcurrency = s.cfg.Default.UserConcurrency
} }
// 解析浮点数类型 // 解析浮点数类型
if balance, err := strconv.ParseFloat(settings[model.SettingKeyDefaultBalance], 64); err == nil { if balance, err := strconv.ParseFloat(settings[SettingKeyDefaultBalance], 64); err == nil {
result.DefaultBalance = balance result.DefaultBalance = balance
} else { } else {
result.DefaultBalance = s.cfg.Default.UserBalance result.DefaultBalance = s.cfg.Default.UserBalance
} }
// 敏感信息直接返回，方便测试连接时使用 // 敏感信息直接返回，方便测试连接时使用
result.SmtpPassword = settings[model.SettingKeySmtpPassword] result.SmtpPassword = settings[SettingKeySmtpPassword]
result.TurnstileSecretKey = settings[model.SettingKeyTurnstileSecretKey] result.TurnstileSecretKey = settings[SettingKeyTurnstileSecretKey]
return result return result
} }
...@@ -263,7 +262,7 @@ func (s *SettingService) getStringOrDefault(settings map[string]string, key, def ...@@ -263,7 +262,7 @@ func (s *SettingService) getStringOrDefault(settings map[string]string, key, def
// IsTurnstileEnabled 检查是否启用 Turnstile 验证 // IsTurnstileEnabled 检查是否启用 Turnstile 验证
func (s *SettingService) IsTurnstileEnabled(ctx context.Context) bool { func (s *SettingService) IsTurnstileEnabled(ctx context.Context) bool {
value, err := s.settingRepo.GetValue(ctx, model.SettingKeyTurnstileEnabled) value, err := s.settingRepo.GetValue(ctx, SettingKeyTurnstileEnabled)
if err != nil { if err != nil {
return false return false
} }
...@@ -272,7 +271,7 @@ func (s *SettingService) IsTurnstileEnabled(ctx context.Context) bool { ...@@ -272,7 +271,7 @@ func (s *SettingService) IsTurnstileEnabled(ctx context.Context) bool {
// GetTurnstileSecretKey 获取 Turnstile Secret Key // GetTurnstileSecretKey 获取 Turnstile Secret Key
func (s *SettingService) GetTurnstileSecretKey(ctx context.Context) string { func (s *SettingService) GetTurnstileSecretKey(ctx context.Context) string {
value, err := s.settingRepo.GetValue(ctx, model.SettingKeyTurnstileSecretKey) value, err := s.settingRepo.GetValue(ctx, SettingKeyTurnstileSecretKey)
if err != nil { if err != nil {
return "" return ""
} }
...@@ -287,10 +286,10 @@ func (s *SettingService) GenerateAdminApiKey(ctx context.Context) (string, error ...@@ -287,10 +286,10 @@ func (s *SettingService) GenerateAdminApiKey(ctx context.Context) (string, error
return "", fmt.Errorf("generate random bytes: %w", err) return "", fmt.Errorf("generate random bytes: %w", err)
} }
key := model.AdminApiKeyPrefix + hex.EncodeToString(bytes) key := AdminApiKeyPrefix + hex.EncodeToString(bytes)
// 存储到 settings 表 // 存储到 settings 表
if err := s.settingRepo.Set(ctx, model.SettingKeyAdminApiKey, key); err != nil { if err := s.settingRepo.Set(ctx, SettingKeyAdminApiKey, key); err != nil {
return "", fmt.Errorf("save admin api key: %w", err) return "", fmt.Errorf("save admin api key: %w", err)
} }
...@@ -300,7 +299,7 @@ func (s *SettingService) GenerateAdminApiKey(ctx context.Context) (string, error ...@@ -300,7 +299,7 @@ func (s *SettingService) GenerateAdminApiKey(ctx context.Context) (string, error
// GetAdminApiKeyStatus 获取管理员 API Key 状态 // GetAdminApiKeyStatus 获取管理员 API Key 状态
// 返回脱敏的 key、是否存在、错误 // 返回脱敏的 key、是否存在、错误
func (s *SettingService) GetAdminApiKeyStatus(ctx context.Context) (maskedKey string, exists bool, err error) { func (s *SettingService) GetAdminApiKeyStatus(ctx context.Context) (maskedKey string, exists bool, err error) {
key, err := s.settingRepo.GetValue(ctx, model.SettingKeyAdminApiKey) key, err := s.settingRepo.GetValue(ctx, SettingKeyAdminApiKey)
if err != nil { if err != nil {
if errors.Is(err, ErrSettingNotFound) { if errors.Is(err, ErrSettingNotFound) {
return "", false, nil return "", false, nil
...@@ -324,7 +323,7 @@ func (s *SettingService) GetAdminApiKeyStatus(ctx context.Context) (maskedKey st ...@@ -324,7 +323,7 @@ func (s *SettingService) GetAdminApiKeyStatus(ctx context.Context) (maskedKey st
// GetAdminApiKey 获取完整的管理员 API Key（仅供内部验证使用） // GetAdminApiKey 获取完整的管理员 API Key（仅供内部验证使用）
// 如果未配置返回空字符串和 nil 错误，只有数据库错误时才返回 error // 如果未配置返回空字符串和 nil 错误，只有数据库错误时才返回 error
func (s *SettingService) GetAdminApiKey(ctx context.Context) (string, error) { func (s *SettingService) GetAdminApiKey(ctx context.Context) (string, error) {
key, err := s.settingRepo.GetValue(ctx, model.SettingKeyAdminApiKey) key, err := s.settingRepo.GetValue(ctx, SettingKeyAdminApiKey)
if err != nil { if err != nil {
if errors.Is(err, ErrSettingNotFound) { if errors.Is(err, ErrSettingNotFound) {
return "", nil // 未配置，返回空字符串 return "", nil // 未配置，返回空字符串
...@@ -336,5 +335,5 @@ func (s *SettingService) GetAdminApiKey(ctx context.Context) (string, error) { ...@@ -336,5 +335,5 @@ func (s *SettingService) GetAdminApiKey(ctx context.Context) (string, error) {
// DeleteAdminApiKey 删除管理员 API Key // DeleteAdminApiKey 删除管理员 API Key
func (s *SettingService) DeleteAdminApiKey(ctx context.Context) error { func (s *SettingService) DeleteAdminApiKey(ctx context.Context) error {
return s.settingRepo.Delete(ctx, model.SettingKeyAdminApiKey) return s.settingRepo.Delete(ctx, SettingKeyAdminApiKey)
} }
backend/internal/service/settings_view.go 0 → 100644
View file @ bfcd9501
package service
type SystemSettings struct {
RegistrationEnabled bool
EmailVerifyEnabled bool
SmtpHost string
SmtpPort int
SmtpUsername string
SmtpPassword string
SmtpFrom string
SmtpFromName string
SmtpUseTLS bool
TurnstileEnabled bool
TurnstileSiteKey string
TurnstileSecretKey string
SiteName string
SiteLogo string
SiteSubtitle string
ApiBaseUrl string
ContactInfo string
DocUrl string
DefaultConcurrency int
DefaultBalance float64
}
type PublicSettings struct {
RegistrationEnabled bool
EmailVerifyEnabled bool
TurnstileEnabled bool
TurnstileSiteKey string
SiteName string
SiteLogo string
SiteSubtitle string
ApiBaseUrl string
ContactInfo string
DocUrl string
Version string
}
backend/internal/service/subscription_service.go
View file @ bfcd9501
...@@ -7,7 +7,6 @@ import ( ...@@ -7,7 +7,6 @@ import (
"time" "time"
infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors" infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors"
"github.com/Wei-Shaw/sub2api/internal/model"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination" "github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
) )
...@@ -48,7 +47,7 @@ type AssignSubscriptionInput struct { ...@@ -48,7 +47,7 @@ type AssignSubscriptionInput struct {
} }
// AssignSubscription 分配订阅给用户（不允许重复分配） // AssignSubscription 分配订阅给用户（不允许重复分配）
func (s *SubscriptionService) AssignSubscription(ctx context.Context, input *AssignSubscriptionInput) (*model.UserSubscription, error) { func (s *SubscriptionService) AssignSubscription(ctx context.Context, input *AssignSubscriptionInput) (*UserSubscription, error) {
// 检查分组是否存在且为订阅类型 // 检查分组是否存在且为订阅类型
group, err := s.groupRepo.GetByID(ctx, input.GroupID) group, err := s.groupRepo.GetByID(ctx, input.GroupID)
if err != nil { if err != nil {
...@@ -91,7 +90,7 @@ func (s *SubscriptionService) AssignSubscription(ctx context.Context, input *Ass ...@@ -91,7 +90,7 @@ func (s *SubscriptionService) AssignSubscription(ctx context.Context, input *Ass
// - 已过期：从当前时间开始计算新的过期时间，并激活订阅 // - 已过期：从当前时间开始计算新的过期时间，并激活订阅
// //
// 如果没有订阅：创建新订阅 // 如果没有订阅：创建新订阅
func (s *SubscriptionService) AssignOrExtendSubscription(ctx context.Context, input *AssignSubscriptionInput) (*model.UserSubscription, bool, error) { func (s *SubscriptionService) AssignOrExtendSubscription(ctx context.Context, input *AssignSubscriptionInput) (*UserSubscription, bool, error) {
// 检查分组是否存在且为订阅类型 // 检查分组是否存在且为订阅类型
group, err := s.groupRepo.GetByID(ctx, input.GroupID) group, err := s.groupRepo.GetByID(ctx, input.GroupID)
if err != nil { if err != nil {
...@@ -132,8 +131,8 @@ func (s *SubscriptionService) AssignOrExtendSubscription(ctx context.Context, in ...@@ -132,8 +131,8 @@ func (s *SubscriptionService) AssignOrExtendSubscription(ctx context.Context, in
} }
// 如果订阅已过期或被暂停，恢复为active状态 // 如果订阅已过期或被暂停，恢复为active状态
if existingSub.Status != model.SubscriptionStatusActive { if existingSub.Status != SubscriptionStatusActive {
if err := s.userSubRepo.UpdateStatus(ctx, existingSub.ID, model.SubscriptionStatusActive); err != nil { if err := s.userSubRepo.UpdateStatus(ctx, existingSub.ID, SubscriptionStatusActive); err != nil {
return nil, false, fmt.Errorf("update subscription status: %w", err) return nil, false, fmt.Errorf("update subscription status: %w", err)
} }
} }
...@@ -185,19 +184,19 @@ func (s *SubscriptionService) AssignOrExtendSubscription(ctx context.Context, in ...@@ -185,19 +184,19 @@ func (s *SubscriptionService) AssignOrExtendSubscription(ctx context.Context, in
} }
// createSubscription 创建新订阅（内部方法） // createSubscription 创建新订阅（内部方法）
func (s *SubscriptionService) createSubscription(ctx context.Context, input *AssignSubscriptionInput) (*model.UserSubscription, error) { func (s *SubscriptionService) createSubscription(ctx context.Context, input *AssignSubscriptionInput) (*UserSubscription, error) {
validityDays := input.ValidityDays validityDays := input.ValidityDays
if validityDays <= 0 { if validityDays <= 0 {
validityDays = 30 validityDays = 30
} }
now := time.Now() now := time.Now()
sub := &model.UserSubscription{ sub := &UserSubscription{
UserID: input.UserID, UserID: input.UserID,
GroupID: input.GroupID, GroupID: input.GroupID,
StartsAt: now, StartsAt: now,
ExpiresAt: now.AddDate(0, 0, validityDays), ExpiresAt: now.AddDate(0, 0, validityDays),
Status: model.SubscriptionStatusActive, Status: SubscriptionStatusActive,
AssignedAt: now, AssignedAt: now,
Notes: input.Notes, Notes: input.Notes,
CreatedAt: now, CreatedAt: now,
...@@ -229,14 +228,14 @@ type BulkAssignSubscriptionInput struct { ...@@ -229,14 +228,14 @@ type BulkAssignSubscriptionInput struct {
type BulkAssignResult struct { type BulkAssignResult struct {
SuccessCount int SuccessCount int
FailedCount int FailedCount int
Subscriptions []model.UserSubscription Subscriptions []UserSubscription
Errors []string Errors []string
} }
// BulkAssignSubscription 批量分配订阅 // BulkAssignSubscription 批量分配订阅
func (s *SubscriptionService) BulkAssignSubscription(ctx context.Context, input *BulkAssignSubscriptionInput) (*BulkAssignResult, error) { func (s *SubscriptionService) BulkAssignSubscription(ctx context.Context, input *BulkAssignSubscriptionInput) (*BulkAssignResult, error) {
result := &BulkAssignResult{ result := &BulkAssignResult{
Subscriptions: make([]model.UserSubscription, 0), Subscriptions: make([]UserSubscription, 0),
Errors: make([]string, 0), Errors: make([]string, 0),
} }
...@@ -286,7 +285,7 @@ func (s *SubscriptionService) RevokeSubscription(ctx context.Context, subscripti ...@@ -286,7 +285,7 @@ func (s *SubscriptionService) RevokeSubscription(ctx context.Context, subscripti
} }
// ExtendSubscription 延长订阅 // ExtendSubscription 延长订阅
func (s *SubscriptionService) ExtendSubscription(ctx context.Context, subscriptionID int64, days int) (*model.UserSubscription, error) { func (s *SubscriptionService) ExtendSubscription(ctx context.Context, subscriptionID int64, days int) (*UserSubscription, error) {
sub, err := s.userSubRepo.GetByID(ctx, subscriptionID) sub, err := s.userSubRepo.GetByID(ctx, subscriptionID)
if err != nil { if err != nil {
return nil, ErrSubscriptionNotFound return nil, ErrSubscriptionNotFound
...@@ -299,8 +298,8 @@ func (s *SubscriptionService) ExtendSubscription(ctx context.Context, subscripti ...@@ -299,8 +298,8 @@ func (s *SubscriptionService) ExtendSubscription(ctx context.Context, subscripti
} }
// 如果订阅已过期，恢复为active状态 // 如果订阅已过期，恢复为active状态
if sub.Status == model.SubscriptionStatusExpired { if sub.Status == SubscriptionStatusExpired {
if err := s.userSubRepo.UpdateStatus(ctx, subscriptionID, model.SubscriptionStatusActive); err != nil { if err := s.userSubRepo.UpdateStatus(ctx, subscriptionID, SubscriptionStatusActive); err != nil {
return nil, err return nil, err
} }
} }
...@@ -319,12 +318,12 @@ func (s *SubscriptionService) ExtendSubscription(ctx context.Context, subscripti ...@@ -319,12 +318,12 @@ func (s *SubscriptionService) ExtendSubscription(ctx context.Context, subscripti
} }
// GetByID 根据ID获取订阅 // GetByID 根据ID获取订阅
func (s *SubscriptionService) GetByID(ctx context.Context, id int64) (*model.UserSubscription, error) { func (s *SubscriptionService) GetByID(ctx context.Context, id int64) (*UserSubscription, error) {
return s.userSubRepo.GetByID(ctx, id) return s.userSubRepo.GetByID(ctx, id)
} }
// GetActiveSubscription 获取用户对特定分组的有效订阅 // GetActiveSubscription 获取用户对特定分组的有效订阅
func (s *SubscriptionService) GetActiveSubscription(ctx context.Context, userID, groupID int64) (*model.UserSubscription, error) { func (s *SubscriptionService) GetActiveSubscription(ctx context.Context, userID, groupID int64) (*UserSubscription, error) {
sub, err := s.userSubRepo.GetActiveByUserIDAndGroupID(ctx, userID, groupID) sub, err := s.userSubRepo.GetActiveByUserIDAndGroupID(ctx, userID, groupID)
if err != nil { if err != nil {
return nil, ErrSubscriptionNotFound return nil, ErrSubscriptionNotFound
...@@ -333,7 +332,7 @@ func (s *SubscriptionService) GetActiveSubscription(ctx context.Context, userID, ...@@ -333,7 +332,7 @@ func (s *SubscriptionService) GetActiveSubscription(ctx context.Context, userID,
} }
// ListUserSubscriptions 获取用户的所有订阅 // ListUserSubscriptions 获取用户的所有订阅
func (s *SubscriptionService) ListUserSubscriptions(ctx context.Context, userID int64) ([]model.UserSubscription, error) { func (s *SubscriptionService) ListUserSubscriptions(ctx context.Context, userID int64) ([]UserSubscription, error) {
subs, err := s.userSubRepo.ListByUserID(ctx, userID) subs, err := s.userSubRepo.ListByUserID(ctx, userID)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -343,7 +342,7 @@ func (s *SubscriptionService) ListUserSubscriptions(ctx context.Context, userID ...@@ -343,7 +342,7 @@ func (s *SubscriptionService) ListUserSubscriptions(ctx context.Context, userID
} }
// ListActiveUserSubscriptions 获取用户的所有有效订阅 // ListActiveUserSubscriptions 获取用户的所有有效订阅
func (s *SubscriptionService) ListActiveUserSubscriptions(ctx context.Context, userID int64) ([]model.UserSubscription, error) { func (s *SubscriptionService) ListActiveUserSubscriptions(ctx context.Context, userID int64) ([]UserSubscription, error) {
subs, err := s.userSubRepo.ListActiveByUserID(ctx, userID) subs, err := s.userSubRepo.ListActiveByUserID(ctx, userID)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -353,7 +352,7 @@ func (s *SubscriptionService) ListActiveUserSubscriptions(ctx context.Context, u ...@@ -353,7 +352,7 @@ func (s *SubscriptionService) ListActiveUserSubscriptions(ctx context.Context, u
} }
// ListGroupSubscriptions 获取分组的所有订阅 // ListGroupSubscriptions 获取分组的所有订阅
func (s *SubscriptionService) ListGroupSubscriptions(ctx context.Context, groupID int64, page, pageSize int) ([]model.UserSubscription, *pagination.PaginationResult, error) { func (s *SubscriptionService) ListGroupSubscriptions(ctx context.Context, groupID int64, page, pageSize int) ([]UserSubscription, *pagination.PaginationResult, error) {
params := pagination.PaginationParams{Page: page, PageSize: pageSize} params := pagination.PaginationParams{Page: page, PageSize: pageSize}
subs, pag, err := s.userSubRepo.ListByGroupID(ctx, groupID, params) subs, pag, err := s.userSubRepo.ListByGroupID(ctx, groupID, params)
if err != nil { if err != nil {
...@@ -364,7 +363,7 @@ func (s *SubscriptionService) ListGroupSubscriptions(ctx context.Context, groupI ...@@ -364,7 +363,7 @@ func (s *SubscriptionService) ListGroupSubscriptions(ctx context.Context, groupI
} }
// List 获取所有订阅（分页，支持筛选） // List 获取所有订阅（分页，支持筛选）
func (s *SubscriptionService) List(ctx context.Context, page, pageSize int, userID, groupID *int64, status string) ([]model.UserSubscription, *pagination.PaginationResult, error) { func (s *SubscriptionService) List(ctx context.Context, page, pageSize int, userID, groupID *int64, status string) ([]UserSubscription, *pagination.PaginationResult, error) {
params := pagination.PaginationParams{Page: page, PageSize: pageSize} params := pagination.PaginationParams{Page: page, PageSize: pageSize}
subs, pag, err := s.userSubRepo.List(ctx, params, userID, groupID, status) subs, pag, err := s.userSubRepo.List(ctx, params, userID, groupID, status)
if err != nil { if err != nil {
...@@ -376,7 +375,7 @@ func (s *SubscriptionService) List(ctx context.Context, page, pageSize int, user ...@@ -376,7 +375,7 @@ func (s *SubscriptionService) List(ctx context.Context, page, pageSize int, user
// normalizeExpiredWindows 将已过期窗口的数据清零（仅影响返回数据，不影响数据库） // normalizeExpiredWindows 将已过期窗口的数据清零（仅影响返回数据，不影响数据库）
// 这确保前端显示正确的当前窗口状态，而不是过期窗口的历史数据 // 这确保前端显示正确的当前窗口状态，而不是过期窗口的历史数据
func normalizeExpiredWindows(subs []model.UserSubscription) { func normalizeExpiredWindows(subs []UserSubscription) {
for i := range subs { for i := range subs {
sub := &subs[i] sub := &subs[i]
// 日窗口过期：清零展示数据 // 日窗口过期：清零展示数据
...@@ -403,7 +402,7 @@ func startOfDay(t time.Time) time.Time { ...@@ -403,7 +402,7 @@ func startOfDay(t time.Time) time.Time {
} }
// CheckAndActivateWindow 检查并激活窗口（首次使用时） // CheckAndActivateWindow 检查并激活窗口（首次使用时）
func (s *SubscriptionService) CheckAndActivateWindow(ctx context.Context, sub *model.UserSubscription) error { func (s *SubscriptionService) CheckAndActivateWindow(ctx context.Context, sub *UserSubscription) error {
if sub.IsWindowActivated() { if sub.IsWindowActivated() {
return nil return nil
} }
...@@ -414,7 +413,7 @@ func (s *SubscriptionService) CheckAndActivateWindow(ctx context.Context, sub *m ...@@ -414,7 +413,7 @@ func (s *SubscriptionService) CheckAndActivateWindow(ctx context.Context, sub *m
} }
// CheckAndResetWindows 检查并重置过期的窗口 // CheckAndResetWindows 检查并重置过期的窗口
func (s *SubscriptionService) CheckAndResetWindows(ctx context.Context, sub *model.UserSubscription) error { func (s *SubscriptionService) CheckAndResetWindows(ctx context.Context, sub *UserSubscription) error {
// 使用当天零点作为新窗口起始时间 // 使用当天零点作为新窗口起始时间
windowStart := startOfDay(time.Now()) windowStart := startOfDay(time.Now())
needsInvalidateCache := false needsInvalidateCache := false
...@@ -458,7 +457,7 @@ func (s *SubscriptionService) CheckAndResetWindows(ctx context.Context, sub *mod ...@@ -458,7 +457,7 @@ func (s *SubscriptionService) CheckAndResetWindows(ctx context.Context, sub *mod
} }
// CheckUsageLimits 检查使用限额（返回错误如果超限） // CheckUsageLimits 检查使用限额（返回错误如果超限）
func (s *SubscriptionService) CheckUsageLimits(ctx context.Context, sub *model.UserSubscription, group *model.Group, additionalCost float64) error { func (s *SubscriptionService) CheckUsageLimits(ctx context.Context, sub *UserSubscription, group *Group, additionalCost float64) error {
if !sub.CheckDailyLimit(group, additionalCost) { if !sub.CheckDailyLimit(group, additionalCost) {
return ErrDailyLimitExceeded return ErrDailyLimitExceeded
} }
...@@ -620,16 +619,16 @@ func (s *SubscriptionService) UpdateExpiredSubscriptions(ctx context.Context) (i ...@@ -620,16 +619,16 @@ func (s *SubscriptionService) UpdateExpiredSubscriptions(ctx context.Context) (i
} }
// ValidateSubscription 验证订阅是否有效 // ValidateSubscription 验证订阅是否有效
func (s *SubscriptionService) ValidateSubscription(ctx context.Context, sub *model.UserSubscription) error { func (s *SubscriptionService) ValidateSubscription(ctx context.Context, sub *UserSubscription) error {
if sub.Status == model.SubscriptionStatusExpired { if sub.Status == SubscriptionStatusExpired {
return ErrSubscriptionExpired return ErrSubscriptionExpired
} }
if sub.Status == model.SubscriptionStatusSuspended { if sub.Status == SubscriptionStatusSuspended {
return ErrSubscriptionSuspended return ErrSubscriptionSuspended
} }
if sub.IsExpired() { if sub.IsExpired() {
// 更新状态 // 更新状态
_ = s.userSubRepo.UpdateStatus(ctx, sub.ID, model.SubscriptionStatusExpired) _ = s.userSubRepo.UpdateStatus(ctx, sub.ID, SubscriptionStatusExpired)
return ErrSubscriptionExpired return ErrSubscriptionExpired
} }
return nil return nil
......
backend/internal/service/token_refresh_service.go
View file @ bfcd9501
...@@ -8,7 +8,6 @@ import ( ...@@ -8,7 +8,6 @@ import (
"time" "time"
"github.com/Wei-Shaw/sub2api/internal/config" "github.com/Wei-Shaw/sub2api/internal/config"
"github.com/Wei-Shaw/sub2api/internal/model"
) )
// TokenRefreshService OAuth token自动刷新服务 // TokenRefreshService OAuth token自动刷新服务
...@@ -144,19 +143,19 @@ func (s *TokenRefreshService) processRefresh() { ...@@ -144,19 +143,19 @@ func (s *TokenRefreshService) processRefresh() {
// listActiveAccounts 获取所有active状态的账号 // listActiveAccounts 获取所有active状态的账号
// 使用ListActive确保刷新所有活跃账号的token（包括临时禁用的） // 使用ListActive确保刷新所有活跃账号的token（包括临时禁用的）
func (s *TokenRefreshService) listActiveAccounts(ctx context.Context) ([]model.Account, error) { func (s *TokenRefreshService) listActiveAccounts(ctx context.Context) ([]Account, error) {
return s.accountRepo.ListActive(ctx) return s.accountRepo.ListActive(ctx)
} }
// refreshWithRetry 带重试的刷新 // refreshWithRetry 带重试的刷新
func (s *TokenRefreshService) refreshWithRetry(ctx context.Context, account *model.Account, refresher TokenRefresher) error { func (s *TokenRefreshService) refreshWithRetry(ctx context.Context, account *Account, refresher TokenRefresher) error {
var lastErr error var lastErr error
for attempt := 1; attempt <= s.cfg.MaxRetries; attempt++ { for attempt := 1; attempt <= s.cfg.MaxRetries; attempt++ {
newCredentials, err := refresher.Refresh(ctx, account) newCredentials, err := refresher.Refresh(ctx, account)
if err == nil { if err == nil {
// 刷新成功，更新账号credentials // 刷新成功，更新账号credentials
account.Credentials = model.JSONB(newCredentials) account.Credentials = newCredentials
if err := s.accountRepo.Update(ctx, account); err != nil { if err := s.accountRepo.Update(ctx, account); err != nil {
return fmt.Errorf("failed to save credentials: %w", err) return fmt.Errorf("failed to save credentials: %w", err)
} }
......
backend/internal/service/token_refresher.go
View file @ bfcd9501
...@@ -4,22 +4,20 @@ import ( ...@@ -4,22 +4,20 @@ import (
"context" "context"
"strconv" "strconv"
"time" "time"
"github.com/Wei-Shaw/sub2api/internal/model"
) )
// TokenRefresher 定义平台特定的token刷新策略接口 // TokenRefresher 定义平台特定的token刷新策略接口
// 通过此接口可以扩展支持不同平台（Anthropic/OpenAI/Gemini） // 通过此接口可以扩展支持不同平台（Anthropic/OpenAI/Gemini）
type TokenRefresher interface { type TokenRefresher interface {
// CanRefresh 检查此刷新器是否能处理指定账号 // CanRefresh 检查此刷新器是否能处理指定账号
CanRefresh(account *model.Account) bool CanRefresh(account *Account) bool
// NeedsRefresh 检查账号的token是否需要刷新 // NeedsRefresh 检查账号的token是否需要刷新
NeedsRefresh(account *model.Account, refreshWindow time.Duration) bool NeedsRefresh(account *Account, refreshWindow time.Duration) bool
// Refresh 执行token刷新，返回更新后的credentials // Refresh 执行token刷新，返回更新后的credentials
// 注意：返回的map应该保留原有credentials中的所有字段，只更新token相关字段 // 注意：返回的map应该保留原有credentials中的所有字段，只更新token相关字段
Refresh(ctx context.Context, account *model.Account) (map[string]any, error) Refresh(ctx context.Context, account *Account) (map[string]any, error)
} }
// ClaudeTokenRefresher 处理Anthropic/Claude OAuth token刷新 // ClaudeTokenRefresher 处理Anthropic/Claude OAuth token刷新
...@@ -37,14 +35,14 @@ func NewClaudeTokenRefresher(oauthService *OAuthService) *ClaudeTokenRefresher { ...@@ -37,14 +35,14 @@ func NewClaudeTokenRefresher(oauthService *OAuthService) *ClaudeTokenRefresher {
// CanRefresh 检查是否能处理此账号 // CanRefresh 检查是否能处理此账号
// 只处理 anthropic 平台的 oauth 类型账号 // 只处理 anthropic 平台的 oauth 类型账号
// setup-token 虽然也是OAuth，但有效期1年，不需要频繁刷新 // setup-token 虽然也是OAuth，但有效期1年，不需要频繁刷新
func (r *ClaudeTokenRefresher) CanRefresh(account *model.Account) bool { func (r *ClaudeTokenRefresher) CanRefresh(account *Account) bool {
return account.Platform == model.PlatformAnthropic && return account.Platform == PlatformAnthropic &&
account.Type == model.AccountTypeOAuth account.Type == AccountTypeOAuth
} }
// NeedsRefresh 检查token是否需要刷新 // NeedsRefresh 检查token是否需要刷新
// 基于 expires_at 字段判断是否在刷新窗口内 // 基于 expires_at 字段判断是否在刷新窗口内
func (r *ClaudeTokenRefresher) NeedsRefresh(account *model.Account, refreshWindow time.Duration) bool { func (r *ClaudeTokenRefresher) NeedsRefresh(account *Account, refreshWindow time.Duration) bool {
expiresAtStr := account.GetCredential("expires_at") expiresAtStr := account.GetCredential("expires_at")
if expiresAtStr == "" { if expiresAtStr == "" {
return false return false
...@@ -61,7 +59,7 @@ func (r *ClaudeTokenRefresher) NeedsRefresh(account *model.Account, refreshWindo ...@@ -61,7 +59,7 @@ func (r *ClaudeTokenRefresher) NeedsRefresh(account *model.Account, refreshWindo
// Refresh 执行token刷新 // Refresh 执行token刷新
// 保留原有credentials中的所有字段，只更新token相关字段 // 保留原有credentials中的所有字段，只更新token相关字段
func (r *ClaudeTokenRefresher) Refresh(ctx context.Context, account *model.Account) (map[string]any, error) { func (r *ClaudeTokenRefresher) Refresh(ctx context.Context, account *Account) (map[string]any, error) {
tokenInfo, err := r.oauthService.RefreshAccountToken(ctx, account) tokenInfo, err := r.oauthService.RefreshAccountToken(ctx, account)
if err != nil { if err != nil {
return nil, err return nil, err
...@@ -103,14 +101,14 @@ func NewOpenAITokenRefresher(openaiOAuthService *OpenAIOAuthService) *OpenAIToke ...@@ -103,14 +101,14 @@ func NewOpenAITokenRefresher(openaiOAuthService *OpenAIOAuthService) *OpenAIToke
// CanRefresh 检查是否能处理此账号 // CanRefresh 检查是否能处理此账号
// 只处理 openai 平台的 oauth 类型账号 // 只处理 openai 平台的 oauth 类型账号
func (r *OpenAITokenRefresher) CanRefresh(account *model.Account) bool { func (r *OpenAITokenRefresher) CanRefresh(account *Account) bool {
return account.Platform == model.PlatformOpenAI && return account.Platform == PlatformOpenAI &&
account.Type == model.AccountTypeOAuth account.Type == AccountTypeOAuth
} }
// NeedsRefresh 检查token是否需要刷新 // NeedsRefresh 检查token是否需要刷新
// 基于 expires_at 字段判断是否在刷新窗口内 // 基于 expires_at 字段判断是否在刷新窗口内
func (r *OpenAITokenRefresher) NeedsRefresh(account *model.Account, refreshWindow time.Duration) bool { func (r *OpenAITokenRefresher) NeedsRefresh(account *Account, refreshWindow time.Duration) bool {
expiresAt := account.GetOpenAITokenExpiresAt() expiresAt := account.GetOpenAITokenExpiresAt()
if expiresAt == nil { if expiresAt == nil {
return false return false
...@@ -121,7 +119,7 @@ func (r *OpenAITokenRefresher) NeedsRefresh(account *model.Account, refreshWindo ...@@ -121,7 +119,7 @@ func (r *OpenAITokenRefresher) NeedsRefresh(account *model.Account, refreshWindo
// Refresh 执行token刷新 // Refresh 执行token刷新
// 保留原有credentials中的所有字段，只更新token相关字段 // 保留原有credentials中的所有字段，只更新token相关字段
func (r *OpenAITokenRefresher) Refresh(ctx context.Context, account *model.Account) (map[string]any, error) { func (r *OpenAITokenRefresher) Refresh(ctx context.Context, account *Account) (map[string]any, error) {
tokenInfo, err := r.openaiOAuthService.RefreshAccountToken(ctx, account) tokenInfo, err := r.openaiOAuthService.RefreshAccountToken(ctx, account)
if err != nil { if err != nil {
return nil, err return nil, err
......
backend/internal/service/usage_log.go 0 → 100644
View file @ bfcd9501
package service
import "time"
const (
BillingTypeBalance int8 = 0 // 钱包余额
BillingTypeSubscription int8 = 1 // 订阅套餐
)
type UsageLog struct {
ID int64
UserID int64
ApiKeyID int64
AccountID int64
RequestID string
Model string
GroupID *int64
SubscriptionID *int64
InputTokens int
OutputTokens int
CacheCreationTokens int
CacheReadTokens int
CacheCreation5mTokens int
CacheCreation1hTokens int
InputCost float64
OutputCost float64
CacheCreationCost float64
CacheReadCost float64
TotalCost float64
ActualCost float64
RateMultiplier float64
BillingType int8
Stream bool
DurationMs *int
FirstTokenMs *int
CreatedAt time.Time
User *User
ApiKey *ApiKey
Account *Account
Group *Group
Subscription *UserSubscription
}
func (u *UsageLog) TotalTokens() int {
return u.InputTokens + u.OutputTokens + u.CacheCreationTokens + u.CacheReadTokens
}
backend/internal/service/usage_service.go
View file @ bfcd9501
...@@ -6,7 +6,6 @@ import ( ...@@ -6,7 +6,6 @@ import (
"time" "time"
infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors" infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors"
"github.com/Wei-Shaw/sub2api/internal/model"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination" "github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
"github.com/Wei-Shaw/sub2api/internal/pkg/usagestats" "github.com/Wei-Shaw/sub2api/internal/pkg/usagestats"
) )
...@@ -66,7 +65,7 @@ func NewUsageService(usageRepo UsageLogRepository, userRepo UserRepository) *Usa ...@@ -66,7 +65,7 @@ func NewUsageService(usageRepo UsageLogRepository, userRepo UserRepository) *Usa
} }
// Create 创建使用日志 // Create 创建使用日志
func (s *UsageService) Create(ctx context.Context, req CreateUsageLogRequest) (*model.UsageLog, error) { func (s *UsageService) Create(ctx context.Context, req CreateUsageLogRequest) (*UsageLog, error) {
// 验证用户存在 // 验证用户存在
_, err := s.userRepo.GetByID(ctx, req.UserID) _, err := s.userRepo.GetByID(ctx, req.UserID)
if err != nil { if err != nil {
...@@ -74,7 +73,7 @@ func (s *UsageService) Create(ctx context.Context, req CreateUsageLogRequest) (* ...@@ -74,7 +73,7 @@ func (s *UsageService) Create(ctx context.Context, req CreateUsageLogRequest) (*
} }
// 创建使用日志 // 创建使用日志
usageLog := &model.UsageLog{ usageLog := &UsageLog{
UserID: req.UserID, UserID: req.UserID,
ApiKeyID: req.ApiKeyID, ApiKeyID: req.ApiKeyID,
AccountID: req.AccountID, AccountID: req.AccountID,
...@@ -112,7 +111,7 @@ func (s *UsageService) Create(ctx context.Context, req CreateUsageLogRequest) (* ...@@ -112,7 +111,7 @@ func (s *UsageService) Create(ctx context.Context, req CreateUsageLogRequest) (*
} }
// GetByID 根据ID获取使用日志 // GetByID 根据ID获取使用日志
func (s *UsageService) GetByID(ctx context.Context, id int64) (*model.UsageLog, error) { func (s *UsageService) GetByID(ctx context.Context, id int64) (*UsageLog, error) {
log, err := s.usageRepo.GetByID(ctx, id) log, err := s.usageRepo.GetByID(ctx, id)
if err != nil { if err != nil {
return nil, fmt.Errorf("get usage log: %w", err) return nil, fmt.Errorf("get usage log: %w", err)
...@@ -121,7 +120,7 @@ func (s *UsageService) GetByID(ctx context.Context, id int64) (*model.UsageLog, ...@@ -121,7 +120,7 @@ func (s *UsageService) GetByID(ctx context.Context, id int64) (*model.UsageLog,
} }
// ListByUser 获取用户的使用日志列表 // ListByUser 获取用户的使用日志列表
func (s *UsageService) ListByUser(ctx context.Context, userID int64, params pagination.PaginationParams) ([]model.UsageLog, *pagination.PaginationResult, error) { func (s *UsageService) ListByUser(ctx context.Context, userID int64, params pagination.PaginationParams) ([]UsageLog, *pagination.PaginationResult, error) {
logs, pagination, err := s.usageRepo.ListByUser(ctx, userID, params) logs, pagination, err := s.usageRepo.ListByUser(ctx, userID, params)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("list usage logs: %w", err) return nil, nil, fmt.Errorf("list usage logs: %w", err)
...@@ -130,7 +129,7 @@ func (s *UsageService) ListByUser(ctx context.Context, userID int64, params pagi ...@@ -130,7 +129,7 @@ func (s *UsageService) ListByUser(ctx context.Context, userID int64, params pagi
} }
// ListByApiKey 获取API Key的使用日志列表 // ListByApiKey 获取API Key的使用日志列表
func (s *UsageService) ListByApiKey(ctx context.Context, apiKeyID int64, params pagination.PaginationParams) ([]model.UsageLog, *pagination.PaginationResult, error) { func (s *UsageService) ListByApiKey(ctx context.Context, apiKeyID int64, params pagination.PaginationParams) ([]UsageLog, *pagination.PaginationResult, error) {
logs, pagination, err := s.usageRepo.ListByApiKey(ctx, apiKeyID, params) logs, pagination, err := s.usageRepo.ListByApiKey(ctx, apiKeyID, params)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("list usage logs: %w", err) return nil, nil, fmt.Errorf("list usage logs: %w", err)
...@@ -139,7 +138,7 @@ func (s *UsageService) ListByApiKey(ctx context.Context, apiKeyID int64, params ...@@ -139,7 +138,7 @@ func (s *UsageService) ListByApiKey(ctx context.Context, apiKeyID int64, params
} }
// ListByAccount 获取账号的使用日志列表 // ListByAccount 获取账号的使用日志列表
func (s *UsageService) ListByAccount(ctx context.Context, accountID int64, params pagination.PaginationParams) ([]model.UsageLog, *pagination.PaginationResult, error) { func (s *UsageService) ListByAccount(ctx context.Context, accountID int64, params pagination.PaginationParams) ([]UsageLog, *pagination.PaginationResult, error) {
logs, pagination, err := s.usageRepo.ListByAccount(ctx, accountID, params) logs, pagination, err := s.usageRepo.ListByAccount(ctx, accountID, params)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("list usage logs: %w", err) return nil, nil, fmt.Errorf("list usage logs: %w", err)
...@@ -243,7 +242,7 @@ func (s *UsageService) GetDailyStats(ctx context.Context, userID int64, days int ...@@ -243,7 +242,7 @@ func (s *UsageService) GetDailyStats(ctx context.Context, userID int64, days int
} }
// calculateStats 计算统计数据 // calculateStats 计算统计数据
func (s *UsageService) calculateStats(logs []model.UsageLog) *UsageStats { func (s *UsageService) calculateStats(logs []UsageLog) *UsageStats {
stats := &UsageStats{} stats := &UsageStats{}
for _, log := range logs { for _, log := range logs {
...@@ -313,7 +312,7 @@ func (s *UsageService) GetBatchApiKeyUsageStats(ctx context.Context, apiKeyIDs [ ...@@ -313,7 +312,7 @@ func (s *UsageService) GetBatchApiKeyUsageStats(ctx context.Context, apiKeyIDs [
} }
// ListWithFilters lists usage logs with admin filters. // ListWithFilters lists usage logs with admin filters.
func (s *UsageService) ListWithFilters(ctx context.Context, params pagination.PaginationParams, filters usagestats.UsageLogFilters) ([]model.UsageLog, *pagination.PaginationResult, error) { func (s *UsageService) ListWithFilters(ctx context.Context, params pagination.PaginationParams, filters usagestats.UsageLogFilters) ([]UsageLog, *pagination.PaginationResult, error) {
logs, result, err := s.usageRepo.ListWithFilters(ctx, params, filters) logs, result, err := s.usageRepo.ListWithFilters(ctx, params, filters)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("list usage logs with filters: %w", err) return nil, nil, fmt.Errorf("list usage logs with filters: %w", err)
......
backend/internal/service/user.go 0 → 100644
View file @ bfcd9501
package service
import (
"time"
"golang.org/x/crypto/bcrypt"
)
type User struct {
ID int64
Email string
Username string
Wechat string
Notes string
PasswordHash string
Role string
Balance float64
Concurrency int
Status string
AllowedGroups []int64
CreatedAt time.Time
UpdatedAt time.Time
ApiKeys []ApiKey
Subscriptions []UserSubscription
}
func (u *User) IsAdmin() bool {
return u.Role == RoleAdmin
}
func (u *User) IsActive() bool {
return u.Status == StatusActive
}
// CanBindGroup checks whether a user can bind to a given group.
// For standard groups:
// - If AllowedGroups is non-empty, only allow binding to IDs in that list.
// - If AllowedGroups is empty (nil or length 0), allow binding to any non-exclusive group.
func (u *User) CanBindGroup(groupID int64, isExclusive bool) bool {
if len(u.AllowedGroups) > 0 {
for _, id := range u.AllowedGroups {
if id == groupID {
return true
}
}
return false
}
return !isExclusive
}
func (u *User) SetPassword(password string) error {
hash, err := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
if err != nil {
return err
}
u.PasswordHash = string(hash)
return nil
}
func (u *User) CheckPassword(password string) bool {
return bcrypt.CompareHashAndPassword([]byte(u.PasswordHash), []byte(password)) == nil
}
backend/internal/service/user_service.go
View file @ bfcd9501
...@@ -5,9 +5,7 @@ import ( ...@@ -5,9 +5,7 @@ import (
"fmt" "fmt"
infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors" infraerrors "github.com/Wei-Shaw/sub2api/internal/infrastructure/errors"
"github.com/Wei-Shaw/sub2api/internal/model"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination" "github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
"golang.org/x/crypto/bcrypt"
) )
var ( var (
...@@ -17,15 +15,15 @@ var ( ...@@ -17,15 +15,15 @@ var (
) )
type UserRepository interface { type UserRepository interface {
Create(ctx context.Context, user *model.User) error Create(ctx context.Context, user *User) error
GetByID(ctx context.Context, id int64) (*model.User, error) GetByID(ctx context.Context, id int64) (*User, error)
GetByEmail(ctx context.Context, email string) (*model.User, error) GetByEmail(ctx context.Context, email string) (*User, error)
GetFirstAdmin(ctx context.Context) (*model.User, error) GetFirstAdmin(ctx context.Context) (*User, error)
Update(ctx context.Context, user *model.User) error Update(ctx context.Context, user *User) error
Delete(ctx context.Context, id int64) error Delete(ctx context.Context, id int64) error
List(ctx context.Context, params pagination.PaginationParams) ([]model.User, *pagination.PaginationResult, error) List(ctx context.Context, params pagination.PaginationParams) ([]User, *pagination.PaginationResult, error)
ListWithFilters(ctx context.Context, params pagination.PaginationParams, status, role, search string) ([]model.User, *pagination.PaginationResult, error) ListWithFilters(ctx context.Context, params pagination.PaginationParams, status, role, search string) ([]User, *pagination.PaginationResult, error)
UpdateBalance(ctx context.Context, id int64, amount float64) error UpdateBalance(ctx context.Context, id int64, amount float64) error
DeductBalance(ctx context.Context, id int64, amount float64) error DeductBalance(ctx context.Context, id int64, amount float64) error
...@@ -61,7 +59,7 @@ func NewUserService(userRepo UserRepository) *UserService { ...@@ -61,7 +59,7 @@ func NewUserService(userRepo UserRepository) *UserService {
} }
// GetFirstAdmin 获取首个管理员用户（用于 Admin API Key 认证） // GetFirstAdmin 获取首个管理员用户（用于 Admin API Key 认证）
func (s *UserService) GetFirstAdmin(ctx context.Context) (*model.User, error) { func (s *UserService) GetFirstAdmin(ctx context.Context) (*User, error) {
admin, err := s.userRepo.GetFirstAdmin(ctx) admin, err := s.userRepo.GetFirstAdmin(ctx)
if err != nil { if err != nil {
return nil, fmt.Errorf("get first admin: %w", err) return nil, fmt.Errorf("get first admin: %w", err)
...@@ -70,7 +68,7 @@ func (s *UserService) GetFirstAdmin(ctx context.Context) (*model.User, error) { ...@@ -70,7 +68,7 @@ func (s *UserService) GetFirstAdmin(ctx context.Context) (*model.User, error) {
} }
// GetProfile 获取用户资料 // GetProfile 获取用户资料
func (s *UserService) GetProfile(ctx context.Context, userID int64) (*model.User, error) { func (s *UserService) GetProfile(ctx context.Context, userID int64) (*User, error) {
user, err := s.userRepo.GetByID(ctx, userID) user, err := s.userRepo.GetByID(ctx, userID)
if err != nil { if err != nil {
return nil, fmt.Errorf("get user: %w", err) return nil, fmt.Errorf("get user: %w", err)
...@@ -79,7 +77,7 @@ func (s *UserService) GetProfile(ctx context.Context, userID int64) (*model.User ...@@ -79,7 +77,7 @@ func (s *UserService) GetProfile(ctx context.Context, userID int64) (*model.User
} }
// UpdateProfile 更新用户资料 // UpdateProfile 更新用户资料
func (s *UserService) UpdateProfile(ctx context.Context, userID int64, req UpdateProfileRequest) (*model.User, error) { func (s *UserService) UpdateProfile(ctx context.Context, userID int64, req UpdateProfileRequest) (*User, error) {
user, err := s.userRepo.GetByID(ctx, userID) user, err := s.userRepo.GetByID(ctx, userID)
if err != nil { if err != nil {
return nil, fmt.Errorf("get user: %w", err) return nil, fmt.Errorf("get user: %w", err)
...@@ -125,18 +123,14 @@ func (s *UserService) ChangePassword(ctx context.Context, userID int64, req Chan ...@@ -125,18 +123,14 @@ func (s *UserService) ChangePassword(ctx context.Context, userID int64, req Chan
} }
// 验证当前密码 // 验证当前密码
if err := bcrypt.CompareHashAndPassword([]byte(user.PasswordHash), []byte(req.CurrentPassword)); err != nil { if !user.CheckPassword(req.CurrentPassword) {
return ErrPasswordIncorrect return ErrPasswordIncorrect
} }
// 生成新密码哈希 if err := user.SetPassword(req.NewPassword); err != nil {
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(req.NewPassword), bcrypt.DefaultCost) return fmt.Errorf("set password: %w", err)
if err != nil {
return fmt.Errorf("hash password: %w", err)
} }
user.PasswordHash = string(hashedPassword)
if err := s.userRepo.Update(ctx, user); err != nil { if err := s.userRepo.Update(ctx, user); err != nil {
return fmt.Errorf("update user: %w", err) return fmt.Errorf("update user: %w", err)
} }
...@@ -145,7 +139,7 @@ func (s *UserService) ChangePassword(ctx context.Context, userID int64, req Chan ...@@ -145,7 +139,7 @@ func (s *UserService) ChangePassword(ctx context.Context, userID int64, req Chan
} }
// GetByID 根据ID获取用户（管理员功能） // GetByID 根据ID获取用户（管理员功能）
func (s *UserService) GetByID(ctx context.Context, id int64) (*model.User, error) { func (s *UserService) GetByID(ctx context.Context, id int64) (*User, error) {
user, err := s.userRepo.GetByID(ctx, id) user, err := s.userRepo.GetByID(ctx, id)
if err != nil { if err != nil {
return nil, fmt.Errorf("get user: %w", err) return nil, fmt.Errorf("get user: %w", err)
...@@ -154,7 +148,7 @@ func (s *UserService) GetByID(ctx context.Context, id int64) (*model.User, error ...@@ -154,7 +148,7 @@ func (s *UserService) GetByID(ctx context.Context, id int64) (*model.User, error
} }
// List 获取用户列表（管理员功能） // List 获取用户列表（管理员功能）
func (s *UserService) List(ctx context.Context, params pagination.PaginationParams) ([]model.User, *pagination.PaginationResult, error) { func (s *UserService) List(ctx context.Context, params pagination.PaginationParams) ([]User, *pagination.PaginationResult, error) {
users, pagination, err := s.userRepo.List(ctx, params) users, pagination, err := s.userRepo.List(ctx, params)
if err != nil { if err != nil {
return nil, nil, fmt.Errorf("list users: %w", err) return nil, nil, fmt.Errorf("list users: %w", err)
......
backend/internal/model/user_subscription.go → backend/internal/service/user_subscription.go
View file @ bfcd9501
package model package service
import ( import "time"
"time"
)
// 订阅状态常量
const (
SubscriptionStatusActive = "active"
SubscriptionStatusExpired = "expired"
SubscriptionStatusSuspended = "suspended"
)
// UserSubscription 用户订阅模型
type UserSubscription struct { type UserSubscription struct {
ID int64 `gorm:"primaryKey" json:"id"` ID int64
UserID int64 `gorm:"index;not null" json:"user_id"` UserID int64
GroupID int64 `gorm:"index;not null" json:"group_id"` GroupID int64
// 订阅有效期 StartsAt time.Time
StartsAt time.Time `gorm:"not null" json:"starts_at"` ExpiresAt time.Time
ExpiresAt time.Time `gorm:"not null" json:"expires_at"` Status string
Status string `gorm:"size:20;default:active;not null" json:"status"` // active/expired/suspended
DailyWindowStart *time.Time
// 滑动窗口起始时间（nil = 未激活） WeeklyWindowStart *time.Time
DailyWindowStart *time.Time `json:"daily_window_start"` MonthlyWindowStart *time.Time
WeeklyWindowStart *time.Time `json:"weekly_window_start"`
MonthlyWindowStart *time.Time `json:"monthly_window_start"` DailyUsageUSD float64
WeeklyUsageUSD float64
// 当前窗口已用额度（USD，基于 total_cost 计算） MonthlyUsageUSD float64
DailyUsageUSD float64 `gorm:"type:decimal(20,10);default:0;not null" json:"daily_usage_usd"`
WeeklyUsageUSD float64 `gorm:"type:decimal(20,10);default:0;not null" json:"weekly_usage_usd"` AssignedBy *int64
MonthlyUsageUSD float64 `gorm:"type:decimal(20,10);default:0;not null" json:"monthly_usage_usd"` AssignedAt time.Time
Notes string
// 管理员分配信息
AssignedBy *int64 `gorm:"index" json:"assigned_by"` CreatedAt time.Time
AssignedAt time.Time `gorm:"not null" json:"assigned_at"` UpdatedAt time.Time
Notes string `gorm:"type:text" json:"notes"`
CreatedAt time.Time `gorm:"not null" json:"created_at"`
UpdatedAt time.Time `gorm:"not null" json:"updated_at"`
// 关联
User *User `gorm:"foreignKey:UserID" json:"user,omitempty"`
Group *Group `gorm:"foreignKey:GroupID" json:"group,omitempty"`
AssignedByUser *User `gorm:"foreignKey:AssignedBy" json:"assigned_by_user,omitempty"`
}
func (UserSubscription) TableName() string { User *User
return "user_subscriptions" Group *Group
AssignedByUser *User
} }
// IsActive 检查订阅是否有效（状态为active且未过期）
func (s *UserSubscription) IsActive() bool { func (s *UserSubscription) IsActive() bool {
return s.Status == SubscriptionStatusActive && time.Now().Before(s.ExpiresAt) return s.Status == SubscriptionStatusActive && time.Now().Before(s.ExpiresAt)
} }
// IsExpired 检查订阅是否已过期
func (s *UserSubscription) IsExpired() bool { func (s *UserSubscription) IsExpired() bool {
return time.Now().After(s.ExpiresAt) return time.Now().After(s.ExpiresAt)
} }
// DaysRemaining 返回订阅剩余天数
func (s *UserSubscription) DaysRemaining() int { func (s *UserSubscription) DaysRemaining() int {
if s.IsExpired() { if s.IsExpired() {
return 0 return 0
...@@ -68,12 +46,10 @@ func (s *UserSubscription) DaysRemaining() int { ...@@ -68,12 +46,10 @@ func (s *UserSubscription) DaysRemaining() int {
return int(time.Until(s.ExpiresAt).Hours() / 24) return int(time.Until(s.ExpiresAt).Hours() / 24)
} }
// IsWindowActivated 检查窗口是否已激活
func (s *UserSubscription) IsWindowActivated() bool { func (s *UserSubscription) IsWindowActivated() bool {
return s.DailyWindowStart != nil || s.WeeklyWindowStart != nil || s.MonthlyWindowStart != nil return s.DailyWindowStart != nil || s.WeeklyWindowStart != nil || s.MonthlyWindowStart != nil
} }
// NeedsDailyReset 检查日窗口是否需要重置
func (s *UserSubscription) NeedsDailyReset() bool { func (s *UserSubscription) NeedsDailyReset() bool {
if s.DailyWindowStart == nil { if s.DailyWindowStart == nil {
return false return false
...@@ -81,7 +57,6 @@ func (s *UserSubscription) NeedsDailyReset() bool { ...@@ -81,7 +57,6 @@ func (s *UserSubscription) NeedsDailyReset() bool {
return time.Since(*s.DailyWindowStart) >= 24*time.Hour return time.Since(*s.DailyWindowStart) >= 24*time.Hour
} }
// NeedsWeeklyReset 检查周窗口是否需要重置
func (s *UserSubscription) NeedsWeeklyReset() bool { func (s *UserSubscription) NeedsWeeklyReset() bool {
if s.WeeklyWindowStart == nil { if s.WeeklyWindowStart == nil {
return false return false
...@@ -89,7 +64,6 @@ func (s *UserSubscription) NeedsWeeklyReset() bool { ...@@ -89,7 +64,6 @@ func (s *UserSubscription) NeedsWeeklyReset() bool {
return time.Since(*s.WeeklyWindowStart) >= 7*24*time.Hour return time.Since(*s.WeeklyWindowStart) >= 7*24*time.Hour
} }
// NeedsMonthlyReset 检查月窗口是否需要重置
func (s *UserSubscription) NeedsMonthlyReset() bool { func (s *UserSubscription) NeedsMonthlyReset() bool {
if s.MonthlyWindowStart == nil { if s.MonthlyWindowStart == nil {
return false return false
...@@ -97,7 +71,6 @@ func (s *UserSubscription) NeedsMonthlyReset() bool { ...@@ -97,7 +71,6 @@ func (s *UserSubscription) NeedsMonthlyReset() bool {
return time.Since(*s.MonthlyWindowStart) >= 30*24*time.Hour return time.Since(*s.MonthlyWindowStart) >= 30*24*time.Hour
} }
// DailyResetTime 返回日窗口重置时间
func (s *UserSubscription) DailyResetTime() *time.Time { func (s *UserSubscription) DailyResetTime() *time.Time {
if s.DailyWindowStart == nil { if s.DailyWindowStart == nil {
return nil return nil
...@@ -106,7 +79,6 @@ func (s *UserSubscription) DailyResetTime() *time.Time { ...@@ -106,7 +79,6 @@ func (s *UserSubscription) DailyResetTime() *time.Time {
return &t return &t
} }
// WeeklyResetTime 返回周窗口重置时间
func (s *UserSubscription) WeeklyResetTime() *time.Time { func (s *UserSubscription) WeeklyResetTime() *time.Time {
if s.WeeklyWindowStart == nil { if s.WeeklyWindowStart == nil {
return nil return nil
...@@ -115,7 +87,6 @@ func (s *UserSubscription) WeeklyResetTime() *time.Time { ...@@ -115,7 +87,6 @@ func (s *UserSubscription) WeeklyResetTime() *time.Time {
return &t return &t
} }
// MonthlyResetTime 返回月窗口重置时间
func (s *UserSubscription) MonthlyResetTime() *time.Time { func (s *UserSubscription) MonthlyResetTime() *time.Time {
if s.MonthlyWindowStart == nil { if s.MonthlyWindowStart == nil {
return nil return nil
...@@ -124,31 +95,27 @@ func (s *UserSubscription) MonthlyResetTime() *time.Time { ...@@ -124,31 +95,27 @@ func (s *UserSubscription) MonthlyResetTime() *time.Time {
return &t return &t
} }
// CheckDailyLimit 检查是否超出日限额
func (s *UserSubscription) CheckDailyLimit(group *Group, additionalCost float64) bool { func (s *UserSubscription) CheckDailyLimit(group *Group, additionalCost float64) bool {
if !group.HasDailyLimit() { if !group.HasDailyLimit() {
return true // 无限制 return true
} }
return s.DailyUsageUSD+additionalCost <= *group.DailyLimitUSD return s.DailyUsageUSD+additionalCost <= *group.DailyLimitUSD
} }
// CheckWeeklyLimit 检查是否超出周限额
func (s *UserSubscription) CheckWeeklyLimit(group *Group, additionalCost float64) bool { func (s *UserSubscription) CheckWeeklyLimit(group *Group, additionalCost float64) bool {
if !group.HasWeeklyLimit() { if !group.HasWeeklyLimit() {
return true // 无限制 return true
} }
return s.WeeklyUsageUSD+additionalCost <= *group.WeeklyLimitUSD return s.WeeklyUsageUSD+additionalCost <= *group.WeeklyLimitUSD
} }
// CheckMonthlyLimit 检查是否超出月限额
func (s *UserSubscription) CheckMonthlyLimit(group *Group, additionalCost float64) bool { func (s *UserSubscription) CheckMonthlyLimit(group *Group, additionalCost float64) bool {
if !group.HasMonthlyLimit() { if !group.HasMonthlyLimit() {
return true // 无限制 return true
} }
return s.MonthlyUsageUSD+additionalCost <= *group.MonthlyLimitUSD return s.MonthlyUsageUSD+additionalCost <= *group.MonthlyLimitUSD
} }
// CheckAllLimits 检查所有限额
func (s *UserSubscription) CheckAllLimits(group *Group, additionalCost float64) (daily, weekly, monthly bool) { func (s *UserSubscription) CheckAllLimits(group *Group, additionalCost float64) (daily, weekly, monthly bool) {
daily = s.CheckDailyLimit(group, additionalCost) daily = s.CheckDailyLimit(group, additionalCost)
weekly = s.CheckWeeklyLimit(group, additionalCost) weekly = s.CheckWeeklyLimit(group, additionalCost)
......
backend/internal/service/user_subscription_port.go
View file @ bfcd9501
...@@ -4,22 +4,21 @@ import ( ...@@ -4,22 +4,21 @@ import (
"context" "context"
"time" "time"
"github.com/Wei-Shaw/sub2api/internal/model"
"github.com/Wei-Shaw/sub2api/internal/pkg/pagination" "github.com/Wei-Shaw/sub2api/internal/pkg/pagination"
) )
type UserSubscriptionRepository interface { type UserSubscriptionRepository interface {
Create(ctx context.Context, sub *model.UserSubscription) error Create(ctx context.Context, sub *UserSubscription) error
GetByID(ctx context.Context, id int64) (*model.UserSubscription, error) GetByID(ctx context.Context, id int64) (*UserSubscription, error)
GetByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (*model.UserSubscription, error) GetByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (*UserSubscription, error)
GetActiveByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (*model.UserSubscription, error) GetActiveByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (*UserSubscription, error)
Update(ctx context.Context, sub *model.UserSubscription) error Update(ctx context.Context, sub *UserSubscription) error
Delete(ctx context.Context, id int64) error Delete(ctx context.Context, id int64) error
ListByUserID(ctx context.Context, userID int64) ([]model.UserSubscription, error) ListByUserID(ctx context.Context, userID int64) ([]UserSubscription, error)
ListActiveByUserID(ctx context.Context, userID int64) ([]model.UserSubscription, error) ListActiveByUserID(ctx context.Context, userID int64) ([]UserSubscription, error)
ListByGroupID(ctx context.Context, groupID int64, params pagination.PaginationParams) ([]model.UserSubscription, *pagination.PaginationResult, error) ListByGroupID(ctx context.Context, groupID int64, params pagination.PaginationParams) ([]UserSubscription, *pagination.PaginationResult, error)
List(ctx context.Context, params pagination.PaginationParams, userID, groupID *int64, status string) ([]model.UserSubscription, *pagination.PaginationResult, error) List(ctx context.Context, params pagination.PaginationParams, userID, groupID *int64, status string) ([]UserSubscription, *pagination.PaginationResult, error)
ExistsByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (bool, error) ExistsByUserIDAndGroupID(ctx context.Context, userID, groupID int64) (bool, error)
ExtendExpiry(ctx context.Context, subscriptionID int64, newExpiresAt time.Time) error ExtendExpiry(ctx context.Context, subscriptionID int64, newExpiresAt time.Time) error
......
backend/internal/setup/setup.go
View file @ bfcd9501
...@@ -10,10 +10,10 @@ import ( ...@@ -10,10 +10,10 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/Wei-Shaw/sub2api/internal/model" "github.com/Wei-Shaw/sub2api/internal/repository"
"github.com/Wei-Shaw/sub2api/internal/service"
"github.com/redis/go-redis/v9" "github.com/redis/go-redis/v9"
"golang.org/x/crypto/bcrypt"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"gorm.io/driver/postgres" "gorm.io/driver/postgres"
"gorm.io/gorm" "gorm.io/gorm"
...@@ -271,8 +271,7 @@ func initializeDatabase(cfg *SetupConfig) error { ...@@ -271,8 +271,7 @@ func initializeDatabase(cfg *SetupConfig) error {
} }
}() }()
// 使用 model 包的 AutoMigrate，确保模型定义统一 return repository.AutoMigrate(db)
return model.AutoMigrate(db)
} }
func createAdminUser(cfg *SetupConfig) error { func createAdminUser(cfg *SetupConfig) error {
...@@ -299,29 +298,28 @@ func createAdminUser(cfg *SetupConfig) error { ...@@ -299,29 +298,28 @@ func createAdminUser(cfg *SetupConfig) error {
// Check if admin already exists // Check if admin already exists
var count int64 var count int64
db.Model(&model.User{}).Where("role = ?", "admin").Count(&count) if err := db.Table("users").Where("role = ?", service.RoleAdmin).Count(&count).Error; err != nil {
return err
}
if count > 0 { if count > 0 {
return nil // Admin already exists return nil // Admin already exists
} }
// Hash password admin := &service.User{
hashedPassword, err := bcrypt.GenerateFromPassword([]byte(cfg.Admin.Password), bcrypt.DefaultCost) Email: cfg.Admin.Email,
if err != nil { Role: service.RoleAdmin,
return err Status: service.StatusActive,
Balance: 0,
Concurrency: 5,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
} }
// Create admin user if err := admin.SetPassword(cfg.Admin.Password); err != nil {
admin := &model.User{ return err
Email: cfg.Admin.Email,
PasswordHash: string(hashedPassword),
Role: model.RoleAdmin,
Status: model.StatusActive,
Balance: 0,
CreatedAt: time.Now(),
UpdatedAt: time.Now(),
} }
return db.Create(admin).Error return repository.NewUserRepository(db).Create(context.Background(), admin)
} }
func writeConfigFile(cfg *SetupConfig) error { func writeConfigFile(cfg *SetupConfig) error {
......
deploy/docker-compose.yml
View file @ bfcd9501
...@@ -141,6 +141,8 @@ services: ...@@ -141,6 +141,8 @@ services:
${REDIS_PASSWORD:+--requirepass ${REDIS_PASSWORD}} ${REDIS_PASSWORD:+--requirepass ${REDIS_PASSWORD}}
environment: environment:
- TZ=${TZ:-Asia/Shanghai} - TZ=${TZ:-Asia/Shanghai}
# REDISCLI_AUTH is used by redis-cli for authentication (safer than -a flag)
- REDISCLI_AUTH=${REDIS_PASSWORD:-}
networks: networks:
- sub2api-network - sub2api-network
healthcheck: healthcheck:
......
deploy/install.sh
View file @ bfcd9501
...@@ -122,6 +122,10 @@ declare -A MSG_ZH=( ...@@ -122,6 +122,10 @@ declare -A MSG_ZH=(
["removing_user"]="正在移除用户..." ["removing_user"]="正在移除用户..."
["config_not_removed"]="配置目录未被移除" ["config_not_removed"]="配置目录未被移除"
["remove_manually"]="如不再需要，请手动删除" ["remove_manually"]="如不再需要，请手动删除"
["removing_install_lock"]="正在移除安装锁文件..."
["install_lock_removed"]="安装锁文件已移除，重新安装时将进入设置向导"
["purge_prompt"]="是否同时删除配置目录？这将清除所有配置和数据 [y/N]: "
["removing_config_dir"]="正在移除配置目录..."
["uninstall_complete"]="Sub2API 已卸载" ["uninstall_complete"]="Sub2API 已卸载"
# Help # Help
...@@ -243,6 +247,10 @@ declare -A MSG_EN=( ...@@ -243,6 +247,10 @@ declare -A MSG_EN=(
["removing_user"]="Removing user..." ["removing_user"]="Removing user..."
["config_not_removed"]="Config directory was NOT removed." ["config_not_removed"]="Config directory was NOT removed."
["remove_manually"]="Remove it manually if you no longer need it." ["remove_manually"]="Remove it manually if you no longer need it."
["removing_install_lock"]="Removing install lock file..."
["install_lock_removed"]="Install lock removed. Setup wizard will appear on next install."
["purge_prompt"]="Also remove config directory? This will delete all config and data [y/N]: "
["removing_config_dir"]="Removing config directory..."
["uninstall_complete"]="Sub2API has been uninstalled" ["uninstall_complete"]="Sub2API has been uninstalled"
# Help # Help
...@@ -926,8 +934,31 @@ uninstall() { ...@@ -926,8 +934,31 @@ uninstall() {
print_info "$(msg 'removing_user')" print_info "$(msg 'removing_user')"
userdel "$SERVICE_USER" 2>/dev/null || true userdel "$SERVICE_USER" 2>/dev/null || true
print_warning "$(msg 'config_not_removed'): $CONFIG_DIR" # Remove install lock file (.installed) to allow fresh setup on reinstall
print_warning "$(msg 'remove_manually')" print_info "$(msg 'removing_install_lock')"
rm -f "$CONFIG_DIR/.installed" 2>/dev/null || true
rm -f "$INSTALL_DIR/.installed" 2>/dev/null || true
print_success "$(msg 'install_lock_removed')"
# Ask about config directory removal (interactive mode only)
local remove_config=false
if [ "${PURGE:-}" = "true" ]; then
remove_config=true
elif is_interactive; then
read -p "$(msg 'purge_prompt')" -n 1 -r < /dev/tty
echo
if [[ $REPLY =~ ^[Yy]$ ]]; then
remove_config=true
fi
fi
if [ "$remove_config" = true ]; then
print_info "$(msg 'removing_config_dir')"
rm -rf "$CONFIG_DIR"
else
print_warning "$(msg 'config_not_removed'): $CONFIG_DIR"
print_warning "$(msg 'remove_manually')"
fi
print_success "$(msg 'uninstall_complete')" print_success "$(msg 'uninstall_complete')"
} }
...@@ -944,6 +975,10 @@ main() { ...@@ -944,6 +975,10 @@ main() {
FORCE_YES="true" FORCE_YES="true"
shift shift
;; ;;
--purge)
PURGE="true"
shift
;;
-v|--version) -v|--version)
if [ -n "${2:-}" ] && [[ ! "$2" =~ ^- ]]; then if [ -n "${2:-}" ] && [[ ! "$2" =~ ^- ]]; then
target_version="$2" target_version="$2"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment