1.feel 临境有感可以不填

@@ -13,6 +13,7 @@ use Dcat\Admin\Grid;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Layout\Content;
 use Dcat\Admin\Show;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Illuminate\Support\Facades\Storage;
 
 
 class AdminMakeVideoController extends AdminController
 class AdminMakeVideoController extends AdminController
 {
 {
@@ -27,15 +28,17 @@ class AdminMakeVideoController extends AdminController
             $grid->model()->where('user_id','=',1);
             $grid->model()->where('user_id','=',1);
 
 
             $grid->column('id')->sortable();
             $grid->column('id')->sortable();
-            $grid->column('title');
-            $grid->column('content');
-            $grid->column('url')->image();
-            $grid->column('type');
+            $grid->column('title','标题');
+            $grid->column('content','有感');
+            $grid->column('url')->display(function ($url){
+                return "<a target='_blank' href='". Storage::disk('public')->url('/ffmpeg/'.basename($url)) ."'>查看</a>";
+            });
+            $grid->column('type','类型')->using([1 => '视频', 2 => '音频']);
             $grid->column('duration');
             $grid->column('duration');
             $grid->column('size');
             $grid->column('size');
             $grid->column('poem_id');
             $grid->column('poem_id');
             $grid->column('temp_id');
             $grid->column('temp_id');
-            $grid->column('thumbnail');
+            $grid->column('thumbnail')->image();
             $grid->column('bgm');
             $grid->column('bgm');
             $grid->column('created_at');
             $grid->column('created_at');
             $grid->column('updated_at')->sortable();
             $grid->column('updated_at')->sortable();

@@ -119,7 +119,7 @@ class MakeVideo implements ShouldQueue
         Immerse::query()->create([
         Immerse::query()->create([
             'user_id' => 1,
             'user_id' => 1,
             'title' => '',
             'title' => '',
-            'content' => $this->adminMakeVideo->feel ?? '-',
+            'content' => $this->adminMakeVideo->feel,
             'url' => $video2,
             'url' => $video2,
             'type' => $this->adminMakeVideo->type == 1 ? 2 : 1,
             'type' => $this->adminMakeVideo->type == 1 ? 2 : 1,
             'duration' => $video_info['format']['duration'],
             'duration' => $video_info['format']['duration'],

@@ -21,7 +21,7 @@ class CreateAdminMakeVideoTable extends Migration
             $table->string('images_url')->nullable()->comment('图片地址');
             $table->string('images_url')->nullable()->comment('图片地址');
             $table->unsignedTinyInteger('bg_music')->comment('是否背景音');
             $table->unsignedTinyInteger('bg_music')->comment('是否背景音');
             $table->string('bgm_url')->nullable()->comment('背景音地址');
             $table->string('bgm_url')->nullable()->comment('背景音地址');
-            $table->string('feel')->default('')->comment('有感');
+            $table->text('feel')->nullable()->comment('有感');
             $table->string('temp_id')->default('')->comment('模板id');
             $table->string('temp_id')->default('')->comment('模板id');
             $table->unsignedTinyInteger('thumbnail')->comment('封面图');
             $table->unsignedTinyInteger('thumbnail')->comment('封面图');
             $table->string('thumbnail_url')->nullable()->comment('封面图地址');
             $table->string('thumbnail_url')->nullable()->comment('封面图地址');