jsasg/orico-official-website
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
jsasg
2025-07-11 22:39:16 +08:00
parent eaceb14a8d 50ee39c197
commit 7a3b2f2226
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/admin/controller/v1/Upload.php
View File

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