diff --git a/app/services/system/SystemAuthService.php b/app/services/system/SystemAuthService.php index 0269d1389bfa509a7714f088f4aba6f35f52ceaf..147bdce6aaefc1c1b7f8f49dd1b3f5db3b7a4949 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 .= '/'; diff --git a/app/services/system/SystemUploadService.php b/app/services/system/SystemUploadService.php index 2d9c49b2f487df33f64cf3acee411c6ba45eac35..420c20d44fa4f462472f4d0f11bda4056e53b8bf 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 a3e6b59f4e5d2ab3fd893db3c9a7941295b5599c..3d9982438acf06122100b89c2dafd4251ac4fc76 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 f07a1971d6dd92af97fccc3d152cf9d896a211f5..efa7b3c04dc80ca617306e7bfec874e3129dffb3 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 91ad118fd356ab32f163dd8b44bb5bc3638d8596..908aef3e8dfb0cec45b853a24e6cb56dd130b93f 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 ae7ae9fb14289c181501dbee22448f57b52ed66f..a3f3426696be4c9e21ce4d342e5b3073c9757d38 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 32c7bb31f5bc0f169fb63b58d7ca21fb42ad936b..29444152fb366837d0147c51d877325792c56e69 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 {