Merge remote-tracking branch 'origin/master' into akun

@@ -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;

@@ -214,7 +214,7 @@ class RankDataController extends BaseController
             $data = [
             $data = [
                 'position' => 0,
                 'position' => 0,
             ];
             ];
-            $res = HttpUtils::get('http://rank.waimaoq.com/luminati_rank', $param);
+            $res = HttpUtils::get('http://rank.waimaoq.com/luminati_rank', $param, [], 20);
             if ($res) {
             if ($res) {
                 $res = Arr::s2a($res);
                 $res = Arr::s2a($res);
                 $data['position'] = $res['position'] ?? '';
                 $data['position'] = $res['position'] ?? '';

@@ -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()