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

@@ -84,7 +84,7 @@ class RouteMap extends Base
         }
         }
         $i=1;//路由重复时拼接
         $i=1;//路由重复时拼接
         $route = $sign.$suffix;
         $route = $sign.$suffix;
-        while(self::isExist($route, $source_id, $project_id)){
+        while(self::isExist($route, $source_id, $project_id,$source)){
             $route = $sign .'-'.$i.$suffix;
             $route = $sign .'-'.$i.$suffix;
             $i++;
             $i++;
         }
         }
@@ -99,7 +99,7 @@ class RouteMap extends Base
      * @time   :2025/3/12 9:51
      * @time   :2025/3/12 9:51
      * @param  :route：路由 source：模块类型 source_id：对应数据id
      * @param  :route：路由 source：模块类型 source_id：对应数据id
      */
      */
-    protected static function isExist($route, $source_id, $project_id){
+    protected static function isExist($route, $source_id, $project_id,$source){
         $fixed = ['api']; //固定的路由
         $fixed = ['api']; //固定的路由
         if(in_array($route, $fixed)){
         if(in_array($route, $fixed)){
             return true;
             return true;
@@ -109,8 +109,13 @@ class RouteMap extends Base
         ];
         ];
         $route = self::where($where)->first();
         $route = self::where($where)->first();
         if($route){
         if($route){
-            if($route->source_id != $source_id){
+            if(($route->source_id != $source_id)){
                 return true;
                 return true;
+            }else{
+                if($source != $route->source){
+                    //source_id想同，source不相同，继续循环
+                    return true;
+                }
             }
             }
         }
         }
         return false;
         return false;