Merge branch 'master-server' of http://47.244.231.31:8099/zhl/globalso-v6

@@ -61,12 +61,11 @@ class Demo extends Command
 
 
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['is_upgrade'=>1]);
-        $data = [];
+        $list = $projectModel->list(['id'=>1659]);
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
             ProjectServer::useProject($v['id']);
-            $this->init404Page($v['id']);
+            $this->getProduct();
             DB::disconnect('custom_mysql');
             DB::disconnect('custom_mysql');
         }
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
@@ -80,23 +79,13 @@ class Demo extends Command
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
                     $tag = "-product";
                     $tag = "-product";
                     if (!(substr($v['route'], -strlen($tag)) === $tag)) {
                     if (!(substr($v['route'], -strlen($tag)) === $tag)) {
-                        echo date('Y-m-d H:i:s') . '拼接'.$tag . PHP_EOL;
-                        $route = $v['route'].$tag;
-                        // 如果不是以 '-product' 结尾，则拼接上 '-product'
-                        $route = RouteMap::setRoute($route, RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
-                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
+                        continue;
                     }else{
                     }else{
+                        $v['route'] = str_replace($tag,'',$v['route']);//删除-product
                         echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                         echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
-                        $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
+                        $route = RouteMap::setRoute($v['route'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
                         $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                         $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                     }
                     }
-                    continue;
-                }else{
-                    echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
-                    $v['title'] = Translate::tran($v['title'], 'en');
-                    $v['title'] = str_replace('.','',$v['title']).'-product';
-                    $route = RouteMap::setRoute($v['title'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
-                    $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                 }
                 }
             }
             }
         }
         }