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

@@ -72,34 +72,34 @@ class Demo extends Command
 //        return true;
 //        return true;
 //    }
 //    }
 
 
-    public function handle(){
-        $keywordVideoModel = new KeywordVideoTask();
-        $project_id_arr = $keywordVideoModel::where('id','>',0)->pluck('project_id')->toArray();
-        $projectModel = new Project();
-        $list = $projectModel->list(['type'=>['!=',0],'delete_status'=>0,'id'=>['in',$project_id_arr]]);
-        $data = [];
-        foreach ($list as $v){
-            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
-            ProjectServer::useProject($v['id']);
-            $this->saveKeyword();
-            DB::disconnect('custom_mysql');
-        }
-        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
-    }
-
-    /**
-     * @remark :关键字有视频的改为1
-     * @name   :getProductKeywordInfo
-     * @author :lyh
-     * @method :post
-     * @time   :2024/5/31 9:54
-     */
-    public function saveKeyword(){
-        $keywordModel = new Keyword();
-        $rs = $keywordModel->edit(['is_video_keyword'=>0],['video'=>'']);
-        echo date('Y-m-d H:i:s') . 'end'.$rs . PHP_EOL;
-        return true;
-    }
+//    public function handle(){
+//        $keywordVideoModel = new KeywordVideoTask();
+//        $project_id_arr = $keywordVideoModel::where('id','>',0)->pluck('project_id')->toArray();
+//        $projectModel = new Project();
+//        $list = $projectModel->list(['type'=>['!=',0],'delete_status'=>0,'id'=>['in',$project_id_arr]]);
+//        $data = [];
+//        foreach ($list as $v){
+//            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
+//            ProjectServer::useProject($v['id']);
+//            $this->saveKeyword();
+//            DB::disconnect('custom_mysql');
+//        }
+//        echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
+//    }
+//
+//    /**
+//     * @remark :关键字有视频的改为1
+//     * @name   :getProductKeywordInfo
+//     * @author :lyh
+//     * @method :post
+//     * @time   :2024/5/31 9:54
+//     */
+//    public function saveKeyword(){
+//        $keywordModel = new Keyword();
+//        $rs = $keywordModel->edit(['is_video_keyword'=>0],['video'=>'']);
+//        echo date('Y-m-d H:i:s') . 'end'.$rs . PHP_EOL;
+//        return true;
+//    }
 
 
 //    public function handle(){
 //    public function handle(){
 //        //切换数据库配置
 //        //切换数据库配置
@@ -138,4 +138,14 @@ class Demo extends Command
 //        }
 //        }
 //        return true;
 //        return true;
 //    }
 //    }
+
+    public function handle(){
+        $keywordModel  = new KeywordVideoTask();
+        $lists = $keywordModel->list(['keywords'=>['!=',null]]);
+        foreach ($lists as $v){
+            $keywords =  str_replace(["\r\n", "\r", "\n"], ',', $v['keywords']);
+            $keywordModel->edit(['keywords'=>$keywords],['id'=>$v['id']]);
+        }
+        return true;
+    }
 }
 }

@@ -214,6 +214,9 @@ class OptimizeController extends BaseController
         if(isset($this->map['title']) && !empty($this->map['title'])){
         if(isset($this->map['title']) && !empty($this->map['title'])){
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
             $query = $query->where('gl_project.title','like','%'.$this->map['title'].'%');
         }
         }
+        if(isset($this->map['ai_video']) && !empty($this->map['ai_video'])){
+            $query = $query->where('gl_project_deploy_optimize.ai_video',$this->map['ai_video']);
+        }
         if(isset($this->map['amp_status'])){
         if(isset($this->map['amp_status'])){
             $query = $query->where('gl_domain_info.amp_status',$this->map['amp_status']);
             $query = $query->where('gl_domain_info.amp_status',$this->map['amp_status']);
         }
         }