Merge remote-tracking branch 'origin/master' into akun

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
     public function handle(){
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>426]);
+        $list = $projectModel->list(['id'=>672]);
         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 = $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{
-//                        $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;

@@ -239,7 +239,7 @@ class WebTraffic extends Command
             ->where('pdo.domain', '>', 0)
             ->where('poc.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)
             ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
-            ->whereIn('pdo.project_id', [6, 25])   //todo 测试两个项目 后面删掉
+            ->where('gl_project.is_upgrade', 0)   //非升级项目
             ->where(function ($query) use ($type) {
            if($type == 1){
                //1-3个月项目

@@ -157,14 +157,12 @@ class TranslateLogic extends BaseLogic
             $contentData[] = $trimmedString;
         }
         $contentData = array_values($contentData);
-        $pattern = '/<meta\s+[^>]*content=[\'"]([^\'"]+)[\'"]/i'; // 匹配 meta 标签的 content 属性的正则表达式
-        $matches1 = array();
-        preg_match_all($pattern, $strippedContent, $matches1);
+        $pattern = '/<meta\s+[^>]*name=[\'"](keywords|description)[\'"][^>]*content=[\'"]([^\'"]+)[\'"]/i'; // 匹配 name 为 "keywords" 或 "description" 的 meta 标签的正则表达式
+        $matches = array();
+        preg_match_all($pattern, $strippedContent, $matches);
         $metaData = array();
-        foreach ($matches1[1] as $content) {
-            if (!empty($content)) {
-                $metaData[] = $content;
-            }
+        foreach ($matches[2] as $index => $content) {
+            $metaData[] = $content;
         }
         $data = array_merge($metaData, $contentData);
         return $data;