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

@@ -215,7 +215,7 @@ class HtmlCollect extends Command
             }
 
             #Description
-            preg_match_all('/<meta name=[\'|\"]description[\'|\"]\s+[^>]*?content=[\'|\"]([\w\W]*?)[\'|\"]/', $html, $matches);
+            preg_match_all('/<meta\s+[^>]*?name=[\'|\"]description[\'|\"]\s+[^>]*?content=[\'|\"]([\w\W]*?)[\'|\"]/', $html, $matches);
             if (!empty($matches[1])) {
                 $meta['description'] = substr($matches[1][0], 0, 255);
             }

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>672]);
+        $list = $projectModel->list(['is_upgrade'=>0,'type'=>['!=',0],'id'=>['<',52]]);
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             ProjectServer::useProject($v['id']);
@@ -101,15 +101,15 @@ class UpdateRoute extends Command
                 if(!empty($v['route'])){
                     $tag = "-tag";
                     if (!(substr($v['route'], -strlen($tag)) === $tag)) {
-                        $route = Translate::tran($v['route'], 'en').$tag;
+//                        $route = Translate::tran($v['route'], 'en').$tag;
                         // 如果不是以 '-tag' 结尾，则拼接上 '-tag'
-//                        $route = $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 = $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;

@@ -510,7 +510,9 @@ class BTemplateLogic extends BaseLogic
             $templateCommonModel->edit($data,['id'=>$commonInfo['id']]);
         }
         //更新所有界面的other
-        return $templateCommonModel->edit(['other'=>$handleInfo['other']],['project_id'=>$this->user['project_id'],'template_id'=>$template_id]);
+        if($template_id != 0){
+            return $templateCommonModel->edit(['other'=>$handleInfo['other']],['project_id'=>$this->user['project_id'],'template_id'=>$template_id]);
+        }
     }
 
     /**