refactor: complete backend rewrite for multi-protocol proxy
Major rewrite of the Go backend to support:
- Three API format imports: openai, anthropic, compatible
- Three protocol conversions: Chat Completions, Responses, Messages
- Hub-and-spoke architecture with Chat as intermediate format
Deleted:
- opencat.go (old entry)
- store/, team/, pkg/team/, pkg/store/ (old data layer)
- internal/model/, internal/consts/ (old types)
- internal/service/team/, internal/controller/team/ (old handlers)
- llm/ (removed LLM client library, pure proxy mode)
- dist/, assets/ (old build artifacts)
Added:
- internal/store/ — 9 GORM models + multi-DB support
- internal/pkg/ — crypto (AES-GCM), apikey, jwt, ratelimit, resp, tokenizer
- internal/channel/ — channel selection, weighted LB, health checks
- internal/proxy/convert/ — 6 protocol conversion functions + SSE streaming
- internal/proxy/ — gateway with request dispatch and upstream selection
- internal/usage/ — async usage recorder with batch writes
- internal/api/ — management API (auth, users, keys, channels, models)
- Makefile for build/test/deploy
Fixed API to match frontend expectations:
- Login response wraps token in { data: { token } }
- GET /api/profile route added
- Profile response wraps user in { code, data }
- Role returned as number (10=admin, 1=user)
This commit is contained in:
Sakurasan
+24
-125
@@ -1,32 +1,11 @@
|
||||
package dao
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"opencatd-open/internal/model"
|
||||
"time"
|
||||
"opencatd-open/internal/store"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
// 确保 UserDAO 实现了 UserRepository 接口
|
||||
var _ UserRepository = (*UserDAO)(nil)
|
||||
|
||||
// UserRepository 定义用户数据访问操作的接口
|
||||
type UserRepository interface {
|
||||
Create(user *model.User) error
|
||||
GetByID(id int64) (*model.User, error)
|
||||
GetByUsername(username string) (*model.User, error)
|
||||
Update(user *model.User) error
|
||||
Delete(id int64) error
|
||||
List(limit, offset int, condition map[string]interface{}) ([]model.User, int64, error)
|
||||
// Enable(id int64) error
|
||||
// Disable(id int64) error
|
||||
BatchEnable(ids []int64, condition []string) error
|
||||
BatchDisable(ids []int64, condition []string) error
|
||||
BatchDelete(ids []int64, condition []string) error
|
||||
}
|
||||
|
||||
type UserDAO struct {
|
||||
db *gorm.DB
|
||||
}
|
||||
@@ -35,129 +14,49 @@ func NewUserDAO(db *gorm.DB) *UserDAO {
|
||||
return &UserDAO{db: db}
|
||||
}
|
||||
|
||||
// 创建用户
|
||||
func (dao *UserDAO) Create(user *model.User) error {
|
||||
if user == nil {
|
||||
return errors.New("user is nil")
|
||||
}
|
||||
fmt.Println(*user)
|
||||
|
||||
return dao.db.Transaction(func(tx *gorm.DB) error {
|
||||
// 创建用户
|
||||
if err := tx.Create(user).Error; err != nil {
|
||||
return fmt.Errorf("failed to create user: %w", err)
|
||||
}
|
||||
|
||||
return nil
|
||||
})
|
||||
func (d *UserDAO) Create(user *store.User) error {
|
||||
return d.db.Create(user).Error
|
||||
}
|
||||
|
||||
// 根据ID获取用户
|
||||
func (dao *UserDAO) GetByID(id int64) (*model.User, error) {
|
||||
var user model.User
|
||||
// err := dao.db.First(&user, id).Error
|
||||
err := dao.db.Preload("Tokens", "user_id = ?", id).First(&user, id).Error
|
||||
func (d *UserDAO) GetByID(id uint64) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.First(&user, id).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
// 根据用户名获取用户
|
||||
func (dao *UserDAO) GetByUsername(username string) (*model.User, error) {
|
||||
var user model.User
|
||||
// err := dao.db.Where("user_name = ?", username).First(&user).Error
|
||||
err := dao.db.Preload("Tokens").Where("user_name = ?", username).First(&user).Error
|
||||
func (d *UserDAO) GetByUsername(username string) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.Where("username = ?", username).First(&user).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
// 更新用户信息
|
||||
func (dao *UserDAO) Update(user *model.User) error {
|
||||
if user == nil {
|
||||
return errors.New("user is nil")
|
||||
func (d *UserDAO) GetByEmail(email string) (*store.User, error) {
|
||||
var user store.User
|
||||
err := d.db.Where("email = ?", email).First(&user).Error
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
user.UpdatedAt = time.Now().Unix()
|
||||
return dao.db.Save(user).Error
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
// 删除用户
|
||||
func (dao *UserDAO) Delete(id int64) error {
|
||||
return dao.db.Unscoped().Delete(&model.User{}, id).Error
|
||||
// return dao.db.Model(&model.User{}).Where("id = ?", id).Update("status", 2).Error
|
||||
}
|
||||
|
||||
// 获取用户列表
|
||||
func (dao *UserDAO) List(limit, offset int, condition map[string]interface{}) ([]model.User, int64, error) {
|
||||
if offset < 0 {
|
||||
offset = 0
|
||||
}
|
||||
var users []model.User
|
||||
func (d *UserDAO) List(limit, offset int) ([]*store.User, int64, error) {
|
||||
var users []*store.User
|
||||
var total int64
|
||||
|
||||
query := dao.db.Preload("Tokens").Model(&model.User{})
|
||||
|
||||
for k, v := range condition {
|
||||
query = query.Where(k, v)
|
||||
}
|
||||
err := query.Limit(limit).Offset(offset).Find(&users).Error
|
||||
if err != nil {
|
||||
return nil, 0, err
|
||||
}
|
||||
query = dao.db.Model(&model.User{})
|
||||
for k, v := range condition {
|
||||
query = query.Where(k, v)
|
||||
}
|
||||
query.Count(&total)
|
||||
|
||||
return users, total, nil
|
||||
d.db.Model(&store.User{}).Count(&total)
|
||||
err := d.db.Limit(limit).Offset(offset).Order("created_at DESC").Find(&users).Error
|
||||
return users, total, err
|
||||
}
|
||||
|
||||
// 启用User
|
||||
func (dao *UserDAO) Enable(id uint) error {
|
||||
return dao.db.Model(&model.User{}).Where("id = ?", id).Update("active", true).Error
|
||||
func (d *UserDAO) Update(user *store.User) error {
|
||||
return d.db.Save(user).Error
|
||||
}
|
||||
|
||||
// 禁用User
|
||||
func (dao *UserDAO) Disable(id uint) error {
|
||||
return dao.db.Model(&model.User{}).Where("id = ?", id).Update("active", false).Error
|
||||
}
|
||||
|
||||
// 批量启用User
|
||||
func (dao *UserDAO) BatchEnable(ids []int64, condition []string) error {
|
||||
if len(ids) == 0 {
|
||||
return errors.New("ids is empty")
|
||||
}
|
||||
query := dao.db.Model(&model.User{}).Where("id IN ?", ids)
|
||||
for _, value := range condition {
|
||||
query = query.Where(value)
|
||||
}
|
||||
return query.Update("active", true).Error
|
||||
}
|
||||
|
||||
// 批量禁用User
|
||||
func (dao *UserDAO) BatchDisable(ids []int64, condition []string) error {
|
||||
if len(ids) == 0 {
|
||||
return errors.New("ids is empty")
|
||||
}
|
||||
query := dao.db.Model(&model.User{}).Where("id IN ?", ids)
|
||||
for _, value := range condition {
|
||||
query = query.Where(value)
|
||||
}
|
||||
return query.Update("active", false).Error
|
||||
}
|
||||
|
||||
// 批量删除用户
|
||||
func (dao *UserDAO) BatchDelete(ids []int64, condition []string) error {
|
||||
if len(ids) == 0 {
|
||||
return errors.New("ids is empty")
|
||||
}
|
||||
query := dao.db.Unscoped().Where("id IN ?", ids)
|
||||
for _, value := range condition {
|
||||
query = query.Where(value)
|
||||
}
|
||||
return query.Delete(&model.User{}).Error
|
||||
func (d *UserDAO) Delete(id uint64) error {
|
||||
return d.db.Delete(&store.User{}, id).Error
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user