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

@@ -75,6 +75,10 @@ class Demo extends Command
      */
      */
     public function handle()
     public function handle()
     {
     {
+        $string = 'demo.globalso.site/';
+        $domain_array = parse_url($string);
+        $domain = $domain_array['host'] ?? $domain_array['path'];
+        dd($domain);
         $data = [];
         $data = [];
         dd(isset($data['a']['b']));
         dd(isset($data['a']['b']));
         $url = 'https://demo.globalso.site/';
         $url = 'https://demo.globalso.site/';

@@ -598,6 +598,12 @@ class ProjectController extends BaseController
         })->orderBy('id', 'desc')->paginate($size)->toArray();
         })->orderBy('id', 'desc')->paginate($size)->toArray();
         $list = [];
         $list = [];
         foreach ($data['list'] as $item){
         foreach ($data['list'] as $item){
+            $domain = '';
+            if ($item['deploy_optimize']['domain']) {
+                $domain_pro = DomainInfo::where('id', $item['deploy_optimize']['domain'])->first();
+                $domain_array = parse_url($domain_pro ? $domain_pro->domain : '');
+                $domain = $domain_array['host'] ?? $domain_array['path'];
+            }
             $param = [
             $param = [
                   "id" => $item['id'],
                   "id" => $item['id'],
                   "title" => $item['title'],
                   "title" => $item['title'],
@@ -614,7 +620,7 @@ class ProjectController extends BaseController
                   "plan" => $item['deploy_build']['plan'] ?: 0,
                   "plan" => $item['deploy_build']['plan'] ?: 0,
                   "plan_text" => Project::planMap()[$item['deploy_build']['plan']] ?? '',
                   "plan_text" => Project::planMap()[$item['deploy_build']['plan']] ?? '',
                   "start_date" => $item['deploy_optimize']['start_date'] ?? '',
                   "start_date" => $item['deploy_optimize']['start_date'] ?? '',
-                  "domain" => $item['deploy_optimize']['domain'] ?? '',
+                  "domain" => $domain ? 'https://' . $domain : $domain,
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
                   "test_domain" => $item['deploy_build']['test_domain'] ?? '',
                   "online_time" => $item['online_check']['qa_check_time'] ?? '',
                   "online_time" => $item['online_check']['qa_check_time'] ?? '',
                   "cooperate_date" => $item['cooperate_date'],
                   "cooperate_date" => $item['cooperate_date'],