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

@@ -54,12 +54,12 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>['in',[183]],'is_upgrade'=>0]);
+        $list = $projectModel->list(['id'=>['in',[221]],'is_upgrade'=>0]);
         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();
             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;

@@ -272,6 +272,7 @@ class ProductLogic extends  BaseLogic
             $param['thumb'] = Arr::a2s($param['gallery'][0] ?? []);
             $param['thumb'] = Arr::a2s($param['gallery'][0] ?? []);
             $param['gallery'] = Arr::a2s($param['gallery'] ?? []);
             $param['gallery'] = Arr::a2s($param['gallery'] ?? []);
         }else{
         }else{
+            $param['gallery'] = Arr::a2s([]);
             $param['thumb'] =  Arr::a2s([]);
             $param['thumb'] =  Arr::a2s([]);
         }
         }
         $param['attrs'] = Arr::a2s($param['attrs'] ?? []);
         $param['attrs'] = Arr::a2s($param['attrs'] ?? []);