gx

@@ -60,16 +60,9 @@ class RouteMap extends Base
         }
         }
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);
-        $suffix = '';
-        if($source == self::SOURCE_PRODUCT_KEYWORD){
-            $suffix = '-tag';
-        }
-        if($source == self::SOURCE_PRODUCT){
-            $suffix = '-product';
-        }
-        $route = $sign.$suffix;
+        $route = $sign;
         while(self::isExist($route, $source, $source_id, $project_id)){
         while(self::isExist($route, $source, $source_id, $project_id)){
-            $route = $sign .'-'.$i.$suffix;
+            $route = $sign .'-'.$i;
             $i++;
             $i++;
         }
         }
         return $route;
         return $route;
@@ -91,7 +84,8 @@ class RouteMap extends Base
             return true;
             return true;
         }
         }
         $where = [
         $where = [
-            'project_id' => $project_id, 'route' => $route,
+            'project_id' => $project_id,
+            'route' => $route,
         ];
         ];
         $route = self::where($where)->first();
         $route = self::where($where)->first();
         if($route){
         if($route){
@@ -125,6 +119,13 @@ class RouteMap extends Base
                 $route_map->source = $source;
                 $route_map->source = $source;
                 $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_PRODUCT_KEYWORD){
+                    $route = self::setKeywordRoute($route);
+                    //查看当前路由是否存在
+                }elseif ($source == self::SOURCE_PRODUCT){
+                    //产品单独处理路由
+                    $route = self::setProductRoute($route);
+                }
             }
             }
             if($source == self::SOURCE_NEWS){
             if($source == self::SOURCE_NEWS){
                 $route_map->path = self::SOURCE_NEWS;
                 $route_map->path = self::SOURCE_NEWS;