From 1d2fe70f426c5676159f0049ff7ee74441ea0f0e Mon Sep 17 00:00:00 2001
From: luoer <952222@163.com>
Date: Tue, 26 Sep 2023 17:06:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8F=92=E5=85=A5?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=94=A8=E6=88=B7=E5=A4=B1=E8=B4=A5=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/database/db.sqlite                    | Bin 163840 -> 163840 bytes
 src/app.module.ts                             |  10 +++++++---
 src/database/suscribers/entify.subscriber.ts  |   2 +-
 .../cache/cache.controller.ts                 |   0
 src/{common => storage}/cache/cache.module.ts |   0
 .../cache/cache.service.ts                    |   0
 src/{common => storage}/cache/index.ts        |   0
 7 files changed, 8 insertions(+), 4 deletions(-)
 rename src/{common => storage}/cache/cache.controller.ts (100%)
 rename src/{common => storage}/cache/cache.module.ts (100%)
 rename src/{common => storage}/cache/cache.service.ts (100%)
 rename src/{common => storage}/cache/index.ts (100%)

diff --git a/content/database/db.sqlite b/content/database/db.sqlite
index ec533ca6848137c18ba0c17aa1da57502739f67a..bfca6b3fab0d1c3cae11fc62a00b218db8e45d5e 100644
GIT binary patch
delta 630
zcmZo@;A&{#njp<MW1@^R<BW|7_WA;By!_1aj5+z~nR)R*QhM`x{m==_(oD&d*$)`A
zFg<5V-Yh7f%Ea8rC_Q=MDRB-XGX(<+D^v5y2TqA1ICoFEGfIKvxk2)#R;ET)MkbR3
z?uxO)*bh!QZ_YV9l}DIw3IiM08wRd7yjnb`d9wMg@w)+SxWUEMRKqC1V614&U_5!A
zospE8m9d$Xp^1@!k+H6Ur7p-^sL<x?cAAVTaV-2`)eH>k;-U;3vW#dd4XsQ~K`!tD
z>H@K!ZS8)se(KYXw&xpn8<wONml&l0L2_bAYI=TAC37q@%s5F=RiJSksKyx>TA7%E
zj8iqU0<$5;fy{xhp7r;?*uMd0+-9x2S&S_Fiy53I&#<#o$zz2WZp@%A$$-VJ=2oT#
zAj6}~Kp|&piE1}k2-*2YVCNgbEMtjggSj2M@fKDFmLTKZfk6RcBb#LmGRxQ)W)?F8
f14Aq*5`e*q*Qv@tvp~*9HVfTdO%IkmU|awIQkK6u

delta 92
zcmZo@;A&{#njp<MVWNyP<AjX~_WA-$y!_1aj5+z~nR)R*QgZWp{m==_lFZqY*$)_R
v78EdK-kg1S8V@%E0|OJU76acDUM--g9PehWyIG8zr`Y8%Ha%GOfN=o;?T{Qv

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<any>): void | Promise<any> {
-    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