合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !3085

@@ -108,13 +108,16 @@ class GeoController extends BaseController
         $token = trim($this->param['token']);
         $token = trim($this->param['token']);
         $data = GeoConfirm::where(['uniqid' => $token])->first();
         $data = GeoConfirm::where(['uniqid' => $token])->first();
         if (empty($data)){
         if (empty($data)){
-            return $this->error('当前授权已失效');
+            return $this->error('确认链接已重置，请查看最新推送链接！');
         }
         }
         $content = explode("\n", $data->content);
         $content = explode("\n", $data->content);
         $confirm = explode("\n", $data->confirm);
         $confirm = explode("\n", $data->confirm);
         $type = $data->type;
         $type = $data->type;
         $status = $data->status;
         $status = $data->status;
-        $result = compact('content', 'confirm', 'type', 'status');
+        $projectModel = new Project();
+        $projectInfo = $projectModel->read(['id' => $data->project_id],['title','version']);
+        $project_title = $projectInfo['title'] ?? '';
+        $result = compact('content', 'confirm', 'type', 'status', 'project_title');
         $this->response('success',Code::SUCCESS,$result);
         $this->response('success',Code::SUCCESS,$result);
     }
     }