diff --git a/content/database/db.sqlite b/content/database/db.sqlite index ec533ca..bfca6b3 100644 Binary files a/content/database/db.sqlite and b/content/database/db.sqlite differ diff --git a/src/app.module.ts b/src/app.module.ts index 6e75622..6827351 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -12,9 +12,9 @@ import { AuthModule } from '@/modules/auth'; import { UserModule } from '@/modules/user'; import { ResponseModule } from '@/common/response'; import { SerializationModule } from '@/common/serialization'; -import { CacheModule } from './common/cache'; -import { ScanModule } from './utils/scan.module'; -import { ContentModule } from './content/content.module'; +import { CacheModule } from '@/storage/cache'; +import { ScanModule } from '@/utils/scan.module'; +import { ContentModule } from '@/content/content.module'; @Module({ imports: [ @@ -62,6 +62,8 @@ import { ContentModule } from './content/content.module'; * @description 用于连接数据库 */ DatabaseModule, + + /** * 用户模块 */ @@ -78,6 +80,8 @@ import { ContentModule } from './content/content.module'; * 权限模块 */ PermissionModule, + + /** * 上传模块 */ diff --git a/src/database/suscribers/entify.subscriber.ts b/src/database/suscribers/entify.subscriber.ts index 63c9803..eda82ff 100644 --- a/src/database/suscribers/entify.subscriber.ts +++ b/src/database/suscribers/entify.subscriber.ts @@ -27,7 +27,7 @@ export class EntitySubscripber implements EntitySubscriberInterface { } beforeSoftRemove(event: SoftRemoveEvent): void | Promise { - event.entity.deletedBy = this.getUser(); + event.entity && (event.entity.deletedBy = this.getUser()); } getUser() { diff --git a/src/common/cache/cache.controller.ts b/src/storage/cache/cache.controller.ts similarity index 100% rename from src/common/cache/cache.controller.ts rename to src/storage/cache/cache.controller.ts diff --git a/src/common/cache/cache.module.ts b/src/storage/cache/cache.module.ts similarity index 100% rename from src/common/cache/cache.module.ts rename to src/storage/cache/cache.module.ts diff --git a/src/common/cache/cache.service.ts b/src/storage/cache/cache.service.ts similarity index 100% rename from src/common/cache/cache.service.ts rename to src/storage/cache/cache.service.ts diff --git a/src/common/cache/index.ts b/src/storage/cache/index.ts similarity index 100% rename from src/common/cache/index.ts rename to src/storage/cache/index.ts