From b02e2d2160a72399525e89b677d19f652316171f Mon Sep 17 00:00:00 2001 From: xy <10816187@qq.com> Date: Wed, 27 Nov 2024 14:30:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=B1=82=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- admin/.env | 2 +- server/src/app.module.ts | 2 +- server/src/config/configuration.ts | 3 +++ server/src/main.ts | 10 ++++++---- .../src/{ => modules}/system/auth/auth.controller.ts | 0 server/src/{ => modules}/system/auth/auth.module.ts | 0 server/src/{ => modules}/system/auth/auth.service.ts | 0 server/src/{ => modules}/system/auth/dto/auth.dto.ts | 2 +- .../system/auth/dto/role-permission.dto.ts | 0 .../src/{ => modules}/system/auth/dto/user-role.dto.ts | 0 server/src/{ => modules}/system/auth/roles.guard.ts | 0 .../{ => modules}/system/config/config.controller.ts | 0 .../src/{ => modules}/system/config/config.module.ts | 0 .../src/{ => modules}/system/config/config.service.ts | 0 .../system/config/dto/create-config.dto.ts | 0 .../{ => modules}/system/config/dto/query-list.dto.ts | 2 +- .../system/config/dto/update-config.dto.ts | 0 .../src/{ => modules}/system/files/files.controller.ts | 0 server/src/{ => modules}/system/files/files.module.ts | 0 server/src/{ => modules}/system/files/files.service.ts | 0 .../{ => modules}/system/menu/dto/create-menu.dto.ts | 0 .../{ => modules}/system/menu/dto/update-menu.dto.ts | 0 .../src/{ => modules}/system/menu/menu.controller.ts | 0 server/src/{ => modules}/system/menu/menu.module.ts | 0 server/src/{ => modules}/system/menu/menu.service.ts | 0 .../system/permission/dto/grant-menu.dto.ts | 0 .../system/permission/permission.controller.ts | 2 +- .../system/permission/permission.module.ts | 0 .../system/permission/permission.service.ts | 2 +- .../{ => modules}/system/role/dto/create-role.dto.ts | 0 .../{ => modules}/system/role/dto/query-list.dto.ts | 2 +- .../{ => modules}/system/role/dto/update-role.dto.ts | 0 .../src/{ => modules}/system/role/role.controller.ts | 0 server/src/{ => modules}/system/role/role.module.ts | 0 server/src/{ => modules}/system/role/role.service.ts | 0 server/src/{ => modules}/system/system.module.ts | 0 .../{ => modules}/system/user/dto/create-user.dto.ts | 0 .../{ => modules}/system/user/dto/query-list.dto.ts | 2 +- .../system/user/dto/update-password.dto.ts | 0 .../{ => modules}/system/user/dto/update-user.dto.ts | 0 .../src/{ => modules}/system/user/user.controller.ts | 0 server/src/{ => modules}/system/user/user.module.ts | 0 server/src/{ => modules}/system/user/user.service.ts | 0 43 files changed, 17 insertions(+), 12 deletions(-) rename server/src/{ => modules}/system/auth/auth.controller.ts (100%) rename server/src/{ => modules}/system/auth/auth.module.ts (100%) rename server/src/{ => modules}/system/auth/auth.service.ts (100%) rename server/src/{ => modules}/system/auth/dto/auth.dto.ts (66%) rename server/src/{ => modules}/system/auth/dto/role-permission.dto.ts (100%) rename server/src/{ => modules}/system/auth/dto/user-role.dto.ts (100%) rename server/src/{ => modules}/system/auth/roles.guard.ts (100%) rename server/src/{ => modules}/system/config/config.controller.ts (100%) rename server/src/{ => modules}/system/config/config.module.ts (100%) rename server/src/{ => modules}/system/config/config.service.ts (100%) rename server/src/{ => modules}/system/config/dto/create-config.dto.ts (100%) rename server/src/{ => modules}/system/config/dto/query-list.dto.ts (72%) rename server/src/{ => modules}/system/config/dto/update-config.dto.ts (100%) rename server/src/{ => modules}/system/files/files.controller.ts (100%) rename server/src/{ => modules}/system/files/files.module.ts (100%) rename server/src/{ => modules}/system/files/files.service.ts (100%) rename server/src/{ => modules}/system/menu/dto/create-menu.dto.ts (100%) rename server/src/{ => modules}/system/menu/dto/update-menu.dto.ts (100%) rename server/src/{ => modules}/system/menu/menu.controller.ts (100%) rename server/src/{ => modules}/system/menu/menu.module.ts (100%) rename server/src/{ => modules}/system/menu/menu.service.ts (100%) rename server/src/{ => modules}/system/permission/dto/grant-menu.dto.ts (100%) rename server/src/{ => modules}/system/permission/permission.controller.ts (86%) rename server/src/{ => modules}/system/permission/permission.module.ts (100%) rename server/src/{ => modules}/system/permission/permission.service.ts (93%) rename server/src/{ => modules}/system/role/dto/create-role.dto.ts (100%) rename server/src/{ => modules}/system/role/dto/query-list.dto.ts (81%) rename server/src/{ => modules}/system/role/dto/update-role.dto.ts (100%) rename server/src/{ => modules}/system/role/role.controller.ts (100%) rename server/src/{ => modules}/system/role/role.module.ts (100%) rename server/src/{ => modules}/system/role/role.service.ts (100%) rename server/src/{ => modules}/system/system.module.ts (100%) rename server/src/{ => modules}/system/user/dto/create-user.dto.ts (100%) rename server/src/{ => modules}/system/user/dto/query-list.dto.ts (82%) rename server/src/{ => modules}/system/user/dto/update-password.dto.ts (100%) rename server/src/{ => modules}/system/user/dto/update-user.dto.ts (100%) rename server/src/{ => modules}/system/user/user.controller.ts (100%) rename server/src/{ => modules}/system/user/user.module.ts (100%) rename server/src/{ => modules}/system/user/user.service.ts (100%) diff --git a/admin/.env b/admin/.env index 1f4fd04..fb79753 100644 --- a/admin/.env +++ b/admin/.env @@ -1,2 +1,2 @@ VITE_APP_TITLE=nestjs-admin -VITE_APP_BASE_URL=http://127.0.0.1:3000/api/admin +VITE_APP_BASE_URL=http://127.0.0.1:8000/api/admin diff --git a/server/src/app.module.ts b/server/src/app.module.ts index cdfc4bf..ab44a2f 100644 --- a/server/src/app.module.ts +++ b/server/src/app.module.ts @@ -4,7 +4,7 @@ import configuration from './config/configuration'; import { APP_GUARD } from '@nestjs/core'; import { AuthGuard } from './common/guard/auth.guard'; import { PermissionGuard } from '@/common/guard/permission.guard'; -import { SystemModule } from './system/system.module'; +import { SystemModule } from '@/modules/system/system.module'; import { PrismaModule } from '@/prisma/prisma.module'; import { CacheModule } from '@nestjs/cache-manager'; import { redisStore } from 'cache-manager-redis-yet'; diff --git a/server/src/config/configuration.ts b/server/src/config/configuration.ts index fb3896a..eecdd55 100644 --- a/server/src/config/configuration.ts +++ b/server/src/config/configuration.ts @@ -18,4 +18,7 @@ export default () => ({ secretKey: '3sNkhS5zVf9tTXb3doSN2iJ3NO6WG8alJPoj1Pzd', bucketName: 'static', }, + server: { + port: 8000, + }, }); diff --git a/server/src/main.ts b/server/src/main.ts index 1e2716f..023b34b 100644 --- a/server/src/main.ts +++ b/server/src/main.ts @@ -2,7 +2,8 @@ import { NestFactory } from '@nestjs/core'; import { AppModule } from './app.module'; import { Logger, ValidationPipe } from '@nestjs/common'; import { PrismaService } from './prisma/prisma.service'; -import { ConfigService } from './system/config/config.service'; +import { ConfigService as SysConfigService } from '@/modules/system/config/config.service'; +import { ConfigService } from '@nestjs/config'; import { HttpExceptionFilter } from 'src/common/http-exception.filter'; import { HttpInterceptor } from 'src/common/http.interceptor'; import { WinstonModule } from 'nest-winston'; @@ -62,16 +63,17 @@ async function bootstrap() { await prismaService.enableShutdownHooks(app); // 同步配置到redis - const configService = app.get(ConfigService); - await configService.syncConfig(); + const sysConfigService = app.get(SysConfigService); + await sysConfigService.syncConfig(); + const config = app.get(ConfigService); // 跨域 app.enableCors(); // 设置全局前缀 app.setGlobalPrefix('api'); const logger = new Logger('Server Running'); - await app.listen(3000, '0.0.0.0', async () => { + await app.listen(config.get('server.port'), '0.0.0.0', async () => { logger.log(`Application is running on: ${await app.getUrl()}`); }); } diff --git a/server/src/system/auth/auth.controller.ts b/server/src/modules/system/auth/auth.controller.ts similarity index 100% rename from server/src/system/auth/auth.controller.ts rename to server/src/modules/system/auth/auth.controller.ts diff --git a/server/src/system/auth/auth.module.ts b/server/src/modules/system/auth/auth.module.ts similarity index 100% rename from server/src/system/auth/auth.module.ts rename to server/src/modules/system/auth/auth.module.ts diff --git a/server/src/system/auth/auth.service.ts b/server/src/modules/system/auth/auth.service.ts similarity index 100% rename from server/src/system/auth/auth.service.ts rename to server/src/modules/system/auth/auth.service.ts diff --git a/server/src/system/auth/dto/auth.dto.ts b/server/src/modules/system/auth/dto/auth.dto.ts similarity index 66% rename from server/src/system/auth/dto/auth.dto.ts rename to server/src/modules/system/auth/dto/auth.dto.ts index fefbad5..eb57782 100644 --- a/server/src/system/auth/dto/auth.dto.ts +++ b/server/src/modules/system/auth/dto/auth.dto.ts @@ -1,4 +1,4 @@ -import { CreateUserDto } from 'src/system/user/dto/create-user.dto'; +import { CreateUserDto } from '@/modules/system/user/dto/create-user.dto'; import { PickType } from '@nestjs/mapped-types'; export class AuthDto extends PickType(CreateUserDto, [ diff --git a/server/src/system/auth/dto/role-permission.dto.ts b/server/src/modules/system/auth/dto/role-permission.dto.ts similarity index 100% rename from server/src/system/auth/dto/role-permission.dto.ts rename to server/src/modules/system/auth/dto/role-permission.dto.ts diff --git a/server/src/system/auth/dto/user-role.dto.ts b/server/src/modules/system/auth/dto/user-role.dto.ts similarity index 100% rename from server/src/system/auth/dto/user-role.dto.ts rename to server/src/modules/system/auth/dto/user-role.dto.ts diff --git a/server/src/system/auth/roles.guard.ts b/server/src/modules/system/auth/roles.guard.ts similarity index 100% rename from server/src/system/auth/roles.guard.ts rename to server/src/modules/system/auth/roles.guard.ts diff --git a/server/src/system/config/config.controller.ts b/server/src/modules/system/config/config.controller.ts similarity index 100% rename from server/src/system/config/config.controller.ts rename to server/src/modules/system/config/config.controller.ts diff --git a/server/src/system/config/config.module.ts b/server/src/modules/system/config/config.module.ts similarity index 100% rename from server/src/system/config/config.module.ts rename to server/src/modules/system/config/config.module.ts diff --git a/server/src/system/config/config.service.ts b/server/src/modules/system/config/config.service.ts similarity index 100% rename from server/src/system/config/config.service.ts rename to server/src/modules/system/config/config.service.ts diff --git a/server/src/system/config/dto/create-config.dto.ts b/server/src/modules/system/config/dto/create-config.dto.ts similarity index 100% rename from server/src/system/config/dto/create-config.dto.ts rename to server/src/modules/system/config/dto/create-config.dto.ts diff --git a/server/src/system/config/dto/query-list.dto.ts b/server/src/modules/system/config/dto/query-list.dto.ts similarity index 72% rename from server/src/system/config/dto/query-list.dto.ts rename to server/src/modules/system/config/dto/query-list.dto.ts index 84b6737..9c34d7b 100644 --- a/server/src/system/config/dto/query-list.dto.ts +++ b/server/src/modules/system/config/dto/query-list.dto.ts @@ -1,4 +1,4 @@ -import { PaginationDto } from 'src/common/dto/pagination.dto'; +import { PaginationDto } from '@/common/dto/pagination.dto'; import { IsOptional } from 'class-validator'; export class QueryListDto extends PaginationDto { diff --git a/server/src/system/config/dto/update-config.dto.ts b/server/src/modules/system/config/dto/update-config.dto.ts similarity index 100% rename from server/src/system/config/dto/update-config.dto.ts rename to server/src/modules/system/config/dto/update-config.dto.ts diff --git a/server/src/system/files/files.controller.ts b/server/src/modules/system/files/files.controller.ts similarity index 100% rename from server/src/system/files/files.controller.ts rename to server/src/modules/system/files/files.controller.ts diff --git a/server/src/system/files/files.module.ts b/server/src/modules/system/files/files.module.ts similarity index 100% rename from server/src/system/files/files.module.ts rename to server/src/modules/system/files/files.module.ts diff --git a/server/src/system/files/files.service.ts b/server/src/modules/system/files/files.service.ts similarity index 100% rename from server/src/system/files/files.service.ts rename to server/src/modules/system/files/files.service.ts diff --git a/server/src/system/menu/dto/create-menu.dto.ts b/server/src/modules/system/menu/dto/create-menu.dto.ts similarity index 100% rename from server/src/system/menu/dto/create-menu.dto.ts rename to server/src/modules/system/menu/dto/create-menu.dto.ts diff --git a/server/src/system/menu/dto/update-menu.dto.ts b/server/src/modules/system/menu/dto/update-menu.dto.ts similarity index 100% rename from server/src/system/menu/dto/update-menu.dto.ts rename to server/src/modules/system/menu/dto/update-menu.dto.ts diff --git a/server/src/system/menu/menu.controller.ts b/server/src/modules/system/menu/menu.controller.ts similarity index 100% rename from server/src/system/menu/menu.controller.ts rename to server/src/modules/system/menu/menu.controller.ts diff --git a/server/src/system/menu/menu.module.ts b/server/src/modules/system/menu/menu.module.ts similarity index 100% rename from server/src/system/menu/menu.module.ts rename to server/src/modules/system/menu/menu.module.ts diff --git a/server/src/system/menu/menu.service.ts b/server/src/modules/system/menu/menu.service.ts similarity index 100% rename from server/src/system/menu/menu.service.ts rename to server/src/modules/system/menu/menu.service.ts diff --git a/server/src/system/permission/dto/grant-menu.dto.ts b/server/src/modules/system/permission/dto/grant-menu.dto.ts similarity index 100% rename from server/src/system/permission/dto/grant-menu.dto.ts rename to server/src/modules/system/permission/dto/grant-menu.dto.ts diff --git a/server/src/system/permission/permission.controller.ts b/server/src/modules/system/permission/permission.controller.ts similarity index 86% rename from server/src/system/permission/permission.controller.ts rename to server/src/modules/system/permission/permission.controller.ts index 3579b97..b1d20cc 100644 --- a/server/src/system/permission/permission.controller.ts +++ b/server/src/modules/system/permission/permission.controller.ts @@ -1,7 +1,7 @@ import { Controller, Body, Patch, Param, Get } from '@nestjs/common'; import { PermissionService } from './permission.service'; -import { GrantMenuDto } from '@/system/permission/dto/grant-menu.dto'; +import { GrantMenuDto } from '@/modules/system/permission/dto/grant-menu.dto'; @Controller() export class PermissionController { diff --git a/server/src/system/permission/permission.module.ts b/server/src/modules/system/permission/permission.module.ts similarity index 100% rename from server/src/system/permission/permission.module.ts rename to server/src/modules/system/permission/permission.module.ts diff --git a/server/src/system/permission/permission.service.ts b/server/src/modules/system/permission/permission.service.ts similarity index 93% rename from server/src/system/permission/permission.service.ts rename to server/src/modules/system/permission/permission.service.ts index d1ecce7..c158b51 100644 --- a/server/src/system/permission/permission.service.ts +++ b/server/src/modules/system/permission/permission.service.ts @@ -1,5 +1,5 @@ import { Injectable } from '@nestjs/common'; -import { GrantMenuDto } from '@/system/permission/dto/grant-menu.dto'; +import { GrantMenuDto } from '@/modules/system/permission/dto/grant-menu.dto'; import { PrismaService } from '@/prisma/prisma.service'; @Injectable() diff --git a/server/src/system/role/dto/create-role.dto.ts b/server/src/modules/system/role/dto/create-role.dto.ts similarity index 100% rename from server/src/system/role/dto/create-role.dto.ts rename to server/src/modules/system/role/dto/create-role.dto.ts diff --git a/server/src/system/role/dto/query-list.dto.ts b/server/src/modules/system/role/dto/query-list.dto.ts similarity index 81% rename from server/src/system/role/dto/query-list.dto.ts rename to server/src/modules/system/role/dto/query-list.dto.ts index b008ff8..310112a 100644 --- a/server/src/system/role/dto/query-list.dto.ts +++ b/server/src/modules/system/role/dto/query-list.dto.ts @@ -1,4 +1,4 @@ -import { PaginationDto } from 'src/common/dto/pagination.dto'; +import { PaginationDto } from '@/common/dto/pagination.dto'; import { IsInt, IsOptional } from 'class-validator'; import { Type } from 'class-transformer'; diff --git a/server/src/system/role/dto/update-role.dto.ts b/server/src/modules/system/role/dto/update-role.dto.ts similarity index 100% rename from server/src/system/role/dto/update-role.dto.ts rename to server/src/modules/system/role/dto/update-role.dto.ts diff --git a/server/src/system/role/role.controller.ts b/server/src/modules/system/role/role.controller.ts similarity index 100% rename from server/src/system/role/role.controller.ts rename to server/src/modules/system/role/role.controller.ts diff --git a/server/src/system/role/role.module.ts b/server/src/modules/system/role/role.module.ts similarity index 100% rename from server/src/system/role/role.module.ts rename to server/src/modules/system/role/role.module.ts diff --git a/server/src/system/role/role.service.ts b/server/src/modules/system/role/role.service.ts similarity index 100% rename from server/src/system/role/role.service.ts rename to server/src/modules/system/role/role.service.ts diff --git a/server/src/system/system.module.ts b/server/src/modules/system/system.module.ts similarity index 100% rename from server/src/system/system.module.ts rename to server/src/modules/system/system.module.ts diff --git a/server/src/system/user/dto/create-user.dto.ts b/server/src/modules/system/user/dto/create-user.dto.ts similarity index 100% rename from server/src/system/user/dto/create-user.dto.ts rename to server/src/modules/system/user/dto/create-user.dto.ts diff --git a/server/src/system/user/dto/query-list.dto.ts b/server/src/modules/system/user/dto/query-list.dto.ts similarity index 82% rename from server/src/system/user/dto/query-list.dto.ts rename to server/src/modules/system/user/dto/query-list.dto.ts index 30ff9ed..2a4cecb 100644 --- a/server/src/system/user/dto/query-list.dto.ts +++ b/server/src/modules/system/user/dto/query-list.dto.ts @@ -1,4 +1,4 @@ -import { PaginationDto } from 'src/common/dto/pagination.dto'; +import { PaginationDto } from '@/common/dto/pagination.dto'; import { IsOptional, IsInt } from 'class-validator'; import { Type } from 'class-transformer'; diff --git a/server/src/system/user/dto/update-password.dto.ts b/server/src/modules/system/user/dto/update-password.dto.ts similarity index 100% rename from server/src/system/user/dto/update-password.dto.ts rename to server/src/modules/system/user/dto/update-password.dto.ts diff --git a/server/src/system/user/dto/update-user.dto.ts b/server/src/modules/system/user/dto/update-user.dto.ts similarity index 100% rename from server/src/system/user/dto/update-user.dto.ts rename to server/src/modules/system/user/dto/update-user.dto.ts diff --git a/server/src/system/user/user.controller.ts b/server/src/modules/system/user/user.controller.ts similarity index 100% rename from server/src/system/user/user.controller.ts rename to server/src/modules/system/user/user.controller.ts diff --git a/server/src/system/user/user.module.ts b/server/src/modules/system/user/user.module.ts similarity index 100% rename from server/src/system/user/user.module.ts rename to server/src/modules/system/user/user.module.ts diff --git a/server/src/system/user/user.service.ts b/server/src/modules/system/user/user.service.ts similarity index 100% rename from server/src/system/user/user.service.ts rename to server/src/modules/system/user/user.service.ts