From 5ea9234184827ff1cd7af7a9db62b069e8f3dd20 Mon Sep 17 00:00:00 2001
From: Zhao <756958008@qq.com>
Date: Tue, 27 Jul 2021 14:42:44 +0000
Subject: [PATCH] =?UTF-8?q?modified=20=E4=BF=AE=E6=94=B9AccessToken?=
 =?UTF-8?q?=E4=BC=A0=E9=80=92=E6=96=B9=E5=BC=8F=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?Post=E3=80=81Get=E3=80=81Header=E3=80=81PathInfo=E5=9B=9B?=
 =?UTF-8?q?=E7=A7=8D=E6=96=B9=E5=BC=8F=E4=BC=A0=E9=80=92=EF=BC=8C=E4=BC=98?=
 =?UTF-8?q?=E5=85=88=E7=BA=A7=E4=B8=BAHeader>Post>Get>PathInfo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/middleware/ApiAuth.php | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/app/middleware/ApiAuth.php b/app/middleware/ApiAuth.php
index 3197393..f42cd91 100644
--- a/app/middleware/ApiAuth.php
+++ b/app/middleware/ApiAuth.php
@@ -23,7 +23,15 @@ class ApiAuth {
      */
     public function handle($request, \Closure $next) {
         $header = config('apiadmin.CROSS_DOMAIN');
-        $apiHash = substr($request->pathinfo(), 4);
+
+        $pathParam = [];
+        $pathArr = explode('/', $request->pathinfo());
+        for ($index = 0; $index < count($pathArr); $index += 2) {
+            if (isset($pathArr[$index + 1])) {
+                $pathParam[$pathArr[$index]] = $pathArr[$index + 1];
+            }
+        }
+        $apiHash = $pathParam['api'];
 
         if ($apiHash) {
             $cached = Cache::has('ApiInfo:' . $apiHash);
@@ -53,12 +61,13 @@ class ApiAuth {
 
             $accessToken = $request->header('Access-Token', '');
             if (!$accessToken) {
-                if ($apiInfo['method'] == 2) {
-                    $accessToken = $request->get('Access-Token', '');
-                }
-                if ($apiInfo['method'] == 1) {
-                    $accessToken = $request->post('Access-Token', '');
-                }
+                $accessToken = $request->post('Access-Token', '');
+            }
+            if (!$accessToken) {
+                $accessToken = $request->get('Access-Token', '');
+            }
+            if (!$accessToken && !empty($pathParam['Access-Token'])) {
+                $accessToken = $pathParam['Access-Token'];
             }
             if (!$accessToken) {
                 return json([