作者 刘锟

合并分支 'akun' 到 'master'

Akun



查看合并请求 !573
@@ -20,6 +20,8 @@ class SelfSiteController extends BaseController @@ -20,6 +20,8 @@ class SelfSiteController extends BaseController
20 public function selfSiteApi(Request $request) 20 public function selfSiteApi(Request $request)
21 { 21 {
22 $token = $request->header('token');//token 22 $token = $request->header('token');//token
  23 + $pid = $request->header('pid');//项目id
  24 +
23 $data = $request->input('data');//访问数据 25 $data = $request->input('data');//访问数据
24 $domain = $request->input('domain');//访问域名 26 $domain = $request->input('domain');//访问域名
25 $ip = $request->input('ip');//访问ip 27 $ip = $request->input('ip');//访问ip
@@ -29,7 +31,7 @@ class SelfSiteController extends BaseController @@ -29,7 +31,7 @@ class SelfSiteController extends BaseController
29 $traffic = $request->input('traffic', SyncSubmitTask::TRAFFIC_DEFAULT);//是否引流 31 $traffic = $request->input('traffic', SyncSubmitTask::TRAFFIC_DEFAULT);//是否引流
30 $files = $request->input('files', []);//文件 32 $files = $request->input('files', []);//文件
31 33
32 - if (empty($token)) { 34 + if (empty($token) || empty($pid)) {
33 return $this->error('token无效', 401); 35 return $this->error('token无效', 401);
34 } 36 }
35 37
@@ -43,7 +45,7 @@ class SelfSiteController extends BaseController @@ -43,7 +45,7 @@ class SelfSiteController extends BaseController
43 45
44 //判断token是否有效 46 //判断token是否有效
45 $project_model = new Project(); 47 $project_model = new Project();
46 - $project_info = $project_model->read(['site_token' => $token], ['id']); 48 + $project_info = $project_model->read(['id' => $pid, 'site_token' => $token]);
47 if (!$project_info) { 49 if (!$project_info) {
48 return $this->error('token无效', 401); 50 return $this->error('token无效', 401);
49 } 51 }