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

Master server



查看合并请求 !1231

@@ -306,7 +306,7 @@ class DownloadProject extends Command
         }
         }
         $arr[] = $content4;
         $arr[] = $content4;
         foreach ($arr as $key => $val){
         foreach ($arr as $key => $val){
-            $content .= $key.','.$val;
+            $content .= ($key+1).','.$val;
         }
         }
         $timestamp = strtotime('tomorrow 9:00 AM');
         $timestamp = strtotime('tomorrow 9:00 AM');
         $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
         $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);

@@ -245,12 +245,13 @@ class WeekProject extends Command
             'project_id'=>$project_id,
             'project_id'=>$project_id,
             'friend_id'=>$friend_id,
             'friend_id'=>$friend_id,
             'type'=>MessagePush::TYPE_WEEK,
             'type'=>MessagePush::TYPE_WEEK,
-            'content'=>$content,
+            'content'=>'【全球搜V6.0周报】'.$content,
             'ref_ids'=>'',
             'ref_ids'=>'',
             'send_time'=>$tomorrowNineAM
             'send_time'=>$tomorrowNineAM
         ];
         ];
         //写入一条推送消息  自动消费
         //写入一条推送消息  自动消费
         $messagePushModel = new MessagePush();
         $messagePushModel = new MessagePush();
-        $messagePushModel->add($param);
+        echo date('Y-m-d H:i:s') . '生成推送消息:'.$project_id . PHP_EOL;
+        return $messagePushModel->add($param);
     }
     }
 }
 }