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

@@ -86,7 +86,6 @@ class UpdateRoute extends Command
             $route = preg_replace('/-1-product.*/', '', $route);
             $route = preg_replace('/-1-product.*/', '', $route);
             $route = preg_replace('/-product.*/', '', $route);
             $route = preg_replace('/-product.*/', '', $route);
             $i = 0;
             $i = 0;
-            echo date('Y-m-d H:i:s') . ' 计数:' . $i . PHP_EOL;
             $routes = $this->productRoute($route,$v['id'],$i);
             $routes = $this->productRoute($route,$v['id'],$i);
             $route = RouteMap::setRoute($routes, RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
             $route = RouteMap::setRoute($routes, RouteMap::SOURCE_PRODUCT, $v['id'], $project_id);
             echo date('Y-m-d H:i:s') . ' 路由表返回的route:' . $route . PHP_EOL;
             echo date('Y-m-d H:i:s') . ' 路由表返回的route:' . $route . PHP_EOL;
@@ -103,17 +102,19 @@ class UpdateRoute extends Command
      * @time   :2023/11/21 18:48
      * @time   :2023/11/21 18:48
      */
      */
     public function productRoute($route,$id,$i){
     public function productRoute($route,$id,$i){
+        echo date('Y-m-d H:i:s') . ' 打印$i:' . $i . PHP_EOL;
         if($i == 0){
         if($i == 0){
             $routes = $route.'-product';
             $routes = $route.'-product';
         }else{
         }else{
             $routes = $route.'-'.$i.'-product';
             $routes = $route.'-'.$i.'-product';
         }
         }
         $routeMapModel = new RouteMap();
         $routeMapModel = new RouteMap();
-        $routeInfo = $routeMapModel->read(['route'=>$routes,'id'=>['!=',$id]]);
-        if($routeInfo === false){
+        $routeInfo = $routeMapModel->read(['route'=>$routes,'source'=>'product','source_id'=>['!=',$id]]);
+        if($routeInfo == false){
             echo date('Y-m-d H:i:s') . ' route:' . $routes . PHP_EOL;
             echo date('Y-m-d H:i:s') . ' route:' . $routes . PHP_EOL;
             return $routes;
             return $routes;
         }else{
         }else{
+            echo date('Y-m-d H:i:s') . ' 数据:' . $routeInfo['id'] . PHP_EOL;
             $i = $i + 1;
             $i = $i + 1;
             return $this->productRoute($route,$id,$i);
             return $this->productRoute($route,$id,$i);
         }
         }