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

modified 完善中间件

Browse Source
This commit is contained in:
zhaoxiang 2020-10-13 00:57:31 +08:00
parent 34dd90c82d
commit a4baba4f18
4 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/middleware/ApiAuth.php
View File

@ -12,30 +12,33 @@ class ApiAuth {
/** /**
* 获取接口基本配置参数，校验接口Hash是否合法，校验APP_ID是否合法等 * 获取接口基本配置参数，校验接口Hash是否合法，校验APP_ID是否合法等
* @param \think\facade\Request $request * @param $request
* @param \Closure $next * @param \Closure $next
* @return mixed|\think\response\Json * @return mixed|\think\response\Json
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
public function handle($request, \Closure $next) { public function handle($request, \Closure $next) {
$header = config('apiadmin.CROSS_DOMAIN'); $header = config('apiadmin.CROSS_DOMAIN');
$apiHash = substr($request->path(), 4); $apiHash = substr($request->pathinfo(), 4);
if ($apiHash) { if ($apiHash) {
$cached = Cache::has('ApiInfo:' . $apiHash); $cached = Cache::has('ApiInfo:' . $apiHash);
if ($cached) { if ($cached) {
$apiInfo = Cache::get('ApiInfo:' . $apiHash); $apiInfo = Cache::get('ApiInfo:' . $apiHash);
} else { } else {
$apiInfo = AdminList::get(['hash' => $apiHash, 'hash_type' => 2]); $apiInfo = (new AdminList())->where('hash', $apiHash)->where('hash_type', 2)->find();
if ($apiInfo) { if ($apiInfo) {
$apiInfo = $apiInfo->toArray(); $apiInfo = $apiInfo->toArray();
Cache::rm('ApiInfo:' . $apiInfo['api_class']); Cache::delete('ApiInfo:' . $apiInfo['api_class']);
Cache::set('ApiInfo:' . $apiHash, $apiInfo); Cache::set('ApiInfo:' . $apiHash, $apiInfo);
} else { } else {
$apiInfo = AdminList::get(['api_class' => $apiHash, 'hash_type' => 1]); $apiInfo = (new AdminList())->where('api_class', $apiHash)->where('hash_type', 1)->find();
if ($apiInfo) { if ($apiInfo) {
$apiInfo = $apiInfo->toArray(); $apiInfo = $apiInfo->toArray();
Cache::rm('ApiInfo:' . $apiInfo['hash']); Cache::delete('ApiInfo:' . $apiInfo['hash']);
Cache::set('ApiInfo:' . $apiHash, $apiInfo); Cache::set('ApiInfo:' . $apiHash, $apiInfo);
} else { } else {
return json([ return json([
@ -84,13 +87,16 @@ class ApiAuth {
/** /**
* 简易鉴权，更具APP_SECRET获取应用信息 * 简易鉴权，更具APP_SECRET获取应用信息
* @param $accessToken * @param $accessToken
* @return bool|mixed * @return array|false|mixed|object|\think\App
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
private function doEasyCheck($accessToken) { private function doEasyCheck($accessToken) {
$appInfo = cache('AccessToken:Easy:' . $accessToken); $appInfo = cache('AccessToken:Easy:' . $accessToken);
if (!$appInfo) { if (!$appInfo) {
$appInfo = AdminApp::get(['app_secret' => $accessToken]); $appInfo = (new AdminApp())->where('app_secret', $accessToken)->find();
if (!$appInfo) { if (!$appInfo) {
return false; return false;
} else { } else {

4
app/middleware/ApiLog.php
View File

@ -8,9 +8,9 @@ use app\util\ApiLogTool;
class ApiLog { class ApiLog {
/** /**
* @param \think\facade\Request $request * @param $request
* @param \Closure $next * @param \Closure $next
* @return mixed|\think\response\Json * @return mixed
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
public function handle($request, \Closure $next) { public function handle($request, \Closure $next) {

2
app/middleware/ApiPermission.php
View File

@ -9,7 +9,7 @@ class ApiPermission {
/** /**
* 校验当前App是否有请求当前接口的权限 * 校验当前App是否有请求当前接口的权限
* @param \think\facade\Request $request * @param $request
* @param \Closure $next * @param \Closure $next
* @return mixed|\think\response\Json * @return mixed|\think\response\Json
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>

7
app/middleware/RequestFilter.php
View File

@ -13,9 +13,12 @@ class RequestFilter {
/** /**
* 接口请求字段过滤【只验证数据的合法性，不再过滤数据】 * 接口请求字段过滤【只验证数据的合法性，不再过滤数据】
* @param \think\facade\Request $request * @param $request
* @param \Closure $next * @param \Closure $next
* @return mixed|\think\response\Json * @return mixed|\think\response\Json
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\DbException
* @throws \think\db\exception\ModelNotFoundException
* @author zhaoxiang <zhaoxiang051405@gmail.com> * @author zhaoxiang <zhaoxiang051405@gmail.com>
*/ */
public function handle($request, \Closure $next) { public function handle($request, \Closure $next) {
@ -26,7 +29,7 @@ class RequestFilter {
if ($has) { if ($has) {
$newRule = cache('RequestFields:NewRule:' . $apiInfo['hash']); $newRule = cache('RequestFields:NewRule:' . $apiInfo['hash']);
} else { } else {
$rule = AdminFields::all(['hash' => $apiInfo['hash'], 'type' => 0]); $rule = (new AdminFields())->where('hash', $apiInfo['hash'])->where('type', 0)->select();
$newRule = $this->buildValidateRule($rule); $newRule = $this->buildValidateRule($rule);
cache('RequestFields:NewRule:' . $apiInfo['hash'], $newRule); cache('RequestFields:NewRule:' . $apiInfo['hash'], $newRule);
} }