作者 刘锟

Merge remote-tracking branch 'origin/master' into akun

@@ -305,8 +305,8 @@ class DownloadProject extends Command @@ -305,8 +305,8 @@ class DownloadProject extends Command
305 $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。'; 305 $content4 .= '聚合页小语种站页面'.$data['aggregation_minor_update_num'].'次。';
306 } 306 }
307 $arr[] = $content4; 307 $arr[] = $content4;
308 - foreach ($data as $key => $val){  
309 - $content = $key.','.$val; 308 + foreach ($arr as $key => $val){
  309 + $content .= $key.','.$val;
310 } 310 }
311 $timestamp = strtotime('tomorrow 9:00 AM'); 311 $timestamp = strtotime('tomorrow 9:00 AM');
312 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp); 312 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
@@ -237,7 +237,7 @@ class WeekProject extends Command @@ -237,7 +237,7 @@ class WeekProject extends Command
237 } 237 }
238 $arr[] = $content4; 238 $arr[] = $content4;
239 foreach ($arr as $key => $val){ 239 foreach ($arr as $key => $val){
240 - $content = ($key + 1) .','.$val; 240 + $content .= ($key + 1) .','.$val;
241 } 241 }
242 $timestamp = strtotime('tomorrow 9:00 AM'); 242 $timestamp = strtotime('tomorrow 9:00 AM');
243 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp); 243 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
@@ -90,7 +90,8 @@ class Project extends Base @@ -90,7 +90,8 @@ class Project extends Base
90 11 => '俄语标准版', 90 11 => '俄语标准版',
91 12 => '俄语商务版', 91 12 => '俄语商务版',
92 14 => '俄语旗舰版', 92 14 => '俄语旗舰版',
93 - 13 => '体验版' 93 + 13 => '体验版',
  94 + 15 => '白帽 SEO'
94 ]; 95 ];
95 } 96 }
96 97