修复清理错误

升级框架和类库
自动清空过期数据；
2026-07-01 19:12:48 +08:00 · 2023-02-20 15:08:56 +08:00 · 2022-12-29 12:38:53 +08:00 · 2022-08-09 09:46:42 +08:00 · 2022-05-23 15:55:30 +08:00
6 changed files with 245 additions and 196 deletions
--- a/app/UploadFiles.php
+++ b/app/UploadFiles.php
@@ -12,126 +12,128 @@ use think\file\UploadedFile;
 class UploadFiles
 {

-  protected static $disk = '';
+    protected static $disk = '';

-  public static function setDisks($disk)
-  {
-    self::$disk = $disk;
-  }
-
-  public static function add()
-  {
-    return new AppUploadFiles();
-  }
-
-  public static function create($data, $allowFiled = [], $replace = false)
-  {
-    return AppUploadFiles::create($data, $allowFiled, $replace);
-  }
-
-  public static function use($save_name)
-  {
-    return AppUploadFiles::where('save_name', $save_name)->update([
-      'used_time' => time(),
-      'status' => 1
-    ]);
-  }
-
-  public static function delete($save_name)
-  {
-    return AppUploadFiles::where('save_name', $save_name)->update([
-      'delete_time' => time(),
-      'status' => 2
-    ]);
-  }
-
-  public static function clear($id)
-  {
-    $model_file = AppUploadFiles::withTrashed()->find($id);
-
-    $model_file->clear_time = time();
-    $model_file->status = 3;
-
-    $model_file->save();
-
-    return Filesystem::disk(self::$disk)->delete($model_file->getData('save_name'));
-  }
-
-  public static function save(Request $request)
-  {
-
-    $type = $request->param('type');
-    if (empty($type)) {
-      return json_message('缺少类型参数');
+    public static function setDisks($disk)
+    {
+        self::$disk = $disk;
    }

-    $file = request()->file('file');
-
-    if (empty($file)) {
-      return json_message('上传失败');
-    }
-    $file_extension = $file->extension();
-
-    if ($file_extension == 'php') {
-      return json_message('上传文件异常');
+    public static function add()
+    {
+        return new AppUploadFiles();
    }

-    $file_path = $file->getRealPath();
-
-    // $file_content = file_get_contents($file_path);
-
-    // if (strpos($file_content, '<?php') !== false) {
-    //   return json_message('上传文件异常');
-    // }
-
-
-
-    $dir_name = $request->param('dir', $type);
-    try {
-      $model_file = self::saveFile($file, $type, $dir_name);
-      return json_message($model_file->append(['src'])->toArray());
-    } catch (\Throwable $th) {
-      return json_message($th->getMessage());
-    }
-  }
-
-  public static function saveFile(File $file, $type, $dir_name = null)
-  {
-    if (is_null($dir_name)) {
-      $dir_name = $type;
-    }
-    $model_file = UploadFiles::add();
-    if ($file instanceof UploadedFile) {
-
-      $model_file->file_name = $file->getOriginalName();
-    } else {
-      $model_file->file_name = $file->getFilename();
+    public static function create($data, $allowFiled = [], $replace = false)
+    {
+        return AppUploadFiles::create($data, $allowFiled, $replace);
    }

-    $model_file->mime_type = $file->getMime();
-    $model_file->ext_name = $file->extension();
-    $model_file->file_size = $file->getSize();
-    $model_file->file_md5 = $file->md5();
-    $model_file->file_sha1 = $file->sha1();
-    $model_file->create_time = time();
-    $model_file->type = $type;
-    $model_file->disk = self::$disk;
-    $model_file->save_name = Filesystem::disk(self::$disk)->putFile('upload/' . $dir_name, $file, 'uniqid');
-    $model_file->save();
-    return $model_file;
-  }
+    public static function use($save_name)
+    {
+        return AppUploadFiles::where('save_name', $save_name)->update([
+            'used_time' => time(),
+            'status' => 1
+        ]);
+    }

-  public static function saveUrlFile($url, $type)
-  {
-    $file_data = geturl($url);
+    public static function delete($save_name)
+    {
+        return AppUploadFiles::where('save_name', $save_name)->update([
+            'delete_time' => time(),
+            'status' => 2
+        ]);
+    }

-    $mime_type = MimeType::detectByContent($file_data);
-    $ext_name = array_search($mime_type, MimeType::getExtensionToMimeTypeMap());
-    $temp_file = tempnam(app()->getRuntimePath(), 'url_save_') . '.' . $ext_name;
-    file_put_contents($temp_file, $file_data);
-    $file = new File($temp_file);
-    $model_file = self::saveFile($file, $type);
-    unlink($temp_file);
-    return $model_file;
-  }
+    public static function clear($id)
+    {
+        $model_file = AppUploadFiles::withTrashed()->find($id);
+
+        $model_file->clear_time = time();
+        $model_file->status = 3;
+
+        $model_file->save();
+
+        return Filesystem::disk(self::$disk)->delete($model_file->getData('save_name'));
+    }
+
+    public static function save(Request $request, $type = null)
+    {
+
+        if (is_null($type)) {
+            $type = $request->param('type');
+        }
+        if (empty($type)) {
+            return json_message('缺少类型参数');
+        }
+
+        $file = request()->file('file');
+
+        if (empty($file)) {
+            return json_message('上传失败');
+        }
+        $file_extension = $file->extension();
+
+        if ($file_extension == 'php') {
+            return json_message('上传文件异常');
+        }
+
+        $file_path = $file->getRealPath();
+
+        // $file_content = file_get_contents($file_path);
+
+        // if (strpos($file_content, '<?php') !== false) {
+        //   return json_message('上传文件异常');
+        // }
+
+
+
+        $dir_name = $request->param('dir', $type);
+        try {
+            $model_file = self::saveFile($file, $type, $dir_name);
+            return json_message($model_file->append(['src'])->toArray());
+        } catch (\Throwable $th) {
+            return json_message($th->getMessage());
+        }
+    }
+
+    public static function saveFile(File $file, $type, $dir_name = null)
+    {
+        if (is_null($dir_name)) {
+            $dir_name = $type;
+        }
+        $model_file = UploadFiles::add();
+        if ($file instanceof UploadedFile) {
+
+            $model_file->file_name = $file->getOriginalName();
+        } else {
+            $model_file->file_name = $file->getFilename();
+        }
+
+        $model_file->mime_type = $file->getMime();
+        $model_file->ext_name = $file->extension();
+        $model_file->file_size = $file->getSize();
+        $model_file->file_md5 = $file->md5();
+        $model_file->file_sha1 = $file->sha1();
+        $model_file->create_time = time();
+        $model_file->type = $type;
+        $model_file->disk = self::$disk;
+        $model_file->save_name = Filesystem::disk(self::$disk)->putFile('upload/' . $dir_name, $file, 'uniqid');
+        $model_file->save();
+        return $model_file;
+    }
+
+    public static function saveUrlFile($url, $type)
+    {
+        $file_data = geturl($url);
+
+        $mime_type = MimeType::detectByContent($file_data);
+        $ext_name = array_search($mime_type, MimeType::getExtensionToMimeTypeMap());
+        $temp_file = tempnam(app()->getRuntimePath(), 'url_save_') . '.' . $ext_name;
+        file_put_contents($temp_file, $file_data);
+        $file = new File($temp_file);
+        $model_file = self::saveFile($file, $type);
+        unlink($temp_file);
+        return $model_file;
+    }
 }
--- a/app/index/controller/File.php
+++ b/app/index/controller/File.php
@@ -9,90 +9,90 @@ use think\Request;

 class File extends Common
 {
-  /**
-   * 显示资源列表
-   *
-   * @return \think\Response
-   */
-  public function index()
-  {
-    //
-  }
+    /**
+     * 显示资源列表
+     *
+     * @return \think\Response
+     */
+    public function index()
+    {
+        //
+    }

-  /**
-   * 显示创建资源表单页.
-   *
-   * @return \think\Response
-   */
-  public function create()
-  {
-    //
-  }
+    /**
+     * 显示创建资源表单页.
+     *
+     * @return \think\Response
+     */
+    public function create()
+    {
+        //
+    }

-  /**
-   * 保存新建的资源
-   *
-   * @param  \think\Request  $request
-   * @return \think\Response
-   */
-  public function save(Request $request)
-  {
-    //
+    /**
+     * 保存新建的资源
+     *
+     * @param  \think\Request  $request
+     * @return \think\Response
+     */
+    public function save(Request $request)
+    {
+        //

-    
-  }

-  public function webSave(Request $request)
-  {
-    # code...
+    }

-    UploadFiles::setDisks('safe');
+    public function webSave(Request $request)
+    {
+        # code...

-    return UploadFiles::save($request);
-  }
+        UploadFiles::setDisks('safe');

-  /**
-   * 显示指定的资源
-   *
-   * @param  int  $id
-   * @return \think\Response
-   */
-  public function read($id)
-  {
-    //
-  }
+        return UploadFiles::save($request, 'fileshare');
+    }

-  /**
-   * 显示编辑资源表单页.
-   *
-   * @param  int  $id
-   * @return \think\Response
-   */
-  public function edit($id)
-  {
-    //
-  }
+    /**
+     * 显示指定的资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function read($id)
+    {
+        //
+    }

-  /**
-   * 保存更新的资源
-   *
-   * @param  \think\Request  $request
-   * @param  int  $id
-   * @return \think\Response
-   */
-  public function update(Request $request, $id)
-  {
-    //
-  }
+    /**
+     * 显示编辑资源表单页.
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function edit($id)
+    {
+        //
+    }

-  /**
-   * 删除指定资源
-   *
-   * @param  int  $id
-   * @return \think\Response
-   */
-  public function delete($id)
-  {
-    //
-  }
+    /**
+     * 保存更新的资源
+     *
+     * @param  \think\Request  $request
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * 删除指定资源
+     *
+     * @param  int  $id
+     * @return \think\Response
+     */
+    public function delete($id)
+    {
+        //
+    }
 }
--- a/app/tools/controller/ClearFile.php
+++ b/app/tools/controller/ClearFile.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+namespace app\tools\controller;
+
+use app\model\Share;
+use app\model\ShareFiles;
+use think\facade\Filesystem;
+use think\facade\Log;
+use think\Request;
+
+class ClearFile
+{
+    public function do()
+    {
+
+        $now_time = time();
+
+        $list_share = Share::where('create_time', '<', $now_time - 86400 * 10)->where('clear_time', 0)->select();
+
+        foreach ($list_share as  $model_share) {
+            
+            Log::debug('清空数据：' . $model_share->build_download_save_name);
+
+            if (Filesystem::disk('safe')->fileExists($model_share->build_download_save_name)) {
+                Filesystem::disk('safe')->delete($model_share->build_download_save_name);
+            }
+
+            $list_files = ShareFiles::where('share_id', $model_share->id)->select();
+
+
+            foreach ($list_files as $model_files) {
+                if (Filesystem::disk('safe')->fileExists($model_files->save_name)) {
+                    Filesystem::disk('safe')->delete($model_files->save_name);
+                }
+                $model_files->clear_time = time();
+                $model_files->save();
+            }
+
+            $model_share->clear_time = time();
+            $model_share->status = 1;
+            $model_share->save();
+        }
+    }
+}
--- a/composer.json
+++ b/composer.json
@@ -19,15 +19,16 @@
    ],
    "require": {
        "php": ">=7.1.0",
-        "topthink/framework": "6.0.*",
-        "topthink/think-orm": "2.0.*",
+        "topthink/framework": "^6.0",
+        "topthink/think-orm": "^2.0",
        "topthink/think-view": "^1.0",
        "topthink/think-migration": "^3.0",
        "topthink/think-helper": "^3.1",
        "topthink/think-captcha": "^3.0",
        "topthink/think-multi-app": "^1.0",
        "ulthon/user_hub_client": "^1.0",
-        "alchemy/zippy": "^1.0"
+        "alchemy/zippy": "^1.0",
+        "topthink/think-filesystem": "^2.0"
    },
    "require-dev": {
        "symfony/var-dumper": "^4.2"
--- a/database/migrations/20220216140643_create_table_share.php
+++ b/database/migrations/20220216140643_create_table_share.php
@@ -45,6 +45,7 @@ class CreateTableShare extends Migrator
            ->addColumn(ColumnFormat::integerTypeStatus('status'))
            ->addColumn(ColumnFormat::integer('times_download'))
            ->addColumn(ColumnFormat::integer('visit'))
+            ->addColumn(ColumnFormat::integer('clear_time')->setComment('清空数据时间'))
            ->create();
    }
 }
--- a/view/index/index/index.html
+++ b/view/index/index/index.html
@@ -35,9 +35,9 @@
    {include file='common/_header'/}
    <div class="layui-container" style="margin-top: 15px;;">
        {notempty name='system_tips'}
-            <div class="layui-row">
-                <blockquote class="layui-elem-quote">{$system_tips}</blockquote>
-            </div>
+        <div class="layui-row">
+            <blockquote class="layui-elem-quote">{$system_tips}</blockquote>
+        </div>
        {/notempty}
        <div class="layui-row">
            <div class="layui-card">
@@ -331,7 +331,6 @@

            $('.file-list .file-item').each(function (index, elem) {
                var fileData = $(elem).data('success')
-
                fileList.push(fileData)
            })
Author	SHA1	Message	Date
augushong	1f07719496	修复清理错误	2023-02-20 15:08:56 +08:00
augushong	c66cd4f275	升级框架和类库	2022-12-29 12:38:53 +08:00
augushong	f7954291b1	自动清空过期数据；	2022-08-09 09:46:42 +08:00
augushong	2e35902e46	修改文件传参；	2022-05-23 15:55:30 +08:00