作者 刘锟

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

@@ -310,6 +310,7 @@ class DownloadProject extends Command @@ -310,6 +310,7 @@ class DownloadProject extends Command
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);
  313 + $content = preg_replace('/[\x00-\x1F\x7F]/u', '', $content);
313 $param = [ 314 $param = [
314 'project_id'=>$project_id, 315 'project_id'=>$project_id,
315 'friend_id'=>17667, 316 'friend_id'=>17667,
@@ -54,7 +54,7 @@ class WeekProject extends Command @@ -54,7 +54,7 @@ class WeekProject extends Command
54 */ 54 */
55 public function handle(){ 55 public function handle(){
56 $projectModel = new Project(); 56 $projectModel = new Project();
57 - $list = $projectModel->list(['delete_status'=>0,'id'=>['<',2000],'type'=>['in',[1,2,3,4,6]]],'id',['id','title']); 57 + $list = $projectModel->list(['delete_status'=>0,'type'=>['in',[1,2,3,4,6]]],'id',['id','title']);
58 $domainModel = new DomainInfo(); 58 $domainModel = new DomainInfo();
59 foreach ($list as $k => $v){ 59 foreach ($list as $k => $v){
60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL; 60 echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
@@ -136,7 +136,7 @@ class WeekProject extends Command @@ -136,7 +136,7 @@ class WeekProject extends Command
136 } 136 }
137 $v6WeeklyReportModel = new V6WeeklyReport(); 137 $v6WeeklyReportModel = new V6WeeklyReport();
138 $v6WeeklyReportModel->add($data); 138 $v6WeeklyReportModel->add($data);
139 -// $this->workChatMessage($data,$value['id']); 139 + $this->workChatMessage($data,$value['id']);
140 return true; 140 return true;
141 } 141 }
142 142
@@ -258,6 +258,7 @@ class WeekProject extends Command @@ -258,6 +258,7 @@ class WeekProject extends Command
258 } 258 }
259 $timestamp = strtotime('tomorrow 9:00 AM'); 259 $timestamp = strtotime('tomorrow 9:00 AM');
260 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp); 260 $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
  261 + $content = preg_replace('/[\x00-\x1F\x7F]/u', '', $content);
261 $param = [ 262 $param = [
262 'project_id'=>$project_id, 263 'project_id'=>$project_id,
263 'friend_id'=>$friend_id, 264 'friend_id'=>$friend_id,