合并分支 'master-server' 到 'master'

gx1417路由



查看合并请求 !831

@@ -56,13 +56,13 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1148]]]);
+        $list = $projectModel->list(['id'=>['in',[1417]]]);
         $data = [];
         $data = [];
         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->getProduct();
-            $this->setProductKeyword();
+            $this->getProduct();
+//            $this->setProductKeyword();
 //            $this->getBlog();
 //            $this->getBlog();
 //            $this->setCustomRoute($v['id']);
 //            $this->setCustomRoute($v['id']);
 //            $this->editProductAlt();
 //            $this->editProductAlt();
@@ -242,18 +242,20 @@ class UpdateRoute extends Command
         if(!empty($lists)){
         if(!empty($lists)){
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
-                    $tag = "-product";
-                    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']]);
-                    }else{
-                        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']);
-                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
-                    }
+//                    $tag = "-product";
+//                    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']]);
+//                    }else{
+//                        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']);
+//                        $productModel->edit(['route'=>$route],['id'=>$v['id']]);
+//                    }
+                    $route = RouteMap::setRoute($v['route'], RouteMap::SOURCE_PRODUCT, $v['id'], $v['project_id']);
+                    $productModel->edit(['route'=>$route],['id'=>$v['id']]);
                     continue;
                     continue;
                 }else{
                 }else{
                     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;