fix: double prefix in laravel version > 9.33.0

webman-tech · Mar 1, 2024 · 7193386 · 7193386
1 parent b28490f
commit 7193386
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -98,9 +98,9 @@ class UserAvatarController
 
 排名不分先后，不做具体推荐
 
-| 厂商          | 扩展包                                                                              | 支持 Laravel9 | 安装使用                                   |
-|-------------|----------------------------------------------------------------------------------|-------------|----------------------------------------|
-| Aliyun OSS  | [iidestiny/flysystem-oss](https://github.com/iiDestiny/laravel-filesystem-oss)   | 是           | [文档](./docs/extends/oss-iidestiny.md)  |
-| QiNiu       | [overtrue/flysystem-qiniu](https://github.com/overtrue/laravel-filesystem-qiniu) | 是           | [文档](./docs/extends/qiniu-overtrue.md) |
-| Tencent COS | [overtrue/flysystem-cos](https://github.com/overtrue/laravel-filesystem-cos)     | 是           | [文档](./docs/extends/cos-overtrue.md)   |
-| Aliyun OSS  | [alphasnow/aliyun-oss-laravel](https://github.com/alphasnow/aliyun-oss-laravel)  | 是           | [文档](./docs/extends/oss-alphasnow.md)  |
+| 厂商          | 扩展包                                                                              | 支持 Laravel>=9 | 安装使用                                   |
+|-------------|----------------------------------------------------------------------------------|---------------|----------------------------------------|
+| Aliyun OSS  | [iidestiny/flysystem-oss](https://github.com/iiDestiny/laravel-filesystem-oss)   | 是             | [文档](./docs/extends/oss-iidestiny.md)  |
+| QiNiu       | [overtrue/flysystem-qiniu](https://github.com/overtrue/laravel-filesystem-qiniu) | 是             | [文档](./docs/extends/qiniu-overtrue.md) |
+| Tencent COS | [overtrue/flysystem-cos](https://github.com/overtrue/laravel-filesystem-cos)     | 是             | [文档](./docs/extends/cos-overtrue.md)   |
+| Aliyun OSS  | [alphasnow/aliyun-oss-laravel](https://github.com/alphasnow/aliyun-oss-laravel)  | 是             | [文档](./docs/extends/oss-alphasnow.md)  |
diff --git a/src/Extend/FlysystemV3/OssAlphaSnowExtend.php b/src/Extend/FlysystemV3/OssAlphaSnowExtend.php
@@ -19,7 +19,12 @@ class OssAlphaSnowExtend implements ExtendInterface
      */
     public static function createFilesystemAdapter($config): FilesystemAdapter
     {
+        // 由于无法直接获取到 laravel 的版本，因此不能用版本比较的方式，此处改为默认为 true
+        // 如果真的使用的 laravel 的版本小于 9.33.0，
+        // 可以手动在 filesystems.php 中添加一个 'url_prefixed' => false 的配置
         //$config['url_prefixed'] = version_compare($app->version(), '9.33.0', '>=');
+        $config['url_prefixed'] = $config['url_prefixed'] ?? true;
+
         $client = Container::get(AliyunFactory::class)->createClient($config);
         $adapter = new AliyunAdapter($client, $config['bucket'], $config['prefix'] ?? '', $config);
         $driver = new Filesystem($adapter);