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

@@ -606,8 +606,8 @@ class Temp extends Command
      */
      */
     public function change_cname_projects()
     public function change_cname_projects()
     {
     {
-        $origin_server_id = 20;//原服务器
-        $target_server_id = 27;//目标服务器
+        $origin_server_id = 2;//原服务器
+        $target_server_id = 12;//目标服务器
 
 
         $server_ip_model = new ServersIp();
         $server_ip_model = new ServersIp();
 
 

@@ -82,6 +82,7 @@ class FetchTicketProjects extends Command
                     'website' => $item['main_url'] ?? '',
                     'website' => $item['main_url'] ?? '',
                     'test_website' => $item['test_url'] ?? '',
                     'test_website' => $item['test_url'] ?? '',
                     'is_del' => 0,
                     'is_del' => 0,
+                    'plan' => $item['plan'] ?? '',
                 ];
                 ];
                 if (!$project) {
                 if (!$project) {
                     $new = new TicketProject();
                     $new = new TicketProject();
@@ -174,12 +175,13 @@ class FetchTicketProjects extends Command
                         'is_del' => $is_del,
                         'is_del' => $is_del,
                         'website' => !empty($item->domainInfo->domain) ? 'https://'.$item->domainInfo->domain : '',
                         'website' => !empty($item->domainInfo->domain) ? 'https://'.$item->domainInfo->domain : '',
                         'test_website' => $item->deploy_build->test_domain ?? '',
                         'test_website' => $item->deploy_build->test_domain ?? '',
+                        'version' => $item->version,
+                        'plan' => $item->planMap()[$item->deploy_build->plan] ?? '',
                     ];
                     ];
                     if (!$project) {
                     if (!$project) {
                         $project = new TicketProject();
                         $project = new TicketProject();
                         $project->uuid = $uuid;
                         $project->uuid = $uuid;
                         $project->post_id = $item->post_id;
                         $project->post_id = $item->post_id;
-                        $project->version = 6;
                         $project->table_id = $item->id;
                         $project->table_id = $item->id;
                         foreach ($fields as $k => $v) {
                         foreach ($fields as $k => $v) {
                             $project->$k = $v;
                             $project->$k = $v;

@@ -13,9 +13,9 @@ class AutoPullNotify extends Base
         return [
         return [
             1 => '硅谷云服务器',
             1 => '硅谷云服务器',
             25 => '硅谷建站服务器02',
             25 => '硅谷建站服务器02',
-            15 => '硅谷IDC服务器01(6.0美服1)',
-            14 => '硅谷IDC服务器02(6.0美服2)',
-            21 => '硅谷IDC服务器03(6.0美服3)',
+            15 => '硅谷IDC服务器01',
+            14 => '硅谷IDC服务器02',
+            21 => '硅谷IDC服务器03',
             2 => '俄罗斯服务器',
             2 => '俄罗斯服务器',
             12 => '俄罗斯IDC服务器01',
             12 => '俄罗斯IDC服务器01',
             4 => '阿里云深圳服务器',
             4 => '阿里云深圳服务器',
@@ -27,6 +27,7 @@ class AutoPullNotify extends Base
             23 => '西班牙服务器',
             23 => '西班牙服务器',
             6 => '自建站服务器群',
             6 => '自建站服务器群',
             27 => '硅谷建站服务器01',
             27 => '硅谷建站服务器01',
+            29 => '硅谷IDC服务器04',
         ];
         ];
     }
     }
 
 

@@ -20,7 +20,7 @@ class TicketLog extends Base
     public function engineer()
     public function engineer()
     {
     {
         return $this->belongsTo(Manage::class, 'engineer_id', 'id')
         return $this->belongsTo(Manage::class, 'engineer_id', 'id')
-            ->select(['id', 'name']);
+            ->select(['id', 'name', 'mobile']);
     }
     }
 
 
     public function ticket()
     public function ticket()