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

@@ -62,18 +62,26 @@ class Demo extends Command
     protected $description = 'demo';
 
     public function handle(){
-        $projectModel = new Project();
-        $list = $projectModel->list(['is_upgrade'=>0,'delete_status'=>0]);
+        $keywordVideoModel = new KeywordVideoTask();
+        $list = $keywordVideoModel->list();
         foreach ($list as $v){
-            echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
-            ProjectServer::useProject($v['id']);
-//            $this->getProduct();
-            $this->copyProduct();
+            echo date('Y-m-d H:i:s') . 'project_id:'.$v['project_id'] . PHP_EOL;
+            ProjectServer::useProject($v['project_id']);
+            if($v['project_id'] == 23){
+                $this->getProduct();
+            }
             DB::disconnect('custom_mysql');
         }
         echo date('Y-m-d H:i:s') . 'end' . PHP_EOL;
     }
 
+    /**
+     * @remark :更新产品
+     * @name   :getProduct
+     * @author :lyh
+     * @method :post
+     * @time   :2024/11/27 15:40
+     */
     public function getProduct(){
         $productModel = new Product();
         $lists = $productModel->list(['status'=>['!=',3]]);
@@ -82,18 +90,19 @@ class Demo extends Command
                 if(!empty($v['keyword_id'])){
                     echo date('Y-m-d H:i:s') . 'id :'.$v['id'] . PHP_EOL;
                     $keyword_arr = [];
+                    $keyword_video_arr = [];
                     $count = count($v['keyword_id']);
                     if($count > 7){
                         foreach ($v['keyword_id'] as $key => $val){
                             if($key > 6){
-                                break;
+                                $keyword_video_arr[] = $val;
+                            }else{
+                                $keyword_arr[] = $val;
                             }
-                            $keyword_arr[] = $val;
                         }
-                        $keyword_str = explode(',',$keyword_arr);
-                        $productModel->edit(['keyword_id'=>$keyword_str],['id'=>$v['id']]);
-                        $keywordRelatedModel = new KeywordRelated();
-                        $keywordRelatedModel->edit(['type'=>2],['keyword_id'=>$val,'product_id'=>$v['id']]);
+                        $keyword_str = !empty($keyword_arr) ? ','.explode(',',$keyword_arr).',' : '';
+                        $keyword_video_str = !empty($keyword_video_arr) ? ','.explode(',',$keyword_video_arr).',' : '';
+                        $productModel->edit(['keyword_id'=>$keyword_str,'keyword_video_id'=>$keyword_video_str],['id'=>$v['id']]);
                     }
                 }
             }

@@ -310,15 +310,19 @@ class SyncSubmitTaskService
             //过滤内容
             if(!empty($data['data']['message'])) {
                 //过滤内容关键字
-                if (!empty($config['filter_contents'])){
+                if (!empty($config['filter_contents'])) {
                     foreach ($config['filter_contents'] as $filter_content) {
-                        //要指定词才过滤
-                        if (preg_match("/\b" . preg_quote($filter_content, "/") . "\b/i", $data['data']['message'])) {
-                            throw new InquiryFilterException('过滤内容：' . $filter_content);
+                        //中文直接包含
+                        if (preg_match("/^[\x{4e00}-\x{9fa5}]+$/u", $filter_content)) {
+                            if (Str::contains($data['data']['message'], $filter_content)) {
+                                throw new InquiryFilterException('过滤内容：' . $filter_content);
+                            }
+                        } else {
+                            //英文要指定词才过滤
+                            if (preg_match("/\b" . preg_quote($filter_content, "/") . "\b/i", $data['data']['message'])) {
+                                throw new InquiryFilterException('过滤内容：' . $filter_content);
+                            }
                         }
-//                        if (Str::contains(strtolower($data['data']['message']), strtolower($filter_content))) {
-//                            throw new InquiryFilterException('过滤内容：' . $filter_content);
-//                        }
                     }
                 }