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

@@ -83,7 +83,7 @@ class DomainInfo extends Command
     public function startUpdateCert()
     public function startUpdateCert()
     {
     {
         $domainModel = new DomainInfoModel();
         $domainModel = new DomainInfoModel();
-        $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
+        $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $list = $domainModel->where('status', '!=', 2)->where(function ($query) use ($end_day) {
         $list = $domainModel->where('status', '!=', 2)->where(function ($query) use ($end_day) {
             $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
             $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
         })->get()->toArray();
         })->get()->toArray();
@@ -111,7 +111,7 @@ class DomainInfo extends Command
     public function startUpdateAmpCert()
     public function startUpdateAmpCert()
     {
     {
         $domainModel = new DomainInfoModel();
         $domainModel = new DomainInfoModel();
-        $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
+        $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $list = $domainModel->where('status', '!=', 2)->where('amp_status', 1)->where(function ($query) use ($end_day) {
         $list = $domainModel->where('status', '!=', 2)->where('amp_status', 1)->where(function ($query) use ($end_day) {
             $query->whereNull('amp_certificate_end_time')->orWhere('amp_certificate_end_time', '<', $end_day);
             $query->whereNull('amp_certificate_end_time')->orWhere('amp_certificate_end_time', '<', $end_day);
         })->get()->toArray();
         })->get()->toArray();
@@ -149,7 +149,7 @@ class DomainInfo extends Command
     public function startUpdateCustomCert()
     public function startUpdateCustomCert()
     {
     {
         $customModel = new CountryCustom();
         $customModel = new CountryCustom();
-        $end_day = date('Y-m-d H:i:s', time() + 2 * 24 * 3600);//2天后到期
+        $end_day = date('Y-m-d H:i:s', time() + 3 * 24 * 3600);//3天后到期
         $list = $customModel->where('status', 1)->where('is_create', 1)->where(function ($query) use ($end_day) {
         $list = $customModel->where('status', 1)->where('is_create', 1)->where(function ($query) use ($end_day) {
             $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
             $query->whereNull('certificate_end_time')->orWhere('certificate_end_time', '<', $end_day);
         })->get()->toArray();
         })->get()->toArray();

@@ -55,7 +55,7 @@ class UpdateRoute extends Command
      */
      */
     public function handle(){
     public function handle(){
         $projectModel = new Project();
         $projectModel = new Project();
-        $list = $projectModel->list(['id'=>951]);
+        $list = $projectModel->list(['id'=>687]);
         $data = [];
         $data = [];
         foreach ($list as $v){
         foreach ($list as $v){
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;
             echo date('Y-m-d H:i:s') . 'project_id:'.$v['id'] . PHP_EOL;

@@ -266,6 +266,8 @@ class ProjectLogic extends BaseLogic
     protected function saveProjectDeployBuild($deploy_build){
     protected function saveProjectDeployBuild($deploy_build){
         $deployBuildModel = new DeployBuild();
         $deployBuildModel = new DeployBuild();
         $deploy_build['configuration'] = Arr::a2s(!empty($deploy_build['configuration']) ? $deploy_build['configuration'] : []);
         $deploy_build['configuration'] = Arr::a2s(!empty($deploy_build['configuration']) ? $deploy_build['configuration'] : []);
+        $deploy_build['main_verify_file'] = $deploy_build['main_verify_file'] ?? '';
+        $deploy_build['amp_verify_file'] = $deploy_build['amp_verify_file'] ?? '';
         $deployBuildModel->edit($deploy_build,['id'=>$deploy_build['id']]);
         $deployBuildModel->edit($deploy_build,['id'=>$deploy_build['id']]);
         return $this->success();
         return $this->success();
     }
     }

@@ -4,6 +4,7 @@ namespace App\Models\Inquiry;
 
 
 use App\Helper\FormGlobalsoApi;
 use App\Helper\FormGlobalsoApi;
 use App\Models\Base;
 use App\Models\Base;
+use App\Utils\LogUtils;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -83,7 +84,10 @@ class InquiryFormData extends Base
                     $data['message'].=  "<br/>" . $k .': ' . $v;
                     $data['message'].=  "<br/>" . $k .': ' . $v;
                 }
                 }
             }
             }
-            !$has_file && (new FormGlobalsoApi())->submitInquiry($ip, $referer, $submit_at, $data);
+            if(!$has_file) {
+                $res = (new FormGlobalsoApi())->submitInquiry($ip, $referer, $submit_at, $data);
+                LogUtils::info('询盘提交', $data, $res?: []);
+            }
         }
         }
         return true;
         return true;
     }
     }

@@ -69,7 +69,8 @@ class SyncSubmitTaskService
         ];
         ];
 
 
         if(Str::contains($referer, $url)){
         if(Str::contains($referer, $url)){
-            $referer = pathinfo($referer,PATHINFO_DIRNAME);
+            $referer = parse_url($referer);
+            $referer = !empty($referer['host']) ? $referer['scheme'] . '://' . $referer['host']  . '/' : $referer['path'];
         }
         }
         return $referer;
         return $referer;
     }
     }