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

@@ -2,6 +2,7 @@
 
 
 namespace App\Http\Controllers\Api;
 namespace App\Http\Controllers\Api;
 
 
+use App\Exceptions\InquiryFilterException;
 use App\Models\Visit\SyncSubmitTask;
 use App\Models\Visit\SyncSubmitTask;
 use App\Services\CosService;
 use App\Services\CosService;
 use Illuminate\Http\Request;
 use Illuminate\Http\Request;
@@ -42,7 +43,9 @@ class SelfSiteController extends BaseController
                         'original_name' => $fileinfo['name'],
                         'original_name' => $fileinfo['name'],
                     ];
                     ];
                 }
                 }
-            } catch (\Exception $e) {
+            }catch (InquiryFilterException $e){
+                return $this->error($e->getMessage());
+            }catch (\Exception $e){
                 return $this->error('File upload fail');
                 return $this->error('File upload fail');
             }
             }
         }
         }

@@ -21,7 +21,7 @@ class Visit extends Base
     //连接数据库
     //连接数据库
     protected $connection = 'custom_mysql';
     protected $connection = 'custom_mysql';
     protected $appends = ['device_text'];
     protected $appends = ['device_text'];
-//    protected $fillable = ['id','ip','device_port','country','city','url','referrer_url','depth','domain','updated_date', 'created_at'];
+    protected $fillable = ['id','ip','device_port','country','city','url','referrer_url','depth','domain','updated_date', 'created_at'];
 
 
     const DEVICE_PC = 1;
     const DEVICE_PC = 1;
     const DEVICE_MOBILE = 2;
     const DEVICE_MOBILE = 2;