blackteay/ApiAdmin
1
0
Fork 0
mirror of https://gitee.com/apiadmin/ApiAdmin.git synced 2025-04-06 03:58:00 +08:00
Code Issues Projects Releases Wiki Activity

!5 修复特殊Header不识别

Browse Source 
Merge pull request !5 from kingj/master
This commit is contained in:
kingj 2018-02-28 17:14:44 +08:00 committed by Zhao
commit be1162986e
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/admin/behavior/ApiAuth.php
View File

@ -23,16 +23,16 @@ class ApiAuth {
public function run() {
$request = Request::instance();
$header = config('apiAdmin.CROSS_DOMAIN');
$userToken = $request->header('Authorization', '');
$userToken = $request->header('ApiAuth', '');
if ($userToken) {
$userInfo = cache($userToken);
$userInfo = json_decode($userInfo, true);
if (!$userInfo || !isset($userInfo['id'])) {
$data = ['code' => ReturnCode::AUTH_ERROR, 'msg' => 'Authorization不匹配', 'data' => []];
$data = ['code' => ReturnCode::AUTH_ERROR, 'msg' => 'ApiAuth不匹配', 'data' => []];
return json($data, 200, $header);
}
} else {
$data = ['code' => ReturnCode::AUTH_ERROR, 'msg' => '缺少Authorization', 'data' => []];
$data = ['code' => ReturnCode::AUTH_ERROR, 'msg' => '缺少ApiAuth', 'data' => []];
return json($data, 200, $header);
}
}

2
application/admin/behavior/ApiPermission.php
View File

@ -29,7 +29,7 @@ class ApiPermission {
$request = Request::instance();
$route = $request->routeInfo();
$header = config('apiAdmin.CROSS_DOMAIN');
$userToken = $request->header('Authorization', '');
$userToken = $request->header('ApiAuth', '');
$userInfo = cache($userToken);
$userInfo = json_decode($userInfo, true);
if (!$this->checkAuth($userInfo['id'], $route['route'])) {

2
application/extra/apiAdmin.php
View File

@ -29,7 +29,7 @@ return [
'CROSS_DOMAIN' => [
'Access-Control-Allow-Origin' => '*',
'Access-Control-Allow-Methods' => 'POST,PUT,GET,DELETE',
'Access-Control-Allow-Headers' => 'Authorization, User-Agent, Keep-Alive, Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With',
'Access-Control-Allow-Headers' => 'ApiAuth, User-Agent, Keep-Alive, Origin, No-Cache, X-Requested-With, If-Modified-Since, Pragma, Last-Modified, Cache-Control, Expires, Content-Type, X-E4M-With',
'Access-Control-Allow-Credentials' => 'true'
],