From 21e41825f5d3261785879b050cdd304816a3d021 Mon Sep 17 00:00:00 2001
From: ctexthuang <ctexthuang@qq.com>
Date: Mon, 11 Nov 2024 10:22:19 +0800
Subject: [PATCH] feat : oss

---
 app/Cron/Oss/OssDelByUrlTask.php          |  2 +-
 app/Service/Common/OssCallbackService.php | 10 +++++++---
 config/autoload/ali.php                   |  4 ++--
 env.pre                                   |  3 ++-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/Cron/Oss/OssDelByUrlTask.php b/app/Cron/Oss/OssDelByUrlTask.php
index beef2dd..8d6551c 100644
--- a/app/Cron/Oss/OssDelByUrlTask.php
+++ b/app/Cron/Oss/OssDelByUrlTask.php
@@ -56,7 +56,7 @@ class OssDelByUrlTask
         $OssClient = new OssClient(
             config('ali.access_key_id'),
             config('ali.access_key_secret'),
-            config('ali.intranet_endpoint')
+            config('ali.oss_endpoint')
         );
         $bucket = config('ali.bucket');
 
diff --git a/app/Service/Common/OssCallbackService.php b/app/Service/Common/OssCallbackService.php
index 0932d85..283b6ce 100644
--- a/app/Service/Common/OssCallbackService.php
+++ b/app/Service/Common/OssCallbackService.php
@@ -114,7 +114,7 @@ class OssCallbackService
         $this->ossClient = new OssClient(
             config('ali.access_key_id'),
             config('ali.access_key_secret'),
-            config('ali.intranet_endpoint')
+            config('ali.oss_endpoint')
         );
 
         $this->bucket = config('ali.bucket');
@@ -131,15 +131,19 @@ class OssCallbackService
         try {
             //记录回调内容
             $this->filePutContents();
+            echo 1;
 
             //检测直传type
             $this->checkType();
+            echo 2;
 
             //检测文件格式
             $this->checkMimeType();
+            echo 3;
 
             //获取新文件名
             $this->getNewFileName();
+            echo 4;
 
             //复制旧文件到指定文件夹
             try {
@@ -149,10 +153,10 @@ class OssCallbackService
             }
 
             date_default_timezone_set('Asia/Shanghai');
-
+echo 5;
             //增加oss object数据
             $this->addOssObjectData();
-
+echo 6;
             //删除旧的文件
             $this->deleteOssObject();
 
diff --git a/config/autoload/ali.php b/config/autoload/ali.php
index 3662089..6ed1bd4 100644
--- a/config/autoload/ali.php
+++ b/config/autoload/ali.php
@@ -31,6 +31,6 @@ return [
     'sts_endpoint' => env('ALI_STS_ENDPOINT', 'sts.cn-shenzhen.aliyuncs.com'),
     // 阿里云 sts 角色
     'role_arn' => env('ALI_ROLE_ARN', 'acs:ram::1644087445786901:role/oss'),
-    // 阿里云内网 endpoint
-    'intranet_endpoint' => env('ALI_INTRANET_ENDPOINT', 'oss-cn-shenzhen-internal.aliyuncs.com'),
+    // 阿里云 oss endpoint  如果使用 ali服务器 可以使用内网 oss-cn-shenzhen-internal.aliyuncs.com
+    'oss_endpoint' => env('ALI_OSS_ENDPOINT', 'oss-cn-shenzhen.aliyuncs.com'),
 ];
\ No newline at end of file
diff --git a/env.pre b/env.pre
index 156b360..f7b1739 100644
--- a/env.pre
+++ b/env.pre
@@ -43,4 +43,5 @@ ALI_REGION=cn-shenzhen
 ALI_CALLBACK_URL=https://new-api-pre.hehele.cc/common/oss/ossCallBack
 ALI_OSS_URL=https://playlet-video-asset.oss-cn-shenzhen.aliyuncs.com/
 ALI_STS_ENDPOINT=sts.cn-shenzhen.aliyuncs.com
-ALI_ROLE_ARN=acs:ram::1644087445786901:role/oss
\ No newline at end of file
+ALI_ROLE_ARN=acs:ram::1644087445786901:role/oss
+ALI_OSS_ENDPOINT=oss-cn-shenzhen.aliyuncs.com
\ No newline at end of file