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

@@ -60,15 +60,19 @@ class RouteMap extends Base
         }
         }
         $i=1;
         $i=1;
         $sign = generateRoute($title);
         $sign = generateRoute($title);
-        $suffix = '';
+        $info = self::where(['project_id' => $project_id, 'source' => $source, 'source_id'=>$source_id])->first();
+        if($info === false){
             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, $source_id, $project_id)){
+        while(self::isExist($route, $source_id, $project_id)){
             $route = $sign .'-'.$i.$suffix;
             $route = $sign .'-'.$i.$suffix;
             $i++;
             $i++;
         }
         }
@@ -85,7 +89,7 @@ class RouteMap extends Base
      * @author zbj
      * @author zbj
      * @date 2023/4/17
      * @date 2023/4/17
      */
      */
-    protected static function isExist($route, $source, $source_id, $project_id){
+    protected static function isExist($route, $source_id, $project_id){
         $fixed = ['search','api']; //固定的路由
         $fixed = ['search','api']; //固定的路由
         if(in_array($route, $fixed)){
         if(in_array($route, $fixed)){
             return true;
             return true;
@@ -140,43 +144,43 @@ class RouteMap extends Base
     }
     }
 
 
 
 
-    /**
-     * @remark :产品新增单独处理路由
-     * @name   :setProductRoute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/21 18:48
-     */
-    public static function setProductRoute($route,$i = 0){
-        $routes = $route.'-'.$i.'-product';
-        $routeMapModel = new RouteMap();
-        $routeInfo = $routeMapModel->read(['route'=>$routes]);
-        if($routeInfo === false){
-            return $routes;
-        }else{
-            $i = $i + 1;
-            return self::setProductRoute($route,$i);
-        }
-    }
-
-    /**
-     * @remark :关键字新增单独处理路由
-     * @name   :setProductRoute
-     * @author :lyh
-     * @method :post
-     * @time   :2023/11/21 18:48
-     */
-    public static function setKeywordRoute($route,$i = 0){
-        $routes = $route.'-'.$i.'-tag';
-        $routeMapModel = new RouteMap();
-        $routeInfo = $routeMapModel->read(['route'=>$routes]);
-        if($routeInfo === false){
-            return $routes;
-        }else{
-            $i = $i + 1;
-            return self::setProductRoute($route,$i);
-        }
-    }
+//    /**
+//     * @remark :产品新增单独处理路由
+//     * @name   :setProductRoute
+//     * @author :lyh
+//     * @method :post
+//     * @time   :2023/11/21 18:48
+//     */
+//    public static function setProductRoute($route,$i = 0){
+//        $routes = $route.'-'.$i.'-product';
+//        $routeMapModel = new RouteMap();
+//        $routeInfo = $routeMapModel->read(['route'=>$routes]);
+//        if($routeInfo === false){
+//            return $routes;
+//        }else{
+//            $i = $i + 1;
+//            return self::setProductRoute($route,$i);
+//        }
+//    }
+//
+//    /**
+//     * @remark :关键字新增单独处理路由
+//     * @name   :setProductRoute
+//     * @author :lyh
+//     * @method :post
+//     * @time   :2023/11/21 18:48
+//     */
+//    public static function setKeywordRoute($route,$i = 0){
+//        $routes = $route.'-'.$i.'-tag';
+//        $routeMapModel = new RouteMap();
+//        $routeInfo = $routeMapModel->read(['route'=>$routes]);
+//        if($routeInfo === false){
+//            return $routes;
+//        }else{
+//            $i = $i + 1;
+//            return self::setKeywordRoute($route,$i);
+//        }
+//    }
 
 
     /**
     /**
      * @param $route
      * @param $route