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

@@ -53,9 +53,13 @@ class UpdateRoute extends Command
      * @time   :2023/11/20 15:13
      * @time   :2023/11/20 15:13
      */
      */
     public function handle(){
     public function handle(){
-        ProjectServer::useProject(75);
-        $this->getProductKeyword();
-        DB::disconnect('custom_mysql');
+        $projectModel = new Project();
+        $list = $projectModel->list(['type'=>['in',[1,2,3,4]]]);
+        foreach ($list as $v){
+            ProjectServer::useProject($v['id']);
+            $this->getProductKeyword($v['id']);
+            DB::disconnect('custom_mysql');
+        }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
     }
 
 
@@ -66,16 +70,21 @@ class UpdateRoute extends Command
      * @method :post
      * @method :post
      * @time   :2023/12/8 11:13
      * @time   :2023/12/8 11:13
      */
      */
-    public function getProductKeyword(){
+    public function getProductKeyword($project_id){
         $keywordModel = new Keyword();
         $keywordModel = new Keyword();
-        $lists = $keywordModel->list(['route'=>'']);
+        $lists = $keywordModel->list(['status'=>1]);
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
-                echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
-                $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $this->user['project_id']);
-                $this->curlDelRoute(['new_route'=>$route]);
-                $this->model->edit(['route'=>$route],['id'=>$v['id']]);
-                echo date('Y-m-d H:i:s') . 'end :'.$route . PHP_EOL;
+                echo date('Y-m-d H:i:s') . '关键字id:'.$v['id'] . PHP_EOL;
+                $tag = "-tag";
+                if (!(substr($v['route'], -strlen($tag)) === $tag)) {
+                    echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
+                    $route = $v['route'].$tag;
+                    // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
+                    $routeModel = new RouteMap();
+                    $routeModel->edit(['route'=>$route],['source'=>RouteMap::SOURCE_PRODUCT_KEYWORD,'source_id'=>$v['id']]);
+                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                }
             }
             }
         }
         }
     }
     }

@@ -58,15 +58,14 @@ class RouteMap extends Base
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
         $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
-        if($info === false){
+        $suffix = '';
+        if(empty($info)){
             if($source == self::SOURCE_PRODUCT_KEYWORD){
             if($source == self::SOURCE_PRODUCT_KEYWORD){
                 $suffix = '-tag';
                 $suffix = '-tag';
             }
             }
             if($source == self::SOURCE_PRODUCT){
             if($source == self::SOURCE_PRODUCT){
                 $suffix = '-product';
                 $suffix = '-product';
             }
             }
-        }else{
-            $suffix = '';
         }
         }
         $route = $sign.$suffix;
         $route = $sign.$suffix;
         while(self::isExist($route, $source_id, $project_id)){
         while(self::isExist($route, $source_id, $project_id)){