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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
zhaoxiang 2018-07-19 13:40:39 +08:00
commit 26bdb0f350
5 changed files with 55 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/admin/controller/Auth.php
View File

@ -80,6 +80,7 @@ class Auth extends Base {
$rules = [];
if ($groupId) {
$rules = (new AdminAuthRule())->where(['groupId' => $groupId])->select();
$rules = Tools::buildArrFromObj($rules);
$rules = array_column($rules, 'url');
}
$newList = $this->buildList($list, $rules);

72
application/adminRoute.php
View File

@ -8,30 +8,35 @@ $afterBehavior = [
'\app\admin\behavior\AdminLog'
];
//一些带有特殊参数的路由写到这里
Route::rule([
'admin/Login/index' => [
'admin/Login/index',
['method' => 'post']
],
'admin/Index/upload' => [
'admin/Index/upload',
[
'method' => 'post', 'after_behavior' => ['\app\admin\behavior\ApiAuth', '\app\admin\behavior\AdminLog']
Route::group('admin', function () use ($afterBehavior) {
//一些带有特殊参数的路由写到这里
Route::rule([
'Login/index' => [
'admin/Login/index',
['method' => 'post']
],
'Index/upload' => [
'admin/Index/upload',
[
'method' => 'post',
'after_behavior' => [
'\app\admin\behavior\ApiAuth',
'\app\admin\behavior\AdminLog'
]
]
],
'Login/logout' => [
'admin/Login/logout',
[
'method' => 'get',
'after_behavior' => [
'\app\admin\behavior\ApiAuth',
'\app\admin\behavior\AdminLog'
]
]
]
],
'admin/Login/logout' => [
'admin/Login/logout',
[
'method' => 'get', 'after_behavior' => ['\app\admin\behavior\ApiAuth', '\app\admin\behavior\AdminLog']
]
]
]);
//大部分控制器的路由都以分组的形式写到这里
Route::group('admin', function() {
]);
//大部分控制器的路由都以分组的形式写到这里
Route::group('Menu', [
'index' => [
'admin/Menu/index',
@ -53,7 +58,7 @@ Route::group('admin', function() {
'admin/Menu/del',
['method' => 'get']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::group('User', [
'index' => [
'admin/User/index',
@ -83,7 +88,7 @@ Route::group('admin', function() {
'admin/User/del',
['method' => 'get']
],
]);
], ['after_behavior' => $afterBehavior]);
Route::group('Auth', [
'index' => [
'admin/Auth/index',
@ -117,7 +122,7 @@ Route::group('admin', function() {
'admin/Auth/getRuleList',
['method' => 'get']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::group('App', [
'index' => [
'admin/App/index',
@ -147,7 +152,7 @@ Route::group('admin', function() {
'admin/App/del',
['method' => 'get']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::group('InterfaceList', [
'index' => [
'admin/InterfaceList/index',
@ -177,7 +182,7 @@ Route::group('admin', function() {
'admin/InterfaceList/getHash',
['method' => 'get']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::group('Fields', [
'index' => [
'admin/Fields/index',
@ -207,7 +212,7 @@ Route::group('admin', function() {
'admin/Fields/upload',
['method' => 'post']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::group('InterfaceGroup', [
'index' => [
'admin/InterfaceGroup/index',
@ -233,7 +238,7 @@ Route::group('admin', function() {
'admin/InterfaceGroup/del',
['method' => 'get']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::group('AppGroup', [
'index' => [
'admin/AppGroup/index',
@ -259,7 +264,7 @@ Route::group('admin', function() {
'admin/AppGroup/del',
['method' => 'get']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::group('Log', [
'index' => [
'admin/Log/index',
@ -269,7 +274,6 @@ Route::group('admin', function() {
'admin/Log/del',
['method' => 'get']
]
]);
], ['after_behavior' => $afterBehavior]);
Route::miss('admin/Miss/index');
}, ['after_behavior' => $afterBehavior]
);
});

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

@ -33,7 +33,7 @@ class ApiPermission {
$appInfo = cache('AccessToken:' . $access_token);
$allRules = explode(',', $appInfo['app_api']);
if (!in_array($hash, $allRules)) {
$data = ['code' => ReturnCode::INVALID, 'msg' => '非常抱歉，您没有权限怎么做！', 'data' => []];
$data = ['code' => ReturnCode::INVALID, 'msg' => '非常抱歉，您没有权限这么做！', 'data' => []];
return json($data);
}

7
application/apiRoute.php
View File

@ -2,7 +2,12 @@
/**
* Api路由
*/
use think\Route;
Route::miss('api/Index/index');
$afterBehavior = ['\app\api\behavior\ApiAuth', '\app\api\behavior\ApiPermission', '\app\api\behavior\RequestFilter'];
$afterBehavior = [
'\app\api\behavior\ApiAuth',
'\app\api\behavior\ApiPermission',
'\app\api\behavior\RequestFilter'
];

11
data/apiRoute.tpl
View File

@ -2,7 +2,14 @@
/**
* Api路由
*/
use think\Route;
Route::miss('api/Index/index');
$afterBehavior = ['\app\api\behavior\ApiAuth', '\app\api\behavior\ApiPermission', '\app\api\behavior\RequestFilter'];
Route::group('api', function () {
Route::miss('api/Index/index');
});
$afterBehavior = [
'\app\api\behavior\ApiAuth',
'\app\api\behavior\ApiPermission',
'\app\api\behavior\RequestFilter'
];