正在显示
1 个修改的文件
包含
7 行增加
和
7 行删除
| @@ -273,7 +273,7 @@ class SyncSubmitTaskService | @@ -273,7 +273,7 @@ class SyncSubmitTaskService | ||
| 273 | 273 | ||
| 274 | $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id); | 274 | $config = InquiryFilterConfig::getCacheInfoByProjectId($project_id); |
| 275 | //没配置 则默认开启且使用全局 | 275 | //没配置 则默认开启且使用全局 |
| 276 | - if($config){ | 276 | + if(!$config){ |
| 277 | $config['is_global_rule'] = 1; | 277 | $config['is_global_rule'] = 1; |
| 278 | $config['status'] = 1; | 278 | $config['status'] = 1; |
| 279 | } | 279 | } |
| @@ -284,11 +284,11 @@ class SyncSubmitTaskService | @@ -284,11 +284,11 @@ class SyncSubmitTaskService | ||
| 284 | self::inquiryFilter(Project::DEMO_PROJECT_ID, $data); | 284 | self::inquiryFilter(Project::DEMO_PROJECT_ID, $data); |
| 285 | } | 285 | } |
| 286 | //过滤国家 | 286 | //过滤国家 |
| 287 | - if($config['filter_countries'] && in_array($data['country'], $config['filter_countries'])){ | 287 | + if(!empty($config['filter_countries']) && in_array($data['country'], $config['filter_countries'])){ |
| 288 | throw new InquiryFilterException( '过滤国家:' . $data['country']); | 288 | throw new InquiryFilterException( '过滤国家:' . $data['country']); |
| 289 | } | 289 | } |
| 290 | //过滤ip | 290 | //过滤ip |
| 291 | - if($config['black_ips']){ | 291 | + if(!empty($config['black_ips'])){ |
| 292 | $black_ips = $config['black_ips']; | 292 | $black_ips = $config['black_ips']; |
| 293 | //后端获取的ip | 293 | //后端获取的ip |
| 294 | if(in_array($data['ip'], $black_ips)){ | 294 | if(in_array($data['ip'], $black_ips)){ |
| @@ -317,7 +317,7 @@ class SyncSubmitTaskService | @@ -317,7 +317,7 @@ class SyncSubmitTaskService | ||
| 317 | } | 317 | } |
| 318 | } | 318 | } |
| 319 | //过滤来源 | 319 | //过滤来源 |
| 320 | - if($config['filter_referers']){ | 320 | + if(!empty($config['filter_referers'])){ |
| 321 | //只比较path路径 | 321 | //只比较path路径 |
| 322 | $paths = array_map(function ($v){ | 322 | $paths = array_map(function ($v){ |
| 323 | return trim(parse_url(Url::to($v), PHP_URL_PATH), '/'); | 323 | return trim(parse_url(Url::to($v), PHP_URL_PATH), '/'); |
| @@ -333,7 +333,7 @@ class SyncSubmitTaskService | @@ -333,7 +333,7 @@ class SyncSubmitTaskService | ||
| 333 | } | 333 | } |
| 334 | } | 334 | } |
| 335 | //过滤邮箱 | 335 | //过滤邮箱 |
| 336 | - if($config['filter_emails'] && !empty($data['data']['email'])){ | 336 | + if(!empty($config['filter_emails']) && !empty($data['data']['email'])){ |
| 337 | foreach ($config['filter_emails'] as $filter_email){ | 337 | foreach ($config['filter_emails'] as $filter_email){ |
| 338 | if(Str::contains(strtolower($data['data']['email']), strtolower($filter_email))){ | 338 | if(Str::contains(strtolower($data['data']['email']), strtolower($filter_email))){ |
| 339 | throw new InquiryFilterException( '过滤邮箱:' . $filter_email); | 339 | throw new InquiryFilterException( '过滤邮箱:' . $filter_email); |
| @@ -341,7 +341,7 @@ class SyncSubmitTaskService | @@ -341,7 +341,7 @@ class SyncSubmitTaskService | ||
| 341 | } | 341 | } |
| 342 | } | 342 | } |
| 343 | //过滤电话 | 343 | //过滤电话 |
| 344 | - if($config['filter_mobiles'] && !empty($data['data']['phone'])){ | 344 | + if(!empty($config['filter_mobiles']) && !empty($data['data']['phone'])){ |
| 345 | foreach ($config['filter_mobiles'] as $filter_mobile){ | 345 | foreach ($config['filter_mobiles'] as $filter_mobile){ |
| 346 | if(Str::contains(strtolower($data['data']['phone']), strtolower($filter_mobile))){ | 346 | if(Str::contains(strtolower($data['data']['phone']), strtolower($filter_mobile))){ |
| 347 | throw new InquiryFilterException( '过滤电话:' . $filter_mobile); | 347 | throw new InquiryFilterException( '过滤电话:' . $filter_mobile); |
| @@ -349,7 +349,7 @@ class SyncSubmitTaskService | @@ -349,7 +349,7 @@ class SyncSubmitTaskService | ||
| 349 | } | 349 | } |
| 350 | } | 350 | } |
| 351 | //过滤姓名 | 351 | //过滤姓名 |
| 352 | - if($config['filter_names'] && !empty($data['data']['name'])){ | 352 | + if(!empty($config['filter_names']) && !empty($data['data']['name'])){ |
| 353 | foreach ($config['filter_names'] as $filter_name){ | 353 | foreach ($config['filter_names'] as $filter_name){ |
| 354 | if( Str::contains(strtolower($data['data']['name']), strtolower($filter_name))){ | 354 | if( Str::contains(strtolower($data['data']['name']), strtolower($filter_name))){ |
| 355 | throw new InquiryFilterException( '过滤姓名:' . $filter_name); | 355 | throw new InquiryFilterException( '过滤姓名:' . $filter_name); |
-
请 注册 或 登录 后发表评论