github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2026-01-25 11:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复文件夹上传时数据库死锁问题

Browse Source 
使用 Redis 分布式锁对同一用户往相同父目录的上传请求进行排队，
  避免并发上传导致的 MySQL 死锁错误 (SQLSTATE[40001])
This commit is contained in:
kuaifan 2026-01-14 11:44:47 +00:00
parent c2c27a684b
commit ec33327408
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/Http/Controllers/Api/FileController.php
View File

@ -14,6 +14,7 @@ use App\Models\User;
use App\Models\UserRecentItem; use App\Models\UserRecentItem;
use App\Module\Base; use App\Module\Base;
use App\Module\Down; use App\Module\Down;
use App\Module\Lock;
use App\Module\Timer; use App\Module\Timer;
use App\Module\Ihttp; use App\Module\Ihttp;
use Response; use Response;
@ -763,10 +764,20 @@ class FileController extends AbstractController
{ {
$user = User::auth(); $user = User::auth();
$pid = intval(Request::input('pid')); $pid = intval(Request::input('pid'));
$overwrite = intval(Request::input('cover')); // 同一用户往相同父目录上传时排队，避免并发导致数据库死锁
$webkitRelativePath = Request::input('webkitRelativePath'); try {
$data = (new File)->contentUpload($user, $pid, $webkitRelativePath, $overwrite); return Lock::withLock("file:upload:{$user->userid}:{$pid}", function () use ($user, $pid) {
return Base::retSuccess($data['data']['name'] . ' 上传成功', $data['addItem']); $overwrite = intval(Request::input('cover'));
$webkitRelativePath = Request::input('webkitRelativePath');
$data = (new File)->contentUpload($user, $pid, $webkitRelativePath, $overwrite);
return Base::retSuccess($data['data']['name'] . ' 上传成功', $data['addItem']);
}, 120000, 120000);
} catch (\Exception $e) {
if (str_contains($e->getMessage(), 'Failed to acquire lock')) {
throw new ApiException('上传繁忙，请稍后再试');
}
throw $e;
}
} }
/** /**