From 83c04174e31293f81389c2e760d2a04e235f5745 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=AF=E7=88=B1=E7=8E=A9=E5=85=B7=E7=86=8A?= <978713427@qq.com> Date: Sat, 23 Nov 2024 15:07:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=AA=E4=BA=BA?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/system/SystemAuthService.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/services/system/SystemAuthService.php b/app/services/system/SystemAuthService.php index 0269d13..147bdce 100644 --- a/app/services/system/SystemAuthService.php +++ b/app/services/system/SystemAuthService.php @@ -313,13 +313,14 @@ class SystemAuthService extends BaseService */ private function getAvatarUrl(SystemUser $adminInfo): string { + /**@var SystemConfigService $systemConfigService */ $systemConfigService = Container::make(SystemConfigService::class); - $url = $systemConfigService->getConfig('site_url', 'system_config'); + $url = $systemConfigService->getConfig('site_url', 'site_setting'); if (empty($url)) { $url = config('process.webman.listen'); $parsed_url = parse_url($url); $port = $parsed_url['port'] ?? 8787; // 使用 null 合并运算符 - $url = '127.0.0.1:' . $port; + $url = 'http://127.0.0.1:' . $port; } if (!str_ends_with($url, '/')) { $url .= '/'; -- Gitee From 8c0dcca3da6cbc4674f862a6df6cfd8404dc7ced Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=AF=E7=88=B1=E7=8E=A9=E5=85=B7=E7=86=8A?= <978713427@qq.com> Date: Sat, 23 Nov 2024 16:39:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=A1=E6=81=AF=E5=92=8C=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=BA=93=E4=B8=8D=E5=AF=B9=E5=BA=94=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/services/system/SystemUploadService.php | 6 ++++-- madong/services/upload/storage/Cos.php | 1 + madong/services/upload/storage/Local.php | 1 + madong/services/upload/storage/Oss.php | 1 + madong/services/upload/storage/Qiniu.php | 1 + madong/services/upload/storage/S3.php | 1 + 6 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/services/system/SystemUploadService.php b/app/services/system/SystemUploadService.php index 2d9c49b..420c20d 100644 --- a/app/services/system/SystemUploadService.php +++ b/app/services/system/SystemUploadService.php @@ -152,17 +152,19 @@ class SystemUploadService extends BaseService $url = str_replace('\\', '/', $data['url']); $path = str_replace('\\', '/', $data['save_path']); + $inData = [ 'platform' => $type, 'original_filename' => $data['origin_name'] ?? '', - 'filename' => $path, + 'filename' => $data['save_name'], 'hash' => $hash, 'content_type' => $data['mime_type'], - 'base_path' => $path, + 'base_path' => $data['base_path'], 'ext' => $data['extension'], 'size' => $data['size'], 'size_info' => formatBytes($data['size']), 'url' => $url, + 'path' => $path ]; return $this->dao->save($inData); }); diff --git a/madong/services/upload/storage/Cos.php b/madong/services/upload/storage/Cos.php index a3e6b59..3d99824 100644 --- a/madong/services/upload/storage/Cos.php +++ b/madong/services/upload/storage/Cos.php @@ -69,6 +69,7 @@ class Cos extends BaseUpload 'size' => $file->getSize(), 'mime_type' => $file->getUploadMimeType(), 'extension' => $file->getUploadExtension(), + 'base_path' =>$this->dirSeparator . $object ]; } diff --git a/madong/services/upload/storage/Local.php b/madong/services/upload/storage/Local.php index f07a197..efa7b3c 100644 --- a/madong/services/upload/storage/Local.php +++ b/madong/services/upload/storage/Local.php @@ -43,6 +43,7 @@ class Local extends BaseUpload 'size' => $file->getSize(), 'mime_type' => $file->getUploadMimeType(), 'extension' => $file->getUploadExtension(), + 'base_path' => empty($dirname) ? $this->dirSeparator . $saveFilename : $this->dirSeparator . $dirname . $this->dirSeparator . $saveFilename ]; $file->move($savePath); $result[] = $temp; diff --git a/madong/services/upload/storage/Oss.php b/madong/services/upload/storage/Oss.php index 91ad118..908aef3 100644 --- a/madong/services/upload/storage/Oss.php +++ b/madong/services/upload/storage/Oss.php @@ -48,6 +48,7 @@ class Oss extends BaseUpload 'size' => $file->getSize(), 'mime_type' => $file->getUploadMimeType(), 'extension' => $file->getUploadExtension(), + 'base_path' =>$this->dirSeparator . $object ]; try { diff --git a/madong/services/upload/storage/Qiniu.php b/madong/services/upload/storage/Qiniu.php index ae7ae9f..a3f3426 100644 --- a/madong/services/upload/storage/Qiniu.php +++ b/madong/services/upload/storage/Qiniu.php @@ -43,6 +43,7 @@ class Qiniu extends BaseUpload 'size' => $file->getSize(), 'mime_type' => $file->getUploadMimeType(), 'extension' => $file->getUploadExtension(), + 'base_path' =>$this->dirSeparator . $object ]; try { diff --git a/madong/services/upload/storage/S3.php b/madong/services/upload/storage/S3.php index 32c7bb3..2944415 100644 --- a/madong/services/upload/storage/S3.php +++ b/madong/services/upload/storage/S3.php @@ -44,6 +44,7 @@ class S3 extends BaseUpload 'size' => $file->getSize(), 'mime_type' => $file->getUploadMimeType(), 'extension' => $file->getUploadExtension(), + 'base_path' =>$this->dirSeparator . $object ]; try { -- Gitee