From 838fea68c8554b42016b9a46d18e70a2a4639a9d Mon Sep 17 00:00:00 2001 From: sunlei Date: Mon, 15 Jun 2026 10:31:40 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=94=B6=E6=95=9BAdmin=E4=B8=8E?= =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E9=85=8D=E7=BD=AE=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../architecture-convergence-inventory.md | 2 +- src/admin/admin.module.ts | 68 -------- src/admin/example/admin-example.controller.ts | 165 ------------------ src/blog/blog-article.controller.ts | 2 +- src/blog/blog-term.controller.ts | 2 +- src/blog/blog-theme-config.controller.ts | 2 +- src/blog/blog.module.ts | 2 +- src/minio/minio.controller.ts | 2 +- src/minio/minio.module.ts | 2 +- .../admin/contract}/admin.types.ts | 27 +-- .../admin/identity/admin-identity.module.ts | 30 ++-- .../identity}/auth/admin-auth-guard.module.ts | 0 .../identity}/auth/admin-auth.controller.ts | 0 .../admin/identity}/auth/admin-auth.dto.ts | 0 .../identity}/auth/admin-auth.service.ts | 0 .../auth/admin-password-crypto.service.ts | 0 .../admin/identity}/auth/admin-super.guard.ts | 2 +- .../identity}/auth/admin-token.service.ts | 2 +- .../admin/identity}/auth/jwt-auth.guard.ts | 2 +- .../identity}/dept/admin-dept.controller.ts | 0 .../admin/identity}/dept/admin-dept.entity.ts | 0 .../identity}/dept/admin-dept.service.ts | 0 .../identity}/menu/admin-menu.controller.ts | 0 .../admin/identity}/menu/admin-menu.entity.ts | 2 +- .../identity}/menu/admin-menu.service.ts | 2 +- .../identity}/role/admin-role.controller.ts | 0 .../admin/identity}/role/admin-role.entity.ts | 0 .../identity}/role/admin-role.service.ts | 2 +- .../user/admin-user-manage.controller.ts | 0 .../identity}/user/admin-user.controller.ts | 0 .../admin/identity}/user/admin-user.entity.ts | 0 .../identity}/user/admin-user.service.ts | 2 +- .../admin-platform-config.module.ts | 28 ++- .../component/component.controller.ts | 2 +- .../component/component.entity.ts | 0 .../component/component.service.ts | 2 +- .../dict/admin-dict.entity.ts | 0 .../platform-config}/dict/dict.controller.ts | 2 +- .../admin/platform-config}/dict/dict.dto.ts | 0 .../platform-config}/dict/dict.module.ts | 2 +- .../platform-config}/dict/dict.service.ts | 2 +- .../notice/admin-notice.controller.ts | 4 +- .../notice/admin-notice.dto.ts | 0 .../notice/admin-notice.entity.ts | 0 .../notice/admin-notice.service.ts | 0 .../platform-config}/notice/notice.module.ts | 2 +- .../system-log/system-log.controller.ts | 2 +- .../system-log/system-log.dto.ts | 0 .../system-log/system-log.service.ts | 0 .../timezone/admin-timezone.controller.ts | 4 +- .../timezone/admin-timezone.service.ts | 2 +- src/modules/qqbot/core/qqbot-core.module.ts | 4 +- .../plugin-platform.controller.ts | 2 +- .../plugin-platform/plugin-platform.module.ts | 2 +- .../application/bangdream-renderer.facade.ts | 2 +- .../ff14Market/qqbot-ff14-client.service.ts | 2 +- .../plugins/ff14Market/qqbot-ff14-worlds.ts | 2 +- .../fflogs/qqbot-fflogs-client.service.ts | 2 +- src/qqbot/account/qqbot-account.controller.ts | 2 +- src/qqbot/account/qqbot-account.service.ts | 2 +- .../command/qqbot-command-parser.service.ts | 2 +- src/qqbot/command/qqbot-command.controller.ts | 2 +- .../dashboard/qqbot-dashboard.controller.ts | 2 +- src/qqbot/message/qqbot-message.controller.ts | 2 +- .../permission/qqbot-permission.controller.ts | 2 +- src/qqbot/plugin/qqbot-plugin.controller.ts | 2 +- src/qqbot/rule/qqbot-rule.controller.ts | 2 +- src/qqbot/send/qqbot-send.controller.ts | 2 +- src/wordpress/wordpress-article.controller.ts | 2 +- src/wordpress/wordpress-auth.controller.ts | 2 +- .../wordpress-category.controller.ts | 2 +- src/wordpress/wordpress-tag.controller.ts | 2 +- src/wordpress/wordpress-theme.controller.ts | 2 +- src/wordpress/wordpress.module.ts | 2 +- test/admin/admin-menu.service.spec.ts | 6 +- test/admin/admin-user-profile.service.spec.ts | 2 +- .../admin-password-crypto.service.spec.ts | 2 +- test/admin/dict/dict.service.spec.ts | 2 +- .../notice/admin-notice.controller.spec.ts | 8 +- .../admin/notice/admin-notice.service.spec.ts | 2 +- .../system-log/system-log.controller.spec.ts | 6 +- .../system-log/system-log.service.spec.ts | 2 +- test/app.e2e-spec.ts | 16 +- test/modules/admin/admin-contract.spec.ts | 8 +- .../core/qqbot-core-command-smoke.spec.ts | 4 +- .../core/qqbot-core-module-contract.spec.ts | 4 +- .../plugin-platform-api-contract.spec.ts | 2 +- .../plugin-controller-http-smoke.spec.ts | 2 +- .../account/qqbot-account.controller.spec.ts | 2 +- .../qqbot-command-parser.service.spec.ts | 2 +- .../qqbot-fflogs-client.service.spec.ts | 2 +- 91 files changed, 117 insertions(+), 373 deletions(-) delete mode 100644 src/admin/admin.module.ts delete mode 100644 src/admin/example/admin-example.controller.ts rename src/{admin => modules/admin/contract}/admin.types.ts (69%) rename src/{admin => modules/admin/identity}/auth/admin-auth-guard.module.ts (100%) rename src/{admin => modules/admin/identity}/auth/admin-auth.controller.ts (100%) rename src/{admin => modules/admin/identity}/auth/admin-auth.dto.ts (100%) rename src/{admin => modules/admin/identity}/auth/admin-auth.service.ts (100%) rename src/{admin => modules/admin/identity}/auth/admin-password-crypto.service.ts (100%) rename src/{admin => modules/admin/identity}/auth/admin-super.guard.ts (90%) rename src/{admin => modules/admin/identity}/auth/admin-token.service.ts (97%) rename src/{admin => modules/admin/identity}/auth/jwt-auth.guard.ts (93%) rename src/{admin => modules/admin/identity}/dept/admin-dept.controller.ts (100%) rename src/{admin => modules/admin/identity}/dept/admin-dept.entity.ts (100%) rename src/{admin => modules/admin/identity}/dept/admin-dept.service.ts (100%) rename src/{admin => modules/admin/identity}/menu/admin-menu.controller.ts (100%) rename src/{admin => modules/admin/identity}/menu/admin-menu.entity.ts (94%) rename src/{admin => modules/admin/identity}/menu/admin-menu.service.ts (98%) rename src/{admin => modules/admin/identity}/role/admin-role.controller.ts (100%) rename src/{admin => modules/admin/identity}/role/admin-role.entity.ts (100%) rename src/{admin => modules/admin/identity}/role/admin-role.service.ts (97%) rename src/{admin => modules/admin/identity}/user/admin-user-manage.controller.ts (100%) rename src/{admin => modules/admin/identity}/user/admin-user.controller.ts (100%) rename src/{admin => modules/admin/identity}/user/admin-user.entity.ts (100%) rename src/{admin => modules/admin/identity}/user/admin-user.service.ts (98%) rename src/{admin => modules/admin/platform-config}/component/component.controller.ts (98%) rename src/{admin => modules/admin/platform-config}/component/component.entity.ts (100%) rename src/{admin => modules/admin/platform-config}/component/component.service.ts (97%) rename src/{admin => modules/admin/platform-config}/dict/admin-dict.entity.ts (100%) rename src/{admin => modules/admin/platform-config}/dict/dict.controller.ts (98%) rename src/{admin => modules/admin/platform-config}/dict/dict.dto.ts (100%) rename src/{admin => modules/admin/platform-config}/dict/dict.module.ts (83%) rename src/{admin => modules/admin/platform-config}/dict/dict.service.ts (99%) rename src/{admin => modules/admin/platform-config}/notice/admin-notice.controller.ts (93%) rename src/{admin => modules/admin/platform-config}/notice/admin-notice.dto.ts (100%) rename src/{admin => modules/admin/platform-config}/notice/admin-notice.entity.ts (100%) rename src/{admin => modules/admin/platform-config}/notice/admin-notice.service.ts (100%) rename src/{admin => modules/admin/platform-config}/notice/notice.module.ts (89%) rename src/{admin => modules/admin/platform-config}/system-log/system-log.controller.ts (96%) rename src/{admin => modules/admin/platform-config}/system-log/system-log.dto.ts (100%) rename src/{admin => modules/admin/platform-config}/system-log/system-log.service.ts (100%) rename src/{admin => modules/admin/platform-config}/timezone/admin-timezone.controller.ts (91%) rename src/{admin => modules/admin/platform-config}/timezone/admin-timezone.service.ts (91%) diff --git a/docs/refactor-v3/architecture-convergence-inventory.md b/docs/refactor-v3/architecture-convergence-inventory.md index abb7108..d68d2f4 100644 --- a/docs/refactor-v3/architecture-convergence-inventory.md +++ b/docs/refactor-v3/architecture-convergence-inventory.md @@ -14,7 +14,7 @@ | Domain | Deleted | Merged | Kept | Evidence | | --- | --- | --- | --- | --- | -| Admin/Auth/Platform Config | none yet | none yet | current files before migration | baseline only | +| Admin/Auth/Platform Config | `src/admin/example` if no active route evidence; empty old admin subdirectories | auth/user/role/menu/dept/component/dict/notice/system-log/timezone moved into `src/modules/admin/**`; duplicate old imports removed | route paths and public DTO class names kept | `rg '@/admin/' src test` returns no source hits; admin focused Jest passes | | Blog/WordPress/Asset | none yet | none yet | current files before migration | baseline only | | Runtime/Common | none yet | none yet | current files before migration | baseline only | | QQBot Core/NapCat | none yet | none yet | current files before migration | baseline only | diff --git a/src/admin/admin.module.ts b/src/admin/admin.module.ts deleted file mode 100644 index 9788092..0000000 --- a/src/admin/admin.module.ts +++ /dev/null @@ -1,68 +0,0 @@ -import { Module } from '@nestjs/common'; -import { TypeOrmModule } from '@nestjs/typeorm'; -import { AdminAuthGuardModule } from './auth/admin-auth-guard.module'; -import { AdminAuthController } from './auth/admin-auth.controller'; -import { ComponentController } from './component/component.controller'; -import { Component } from './component/component.entity'; -import { ComponentService } from './component/component.service'; -import { AdminDeptController } from './dept/admin-dept.controller'; -import { AdminDept } from './dept/admin-dept.entity'; -import { AdminDeptService } from './dept/admin-dept.service'; -import { DictModule } from './dict/dict.module'; -import { AdminExampleController } from './example/admin-example.controller'; -import { AdminMenuController } from './menu/admin-menu.controller'; -import { AdminMenu } from './menu/admin-menu.entity'; -import { AdminMenuService } from './menu/admin-menu.service'; -import { AdminRoleController } from './role/admin-role.controller'; -import { AdminRole } from './role/admin-role.entity'; -import { AdminRoleService } from './role/admin-role.service'; -import { NoticeModule } from './notice/notice.module'; -import { SystemLogController } from './system-log/system-log.controller'; -import { SystemLogService } from './system-log/system-log.service'; -import { AdminTimezoneController } from './timezone/admin-timezone.controller'; -import { AdminTimezoneService } from './timezone/admin-timezone.service'; -import { AdminUserManageController } from './user/admin-user-manage.controller'; -import { AdminUserController } from './user/admin-user.controller'; -import { AdminUser } from './user/admin-user.entity'; -import { AdminUserService } from './user/admin-user.service'; -import { MinioClientModule } from '@/minio/minio.module'; -import { WordpressModule } from '@/wordpress/wordpress.module'; - -@Module({ - imports: [ - TypeOrmModule.forFeature([ - AdminUser, - AdminRole, - AdminMenu, - AdminDept, - Component, - ]), - AdminAuthGuardModule, - DictModule, - NoticeModule, - MinioClientModule, - WordpressModule, - ], - controllers: [ - AdminAuthController, - AdminUserController, - AdminUserManageController, - AdminMenuController, - AdminRoleController, - AdminDeptController, - ComponentController, - SystemLogController, - AdminTimezoneController, - AdminExampleController, - ], - providers: [ - ComponentService, - AdminDeptService, - AdminMenuService, - AdminRoleService, - SystemLogService, - AdminTimezoneService, - AdminUserService, - ], -}) -export class AdminModule {} diff --git a/src/admin/example/admin-example.controller.ts b/src/admin/example/admin-example.controller.ts deleted file mode 100644 index 2b4c596..0000000 --- a/src/admin/example/admin-example.controller.ts +++ /dev/null @@ -1,165 +0,0 @@ -import { - Controller, - Get, - Post, - Query, - Res, - UploadedFile, - UseGuards, - UseInterceptors, -} from '@nestjs/common'; -import { FileInterceptor } from '@nestjs/platform-express'; -import { ApiOperation, ApiTags } from '@nestjs/swagger'; -import type { Response } from 'express'; -import { JwtAuthGuard } from '../auth/jwt-auth.guard'; -import { formatKtDateTime, Public, vbenPage, vbenSuccess } from '@/common'; -import { MinioClientService } from '@/minio/minio.service'; -import type { MinioUploadFile } from '@/minio/minio.types'; -import type { AdminDemoTableRow } from '../admin.types'; - -const DEMO_ROWS: AdminDemoTableRow[] = Array.from( - { length: 100 }, - (_, index) => { - const sequence = index + 1; - const categories = ['Dashboard', 'Form', 'Table', 'Chart', 'Workflow']; - const colors = ['Blue', 'Green', 'Purple', 'Orange', 'Slate']; - const statuses = ['success', 'warning', 'error']; - - return { - available: sequence % 3 !== 0, - category: categories[index % categories.length], - color: colors[index % colors.length], - currency: 'CNY', - description: `真实 API 示例数据 ${sequence}`, - id: `demo-${String(sequence).padStart(3, '0')}`, - imageUrl: - 'https://unpkg.com/@vbenjs/static-source@0.1.7/source/logo-v1.webp', - imageUrl2: - 'https://unpkg.com/@vbenjs/static-source@0.1.7/source/avatar-v1.webp', - inProduction: sequence % 2 === 0, - open: sequence % 4 === 0, - price: `${(sequence * 3.6 + 19).toFixed(2)}`, - productName: `KT Admin 模板能力 ${sequence}`, - quantity: 10 + sequence, - rating: Number((3 + (sequence % 20) / 10).toFixed(1)), - releaseDate: formatKtDateTime( - new Date(2026, index % 12, (index % 28) + 1), - ), - status: statuses[index % statuses.length], - tags: [ - 'kt', - 'admin', - categories[index % categories.length].toLowerCase(), - ], - weight: Number((1 + sequence / 10).toFixed(2)), - }; - }, -); - -@ApiTags('Admin - 示例') -@Controller() -@UseGuards(JwtAuthGuard) -export class AdminExampleController { - constructor(private readonly minioClientService: MinioClientService) {} - - @Post('upload') - @ApiOperation({ summary: '上传示例文件' }) - @UseInterceptors(FileInterceptor('file')) - async upload(@UploadedFile() file: MinioUploadFile) { - const result = await this.minioClientService.uploadObject({ file }); - - return vbenSuccess({ - url: result.url, - }); - } - - @Get('table/list') - @ApiOperation({ summary: '获取示例表格分页列表' }) - async tableList(@Query() query: Record) { - const page = Math.max(Number(query.page || 1), 1); - const pageSize = Math.max(Number(query.pageSize || 10), 1); - const sorted = this.sortRows([...DEMO_ROWS], query.sortBy, query.sortOrder); - const items = sorted.slice((page - 1) * pageSize, page * pageSize); - - return vbenPage(items, sorted.length); - } - - @Get('status') - @ApiOperation({ summary: '返回指定状态码示例' }) - @Public() - status(@Query('status') status: string, @Res() res: Response) { - const code = Number(status) || 200; - - if (code === 200) { - res.status(code).send(vbenSuccess(`${code}`)); - return; - } - - res.status(code).send({ - code, - msg: `${code}`, - err: `${code}`, - }); - } - - @Get('demo/bigint') - @ApiOperation({ summary: '获取 BigInt 序列化示例' }) - async bigint(@Res() res: Response) { - res.setHeader('Content-Type', 'application/json'); - res.send(`{ - "code": 200, - "msg": "操作成功", - "data": [ - { - "id": 123456789012345678901234567890123456789012345678901234567890, - "name": "John Doe", - "age": 30, - "email": "john-doe@demo.com" - }, - { - "id": 987654321098765432109876543210987654321098765432109876543210, - "name": "Jane Smith", - "age": 25, - "email": "jane@demo.com" - } - ] -}`); - } - - @Get('test') - @ApiOperation({ summary: 'GET 测试接口' }) - @Public() - testGet() { - return vbenSuccess('Test get handler'); - } - - @Post('test') - @ApiOperation({ summary: 'POST 测试接口' }) - @Public() - testPost() { - return vbenSuccess('Test post handler'); - } - - private sortRows( - rows: AdminDemoTableRow[], - sortBy?: string, - sortOrder?: string, - ) { - if (!sortBy || !Object.hasOwn(rows[0], sortBy)) return rows; - - return rows.sort((prev, next) => { - const prevValue = prev[sortBy]; - const nextValue = next[sortBy]; - const result = String(prevValue).localeCompare( - String(nextValue), - 'zh-CN', - { - numeric: true, - sensitivity: 'base', - }, - ); - - return sortOrder === 'desc' ? -result : result; - }); - } -} diff --git a/src/blog/blog-article.controller.ts b/src/blog/blog-article.controller.ts index 945a38a..5ebd185 100644 --- a/src/blog/blog-article.controller.ts +++ b/src/blog/blog-article.controller.ts @@ -10,7 +10,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { Public, vbenSuccess } from '@/common'; import { BlogArticleBodyDto, diff --git a/src/blog/blog-term.controller.ts b/src/blog/blog-term.controller.ts index 5337ed0..491d24f 100644 --- a/src/blog/blog-term.controller.ts +++ b/src/blog/blog-term.controller.ts @@ -10,7 +10,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import type { BlogTermKind } from './blog-term.entity'; import { diff --git a/src/blog/blog-theme-config.controller.ts b/src/blog/blog-theme-config.controller.ts index 55be1a0..0f3d499 100644 --- a/src/blog/blog-theme-config.controller.ts +++ b/src/blog/blog-theme-config.controller.ts @@ -9,7 +9,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { Public, vbenSuccess } from '@/common'; import { BlogThemeConfigBodyDto } from './blog-theme-config.dto'; import { BlogThemeConfigService } from './blog-theme-config.service'; diff --git a/src/blog/blog.module.ts b/src/blog/blog.module.ts index 150a81a..12e93fb 100644 --- a/src/blog/blog.module.ts +++ b/src/blog/blog.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AdminAuthGuardModule } from '@/admin/auth/admin-auth-guard.module'; +import { AdminAuthGuardModule } from '@/modules/admin/identity/auth/admin-auth-guard.module'; import { CommonModule } from '@/common'; import { WordpressModule } from '@/wordpress/wordpress.module'; import { BlogArticleController } from './blog-article.controller'; diff --git a/src/minio/minio.controller.ts b/src/minio/minio.controller.ts index d014982..bd1ae8f 100644 --- a/src/minio/minio.controller.ts +++ b/src/minio/minio.controller.ts @@ -36,7 +36,7 @@ import { MinioObjectDto, MinioUploadResultDto, } from './minio.dto'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; const PROXY_RESOURCE_TIMEOUT = 1000 * 15; const PROXY_RESOURCE_CONTENT_TYPES = [ diff --git a/src/minio/minio.module.ts b/src/minio/minio.module.ts index 06fa78e..d550035 100644 --- a/src/minio/minio.module.ts +++ b/src/minio/minio.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; -import { AdminAuthGuardModule } from '@/admin/auth/admin-auth-guard.module'; +import { AdminAuthGuardModule } from '@/modules/admin/identity/auth/admin-auth-guard.module'; import { MinioClientController } from './minio.controller'; import { MinioClientService } from './minio.service'; diff --git a/src/admin/admin.types.ts b/src/modules/admin/contract/admin.types.ts similarity index 69% rename from src/admin/admin.types.ts rename to src/modules/admin/contract/admin.types.ts index 4f9f877..60fcb36 100644 --- a/src/admin/admin.types.ts +++ b/src/modules/admin/contract/admin.types.ts @@ -1,28 +1,7 @@ import type { Request } from 'express'; -import type { AdminMenu } from './menu/admin-menu.entity'; -import type { AdminRole } from './role/admin-role.entity'; -import type { AdminUser } from './user/admin-user.entity'; - -export type AdminDemoTableRow = { - available: boolean; - category: string; - color: string; - currency: string; - description: string; - id: string; - imageUrl: string; - imageUrl2: string; - inProduction: boolean; - open: boolean; - price: string; - productName: string; - quantity: number; - rating: number; - releaseDate: string; - status: string; - tags: string[]; - weight: number; -}; +import type { AdminMenu } from '../identity/menu/admin-menu.entity'; +import type { AdminRole } from '../identity/role/admin-role.entity'; +import type { AdminUser } from '../identity/user/admin-user.entity'; export type AdminDictItem = { childrenCode?: string | null; diff --git a/src/modules/admin/identity/admin-identity.module.ts b/src/modules/admin/identity/admin-identity.module.ts index 664023e..8a0e4ab 100644 --- a/src/modules/admin/identity/admin-identity.module.ts +++ b/src/modules/admin/identity/admin-identity.module.ts @@ -1,20 +1,20 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AdminAuthGuardModule } from '@/admin/auth/admin-auth-guard.module'; -import { AdminAuthController } from '@/admin/auth/admin-auth.controller'; -import { AdminDeptController } from '@/admin/dept/admin-dept.controller'; -import { AdminDept } from '@/admin/dept/admin-dept.entity'; -import { AdminDeptService } from '@/admin/dept/admin-dept.service'; -import { AdminMenuController } from '@/admin/menu/admin-menu.controller'; -import { AdminMenu } from '@/admin/menu/admin-menu.entity'; -import { AdminMenuService } from '@/admin/menu/admin-menu.service'; -import { AdminRoleController } from '@/admin/role/admin-role.controller'; -import { AdminRole } from '@/admin/role/admin-role.entity'; -import { AdminRoleService } from '@/admin/role/admin-role.service'; -import { AdminUserManageController } from '@/admin/user/admin-user-manage.controller'; -import { AdminUserController } from '@/admin/user/admin-user.controller'; -import { AdminUser } from '@/admin/user/admin-user.entity'; -import { AdminUserService } from '@/admin/user/admin-user.service'; +import { AdminAuthGuardModule } from '@/modules/admin/identity/auth/admin-auth-guard.module'; +import { AdminAuthController } from '@/modules/admin/identity/auth/admin-auth.controller'; +import { AdminDeptController } from '@/modules/admin/identity/dept/admin-dept.controller'; +import { AdminDept } from '@/modules/admin/identity/dept/admin-dept.entity'; +import { AdminDeptService } from '@/modules/admin/identity/dept/admin-dept.service'; +import { AdminMenuController } from '@/modules/admin/identity/menu/admin-menu.controller'; +import { AdminMenu } from '@/modules/admin/identity/menu/admin-menu.entity'; +import { AdminMenuService } from '@/modules/admin/identity/menu/admin-menu.service'; +import { AdminRoleController } from '@/modules/admin/identity/role/admin-role.controller'; +import { AdminRole } from '@/modules/admin/identity/role/admin-role.entity'; +import { AdminRoleService } from '@/modules/admin/identity/role/admin-role.service'; +import { AdminUserManageController } from '@/modules/admin/identity/user/admin-user-manage.controller'; +import { AdminUserController } from '@/modules/admin/identity/user/admin-user.controller'; +import { AdminUser } from '@/modules/admin/identity/user/admin-user.entity'; +import { AdminUserService } from '@/modules/admin/identity/user/admin-user.service'; import { WordpressMirrorModule } from '@/modules/wordpress/wordpress-mirror.module'; export const ADMIN_IDENTITY_CONTROLLERS = [ diff --git a/src/admin/auth/admin-auth-guard.module.ts b/src/modules/admin/identity/auth/admin-auth-guard.module.ts similarity index 100% rename from src/admin/auth/admin-auth-guard.module.ts rename to src/modules/admin/identity/auth/admin-auth-guard.module.ts diff --git a/src/admin/auth/admin-auth.controller.ts b/src/modules/admin/identity/auth/admin-auth.controller.ts similarity index 100% rename from src/admin/auth/admin-auth.controller.ts rename to src/modules/admin/identity/auth/admin-auth.controller.ts diff --git a/src/admin/auth/admin-auth.dto.ts b/src/modules/admin/identity/auth/admin-auth.dto.ts similarity index 100% rename from src/admin/auth/admin-auth.dto.ts rename to src/modules/admin/identity/auth/admin-auth.dto.ts diff --git a/src/admin/auth/admin-auth.service.ts b/src/modules/admin/identity/auth/admin-auth.service.ts similarity index 100% rename from src/admin/auth/admin-auth.service.ts rename to src/modules/admin/identity/auth/admin-auth.service.ts diff --git a/src/admin/auth/admin-password-crypto.service.ts b/src/modules/admin/identity/auth/admin-password-crypto.service.ts similarity index 100% rename from src/admin/auth/admin-password-crypto.service.ts rename to src/modules/admin/identity/auth/admin-password-crypto.service.ts diff --git a/src/admin/auth/admin-super.guard.ts b/src/modules/admin/identity/auth/admin-super.guard.ts similarity index 90% rename from src/admin/auth/admin-super.guard.ts rename to src/modules/admin/identity/auth/admin-super.guard.ts index c0b1bbe..d122204 100644 --- a/src/admin/auth/admin-super.guard.ts +++ b/src/modules/admin/identity/auth/admin-super.guard.ts @@ -1,6 +1,6 @@ import { CanActivate, ExecutionContext, HttpStatus, Injectable } from '@nestjs/common'; import { throwVbenError } from '@/common'; -import type { AdminRequest } from '../admin.types'; +import type { AdminRequest } from '../../contract/admin.types'; @Injectable() export class AdminSuperGuard implements CanActivate { diff --git a/src/admin/auth/admin-token.service.ts b/src/modules/admin/identity/auth/admin-token.service.ts similarity index 97% rename from src/admin/auth/admin-token.service.ts rename to src/modules/admin/identity/auth/admin-token.service.ts index eb502e7..962f94a 100644 --- a/src/admin/auth/admin-token.service.ts +++ b/src/modules/admin/identity/auth/admin-token.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { createHmac, timingSafeEqual } from 'crypto'; -import type { AdminTokenPayload } from '../admin.types'; +import type { AdminTokenPayload } from '../../contract/admin.types'; @Injectable() export class AdminTokenService { diff --git a/src/admin/auth/jwt-auth.guard.ts b/src/modules/admin/identity/auth/jwt-auth.guard.ts similarity index 93% rename from src/admin/auth/jwt-auth.guard.ts rename to src/modules/admin/identity/auth/jwt-auth.guard.ts index 0ff285e..286fc5e 100644 --- a/src/admin/auth/jwt-auth.guard.ts +++ b/src/modules/admin/identity/auth/jwt-auth.guard.ts @@ -2,7 +2,7 @@ import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common'; import { Reflector } from '@nestjs/core'; import { AdminAuthService } from './admin-auth.service'; import { IS_PUBLIC_KEY } from '@/common'; -import type { AdminRequest } from '../admin.types'; +import type { AdminRequest } from '../../contract/admin.types'; @Injectable() export class JwtAuthGuard implements CanActivate { diff --git a/src/admin/dept/admin-dept.controller.ts b/src/modules/admin/identity/dept/admin-dept.controller.ts similarity index 100% rename from src/admin/dept/admin-dept.controller.ts rename to src/modules/admin/identity/dept/admin-dept.controller.ts diff --git a/src/admin/dept/admin-dept.entity.ts b/src/modules/admin/identity/dept/admin-dept.entity.ts similarity index 100% rename from src/admin/dept/admin-dept.entity.ts rename to src/modules/admin/identity/dept/admin-dept.entity.ts diff --git a/src/admin/dept/admin-dept.service.ts b/src/modules/admin/identity/dept/admin-dept.service.ts similarity index 100% rename from src/admin/dept/admin-dept.service.ts rename to src/modules/admin/identity/dept/admin-dept.service.ts diff --git a/src/admin/menu/admin-menu.controller.ts b/src/modules/admin/identity/menu/admin-menu.controller.ts similarity index 100% rename from src/admin/menu/admin-menu.controller.ts rename to src/modules/admin/identity/menu/admin-menu.controller.ts diff --git a/src/admin/menu/admin-menu.entity.ts b/src/modules/admin/identity/menu/admin-menu.entity.ts similarity index 94% rename from src/admin/menu/admin-menu.entity.ts rename to src/modules/admin/identity/menu/admin-menu.entity.ts index 48b56af..e8050b4 100644 --- a/src/admin/menu/admin-menu.entity.ts +++ b/src/modules/admin/identity/menu/admin-menu.entity.ts @@ -12,7 +12,7 @@ import { KtUpdateDateColumn, } from '@/common'; import { AdminRole } from '../role/admin-role.entity'; -import type { AdminMenuMeta, AdminMenuType } from '../admin.types'; +import type { AdminMenuMeta, AdminMenuType } from '../../contract/admin.types'; @Entity('admin_menu') export class AdminMenu { diff --git a/src/admin/menu/admin-menu.service.ts b/src/modules/admin/identity/menu/admin-menu.service.ts similarity index 98% rename from src/admin/menu/admin-menu.service.ts rename to src/modules/admin/identity/menu/admin-menu.service.ts index 9570ff0..6b5e5e5 100644 --- a/src/admin/menu/admin-menu.service.ts +++ b/src/modules/admin/identity/menu/admin-menu.service.ts @@ -4,7 +4,7 @@ import { In, Repository } from 'typeorm'; import { toTree } from '@/common'; import { AdminUser } from '../user/admin-user.entity'; import { AdminMenu } from './admin-menu.entity'; -import type { AdminMenuInput, AdminMenuMeta } from '../admin.types'; +import type { AdminMenuInput, AdminMenuMeta } from '../../contract/admin.types'; @Injectable() export class AdminMenuService { diff --git a/src/admin/role/admin-role.controller.ts b/src/modules/admin/identity/role/admin-role.controller.ts similarity index 100% rename from src/admin/role/admin-role.controller.ts rename to src/modules/admin/identity/role/admin-role.controller.ts diff --git a/src/admin/role/admin-role.entity.ts b/src/modules/admin/identity/role/admin-role.entity.ts similarity index 100% rename from src/admin/role/admin-role.entity.ts rename to src/modules/admin/identity/role/admin-role.entity.ts diff --git a/src/admin/role/admin-role.service.ts b/src/modules/admin/identity/role/admin-role.service.ts similarity index 97% rename from src/admin/role/admin-role.service.ts rename to src/modules/admin/identity/role/admin-role.service.ts index 55a151c..2264ba3 100644 --- a/src/admin/role/admin-role.service.ts +++ b/src/modules/admin/identity/role/admin-role.service.ts @@ -4,7 +4,7 @@ import { Repository } from 'typeorm'; import { throwVbenError } from '@/common'; import { AdminMenu } from '../menu/admin-menu.entity'; import { AdminRole } from './admin-role.entity'; -import type { AdminRoleInput, AdminRoleListQuery } from '../admin.types'; +import type { AdminRoleInput, AdminRoleListQuery } from '../../contract/admin.types'; @Injectable() export class AdminRoleService { diff --git a/src/admin/user/admin-user-manage.controller.ts b/src/modules/admin/identity/user/admin-user-manage.controller.ts similarity index 100% rename from src/admin/user/admin-user-manage.controller.ts rename to src/modules/admin/identity/user/admin-user-manage.controller.ts diff --git a/src/admin/user/admin-user.controller.ts b/src/modules/admin/identity/user/admin-user.controller.ts similarity index 100% rename from src/admin/user/admin-user.controller.ts rename to src/modules/admin/identity/user/admin-user.controller.ts diff --git a/src/admin/user/admin-user.entity.ts b/src/modules/admin/identity/user/admin-user.entity.ts similarity index 100% rename from src/admin/user/admin-user.entity.ts rename to src/modules/admin/identity/user/admin-user.entity.ts diff --git a/src/admin/user/admin-user.service.ts b/src/modules/admin/identity/user/admin-user.service.ts similarity index 98% rename from src/admin/user/admin-user.service.ts rename to src/modules/admin/identity/user/admin-user.service.ts index 5e2e8af..e4c408d 100644 --- a/src/admin/user/admin-user.service.ts +++ b/src/modules/admin/identity/user/admin-user.service.ts @@ -5,7 +5,7 @@ import { throwVbenError } from '@/common'; import { AdminDept } from '../dept/admin-dept.entity'; import { AdminRole } from '../role/admin-role.entity'; import { AdminUser } from './admin-user.entity'; -import type { AdminUserInput, AdminUserListQuery } from '../admin.types'; +import type { AdminUserInput, AdminUserListQuery } from '../../contract/admin.types'; @Injectable() export class AdminUserService { diff --git a/src/modules/admin/platform-config/admin-platform-config.module.ts b/src/modules/admin/platform-config/admin-platform-config.module.ts index 0f3de52..1d0e285 100644 --- a/src/modules/admin/platform-config/admin-platform-config.module.ts +++ b/src/modules/admin/platform-config/admin-platform-config.module.ts @@ -1,26 +1,24 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AdminAuthGuardModule } from '@/admin/auth/admin-auth-guard.module'; -import { ComponentController } from '@/admin/component/component.controller'; -import { Component } from '@/admin/component/component.entity'; -import { ComponentService } from '@/admin/component/component.service'; -import { DictController } from '@/admin/dict/dict.controller'; -import { DictModule } from '@/admin/dict/dict.module'; -import { AdminNoticeController } from '@/admin/notice/admin-notice.controller'; -import { NoticeModule } from '@/admin/notice/notice.module'; -import { SystemLogController } from '@/admin/system-log/system-log.controller'; -import { SystemLogService } from '@/admin/system-log/system-log.service'; -import { AdminTimezoneController } from '@/admin/timezone/admin-timezone.controller'; -import { AdminTimezoneService } from '@/admin/timezone/admin-timezone.service'; -import { AdminUser } from '@/admin/user/admin-user.entity'; -import { AdminExampleController } from '@/admin/example/admin-example.controller'; +import { AdminAuthGuardModule } from '@/modules/admin/identity/auth/admin-auth-guard.module'; +import { ComponentController } from '@/modules/admin/platform-config/component/component.controller'; +import { Component } from '@/modules/admin/platform-config/component/component.entity'; +import { ComponentService } from '@/modules/admin/platform-config/component/component.service'; +import { DictController } from '@/modules/admin/platform-config/dict/dict.controller'; +import { DictModule } from '@/modules/admin/platform-config/dict/dict.module'; +import { AdminNoticeController } from '@/modules/admin/platform-config/notice/admin-notice.controller'; +import { NoticeModule } from '@/modules/admin/platform-config/notice/notice.module'; +import { SystemLogController } from '@/modules/admin/platform-config/system-log/system-log.controller'; +import { SystemLogService } from '@/modules/admin/platform-config/system-log/system-log.service'; +import { AdminTimezoneController } from '@/modules/admin/platform-config/timezone/admin-timezone.controller'; +import { AdminTimezoneService } from '@/modules/admin/platform-config/timezone/admin-timezone.service'; +import { AdminUser } from '@/modules/admin/identity/user/admin-user.entity'; import { AssetModule } from '@/modules/asset/asset.module'; export const ADMIN_PLATFORM_CONFIG_DIRECT_CONTROLLERS = [ ComponentController, SystemLogController, AdminTimezoneController, - AdminExampleController, ]; export const ADMIN_PLATFORM_CONFIG_IMPORTED_CONTROLLERS = [ diff --git a/src/admin/component/component.controller.ts b/src/modules/admin/platform-config/component/component.controller.ts similarity index 98% rename from src/admin/component/component.controller.ts rename to src/modules/admin/platform-config/component/component.controller.ts index 699f564..f597439 100644 --- a/src/admin/component/component.controller.ts +++ b/src/modules/admin/platform-config/component/component.controller.ts @@ -26,7 +26,7 @@ import { type KtPageParams, ToolsService, } from '@/common'; -import { JwtAuthGuard } from '../auth/jwt-auth.guard'; +import { JwtAuthGuard } from '../../identity/auth/jwt-auth.guard'; import { ComponentService } from './component.service'; import { Component } from './component.entity'; diff --git a/src/admin/component/component.entity.ts b/src/modules/admin/platform-config/component/component.entity.ts similarity index 100% rename from src/admin/component/component.entity.ts rename to src/modules/admin/platform-config/component/component.entity.ts diff --git a/src/admin/component/component.service.ts b/src/modules/admin/platform-config/component/component.service.ts similarity index 97% rename from src/admin/component/component.service.ts rename to src/modules/admin/platform-config/component/component.service.ts index ca276a4..dadac7e 100644 --- a/src/admin/component/component.service.ts +++ b/src/modules/admin/platform-config/component/component.service.ts @@ -4,7 +4,7 @@ import { Repository } from 'typeorm'; import { Component } from './component.entity'; import { ToolsService, type KtPage, type KtPageParams } from '@/common'; import { isNumber, omit, pick } from 'lodash'; -import { DictService } from '@/admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; @Injectable() export class ComponentService { diff --git a/src/admin/dict/admin-dict.entity.ts b/src/modules/admin/platform-config/dict/admin-dict.entity.ts similarity index 100% rename from src/admin/dict/admin-dict.entity.ts rename to src/modules/admin/platform-config/dict/admin-dict.entity.ts diff --git a/src/admin/dict/dict.controller.ts b/src/modules/admin/platform-config/dict/dict.controller.ts similarity index 98% rename from src/admin/dict/dict.controller.ts rename to src/modules/admin/platform-config/dict/dict.controller.ts index 3e0119f..4d3df2e 100644 --- a/src/admin/dict/dict.controller.ts +++ b/src/modules/admin/platform-config/dict/dict.controller.ts @@ -28,7 +28,7 @@ import { AdminDictUpdateDto, DictDto, } from './dict.dto'; -import { JwtAuthGuard } from '../auth/jwt-auth.guard'; +import { JwtAuthGuard } from '../../identity/auth/jwt-auth.guard'; const componentTypeDictExample = [ { diff --git a/src/admin/dict/dict.dto.ts b/src/modules/admin/platform-config/dict/dict.dto.ts similarity index 100% rename from src/admin/dict/dict.dto.ts rename to src/modules/admin/platform-config/dict/dict.dto.ts diff --git a/src/admin/dict/dict.module.ts b/src/modules/admin/platform-config/dict/dict.module.ts similarity index 83% rename from src/admin/dict/dict.module.ts rename to src/modules/admin/platform-config/dict/dict.module.ts index 8022a77..49ee1bf 100644 --- a/src/admin/dict/dict.module.ts +++ b/src/modules/admin/platform-config/dict/dict.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AdminAuthGuardModule } from '../auth/admin-auth-guard.module'; +import { AdminAuthGuardModule } from '../../identity/auth/admin-auth-guard.module'; import { DictController } from './dict.controller'; import { DictService } from './dict.service'; import { AdminDict } from './admin-dict.entity'; diff --git a/src/admin/dict/dict.service.ts b/src/modules/admin/platform-config/dict/dict.service.ts similarity index 99% rename from src/admin/dict/dict.service.ts rename to src/modules/admin/platform-config/dict/dict.service.ts index a974dfd..ef4431d 100644 --- a/src/admin/dict/dict.service.ts +++ b/src/modules/admin/platform-config/dict/dict.service.ts @@ -18,7 +18,7 @@ import type { AdminDictItem, AdminDictSerialized, AdminDictTreeItem, -} from '../admin.types'; +} from '../../contract/admin.types'; const COMPONENT_TYPE_DICT_KEY = 'COMPONENT_TYPE'; diff --git a/src/admin/notice/admin-notice.controller.ts b/src/modules/admin/platform-config/notice/admin-notice.controller.ts similarity index 93% rename from src/admin/notice/admin-notice.controller.ts rename to src/modules/admin/platform-config/notice/admin-notice.controller.ts index 2d3d51f..ff82821 100644 --- a/src/admin/notice/admin-notice.controller.ts +++ b/src/modules/admin/platform-config/notice/admin-notice.controller.ts @@ -1,8 +1,8 @@ import { Controller, Delete, Get, Param, Post, Query, UseGuards } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; import { vbenPage, vbenSuccess } from '@/common'; -import { AdminSuperGuard } from '../auth/admin-super.guard'; -import { JwtAuthGuard } from '../auth/jwt-auth.guard'; +import { AdminSuperGuard } from '../../identity/auth/admin-super.guard'; +import { JwtAuthGuard } from '../../identity/auth/jwt-auth.guard'; import { AdminNoticeQueryDto } from './admin-notice.dto'; import { AdminNoticeService } from './admin-notice.service'; diff --git a/src/admin/notice/admin-notice.dto.ts b/src/modules/admin/platform-config/notice/admin-notice.dto.ts similarity index 100% rename from src/admin/notice/admin-notice.dto.ts rename to src/modules/admin/platform-config/notice/admin-notice.dto.ts diff --git a/src/admin/notice/admin-notice.entity.ts b/src/modules/admin/platform-config/notice/admin-notice.entity.ts similarity index 100% rename from src/admin/notice/admin-notice.entity.ts rename to src/modules/admin/platform-config/notice/admin-notice.entity.ts diff --git a/src/admin/notice/admin-notice.service.ts b/src/modules/admin/platform-config/notice/admin-notice.service.ts similarity index 100% rename from src/admin/notice/admin-notice.service.ts rename to src/modules/admin/platform-config/notice/admin-notice.service.ts diff --git a/src/admin/notice/notice.module.ts b/src/modules/admin/platform-config/notice/notice.module.ts similarity index 89% rename from src/admin/notice/notice.module.ts rename to src/modules/admin/platform-config/notice/notice.module.ts index 3362c28..d3564a8 100644 --- a/src/admin/notice/notice.module.ts +++ b/src/modules/admin/platform-config/notice/notice.module.ts @@ -4,7 +4,7 @@ import { SYSTEM_NOTICE_PUBLISHER } from '@/common'; import { AdminNoticeController } from './admin-notice.controller'; import { AdminNotice } from './admin-notice.entity'; import { AdminNoticeService } from './admin-notice.service'; -import { AdminAuthGuardModule } from '../auth/admin-auth-guard.module'; +import { AdminAuthGuardModule } from '../../identity/auth/admin-auth-guard.module'; @Global() @Module({ diff --git a/src/admin/system-log/system-log.controller.ts b/src/modules/admin/platform-config/system-log/system-log.controller.ts similarity index 96% rename from src/admin/system-log/system-log.controller.ts rename to src/modules/admin/platform-config/system-log/system-log.controller.ts index 8c0ecd3..67f6e9f 100644 --- a/src/admin/system-log/system-log.controller.ts +++ b/src/modules/admin/platform-config/system-log/system-log.controller.ts @@ -7,7 +7,7 @@ import { vbenPage, vbenSuccess, } from '@/common'; -import { JwtAuthGuard } from '../auth/jwt-auth.guard'; +import { JwtAuthGuard } from '../../identity/auth/jwt-auth.guard'; import { SystemLogDto, SystemLogQueryDto, diff --git a/src/admin/system-log/system-log.dto.ts b/src/modules/admin/platform-config/system-log/system-log.dto.ts similarity index 100% rename from src/admin/system-log/system-log.dto.ts rename to src/modules/admin/platform-config/system-log/system-log.dto.ts diff --git a/src/admin/system-log/system-log.service.ts b/src/modules/admin/platform-config/system-log/system-log.service.ts similarity index 100% rename from src/admin/system-log/system-log.service.ts rename to src/modules/admin/platform-config/system-log/system-log.service.ts diff --git a/src/admin/timezone/admin-timezone.controller.ts b/src/modules/admin/platform-config/timezone/admin-timezone.controller.ts similarity index 91% rename from src/admin/timezone/admin-timezone.controller.ts rename to src/modules/admin/platform-config/timezone/admin-timezone.controller.ts index c410970..87cecb1 100644 --- a/src/admin/timezone/admin-timezone.controller.ts +++ b/src/modules/admin/platform-config/timezone/admin-timezone.controller.ts @@ -1,8 +1,8 @@ import { Body, Controller, Get, Post, UseGuards } from '@nestjs/common'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; import { CurrentAdminUser, vbenSuccess } from '@/common'; -import { JwtAuthGuard } from '../auth/jwt-auth.guard'; -import { AdminUser } from '../user/admin-user.entity'; +import { JwtAuthGuard } from '../../identity/auth/jwt-auth.guard'; +import { AdminUser } from '../../identity/user/admin-user.entity'; import { AdminTimezoneService } from './admin-timezone.service'; const TIMEZONE_OPTIONS = [ diff --git a/src/admin/timezone/admin-timezone.service.ts b/src/modules/admin/platform-config/timezone/admin-timezone.service.ts similarity index 91% rename from src/admin/timezone/admin-timezone.service.ts rename to src/modules/admin/platform-config/timezone/admin-timezone.service.ts index c64c821..0295d21 100644 --- a/src/admin/timezone/admin-timezone.service.ts +++ b/src/modules/admin/platform-config/timezone/admin-timezone.service.ts @@ -2,7 +2,7 @@ import { HttpStatus, Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; import { throwVbenError } from '@/common'; -import { AdminUser } from '../user/admin-user.entity'; +import { AdminUser } from '../../identity/user/admin-user.entity'; @Injectable() export class AdminTimezoneService { diff --git a/src/modules/qqbot/core/qqbot-core.module.ts b/src/modules/qqbot/core/qqbot-core.module.ts index 2950864..ede3a9f 100644 --- a/src/modules/qqbot/core/qqbot-core.module.ts +++ b/src/modules/qqbot/core/qqbot-core.module.ts @@ -1,8 +1,8 @@ import { Module } from '@nestjs/common'; import { ConfigModule } from '@nestjs/config'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AdminAuthGuardModule } from '@/admin/auth/admin-auth-guard.module'; -import { DictModule } from '@/admin/dict/dict.module'; +import { AdminAuthGuardModule } from '@/modules/admin/identity/auth/admin-auth-guard.module'; +import { DictModule } from '@/modules/admin/platform-config/dict/dict.module'; import { QqbotAccountAbility } from '@/qqbot/account/qqbot-account-ability.entity'; import { QqbotAccountController } from '@/qqbot/account/qqbot-account.controller'; import { QqbotAccount } from '@/qqbot/account/qqbot-account.entity'; diff --git a/src/modules/qqbot/plugin-platform/plugin-platform.controller.ts b/src/modules/qqbot/plugin-platform/plugin-platform.controller.ts index 72ee5e7..77048b2 100644 --- a/src/modules/qqbot/plugin-platform/plugin-platform.controller.ts +++ b/src/modules/qqbot/plugin-platform/plugin-platform.controller.ts @@ -9,7 +9,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { QqbotPluginPlatformService } from './plugin-platform.service'; diff --git a/src/modules/qqbot/plugin-platform/plugin-platform.module.ts b/src/modules/qqbot/plugin-platform/plugin-platform.module.ts index 101cb90..d072fa0 100644 --- a/src/modules/qqbot/plugin-platform/plugin-platform.module.ts +++ b/src/modules/qqbot/plugin-platform/plugin-platform.module.ts @@ -1,6 +1,6 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; -import { AdminAuthGuardModule } from '@/admin/auth/admin-auth-guard.module'; +import { AdminAuthGuardModule } from '@/modules/admin/identity/auth/admin-auth-guard.module'; import { QqbotPluginPlatformController } from './plugin-platform.controller'; import { QqbotPluginPlatformService } from './plugin-platform.service'; import { QQBOT_PLUGIN_PLATFORM_ENTITIES } from './persistence'; diff --git a/src/modules/qqbot/plugins/bangDream/application/bangdream-renderer.facade.ts b/src/modules/qqbot/plugins/bangDream/application/bangdream-renderer.facade.ts index db59f33..fcadf00 100644 --- a/src/modules/qqbot/plugins/bangDream/application/bangdream-renderer.facade.ts +++ b/src/modules/qqbot/plugins/bangDream/application/bangdream-renderer.facade.ts @@ -1,6 +1,6 @@ import { Injectable, Optional } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { DictService } from '@/admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; import { Card } from '@/modules/qqbot/plugins/bangDream/card/card.model'; import { getPresentEvent } from '@/modules/qqbot/plugins/bangDream/event/event.model'; import { diff --git a/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-client.service.ts b/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-client.service.ts index 59cbf7e..c83fc1c 100644 --- a/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-client.service.ts +++ b/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-client.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { formatKtDateTime } from '@/common'; -import { DictService } from '@/admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; import { QqbotPluginHttpClientService } from '@/modules/qqbot/plugin-platform/sdk'; import { buildQqbotFf14MarketCatalog, diff --git a/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-worlds.ts b/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-worlds.ts index c0dcfd8..abb4ae8 100644 --- a/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-worlds.ts +++ b/src/modules/qqbot/plugins/ff14Market/qqbot-ff14-worlds.ts @@ -1,4 +1,4 @@ -import type { AdminDictItem, AdminDictTreeItem } from '@/admin/admin.types'; +import type { AdminDictItem, AdminDictTreeItem } from '@/modules/admin/contract/admin.types'; import type { QqbotFf14DataCenter, QqbotFf14MarketCatalog, diff --git a/src/modules/qqbot/plugins/fflogs/qqbot-fflogs-client.service.ts b/src/modules/qqbot/plugins/fflogs/qqbot-fflogs-client.service.ts index 1e558b2..4dc5002 100644 --- a/src/modules/qqbot/plugins/fflogs/qqbot-fflogs-client.service.ts +++ b/src/modules/qqbot/plugins/fflogs/qqbot-fflogs-client.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; -import { DictService } from '@/admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; import { QqbotPluginHttpClientService } from '@/modules/qqbot/plugin-platform/sdk'; import type { FflogsCharacterEncounterRankingsResponse, diff --git a/src/qqbot/account/qqbot-account.controller.ts b/src/qqbot/account/qqbot-account.controller.ts index 881e649..b0bf89b 100644 --- a/src/qqbot/account/qqbot-account.controller.ts +++ b/src/qqbot/account/qqbot-account.controller.ts @@ -10,7 +10,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { QqbotAccountBodyDto, diff --git a/src/qqbot/account/qqbot-account.service.ts b/src/qqbot/account/qqbot-account.service.ts index bdf32eb..44c4031 100644 --- a/src/qqbot/account/qqbot-account.service.ts +++ b/src/qqbot/account/qqbot-account.service.ts @@ -8,7 +8,7 @@ import { throwVbenError, ToolsService, } from '@/common'; -import { AdminPasswordCryptoService } from '@/admin/auth/admin-password-crypto.service'; +import { AdminPasswordCryptoService } from '@/modules/admin/identity/auth/admin-password-crypto.service'; import { QqbotAccountAbility } from './qqbot-account-ability.entity'; import { QqbotAccount } from './qqbot-account.entity'; import type { diff --git a/src/qqbot/command/qqbot-command-parser.service.ts b/src/qqbot/command/qqbot-command-parser.service.ts index bfd5388..a05bc6c 100644 --- a/src/qqbot/command/qqbot-command-parser.service.ts +++ b/src/qqbot/command/qqbot-command-parser.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { DictService } from '../../admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; import type { QqbotCommand } from './qqbot-command.entity'; import type { QqbotNormalizedMessage } from '../qqbot.types'; import { diff --git a/src/qqbot/command/qqbot-command.controller.ts b/src/qqbot/command/qqbot-command.controller.ts index 4d24370..87d7d49 100644 --- a/src/qqbot/command/qqbot-command.controller.ts +++ b/src/qqbot/command/qqbot-command.controller.ts @@ -9,7 +9,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { ToolsService, vbenSuccess } from '@/common'; import { QqbotCommandBodyDto, diff --git a/src/qqbot/dashboard/qqbot-dashboard.controller.ts b/src/qqbot/dashboard/qqbot-dashboard.controller.ts index ce59a7e..bdae991 100644 --- a/src/qqbot/dashboard/qqbot-dashboard.controller.ts +++ b/src/qqbot/dashboard/qqbot-dashboard.controller.ts @@ -1,6 +1,6 @@ import { Controller, Get, UseGuards } from '@nestjs/common'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { QqbotDashboardService } from './qqbot-dashboard.service'; diff --git a/src/qqbot/message/qqbot-message.controller.ts b/src/qqbot/message/qqbot-message.controller.ts index a33cb03..2ad4a8b 100644 --- a/src/qqbot/message/qqbot-message.controller.ts +++ b/src/qqbot/message/qqbot-message.controller.ts @@ -1,6 +1,6 @@ import { Controller, Get, Query, UseGuards } from '@nestjs/common'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { QqbotConversationQueryDto, diff --git a/src/qqbot/permission/qqbot-permission.controller.ts b/src/qqbot/permission/qqbot-permission.controller.ts index be2f0f9..23948b7 100644 --- a/src/qqbot/permission/qqbot-permission.controller.ts +++ b/src/qqbot/permission/qqbot-permission.controller.ts @@ -9,7 +9,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { QqbotPermissionBodyDto, diff --git a/src/qqbot/plugin/qqbot-plugin.controller.ts b/src/qqbot/plugin/qqbot-plugin.controller.ts index 6347c9b..0eea114 100644 --- a/src/qqbot/plugin/qqbot-plugin.controller.ts +++ b/src/qqbot/plugin/qqbot-plugin.controller.ts @@ -8,7 +8,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { QqbotEventPluginRegistryService } from './qqbot-event-plugin-registry.service'; import { QqbotPluginRegistryService } from './qqbot-plugin-registry.service'; diff --git a/src/qqbot/rule/qqbot-rule.controller.ts b/src/qqbot/rule/qqbot-rule.controller.ts index bdcea7b..38dc4ab 100644 --- a/src/qqbot/rule/qqbot-rule.controller.ts +++ b/src/qqbot/rule/qqbot-rule.controller.ts @@ -9,7 +9,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { ToolsService, vbenSuccess } from '@/common'; import { QqbotRuleBodyDto, diff --git a/src/qqbot/send/qqbot-send.controller.ts b/src/qqbot/send/qqbot-send.controller.ts index 91ff2ea..b4c2e0a 100644 --- a/src/qqbot/send/qqbot-send.controller.ts +++ b/src/qqbot/send/qqbot-send.controller.ts @@ -9,7 +9,7 @@ import { UseGuards, } from '@nestjs/common'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { QqbotSendGroupDto, diff --git a/src/wordpress/wordpress-article.controller.ts b/src/wordpress/wordpress-article.controller.ts index 113d20b..e116248 100644 --- a/src/wordpress/wordpress-article.controller.ts +++ b/src/wordpress/wordpress-article.controller.ts @@ -12,7 +12,7 @@ import { } from '@nestjs/common'; import { ApiHeader, ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; import type { Request } from 'express'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { Public, vbenSuccess } from '@/common'; import { WordpressArticleBodyDto, diff --git a/src/wordpress/wordpress-auth.controller.ts b/src/wordpress/wordpress-auth.controller.ts index 6029de1..e7130f4 100644 --- a/src/wordpress/wordpress-auth.controller.ts +++ b/src/wordpress/wordpress-auth.controller.ts @@ -8,7 +8,7 @@ import { } from '@nestjs/common'; import { ApiHeader, ApiOperation, ApiTags } from '@nestjs/swagger'; import type { Request, Response } from 'express'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { Public, vbenSuccess } from '@/common'; import { WordpressService } from './wordpress.service'; diff --git a/src/wordpress/wordpress-category.controller.ts b/src/wordpress/wordpress-category.controller.ts index 9a48690..d58ad97 100644 --- a/src/wordpress/wordpress-category.controller.ts +++ b/src/wordpress/wordpress-category.controller.ts @@ -12,7 +12,7 @@ import { } from '@nestjs/common'; import { ApiHeader, ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; import type { Request } from 'express'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { WordpressTermBodyDto, diff --git a/src/wordpress/wordpress-tag.controller.ts b/src/wordpress/wordpress-tag.controller.ts index e1c2a56..93894a8 100644 --- a/src/wordpress/wordpress-tag.controller.ts +++ b/src/wordpress/wordpress-tag.controller.ts @@ -12,7 +12,7 @@ import { } from '@nestjs/common'; import { ApiHeader, ApiOperation, ApiQuery, ApiTags } from '@nestjs/swagger'; import type { Request } from 'express'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { vbenSuccess } from '@/common'; import { WordpressTermBodyDto, diff --git a/src/wordpress/wordpress-theme.controller.ts b/src/wordpress/wordpress-theme.controller.ts index cf46dab..c9f6c5b 100644 --- a/src/wordpress/wordpress-theme.controller.ts +++ b/src/wordpress/wordpress-theme.controller.ts @@ -1,6 +1,6 @@ import { Controller, Get, Res, UseGuards } from '@nestjs/common'; import { ApiOperation, ApiTags } from '@nestjs/swagger'; -import { JwtAuthGuard } from '@/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '@/modules/admin/identity/auth/jwt-auth.guard'; import { Public, vbenSuccess } from '@/common'; import { WordpressService } from './wordpress.service'; diff --git a/src/wordpress/wordpress.module.ts b/src/wordpress/wordpress.module.ts index a66651a..485e42d 100644 --- a/src/wordpress/wordpress.module.ts +++ b/src/wordpress/wordpress.module.ts @@ -1,5 +1,5 @@ import { Module } from '@nestjs/common'; -import { AdminAuthGuardModule } from '@/admin/auth/admin-auth-guard.module'; +import { AdminAuthGuardModule } from '@/modules/admin/identity/auth/admin-auth-guard.module'; import { WordpressArticleController } from './wordpress-article.controller'; import { WordpressAuthController } from './wordpress-auth.controller'; import { WordpressCategoryController } from './wordpress-category.controller'; diff --git a/test/admin/admin-menu.service.spec.ts b/test/admin/admin-menu.service.spec.ts index 41453af..b832236 100644 --- a/test/admin/admin-menu.service.spec.ts +++ b/test/admin/admin-menu.service.spec.ts @@ -1,6 +1,6 @@ -import { AdminMenuService } from '../../src/admin/menu/admin-menu.service'; -import type { AdminMenu } from '../../src/admin/menu/admin-menu.entity'; -import type { AdminUser } from '../../src/admin/user/admin-user.entity'; +import { AdminMenuService } from '../../src/modules/admin/identity/menu/admin-menu.service'; +import type { AdminMenu } from '../../src/modules/admin/identity/menu/admin-menu.entity'; +import type { AdminUser } from '../../src/modules/admin/identity/user/admin-user.entity'; describe('AdminMenuService', () => { const blogMenus = [ diff --git a/test/admin/admin-user-profile.service.spec.ts b/test/admin/admin-user-profile.service.spec.ts index 48c5891..b1a02ab 100644 --- a/test/admin/admin-user-profile.service.spec.ts +++ b/test/admin/admin-user-profile.service.spec.ts @@ -1,4 +1,4 @@ -import { AdminUserService } from '../../src/admin/user/admin-user.service'; +import { AdminUserService } from '../../src/modules/admin/identity/user/admin-user.service'; describe('AdminUserService profile', () => { const userRepository = { diff --git a/test/admin/auth/admin-password-crypto.service.spec.ts b/test/admin/auth/admin-password-crypto.service.spec.ts index bb96e5a..ff087a5 100644 --- a/test/admin/auth/admin-password-crypto.service.spec.ts +++ b/test/admin/auth/admin-password-crypto.service.spec.ts @@ -1,7 +1,7 @@ import { constants, publicEncrypt } from 'node:crypto'; import { HttpException } from '@nestjs/common'; -import { AdminPasswordCryptoService } from '../../../src/admin/auth/admin-password-crypto.service'; +import { AdminPasswordCryptoService } from '../../../src/modules/admin/identity/auth/admin-password-crypto.service'; describe('AdminPasswordCryptoService', () => { it('decrypts password encrypted by the exported public key', () => { diff --git a/test/admin/dict/dict.service.spec.ts b/test/admin/dict/dict.service.spec.ts index c97d72b..e0c3530 100644 --- a/test/admin/dict/dict.service.spec.ts +++ b/test/admin/dict/dict.service.spec.ts @@ -10,7 +10,7 @@ jest.mock('@/common', () => { }); import { ToolsService } from '@/common'; -import { DictService } from '@/admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; describe('DictService', () => { const dictRows = [ diff --git a/test/admin/notice/admin-notice.controller.spec.ts b/test/admin/notice/admin-notice.controller.spec.ts index 7b389ab..bc8cd9c 100644 --- a/test/admin/notice/admin-notice.controller.spec.ts +++ b/test/admin/notice/admin-notice.controller.spec.ts @@ -2,10 +2,10 @@ import type { INestApplication } from '@nestjs/common'; import { Test } from '@nestjs/testing'; import * as request from 'supertest'; -import { AdminSuperGuard } from '../../../src/admin/auth/admin-super.guard'; -import { JwtAuthGuard } from '../../../src/admin/auth/jwt-auth.guard'; -import { AdminNoticeController } from '../../../src/admin/notice/admin-notice.controller'; -import { AdminNoticeService } from '../../../src/admin/notice/admin-notice.service'; +import { AdminSuperGuard } from '../../../src/modules/admin/identity/auth/admin-super.guard'; +import { JwtAuthGuard } from '../../../src/modules/admin/identity/auth/jwt-auth.guard'; +import { AdminNoticeController } from '../../../src/modules/admin/platform-config/notice/admin-notice.controller'; +import { AdminNoticeService } from '../../../src/modules/admin/platform-config/notice/admin-notice.service'; describe('AdminNoticeController', () => { let app: INestApplication; diff --git a/test/admin/notice/admin-notice.service.spec.ts b/test/admin/notice/admin-notice.service.spec.ts index 34fc53a..ab5b597 100644 --- a/test/admin/notice/admin-notice.service.spec.ts +++ b/test/admin/notice/admin-notice.service.spec.ts @@ -1,4 +1,4 @@ -import { AdminNoticeService } from '@/admin/notice/admin-notice.service'; +import { AdminNoticeService } from '@/modules/admin/platform-config/notice/admin-notice.service'; import { ToolsService } from '@/common'; function createRepositoryMock(overrides: Record = {}) { diff --git a/test/admin/system-log/system-log.controller.spec.ts b/test/admin/system-log/system-log.controller.spec.ts index 9b6a3fd..26115d1 100644 --- a/test/admin/system-log/system-log.controller.spec.ts +++ b/test/admin/system-log/system-log.controller.spec.ts @@ -2,9 +2,9 @@ import { INestApplication } from '@nestjs/common'; import { ConfigService } from '@nestjs/config'; import { Test } from '@nestjs/testing'; import * as request from 'supertest'; -import { JwtAuthGuard } from '../../../src/admin/auth/jwt-auth.guard'; -import { SystemLogController } from '../../../src/admin/system-log/system-log.controller'; -import { SystemLogService } from '../../../src/admin/system-log/system-log.service'; +import { JwtAuthGuard } from '../../../src/modules/admin/identity/auth/jwt-auth.guard'; +import { SystemLogController } from '../../../src/modules/admin/platform-config/system-log/system-log.controller'; +import { SystemLogService } from '../../../src/modules/admin/platform-config/system-log/system-log.service'; import { ToolsService } from '../../../src/common'; describe('SystemLogController', () => { diff --git a/test/admin/system-log/system-log.service.spec.ts b/test/admin/system-log/system-log.service.spec.ts index c06f0f2..602fa62 100644 --- a/test/admin/system-log/system-log.service.spec.ts +++ b/test/admin/system-log/system-log.service.spec.ts @@ -1,5 +1,5 @@ import { ConfigService } from '@nestjs/config'; -import { SystemLogService } from '../../../src/admin/system-log/system-log.service'; +import { SystemLogService } from '../../../src/modules/admin/platform-config/system-log/system-log.service'; import { ToolsService } from '../../../src/common'; function createService() { diff --git a/test/app.e2e-spec.ts b/test/app.e2e-spec.ts index dc9157a..9a5b0ee 100644 --- a/test/app.e2e-spec.ts +++ b/test/app.e2e-spec.ts @@ -5,14 +5,14 @@ import * as request from 'supertest'; import { Readable } from 'stream'; import { AppController } from '../src/app.controller'; import { AppService } from '../src/app.service'; -import { AdminAuthService } from '../src/admin/auth/admin-auth.service'; -import { JwtAuthGuard } from '../src/admin/auth/jwt-auth.guard'; -import { ComponentController } from '../src/admin/component/component.controller'; -import { ComponentService } from '../src/admin/component/component.service'; -import { DictController } from '../src/admin/dict/dict.controller'; -import { DictService } from '../src/admin/dict/dict.service'; -import { SystemLogController } from '../src/admin/system-log/system-log.controller'; -import { SystemLogService } from '../src/admin/system-log/system-log.service'; +import { AdminAuthService } from '../src/modules/admin/identity/auth/admin-auth.service'; +import { JwtAuthGuard } from '../src/modules/admin/identity/auth/jwt-auth.guard'; +import { ComponentController } from '../src/modules/admin/platform-config/component/component.controller'; +import { ComponentService } from '../src/modules/admin/platform-config/component/component.service'; +import { DictController } from '../src/modules/admin/platform-config/dict/dict.controller'; +import { DictService } from '../src/modules/admin/platform-config/dict/dict.service'; +import { SystemLogController } from '../src/modules/admin/platform-config/system-log/system-log.controller'; +import { SystemLogService } from '../src/modules/admin/platform-config/system-log/system-log.service'; import { ApiExceptionFilter, IS_PUBLIC_KEY, diff --git a/test/modules/admin/admin-contract.spec.ts b/test/modules/admin/admin-contract.spec.ts index 4c28f15..dc0852d 100644 --- a/test/modules/admin/admin-contract.spec.ts +++ b/test/modules/admin/admin-contract.spec.ts @@ -1,8 +1,8 @@ import { MODULE_METADATA } from '@nestjs/common/constants'; -import { DictController } from '../../../src/admin/dict/dict.controller'; -import { DictModule } from '../../../src/admin/dict/dict.module'; -import { AdminNoticeController } from '../../../src/admin/notice/admin-notice.controller'; -import { NoticeModule } from '../../../src/admin/notice/notice.module'; +import { DictController } from '../../../src/modules/admin/platform-config/dict/dict.controller'; +import { DictModule } from '../../../src/modules/admin/platform-config/dict/dict.module'; +import { AdminNoticeController } from '../../../src/modules/admin/platform-config/notice/admin-notice.controller'; +import { NoticeModule } from '../../../src/modules/admin/platform-config/notice/notice.module'; import { AdminModule } from '../../../src/modules/admin/admin.module'; import { ADMIN_IDENTITY_CONTROLLERS, diff --git a/test/modules/qqbot/core/qqbot-core-command-smoke.spec.ts b/test/modules/qqbot/core/qqbot-core-command-smoke.spec.ts index 27bb7c4..b53d445 100644 --- a/test/modules/qqbot/core/qqbot-core-command-smoke.spec.ts +++ b/test/modules/qqbot/core/qqbot-core-command-smoke.spec.ts @@ -1,4 +1,4 @@ -jest.mock('@/admin/auth/jwt-auth.guard', () => ({ +jest.mock('@/modules/admin/identity/auth/jwt-auth.guard', () => ({ JwtAuthGuard: class { canActivate() { return true; @@ -17,7 +17,7 @@ import { ConfigService } from '@nestjs/config'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Test } from '@nestjs/testing'; import * as request from 'supertest'; -import { DictService } from '../../../../src/admin/dict/dict.service'; +import { DictService } from '../../../../src/modules/admin/platform-config/dict/dict.service'; import { ToolsService } from '../../../../src/common'; import { QqbotAccountService } from '../../../../src/qqbot/account/qqbot-account.service'; import { QqbotCommandController } from '../../../../src/qqbot/command/qqbot-command.controller'; diff --git a/test/modules/qqbot/core/qqbot-core-module-contract.spec.ts b/test/modules/qqbot/core/qqbot-core-module-contract.spec.ts index f029606..c8a9157 100644 --- a/test/modules/qqbot/core/qqbot-core-module-contract.spec.ts +++ b/test/modules/qqbot/core/qqbot-core-module-contract.spec.ts @@ -63,8 +63,8 @@ import { MODULE_METADATA } from '@nestjs/common/constants'; import { ConfigModule } from '@nestjs/config'; import { TypeOrmModule } from '@nestjs/typeorm'; import { getMetadataArgsStorage } from 'typeorm'; -import { AdminAuthGuardModule } from '../../../../src/admin/auth/admin-auth-guard.module'; -import { DictModule } from '../../../../src/admin/dict/dict.module'; +import { AdminAuthGuardModule } from '../../../../src/modules/admin/identity/auth/admin-auth-guard.module'; +import { DictModule } from '../../../../src/modules/admin/platform-config/dict/dict.module'; import { AppModule } from '../../../../src/app.module'; import { QqbotAccountController } from '../../../../src/qqbot/account/qqbot-account.controller'; import { QqbotCommandController } from '../../../../src/qqbot/command/qqbot-command.controller'; diff --git a/test/modules/qqbot/plugin-platform/plugin-platform-api-contract.spec.ts b/test/modules/qqbot/plugin-platform/plugin-platform-api-contract.spec.ts index ea2ab0e..a467c95 100644 --- a/test/modules/qqbot/plugin-platform/plugin-platform-api-contract.spec.ts +++ b/test/modules/qqbot/plugin-platform/plugin-platform-api-contract.spec.ts @@ -4,7 +4,7 @@ import { INestApplication } from '@nestjs/common'; import { Test } from '@nestjs/testing'; import { getRepositoryToken } from '@nestjs/typeorm'; import * as request from 'supertest'; -import { JwtAuthGuard } from '../../../../src/admin/auth/jwt-auth.guard'; +import { JwtAuthGuard } from '../../../../src/modules/admin/identity/auth/jwt-auth.guard'; import { QqbotPluginPlatformController } from '../../../../src/modules/qqbot/plugin-platform/plugin-platform.controller'; import { QqbotPluginPlatformModule } from '../../../../src/modules/qqbot/plugin-platform/plugin-platform.module'; import { QqbotPluginPlatformService } from '../../../../src/modules/qqbot/plugin-platform/plugin-platform.service'; diff --git a/test/modules/qqbot/plugins/plugin-controller-http-smoke.spec.ts b/test/modules/qqbot/plugins/plugin-controller-http-smoke.spec.ts index 1476731..6244ca0 100644 --- a/test/modules/qqbot/plugins/plugin-controller-http-smoke.spec.ts +++ b/test/modules/qqbot/plugins/plugin-controller-http-smoke.spec.ts @@ -1,4 +1,4 @@ -jest.mock('@/admin/auth/jwt-auth.guard', () => ({ +jest.mock('@/modules/admin/identity/auth/jwt-auth.guard', () => ({ JwtAuthGuard: class { canActivate() { return true; diff --git a/test/qqbot/account/qqbot-account.controller.spec.ts b/test/qqbot/account/qqbot-account.controller.spec.ts index cea7409..87b8de6 100644 --- a/test/qqbot/account/qqbot-account.controller.spec.ts +++ b/test/qqbot/account/qqbot-account.controller.spec.ts @@ -1,4 +1,4 @@ -jest.mock('@/admin/auth/jwt-auth.guard', () => ({ +jest.mock('@/modules/admin/identity/auth/jwt-auth.guard', () => ({ JwtAuthGuard: class { canActivate() { return true; diff --git a/test/qqbot/command/qqbot-command-parser.service.spec.ts b/test/qqbot/command/qqbot-command-parser.service.spec.ts index 6bb0922..ea8089e 100644 --- a/test/qqbot/command/qqbot-command-parser.service.spec.ts +++ b/test/qqbot/command/qqbot-command-parser.service.spec.ts @@ -26,7 +26,7 @@ jest.mock( { virtual: true }, ); -import { DictService } from '@/admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; import type { QqbotCommand } from '@/qqbot/command/qqbot-command.entity'; import { QqbotCommandParserService } from '@/qqbot/command/qqbot-command-parser.service'; diff --git a/test/qqbot/plugins/fflogs/qqbot-fflogs-client.service.spec.ts b/test/qqbot/plugins/fflogs/qqbot-fflogs-client.service.spec.ts index f09d4a3..6cbc7e4 100644 --- a/test/qqbot/plugins/fflogs/qqbot-fflogs-client.service.spec.ts +++ b/test/qqbot/plugins/fflogs/qqbot-fflogs-client.service.spec.ts @@ -27,7 +27,7 @@ jest.mock( ); import { ConfigService } from '@nestjs/config'; -import { DictService } from '@/admin/dict/dict.service'; +import { DictService } from '@/modules/admin/platform-config/dict/dict.service'; import { QqbotPluginHttpClientService } from '@/modules/qqbot/plugin-platform/sdk'; import { QqbotFflogsClientService } from '@/modules/qqbot/plugins/fflogs/qqbot-fflogs-client.service';