合并分支 'lyh-server' 到 'master'

gx



查看合并请求 !2497

@@ -12,7 +12,6 @@ namespace App\Http\Controllers\Api;
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
 use App\Models\Project\AiVideoAutoLog;
 use App\Models\Project\AiVideoAutoLog;
 use App\Services\CosService;
 use App\Services\CosService;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Redis;
 use Illuminate\Support\Facades\Redis;
 
 
 class AiVideoController extends BaseController
 class AiVideoController extends BaseController
@@ -26,7 +25,6 @@ class AiVideoController extends BaseController
      */
      */
     public function ImageCallBack(){
     public function ImageCallBack(){
         $this->saveLog('数据详情：'.json_encode($this->param,true));
         $this->saveLog('数据详情：'.json_encode($this->param,true));
-        Log::channel('ai_video')->info('数据详情：'.json_encode($this->param,true));
         $count = Redis::decr('ai_video_image');
         $count = Redis::decr('ai_video_image');
         if ($count < 0) {
         if ($count < 0) {
             Redis::set('ai_video_image', 0);
             Redis::set('ai_video_image', 0);
@@ -34,18 +32,19 @@ class AiVideoController extends BaseController
         $data = $this->param['attachments'][0] ?? [];
         $data = $this->param['attachments'][0] ?? [];
         $aiVideoAutoLogModel = new AiVideoAutoLog();
         $aiVideoAutoLogModel = new AiVideoAutoLog();
         if(empty($data) || empty($data['url'])){
         if(empty($data) || empty($data['url'])){
+            $this->saveLog('未获取到回调数据详情');
             $aiVideoAutoLogModel->edit(['status'=>9,'result'=>json_encode($this->param,true)],['trigger_id'=>$this->param['id']]);
             $aiVideoAutoLogModel->edit(['status'=>9,'result'=>json_encode($this->param,true)],['trigger_id'=>$this->param['id']]);
         }
         }
         //获取当前数据详情
         //获取当前数据详情
         $info = $aiVideoAutoLogModel->read(['trigger_id'=>$this->param['id']]);
         $info = $aiVideoAutoLogModel->read(['trigger_id'=>$this->param['id']]);
         if($info === false){
         if($info === false){
-            @file_put_contents(storage_path('logs/ai_video.log'), var_export($info, true) . PHP_EOL, FILE_APPEND);
-            Log::channel('ai_video')->info('当前数据不存在或已被删除'.$this->param['id']);
+            $this->saveLog('未获取到当前数据详情。'.$info);
+            $this->response('success');
         }
         }
         //上传图片  返回cdn链接
         //上传图片  返回cdn链接
         $cosService = new CosService();
         $cosService = new CosService();
         $imagePath = $cosService->uploadRemote($info['project_id'],'video',$data['url']);
         $imagePath = $cosService->uploadRemote($info['project_id'],'video',$data['url']);
-        @file_put_contents(storage_path('logs/ai_video.log'), var_export($imagePath, true) . PHP_EOL, FILE_APPEND);
+        $this->saveLog($imagePath);
         try {
         try {
             if($imagePath){
             if($imagePath){
                 $cos = config('filesystems.disks.cos');
                 $cos = config('filesystems.disks.cos');
@@ -60,11 +59,11 @@ class AiVideoController extends BaseController
                     }
                     }
                 }
                 }
                 $images = array_merge($images,$info['images']);
                 $images = array_merge($images,$info['images']);
-                Log::channel('ai_video')->info('图片：'.json_encode($images));
+                $this->saveLog('返回的数据详情。'.$images);
                 $aiVideoAutoLogModel->edit(['images'=>$images,'result'=>json_encode($this->param,true),'status'=>1],['id'=>$info['id']]);
                 $aiVideoAutoLogModel->edit(['images'=>$images,'result'=>json_encode($this->param,true),'status'=>1],['id'=>$info['id']]);
             }
             }
         }catch (\Exception $e){
         }catch (\Exception $e){
-            Log::channel('ai_video')->info('上传图片失败'.$e->getMessage());
+            $this->saveLog('上传图片失败，获取到数据详情。'.$e->getMessage());
         }
         }
         $this->response('success');
         $this->response('success');
     }
     }