Merge branch 'dev'

app/admin/controller/v1/Upload.php

@@ -61,7 +61,7 @@ class Upload
                 $name_rule = fn() => $filename_keep ? $this->filenameGenerator($file) : null;
 
                 // 处理图片
-                $image_manager = ImageManager::imagick();
+                $image_manager = ImageManager::gd();
                 if ($filetype_to == 'original') {
                     $filename = Filesystem::disk('image')->putFile($param['module'], $file, $name_rule());
                     $image    = $image_manager->read('.' . $storage . '/' . $filename);
@@ -171,7 +171,6 @@ class Upload
                 'filesha1'   => $image_model->file_sha1
             ]);
         } catch (\Throwable $th) {
-            dump($th);exit;
             return error($th->getMessage());
         }
 
@@ -185,7 +184,7 @@ class Upload
      */
     private function checkPath($path): string
     {
-        $ok       = false;
+        $ok       = true;
         $filename = basename($path);
         $dirname  = dirname($path);
         if (!is_dir($dirname)) {