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

@@ -40,12 +40,12 @@ class DownloadProject extends Command
     protected $description = '导出项目数据';
     protected $description = '导出项目数据';
 
 
     public function handle(){
     public function handle(){
-        ProjectServer::useProject(5);
-        echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
         $v6WeekModel = new V6WeeklyReport();
         $v6WeekModel = new V6WeeklyReport();
-        $data = $v6WeekModel->read(['id'=>28058]);
-        $data = $this->workChatMessage($data,5);
-        DB::disconnect('custom_mysql');
+        $lists = $v6WeekModel->list([],'id',['*'],'desc',100);
+        echo date('Y-m-d H:i:s') . 'start' . PHP_EOL;
+        foreach ($lists as $data){
+            $this->workChatMessage($data,$data['project_id']);
+        }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         return true;
         return true;
     }
     }
@@ -312,12 +312,12 @@ class DownloadProject extends Command
         $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
         $tomorrowNineAM = date('Y-m-d H:i:s', $timestamp);
         $param = [
         $param = [
             'project_id'=>$project_id,
             'project_id'=>$project_id,
-            'friend_id'=>1,
+            'friend_id'=>17667,
             'type'=>MessagePush::TYPE_WEEK,
             'type'=>MessagePush::TYPE_WEEK,
-            'content'=>"【全球搜V6.0周报】"."\n".$content,
+            'content'=>"【全球搜V6.0周报】--项目id:$project_id"."\n".$content,
             'ref_ids'=>'',
             'ref_ids'=>'',
             'send_time'=>$tomorrowNineAM,
             'send_time'=>$tomorrowNineAM,
-            'status'=>3,
+            'status'=>0,
         ];
         ];
         //写入一条推送消息  自动消费
         //写入一条推送消息  自动消费
         $messagePushModel = new MessagePush();
         $messagePushModel = new MessagePush();

@@ -14,6 +14,8 @@ use App\Models\CustomModule\CustomModuleContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\CustomModule\CustomModuleExtentContent;
 use App\Models\News\News;
 use App\Models\News\News;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
+use App\Models\Template\BTemplate;
+use App\Models\Template\Template;
 use App\Services\ProjectServer;
 use App\Services\ProjectServer;
 use Illuminate\Console\Command;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
@@ -141,7 +143,7 @@ class LyhImportTest extends Command
             $newsModel->del(['id'=>$v['id']]);
             $newsModel->del(['id'=>$v['id']]);
             $customContentModel = new CustomModuleContent();
             $customContentModel = new CustomModuleContent();
             $id = $customContentModel->addReturnId($param);
             $id = $customContentModel->addReturnId($param);
-            $route = RouteMap::setRoute($v['route'],RouteMap::SOURCE_MODULE,$id,$project_id);
+            $route = RouteMap::setRoute($param['route'],RouteMap::SOURCE_MODULE,$id,$project_id);
             $customContentModel->edit(['route'=>$route],['id'=>$id]);
             $customContentModel->edit(['route'=>$route],['id'=>$id]);
         }
         }
         return true;
         return true;