format + lint

tone-page-server/src/admin/admin.module.ts

@@ -16,9 +16,7 @@ import { BlogModule } from 'src/blog/blog.module';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([
+    TypeOrmModule.forFeature([User]),
-      User,
-    ]),
     UserModule,
     RoleModule,
     ResourceModule,

tone-page-server/src/admin/controller/admin-permission.controller.ts

@@ -1,13 +1,18 @@
-import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post } from "@nestjs/common";
+import {
-import { PermissionService } from "src/role/services/permission.service";
+  Body,
-import { CreatePermissionDto } from "../dto/admin-permission/create-permission.dto";
+  Controller,
+  Delete,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+} from '@nestjs/common';
+import { PermissionService } from 'src/role/services/permission.service';
+import { CreatePermissionDto } from '../dto/admin-permission/create-permission.dto';
 
 @Controller('admin/permission')
 export class AdminPermissionController {
-
+  constructor(private readonly permissionService: PermissionService) {}
-    constructor(
-        private readonly permissionService: PermissionService,
-    ) { }
 
   @Get()
   async list() {
@@ -15,17 +20,12 @@ export class AdminPermissionController {
   }
 
   @Post()
-    async create(
+  async create(@Body() dto: CreatePermissionDto) {
-        @Body() dto: CreatePermissionDto
-    ) {
     return this.permissionService.create(dto);
   }
 
   @Delete(':id')
-    async delete(
+  async delete(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-        @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-    ) {
     return this.permissionService.delete(id);
   }
-
 }

tone-page-server/src/admin/controller/admin-role-permission.controller.ts

@@ -1,11 +1,18 @@
-import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post } from "@nestjs/common";
+import {
-import { PermissionService } from "src/role/services/permission.service";
+  Body,
-import { RolePermissionService } from "src/role/services/role-permission.service";
+  Controller,
-import { SetRolePermissionsDto } from "../dto/admin-role-permission/set-role-permissions.dto";
+  Delete,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+} from '@nestjs/common';
+import { PermissionService } from 'src/role/services/permission.service';
+import { RolePermissionService } from 'src/role/services/role-permission.service';
+import { SetRolePermissionsDto } from '../dto/admin-role-permission/set-role-permissions.dto';
 
 @Controller('admin/roles/:roleId/permission')
 export class AdminRolePermissionController {
-
   constructor(
     private readonly rolePermissionService: RolePermissionService,
     private readonly permissionService: PermissionService,
@@ -15,7 +22,8 @@ export class AdminRolePermissionController {
   async getRolePermissions(
     @Param('roleId', new ParseUUIDPipe({ version: '4' })) roleId: string,
   ) {
-        const permissionIds = await this.rolePermissionService.findPermissionIdsByRoleIds([roleId]);
+    const permissionIds =
+      await this.rolePermissionService.findPermissionIdsByRoleIds([roleId]);
     return await this.permissionService.findPermissionByIds(permissionIds);
   }
 
@@ -24,7 +32,10 @@ export class AdminRolePermissionController {
     @Param('roleId', new ParseUUIDPipe({ version: '4' })) roleId: string,
     @Body() dto: SetRolePermissionsDto,
   ) {
-        return await this.rolePermissionService.addRolePermissions(roleId, dto.permissionIds);
+    return await this.rolePermissionService.addRolePermissions(
+      roleId,
+      dto.permissionIds,
+    );
   }
 
   @Delete()
@@ -32,6 +43,9 @@ export class AdminRolePermissionController {
     @Param('roleId', new ParseUUIDPipe({ version: '4' })) roleId: string,
     @Body() dto: SetRolePermissionsDto,
   ) {
-        return await this.rolePermissionService.deleteRolePermissions(roleId, dto.permissionIds);
+    return await this.rolePermissionService.deleteRolePermissions(
+      roleId,
+      dto.permissionIds,
+    );
   }
 }

tone-page-server/src/admin/controller/admin-role.controller.ts

@@ -1,13 +1,18 @@
-import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post } from "@nestjs/common";
+import {
-import { RoleService } from "src/role/services/role.service";
+  Body,
-import { CreateRoleDto } from "../dto/admin-role/create-role.dto";
+  Controller,
+  Delete,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+} from '@nestjs/common';
+import { RoleService } from 'src/role/services/role.service';
+import { CreateRoleDto } from '../dto/admin-role/create-role.dto';
 
 @Controller('admin/role')
 export class AdminRoleController {
-
+  constructor(private readonly roleService: RoleService) {}
-    constructor(
-        private readonly roleService: RoleService,
-    ) { }
 
   @Get()
   async list() {
@@ -15,16 +20,12 @@ export class AdminRoleController {
   }
 
   @Post()
-    async create(
+  async create(@Body() dto: CreateRoleDto) {
-        @Body() dto: CreateRoleDto
-    ) {
     return this.roleService.create(dto);
   }
 
   @Delete(':id')
-    async delete(
+  async delete(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-        @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-    ) {
     return this.roleService.delete(id);
   }
 }

tone-page-server/src/admin/controller/admin-user-role.controller.ts

@@ -1,12 +1,19 @@
-import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post } from "@nestjs/common";
+import {
-import { RoleService } from "src/role/services/role.service";
+  Body,
-import { UserRoleService } from "src/role/services/user-role.service";
+  Controller,
-import { CreateUserRoleDto } from "../dto/admin-user-role/create-user-role.dto";
+  Delete,
-import { DeleteUserRoleDto } from "../dto/admin-user-role/delete-user-role.dto";
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+} from '@nestjs/common';
+import { RoleService } from 'src/role/services/role.service';
+import { UserRoleService } from 'src/role/services/user-role.service';
+import { CreateUserRoleDto } from '../dto/admin-user-role/create-user-role.dto';
+import { DeleteUserRoleDto } from '../dto/admin-user-role/delete-user-role.dto';
 
 @Controller('admin/users/:userId/role')
 export class AdminUserRoleController {
-
   constructor(
     private readonly userRoleService: UserRoleService,
     private readonly roleService: RoleService,

tone-page-server/src/admin/controller/admin-user.controller.ts

@@ -1,22 +1,27 @@
-import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post, Put, Query } from "@nestjs/common";
+import {
-import { ListDto } from "../dto/admin-user/list.dto";
+  Body,
-import { CreateDto } from "../dto/admin-user/create.dto";
+  Controller,
-import { UserService } from "src/user/user.service";
+  Delete,
-import { UpdateDto } from "../dto/admin-user/update.dto";
+  Get,
-import { UpdatePasswordDto } from "../dto/admin-user/update-password.dto";
+  Param,
-import { RemoveUserDto } from "../dto/admin-user/remove.dto";
+  ParseUUIDPipe,
+  Post,
+  Put,
+  Query,
+} from '@nestjs/common';
+import { ListDto } from '../dto/admin-user/list.dto';
+import { CreateDto } from '../dto/admin-user/create.dto';
+import { UserService } from 'src/user/user.service';
+import { UpdateDto } from '../dto/admin-user/update.dto';
+import { UpdatePasswordDto } from '../dto/admin-user/update-password.dto';
+import { RemoveUserDto } from '../dto/admin-user/remove.dto';
 
 @Controller('admin/user')
 export class AdminUserController {
-
+  constructor(private readonly userService: UserService) {}
-    constructor(
-        private readonly userService: UserService,
-    ) { }
 
   @Get()
-    async list(
+  async list(@Query() listDto: ListDto) {
-        @Query() listDto: ListDto
-    ) {
     return this.userService.list(listDto.page, listDto.pageSize);
   }
 
@@ -28,18 +33,20 @@ export class AdminUserController {
   }
 
   @Post()
-    async create(
+  async create(@Body() createDto: CreateDto) {
-        @Body() createDto: CreateDto
-    ) {
     return this.userService.create({
       ...createDto,
-            ...createDto.password && (() => {
+      ...(createDto.password &&
+        (() => {
           const salt = this.userService.generateSalt();
           return {
             salt,
-                    password_hash: this.userService.hashPassword(createDto.password, salt),
+            password_hash: this.userService.hashPassword(
-                }
+              createDto.password,
-            })(),
+              salt,
+            ),
+          };
+        })()),
     });
   }
 

tone-page-server/src/admin/controller/web/admin-web-blog.controller.ts

@@ -1,13 +1,19 @@
-import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post, Put } from "@nestjs/common";
+import {
-import { CreateBlogDto } from "src/admin/dto/admin-web/create-blog.dto";
+  Body,
-import { BlogService } from "src/blog/blog.service";
+  Controller,
+  Delete,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Put,
+} from '@nestjs/common';
+import { CreateBlogDto } from 'src/admin/dto/admin-web/create-blog.dto';
+import { BlogService } from 'src/blog/blog.service';
 
 @Controller('/admin/web/blog')
 export class AdminWebBlogController {
-
+  constructor(private readonly adminWebBlogService: BlogService) {}
-    constructor(
-        private readonly adminWebBlogService: BlogService,
-    ) { }
 
   @Get()
   async list() {
@@ -15,9 +21,7 @@ export class AdminWebBlogController {
   }
 
   @Post()
-    async create(
+  async create(@Body() dto: CreateBlogDto) {
-        @Body() dto: CreateBlogDto,
-    ) {
     return this.adminWebBlogService.create(dto);
   }
 
@@ -30,16 +34,12 @@ export class AdminWebBlogController {
   }
 
   @Get(':id')
-    async get(
+  async get(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-        @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-    ) {
     return this.adminWebBlogService.findById(id);
   }
 
   @Delete(':id')
-    async remove(
+  async remove(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-        @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-    ) {
     return this.adminWebBlogService.remove(id);
   }
 }

tone-page-server/src/admin/controller/web/admin-web-resource.controller.ts

@@ -1,13 +1,19 @@
-import { Body, Controller, Delete, Get, Param, ParseUUIDPipe, Post, Put } from "@nestjs/common";
+import {
-import { CreateResourceDto } from "src/admin/dto/admin-web/create-resource.dto";
+  Body,
-import { ResourceService } from "src/resource/resource.service";
+  Controller,
+  Delete,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Put,
+} from '@nestjs/common';
+import { CreateResourceDto } from 'src/admin/dto/admin-web/create-resource.dto';
+import { ResourceService } from 'src/resource/resource.service';
 
 @Controller('/admin/web/resource')
 export class AdminWebResourceController {
-
+  constructor(private readonly resourceService: ResourceService) {}
-    constructor(
-        private readonly resourceService: ResourceService,
-    ) { }
 
   @Get()
   async list() {
@@ -27,15 +33,13 @@ export class AdminWebResourceController {
   @Put(':id')
   async update(
     @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-        @Body() data: CreateResourceDto
+    @Body() data: CreateResourceDto,
   ) {
     return this.resourceService.update(id, data);
   }
 
   @Delete(':id')
-    async delete(
+  async delete(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-        @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-    ) {
     return this.resourceService.delete(id);
   }
 }

tone-page-server/src/admin/dto/admin-permission/create-permission.dto.ts

@@ -1,8 +1,8 @@
-import { IsString } from "class-validator";
+import { IsString } from 'class-validator';
 
 export class CreatePermissionDto {
   @IsString()
-    name: string
+  name: string;
 
   @IsString()
   description: string;

tone-page-server/src/admin/dto/admin-role-permission/delete-role-permissions.dto.ts

@@ -1,4 +1,4 @@
-import { ArrayMinSize, IsArray, IsUUID } from "class-validator";
+import { ArrayMinSize, IsArray, IsUUID } from 'class-validator';
 
 export class DeleteRolePermissionsDto {
   @IsArray()

tone-page-server/src/admin/dto/admin-role-permission/set-role-permissions.dto.ts

@@ -1,4 +1,4 @@
-import { ArrayMinSize, IsArray, IsUUID } from "class-validator";
+import { ArrayMinSize, IsArray, IsUUID } from 'class-validator';
 
 export class SetRolePermissionsDto {
   @IsArray()

tone-page-server/src/admin/dto/admin-role/create-role.dto.ts

@@ -1,8 +1,8 @@
-import { IsString } from "class-validator";
+import { IsString } from 'class-validator';
 
 export class CreateRoleDto {
   @IsString()
-    name: string
+  name: string;
 
   @IsString()
   localName: string;

tone-page-server/src/admin/dto/admin-user-role/create-user-role.dto.ts

@@ -1,4 +1,4 @@
-import { IsBoolean, IsDateString, IsOptional, IsUUID } from "class-validator";
+import { IsBoolean, IsDateString, IsOptional, IsUUID } from 'class-validator';
 
 export class CreateUserRoleDto {
   @IsUUID('4')

tone-page-server/src/admin/dto/admin-user-role/delete-user-role.dto.ts

@@ -1,4 +1,4 @@
-import { IsUUID } from "class-validator";
+import { IsUUID } from 'class-validator';
 
 export class DeleteUserRoleDto {
   @IsUUID('4')

tone-page-server/src/admin/dto/admin-user/create.dto.ts

@@ -1,31 +1,32 @@
-import { IsString, Length, Matches, ValidateIf } from "class-validator";
+import { IsString, Length, Matches, ValidateIf } from 'class-validator';
 
 export class CreateDto {
-    @ValidateIf(o => o.username !== null)
+  @ValidateIf((o) => o.username !== null)
   @IsString({ message: '用户名不得为空' })
   @Length(4, 32, { message: '用户名长度只能为4~32' })
   username: string | null;
 
-    @ValidateIf(o => o.nickname !== null)
+  @ValidateIf((o) => o.nickname !== null)
   @IsString({ message: '昵称不得为空' })
   @Length(1, 30, { message: '昵称长度只能为1~30' })
   nickname: string | null;
 
-    @ValidateIf(o => o.email !== null)
+  @ValidateIf((o) => o.email !== null)
   @IsString({ message: '邮箱不得为空' })
   @Length(6, 254, { message: '邮箱长度只能为6~254' })
   email: string | null;
 
-    @ValidateIf(o => o.phone !== null)
+  @ValidateIf((o) => o.phone !== null)
   @IsString({ message: '手机号不得为空' })
   @Length(11, 11, { message: '手机号长度只能为11' })
   phone: string | null;
 
-    @ValidateIf(o => o.password !== null)
+  @ValidateIf((o) => o.password !== null)
   @IsString({ message: '密码不得为空' })
   @Length(6, 32, { message: '密码长度只能为6~32' })
-    @Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/,
+  @Matches(
-        { message: '密码必须包含字母和数字，且长度在6~32之间' }
+    /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/,
+    { message: '密码必须包含字母和数字，且长度在6~32之间' },
   )
   password: string | null;
 }

tone-page-server/src/admin/dto/admin-user/list.dto.ts

@@ -1,5 +1,3 @@
-import { PaginationDto } from "../common/pagination.dto";
+import { PaginationDto } from '../common/pagination.dto';
 
-export class ListDto extends PaginationDto {
+export class ListDto extends PaginationDto {}
-
-}

tone-page-server/src/admin/dto/admin-user/remove.dto.ts

@@ -1,5 +1,5 @@
-import { Transform } from "class-transformer";
+import { Transform } from 'class-transformer';
-import { IsBoolean } from "class-validator";
+import { IsBoolean } from 'class-validator';
 
 export class RemoveUserDto {
   @Transform(({ value }) => value === 'true')

tone-page-server/src/admin/dto/admin-user/update-password.dto.ts

@@ -1,10 +1,11 @@
-import { IsString, Length, Matches } from "class-validator";
+import { IsString, Length, Matches } from 'class-validator';
 
 export class UpdatePasswordDto {
   @IsString({ message: '密码不得为空' })
   @Length(6, 32, { message: '密码长度只能为6~32' })
-    @Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/,
+  @Matches(
-        { message: '密码必须包含字母和数字，且长度在6~32之间' }
+    /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/,
+    { message: '密码必须包含字母和数字，且长度在6~32之间' },
   )
   password: string;
 }

tone-page-server/src/admin/dto/admin-user/update.dto.ts

@@ -1,4 +1,10 @@
-import { IsEmail, IsOptional, IsString, Length, Matches } from "class-validator";
+import {
+  IsEmail,
+  IsOptional,
+  IsString,
+  Length,
+  Matches,
+} from 'class-validator';
 
 export class UpdateDto {
   @IsString({ message: '用户名不得为空' })
@@ -14,7 +20,7 @@ export class UpdateDto {
   @Length(6, 254, {
     message: '邮箱长度只能为6~254',
     // 仅在值不为 null 或 undefined 时验证
-        always: false
+    always: false,
   })
   email?: string;
 
@@ -23,7 +29,7 @@ export class UpdateDto {
   @Matches(/^1[3456789]\d{9}$/, {
     message: '请输入有效的手机号码',
     // 仅在值不为 null 或 undefined 时验证
-        always: false
+    always: false,
   })
   phone?: string;
 }

tone-page-server/src/admin/dto/admin-web/create-blog.dto.ts

@@ -1,4 +1,4 @@
-import { IsString } from "class-validator";
+import { IsString } from 'class-validator';
 
 export class CreateBlogDto {
   @IsString()

tone-page-server/src/admin/dto/admin-web/create-resource.dto.ts

@@ -1,5 +1,5 @@
-import { Type } from "class-transformer";
+import { Type } from 'class-transformer';
-import { IsString, ValidateNested } from "class-validator";
+import { IsString, ValidateNested } from 'class-validator';
 
 class ResourceTagDto {
   @IsString()

tone-page-server/src/admin/dto/common/pagination.dto.ts

@@ -1,5 +1,5 @@
 import { Type } from 'class-transformer';
-import { IsInt, IsOptional, Max, Min } from 'class-validator';
+import { IsInt, IsOptional, Min } from 'class-validator';
 
 export class PaginationDto {
   @IsOptional()

tone-page-server/src/auth/auth.controller.ts

@@ -1,4 +1,11 @@
-import { BadRequestException, Body, Controller, Get, Post, Request, UseGuards } from '@nestjs/common';
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  Post,
+  Request,
+  UseGuards,
+} from '@nestjs/common';
 import { LoginDto } from './dto/login.dto';
 import { AuthService } from './auth.service';
 import { AuthGuard } from '@nestjs/passport';
@@ -6,7 +13,6 @@ import { UserSessionService } from 'src/user/services/user-session.service';
 
 @Controller('auth')
 export class AuthController {
-
   constructor(
     private readonly authService: AuthService,
     private readonly userSessionService: UserSessionService,

tone-page-server/src/auth/auth.module.ts

@@ -25,21 +25,12 @@ import { OptionalAuthGuard } from './strategies/OptionalAuthGuard';
         signOptions: {
           expiresIn: configService.get<string>('JWT_EXPIRES_IN', '1d'),
         },
-      })
+      }),
     }),
     VerificationModule,
   ],
   controllers: [AuthController],
-  providers: [
+  providers: [AuthService, JwtStrategy, OptionalAuthGuard],
-    AuthService,
+  exports: [PassportModule, JwtStrategy, AuthService, OptionalAuthGuard],
-    JwtStrategy,
-    OptionalAuthGuard,
-  ],
-  exports: [
-    PassportModule,
-    JwtStrategy,
-    AuthService,
-    OptionalAuthGuard,
-  ]
 })
 export class AuthModule {}

tone-page-server/src/auth/auth.service.ts

@@ -10,7 +10,6 @@ import { VerificationService } from 'src/verification/verification.service';
 
 @Injectable()
 export class AuthService {
-
   constructor(
     private readonly userService: UserService,
     private readonly jwtService: JwtService,
@@ -21,13 +20,12 @@ export class AuthService {
   async loginWithPassword(loginDto: LoginDto) {
     const { account, password } = loginDto;
     // 依次使用邮箱登录、手机号、账号
-        const user = await this.userService.findOne([
+    const user = await this.userService.findOne(
-            { email: account },
+      [{ email: account }, { phone: account }, { username: account }],
-            { phone: account },
+      {
-            { username: account },
-        ], {
         withDeleted: true,
-        });
+      },
+    );
 
     if (user && user.deletedAt !== null) {
       throw new BadRequestException('该账号注销中');
@@ -46,13 +44,17 @@ export class AuthService {
     // 登录成功，颁发token
     return {
       token: await this.generateToken(user),
-        }
+    };
   }
 
   async loginWithPhone(loginDto: LoginDto) {
     const { phone, code } = loginDto;
     // 先判断验证码是否正确
-        const isValid = this.verificationService.verifyPhoneCode(phone, code, 'login');
+    const isValid = this.verificationService.verifyPhoneCode(
+      phone,
+      code,
+      'login',
+    );
     switch (isValid) {
       case 0:
         break;
@@ -77,20 +79,25 @@ export class AuthService {
       user = await this.userService.create({ phone: phone });
     }
 
-        if (!user || !user.userId) {// 注册失败或用户信息错误
+    if (!user || !user.userId) {
+      // 注册失败或用户信息错误
       throw new BadRequestException('请求失败，请稍后再试');
     }
 
     // 登录，颁发token
     return {
       token: await this.generateToken(user),
-        }
+    };
   }
 
   async loginWithEmail(loginDto: LoginDto) {
     const { email, code } = loginDto;
     // 先判断验证码是否正确
-        const isValid = this.verificationService.verifyEmailCode(email, code, 'login');
+    const isValid = this.verificationService.verifyEmailCode(
+      email,
+      code,
+      'login',
+    );
     switch (isValid) {
       case 0:
         break;
@@ -115,14 +122,15 @@ export class AuthService {
       user = await this.userService.create({ email: email });
     }
 
-        if (!user || !user.userId) {// 注册失败或用户信息错误
+    if (!user || !user.userId) {
+      // 注册失败或用户信息错误
       throw new BadRequestException('请求失败，请稍后再试');
     }
 
     // 登录，颁发token
     return {
       token: await this.generateToken(user),
-        }
+    };
   }
 
   private hashPassword(password: string, salt: string): string {
@@ -133,13 +141,15 @@ export class AuthService {
     const payload = {
       userId: user.userId,
       sessionId: uuidv4(),
-        }
+    };
 
     // 存储
-        await this.userSessionService.createSession(payload.userId, payload.sessionId);
+    await this.userSessionService.createSession(
+      payload.userId,
+      payload.sessionId,
+    );
 
     // 颁发token
     return this.jwtService.sign(payload);
   }
-
 }

tone-page-server/src/auth/dto/login.dto.ts

@@ -4,27 +4,27 @@ export class LoginDto {
   @IsEnum(['password', 'phone', 'email'], { message: '请求类型错误' })
   type: 'password' | 'phone' | 'email';
 
-    @ValidateIf(o => o.type === 'password')
+  @ValidateIf((o) => o.type === 'password')
   @IsString({ message: '账户必须输入' })
   @Length(1, 254, { message: '账户异常' }) // 用户名、邮箱、手机号
   account?: string;
 
-    @ValidateIf(o => o.type === 'password')
+  @ValidateIf((o) => o.type === 'password')
   @IsString({ message: '密码必须输入' })
   @Length(6, 32, { message: '密码异常' }) // 6-32位
   password?: string;
 
-    @ValidateIf(o => o.type === 'phone')
+  @ValidateIf((o) => o.type === 'phone')
   @IsString({ message: '手机号必须输入' })
   @Length(11, 11, { message: '手机号异常' }) // 中国大陆，11位数字
   phone?: string;
 
-    @ValidateIf(o => o.type === 'email')
+  @ValidateIf((o) => o.type === 'email')
   @IsString({ message: '邮箱必须输入' })
   @Length(6, 254, { message: '邮箱异常' }) // RFC 5321
   email?: string;
 
-    @ValidateIf(o => o.type === 'phone' || o.type === 'email')
+  @ValidateIf((o) => o.type === 'phone' || o.type === 'email')
   @IsString({ message: '验证码必须输入' })
   @Length(6, 6, { message: '验证码异常' }) // 6位数字
   code?: string;

tone-page-server/src/auth/strategies/OptionalAuthGuard.ts

@@ -1,6 +1,5 @@
-import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
-import { AuthGuard } from "@nestjs/passport";
+import { AuthGuard } from '@nestjs/passport';
-import { Observable, retry } from "rxjs";
 
 @Injectable()
 export class OptionalAuthGuard extends AuthGuard('jwt') implements CanActivate {
@@ -9,11 +8,18 @@ export class OptionalAuthGuard extends AuthGuard('jwt') implements CanActivate {
       await super.canActivate(context);
       return true;
     } catch (error) {
+      console.error('OptionalAuthGuard error:', error);
       return true; // 如果验证失败，仍然允许访问
     }
   }
 
-    handleRequest<TUser = any>(err: any, user: any, info: any, context: ExecutionContext, status?: any): TUser {
+  handleRequest<TUser = any>(
+    err: any,
+    user: any,
+    // info: any,
+    // context: ExecutionContext,
+    // status?: any,
+  ): TUser {
     if (err || !user) {
       return null; // 如果没有用户信息，返回null
     }

tone-page-server/src/auth/strategies/jwt.strategy.ts

@@ -1,8 +1,8 @@
-import { Injectable, UnauthorizedException } from "@nestjs/common";
+import { Injectable, UnauthorizedException } from '@nestjs/common';
-import { ConfigService } from "@nestjs/config";
+import { ConfigService } from '@nestjs/config';
-import { PassportStrategy } from "@nestjs/passport";
+import { PassportStrategy } from '@nestjs/passport';
-import { ExtractJwt, Strategy } from "passport-jwt";
+import { ExtractJwt, Strategy } from 'passport-jwt';
-import { UserSessionService } from "src/user/services/user-session.service";
+import { UserSessionService } from 'src/user/services/user-session.service';
 
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
@@ -14,13 +14,16 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
       jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
       ignoreExpiration: false,
       secretOrKey: configService.get<string>('JWT_SECRET', 'tone-page'),
-        })
+    });
   }
 
   async validate(payload: any) {
     const { userId, sessionId } = payload ?? {};
 
-        const isValidSession = await this.userSessionService.isSessionValid(userId, sessionId);
+    const isValidSession = await this.userSessionService.isSessionValid(
+      userId,
+      sessionId,
+    );
     if (!isValidSession) {
       throw new UnauthorizedException('登录凭证已过期，请重新登录');
     }
@@ -28,6 +31,6 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
     return {
       userId,
       sessionId,
-        }
+    };
   }
 }

tone-page-server/src/blog/blog.controller.ts

@@ -1,4 +1,14 @@
-import { BadRequestException, Body, Controller, Get, Param, ParseUUIDPipe, Post, Req, Request, UseGuards } from '@nestjs/common';
+import {
+  BadRequestException,
+  Body,
+  Controller,
+  Get,
+  Param,
+  ParseUUIDPipe,
+  Post,
+  Request,
+  UseGuards,
+} from '@nestjs/common';
 import { BlogService } from './blog.service';
 import { OptionalAuthGuard } from 'src/auth/strategies/OptionalAuthGuard';
 import { UserService } from 'src/user/user.service';
@@ -6,7 +16,6 @@ import { createBlogCommentDto } from './dto/create.blogcomment.dto';
 
 @Controller('blog')
 export class BlogController {
-
   constructor(
     private readonly blogService: BlogService,
     private readonly userService: UserService,
@@ -18,9 +27,7 @@ export class BlogController {
   }
 
   @Get(':id')
-    async getBlog(
+  async getBlog(@Param('id', new ParseUUIDPipe({ version: '4' })) id: string) {
-        @Param('id', new ParseUUIDPipe({ version: '4' })) id: string,
-    ) {
     const blog = await this.blogService.findById(id);
     if (!blog) throw new BadRequestException('文章不存在');
 
@@ -58,13 +65,21 @@ export class BlogController {
     const blog = await this.blogService.findById(id);
     if (!blog) throw new BadRequestException('文章不存在');
 
-        let user = userId ? await this.userService.findOne({ userId }) : null;
+    const user = userId ? await this.userService.findOne({ userId }) : null;
 
     // 获取IP归属地
-        const ip = req.ip || req.socket.remoteAddress || req.headers['x-forwarded-for'] || '未知';
+    const ip =
+      req.ip ||
+      req.socket.remoteAddress ||
+      req.headers['x-forwarded-for'] ||
+      '未知';
     let address = '未知';
     if (!['::1'].includes(ip)) {
-            const addressRes = await (await fetch(`https://mesh.if.iqiyi.com/aid/ip/info?version=1.1.1&ip=${ip}`)).json();
+      const addressRes = await (
+        await fetch(
+          `https://mesh.if.iqiyi.com/aid/ip/info?version=1.1.1&ip=${ip}`,
+        )
+      ).json();
       if (addressRes?.code == 0) {
         const country: string = addressRes?.data?.countryCN || '未知';
         const province: string = addressRes?.data?.provinceCN || '中国';

tone-page-server/src/blog/blog.module.ts

@@ -8,7 +8,11 @@ import { AuthModule } from 'src/auth/auth.module';
 import { UserModule } from 'src/user/user.module';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Blog, BlogComment]), AuthModule, UserModule],
+  imports: [
+    TypeOrmModule.forFeature([Blog, BlogComment]),
+    AuthModule,
+    UserModule,
+  ],
   controllers: [BlogController],
   providers: [BlogService],
   exports: [BlogService],

tone-page-server/src/blog/blog.service.ts

@@ -3,11 +3,9 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Blog } from './entity/Blog.entity';
 import { Repository } from 'typeorm';
 import { BlogComment } from './entity/BlogComment';
-import { UserService } from 'src/user/user.service';
 
 @Injectable()
 export class BlogService {
-
   constructor(
     @InjectRepository(Blog)
     private readonly blogRepository: Repository<Blog>,
@@ -20,8 +18,8 @@ export class BlogService {
       where: { deletedAt: null },
       order: {
         createdAt: 'DESC',
-            }
+      },
-        })
+    });
   }
 
   async create(blog: Partial<Blog>) {
@@ -54,7 +52,7 @@ export class BlogService {
       relations: ['user'],
       order: {
         createdAt: 'DESC',
-            }
+      },
     });
   }
 

tone-page-server/src/blog/dto/create.blogcomment.dto.ts

@@ -1,4 +1,4 @@
-import { IsOptional, IsString, IsUUID } from "class-validator";
+import { IsOptional, IsString, IsUUID } from 'class-validator';
 
 export class createBlogCommentDto {
   @IsString({ message: '评论内容不能为空' })

tone-page-server/src/blog/entity/Blog.entity.ts

@@ -1,5 +1,13 @@
-import { Column, CreateDateColumn, DeleteDateColumn, Entity, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
+import {
-import { BlogComment } from "./BlogComment";
+  Column,
+  CreateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
+import { BlogComment } from './BlogComment';
 
 @Entity()
 export class Blog {
@@ -30,6 +38,6 @@ export class Blog {
   // 权限关系 TODO
 
   // 关系
-    @OneToMany(() => BlogComment, blog => blog.id)
+  @OneToMany(() => BlogComment, (blog) => blog.id)
   comments: BlogComment[];
 }

tone-page-server/src/blog/entity/BlogComment.ts

@@ -1,5 +1,13 @@
-import { User } from "src/user/entities/user.entity";
+import { User } from 'src/user/entities/user.entity';
-import { Column, CreateDateColumn, DeleteDateColumn, Entity, JoinColumn, ManyToOne, PrimaryGeneratedColumn } from "typeorm";
+import {
+  Column,
+  CreateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  JoinColumn,
+  ManyToOne,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
 
 @Entity()
 export class BlogComment {

tone-page-server/src/common/decorators/permissions.decorator.ts

@@ -1,3 +1,4 @@
-import { SetMetadata } from "@nestjs/common";
+import { SetMetadata } from '@nestjs/common';
 
-export const Permissions = (...permissions: string[]) => SetMetadata('permissions', permissions);
+export const Permissions = (...permissions: string[]) =>
+  SetMetadata('permissions', permissions);

tone-page-server/src/common/decorators/role.decorator.ts

@@ -1,3 +1,3 @@
-import { SetMetadata } from "@nestjs/common";
+import { SetMetadata } from '@nestjs/common';
 
 export const Roles = (...roles: string[]) => SetMetadata('roles', roles);

tone-page-server/src/common/guard/permission.guard.ts

@@ -1,8 +1,8 @@
-import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
-import { PermissionService } from "src/role/services/permission.service";
+import { PermissionService } from 'src/role/services/permission.service';
-import { RolePermissionService } from "src/role/services/role-permission.service";
+import { RolePermissionService } from 'src/role/services/role-permission.service';
-import { UserRoleService } from "src/role/services/user-role.service";
+import { UserRoleService } from 'src/role/services/user-role.service';
 
 @Injectable()
 export class PermissionGuard implements CanActivate {
@@ -14,10 +14,10 @@ export class PermissionGuard implements CanActivate {
   ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
-        const requiredPermissions = this.reflector.getAllAndOverride<string[]>('permissions', [
+    const requiredPermissions = this.reflector.getAllAndOverride<string[]>(
-            context.getHandler(),
+      'permissions',
-            context.getClass(),
+      [context.getHandler(), context.getClass()],
-        ]);
+    );
 
     if (!requiredPermissions) return true;
 
@@ -27,14 +27,21 @@ export class PermissionGuard implements CanActivate {
     if (!userId) return false;
 
     // 查询用户拥有的有效角色ID
-        const userRoleIds = await this.userRoleService.findValidRoleIdsByUserId(userId);
+    const userRoleIds =
+      await this.userRoleService.findValidRoleIdsByUserId(userId);
 
     // 查询用户拥有的有效角色ID对应的权限ID
-        const userPermissionIds = await this.rolePermissionService.findPermissionIdsByRoleIds(userRoleIds);
+    const userPermissionIds =
+      await this.rolePermissionService.findPermissionIdsByRoleIds(userRoleIds);
 
     // 查询用户拥有的权限ID对应的权限名
-        const userPermissionNames = await this.permissionService.findPermissionNamesByPermissionIds(userPermissionIds);
+    const userPermissionNames =
+      await this.permissionService.findPermissionNamesByPermissionIds(
+        userPermissionIds,
+      );
 
-        return requiredPermissions.every(permission => userPermissionNames.includes(permission))
+    return requiredPermissions.every((permission) =>
+      userPermissionNames.includes(permission),
+    );
   }
 }

tone-page-server/src/common/guard/roles.guard.ts

@@ -1,7 +1,7 @@
-import { CanActivate, ExecutionContext, Injectable } from "@nestjs/common";
+import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
-import { RoleService } from "src/role/services/role.service";
+import { RoleService } from 'src/role/services/role.service';
-import { UserRoleService } from "src/role/services/user-role.service";
+import { UserRoleService } from 'src/role/services/user-role.service';
 
 @Injectable()
 export class RolesGuard implements CanActivate {
@@ -19,18 +19,19 @@ export class RolesGuard implements CanActivate {
 
     if (!requiredRoles) return true;
 
-
     const request = context.switchToHttp().getRequest();
     const userId = request.user?.userId;
 
     if (!userId) return false;
 
     // 查询用户拥有的有效角色Id
-        const userRoleIds = await this.userRoleService.findValidRoleIdsByUserId(userId);
+    const userRoleIds =
+      await this.userRoleService.findValidRoleIdsByUserId(userId);
 
     // 查询用户角色Id对应的角色名
-        const userRoleNames = await this.roleService.findRoleNamesByRoleIds(userRoleIds);
+    const userRoleNames =
+      await this.roleService.findRoleNamesByRoleIds(userRoleIds);
 
-        return requiredRoles.some(role => userRoleNames.includes(role));
+    return requiredRoles.some((role) => userRoleNames.includes(role));
   }
 }

tone-page-server/src/common/interceptors/response.interceptor.ts

@@ -1,12 +1,20 @@
-import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from "@nestjs/common";
+import {
-import { Observable } from "rxjs";
+  CallHandler,
-import { map } from "rxjs/operators"; 
+  ExecutionContext,
+  Injectable,
+  NestInterceptor,
+} from '@nestjs/common';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 @Injectable()
 export class ResponseInterceptor implements NestInterceptor {
-    intercept(context: ExecutionContext, next: CallHandler<any>): Observable<any> | Promise<Observable<any>> {
+  intercept(
+    context: ExecutionContext,
+    next: CallHandler<any>,
+  ): Observable<any> | Promise<Observable<any>> {
     return next.handle().pipe(
-            map(data => ({
+      map((data) => ({
         statusCode: 200,
         message: '请求成功',
         data,

tone-page-server/src/main.ts

@@ -5,22 +5,26 @@ import { ResponseInterceptor } from './common/interceptors/response.interceptor'
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
-  app.useGlobalPipes(new ValidationPipe({
+  app.useGlobalPipes(
+    new ValidationPipe({
       transform: true,
       whitelist: true,
       forbidNonWhitelisted: true,
       stopAtFirstError: true,
       exceptionFactory: (errors) => {
         const error = errors[0];
-      const firstConstraint = error.constraints ? Object.values(error.constraints)[0] : '验证失败';
+        const firstConstraint = error.constraints
+          ? Object.values(error.constraints)[0]
+          : '验证失败';
 
         throw new BadRequestException({
           message: firstConstraint,
           error: 'Bad Request',
-        statusCode: 400
+          statusCode: 400,
         });
-    }
+      },
-  }));
+    }),
+  );
   app.useGlobalInterceptors(new ResponseInterceptor());
   await app.listen(process.env.PORT ?? 3001);
 }

tone-page-server/src/notification/notification.service.ts

@@ -2,15 +2,19 @@ import { Injectable } from '@nestjs/common';
 
 @Injectable()
 export class NotificationService {
-
   sendEmail(email: string, subject: string, content: string) {
-        
+    throw new Error(
+      `Email sending is not implemented yet. Email: ${email}, Subject: ${subject}, Content: ${content}`,
+    );
   }
 
   /**
    * @deprecated 短信签名暂未通过
    */
   async sendSMS(phone: string, type: 'login', code: string) {
+    throw new Error(
+      `SMS sending is not implemented yet. Phone: ${phone}, Type: ${type}, Code: ${code}`,
+    );
     // const config = new $OpenApi.Config({
     //     accessKeyId: process.env.ALIYUN_ACCESS_KEY_ID,
     //     accessKeySecret: process.env.ALIYUN_ACCESS_KEY_SECRET,
@@ -28,7 +32,6 @@ export class NotificationService {
     //     }
     // })();
     // request.templateCode = code;
-
     // await client.sendSms(request).then(a => {
     //     console.log(a)
     // }).catch(err => {

tone-page-server/src/oss/oss.controller.ts

@@ -4,18 +4,15 @@ import { AuthGuard } from '@nestjs/passport';
 
 @Controller('oss')
 export class OssController {
-
+  constructor(private readonly ossService: OssService) {}
-    constructor(
-        private readonly ossService: OssService,
-    ) { }
 
   @UseGuards(AuthGuard('jwt'))
   @Get('sts')
   async getStsToken(@Request() req) {
-        const { userId, sessionId } = req.user;
+    const { userId } = req.user;
     return {
-            ...await this.ossService.getStsToken(`${userId}`),
+      ...(await this.ossService.getStsToken(`${userId}`)),
       userId,
-        }
+    };
   }
 }

tone-page-server/src/oss/oss.module.ts

@@ -4,6 +4,6 @@ import { OssController } from './oss.controller';
 
 @Module({
   providers: [OssService],
-  controllers: [OssController]
+  controllers: [OssController],
 })
 export class OssModule {}

tone-page-server/src/oss/oss.service.ts

@@ -3,7 +3,6 @@ import { STS } from 'ali-oss';
 
 @Injectable()
 export class OssService {
-
   private sts = new STS({
     accessKeyId: process.env.ALIYUN_ACCESS_KEY_ID,
     accessKeySecret: process.env.ALIYUN_ACCESS_KEY_SECRET,
@@ -18,7 +17,7 @@ export class OssService {
         Expiration: string;
       };
       expireTime: number; // 时间戳，单位为毫秒
-        }
+    };
   } = {};
 
   /** @todo 该方法存在缓存穿透问题，待优化 */
@@ -34,20 +33,21 @@ export class OssService {
       }
     }
 
-        return this.sts.assumeRole(
+    return this.sts
-            process.env.ALIYUN_OSS_STS_ROLE_ARN, ``, 3600, `${session}`,
+      .assumeRole(process.env.ALIYUN_OSS_STS_ROLE_ARN, ``, 3600, `${session}`)
-        ).then((res) => {
+      .then((res) => {
         // 缓存
         this.stsCache[session] = {
           credentials: res.credentials,
-                expireTime: new Date(res.credentials.Expiration).getTime() - 5 * 60 * 1000, // 提前5分钟过期,
+          expireTime:
+            new Date(res.credentials.Expiration).getTime() - 5 * 60 * 1000, // 提前5分钟过期,
         };
 
         return res.credentials;
-        }).catch(err => {
+      })
+      .catch((err) => {
         console.error('获取STS Token失败:', err);
         throw new Error('获取STS Token失败');
-        })
+      });
   }
-
 }

tone-page-server/src/resource/entity/resource.entity.ts

@@ -1,9 +1,16 @@
-import { Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
 
 type ResourceTag = {
   name: string;
   type: string;
-}
+};
 
 @Entity()
 export class Resource {

tone-page-server/src/resource/resource.controller.ts

@@ -3,10 +3,7 @@ import { ResourceService } from './resource.service';
 
 @Controller('resource')
 export class ResourceController {
-
+  constructor(private readonly resourceService: ResourceService) {}
-    constructor(
-        private readonly resourceService: ResourceService,
-    ) { }
 
   @Get()
   async getResource() {

tone-page-server/src/resource/resource.service.ts

@@ -14,7 +14,7 @@ export class ResourceService {
     return this.resourceRepository.find({
       order: {
         createdAt: 'DESC',
-            }
+      },
     });
   }
 

tone-page-server/src/role/entities/permission.entity.ts

@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()
 export class Permission {

tone-page-server/src/role/entities/role-permission.entity.ts

@@ -1,4 +1,4 @@
-import { Entity, Index, PrimaryColumn } from "typeorm";
+import { Entity, Index, PrimaryColumn } from 'typeorm';
 
 @Entity()
 @Index(['roleId', 'permissionId'], { unique: true })

tone-page-server/src/role/entities/role.entity.ts

@@ -1,4 +1,4 @@
-import { Column, Entity, PrimaryGeneratedColumn } from "typeorm";
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()
 export class Role {

tone-page-server/src/role/entities/user-role.entity.ts

@@ -1,4 +1,10 @@
-import { Column, CreateDateColumn, Entity, Index, PrimaryGeneratedColumn } from "typeorm";
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
 
 @Entity()
 @Index(['userId', 'roleId'])
@@ -10,7 +16,7 @@ export class UserRole {
   roleId: string;
 
   @Column('uuid')
-    userId: string
+  userId: string;
 
   @Column()
   isEnabled: boolean;

tone-page-server/src/role/role.module.ts

@@ -10,8 +10,20 @@ import { UserRole } from './entities/user-role.entity';
 import { PermissionService } from './services/permission.service';
 
 @Module({
-    imports: [TypeOrmModule.forFeature([Role, Permission, RolePermission, UserRole])],
+  imports: [
-    providers: [RolePermissionService, RoleService, UserRoleService, PermissionService],
+    TypeOrmModule.forFeature([Role, Permission, RolePermission, UserRole]),
-    exports: [RolePermissionService, RoleService, UserRoleService, PermissionService],
+  ],
+  providers: [
+    RolePermissionService,
+    RoleService,
+    UserRoleService,
+    PermissionService,
+  ],
+  exports: [
+    RolePermissionService,
+    RoleService,
+    UserRoleService,
+    PermissionService,
+  ],
 })
 export class RoleModule {}

tone-page-server/src/role/services/permission.service.ts

@@ -1,34 +1,38 @@
-import { BadRequestException, Injectable } from "@nestjs/common";
+import { BadRequestException, Injectable } from '@nestjs/common';
-import { InjectRepository } from "@nestjs/typeorm";
+import { InjectRepository } from '@nestjs/typeorm';
-import { Permission } from "../entities/permission.entity";
+import { Permission } from '../entities/permission.entity';
-import { In, Repository } from "typeorm";
+import { In, Repository } from 'typeorm';
 
 @Injectable()
 export class PermissionService {
-
   constructor(
     @InjectRepository(Permission)
     private readonly permissionRepository: Repository<Permission>,
   ) {}
 
-    async findPermissionNamesByPermissionIds(permissionIds: string[]): Promise<string[]> {
+  async findPermissionNamesByPermissionIds(
-        const permissions = await this.findPermissionsByPermissionIds(permissionIds);
+    permissionIds: string[],
-        return permissions.map(permission => permission.name);
+  ): Promise<string[]> {
+    const permissions =
+      await this.findPermissionsByPermissionIds(permissionIds);
+    return permissions.map((permission) => permission.name);
   }
 
-    async findPermissionsByPermissionIds(permissionIds: string[]): Promise<Permission[]> {
+  async findPermissionsByPermissionIds(
+    permissionIds: string[],
+  ): Promise<Permission[]> {
     return this.permissionRepository.find({
       where: {
         id: In(permissionIds),
-            }
+      },
-        })
+    });
   }
 
   async findPermissionByIds(permissionIds: string[]): Promise<Permission[]> {
     return this.permissionRepository.find({
       where: {
         id: In(permissionIds),
-            }
+      },
     });
   }
 
@@ -36,13 +40,17 @@ export class PermissionService {
     return this.permissionRepository.find();
   }
 
-    async create(permission: Pick<Permission, 'name' | 'description'>): Promise<Permission> {
+  async create(
+    permission: Pick<Permission, 'name' | 'description'>,
+  ): Promise<Permission> {
     const newPermission = this.permissionRepository.create(permission);
     return this.permissionRepository.save(newPermission);
   }
 
   async delete(permissionId: string): Promise<void> {
-        const existingPermission = await this.permissionRepository.findOne({ where: { id: permissionId } });
+    const existingPermission = await this.permissionRepository.findOne({
+      where: { id: permissionId },
+    });
     if (!existingPermission) {
       throw new BadRequestException('Permission not found');
     }

tone-page-server/src/role/services/role-permission.service.ts

@@ -1,11 +1,10 @@
-import { Injectable } from "@nestjs/common";
+import { Injectable } from '@nestjs/common';
-import { InjectRepository } from "@nestjs/typeorm";
+import { InjectRepository } from '@nestjs/typeorm';
-import { RolePermission } from "../entities/role-permission.entity";
+import { RolePermission } from '../entities/role-permission.entity';
-import { In, Repository } from "typeorm";
+import { In, Repository } from 'typeorm';
 
 @Injectable()
 export class RolePermissionService {
-
   constructor(
     @InjectRepository(RolePermission)
     private readonly rolePermissionRepository: Repository<RolePermission>,
@@ -15,14 +14,17 @@ export class RolePermissionService {
     const rolePermissions = await this.rolePermissionRepository.find({
       where: {
         roleId: In(roleIds),
-            }
+      },
     });
 
-        return rolePermissions.map(rp => rp.permissionId);
+    return rolePermissions.map((rp) => rp.permissionId);
   }
 
-    async addRolePermissions(roleId: string, permissionIds: string[]): Promise<void> {
+  async addRolePermissions(
-        const rolePermissions = permissionIds.map(permissionId => {
+    roleId: string,
+    permissionIds: string[],
+  ): Promise<void> {
+    const rolePermissions = permissionIds.map((permissionId) => {
       const rolePermission = this.rolePermissionRepository.create({
         roleId,
         permissionId,
@@ -33,7 +35,10 @@ export class RolePermissionService {
     await this.rolePermissionRepository.save(rolePermissions);
   }
 
-    async deleteRolePermissions(roleId: string, permissionIds: string[]): Promise<void> {
+  async deleteRolePermissions(
+    roleId: string,
+    permissionIds: string[],
+  ): Promise<void> {
     await this.rolePermissionRepository.delete({
       roleId,
       permissionId: In(permissionIds),

tone-page-server/src/role/services/role.service.ts

@@ -1,11 +1,10 @@
-import { BadRequestException, Injectable } from "@nestjs/common";
+import { BadRequestException, Injectable } from '@nestjs/common';
-import { InjectRepository } from "@nestjs/typeorm";
+import { InjectRepository } from '@nestjs/typeorm';
-import { Role } from "../entities/role.entity";
+import { Role } from '../entities/role.entity';
-import { In, Repository } from "typeorm";
+import { In, Repository } from 'typeorm';
 
 @Injectable()
 export class RoleService {
-
   constructor(
     @InjectRepository(Role)
     private readonly roleRepository: Repository<Role>,
@@ -13,15 +12,15 @@ export class RoleService {
 
   async findRoleNamesByRoleIds(roleIds: string[]): Promise<string[]> {
     const roles = await this.findRolesByRoleIds(roleIds);
-        return roles.map(role => role.name);
+    return roles.map((role) => role.name);
   }
 
   async findRolesByRoleIds(roleIds: string[]): Promise<Role[]> {
     return this.roleRepository.find({
       where: {
         id: In(roleIds),
-            }
+      },
-        })
+    });
   }
 
   async create(role: Pick<Role, 'name' | 'localName'>): Promise<Role> {
@@ -34,7 +33,9 @@ export class RoleService {
   }
 
   async delete(roleId: string): Promise<void> {
-        const existingRole = await this.roleRepository.findOne({ where: { id: roleId } });
+    const existingRole = await this.roleRepository.findOne({
+      where: { id: roleId },
+    });
     if (!existingRole) {
       throw new BadRequestException('Role not found');
     }

tone-page-server/src/role/services/user-role.service.ts

@@ -1,7 +1,7 @@
-import { Injectable } from "@nestjs/common";
+import { Injectable } from '@nestjs/common';
-import { InjectRepository } from "@nestjs/typeorm";
+import { InjectRepository } from '@nestjs/typeorm';
-import { UserRole } from "src/role/entities/user-role.entity";
+import { UserRole } from 'src/role/entities/user-role.entity';
-import { IsNull, MoreThanOrEqual, Repository } from "typeorm";
+import { IsNull, MoreThanOrEqual, Repository } from 'typeorm';
 
 @Injectable()
 export class UserRoleService {
@@ -14,14 +14,14 @@ export class UserRoleService {
     const userRoles = await this.userRoleRepository.find({
       where: {
         userId,
-            }
+      },
     });
 
-        return userRoles.map(ur => ur.roleId);
+    return userRoles.map((ur) => ur.roleId);
   }
 
   async findValidRoleIdsByUserId(userId: string): Promise<string[]> {
-        return (await this.findValidRolesByUserId(userId)).map(ur => ur.roleId);
+    return (await this.findValidRolesByUserId(userId)).map((ur) => ur.roleId);
   }
 
   async findValidRolesByUserId(userId: string) {
@@ -38,12 +38,14 @@ export class UserRoleService {
           userId,
           isEnabled: true,
           expiredAt: IsNull(),
-                }
+        },
-            ]
+      ],
-        })
+    });
   }
 
-    async addUserRole(userRole: Pick<UserRole, 'roleId' | 'userId' | 'isEnabled' | 'expiredAt'>): Promise<void> {
+  async addUserRole(
+    userRole: Pick<UserRole, 'roleId' | 'userId' | 'isEnabled' | 'expiredAt'>,
+  ): Promise<void> {
     const newUserRole = this.userRoleRepository.create(userRole);
     await this.userRoleRepository.save(newUserRole);
   }

tone-page-server/src/user/dto/update-user-password.dto.ts

@@ -1,10 +1,11 @@
-import { IsString, Length, Matches } from "class-validator";
+import { IsString, Length, Matches } from 'class-validator';
 
 export class UpdateUserPasswordDto {
   @IsString({ message: '密码不得为空' })
   @Length(6, 32, { message: '密码长度只能为6~32' })
-    @Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/,
+  @Matches(
-        { message: '密码必须包含字母和数字，且长度在6~32之间' }
+    /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/,
+    { message: '密码必须包含字母和数字，且长度在6~32之间' },
   )
   password: string;
 }

tone-page-server/src/user/entities/user-session.entity.ts

@@ -1,4 +1,11 @@
-import { Column, CreateDateColumn, DeleteDateColumn, Entity, Index, PrimaryGeneratedColumn } from "typeorm";
+import {
+  Column,
+  CreateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  Index,
+  PrimaryGeneratedColumn,
+} from 'typeorm';
 
 @Entity()
 @Index(['sessionId', 'userId'])

tone-page-server/src/user/entities/user.entity.ts

@@ -1,11 +1,26 @@
-import { BeforeInsert, Column, CreateDateColumn, DeleteDateColumn, Entity, Index, PrimaryGeneratedColumn, UpdateDateColumn } from "typeorm";
+import {
+  BeforeInsert,
+  Column,
+  CreateDateColumn,
+  DeleteDateColumn,
+  Entity,
+  Index,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn,
+} from 'typeorm';
 import { v4 as uuidv4 } from 'uuid';
 
 @Entity()
-@Index("IDX_user_userid", ["userId"], { unique: true })
+@Index('IDX_user_userid', ['userId'], { unique: true })
-@Index("IDX_user_username", ["username"], { unique: true })
+@Index('IDX_user_username', ['username'], { unique: true })
-@Index("IDX_user_email", ["email"], { unique: true, where: "email IS NOT NULL" })
+@Index('IDX_user_email', ['email'], {
-@Index("IDX_user_phone", ["phone"], { unique: true, where: "phone IS NOT NULL" })
+  unique: true,
+  where: 'email IS NOT NULL',
+})
+@Index('IDX_user_phone', ['phone'], {
+  unique: true,
+  where: 'phone IS NOT NULL',
+})
 export class User {
   @PrimaryGeneratedColumn('uuid')
   userId: string;
@@ -38,7 +53,7 @@ export class User {
     transformer: {
       to: (value: string | null) => value?.trim() || null,
       from: (value: string | null) => value,
-        }
+    },
   }) // RFC 5321
   email: string | null;
 
@@ -48,7 +63,7 @@ export class User {
     transformer: {
       to: (value: string | null) => value?.trim() || null,
       from: (value: string | null) => value,
-        }
+    },
   }) // China Mainland
   phone: string | null;
 
@@ -57,7 +72,7 @@ export class User {
     transformer: {
       to: (value: string | null) => value?.trim() || null,
       from: (value: string | null) => value,
-        }
+    },
   })
   avatar: string;
 

tone-page-server/src/user/services/user-session.service.ts

@@ -1,7 +1,7 @@
-import { InjectRepository } from "@nestjs/typeorm";
+import { InjectRepository } from '@nestjs/typeorm';
-import { Injectable } from "@nestjs/common";
+import { Injectable } from '@nestjs/common';
-import { UserSession } from "../entities/user-session.entity";
+import { UserSession } from '../entities/user-session.entity';
-import { Repository } from "typeorm";
+import { Repository } from 'typeorm';
 
 @Injectable()
 export class UserSessionService {
@@ -10,7 +10,6 @@ export class UserSessionService {
     private readonly userSessionRepository: Repository<UserSession>,
   ) {}
 
-
   async createSession(userId: string, sessionId: string): Promise<UserSession> {
     const session = this.userSessionRepository.create({
       userId,
@@ -25,7 +24,7 @@ export class UserSessionService {
         userId,
         sessionId,
         deletedAt: null,
-            }
+      },
     });
 
     return !!session;
@@ -37,7 +36,7 @@ export class UserSessionService {
         userId,
         sessionId,
         deletedAt: null,
-            }
+      },
     });
 
     if (session) {

tone-page-server/src/user/user.controller.ts

@@ -6,7 +6,6 @@ import { AuthService } from 'src/auth/auth.service';
 
 @Controller('user')
 export class UserController {
-
   constructor(
     private readonly userService: UserService,
     private readonly authService: AuthService,
@@ -21,10 +20,7 @@ export class UserController {
 
   @UseGuards(AuthGuard('jwt'))
   @Put('password')
-    async update(
+  async update(@Request() req, @Body() dto: UpdateUserPasswordDto) {
-        @Request() req,
-        @Body() dto: UpdateUserPasswordDto,
-    ) {
     return this.userService.setPassword(req.user.userId, dto.password);
   }
 }

tone-page-server/src/user/user.service.ts

@@ -1,11 +1,17 @@
-import { BadRequestException, ConflictException, Injectable } from '@nestjs/common';
+import {
+  BadRequestException,
+  ConflictException,
+  Injectable,
+} from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { User } from './entities/user.entity';
 import { QueryFailedError, Repository } from 'typeorm';
-import { createHash, ECDH } from 'crypto';
+import { createHash } from 'crypto';
 import { v4 as uuid } from 'uuid';
 
-type UserFindOptions = Partial<Pick<User, 'userId' | 'username' | 'phone' | 'email'>>;
+type UserFindOptions = Partial<
+  Pick<User, 'userId' | 'username' | 'phone' | 'email'>
+>;
 
 @Injectable()
 export class UserService {
@@ -14,7 +20,10 @@ export class UserService {
     private readonly userRepository: Repository<User>,
   ) {}
 
-    async findOne(options: UserFindOptions | UserFindOptions[], additionalOptions?: { withDeleted?: boolean }): Promise<User | null> {
+  async findOne(
+    options: UserFindOptions | UserFindOptions[],
+    additionalOptions?: { withDeleted?: boolean },
+  ): Promise<User | null> {
     if (Object.keys(options).length === 0) {
       throw new BadRequestException('查询条件不能为空');
     }
@@ -37,7 +46,9 @@ export class UserService {
   }
 
   async update(userId: string, user: Partial<User>): Promise<User> {
-        const existingUser = await this.userRepository.findOne({ where: { userId } });
+    const existingUser = await this.userRepository.findOne({
+      where: { userId },
+    });
     if (!existingUser) {
       throw new BadRequestException('User not found');
     }
@@ -52,22 +63,25 @@ export class UserService {
   }
 
   async delete(userId: string, soft: boolean) {
-        const existingUser = await this.userRepository.findOne({ where: { userId }, withDeleted: true });
+    const existingUser = await this.userRepository.findOne({
+      where: { userId },
+      withDeleted: true,
+    });
     if (!existingUser) {
       throw new BadRequestException('用户不存在');
     }
 
     if (existingUser.deletedAt && soft) {
-            throw new BadRequestException('账户已注销，不得重复操作')
+      throw new BadRequestException('账户已注销，不得重复操作');
     }
 
     if (!existingUser.deletedAt && !soft) {
-            throw new BadRequestException('账号未注销，请先注销再执行删除操作')
+      throw new BadRequestException('账号未注销，请先注销再执行删除操作');
     }
 
     return soft
       ? await this.userRepository.softDelete(existingUser.userId)
-            : await this.userRepository.delete(existingUser.userId)
+      : await this.userRepository.delete(existingUser.userId);
   }
 
   hashPassword(password: string, salt: string): string {
@@ -104,7 +118,7 @@ export class UserService {
   }
 
   async list(page = 1, pageSize = 20) {
-        const queryBuilder = this.userRepository.createQueryBuilder('user')
+    const queryBuilder = this.userRepository.createQueryBuilder('user');
 
     queryBuilder.withDeleted();
 
@@ -119,6 +133,6 @@ export class UserService {
       total,
       page,
       pageSize,
-        }
+    };
   }
 }

tone-page-server/src/verification/dto/send-verification-code.dto.ts

@@ -1,18 +1,18 @@
-import { IsEnum, IsString, Length, ValidateIf } from "class-validator";
+import { IsEnum, IsString, Length, ValidateIf } from 'class-validator';
 
 export class SendVerificationCodeDto {
   @IsEnum(['phone', 'email'], { message: '请求类型错误' })
   targetType: 'phone' | 'email';
 
   @IsEnum(['login'], { message: '请求类型错误' })
-    type: 'login'
+  type: 'login';
 
-    @ValidateIf(o => o.targetType === 'phone')
+  @ValidateIf((o) => o.targetType === 'phone')
   @IsString({ message: '手机号必须输入' })
   @Length(11, 11, { message: '手机号异常' }) // 中国大陆，11位数字
   phone?: string;
 
-    @ValidateIf(o => o.targetType === 'email')
+  @ValidateIf((o) => o.targetType === 'email')
   @IsString({ message: '邮箱必须输入' })
   @Length(6, 254, { message: '邮箱异常' }) // RFC 5321
   email?: string;

tone-page-server/src/verification/verification.controller.ts

@@ -4,10 +4,7 @@ import { VerificationService } from './verification.service';
 
 @Controller('verification')
 export class VerificationController {
-
+  constructor(private readonly verificationService: VerificationService) {}
-    constructor(
-        private readonly verificationService: VerificationService,
-    ) { }
 
   @Post('send')
   async sendVerificationCode(@Body() dto: SendVerificationCodeDto) {

tone-page-server/src/verification/verification.service.ts

@@ -3,20 +3,20 @@ import { NotificationService } from 'src/notification/notification.service';
 
 @Injectable()
 export class VerificationService {
-
   private readonly logger = new Logger(VerificationService.name);
 
-    constructor(
+  constructor(private readonly notificationService: NotificationService) {}
-        private readonly notificationService: NotificationService,
-    ) { }
 
-    private pool: Map<string, {
+  private pool: Map<
+    string,
+    {
       code: string;
       createdAt: number;
       expiredAt: number;
       tryCount: number;
       maxTryCount: number;
-    }> = new Map();
+    }
+  > = new Map();
 
   async sendPhoneCode(phone: string, type: 'login') {
     const key = `phone:${phone}:${type}`;
@@ -96,4 +96,3 @@ export class VerificationService {
     return Math.floor(100000 + Math.random() * 900000).toString();
   }
 }
-