gx

@@ -9,6 +9,12 @@
 
 
 namespace App\Console\Commands;
 namespace App\Console\Commands;
 
 
+use App\Models\Blog\Blog;
+use App\Models\Blog\BlogCategory;
+use App\Models\News\News;
+use App\Models\News\NewsCategory;
+use App\Models\Product\Category;
+use App\Models\Product\Keyword;
 use App\Models\Product\Product;
 use App\Models\Product\Product;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
 use App\Models\RouteMap\RouteMap;
 use App\Models\RouteMap\RouteMap;
@@ -51,6 +57,12 @@ class UpdateRoute extends Command
         $lists = $projectModel->list(['is_upgrade'=>0]);
         $lists = $projectModel->list(['is_upgrade'=>0]);
         foreach ($lists as $k => $v){
         foreach ($lists as $k => $v){
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
+            $this->setProductRoute($v['id']);
+            $this->setProductKeywordRoute($v['id']);
+            $this->setBlogRoute($v['id']);
+            $this->setNewsRoute($v['id']);
+            $this->setBlogCateRoute($v['id']);
+            $this->setNewsCateRoute($v['id']);
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
     }
     }
@@ -65,12 +77,12 @@ class UpdateRoute extends Command
     public function setProductRoute($project_id){
     public function setProductRoute($project_id){
         $productModel = new Product();
         $productModel = new Product();
         $productList = $productModel->list(['status'=>['!=',2]],'id',['id','route']);
         $productList = $productModel->list(['status'=>['!=',2]],'id',['id','route']);
-        foreach ($productList as $k => $v){
-            if(!ends_with($v['route'],'-product')){
-                $route = $v['route'].'-product';
-                $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
-            }
+        foreach ($productList as $v){
+            $route = preg_replace('/-product.*/', '', $v['route']);
+            $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
+            $route = $route.'-product';
+            $productModel->edit(['route'=>$route],['id'=>$v['id']]);
+            RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
         }
         }
         return true;
         return true;
     }
     }
@@ -82,14 +94,77 @@ class UpdateRoute extends Command
      * @method :post
      * @method :post
      * @time   :2023/11/20 15:30
      * @time   :2023/11/20 15:30
      */
      */
-    public function setProductCateRoute($project_id){
-        $productModel = new Product();
-        $productList = $productModel->list(['status'=>['!=',2]],'id',['id','route']);
-        foreach ($productList as $k => $v){
-            if(!ends_with($v['route'],'-product')){
-                $route = $v['route'].'-product';
-                $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
+    public function setNewsRoute($project_id){
+        $newsModel = new News();
+        $newsList = $newsModel->list(['status'=>['!=',2]],'id',['id','url']);
+        foreach ($newsList as $v){
+             RouteMap::setRoute($v['url'], RouteMap::SOURCE_NEWS, $v['id'], $project_id);
+        }
+        return true;
+    }
+
+    /**
+     * @remark :设置路由
+     * @name   :setRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/20 15:30
+     */
+    public function setNewsCateRoute($project_id){
+        $newsCateModel = new NewsCategory();
+        $newsList = $newsCateModel->list([],'id',['id','alias']);
+        foreach ($newsList as $v){
+            RouteMap::setRoute($v['alias'], RouteMap::SOURCE_NEWS_CATE, $v['id'], $project_id);
+        }
+        return true;
+    }
+
+    /**
+     * @remark :设置路由
+     * @name   :setRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/20 15:30
+     */
+    public function setBlogRoute($project_id){
+        $blogModel = new Blog();
+        $blogList = $blogModel->list(['status'=>['!=',2]],'id',['id','url']);
+        foreach ($blogList as $v){
+            RouteMap::setRoute($v['url'], RouteMap::SOURCE_BLOG, $v['id'], $project_id);
+        }
+        return true;
+    }
+
+    /**
+     * @remark :设置路由
+     * @name   :setRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/20 15:30
+     */
+    public function setBlogCateRoute($project_id){
+        $blogCateModel = new BlogCategory();
+        $blogList = $blogCateModel->list([],'id',['id','alias']);
+        foreach ($blogList as $v){
+            RouteMap::setRoute($v['alias'], RouteMap::SOURCE_BLOG_CATE, $v['id'], $project_id);
+        }
+        return true;
+    }
+
+    /**
+     * @remark :设置路由
+     * @name   :setRoute
+     * @author :lyh
+     * @method :post
+     * @time   :2023/11/20 15:30
+     */
+    public function setProductKeywordRoute($project_id){
+        $keywordModel = new Keyword();
+        $keywordList = $keywordModel->list([],'id',['id','route']);
+        foreach ($keywordList as $v){
+            if(!ends_with($v['route'],'-tag')){
+                $route = $v['route'].'-tag';
+                RouteMap::setRoute($route, RouteMap::SOURCE_BLOG_CATE, $v['id'], $project_id);
             }
             }
         }
         }
         return true;
         return true;

@@ -109,15 +109,7 @@ class RouteMap extends Base
             if(!$route_map){
             if(!$route_map){
                 $route_map = new self();
                 $route_map = new self();
                 $route_map->source = $source;
                 $route_map->source = $source;
-                if($source == self::SOURCE_NEWS){
-                    $route_map->path = self::SOURCE_NEWS;
-                }elseif($source == self::SOURCE_NEWS_CATE){
-                    $route_map->path = self::PATH_NEWS_CATE;
-                }elseif ($source == self::SOURCE_BLOG){
-                    $route_map->path = self::SOURCE_BLOG;
-                }elseif ($source == self::SOURCE_BLOG_CATE){
-                    $route_map->path = self::PATH_BLOG_CATE;
-                }elseif ($source == self::SOURCE_PRODUCT_KEYWORD){
+                if ($source == self::SOURCE_PRODUCT_KEYWORD){
                     $route = $route.'-tag';
                     $route = $route.'-tag';
                 }elseif ($source == self::SOURCE_PRODUCT){
                 }elseif ($source == self::SOURCE_PRODUCT){
                     $route = $route.'-product';
                     $route = $route.'-product';
@@ -125,6 +117,15 @@ class RouteMap extends Base
                 $route_map->source_id = $source_id;
                 $route_map->source_id = $source_id;
                 $route_map->project_id = $project_id;
                 $route_map->project_id = $project_id;
             }
             }
+            if($source == self::SOURCE_NEWS){
+                $route_map->path = self::SOURCE_NEWS;
+            }elseif($source == self::SOURCE_NEWS_CATE){
+                $route_map->path = self::PATH_NEWS_CATE;
+            }elseif ($source == self::SOURCE_BLOG){
+                $route_map->path = self::SOURCE_BLOG;
+            }elseif ($source == self::SOURCE_BLOG_CATE){
+                $route_map->path = self::PATH_BLOG_CATE;
+            }
             $route_map->route = $route;
             $route_map->route = $route;
             $route_map->save();
             $route_map->save();
         }catch (\Exception $e){
         }catch (\Exception $e){