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

gx脚本



查看合并请求 !1236

@@ -314,9 +314,9 @@ class DownloadProject extends Command
             'project_id'=>$project_id,
             'project_id'=>$project_id,
             'friend_id'=>1,
             'friend_id'=>1,
             'type'=>MessagePush::TYPE_WEEK,
             'type'=>MessagePush::TYPE_WEEK,
-            'content'=>$content,
+            'content'=>"【全球搜V6.0周报】/n".$content,
             'ref_ids'=>'',
             'ref_ids'=>'',
-            'send_time'=>'【全球搜V6.0周报】/n'.$tomorrowNineAM,
+            'send_time'=>$tomorrowNineAM,
             'status'=>3,
             'status'=>3,
         ];
         ];
         //写入一条推送消息  自动消费
         //写入一条推送消息  自动消费

@@ -237,7 +237,7 @@ class WeekProject extends Command
         }
         }
         $arr[] = $content4;
         $arr[] = $content4;
         foreach ($arr as $key => $val){
         foreach ($arr as $key => $val){
-            $content .= ($key + 1) .','.$val;
+            $content .= ($key + 1) .','.$val."/n";
         }
         }
         $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,7 +245,7 @@ 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'=>'【全球搜V6.0周报】'.$content,
+            'content'=>'【全球搜V6.0周报】'."/n".$content,
             'ref_ids'=>'',
             'ref_ids'=>'',
             'send_time'=>$tomorrowNineAM
             'send_time'=>$tomorrowNineAM
         ];
         ];