gx

@@ -9,6 +9,7 @@ use App\Helper\QuanqiusouApi;
 use App\Http\Controllers\Bside\BaseController;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Bside\RankData\RankDataLogic;
+use App\Models\Domain\DomainInfo;
 use App\Models\RankData\RankData;
 use App\Models\RankData\Speed as GoogleSpeedModel;
 use App\Services\BatchExportService;
@@ -58,7 +59,7 @@ class RankDataController extends BaseController
     public function speed(ProjectLogic $projectLogic, GoogleSpeedApi $googleSpeedApi){
         $project_id = $this->user['project_id'];
         $project = $projectLogic->getProjectInfo($project_id);
-        $domain = $project['deploy_optimize']['domain'] ?? '';
+        $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $data = $googleSpeedApi->run($domain);
         if($data){
             $model = GoogleSpeedModel::where('project_id', $project_id)->first();

@@ -19,7 +19,7 @@ class DomainInfoLogic extends BaseLogic
     public function getDomainInfo($project_id)
     {
         $project = app(ProjectLogic::class)->getInfo($project_id);
-        $domain = $project['deploy_optimize']['domain'] ?? '';
+        $domain = (!empty($project['deploy_optimize']['domain']) ? ((new \App\Models\Domain\DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $info = $this->model->where('project_id', $project_id)->first();
         //不存在或时间过期了 重新获取信息
         $expiration_date = $info['domain_info']['expiration_date'] ?? '';

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Aside\Project;
 
 
 use App\Http\Logic\Aside\BaseLogic;
+use App\Models\Domain\DomainInfo;
 use App\Models\Project\ProcessRecords;
 use App\Models\Project\Project;
 
@@ -30,7 +31,7 @@ class ProcessRecordsLogic extends BaseLogic
         $data['project_company'] = $project['company'] ?? '';
         $data['project_plan'] = Project::planMap()[$project['deploy_build']['plan']];
         $data['project_service_duration'] = $project['deploy_build']['service_duration'] ?? '';
-        $data['domain'] = $project['deploy_optimize']['domain'] ?? '';
+        $data['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');;
         $data['test_domain'] = $project['deploy_build']['test_domain'] ?? '';
         $data['login_mobile'] = $project['deploy_build']['login_mobile'] ?? '';
         $data['data_source'] = [

@@ -408,7 +408,7 @@ class ProjectLogic extends BaseLogic
     {
         $project = $this->getCacheInfo($param['project_id']);
         //同步到接口
-        $domain = parse_url($project['deploy_optimize']['domain'])['host'];
+        $domain = parse_url((!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  ''))['host'];
         $emails = Arr::arrToSet($param['emails']??'', 'trim');
         $phones = Arr::arrToSet($param['phones']??'', 'trim');
         $form_global_api  = new FormGlobalsoApi();

@@ -7,6 +7,7 @@ use App\Helper\FormGlobalsoApi;
 use App\Helper\Translate;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Domain\DomainInfo;
 
 /**
  * Class InquiryLogic
@@ -31,7 +32,8 @@ class InquiryLogic extends BaseLogic
         $search = $this->request['search'] ?: '';
         $page = $this->request['page'] ?: 1;
         $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
-        $domain = $project['deploy_optimize']['domain'] ?? '';
+        $domain = (!empty(
+            $project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size);
         //处理格式 免得前端又改
         $data = [
@@ -54,7 +56,7 @@ class InquiryLogic extends BaseLogic
     public function getInfo($id)
     {
         $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
-        $domain = $project['deploy_optimize']['domain'] ?: '';
+        $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         //修改状态为已读
         if($this->request['read_status']){
             $this->form_globalso_api->saveInquiryRead($domain, $id);
@@ -70,7 +72,7 @@ class InquiryLogic extends BaseLogic
     public function delete($ids, $map = [])
     {
         $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
-        $domain = $project['deploy_optimize']['domain'] ?: '';
+        $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $ids = array_filter(Arr::splitFilterToArray($ids), 'intval');
         if(!$ids){
             $this->fail('ID不能为空');

@@ -9,6 +9,7 @@ use App\Helper\Translate;
 use App\Http\Logic\Aside\Project\DomainInfoLogic;
 use App\Http\Logic\Aside\Project\ProjectLogic;
 use App\Http\Logic\Bside\BaseLogic;
+use App\Models\Domain\DomainInfo;
 use App\Models\Project\DeployBuild;
 use App\Models\Project\DeployOptimize;
 use App\Models\Project\Project;
@@ -59,7 +60,7 @@ class RankDataLogic extends BaseLogic
         //项目信息
         $data['project'] = [
             'company' => $project['company'],
-            'domain' => $project['deploy_optimize']['domain'] ?? '',
+            'domain' =>  (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  ''),
             'domain_info' => ($domain_info['domain_info']['creation_date'] ?? '') . ' - ' . ($domain_info['domain_info']['expiration_date'] ?? ''),
             'cert_info' => ($domain_info['ssl']['start_time'] ?? '') . ' - ' . ($domain_info['ssl']['end_time'] ?? ''),
             'plan' => Project::planMap()[$project['deploy_build']['plan']],
@@ -144,7 +145,7 @@ class RankDataLogic extends BaseLogic
         $project_id = $this->user['project_id'];
         $project = app(ProjectLogic::class)->getInfo($project_id);
         $api_no = $project['deploy_optimize']['api_no'] ?? '';
-        $domain = $project['deploy_optimize']['domain'] ?? '';
+        $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) :  '');
         $domain_arr = parse_url($domain);
         $domain = $domain_arr['host'] ?? $domain_arr['path'];
         //复制站点域名

@@ -164,8 +164,7 @@ class UserLoginLogic
         $info['aicc'] = $project['aicc'] ?? '';
         $info['hagro'] = $project['hagro'] ?? '';
         $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
-        $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
-            ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
+        $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
         //保存项目缓存
         Cache::put('user-'.$info['project_id'],$project,$minutes = null);
         return $this->success($info);
@@ -188,8 +187,7 @@ class UserLoginLogic
         $info['aicc'] = $project['aicc'] ?? '';
         $info['hagro'] = $project['hagro'] ?? '';
         $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
-        $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?
-            ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
+        $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
         //保存项目缓存
         Cache::put('user-'.$info['project_id'],$project,$minutes = null);
         return $this->success($info);