diff --git a/internal/db/models/admin_model.go b/internal/db/models/admin_model.go index 03e69fe1..ac1e08c2 100644 --- a/internal/db/models/admin_model.go +++ b/internal/db/models/admin_model.go @@ -2,6 +2,22 @@ package models import "github.com/iwind/TeaGo/dbs" +const ( + AdminFieldId dbs.FieldName = "id" // ID + AdminFieldIsOn dbs.FieldName = "isOn" // 是否启用 + AdminFieldUsername dbs.FieldName = "username" // 用户名 + AdminFieldPassword dbs.FieldName = "password" // 密码 + AdminFieldFullname dbs.FieldName = "fullname" // 全名 + AdminFieldIsSuper dbs.FieldName = "isSuper" // 是否为超级管理员 + AdminFieldCreatedAt dbs.FieldName = "createdAt" // 创建时间 + AdminFieldUpdatedAt dbs.FieldName = "updatedAt" // 修改时间 + AdminFieldState dbs.FieldName = "state" // 状态 + AdminFieldModules dbs.FieldName = "modules" // 允许的模块 + AdminFieldCanLogin dbs.FieldName = "canLogin" // 是否可以登录 + AdminFieldTheme dbs.FieldName = "theme" // 模板设置 + AdminFieldLang dbs.FieldName = "lang" // 语言代号 +) + // Admin 管理员 type Admin struct { Id uint32 `field:"id"` // ID @@ -16,6 +32,7 @@ type Admin struct { Modules dbs.JSON `field:"modules"` // 允许的模块 CanLogin bool `field:"canLogin"` // 是否可以登录 Theme string `field:"theme"` // 模板设置 + Lang string `field:"lang"` // 语言代号 } type AdminOperator struct { @@ -31,6 +48,7 @@ type AdminOperator struct { Modules any // 允许的模块 CanLogin any // 是否可以登录 Theme any // 模板设置 + Lang any // 语言代号 } func NewAdminOperator() *AdminOperator { diff --git a/internal/rpc/services/service_admin.go b/internal/rpc/services/service_admin.go index 06d37e8d..42052e73 100644 --- a/internal/rpc/services/service_admin.go +++ b/internal/rpc/services/service_admin.go @@ -283,7 +283,7 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA return nil, err } - result := []*pb.AdminModuleList{} + var result = []*pb.AdminModuleList{} for _, admin := range admins { modules := []*systemconfigs.AdminModule{} if len(admin.Modules) > 0 { @@ -292,7 +292,7 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA return nil, err } } - pbModules := []*pb.AdminModule{} + var pbModules = []*pb.AdminModule{} for _, module := range modules { pbModules = append(pbModules, &pb.AdminModule{ AllowAll: module.AllowAll, @@ -301,11 +301,12 @@ func (this *AdminService) FindAllAdminModules(ctx context.Context, req *pb.FindA }) } - list := &pb.AdminModuleList{ + var list = &pb.AdminModuleList{ AdminId: int64(admin.Id), IsSuper: admin.IsSuper, Fullname: admin.Fullname, Theme: admin.Theme, + Lang: admin.Lang, Modules: pbModules, } result = append(result, list)