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

@@ -56,16 +56,16 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[1799]]]);
+        $list = $projectModel->list(['id'=>['in',[1148]]]);
         $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->getProduct();
-//            $this->setProductKeyword();
+            $this->setProductKeyword();
 //            $this->getBlog();
 //            $this->getBlog();
 //            $this->setCustomRoute($v['id']);
 //            $this->setCustomRoute($v['id']);
-            $this->editProductAlt();
+//            $this->editProductAlt();
             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;
@@ -131,6 +131,8 @@ class UpdateRoute extends Command
             foreach ($lists as $v){
             foreach ($lists as $v){
                 if(!empty($v['route'])){
                 if(!empty($v['route'])){
                     echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
                     echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
+                    $route = $this->setRoute($v['route'], RouteMap::SOURCE_PRODUCT_KEYWORD, $v['id'], $v['project_id']);
+                    $keywordModel->edit(['route'=>$route],['id'=>$v['id']]);
                     continue;
                     continue;
                 }else{
                 }else{
                     echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;
                     echo date('Y-m-d H:i:s') . 'route :'.$v['id'] . PHP_EOL;

@@ -111,7 +111,7 @@ class TaskController extends BaseController
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
         $data = $logic->getTaskInfo();
         $data = $logic->getTaskInfo();
-        return $this->response('success',Code::SUCCESS,$data);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 
 
     /**
     /**