xiaogang 3 năm trước cách đây
mục cha
commit
12f31bf80b

+ 1 - 1
app/Admin/Controllers/UsersInfoController.php

xqd
@@ -88,7 +88,7 @@ class UsersInfoController extends AdminController
         return Form::make(new UserInfoModel(), function (Form $form) {
             $form->display('user_id');
             $form->text('weixin');
-            $form->image('avatar')->uniqueName()->removable(false)->autoUpload()->saveFullUrl();
+            $form->image('avatar')->disk('oss')->uniqueName()->removable(false)->autoUpload()->saveFullUrl();
             $form->text('nickname');
             $form->text('birthday');
             $form->text('height');

+ 2 - 2
app/Http/Controllers/Api/UploadConfigController.php

xqd
@@ -21,11 +21,11 @@ class UploadConfigController extends Controller
         );
         $policyText=json_encode($policy);
         $policyBase64=base64_encode($policyText);
-        $bytes=hash_hmac("sha1",$policyBase64,$config['access_key'],true);
+        $bytes=hash_hmac("sha1",$policyBase64,$config['secret_key'],true);
         $signature=base64_encode($bytes);
         $res['policy']=$policyBase64;
         $res['signature']=$signature;
-        $res['OSSAccessKeyId']=$config['access_id'];
+        $res['OSSAccessKeyId']=$config['access_key'];
         $res['domain']="https://".$config['bucket'].'.'.$config['endpoint'];
         $res['folder']="chengluApp";
         return response()->json($res);

+ 1 - 1
composer.json

xqd
@@ -13,7 +13,7 @@
         "fideloper/proxy": "^4.4",
         "fruitcake/laravel-cors": "^2.0",
         "guzzlehttp/guzzle": "^7.0.1",
-        "jacobcyl/ali-oss-storage": "2.1",
+        "iidestiny/laravel-filesystem-oss": "^2.1",
         "jpush/jpush": "^3.6",
         "laravel/framework": "^8.40",
         "laravel/tinker": "^2.5",

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 622 - 106
composer.lock


+ 2 - 1
config/app.php

xqd
@@ -178,9 +178,10 @@ return [
         App\Providers\RouteServiceProvider::class,
         Dingo\Api\Provider\LaravelServiceProvider::class,
 
-        Jacobcyl\AliOSS\AliOssServiceProvider::class,
+//        Jacobcyl\AliOSS\AliOssServiceProvider::class,
 
         Mews\Captcha\CaptchaServiceProvider::class,
+        Iidestiny\LaravelFilesystemOss\OssStorageServiceProvider::class,
     ],
 
     /*

+ 21 - 8
config/filesystems.php

xqd
@@ -54,15 +54,28 @@ return [
         ],
 
 
+//        'oss' => [
+//            'driver'     => 'oss',
+//            'access_id'  => env('ALI_OSS_ACCESS_ID',""),//Your Aliyun OSS AccessKeyId
+//            'access_key' => env('ALI_OSS_ACCESS_KEY',""),//Your Aliyun OSS AccessKeySecret
+//            'bucket'     => env('ALI_OSS_BUCKET',""),//OSS bucket name
+//            'endpoint'   => env('ALI_OSS_ENDPOINT',""),
+//            'ssl'        => true, // true to use 'https://' and false to use 'http://'. default is false,
+//            'isCName'    => false, // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url, false: 则使用外部节点生成url
+//            'debug'      => false,
+//        ],
+
+
         'oss' => [
-            'driver'     => 'oss',
-            'access_id'  => env('ALI_OSS_ACCESS_ID',""),//Your Aliyun OSS AccessKeyId
-            'access_key' => env('ALI_OSS_ACCESS_KEY',""),//Your Aliyun OSS AccessKeySecret
-            'bucket'     => env('ALI_OSS_BUCKET',""),//OSS bucket name
-            'endpoint'   => env('ALI_OSS_ENDPOINT',""),
-            'ssl'        => true, // true to use 'https://' and false to use 'http://'. default is false,
-            'isCName'    => false, // 是否使用自定义域名,true: 则Storage.url()会使用自定义的cdn或域名生成文件url, false: 则使用外部节点生成url
-            'debug'      => false,
+            'driver' => 'oss',
+            'root' => '', // 设置上传时根前缀
+            'access_key' => env('ALI_OSS_ACCESS_ID'),
+            'secret_key' => env('ALI_OSS_ACCESS_KEY'),
+            'endpoint'   => env('ALI_OSS_ENDPOINT'), // 使用 ssl 这里设置如: https://oss-cn-beijing.aliyuncs.com
+            'bucket'     => env('ALI_OSS_BUCKET'),
+            'isCName'    => false, // 如果 isCname 为 false,endpoint 应配置 oss 提供的域名如:`oss-cn-beijing.aliyuncs.com`,否则为自定义域名,,cname 或 cdn 请自行到阿里 oss 后台配置并绑定 bucket
+            // 如果有更多的 bucket 需要切换,就添加所有bucket,默认的 bucket 填写到上面,不要加到 buckets 中
+            'ssl'        => true,
         ],
 
     ],

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác