gx

@@ -60,14 +60,7 @@ class UpdateRoute extends Command
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
-//            $this->delProductKeyword();
-//            $this->checkProduct($data,$v['id']);
-//            $this->getProduct();
             $this->setProductKeyword();
-//            $this->getRouteMap();
-//            $this->getProductCategory();
-//            $this->delRouteMap();
-//            $this->setCustomRoute($v['id']);
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -114,19 +107,19 @@ class UpdateRoute extends Command
         if(!empty($lists)){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
-//                    $tag = "-tag";
-//                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
-//                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
-////                        $route = Translate::tran($v['route'], 'en').$tag;
-//                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-//                        $route = trim($v['route'],'-tag');
-//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-//                    }else{
-//                        $route = Translate::tran($v['title'], 'en').$tag;
-//                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
-//                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
-//                    }
+                    $tag = "-tag";
+                    if ((substr($v['route'], -strlen($tag)) === $tag)) {
+                        echo date('Y-m-d H:i:s') . '拼接 :'.$v['id'] . PHP_EOL;
+//                        $route = Translate::tran($v['route'], 'en').$tag;
+                        // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
+                        $route = trim($v['route'],'-tag');
+                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    }else{
+                        $route = Translate::tran($v['title'], 'en').$tag;
+                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                        $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
+                    }
                 }else{
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                     $route = Translate::tran($v['title'], 'en');

@@ -46,7 +46,7 @@ class ProductLogic extends  BaseLogic
         $this->param = $this->handleSaveParam($this->param);
         try {
             if(isset($this->param['id']) && !empty($this->param['id'])){
-                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id']);
+                $this->param['route'] = RouteMap::setRoute($this->param['route'], RouteMap::SOURCE_PRODUCT, $this->param['id'], $this->user['project_id'],$this->param['six_read'] ?? 1);
                 $route = $this->param['route'];
                 $this->model->edit($this->param,['id'=>$this->param['id']]);
                 $id = $this->param['id'];

@@ -67,7 +67,7 @@ class Category extends Base
      * @date 2023/4/28
      */
     public function getProductNum($cate_id){
-        $str = [];
+        $str[] = $cate_id;
         $cate_ids = $this->getAllSub($cate_id,$str);
         $count = CategoryRelated::whereIn('cate_id',$cate_ids)->count();
 //        $str = 0;

@@ -111,7 +111,10 @@ class RouteMap extends Base
      * @author zbj
      * @date 2023/4/17
      */
-    public static function setRoute($title, $source, $source_id, $project_id = 0){
+    public static function setRoute($title, $source, $source_id, $project_id = 0,$six_read = 1){
+        if($six_read != 1){//5.0数据编辑路由时，直接返回路由
+            return $title;
+        }
         $route = self::generateRoute($title, $source, $source_id, $project_id);
         if(!$route){
             throw new \Exception('路由生成失败');