fix: update admin test environment config

This commit is contained in:
richjohnrambo
2026-09-14 14:06:41 +08:00
parent f44e8adb72
commit c1a6a41575
5 changed files with 24 additions and 179 deletions
+16 -3
View File
@@ -5,7 +5,6 @@ import (
"hotgo/internal/consts"
"hotgo/internal/dao"
"hotgo/internal/library/contexts"
"hotgo/internal/library/imadmin"
"hotgo/internal/library/imtenant"
"hotgo/internal/model/entity"
"hotgo/internal/service"
@@ -20,17 +19,31 @@ import (
"github.com/gogf/gf/v2/os/gtime"
)
type imAdminScope struct {
TenantId int64
OperatorId int64
RoleKey string
RequestId string
}
const (
imAdminOperationAuditTable = "im_admin_operation_audit"
)
func resolveImAdminScope(ctx context.Context, selectedTenantId int64) (scope imadmin.AdminScope, err error) {
func resolveImAdminScope(ctx context.Context, selectedTenantId int64) (scope imAdminScope, err error) {
return resolveImAdminScopeWithAll(ctx, selectedTenantId, false)
}
func resolveImAdminScopeWithAll(ctx context.Context, selectedTenantId int64, allowAll bool) (scope imAdminScope, err error) {
operatorId := contexts.GetUserId(ctx)
scope.OperatorId = operatorId
scope.RoleKey = contexts.GetRoleKey(ctx)
scope.RequestId = gctx.CtxId(ctx)
if isImPlatformAdmin(ctx, operatorId) {
if selectedTenantId <= 0 {
if allowAll {
return scope, nil
}
return scope, gerror.New("请选择IM租户")
}
if err = ensureImTenantActive(ctx, selectedTenantId); err != nil {
@@ -71,7 +84,7 @@ func resolveImAdminBoundTenant(ctx context.Context) (int64, error) {
func ensureImTenantActive(ctx context.Context, tenantId int64) (err error) {
var tenant *entity.ImTenant
if err = imtenant.RegistryDB(ctx).Model(dao.ImTenant.Table()).Safe().Ctx(ctx).WherePri(tenantId).Scan(&tenant); err != nil {
if err = imtenant.RegistryDB().Model(dao.ImTenant.Table()).Safe().Ctx(ctx).WherePri(tenantId).Scan(&tenant); err != nil {
return gerror.Wrap(err, "获取IM租户失败")
}
if tenant == nil || tenant.Id <= 0 {