diff --git a/app/admin/controller/v1/Upload.php b/app/admin/controller/v1/Upload.php index 3e82fc92..2a3c5cdb 100644 --- a/app/admin/controller/v1/Upload.php +++ b/app/admin/controller/v1/Upload.php @@ -3,8 +3,8 @@ declare (strict_types = 1); namespace app\admin\controller\v1; -use app\admin\model\v1\SysImageModel; -use app\admin\model\v1\SysVideoModel; +use app\admin\model\v1\SysImageUploadRecordModel; +use app\admin\model\v1\SysVideoUploadRecordModel; use Intervention\Image\ImageManager; use think\facade\Filesystem; @@ -39,7 +39,7 @@ class Upload $filemd5 = $file->md5(); $filesha1 = $file->sha1(); - $image_model = SysImageModel::md5($filemd5)->find(); + $image_model = SysImageUploadRecordModel::md5($filemd5)->find(); if (is_null($image_model)) { $filename = Filesystem::disk('image')->putFile($param['module'], $file); // 生成缩略图 @@ -51,7 +51,7 @@ class Upload $image->save('.' . $storage . '/' . $thumb_filename); // 保存图片 - $image_model = new SysImageModel(); + $image_model = new SysImageUploadRecordModel(); $image_model->language_id = request()->lang_id; $image_model->module = $param['module']; $image_model->image_path = $filename; @@ -68,8 +68,8 @@ class Upload return success('操作成功', [ 'path' => $storage . '/' . $image_model->image_path, 'thumb_path' => $storage . '/' . $image_model->image_thumb, - 'filemd5' => $image_model->file_md5, - 'filesha1' => $image_model->file_sha1 + 'filemd5' => $image_model->file_md5, + 'filesha1' => $image_model->file_sha1 ]); } catch (\Throwable $th) { return error($th->getMessage()); @@ -106,26 +106,26 @@ class Upload $filemd5 = $file->md5(); $filesha1 = $file->sha1(); - $video = SysVideoModel::md5($filemd5)->find(); + $video = SysVideoUploadRecordModel::md5($filemd5)->find(); if (is_null($video)) { $filename = Filesystem::disk('video')->putFile($param['module'], $file); // 保存视频 - $video = new SysVideoModel(); + $video = new SysVideoUploadRecordModel(); $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; + $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('上传成功', [ - 'path' => $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/SysImageUploadRecordModel.php similarity index 67% rename from app/admin/model/v1/SysImageModel.php rename to app/admin/model/v1/SysImageUploadRecordModel.php index 891b7a3b..a0f4b65d 100644 --- a/app/admin/model/v1/SysImageModel.php +++ b/app/admin/model/v1/SysImageUploadRecordModel.php @@ -3,13 +3,13 @@ declare (strict_types = 1); namespace app\admin\model\v1; -use app\common\model\SysImageBaseModel; +use app\common\model\SysImageUploadRecordBaseModel; /** * 图片上传模型 * @mixin \think\Model */ -class SysImageModel extends SysImageBaseModel +class SysImageUploadRecordModel extends SysImageUploadRecordBaseModel { // 根据md5获取图片 public function scopeMd5($query, $md5) diff --git a/app/admin/model/v1/SysVideoModel.php b/app/admin/model/v1/SysVideoUploadRecordModel.php similarity index 67% rename from app/admin/model/v1/SysVideoModel.php rename to app/admin/model/v1/SysVideoUploadRecordModel.php index 4b99d566..82de9496 100644 --- a/app/admin/model/v1/SysVideoModel.php +++ b/app/admin/model/v1/SysVideoUploadRecordModel.php @@ -3,13 +3,13 @@ declare (strict_types = 1); namespace app\admin\model\v1; -use app\common\model\SysVideoBaseModel; +use app\common\model\SysVideoUploadRecordBaseModel; /** * 视频上传模型 * @mixin \think\Model */ -class SysVideoModel extends SysVideoBaseModel +class SysVideoUploadRecordModel extends SysVideoUploadRecordBaseModel { // 根据md5查询 public function scopeMd5($query, $value) diff --git a/app/common/model/SysImageBaseModel.php b/app/common/model/SysImageUploadRecordBaseModel.php similarity index 85% rename from app/common/model/SysImageBaseModel.php rename to app/common/model/SysImageUploadRecordBaseModel.php index 6bab456b..915360f5 100644 --- a/app/common/model/SysImageBaseModel.php +++ b/app/common/model/SysImageUploadRecordBaseModel.php @@ -8,10 +8,10 @@ use think\Model; /** * @mixin \think\Model */ -class SysImageBaseModel extends Model +class SysImageUploadRecordBaseModel extends Model { // 表名 - protected $name = 'sys_image'; + protected $name = 'sys_image_upload_record'; // 主键 protected $pk = 'id'; diff --git a/app/common/model/SysVideoBaseModel.php b/app/common/model/SysVideoUploadRecordBaseModel.php similarity index 85% rename from app/common/model/SysVideoBaseModel.php rename to app/common/model/SysVideoUploadRecordBaseModel.php index d1bc7de5..00efc7d1 100644 --- a/app/common/model/SysVideoBaseModel.php +++ b/app/common/model/SysVideoUploadRecordBaseModel.php @@ -9,10 +9,10 @@ use think\Model; * 视频上传基础模型 * @mixin \think\Model */ -class SysVideoBaseModel extends Model +class SysVideoUploadRecordBaseModel extends Model { // 表名 - protected $name = 'sys_video'; + protected $name = 'sys_video_upload_record'; // 主键 protected $pk = 'id'; diff --git a/database/migrations/20241220072120_create_sys_image.php b/database/migrations/20241220072120_create_sys_image_upload_record.php similarity index 91% rename from database/migrations/20241220072120_create_sys_image.php rename to database/migrations/20241220072120_create_sys_image_upload_record.php index 4a7ebb24..405c08db 100644 --- a/database/migrations/20241220072120_create_sys_image.php +++ b/database/migrations/20241220072120_create_sys_image_upload_record.php @@ -2,7 +2,7 @@ use think\migration\Migrator; -class CreateSysImage extends Migrator +class CreateSysImageUploadRecord extends Migrator { /** * Change Method. @@ -27,7 +27,7 @@ class CreateSysImage extends Migrator */ public function change() { - $table = $this->table('sys_image', ['engine' => 'MyISAM', 'comment' => '图片上传表']); + $table = $this->table('sys_image_upload_record', ['engine' => 'MyISAM', 'comment' => '图片上传表']); $table->addColumn('language_id', 'integer', ['signed' => false, 'null' => false, 'comment' => '语言ID']) ->addColumn('module', 'string', ['limit' => 64, 'null' => false, 'comment' => '图片所属模块']) ->addColumn('image_path', 'string', ['limit' => 125, 'null' => false, 'comment' => '图片路径']) diff --git a/database/migrations/20250219080834_create_sys_video.php b/database/migrations/20250219080834_create_sys_video_upload_record.php similarity index 91% rename from database/migrations/20250219080834_create_sys_video.php rename to database/migrations/20250219080834_create_sys_video_upload_record.php index affcdba7..c24f6e39 100644 --- a/database/migrations/20250219080834_create_sys_video.php +++ b/database/migrations/20250219080834_create_sys_video_upload_record.php @@ -1,9 +1,8 @@ table('sys_video', ['engine' => 'MyISAM', 'comment' => '视频上传表']); + $table = $this->table('sys_video_upload_record', ['engine' => 'MyISAM', 'comment' => '视频上传表']); $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' => '视频路径'])