gx

@@ -60,9 +60,16 @@ class RouteMap extends Base
         }
         }
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);
-        $route = $sign;
+        $suffix = '';
+        if($source == self::SOURCE_PRODUCT_KEYWORD){
+            $suffix = '-tag';
+        }
+        if($source == self::SOURCE_PRODUCT){
+            $suffix = '-product';
+        }
+        $route = $sign.$suffix;
         while(self::isExist($route, $source, $source_id, $project_id)){
         while(self::isExist($route, $source, $source_id, $project_id)){
-            $route = $sign .'-'.$i;
+            $route = $sign .'-'.$i.$suffix;
             $i++;
             $i++;
         }
         }
         return $route;
         return $route;
@@ -83,17 +90,8 @@ class RouteMap extends Base
         if(in_array($route, $fixed)){
         if(in_array($route, $fixed)){
             return true;
             return true;
         }
         }
-        $path = '';
-        if($source == self::SOURCE_NEWS){
-            $path = self::SOURCE_NEWS;
-        }elseif ($source == self::SOURCE_BLOG){
-            $path = self::SOURCE_BLOG.'s';
-        }
-
         $where = [
         $where = [
-            'project_id' => $project_id,
-            'route' => $route,
-            'path' => $path,
+            'project_id' => $project_id, 'route' => $route,
         ];
         ];
         $route = self::where($where)->first();
         $route = self::where($where)->first();
         if($route){
         if($route){
@@ -122,25 +120,11 @@ class RouteMap extends Base
         }
         }
         try {
         try {
             $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
             $route_map = self::where('project_id', $project_id)->where('source_id', $source_id)->where('source', $source)->first();
-            //上线项目 不能修改链接了
-//            if($route_map){
-//                $project = ProjectLogic::instance()->getInfo($project_id);
-//                if($project['type'] !== Project::STATUS_ONE){
-//                    return $route_map->route;
-//                }
-//            }
             if(!$route_map){
             if(!$route_map){
                 $route_map = new self();
                 $route_map = new self();
                 $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;