周海龙 / globalso · 提交

转到一个项目

作者 lyh
提交 8abd00ccea97f2512add93397f8cd9734cc1074a 1 个父辈 592b76d0

gx

内嵌 并排对比
正在显示 7 个修改的文件 包含 16 行增加 和 13 行删除
@@ -9,6 +9,7 @@ use App\Helper\QuanqiusouApi; @@ -9,6 +9,7 @@ use App\Helper\QuanqiusouApi;
9 use App\Http\Controllers\Bside\BaseController; 9 use App\Http\Controllers\Bside\BaseController;
10 use App\Http\Logic\Aside\Project\ProjectLogic; 10 use App\Http\Logic\Aside\Project\ProjectLogic;
11 use App\Http\Logic\Bside\RankData\RankDataLogic; 11 use App\Http\Logic\Bside\RankData\RankDataLogic;
  12 +use App\Models\Domain\DomainInfo;
12 use App\Models\RankData\RankData; 13 use App\Models\RankData\RankData;
13 use App\Models\RankData\Speed as GoogleSpeedModel; 14 use App\Models\RankData\Speed as GoogleSpeedModel;
14 use App\Services\BatchExportService; 15 use App\Services\BatchExportService;
@@ -58,7 +59,7 @@ class RankDataController extends BaseController @@ -58,7 +59,7 @@ class RankDataController extends BaseController
58 public function speed(ProjectLogic $projectLogic, GoogleSpeedApi $googleSpeedApi){ 59 public function speed(ProjectLogic $projectLogic, GoogleSpeedApi $googleSpeedApi){
59 $project_id = $this->user['project_id']; 60 $project_id = $this->user['project_id'];
60 $project = $projectLogic->getProjectInfo($project_id); 61 $project = $projectLogic->getProjectInfo($project_id);
61 - $domain = $project['deploy_optimize']['domain'] ?? ''; 62 + $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
62 $data = $googleSpeedApi->run($domain); 63 $data = $googleSpeedApi->run($domain);
63 if($data){ 64 if($data){
64 $model = GoogleSpeedModel::where('project_id', $project_id)->first(); 65 $model = GoogleSpeedModel::where('project_id', $project_id)->first();
@@ -19,7 +19,7 @@ class DomainInfoLogic extends BaseLogic @@ -19,7 +19,7 @@ class DomainInfoLogic extends BaseLogic
19 public function getDomainInfo($project_id) 19 public function getDomainInfo($project_id)
20 { 20 {
21 $project = app(ProjectLogic::class)->getInfo($project_id); 21 $project = app(ProjectLogic::class)->getInfo($project_id);
22 - $domain = $project['deploy_optimize']['domain'] ?? ''; 22 + $domain = (!empty($project['deploy_optimize']['domain']) ? ((new \App\Models\Domain\DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
23 $info = $this->model->where('project_id', $project_id)->first(); 23 $info = $this->model->where('project_id', $project_id)->first();
24 //不存在或时间过期了 重新获取信息 24 //不存在或时间过期了 重新获取信息
25 $expiration_date = $info['domain_info']['expiration_date'] ?? ''; 25 $expiration_date = $info['domain_info']['expiration_date'] ?? '';
@@ -4,6 +4,7 @@ namespace App\Http\Logic\Aside\Project; @@ -4,6 +4,7 @@ namespace App\Http\Logic\Aside\Project;
4 4
5 5
6 use App\Http\Logic\Aside\BaseLogic; 6 use App\Http\Logic\Aside\BaseLogic;
  7 +use App\Models\Domain\DomainInfo;
7 use App\Models\Project\ProcessRecords; 8 use App\Models\Project\ProcessRecords;
8 use App\Models\Project\Project; 9 use App\Models\Project\Project;
9 10
@@ -30,7 +31,7 @@ class ProcessRecordsLogic extends BaseLogic @@ -30,7 +31,7 @@ class ProcessRecordsLogic extends BaseLogic
30 $data['project_company'] = $project['company'] ?? ''; 31 $data['project_company'] = $project['company'] ?? '';
31 $data['project_plan'] = Project::planMap()[$project['deploy_build']['plan']]; 32 $data['project_plan'] = Project::planMap()[$project['deploy_build']['plan']];
32 $data['project_service_duration'] = $project['deploy_build']['service_duration'] ?? ''; 33 $data['project_service_duration'] = $project['deploy_build']['service_duration'] ?? '';
33 - $data['domain'] = $project['deploy_optimize']['domain'] ?? ''; 34 + $data['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');;
34 $data['test_domain'] = $project['deploy_build']['test_domain'] ?? ''; 35 $data['test_domain'] = $project['deploy_build']['test_domain'] ?? '';
35 $data['login_mobile'] = $project['deploy_build']['login_mobile'] ?? ''; 36 $data['login_mobile'] = $project['deploy_build']['login_mobile'] ?? '';
36 $data['data_source'] = [ 37 $data['data_source'] = [
@@ -408,7 +408,7 @@ class ProjectLogic extends BaseLogic @@ -408,7 +408,7 @@ class ProjectLogic extends BaseLogic
408 { 408 {
409 $project = $this->getCacheInfo($param['project_id']); 409 $project = $this->getCacheInfo($param['project_id']);
410 //同步到接口 410 //同步到接口
411 - $domain = parse_url($project['deploy_optimize']['domain'])['host']; 411 + $domain = parse_url((!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ''))['host'];
412 $emails = Arr::arrToSet($param['emails']??'', 'trim'); 412 $emails = Arr::arrToSet($param['emails']??'', 'trim');
413 $phones = Arr::arrToSet($param['phones']??'', 'trim'); 413 $phones = Arr::arrToSet($param['phones']??'', 'trim');
414 $form_global_api = new FormGlobalsoApi(); 414 $form_global_api = new FormGlobalsoApi();
@@ -7,6 +7,7 @@ use App\Helper\FormGlobalsoApi; @@ -7,6 +7,7 @@ use App\Helper\FormGlobalsoApi;
7 use App\Helper\Translate; 7 use App\Helper\Translate;
8 use App\Http\Logic\Aside\Project\ProjectLogic; 8 use App\Http\Logic\Aside\Project\ProjectLogic;
9 use App\Http\Logic\Bside\BaseLogic; 9 use App\Http\Logic\Bside\BaseLogic;
  10 +use App\Models\Domain\DomainInfo;
10 11
11 /** 12 /**
12 * Class InquiryLogic 13 * Class InquiryLogic
@@ -31,7 +32,8 @@ class InquiryLogic extends BaseLogic @@ -31,7 +32,8 @@ class InquiryLogic extends BaseLogic
31 $search = $this->request['search'] ?: ''; 32 $search = $this->request['search'] ?: '';
32 $page = $this->request['page'] ?: 1; 33 $page = $this->request['page'] ?: 1;
33 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']); 34 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
34 - $domain = $project['deploy_optimize']['domain'] ?? ''; 35 + $domain = (!empty(
  36 + $project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
35 $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size); 37 $list = $this->form_globalso_api->getInquiryList($domain, $search, $page, $page_size);
36 //处理格式 免得前端又改 38 //处理格式 免得前端又改
37 $data = [ 39 $data = [
@@ -54,7 +56,7 @@ class InquiryLogic extends BaseLogic @@ -54,7 +56,7 @@ class InquiryLogic extends BaseLogic
54 public function getInfo($id) 56 public function getInfo($id)
55 { 57 {
56 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']); 58 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
57 - $domain = $project['deploy_optimize']['domain'] ?: ''; 59 + $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
58 //修改状态为已读 60 //修改状态为已读
59 if($this->request['read_status']){ 61 if($this->request['read_status']){
60 $this->form_globalso_api->saveInquiryRead($domain, $id); 62 $this->form_globalso_api->saveInquiryRead($domain, $id);
@@ -70,7 +72,7 @@ class InquiryLogic extends BaseLogic @@ -70,7 +72,7 @@ class InquiryLogic extends BaseLogic
70 public function delete($ids, $map = []) 72 public function delete($ids, $map = [])
71 { 73 {
72 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']); 74 $project = (new ProjectLogic())->getProjectInfo($this->user['project_id']);
73 - $domain = $project['deploy_optimize']['domain'] ?: ''; 75 + $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
74 $ids = array_filter(Arr::splitFilterToArray($ids), 'intval'); 76 $ids = array_filter(Arr::splitFilterToArray($ids), 'intval');
75 if(!$ids){ 77 if(!$ids){
76 $this->fail('ID不能为空'); 78 $this->fail('ID不能为空');
@@ -9,6 +9,7 @@ use App\Helper\Translate; @@ -9,6 +9,7 @@ use App\Helper\Translate;
9 use App\Http\Logic\Aside\Project\DomainInfoLogic; 9 use App\Http\Logic\Aside\Project\DomainInfoLogic;
10 use App\Http\Logic\Aside\Project\ProjectLogic; 10 use App\Http\Logic\Aside\Project\ProjectLogic;
11 use App\Http\Logic\Bside\BaseLogic; 11 use App\Http\Logic\Bside\BaseLogic;
  12 +use App\Models\Domain\DomainInfo;
12 use App\Models\Project\DeployBuild; 13 use App\Models\Project\DeployBuild;
13 use App\Models\Project\DeployOptimize; 14 use App\Models\Project\DeployOptimize;
14 use App\Models\Project\Project; 15 use App\Models\Project\Project;
@@ -59,7 +60,7 @@ class RankDataLogic extends BaseLogic @@ -59,7 +60,7 @@ class RankDataLogic extends BaseLogic
59 //项目信息 60 //项目信息
60 $data['project'] = [ 61 $data['project'] = [
61 'company' => $project['company'], 62 'company' => $project['company'],
62 - 'domain' => $project['deploy_optimize']['domain'] ?? '', 63 + 'domain' => (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ''),
63 'domain_info' => ($domain_info['domain_info']['creation_date'] ?? '') . ' - ' . ($domain_info['domain_info']['expiration_date'] ?? ''), 64 'domain_info' => ($domain_info['domain_info']['creation_date'] ?? '') . ' - ' . ($domain_info['domain_info']['expiration_date'] ?? ''),
64 'cert_info' => ($domain_info['ssl']['start_time'] ?? '') . ' - ' . ($domain_info['ssl']['end_time'] ?? ''), 65 'cert_info' => ($domain_info['ssl']['start_time'] ?? '') . ' - ' . ($domain_info['ssl']['end_time'] ?? ''),
65 'plan' => Project::planMap()[$project['deploy_build']['plan']], 66 'plan' => Project::planMap()[$project['deploy_build']['plan']],
@@ -144,7 +145,7 @@ class RankDataLogic extends BaseLogic @@ -144,7 +145,7 @@ class RankDataLogic extends BaseLogic
144 $project_id = $this->user['project_id']; 145 $project_id = $this->user['project_id'];
145 $project = app(ProjectLogic::class)->getInfo($project_id); 146 $project = app(ProjectLogic::class)->getInfo($project_id);
146 $api_no = $project['deploy_optimize']['api_no'] ?? ''; 147 $api_no = $project['deploy_optimize']['api_no'] ?? '';
147 - $domain = $project['deploy_optimize']['domain'] ?? ''; 148 + $domain = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : '');
148 $domain_arr = parse_url($domain); 149 $domain_arr = parse_url($domain);
149 $domain = $domain_arr['host'] ?? $domain_arr['path']; 150 $domain = $domain_arr['host'] ?? $domain_arr['path'];
150 //复制站点域名 151 //复制站点域名
@@ -164,8 +164,7 @@ class UserLoginLogic @@ -164,8 +164,7 @@ class UserLoginLogic
164 $info['aicc'] = $project['aicc'] ?? ''; 164 $info['aicc'] = $project['aicc'] ?? '';
165 $info['hagro'] = $project['hagro'] ?? ''; 165 $info['hagro'] = $project['hagro'] ?? '';
166 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 166 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
167 - $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?  
168 - ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 167 + $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
169 //保存项目缓存 168 //保存项目缓存
170 Cache::put('user-'.$info['project_id'],$project,$minutes = null); 169 Cache::put('user-'.$info['project_id'],$project,$minutes = null);
171 return $this->success($info); 170 return $this->success($info);
@@ -188,8 +187,7 @@ class UserLoginLogic @@ -188,8 +187,7 @@ class UserLoginLogic
188 $info['aicc'] = $project['aicc'] ?? ''; 187 $info['aicc'] = $project['aicc'] ?? '';
189 $info['hagro'] = $project['hagro'] ?? ''; 188 $info['hagro'] = $project['hagro'] ?? '';
190 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']]; 189 $info['plan'] = Project::planMap()[$project['deploy_build']['plan']];
191 - $info['domain'] = (!empty($project['deploy_optimize']['domain']) ?  
192 - ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? '')); 190 + $info['domain'] = (!empty($project['deploy_optimize']['domain']) ? ((new DomainInfo())->getDomain($project['deploy_optimize']['domain'])) : ($project['deploy_build']['test_domain'] ?? ''));
193 //保存项目缓存 191 //保存项目缓存
194 Cache::put('user-'.$info['project_id'],$project,$minutes = null); 192 Cache::put('user-'.$info['project_id'],$project,$minutes = null);
195 return $this->success($info); 193 return $this->success($info);