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

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>917]);
+        $list = $projectModel->list(['id'=>672]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -83,12 +83,13 @@ class CreateKeywordLogic extends BaseLogic
             return $this->success($data);
             return $this->success($data);
         }
         }
         $except_k = ['Quality','Philippines','USA','UK','America','China','Wholesale','Hot Sale','Cheap','cheap','price','pricelist','hot sale','Price','Pricelist','With ','For ','And ','Oem','Odm','Supplier','Manufacturer','CE Certification','Factory','Exporters','Company','Companies','Suppliers','Manufacturers','Factories','Company','Companies','Exporters','Exporter','Buy ',' Buy','Where ','What ','When ','How ','Which ','Producer','Producers','Best Selling','Hot Selling','Near','Chinese','India','use','high quality','discount','online','custom','customized','Enterprise','Agent','Plant','Refinery','Foundry','Maker','Distributor'];
         $except_k = ['Quality','Philippines','USA','UK','America','China','Wholesale','Hot Sale','Cheap','cheap','price','pricelist','hot sale','Price','Pricelist','With ','For ','And ','Oem','Odm','Supplier','Manufacturer','CE Certification','Factory','Exporters','Company','Companies','Suppliers','Manufacturers','Factories','Company','Companies','Exporters','Exporter','Buy ',' Buy','Where ','What ','When ','How ','Which ','Producer','Producers','Best Selling','Hot Selling','Near','Chinese','India','use','high quality','discount','online','custom','customized','Enterprise','Agent','Plant','Refinery','Foundry','Maker','Distributor'];
-        $except_k = array_map('strtolower', $except_k);
         $filterKeywords = [];
         $filterKeywords = [];
-        foreach ($this->param['keyword'] as $k=>$v){
-            if(in_array(strtolower($v),$except_k)){
-                unset($this->param['keyword'][$k]);
-                $filterKeywords[] = $v;
+        foreach ($this->param['keyword'] as $k=>$keyword){
+            foreach ($except_k as  $exc_k){
+                if(strpos(strtolower($keyword),strtolower($exc_k)) !== false){
+                    unset($this->param['keyword'][$k]);
+                    $filterKeywords[] = $keyword;
+                }
             }
             }
         }
         }
         $prefix_keyword = $this->prefixKeyword($this->param['prefix'] ?? [],$this->param['keyword'],$except_k);
         $prefix_keyword = $this->prefixKeyword($this->param['prefix'] ?? [],$this->param['keyword'],$except_k);

@@ -25,7 +25,7 @@ class AiCommandRequest extends FormRequest
     {
     {
         return [
         return [
             'key'=>'required',
             'key'=>'required',
-            'scene'=>'required',
+//            'scene'=>'required',
             'ai'=>'required',
             'ai'=>'required',
         ];
         ];
     }
     }
@@ -34,7 +34,7 @@ class AiCommandRequest extends FormRequest
     {
     {
         return [
         return [
             'key.required'=>'key不能为空',
             'key.required'=>'key不能为空',
-            'scene.required'   =>  '场景不能为空',
+//            'scene.required'   =>  '场景不能为空',
             'ai.required'=>'指令你能为空',
             'ai.required'=>'指令你能为空',
         ];
         ];
     }
     }