Merge remote-tracking branch 'origin/develop' into develop

app/Console/Commands/ContentFeedCreate.php

@@ -81,7 +81,9 @@ class ContentFeedCreate extends Command
 
         $callback = function ($msg) {
             $param = \GuzzleHttp\json_decode($msg->body,true);
+            $this->line('收到消息'.$msg->body);
             $row = $this->feedRepositories->feedCreate($param);
+            $this->line('处理消息'.$row);
             if($row){
                 $msg->delivery_info['channel']->basic_ack($msg->delivery_info['delivery_tag']);
             }

app/Repositories/FeedRepositories.php

@@ -10,12 +10,14 @@ namespace App\Repositories;
 
 
 use App\Models\Behavior;
+use App\Models\Feed;
 use Illuminate\Support\Facades\Log;
 
 class FeedRepositories
 {
-    public function __construct()
+    public function __construct(Feed $feed)
     {
+        $this->feed = $feed;
     }
 
     public function getFeedType($action)
@@ -39,8 +41,9 @@ class FeedRepositories
      */
     public function feedCreate($request)
     {
-        $fans = $request['fans'];
-        $behaviorFlag = $request['behavior_flag'];
+        Log::debug('feedCreate-request:'.json_encode($request));
+        $fans = isset($request['fans'])?$request['fans']:[];
+        $behaviorFlag = isset($request['behavior_flag'])?$request['behavior_flag']:'';
         $feedType = $this->feedCreate($behaviorFlag);
         if($feedType){
             $data = [];
@@ -64,6 +67,7 @@ class FeedRepositories
                     $data['relate_id'] = $request['focus_uid'];
                 }
                 $data['content'] = json_encode($content);
+                $this->feed->insert($data);
             }
         }
     }