Showing
2 changed files
with
21 additions
and
8 deletions
... | @@ -6,7 +6,7 @@ use App\Admin\Renderable\PoemTable; | ... | @@ -6,7 +6,7 @@ use App\Admin\Renderable\PoemTable; |
6 | use App\Admin\Renderable\TemplateTable; | 6 | use App\Admin\Renderable\TemplateTable; |
7 | use App\Jobs\AdminMakeImmerse; | 7 | use App\Jobs\AdminMakeImmerse; |
8 | use App\Admin\Repositories\AdminMakeVideo; | 8 | use App\Admin\Repositories\AdminMakeVideo; |
9 | -use App\Models\Immerse; | 9 | +use App\Models\AdminMakeVideo as AdminVideo; |
10 | use App\Models\OnePoem; | 10 | use App\Models\OnePoem; |
11 | use App\Models\VideoTemp; | 11 | use App\Models\VideoTemp; |
12 | use Dcat\Admin\Form; | 12 | use Dcat\Admin\Form; |
... | @@ -153,15 +153,19 @@ class AdminMakeVideoController extends AdminController | ... | @@ -153,15 +153,19 @@ class AdminMakeVideoController extends AdminController |
153 | 153 | ||
154 | public function destroy($id) | 154 | public function destroy($id) |
155 | { | 155 | { |
156 | - $admin = AdminMakeVideo::find($id); | 156 | + $admin = AdminVideo::query()->find($id); |
157 | 157 | ||
158 | - dd($admin); | 158 | + if(Storage::disk("public")->exists($admin->video_url)) |
159 | + Storage::disk('public')->delete($admin->video_url); | ||
159 | 160 | ||
160 | -// Storage::disk('public')->delete($immerse->url); | 161 | + if(Storage::disk("public")->exists($admin->images_url)) |
161 | -// Storage::disk('public')->delete($immerse->thumbnail); | 162 | + Storage::disk('public')->delete($admin->images_url); |
162 | -// Storage::disk('public')->delete($immerse->bgm); | 163 | + |
163 | -// $immerse->delete(); | 164 | + if(Storage::disk("public")->exists($admin->thumbnail_url)) |
165 | + Storage::disk('public')->delete($admin->thumbnail_url); | ||
166 | + | ||
167 | + $admin->delete(); | ||
164 | // | 168 | // |
165 | -// return $this->form()->response()->refresh()->success('删除成功'); | 169 | + return $this->form()->response()->refresh()->success('删除成功'); |
166 | } | 170 | } |
167 | } | 171 | } | ... | ... |
... | @@ -71,9 +71,18 @@ class ImmerseController extends AdminController | ... | @@ -71,9 +71,18 @@ class ImmerseController extends AdminController |
71 | { | 71 | { |
72 | $immerse = Immerse::query()->find($id); | 72 | $immerse = Immerse::query()->find($id); |
73 | 73 | ||
74 | + if(Storage::disk("public")->exists($immerse->url)) | ||
74 | Storage::disk('public')->delete($immerse->url); | 75 | Storage::disk('public')->delete($immerse->url); |
76 | + | ||
77 | + if(Storage::disk("public")->exists($immerse->upload_file)) | ||
78 | + Storage::disk('public')->delete($immerse->upload_file); | ||
79 | + | ||
80 | + if(Storage::disk("public")->exists($immerse->thumbnail)) | ||
75 | Storage::disk('public')->delete($immerse->thumbnail); | 81 | Storage::disk('public')->delete($immerse->thumbnail); |
82 | + | ||
83 | + if(Storage::disk("public")->exists($immerse->bgm)) | ||
76 | Storage::disk('public')->delete($immerse->bgm); | 84 | Storage::disk('public')->delete($immerse->bgm); |
85 | + | ||
77 | $immerse->delete(); | 86 | $immerse->delete(); |
78 | 87 | ||
79 | return $this->form()->response()->refresh()->success('删除成功'); | 88 | return $this->form()->response()->refresh()->success('删除成功'); | ... | ... |
-
Please register or login to post a comment