作者 赵彬吉
@@ -72,28 +72,28 @@ class UpdateRoute extends Command @@ -72,28 +72,28 @@ class UpdateRoute extends Command
72 72
73 public function keyword_actions(){ 73 public function keyword_actions(){
74 $a = new AggregateKeyword(); 74 $a = new AggregateKeyword();
75 - $list = $a->formatQuery(['status'=>1])->pluck('project_id')->unique()->values()->toArray(); 75 +// $list = $a->formatQuery(['status'=>1])->pluck('project_id')->unique()->values()->toArray();
  76 + $list = [2368,2168,1786,2289,3685,3008];
76 foreach ($list as $v){ 77 foreach ($list as $v){
  78 + if($v == 1){
  79 + continue;
  80 + }
77 echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL; 81 echo date('Y-m-d H:i:s').' 执行的项目id:'.$v.PHP_EOL;
78 ProjectServer::useProject($v); 82 ProjectServer::useProject($v);
79 $keywordModel = new Keyword(); 83 $keywordModel = new Keyword();
80 - $keyList = $keywordModel->list(['status'=>1],'id',['id','title'],'asc');  
81 - foreach ($keyList as $keyV){  
82 - echo date('Y-m-d H:i:s').'对应数据id:'.$keyV['id'].PHP_EOL;  
83 - $keywordInfo = $keywordModel->read(['id'=>$keyV['id']],['id']);  
84 - if($keywordInfo !== false){  
85 - $keywordIds = $keywordModel->formatQuery(['id'=>['!=',$keyV['id'],'title'=>$keyV['title']]])->pluck('id')->toArray();  
86 - if(!empty($keywordIds)){  
87 - echo date('Y-m-d H:i:s').'清空对应重复的关键词....'.PHP_EOL;  
88 - $keywordModel->del(['id'=>['in',$keywordIds]]);  
89 - $routeMapModel = new RouteMap();  
90 - $routeMapModel->del(['source'=>'product_keyword','source_id'=>['in',$keywordIds]]);  
91 - }else{  
92 - echo date('Y-m-d H:i:s').'无重复关键词..'.PHP_EOL;  
93 - }  
94 - }else{  
95 - echo '当前关键词已被清除'.PHP_EOL; 84 + $bak_lists = DB::connection('custom_mysql')->table('gl_product_keyword_bak')->where('status',1)->get()->toArray();
  85 + foreach ($bak_lists as $bakV){
  86 + $info = $keywordModel->read(['title'=>$bakV['title']],['id']);
  87 + if($info !== false){
  88 + echo '当前关键词已存在,跳过的关键词'.$bakV['title'].PHP_EOL;
  89 + continue;
96 } 90 }
  91 + //执行新增数据
  92 + unset($bakV['id']);
  93 + $id = $keywordModel->addReturnId($bakV);
  94 + $route = RouteMap::setRoute($bakV['route'],'product_keyword',$id,$v);
  95 + $keywordModel->edit(['route'=>$route],['id'=>$id]);
  96 + echo '执行新增----'.$bakV['title'].PHP_EOL;
97 } 97 }
98 DB::disconnect('custom_mysql'); 98 DB::disconnect('custom_mysql');
99 } 99 }
@@ -248,11 +248,11 @@ class SyncProject extends Command @@ -248,11 +248,11 @@ class SyncProject extends Command
248 } 248 }
249 DB::beginTransaction(); 249 DB::beginTransaction();
250 try { 250 try {
251 - if(isset($data['deploy_build']['plan']) && ($data['deploy_build']['plan'] == 15)){ 251 + if(isset($data['deploy_build']['seo_plan']) && ($data['deploy_build']['seo_plan'] == 1)){
252 $data['project']['project_type'] = 1;//白帽版本 252 $data['project']['project_type'] = 1;//白帽版本
253 } 253 }
254 $id = $this->saveProject($data['project']); 254 $id = $this->saveProject($data['project']);
255 - $this->setPostId($data['deploy_build']['plan'],$id); 255 + $this->setPostId($data['deploy_build']['plan'] ?? 1,$id);
256 $this->savePayment($data['payment'],$id); 256 $this->savePayment($data['payment'],$id);
257 $this->saveDeployBuild($data['deploy_build'],$id); 257 $this->saveDeployBuild($data['deploy_build'],$id);
258 $this->saveDeployOptimize($data['deploy_optimize'],$id); 258 $this->saveDeployOptimize($data['deploy_optimize'],$id);