From b5ee9fa69199464c29118c18239c374fc0f50e52 Mon Sep 17 00:00:00 2001 From: jsasg <735273025@qq.com> Date: Wed, 19 Feb 2025 16:58:31 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E8=B0=83=E6=95=B4=E5=9B=BE?= =?UTF-8?q?=E7=89=87/=E8=A7=86=E9=A2=91=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/v1/Upload.php | 36 +++++++++---------- app/admin/model/v1/SysImageModel.php | 2 +- app/admin/model/v1/SysVideoModel.php | 2 +- app/common/model/SysImageBaseModel.php | 8 ++--- app/common/model/SysVideoBaseModel.php | 8 ++--- .../20241220072120_create_sys_image.php | 8 ++--- .../20250219080834_create_sys_video.php | 8 ++--- 7 files changed, 36 insertions(+), 36 deletions(-) diff --git a/app/admin/controller/v1/Upload.php b/app/admin/controller/v1/Upload.php index b85f068a..3e82fc92 100644 --- a/app/admin/controller/v1/Upload.php +++ b/app/admin/controller/v1/Upload.php @@ -56,20 +56,20 @@ class Upload $image_model->module = $param['module']; $image_model->image_path = $filename; $image_model->image_thumb = $thumb_filename; - $image_model->image_size = $file->getSize(); - $image_model->image_type = $file->getOriginalMime(); - $image_model->image_md5 = $filemd5; - $image_model->image_sha1 = $filesha1; + $image_model->file_size = $file->getSize(); + $image_model->file_type = $file->getOriginalMime(); + $image_model->file_md5 = $filemd5; + $image_model->file_sha1 = $filesha1; if (!$image_model->save()) { return error('上传失败'); } } return success('操作成功', [ - 'url' => $storage . '/' . $image_model->image_path, - 'thumb_url' => $storage . '/' . $image_model->image_thumb, - 'filemd5' => $image_model->image_md5, - 'filesha1' => $image_model->image_sha1 + 'path' => $storage . '/' . $image_model->image_path, + 'thumb_path' => $storage . '/' . $image_model->image_thumb, + 'filemd5' => $image_model->file_md5, + 'filesha1' => $image_model->file_sha1 ]); } catch (\Throwable $th) { return error($th->getMessage()); @@ -95,9 +95,9 @@ class Upload try { $validate = validate([ 'module' => 'require|max:64', - 'image' => 'fileSize:52428800|fileExt:mp4' + 'video' => 'fileSize:52428800|fileExt:mp4' ]); - if (!$validate->check(['module' => $param['module'], 'image' => $file])) { + if (!$validate->check(['module' => $param['module'], 'video' => $file])) { return error($validate->getError()); } @@ -112,20 +112,20 @@ class Upload // 保存视频 $video = new SysVideoModel(); - $video->language_id = $param['language_id']; - $video->module = $param['module']; - $video->video_path = $filename; - $video->video_size = $file->getSize(); - $video->video_type = $file->getOriginalMime(); - $video->video_md5 = $filemd5; - $video->video_sha1 = $filesha1; + $video->language_id = request()->lang_id; + $video->module = $param['module']; + $video->video_path = $filename; + $video->file_size = $file->getSize(); + $video->file_type = $file->getOriginalMime(); + $video->file_md5 = $filemd5; + $video->file_sha1 = $filesha1; if (!$video->save()) { return error('上传失败'); } } return success('上传成功', [ - 'url' => $storage . '/' . $video->video_path, + 'path' => $storage . '/' . $video->video_path, 'file_md5' => $video->file_md5, 'file_sha1' => $video->file_sha1 ]); diff --git a/app/admin/model/v1/SysImageModel.php b/app/admin/model/v1/SysImageModel.php index 818173c8..891b7a3b 100644 --- a/app/admin/model/v1/SysImageModel.php +++ b/app/admin/model/v1/SysImageModel.php @@ -14,6 +14,6 @@ class SysImageModel extends SysImageBaseModel // 根据md5获取图片 public function scopeMd5($query, $md5) { - $query->where('image_md5', '=', $md5); + $query->where('file_md5', '=', $md5); } } diff --git a/app/admin/model/v1/SysVideoModel.php b/app/admin/model/v1/SysVideoModel.php index 8315ec74..4b99d566 100644 --- a/app/admin/model/v1/SysVideoModel.php +++ b/app/admin/model/v1/SysVideoModel.php @@ -14,6 +14,6 @@ class SysVideoModel extends SysVideoBaseModel // 根据md5查询 public function scopeMd5($query, $value) { - $query->where('video_md5', '=', $value); + $query->where('file_md5', '=', $value); } } diff --git a/app/common/model/SysImageBaseModel.php b/app/common/model/SysImageBaseModel.php index f1b6bfa8..6bab456b 100644 --- a/app/common/model/SysImageBaseModel.php +++ b/app/common/model/SysImageBaseModel.php @@ -23,10 +23,10 @@ class SysImageBaseModel extends Model 'module' => 'string', 'image_path' => 'string', 'image_thumb' => 'string', - 'image_size' => 'int', - 'image_type' => 'string', - 'image_md5' => 'string', - 'image_sha1' => 'string', + 'file_size' => 'int', + 'file_type' => 'string', + 'file_md5' => 'string', + 'file_sha1' => 'string', 'created_at' => 'datetime', 'deleted_at' => 'datetime', ]; diff --git a/app/common/model/SysVideoBaseModel.php b/app/common/model/SysVideoBaseModel.php index 68cea675..d1bc7de5 100644 --- a/app/common/model/SysVideoBaseModel.php +++ b/app/common/model/SysVideoBaseModel.php @@ -23,10 +23,10 @@ class SysVideoBaseModel extends Model 'language_id' => 'int', 'module' => 'string', 'video_path' => 'string', - 'video_size' => 'int', - 'video_type' => 'string', - 'video_md5' => 'string', - 'video_sha1' => 'string', + 'file_size' => 'int', + 'file_type' => 'string', + 'file_md5' => 'string', + 'file_sha1' => 'string', 'created_at' => 'datetime', 'deleted_at' => 'datetime', ]; diff --git a/database/migrations/20241220072120_create_sys_image.php b/database/migrations/20241220072120_create_sys_image.php index afe301d6..4a7ebb24 100644 --- a/database/migrations/20241220072120_create_sys_image.php +++ b/database/migrations/20241220072120_create_sys_image.php @@ -32,10 +32,10 @@ class CreateSysImage extends Migrator ->addColumn('module', 'string', ['limit' => 64, 'null' => false, 'comment' => '图片所属模块']) ->addColumn('image_path', 'string', ['limit' => 125, 'null' => false, 'comment' => '图片路径']) ->addColumn('image_thumb', 'string', ['limit' => 125, 'null' => false, 'comment' => '缩略图路径']) - ->addColumn('image_size', 'integer', ['null' => false, 'comment' => '图片大小']) - ->addColumn('image_type', 'string', ['limit' => 125, 'null' => false, 'comment' => '图片类型']) - ->addColumn('image_md5', 'string', ['limit' => 32, 'null' => false, 'comment' => '图片md5值']) - ->addColumn('image_sha1', 'string', ['limit' => 40, 'null' => false, 'comment' => '图片sha1值']) + ->addColumn('file_size', 'integer', ['null' => false, 'comment' => '图片大小']) + ->addColumn('file_type', 'string', ['limit' => 125, 'null' => false, 'comment' => '图片类型']) + ->addColumn('file_md5', 'string', ['limit' => 32, 'null' => false, 'comment' => '图片md5值']) + ->addColumn('file_sha1', 'string', ['limit' => 40, 'null' => false, 'comment' => '图片sha1值']) ->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间']) ->addColumn('deleted_at', 'timestamp', ['null' => true, 'comment' => '删除时间']) ->create(); diff --git a/database/migrations/20250219080834_create_sys_video.php b/database/migrations/20250219080834_create_sys_video.php index 9d5252ad..affcdba7 100644 --- a/database/migrations/20250219080834_create_sys_video.php +++ b/database/migrations/20250219080834_create_sys_video.php @@ -32,10 +32,10 @@ class CreateSysVideo extends Migrator $table->addColumn('language_id', 'integer', ['signed' => false, 'null' => false, 'comment' => '语言ID']) ->addColumn('module', 'string', ['limit' => 64, 'null' => false, 'comment' => '视频所属模块']) ->addColumn('video_path', 'string', ['limit' => 125, 'null' => false, 'comment' => '视频路径']) - ->addColumn('video_size', 'integer', ['null' => false, 'comment' => '视频大小']) - ->addColumn('video_type', 'string', ['limit' => 125, 'null' => false, 'comment' => '视频类型']) - ->addColumn('video_md5', 'string', ['limit' => 32, 'null' => false, 'comment' => '视频md5值']) - ->addColumn('video_sha1', 'string', ['limit' => 40, 'null' => false, 'comment' => '视频sha1值']) + ->addColumn('file_size', 'integer', ['null' => false, 'comment' => '视频大小']) + ->addColumn('file_type', 'string', ['limit' => 125, 'null' => false, 'comment' => '视频类型']) + ->addColumn('file_md5', 'string', ['limit' => 32, 'null' => false, 'comment' => '视频md5值']) + ->addColumn('file_sha1', 'string', ['limit' => 40, 'null' => false, 'comment' => '视频sha1值']) ->addColumn('created_at', 'timestamp', ['null' => false, 'default' => 'CURRENT_TIMESTAMP', 'comment' => '创建时间']) ->addColumn('deleted_at', 'timestamp', ['null' => true, 'comment' => '删除时间']) ->create();