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

Lyh server



查看合并请求 !1822

@@ -72,7 +72,8 @@ class UpdateRoute extends Command
 
 
     public function keyword_actions(){
     public function keyword_actions(){
         $a = new AggregateKeyword();
         $a = new AggregateKeyword();
-        $list = $a->formatQuery(['status'=>1])->pluck('project_id')->unique()->values()->toArray();
+//        $list = $a->formatQuery(['status'=>1])->pluck('project_id')->unique()->values()->toArray();
+        $list = [2368,2168,1786,2289,3685,3008];
         foreach ($list as $v){
         foreach ($list as $v){
             if($v == 1){
             if($v == 1){
                 continue;
                 continue;
@@ -80,9 +81,6 @@ class UpdateRoute extends Command
             echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL;
             echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL;
             ProjectServer::useProject($v);
             ProjectServer::useProject($v);
             $keywordModel = new Keyword();
             $keywordModel = new Keyword();
-            $keywordModel->truncate();
-            $routeMapModel = new RouteMap();
-            $routeMapModel->del(['source'=>'product_keyword']);
             $bak_lists = DB::connection('custom_mysql')->table('gl_product_keyword_bak')->where('status',1)->get()->toArray();
             $bak_lists = DB::connection('custom_mysql')->table('gl_product_keyword_bak')->where('status',1)->get()->toArray();
             foreach ($bak_lists as $bakV){
             foreach ($bak_lists as $bakV){
                 $info = $keywordModel->read(['title'=>$bakV['title']],['id']);
                 $info = $keywordModel->read(['title'=>$bakV['title']],['id']);

@@ -248,11 +248,11 @@ class SyncProject extends Command
         }
         }
         DB::beginTransaction();
         DB::beginTransaction();
         try {
         try {
-            if(isset($data['deploy_build']['plan']) && ($data['deploy_build']['plan'] == 15)){
+            if(isset($data['deploy_build']['seo_plan']) && ($data['deploy_build']['seo_plan'] == 1)){
                 $data['project']['project_type'] = 1;//白帽版本
                 $data['project']['project_type'] = 1;//白帽版本
             }
             }
             $id = $this->saveProject($data['project']);
             $id = $this->saveProject($data['project']);
-            $this->setPostId($data['deploy_build']['plan'],$id);
+            $this->setPostId($data['deploy_build']['plan'] ?? 1,$id);
             $this->savePayment($data['payment'],$id);
             $this->savePayment($data['payment'],$id);
             $this->saveDeployBuild($data['deploy_build'],$id);
             $this->saveDeployBuild($data['deploy_build'],$id);
             $this->saveDeployOptimize($data['deploy_optimize'],$id);
             $this->saveDeployOptimize($data['deploy_optimize'],$id);