csxj2026/junhong_cmp_fiber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

add: 提交部分表设计

Browse Source 
update: 1.所有model嵌入gorm公用model 2.所有model嵌入BaseModel
This commit is contained in:
huang
2025-12-15 11:32:33 +08:00
parent 4455b39e42
commit ad946af5ee
21 changed files with 1109 additions and 321 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/integration/account_role_test.go
View File

@@ -91,8 +91,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(account)
@@ -101,8 +99,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
RoleName: "单角色测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -122,8 +118,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(account)
@@ -135,8 +129,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
RoleName: "多角色测试_" + string(rune('A'+i)),
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(roles[i])
roleIDs[i] = roles[i].ID
@@ -156,8 +148,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(account)
@@ -166,8 +156,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
RoleName: "获取角色列表测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -189,8 +177,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(account)
@@ -199,8 +185,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
RoleName: "移除角色测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -226,8 +210,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(account)
@@ -236,8 +218,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
RoleName: "重复分配测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -260,8 +240,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
RoleName: "账号不存在测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -276,8 +254,6 @@ func TestAccountRoleAssociation_AssignRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(account)
@@ -341,8 +317,6 @@ func TestAccountRoleAssociation_SoftDelete(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(account)
@@ -350,8 +324,6 @@ func TestAccountRoleAssociation_SoftDelete(t *testing.T) {
RoleName: "恢复角色测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)

24
tests/integration/account_test.go
View File

@@ -178,8 +178,6 @@ func TestAccountAPI_Create(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypeRoot,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, rootAccount)
@@ -220,8 +218,6 @@ func TestAccountAPI_Create(t *testing.T) {
UserType: constants.UserTypePlatform,
ParentID: &rootAccount.ID,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, existingAccount)
@@ -290,8 +286,6 @@ func TestAccountAPI_Get(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, testAccount)
@@ -350,8 +344,6 @@ func TestAccountAPI_Update(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, testAccount)
@@ -397,8 +389,6 @@ func TestAccountAPI_Delete(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, testAccount)
@@ -436,8 +426,6 @@ func TestAccountAPI_List(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, account)
}
@@ -482,8 +470,6 @@ func TestAccountAPI_AssignRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, testAccount)
@@ -492,8 +478,6 @@ func TestAccountAPI_AssignRoles(t *testing.T) {
RoleName: "测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -537,8 +521,6 @@ func TestAccountAPI_GetRoles(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, testAccount)
@@ -547,8 +529,6 @@ func TestAccountAPI_GetRoles(t *testing.T) {
RoleName: "获取角色测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -594,8 +574,6 @@ func TestAccountAPI_RemoveRole(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
createTestAccount(t, env.db, testAccount)
@@ -604,8 +582,6 @@ func TestAccountAPI_RemoveRole(t *testing.T) {
RoleName: "移除角色测试",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)

8
tests/integration/api_regression_test.go
View File

@@ -210,8 +210,6 @@ func TestAPIRegression_RouteModularization(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(account)
@@ -234,8 +232,6 @@ func TestAPIRegression_RouteModularization(t *testing.T) {
RoleName: "回归测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(role)
@@ -259,8 +255,6 @@ func TestAPIRegression_RouteModularization(t *testing.T) {
PermCode: "regression:test:perm",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(perm)
@@ -328,8 +322,6 @@ func TestAPIRegression_Pagination(t *testing.T) {
Password: "hashedpassword",
UserType: constants.UserTypePlatform,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(account)
}

18
tests/integration/permission_test.go
View File

@@ -155,8 +155,6 @@ func TestPermissionAPI_Create(t *testing.T) {
PermCode: "existing:perm",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(existingPerm)
@@ -187,8 +185,6 @@ func TestPermissionAPI_Create(t *testing.T) {
PermCode: "system:manage",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(parentPerm)
@@ -235,8 +231,6 @@ func TestPermissionAPI_Get(t *testing.T) {
PermCode: "get:test:perm",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testPerm)
@@ -283,8 +277,6 @@ func TestPermissionAPI_Update(t *testing.T) {
PermCode: "update:test:perm",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testPerm)
@@ -329,8 +321,6 @@ func TestPermissionAPI_Delete(t *testing.T) {
PermCode: "delete:test:perm",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testPerm)
@@ -367,8 +357,6 @@ func TestPermissionAPI_List(t *testing.T) {
PermCode: fmt.Sprintf("list:test:perm:%d", i),
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(perm)
}
@@ -413,8 +401,6 @@ func TestPermissionAPI_GetTree(t *testing.T) {
PermCode: "system",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(rootPerm)
@@ -425,8 +411,6 @@ func TestPermissionAPI_GetTree(t *testing.T) {
PermType: constants.PermissionTypeMenu,
ParentID: &rootPerm.ID,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(childPerm)
@@ -437,8 +421,6 @@ func TestPermissionAPI_GetTree(t *testing.T) {
PermType: constants.PermissionTypeButton,
ParentID: &childPerm.ID,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(grandchildPerm)

44
tests/integration/role_permission_test.go
View File

@@ -72,8 +72,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
RoleName: "单权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -83,8 +81,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
PermCode: "single:perm:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
@@ -102,8 +98,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
RoleName: "多权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -115,8 +109,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
PermCode: "multi:perm:test:" + string(rune('a'+i)),
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
permIDs[i] = perm.ID
@@ -134,8 +126,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
RoleName: "获取权限列表测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -145,8 +135,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
PermCode: "get:perm:list:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
@@ -166,8 +154,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
RoleName: "移除权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -177,8 +163,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
PermCode: "remove:perm:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
@@ -202,8 +186,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
RoleName: "重复权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -213,8 +195,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
PermCode: "duplicate:perm:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
@@ -238,8 +218,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
PermCode: "role:not:exist:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
@@ -252,8 +230,6 @@ func TestRolePermissionAssociation_AssignPermissions(t *testing.T) {
RoleName: "权限不存在测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -302,8 +278,6 @@ func TestRolePermissionAssociation_SoftDelete(t *testing.T) {
RoleName: "恢复权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -312,8 +286,6 @@ func TestRolePermissionAssociation_SoftDelete(t *testing.T) {
PermCode: "restore:perm:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
@@ -342,8 +314,6 @@ func TestRolePermissionAssociation_SoftDelete(t *testing.T) {
RoleName: "批量权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -355,8 +325,6 @@ func TestRolePermissionAssociation_SoftDelete(t *testing.T) {
PermCode: "batch:perm:test:" + string(rune('a'+i)),
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
permIDs[i] = perm.ID
@@ -417,8 +385,6 @@ func TestRolePermissionAssociation_Cascade(t *testing.T) {
RoleName: "级联测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(role)
@@ -427,18 +393,14 @@ func TestRolePermissionAssociation_Cascade(t *testing.T) {
PermCode: "cascade:test:perm",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
db.Create(perm)
// 创建关联
rp := &model.RolePermission{
RoleID: role.ID,
PermID: perm.ID,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
RoleID: role.ID,
PermID: perm.ID,
Status: constants.StatusEnabled,
}
db.Create(rp)

36
tests/integration/role_test.go
View File

@@ -226,8 +226,6 @@ func TestRoleAPI_Get(t *testing.T) {
RoleName: "获取测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -273,8 +271,6 @@ func TestRoleAPI_Update(t *testing.T) {
RoleName: "更新测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -318,8 +314,6 @@ func TestRoleAPI_Delete(t *testing.T) {
RoleName: "删除测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -355,8 +349,6 @@ func TestRoleAPI_List(t *testing.T) {
RoleName: fmt.Sprintf("列表测试角色_%d", i),
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(role)
}
@@ -392,8 +384,6 @@ func TestRoleAPI_AssignPermissions(t *testing.T) {
RoleName: "权限分配测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -403,8 +393,6 @@ func TestRoleAPI_AssignPermissions(t *testing.T) {
PermCode: "test:permission",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testPerm)
@@ -446,8 +434,6 @@ func TestRoleAPI_GetPermissions(t *testing.T) {
RoleName: "获取权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -457,17 +443,13 @@ func TestRoleAPI_GetPermissions(t *testing.T) {
PermCode: "get:permission:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testPerm)
rolePerm := &model.RolePermission{
RoleID: testRole.ID,
PermID: testPerm.ID,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
RoleID: testRole.ID,
PermID: testPerm.ID,
Status: constants.StatusEnabled,
}
env.db.Create(rolePerm)
@@ -502,8 +484,6 @@ func TestRoleAPI_RemovePermission(t *testing.T) {
RoleName: "移除权限测试角色",
RoleType: constants.RoleTypeSuper,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testRole)
@@ -513,17 +493,13 @@ func TestRoleAPI_RemovePermission(t *testing.T) {
PermCode: "remove:permission:test",
PermType: constants.PermissionTypeMenu,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
}
env.db.Create(testPerm)
rolePerm := &model.RolePermission{
RoleID: testRole.ID,
PermID: testPerm.ID,
Status: constants.StatusEnabled,
Creator: 1,
Updater: 1,
RoleID: testRole.ID,
PermID: testPerm.ID,
Status: constants.StatusEnabled,
}
env.db.Create(rolePerm)