modified 完善接口鉴权部分的接口信息和权限信息

application/admin/controller/App.php

@@ -146,6 +146,8 @@ class App extends Base {
         if ($res === false) {
             return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '操作失败');
         } else {
+            $appInfo = AdminApp::get($id);
+            cache('AccessToken:' . $appInfo['app_secret'], null);
             return $this->buildSuccess([]);
         }
     }
@@ -176,6 +178,8 @@ class App extends Base {
         if ($res === false) {
             return $this->buildFailed(ReturnCode::DB_SAVE_ERROR, '操作失败');
         } else {
+            $appInfo = AdminApp::get($postData['id']);
+            cache('AccessToken:' . $appInfo['app_secret'], null);
             return $this->buildSuccess([]);
         }
     }
@@ -190,6 +194,9 @@ class App extends Base {
         if (!$id) {
             return $this->buildFailed(ReturnCode::EMPTY_PARAMS, '缺少必要参数');
         }
+        $appInfo = AdminApp::get($id);
+        cache('AccessToken:' . $appInfo['app_secret'], null);
+
         AdminApp::destroy($id);
 
         return $this->buildSuccess([]);

application/http/middleware/ApiAuth.php

@@ -2,10 +2,109 @@
 
 namespace app\http\middleware;
 
-class ApiAuth
+use app\model\AdminApp;
-{
+use app\model\AdminList;
-    public function handle($request, \Closure $next)
+use app\util\ReturnCode;
-    {
+use think\facade\Cache;
-        return $next($request);
+
+class ApiAuth {
+
+    /**
+     * 获取接口基本配置参数，校验接口Hash是否合法，校验APP_ID是否合法等
+     * @param \think\facade\Request $request
+     * @param \Closure $next
+     * @return mixed|\think\response\Json
+     * @author zhaoxiang <zhaoxiang051405@gmail.com>
+     */
+    public function handle($request, \Closure $next) {
+        $header = config('apiadmin.CROSS_DOMAIN');
+        $apiHash = substr($request->path(), 4);
+
+        if ($apiHash) {
+            $cached = Cache::has('ApiInfo:' . $apiHash);
+            if ($cached) {
+                $apiInfo = Cache::get('ApiInfo:' . $apiHash);
+            } else {
+                $apiInfo = AdminList::get(['hash' => $apiHash]);
+                if ($apiInfo) {
+                    $apiInfo = $apiInfo->toArray();
+                    Cache::set('ApiInfo:' . $apiHash, $apiInfo);
+                } else {
+                    return json([
+                        'code' => ReturnCode::DB_READ_ERROR,
+                        'msg'  => '获取接口配置数据失败',
+                        'data' => []
+                    ])->header($header);
+                }
+            }
+
+            $accessToken = $request->header('access-token', '');
+            if (!$accessToken) {
+                return json([
+                    'code' => ReturnCode::AUTH_ERROR,
+                    'msg'  => '缺少必要参数access-token',
+                    'data' => []
+                ])->header($header);
+            }
+            if ($apiInfo['access_token']) {
+                $appInfo = $this->doCheck($accessToken);
+            } else {
+                $appInfo = $this->doEasyCheck($accessToken);
+            }
+            if ($appInfo === false) {
+                return json([
+                    'code' => ReturnCode::ACCESS_TOKEN_TIMEOUT,
+                    'msg'  => 'access-token已过期',
+                    'data' => []
+                ])->header($header);
+            }
+
+            $request->APP_CONF_DETAIL = $appInfo;
+            $request->API_CONF_DETAIL = $apiInfo;
+
+            return $next($request);
+        } else {
+            return json([
+                'code' => ReturnCode::AUTH_ERROR,
+                'msg'  => '缺少接口Hash',
+                'data' => []
+            ])->header($header);
+        }
+    }
+
+    /**
+     * 简易鉴权，更具APP_SECRET获取应用信=/.
+     * @param $accessToken
+     * @return bool|mixed
+     * @author zhaoxiang <zhaoxiang051405@gmail.com>
+     */
+    private function doEasyCheck($accessToken) {
+        $appInfo = cache('AccessToken:' . $accessToken);
+        if (!$appInfo) {
+            $appInfo = AdminApp::get(['app_secret' => $accessToken]);
+            if (!$appInfo) {
+                return false;
+            } else {
+                $appInfo = $appInfo->toArray();
+                cache('AccessToken:' . $accessToken, $appInfo);
+            }
+        }
+
+        return $appInfo;
+    }
+
+    /**
+     * 复杂鉴权，需要先通过接口获取AccessToken
+     * @param $accessToken
+     * @return bool|mixed
+     * @author zhaoxiang <zhaoxiang051405@gmail.com>
+     */
+    private function doCheck($accessToken) {
+        $appInfo = cache('AccessToken:' . $accessToken);
+        if (!$appInfo) {
+            return false;
+        } else {
+            return $appInfo;
+        }
     }
 }

application/http/middleware/ApiPermission.php

@@ -2,10 +2,19 @@
 
 namespace app\http\middleware;
 
-class ApiPermission
+class ApiPermission {
-{
+
-    public function handle($request, \Closure $next)
+    /**
-    {
+     * 校验当前App是否有请求当前接口的权限
+     * @param \think\facade\Request $request
+     * @param \Closure $next
+     * @return mixed|\think\response\Json
+     * @author zhaoxiang <zhaoxiang051405@gmail.com>
+     */
+    public function handle($request, \Closure $next) {
+        $appInfo = $request->APP_CONF_DETAIL;
+        $apiInfo = $request->API_CONF_DETAIL;
+
         return $next($request);
     }
 }