Merge branch 'main' into feature/antigravity_auth
This commit is contained in:
@@ -30,6 +30,11 @@ func AutoMigrate(db *gorm.DB) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// 创建默认分组(简易模式支持)
|
||||
if err := ensureDefaultGroups(db); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
// 修复无效的过期时间(年份超过 2099 会导致 JSON 序列化失败)
|
||||
return fixInvalidExpiresAt(db)
|
||||
}
|
||||
@@ -47,3 +52,55 @@ func fixInvalidExpiresAt(db *gorm.DB) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// ensureDefaultGroups 确保默认分组存在(简易模式支持)
|
||||
// 为每个平台创建一个默认分组,配置最大权限以确保简易模式下不受限制
|
||||
func ensureDefaultGroups(db *gorm.DB) error {
|
||||
defaultGroups := []struct {
|
||||
name string
|
||||
platform string
|
||||
description string
|
||||
}{
|
||||
{
|
||||
name: "anthropic-default",
|
||||
platform: "anthropic",
|
||||
description: "Default group for Anthropic accounts (Simple Mode)",
|
||||
},
|
||||
{
|
||||
name: "openai-default",
|
||||
platform: "openai",
|
||||
description: "Default group for OpenAI accounts (Simple Mode)",
|
||||
},
|
||||
{
|
||||
name: "gemini-default",
|
||||
platform: "gemini",
|
||||
description: "Default group for Gemini accounts (Simple Mode)",
|
||||
},
|
||||
}
|
||||
|
||||
for _, dg := range defaultGroups {
|
||||
var count int64
|
||||
if err := db.Model(&groupModel{}).Where("name = ?", dg.name).Count(&count).Error; err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if count == 0 {
|
||||
group := &groupModel{
|
||||
Name: dg.name,
|
||||
Description: dg.description,
|
||||
Platform: dg.platform,
|
||||
RateMultiplier: 1.0,
|
||||
IsExclusive: false,
|
||||
Status: "active",
|
||||
SubscriptionType: "standard",
|
||||
}
|
||||
if err := db.Create(group).Error; err != nil {
|
||||
log.Printf("[AutoMigrate] Failed to create default group %s: %v", dg.name, err)
|
||||
return err
|
||||
}
|
||||
log.Printf("[AutoMigrate] Created default group: %s (platform: %s)", dg.name, dg.platform)
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
@@ -82,8 +82,9 @@ func (s *GroupRepoSuite) TestList() {
|
||||
|
||||
groups, page, err := s.repo.List(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10})
|
||||
s.Require().NoError(err, "List")
|
||||
s.Require().Len(groups, 2)
|
||||
s.Require().Equal(int64(2), page.Total)
|
||||
// 3 default groups + 2 test groups = 5 total
|
||||
s.Require().Len(groups, 5)
|
||||
s.Require().Equal(int64(5), page.Total)
|
||||
}
|
||||
|
||||
func (s *GroupRepoSuite) TestListWithFilters_Platform() {
|
||||
@@ -92,8 +93,12 @@ func (s *GroupRepoSuite) TestListWithFilters_Platform() {
|
||||
|
||||
groups, _, err := s.repo.ListWithFilters(s.ctx, pagination.PaginationParams{Page: 1, PageSize: 10}, service.PlatformOpenAI, "", nil)
|
||||
s.Require().NoError(err)
|
||||
s.Require().Len(groups, 1)
|
||||
s.Require().Equal(service.PlatformOpenAI, groups[0].Platform)
|
||||
// 1 default openai group + 1 test openai group = 2 total
|
||||
s.Require().Len(groups, 2)
|
||||
// Verify all groups are OpenAI platform
|
||||
for _, g := range groups {
|
||||
s.Require().Equal(service.PlatformOpenAI, g.Platform)
|
||||
}
|
||||
}
|
||||
|
||||
func (s *GroupRepoSuite) TestListWithFilters_Status() {
|
||||
@@ -151,8 +156,17 @@ func (s *GroupRepoSuite) TestListActive() {
|
||||
|
||||
groups, err := s.repo.ListActive(s.ctx)
|
||||
s.Require().NoError(err, "ListActive")
|
||||
s.Require().Len(groups, 1)
|
||||
s.Require().Equal("active1", groups[0].Name)
|
||||
// 3 default groups (all active) + 1 test active group = 4 total
|
||||
s.Require().Len(groups, 4)
|
||||
// Verify our test group is in the results
|
||||
var found bool
|
||||
for _, g := range groups {
|
||||
if g.Name == "active1" {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
s.Require().True(found, "active1 group should be in results")
|
||||
}
|
||||
|
||||
func (s *GroupRepoSuite) TestListActiveByPlatform() {
|
||||
@@ -162,8 +176,17 @@ func (s *GroupRepoSuite) TestListActiveByPlatform() {
|
||||
|
||||
groups, err := s.repo.ListActiveByPlatform(s.ctx, service.PlatformAnthropic)
|
||||
s.Require().NoError(err, "ListActiveByPlatform")
|
||||
s.Require().Len(groups, 1)
|
||||
s.Require().Equal("g1", groups[0].Name)
|
||||
// 1 default anthropic group + 1 test active anthropic group = 2 total
|
||||
s.Require().Len(groups, 2)
|
||||
// Verify our test group is in the results
|
||||
var found bool
|
||||
for _, g := range groups {
|
||||
if g.Name == "g1" {
|
||||
found = true
|
||||
break
|
||||
}
|
||||
}
|
||||
s.Require().True(found, "g1 group should be in results")
|
||||
}
|
||||
|
||||
// --- ExistsByName ---
|
||||
|
||||
Reference in New Issue
Block a user