diff --git a/app/controller/UploadController.php b/app/controller/UploadController.php index 23631f8..5f413bf 100644 --- a/app/controller/UploadController.php +++ b/app/controller/UploadController.php @@ -119,7 +119,8 @@ class UploadController $ossservice = new OssService(); $data = [ - 'image_name' => $result->file_name, + 'path' => $result->file_name, + 'original_name' => $result->origin_name, 'image_url' => $ossservice->generatePrivateUrl($result->file_name) ]; diff --git a/app/model/Follow.php b/app/model/Follow.php index e353994..27e3d75 100644 --- a/app/model/Follow.php +++ b/app/model/Follow.php @@ -44,7 +44,7 @@ class Follow extends Model 'created_at' => 'timestamp', // 指定序列化格式 ]; - public static function getFollow($follow,$domain) + public static function getFollow($follow,$domain = '') { $follow['type_txt'] = Constants::FOLLOW[$follow['type']]; $follow['oss_picture'] = $domain.'/'.$follow['picture']; diff --git a/composer.json b/composer.json index 0e71aa1..a662821 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ "illuminate/database": "^11.44", "phpmailer/phpmailer": "^6.9", "shopwwi/webman-filesystem": "^2.0", - "iidestiny/flysystem-oss": "4.5" + "iidestiny/flysystem-oss": "4" }, "suggest": { "ext-event": "For better performance. " diff --git a/composer.lock b/composer.lock index 56d9c04..73cb722 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ae2f4f7e2fab33fd2510f9f789bf1dc1", + "content-hash": "160510c61db59eaaf716725f2dd4a92f", "packages": [ { "name": "aliyuncs/oss-sdk-php", @@ -342,16 +342,16 @@ }, { "name": "iidestiny/flysystem-oss", - "version": "4.5", + "version": "4.0", "source": { "type": "git", "url": "https://github.com/iiDestiny/flysystem-oss.git", - "reference": "154ccb26075a20b350e2357289bfeabe3ca79ba0" + "reference": "6b6cf6850be377c484c086505d942e61afa2875c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/iiDestiny/flysystem-oss/zipball/154ccb26075a20b350e2357289bfeabe3ca79ba0", - "reference": "154ccb26075a20b350e2357289bfeabe3ca79ba0", + "url": "https://api.github.com/repos/iiDestiny/flysystem-oss/zipball/6b6cf6850be377c484c086505d942e61afa2875c", + "reference": "6b6cf6850be377c484c086505d942e61afa2875c", "shasum": "", "mirrors": [ { @@ -361,7 +361,7 @@ ] }, "require": { - "aliyuncs/oss-sdk-php": "^2", + "aliyuncs/oss-sdk-php": "^2.4", "ext-curl": "*", "ext-json": "*", "ext-openssl": "*", @@ -369,8 +369,8 @@ "php": "^8.0.2" }, "require-dev": { - "mockery/mockery": "^1.5", - "phpunit/phpunit": "^9.5", + "mockery/mockery": "^1.2", + "phpunit/phpunit": "^6.5", "symfony/var-dumper": "^3.4" }, "type": "library", @@ -398,9 +398,9 @@ ], "support": { "issues": "https://github.com/iiDestiny/flysystem-oss/issues", - "source": "https://github.com/iiDestiny/flysystem-oss/tree/4.5" + "source": "https://github.com/iiDestiny/flysystem-oss/tree/4.0" }, - "time": "2025-02-12T05:54:03+00:00" + "time": "2022-04-19T06:23:50+00:00" }, { "name": "illuminate/bus", diff --git a/config/plugin/shopwwi/filesystem/app.php b/config/plugin/shopwwi/filesystem/app.php index 2b8af74..460a362 100644 --- a/config/plugin/shopwwi/filesystem/app.php +++ b/config/plugin/shopwwi/filesystem/app.php @@ -74,7 +74,7 @@ return [ 'secretKey' => 'nqklJBft6t3S0A4ZvxF4ci9ni91kmm', 'bucket' => 'vehicle-album', 'endpoint' => 'https://oss-cn-beijing.aliyuncs.com', - 'url' => 'https://vehicle-album.oss-cn-beijing.aliyuncs.com', // 静态文件访问域名 + 'url' => '', // 静态文件访问域名 // 'timeout' => 3600, // 'connectTimeout' => 10, 'isCName' => false,