社媒对接

app/Console/Commands/TimerSsmPost.php

@@ -210,8 +210,8 @@ class TimerSsmPost extends Command
 
     public function ossUpload()
     {
-        $count = SmmPost::getOssUploadingPostCount();
-        if ($count > 0) {
+        $has = SmmPost::hasOssUploadingPost();
+        if ($has == true) {
             return false;
         }
         // 发送社媒帖子
@@ -219,6 +219,7 @@ class TimerSsmPost extends Command
         $disk = $this->disk('oss');
         foreach ($ossUploadPost as $post) {
             $post->oss_upload = 1;//上传中
+            $post->updated_at = Carbon::now();
             $post->save();
             //上传图片到oss
             $imageVideoUrl = explode(',', $post->image_video_url);
@@ -229,6 +230,7 @@ class TimerSsmPost extends Command
                 $disk->putFileAs($dir, $localPath, $filename);
             }
             $post->oss_upload = 2; //上传完成
+            $post->updated_at = Carbon::now();
             $post->save();
         }
         return true;

app/Distributor/Controllers/SmmPostController.php

@@ -177,13 +177,6 @@ class SmmPostController extends AdminDistController
             $timer->createLog();
 
             return Admin::json()->success(admin_trans_label('operation_successful'))->refresh();
-            //最后一步
-//            $data = [
-//                'title'       => admin_trans_label('operation_successful'),
-//                'description' => admin_trans_label('send_post_description'),
-//                'continue_publishing' => admin_trans_label('continue_publishing'),
-//            ];
-           // return view('distributor.form_custom.completion-page', $data);
         }
     }
 

app/Distributor/Controllers/SmmPostLogController.php

@@ -35,7 +35,7 @@ class SmmPostLogController extends AdminController
             $grid->column('id')->sortable();
             $grid->column('account.name', admin_trans_label('account_name'));
             $grid->column('media_name',admin_trans_label('media_name'));
-            $grid->column('post.message',admin_trans_label('post_message'))->width('30%');
+            //$grid->column('post.message',admin_trans_label('post_message'))->width('30%');
             $grid->column('created_at');
             $grid->column('status')->using(admin_trans_array(config('dictionary.post_log_status')))->label([
                 0 => 'gray',

app/Distributor/Repositories/SmmPost.php

@@ -3,6 +3,7 @@
 namespace App\Distributor\Repositories;
 
 use App\Models\SmmPost as Model;
+use Carbon\Carbon;
 use Dcat\Admin\Repositories\EloquentRepository;
 
 class SmmPost extends EloquentRepository
@@ -54,11 +55,24 @@ class SmmPost extends EloquentRepository
         return $model;
     }
 
-    public static function getOssUploadingPostCount()
+    public static function hasOssUploadingPost()
     {
         $model = new Model();
-        $count = $model->where('oss_upload',1)->count();
-        return $count;
+        $result = $model->where('oss_upload',1)->first();
+        if($result){
+            //updated_at到现在时间大于10分钟，则认为已经上传失败
+            $now = Carbon::now();
+            $diff = $now->diffInMinutes($result->updated_at);
+            if($diff > 10){
+                $result->status = 0;//改为0，重新发送
+                $result->updated_at = $now;
+                $result->save();
+                return true;
+            }
+            return true;
+        } else {
+            return false;
+        }
     }
 
 
@@ -70,6 +84,4 @@ class SmmPost extends EloquentRepository
     }
 
 
-
-
 }