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

@@ -82,9 +82,11 @@ class InitKeyword extends Command
             $this->output(' keywordID: ' . $val->id . ', title: ' . $val->title);
             $this->output(' keywordID: ' . $val->id . ', title: ' . $val->title);
             try {
             try {
                 if(contains_russian($val['title'])){
                 if(contains_russian($val['title'])){
-                    $val['title'] = Translate::tran($val['title'], 'en');
+                    $title = Translate::tran($val['title'], 'en');
+                }else{
+                    $title = $val['title'];
                 }
                 }
-                $route = RouteMap::setRoute($val['title'],RouteMap::SOURCE_PRODUCT_KEYWORD, $val->id, $notice['data']['project_id']);
+                $route = RouteMap::setRoute($title,RouteMap::SOURCE_PRODUCT_KEYWORD, $val->id, $notice['data']['project_id']);
                 $val->route = $route;
                 $val->route = $route;
                 $val->save();
                 $val->save();
             } catch (\Exception $e) {
             } catch (\Exception $e) {

@@ -40,7 +40,7 @@ class PrivateController extends BaseController
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
         $result = Project::select($field)->leftJoin('gl_project_deploy_optimize as b', 'gl_project.id', '=', 'b.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_project_online_check as c', 'gl_project.id', '=', 'c.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
             ->leftJoin('gl_domain_info as d', 'gl_project.id', '=', 'd.project_id')
-            ->whereIn('gl_project.type', [Project::TYPE_TWO, Project::TYPE_FOUR])
+            ->where('gl_project.type', Project::TYPE_TWO)
             ->where(function ($subQuery) {
             ->where(function ($subQuery) {
                 $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
                 $subQuery->orwhere('c.qa_status', OnlineCheck::STATUS_ONLINE_TRUE)->orwhere('gl_project.is_upgrade', Project::IS_UPGRADE_TRUE);
             })
             })

@@ -262,7 +262,7 @@ class OptimizeController extends BaseController
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
         if(isset($this->map['test_domain']) && !empty($this->map['test_domain'])){
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
             $query = $query->where('gl_project_deploy_build.test_domain','like','%'.$this->map['test_domain'].'%');
         }
         }
-        $query = $query->whereIn('gl_project.type',[2,4]);//TODO::2,4代表优化项目
+        $query = $query->where('gl_project.type',2);//TODO::2,4代表优化项目; 2024-06-05修改项目中台只显示为类型为2
         $query->where(function ($subQuery) {
         $query->where(function ($subQuery) {
             $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);
             $subQuery->orwhere('gl_project_online_check.qa_status',1)->orwhere('gl_project.is_upgrade',1);
         });
         });