修复文件存储问题；增加文件上传；修复字段错误

app/UploadFiles.php

@@ -3,15 +3,14 @@
 namespace app;
 
 use app\model\UploadFiles as AppUploadFiles;
-use League\Flysystem\Util\MimeType;
+use League\MimeTypeDetection\FinfoMimeTypeDetector;
+use League\MimeTypeDetection\GeneratedExtensionToMimeTypeMap;
 use think\facade\Filesystem;
-use think\facade\Config;
 use think\File;
 use think\file\UploadedFile;
 
 class UploadFiles
 {
-
     public static function add()
     {
         return new AppUploadFiles();
@@ -26,7 +25,7 @@ class UploadFiles
     {
         return AppUploadFiles::where('save_name', $save_name)->update([
             'used_time' => time(),
-            'status' => 1
+            'status' => 1,
         ]);
     }
 
@@ -34,7 +33,7 @@ class UploadFiles
     {
         return AppUploadFiles::where('save_name', $save_name)->update([
             'delete_time' => time(),
-            'status' => 2
+            'status' => 2,
         ]);
     }
 
@@ -52,7 +51,6 @@ class UploadFiles
 
     public static function save(Request $request)
     {
-
         $type = $request->param('type');
         if (empty($type)) {
             return json_message('缺少类型参数');
@@ -61,12 +59,11 @@ class UploadFiles
 
         $file = request()->file('file');
 
-
         try {
-
             self::fileScan($file);
 
             $model_file = self::saveFile($file, $type, $dir_name);
+
             return json_message($model_file->toArray());
         } catch (\Throwable $th) {
             return json_message($th->getMessage());
@@ -96,7 +93,6 @@ class UploadFiles
 
     public static function wangEditorSave(Request $request)
     {
-
         $type = $request->param('type');
         if (empty($type)) {
             return json_message('缺少类型参数');
@@ -110,18 +106,17 @@ class UploadFiles
 
         $saved_files_src = self::saveFile($file, $type, $dir_name)->src;
 
-
         return json([
-            "errno" => 0,
-            "data" => [
+            'errno' => 0,
+            'data' => [
                 'url' => $saved_files_src,
 
-            ]
+            ],
         ]);
     }
+
     public static function editormdSave(Request $request)
     {
-
         $type = $request->param('type', 'editormd');
         if (empty($type)) {
             return json_message('缺少类型参数');
@@ -134,23 +129,22 @@ class UploadFiles
 
         foreach ($files as $file) {
             try {
-
                 self::fileScan($file);
 
                 $saved_files_src[] = self::saveFile($file, $type, $dir_name)->src;
             } catch (\Throwable $th) {
                 return json([
-                    "success" => 1,
-                    "message" => $th->getMessage(),
+                    'success' => 1,
+                    'message' => $th->getMessage(),
 
                 ]);
             }
         }
 
         return json([
-            "success" => 1,
-            "message" => "上传成功",
-            "url" => $saved_files_src
+            'success' => 1,
+            'message' => '上传成功',
+            'url' => $saved_files_src,
         ]);
     }
 
@@ -159,10 +153,9 @@ class UploadFiles
         if (is_null($dir_name)) {
             $dir_name = $type;
         }
-        $model_file = UploadFiles::add();
+        $model_file = self::add();
 
         if ($file instanceof UploadedFile) {
-
             $model_file->file_name = $file->getOriginalName();
         } else {
             $model_file->file_name = $file->getFilename();
@@ -179,34 +172,40 @@ class UploadFiles
         $model_file->save_name = Filesystem::putFile('upload/' . $dir_name, $file, 'uniqid');
         $model_file->save();
         $model_file->append(['src']);
+
         return $model_file;
     }
 
     public static function saveUrlFile($url, $type)
     {
         $file_data = geturl($url);
+
         return json_message(self::saveData($file_data, $type)->toArray());
     }
 
     public static function saveBase64File($file_data, $type)
     {
-        if (strstr($file_data, ",")) {
+        if (strstr($file_data, ',')) {
             $file_data = explode(',', $file_data);
             $file_data = $file_data[1];
         }
         $file_data = base64_decode($file_data);
+
         return json_message(self::saveData($file_data, $type)->toArray());
     }
 
     public static function saveData($file_data, $type)
     {
-        $mime_type = MimeType::detectByContent($file_data);
-        $ext_name = array_search($mime_type, MimeType::getExtensionToMimeTypeMap());
+        $mime_detector = new FinfoMimeTypeDetector();
+
+        $mime_type = $mime_detector->detectMimeTypeFromBuffer($file_data);
+        $ext_name = array_search($mime_type, GeneratedExtensionToMimeTypeMap::MIME_TYPES_FOR_EXTENSIONS);
         $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;
     }
 }