作者 赵彬吉

update

... ... @@ -273,7 +273,7 @@ class SyncSubmitTaskService
$config = InquiryFilterConfig::getCacheInfoByProjectId($project_id);
//没配置 则默认开启且使用全局
if($config){
if(!$config){
$config['is_global_rule'] = 1;
$config['status'] = 1;
}
... ... @@ -284,11 +284,11 @@ class SyncSubmitTaskService
self::inquiryFilter(Project::DEMO_PROJECT_ID, $data);
}
//过滤国家
if($config['filter_countries'] && in_array($data['country'], $config['filter_countries'])){
if(!empty($config['filter_countries']) && in_array($data['country'], $config['filter_countries'])){
throw new InquiryFilterException( '过滤国家:' . $data['country']);
}
//过滤ip
if($config['black_ips']){
if(!empty($config['black_ips'])){
$black_ips = $config['black_ips'];
//后端获取的ip
if(in_array($data['ip'], $black_ips)){
... ... @@ -317,7 +317,7 @@ class SyncSubmitTaskService
}
}
//过滤来源
if($config['filter_referers']){
if(!empty($config['filter_referers'])){
//只比较path路径
$paths = array_map(function ($v){
return trim(parse_url(Url::to($v), PHP_URL_PATH), '/');
... ... @@ -333,7 +333,7 @@ class SyncSubmitTaskService
}
}
//过滤邮箱
if($config['filter_emails'] && !empty($data['data']['email'])){
if(!empty($config['filter_emails']) && !empty($data['data']['email'])){
foreach ($config['filter_emails'] as $filter_email){
if(Str::contains(strtolower($data['data']['email']), strtolower($filter_email))){
throw new InquiryFilterException( '过滤邮箱:' . $filter_email);
... ... @@ -341,7 +341,7 @@ class SyncSubmitTaskService
}
}
//过滤电话
if($config['filter_mobiles'] && !empty($data['data']['phone'])){
if(!empty($config['filter_mobiles']) && !empty($data['data']['phone'])){
foreach ($config['filter_mobiles'] as $filter_mobile){
if(Str::contains(strtolower($data['data']['phone']), strtolower($filter_mobile))){
throw new InquiryFilterException( '过滤电话:' . $filter_mobile);
... ... @@ -349,7 +349,7 @@ class SyncSubmitTaskService
}
}
//过滤姓名
if($config['filter_names'] && !empty($data['data']['name'])){
if(!empty($config['filter_names']) && !empty($data['data']['name'])){
foreach ($config['filter_names'] as $filter_name){
if( Str::contains(strtolower($data['data']['name']), strtolower($filter_name))){
throw new InquiryFilterException( '过滤姓名:' . $filter_name);
... ...