fix: 修复上传文件名乱码的问题

README.md

@@ -38,6 +38,11 @@
 - .dockerignore 配置哪些文件应该被忽略掉
 - .gitea/workflows/depoy.yaml 流水线任务的配置文件，语法上与 Github Actions 一致
 
+## 计划
+- 双token无感刷新
+- session/cookie，jwt，sso单点登陆
+- 大文件上传，断点续传
+
 ## 笔记
 
 - createUserDto与User分开

content/upload/2023-11-03/1698981118120.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698981118219.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

content/upload/2023-11-03/1698982084503.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698982126742.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698982168940.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698982280989.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698982946508.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698982998189.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698983054615.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698983054651.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

content/upload/2023-11-03/1698993024969.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698993024973.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

content/upload/2023-11-03/1698996056135.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698996056140.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

content/upload/2023-11-03/1698996120451.txt

@@ -0,0 +1,6 @@
+This favicon was generated using the following font:
+
+- Font Title: Leckerli One
+- Font Author: Copyright (c) 2011 Gesine Todt (www.gesine-todt.de hallo@gesine-todt.de), with Reserved Font Names "Leckerli"
+- Font Source: http://fonts.gstatic.com/s/leckerlione/v20/V8mCoQH8VCsNttEnxnGQ-1itLZxcBtItFw.ttf
+- Font License: SIL Open Font License, 1.1 (http://scripts.sil.org/OFL))

content/upload/2023-11-03/1698996120454.webmanifest

@@ -0,0 +1 @@
+{"name":"","short_name":"","icons":[{"src":"/android-chrome-192x192.png","sizes":"192x192","type":"image/png"},{"src":"/android-chrome-512x512.png","sizes":"512x512","type":"image/png"}],"theme_color":"#ffffff","background_color":"#ffffff","display":"standalone"}

src/monitor/log/interceptors/loginLog.interceptor.ts

@@ -11,12 +11,12 @@ export class LoginLogInterceptor implements NestInterceptor {
       tap({
         next: (data) => {
           const status = true;
-          const description = '登录成功';
+          const description = '用户登录成功';
           this.recordLoginLog(context, { status, description });
         },
         error: (err) => {
           const status = false;
-          const description = err?.message || '登录失败';
+          const description = err?.message || '用户登录失败';
           this.recordLoginLog(context, { status, description });
         },
       }),

src/storage/file/entities/file.entity.ts

@@ -1,6 +1,7 @@
 import { BaseEntity } from '@/database';
 import { FileCategory } from '@/storage/fileCategory';
 import { ApiHideProperty } from '@nestjs/swagger';
+import { Exclude } from 'class-transformer';
 import { Column, Entity, JoinColumn, ManyToOne } from 'typeorm';
 
 @Entity({ orderBy: { id: 'DESC' } })
@@ -54,6 +55,13 @@ export class File extends BaseEntity {
   @Column({ comment: '文件后缀' })
   extension: string;
 
+  /**
+   * 文件类型
+   * @example 1
+   */
+  @Column({ comment: '类型(1: 文本，2: 图片，3: 音频，4: 视频，5: 其他)', nullable: true })
+  type: number;
+
   /**
    * 分类
    */
@@ -66,6 +74,8 @@ export class File extends BaseEntity {
    * 分类ID
    * @example 0
    */
+  @Exclude()
+  @ApiHideProperty()
   @Column({ comment: '分类ID', nullable: true })
   categoryId: number;
 }

src/storage/file/file.module.ts

@@ -1,33 +1,35 @@
 import { ConfigService } from '@/config';
+import { dayjs } from '@/libraries';
 import { Module, forwardRef } from '@nestjs/common';
 import { MulterModule } from '@nestjs/platform-express';
 import { TypeOrmModule } from '@nestjs/typeorm';
 import { existsSync, mkdirSync } from 'fs';
 import { diskStorage } from 'multer';
 import { extname, join } from 'path';
+import { FileCategoryModule } from '../fileCategory';
 import { File } from './entities/file.entity';
 import { FileController } from './file.controller';
 import { FileService } from './file.service';
-import { dayjs } from '@/libraries';
-import { FileCategoryModule } from '../fileCategory';
 
 const MulteredModule = MulterModule.registerAsync({
-  useFactory: (config: ConfigService) => {
-    return {
-      storage: diskStorage({
-        destination: (req, file, next) => {
-          const dest = join(config.uploadDir, dayjs().format(dayjs.DATE));
-          if (!existsSync(dest)) {
-            mkdirSync(dest, { recursive: true });
-          }
-          next(null, dest);
-        },
-        filename: (req, file, next) => {
-          next(null, Date.now() + extname(file.originalname));
-        },
-      }),
-    };
-  },
+  useFactory: (config: ConfigService) => ({
+    storage: diskStorage({
+      destination: (req, file, next) => {
+        const dest = join(config.uploadDir, dayjs().format(dayjs.DATE));
+        if (!existsSync(dest)) {
+          mkdirSync(dest, { recursive: true });
+        }
+        next(null, dest);
+      },
+      filename: (req, file, next) => {
+        next(null, Date.now() + extname(file.originalname));
+      },
+    }),
+    fileFilter(req, file, callback) {
+      file.originalname = Buffer.from(file.originalname, 'latin1').toString('utf-8');
+      callback(null, true);
+    },
+  }),
   inject: [ConfigService],
 });
 

src/storage/file/file.service.ts

@@ -7,6 +7,9 @@ import { UpdateFileDto } from './dto/update-file.dto';
 import { File } from './entities/file.entity';
 import { FindFileDto } from './dto/find-file.dto';
 import { FileCategoryService } from '../fileCategory';
+import { createReadStream } from 'fs';
+import { createHash } from 'crypto';
+import { getTypeByMimetype } from './util';
 
 @Injectable()
 export class FileService extends BaseService {
@@ -23,13 +26,17 @@ export class FileService extends BaseService {
    * @returns
    */
   async create(uploadFile: Express.Multer.File) {
-    const { originalname: name, mimetype, size, path: hash } = uploadFile;
-    const relativePath = relative(this.config.uploadDir, uploadFile.path).split(sep).join('/');
-    const path = `${this.config.uploadPrefix}/${relativePath}`;
+    const { originalname: name, mimetype, size } = uploadFile;
+    const { uploadDir, uploadPrefix } = this.config;
+    const relativePath = relative(uploadDir, uploadFile.path).split(sep).join('/');
+    const path = `${uploadPrefix}/${relativePath}`;
     const extension = extname(uploadFile.originalname);
     const description = '';
+    const hash = await this.hashByFilePath(uploadFile.path);
+    const type = getTypeByMimetype(mimetype)
     const file = this.repository.create({
       name,
+      type,
       mimetype,
       size,
       hash,
@@ -41,7 +48,28 @@ export class FileService extends BaseService {
     return file.id;
   }
 
-  findMany(findFileDto: FindFileDto) {
+  /**
+   * 从文件路径读取流，进行MD5哈希
+   * @param path 文件路径
+   * @returns
+   */
+  hashByFilePath(path: string): Promise<string> {
+    const hash = createHash('md5');
+    const stream = createReadStream(path);
+    return new Promise((res, rej) => {
+      stream.on('data', (chunk) => {
+        hash.update(chunk);
+      });
+      stream.on('end', () => {
+        res(hash.digest('hex'));
+      });
+      stream.on('error', () => {
+        rej('获取文件哈希值失败');
+      });
+    });
+  }
+
+  async findMany(findFileDto: FindFileDto) {
     const { page, size, name, categoryId } = findFileDto;
     const { skip, take } = this.formatPagination(page, size, true);
     const where: FindOptionsWhere<File> = {};
@@ -51,7 +79,20 @@ export class FileService extends BaseService {
     if (categoryId) {
       where.categoryId = categoryId;
     }
-    return this.repository.findAndCount({ skip, take, where });
+    return this.repository.findAndCount({
+      skip,
+      take,
+      where,
+      relations: {
+        category: true,
+      },
+      select: {
+        category: {
+          id: true,
+          name: true,
+        },
+      },
+    });
   }
 
   findOne(id: number) {

src/storage/file/util.ts

@@ -0,0 +1,30 @@
+/**
+ * 文件类型
+ */
+enum FileType {
+  /**
+   * 文本
+   */
+  TEXT = 1,
+  /**
+   * 图片
+   */
+  IMAGE = 2,
+  /**
+   * 音频
+   */
+  AUDIO = 3,
+  /**
+   * 视频
+   */
+  VIDEO = 4,
+  /**
+   * 其他
+   */
+  OTHER = 5,
+}
+
+export function getTypeByMimetype(mimetype: string) {
+  const [type] = mimetype.split('/');
+  return FileType[type.toLowerCase()] ?? FileType.OTHER;
+}

src/system/role/dto/create-role.dto.ts

@@ -29,5 +29,5 @@ export class CreateRoleDto {
    */
   @IsOptional()
   @IsInt({ each: true })
-  menuIds: number[];
+  menuIds?: number[];
 }

src/system/role/entities/role.entity.ts

@@ -43,6 +43,7 @@ export class Role extends BaseEntity {
 
   /**
    * 菜单ID数组
+   * @example [1]
    */
   @RelationId('menus')
   menuIds: number[];