ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-07 02:22:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(upload): 修复云存储上传失败时静默返回空save_name的问题

Browse Source
This commit is contained in:
augushong
2026-05-11 21:23:00 +08:00
parent 1c99e74c2e
commit 81706debbb
2 changed files with 33 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
extend/base/common/service/UploadServiceBase.php
View File

@@ -113,23 +113,31 @@ class UploadServiceBase
$model_file->mime_type = $file->getMime(); $model_file->mime_type = $file->getMime();
} }
$save_name = Filesystem::disk($this->uploadType)->putFile($upload_dir, $file, function () use ($save_name, $file) { try {
if (!is_null($save_name)) { $save_name = Filesystem::disk($this->uploadType)->putFile($upload_dir, $file, function () use ($save_name, $file) {
$ext_name = $file->extension(); if (!is_null($save_name)) {
$ext_name = $file->extension();
if (empty($ext_name)) { if (empty($ext_name)) {
return $save_name; return $save_name;
}
$list_name = explode('.', $save_name);
array_pop($list_name);
return implode('.', $list_name);
} }
$list_name = explode('.', $save_name); return date('Ymd') . '/' . uniqid();
});
} catch (\Throwable $e) {
throw new \Exception('文件上传失败：' . $e->getMessage());
}
array_pop($list_name); if ($save_name === false) {
throw new \Exception('文件上传失败：存储写入失败');
return implode('.', $list_name); }
}
return date('Ymd') . '/' . uniqid();
});
$url = $this->url($save_name); $url = $this->url($save_name);

18
extend/think/filesystem/Driver.php
View File

@@ -19,6 +19,7 @@ use League\Flysystem\UnableToWriteFile;
use RuntimeException; use RuntimeException;
use think\Cache; use think\Cache;
use think\File; use think\File;
use think\facade\Log;
/** /**
* Class Driver * Class Driver
@@ -104,10 +105,12 @@ abstract class Driver
$stream = fopen($file->getRealPath(), 'r'); $stream = fopen($file->getRealPath(), 'r');
$path = trim($path . '/' . $name, '/'); $path = trim($path . '/' . $name, '/');
$result = $this->put($path, $stream, $options); try {
$result = $this->put($path, $stream, $options);
if (is_resource($stream)) { } finally {
fclose($stream); if (is_resource($stream)) {
fclose($stream);
}
} }
return $result ? $path : false; return $result ? $path : false;
@@ -116,9 +119,12 @@ abstract class Driver
protected function put(string $path, $contents, array $options = []) protected function put(string $path, $contents, array $options = [])
{ {
try { try {
$this->writeStream($path, $contents, $options); is_resource($contents)
? $this->writeStream($path, $contents, $options)
: $this->write($path, $contents, $options);
} catch (UnableToWriteFile|UnableToSetVisibility $e) { } catch (UnableToWriteFile|UnableToSetVisibility $e) {
return false; Log::error('Filesystem write failed: ' . $e->getMessage());
throw $e;
} }
return true; return true;
} }