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

@@ -329,7 +329,8 @@ class ProjectLogic extends BaseLogic
         $config['filter_emails'] = Arr::a2s(!empty($config['filter_emails']) ? $config['filter_emails'] : []);
         $config['filter_emails'] = Arr::a2s(!empty($config['filter_emails']) ? $config['filter_emails'] : []);
         $config['filter_mobiles'] = Arr::a2s(!empty($config['filter_mobiles']) ? $config['filter_mobiles'] : []);
         $config['filter_mobiles'] = Arr::a2s(!empty($config['filter_mobiles']) ? $config['filter_mobiles'] : []);
         $config['filter_names'] = Arr::a2s(!empty($config['filter_names']) ? $config['filter_names'] : []);
         $config['filter_names'] = Arr::a2s(!empty($config['filter_names']) ? $config['filter_names'] : []);
-
+        $config['black_ips'] = $config['black_ips'] ?? '';
+        
         $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first();
         $model = InquiryFilterConfig::where('project_id', $config['project_id'])->first();
         if(!$model){
         if(!$model){
             $model = new InquiryFilterConfig();
             $model = new InquiryFilterConfig();

@@ -47,7 +47,9 @@ class SyncSubmitTaskService
             return false;
             return false;
         }
         }
 
 
-        ProjectServer::useProject($project['id']);
+        if(!ProjectServer::useProject($project['id'])){
+            return false;
+        }
 
 
         $action = $task['type'];
         $action = $task['type'];
         $handler = new self();
         $handler = new self();
@@ -133,7 +135,6 @@ class SyncSubmitTaskService
      * @date 2023/11/30
      * @date 2023/11/30
      */
      */
     public static function checkIpCountry($domain, $ip, $type){
     public static function checkIpCountry($domain, $ip, $type){
-        $domain = 'https://demo.globalso.site/';
         $project = Project::getProjectByDomain($domain);
         $project = Project::getProjectByDomain($domain);
         if(empty($project)){
         if(empty($project)){
             throw new InquiryFilterException('项目不存在');
             throw new InquiryFilterException('项目不存在');
@@ -210,11 +211,11 @@ class SyncSubmitTaskService
             if($config['filter_referers']){
             if($config['filter_referers']){
                 //只比较path路径
                 //只比较path路径
                 $paths = array_map(function ($v){
                 $paths = array_map(function ($v){
-                    return parse_url(Url::to($v), PHP_URL_PATH);
+                    return trim(parse_url(Url::to($v), PHP_URL_PATH), '/');
                 },$config['filter_referers']);
                 },$config['filter_referers']);
 
 
                 //后端获取的referer
                 //后端获取的referer
-                if(in_array(parse_url($data['referer'], PHP_URL_PATH), $paths)){
+                if(in_array(trim(parse_url($data['referer'], PHP_URL_PATH), '/'), $paths)){
                     throw new InquiryFilterException( '过滤来源链接：' . $data['referer']);
                     throw new InquiryFilterException( '过滤来源链接：' . $data['referer']);
                 }
                 }
                 //前端获取的referer
                 //前端获取的referer