gx

@@ -53,11 +53,9 @@ class UpdateRoute extends Command
      * @time   :2023/11/20 15:13
      * @time   :2023/11/20 15:13
      */
      */
     public function handle(){
     public function handle(){
-<<<<<<< HEAD
         ProjectServer::useProject(91);
         ProjectServer::useProject(91);
         $this->getProductKeyword();
         $this->getProductKeyword();
         DB::disconnect('custom_mysql');
         DB::disconnect('custom_mysql');
-=======
         $projectModel = new Project();
         $projectModel = new Project();
         $list = $projectModel->list(['type'=>['in',[1,2,3,4]]]);
         $list = $projectModel->list(['type'=>['in',[1,2,3,4]]]);
         foreach ($list as $v){
         foreach ($list as $v){
@@ -65,7 +63,6 @@ class UpdateRoute extends Command
             $this->getProductKeyword($v['id']);
             $this->getProductKeyword($v['id']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
->>>>>>> 66efe5cd4b835d715f00e164b101185541dd9f83
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
@@ -81,17 +78,6 @@ class UpdateRoute extends Command
         $lists = $keywordModel->list(['status'=>1]);
         $lists = $keywordModel->list(['status'=>1]);
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
-<<<<<<< HEAD
-                $tag = "-tag";
-                if (!substr($v['route'], -strlen($tag)) === $tag) {
-                    $route = $v['route'].$tag;
-                    // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-                    $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $this->user['project_id']);
-                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-                }
-                echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
-=======
-                echo date('Y-m-d H:i:s') . '关键字id:'.$v['id'] . PHP_EOL;
                 $tag = "-tag";
                 $tag = "-tag";
                 if (!(substr($v['route'], -strlen($tag)) === $tag)) {
                 if (!(substr($v['route'], -strlen($tag)) === $tag)) {
                     echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
                     echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
@@ -101,7 +87,6 @@ class UpdateRoute extends Command
                     $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
                     $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
                     $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                 }
                 }
->>>>>>> 66efe5cd4b835d715f00e164b101185541dd9f83
             }
             }
         }
         }
     }
     }