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

@@ -401,7 +401,7 @@ class InquiryForwardLogic extends BaseLogic
             $text = Translate::tran($text, $lang);
             $text = Translate::tran($text, $lang);
         }
         }
 
 
-        return $this->success(['ai_message' => Common::deal_str($text)]);
+        return $this->success(['ai_message' => str_replace('<br/>', PHP_EOL, Common::deal_str($text))]);
     }
     }
 
 
     /**
     /**

@@ -509,6 +509,14 @@ class SyncSubmitTaskService
             throw new InquiryFilterException( '被刷数据');
             throw new InquiryFilterException( '被刷数据');
         }
         }
 
 
+        //3373江苏石川岛丰东真空 ip荷兰 name >8 纯字母不含空格
+        if($project_id == 3373 && in_array($data['country']??'', ['荷兰', '俄罗斯'])
+            && strlen($data['data']['name']??"") >= 8
+            && preg_match('/^[a-zA-Z]+$/', $data['data']['name']??'')
+        ){
+            throw new InquiryFilterException( '被刷数据');
+        }
+
         //数据都是空的
         //数据都是空的
         $is_all_empty = true;
         $is_all_empty = true;
         foreach ($data['data'] as $item){
         foreach ($data['data'] as $item){