周海龙 / globalso · 提交

转到一个项目

作者 周海龙
提交 81ae7b281cc5149a9a23f5d361fa6b2c6a8f35a1 2 个父辈 fb7b0d66 4a2c5ef9

合并分支 'zhl' 到 'master' 

Zhl



查看合并请求 !21
内嵌 并排对比
正在显示 2 个修改的文件 包含 11 行增加 和 1 行删除
@@ -75,6 +75,10 @@ class Demo extends Command @@ -75,6 +75,10 @@ class Demo extends Command
75 */ 75 */
76 public function handle() 76 public function handle()
77 { 77 {
  78 + $string = 'demo.globalso.site/';
  79 + $domain_array = parse_url($string);
  80 + $domain = $domain_array['host'] ?? $domain_array['path'];
  81 + dd($domain);
78 $data = []; 82 $data = [];
79 dd(isset($data['a']['b'])); 83 dd(isset($data['a']['b']));
80 $url = 'https://demo.globalso.site/'; 84 $url = 'https://demo.globalso.site/';
@@ -598,6 +598,12 @@ class ProjectController extends BaseController @@ -598,6 +598,12 @@ class ProjectController extends BaseController
598 })->orderBy('id', 'desc')->paginate($size)->toArray(); 598 })->orderBy('id', 'desc')->paginate($size)->toArray();
599 $list = []; 599 $list = [];
600 foreach ($data['list'] as $item){ 600 foreach ($data['list'] as $item){
  601 + $domain = '';
  602 + if ($item['deploy_optimize']['domain']) {
  603 + $domain_pro = DomainInfo::where('id', $item['deploy_optimize']['domain'])->first();
  604 + $domain_array = parse_url($domain_pro ? $domain_pro->domain : '');
  605 + $domain = $domain_array['host'] ?? $domain_array['path'];
  606 + }
601 $param = [ 607 $param = [
602 "id" => $item['id'], 608 "id" => $item['id'],
603 "title" => $item['title'], 609 "title" => $item['title'],
@@ -614,7 +620,7 @@ class ProjectController extends BaseController @@ -614,7 +620,7 @@ class ProjectController extends BaseController
614 "plan" => $item['deploy_build']['plan'] ?: 0, 620 "plan" => $item['deploy_build']['plan'] ?: 0,
615 "plan_text" => Project::planMap()[$item['deploy_build']['plan']] ?? '', 621 "plan_text" => Project::planMap()[$item['deploy_build']['plan']] ?? '',
616 "start_date" => $item['deploy_optimize']['start_date'] ?? '', 622 "start_date" => $item['deploy_optimize']['start_date'] ?? '',
617 - "domain" => $item['deploy_optimize']['domain'] ?? '', 623 + "domain" => $domain ? 'https://' . $domain : $domain,
618 "test_domain" => $item['deploy_build']['test_domain'] ?? '', 624 "test_domain" => $item['deploy_build']['test_domain'] ?? '',
619 "online_time" => $item['online_check']['qa_check_time'] ?? '', 625 "online_time" => $item['online_check']['qa_check_time'] ?? '',
620 "cooperate_date" => $item['cooperate_date'], 626 "cooperate_date" => $item['cooperate_date'],