From be75bb7bc1d80745f459bbc256327acf75287d1c Mon Sep 17 00:00:00 2001 From: tone <3341154833@qq.com> Date: Mon, 23 Jun 2025 01:30:02 +0800 Subject: [PATCH] lint --- .../web/admin-web-blog.controller.ts | 6 +-- .../admin/dto/admin-web/create-blog.dto.ts | 2 +- .../dto/admin-web/set-blog-password.dto.ts | 8 ++-- tone-page-server/src/blog/blog.controller.ts | 7 ++- .../src/blog/blog.permission.enum.ts | 8 ++-- tone-page-server/src/blog/blog.service.ts | 48 ++++++++++++------- 6 files changed, 45 insertions(+), 34 deletions(-) diff --git a/tone-page-server/src/admin/controller/web/admin-web-blog.controller.ts b/tone-page-server/src/admin/controller/web/admin-web-blog.controller.ts index 41bd565..eb0db21 100644 --- a/tone-page-server/src/admin/controller/web/admin-web-blog.controller.ts +++ b/tone-page-server/src/admin/controller/web/admin-web-blog.controller.ts @@ -1,5 +1,4 @@ import { - BadRequestException, Body, Controller, Delete, @@ -11,14 +10,11 @@ import { UseGuards, } from '@nestjs/common'; import { AuthGuard } from '@nestjs/passport'; -import { UpdatePasswordDto } from 'src/admin/dto/admin-user/update-password.dto'; import { CreateBlogDto } from 'src/admin/dto/admin-web/create-blog.dto'; import { SetBlogPasswordDto } from 'src/admin/dto/admin-web/set-blog-password.dto'; import { UpdateBlogDto } from 'src/admin/dto/admin-web/update-blog.dto'; import { Role } from 'src/auth/role.enum'; -import { BlogPermission } from 'src/blog/Blog.Permission.enum'; import { BlogService } from 'src/blog/blog.service'; -import { Blog } from 'src/blog/entity/Blog.entity'; import { Roles } from 'src/common/decorators/role.decorator'; import { RolesGuard } from 'src/common/guard/roles.guard'; @@ -26,7 +22,7 @@ import { RolesGuard } from 'src/common/guard/roles.guard'; @UseGuards(AuthGuard('jwt'), RolesGuard) @Roles(Role.Admin) export class AdminWebBlogController { - constructor(private readonly adminWebBlogService: BlogService) { } + constructor(private readonly adminWebBlogService: BlogService) {} @Get() async list() { diff --git a/tone-page-server/src/admin/dto/admin-web/create-blog.dto.ts b/tone-page-server/src/admin/dto/admin-web/create-blog.dto.ts index 4481d72..b83c3bf 100644 --- a/tone-page-server/src/admin/dto/admin-web/create-blog.dto.ts +++ b/tone-page-server/src/admin/dto/admin-web/create-blog.dto.ts @@ -15,5 +15,5 @@ export class CreateBlogDto { permissions: BlogPermission[]; @IsString() - password: string;// 允许空串 + password: string; // 允许空串 } diff --git a/tone-page-server/src/admin/dto/admin-web/set-blog-password.dto.ts b/tone-page-server/src/admin/dto/admin-web/set-blog-password.dto.ts index 028d2a1..75c5ee0 100644 --- a/tone-page-server/src/admin/dto/admin-web/set-blog-password.dto.ts +++ b/tone-page-server/src/admin/dto/admin-web/set-blog-password.dto.ts @@ -1,6 +1,6 @@ -import { IsString } from "class-validator"; +import { IsString } from 'class-validator'; export class SetBlogPasswordDto { - @IsString() - password: string; -} \ No newline at end of file + @IsString() + password: string; +} diff --git a/tone-page-server/src/blog/blog.controller.ts b/tone-page-server/src/blog/blog.controller.ts index c68cea4..c95a4b8 100644 --- a/tone-page-server/src/blog/blog.controller.ts +++ b/tone-page-server/src/blog/blog.controller.ts @@ -22,7 +22,7 @@ export class BlogController { constructor( private readonly blogService: BlogService, private readonly userService: UserService, - ) { } + ) {} @Get() getBlogs() { @@ -43,7 +43,10 @@ export class BlogController { throw new BadRequestException('文章不存在或无权限访问'); } else { // 判断密码是否正确 - if (!password || this.blogService.hashPassword(password) !== blog.password_hash) { + if ( + !password || + this.blogService.hashPassword(password) !== blog.password_hash + ) { throw new BadRequestException('文章不存在或无权限访问'); } } diff --git a/tone-page-server/src/blog/blog.permission.enum.ts b/tone-page-server/src/blog/blog.permission.enum.ts index 591fd14..54f87be 100644 --- a/tone-page-server/src/blog/blog.permission.enum.ts +++ b/tone-page-server/src/blog/blog.permission.enum.ts @@ -1,5 +1,5 @@ export enum BlogPermission { - Public = 'Public', - ByPassword = 'ByPassword', - List = 'List', -} \ No newline at end of file + Public = 'Public', + ByPassword = 'ByPassword', + List = 'List', +} diff --git a/tone-page-server/src/blog/blog.service.ts b/tone-page-server/src/blog/blog.service.ts index d4071df..5a8c8a7 100644 --- a/tone-page-server/src/blog/blog.service.ts +++ b/tone-page-server/src/blog/blog.service.ts @@ -1,7 +1,7 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Blog } from './entity/Blog.entity'; -import { ArrayContains, Repository } from 'typeorm'; +import { Repository } from 'typeorm'; import { BlogComment } from './entity/BlogComment.entity'; import { BlogPermission } from './Blog.Permission.enum'; import { createHash } from 'crypto'; @@ -13,18 +13,24 @@ export class BlogService { private readonly blogRepository: Repository, @InjectRepository(BlogComment) private readonly blogCommentRepository: Repository, - ) { } + ) {} - async list(option: { - withAll?: boolean; - } = {}) { - return (await this.blogRepository.find({ - order: { - createdAt: 'DESC', - }, - })) - .filter(i => option.withAll || i.permissions.includes(BlogPermission.List)) - .map(i => { + async list( + option: { + withAll?: boolean; + } = {}, + ) { + return ( + await this.blogRepository.find({ + order: { + createdAt: 'DESC', + }, + }) + ) + .filter( + (i) => option.withAll || i.permissions.includes(BlogPermission.List), + ) + .map((i) => { if (option.withAll) { return i; } @@ -36,7 +42,7 @@ export class BlogService { id, title, viewCount, - } + }; }); } @@ -44,7 +50,9 @@ export class BlogService { const { password, ...blog } = dto; if (blog.permissions.includes(BlogPermission.ByPassword)) { if (password) { - blog.password_hash = createHash('sha256').update(`${password}`).digest('hex'); + blog.password_hash = createHash('sha256') + .update(`${password}`) + .digest('hex'); } } @@ -58,10 +66,14 @@ export class BlogService { throw new Error('博客不存在'); } - return (await this.blogRepository.update(id, { - ...blog, - password_hash: this.hashPassword(password), - })).affected > 0; + return ( + ( + await this.blogRepository.update(id, { + ...blog, + password_hash: this.hashPassword(password), + }) + ).affected > 0 + ); } async update(id: string, blog: Partial) {