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

@@ -16,6 +16,7 @@ use App\Models\Com\Notify;
 use App\Models\Com\UpdateNotify;
 use App\Models\Com\UpdateNotify;
 use App\Models\Com\UpdateProgress;
 use App\Models\Com\UpdateProgress;
 use App\Models\Devops\ServerConfig;
 use App\Models\Devops\ServerConfig;
+use App\Models\Devops\ServersIp;
 use App\Models\Domain\DomainInfo;
 use App\Models\Domain\DomainInfo;
 use App\Models\Project\Country as CountryModel;
 use App\Models\Project\Country as CountryModel;
 use App\Models\Project\Project;
 use App\Models\Project\Project;
@@ -51,8 +52,14 @@ class CNoticeController extends BaseController
         //获取项目所在服务器
         //获取项目所在服务器
         $project_model = new Project();
         $project_model = new Project();
         $project_info = $project_model->read(['id'=>$project_id],['serve_id']);
         $project_info = $project_model->read(['id'=>$project_id],['serve_id']);
+        if(!$project_info){
+            $this->fail('未查询到项目数据');
+        }
+        $serve_ip_model = new ServersIp();
+        $serve_ip_info = $serve_ip_model->read(['id'=>$project_info['serve_id']],['servers_id']);
+        $servers_id = $serve_ip_info ? $serve_ip_info['servers_id'] : 0;
 
 
-        if($project_info && $project_info['serve_id'] == ServerConfig::SELF_SITE_ID){
+        if($servers_id == ServerConfig::SELF_SITE_ID){
             //自建站服务器：如果项目已经上线，不请求C端接口，数据直接入库
             //自建站服务器：如果项目已经上线，不请求C端接口，数据直接入库
             $domain_model = new DomainInfo();
             $domain_model = new DomainInfo();
             $domain_info = $domain_model->read(['project_id'=>$this->user['project_id']],['domain']);
             $domain_info = $domain_model->read(['project_id'=>$this->user['project_id']],['domain']);

@@ -34,7 +34,7 @@ class ServerConfig extends Base
 
 
     const STATUS_ONE = 1;
     const STATUS_ONE = 1;
 
 
-    const SELF_SITE_ID = 8;//自建站服务器ID
+    const SELF_SITE_ID = 6;//自建站服务器ID
 
 
     /**
     /**
      * @remark :获取数据用户名解密
      * @remark :获取数据用户名解密

@@ -133,6 +133,9 @@ class SyncSubmitTaskService
         $visit_data['updated_date'] = $data['submit_at']->toDateString();
         $visit_data['updated_date'] = $data['submit_at']->toDateString();
         $visit_data['created_at'] = $data['submit_at'];
         $visit_data['created_at'] = $data['submit_at'];
         $visit_data['user_agent'] = $data['user_agent'];
         $visit_data['user_agent'] = $data['user_agent'];
+        if(!empty($data['is_cf'])){
+            $visit_data['is_inquiry'] = 1;
+        }
         Visit::saveData($visit_data, $date);
         Visit::saveData($visit_data, $date);
 
 
         return true;
         return true;