caihongxingqiu vor 6 Jahren
Ursprung
Commit
b542c60fbc
2 geänderte Dateien mit 72 neuen und 72 gelöschten Zeilen
  1. 36 36
      app/Http/Middleware/JwtAuthMiddleware.php
  2. 36 36
      app/Providers/AppServiceProvider.php

+ 36 - 36
app/Http/Middleware/JwtAuthMiddleware.php

@@ -20,42 +20,42 @@ class JwtAuthMiddleware
     public function handle($request, Closure $next)
     {
 
-//        try {
-//            $token = JWTAuth::getToken();
-//            $data = JWTAuth::decode($token);
-//            if ($data->sign !== md5($data->uid . env('JWT_SECRET'))) {
-//                $error = [
-//                    'message' => 'request is not allow',
-//                    'code' => 401,
-//                ];
-//                return response()->json($error);
-//            }
-//        } catch (TokenExpiredException $e) {
-//            $error = [
-//                'message' => 'Token is Expired',
-//                'code' => 401,
-//            ];
-//            return response()->json($error)->setStatusCode(401);
-//        } catch (TokenInvalidException $e) {
-//            $error = [
-//                'message' => $e->getMessage(),
-//                'code' => 401,
-//            ];
-//            return response()->json($error)->setStatusCode(401);
-//        } catch (JWTException $e) {
-//            $error = [
-//                'message' => $e->getMessage(),
-//                'code' => 401,
-//            ];
-//
-//            return response()->json($error)->setStatusCode(401);
-//        }catch (\Exception $e){
-//            $error = [
-//                'message' => $e->getMessage(),
-//                'code' => 401,
-//            ];
-//            return response()->json($error)->setStatusCode(401);
-//        }
+        try {
+            $token = JWTAuth::getToken();
+            $data = JWTAuth::decode($token);
+            if ($data->sign !== md5($data->uid . env('JWT_SECRET'))) {
+                $error = [
+                    'message' => 'request is not allow',
+                    'code' => 401,
+                ];
+                return response()->json($error);
+            }
+        } catch (TokenExpiredException $e) {
+            $error = [
+                'message' => 'Token is Expired',
+                'code' => 401,
+            ];
+            return response()->json($error)->setStatusCode(401);
+        } catch (TokenInvalidException $e) {
+            $error = [
+                'message' => $e->getMessage(),
+                'code' => 401,
+            ];
+            return response()->json($error)->setStatusCode(401);
+        } catch (JWTException $e) {
+            $error = [
+                'message' => $e->getMessage(),
+                'code' => 401,
+            ];
+
+            return response()->json($error)->setStatusCode(401);
+        }catch (\Exception $e){
+            $error = [
+                'message' => $e->getMessage(),
+                'code' => 401,
+            ];
+            return response()->json($error)->setStatusCode(401);
+        }
         return $next($request);
     }
 }

+ 36 - 36
app/Providers/AppServiceProvider.php

@@ -20,41 +20,41 @@ class AppServiceProvider extends ServiceProvider
             return preg_match('/^1[3456789]{1}\d{9}$/', $value);
         });
 
-        app('Dingo\Api\Exception\Handler')->register(function (\Tymon\JWTAuth\Exceptions\JWTException $e) {
-
-            if ($e instanceof TokenExpiredException) {
-
-                $error = [
-                    'message' => 'Token Expired',
-                    'errors' => [
-                        'token_expired' => 'token_expired'
-                    ],
-                    'code' => $e->getStatusCode(),
-                    'status_code' => $e->getStatusCode(),
-                ];
-
-            } else if ($e instanceof TokenInvalidException) {
-
-                $error = [
-                    'message' => 'Token Invalid',
-                    'errors' => [
-                        'token_invalid' => 'token_invalid'
-                    ],
-                    'code' => $e->getStatusCode(),
-                    'status_code' => $e->getStatusCode(),
-                ];
-
-            }
-
-            return response()->json($error, $e->getStatusCode());
-        });
-
-        app('Dingo\Api\Exception\Handler')->register(function (\Illuminate\Auth\AuthenticationException $e) {
-            $error = [
-                'message' => '请重新登录',
-                'code' => '1001',
-            ];
-            return response()->json($error);
-        });
+//        app('Dingo\Api\Exception\Handler')->register(function (\Tymon\JWTAuth\Exceptions\JWTException $e) {
+//
+//            if ($e instanceof TokenExpiredException) {
+//
+//                $error = [
+//                    'message' => 'Token Expired',
+//                    'errors' => [
+//                        'token_expired' => 'token_expired'
+//                    ],
+//                    'code' => $e->getStatusCode(),
+//                    'status_code' => $e->getStatusCode(),
+//                ];
+//
+//            } else if ($e instanceof TokenInvalidException) {
+//
+//                $error = [
+//                    'message' => 'Token Invalid',
+//                    'errors' => [
+//                        'token_invalid' => 'token_invalid'
+//                    ],
+//                    'code' => $e->getStatusCode(),
+//                    'status_code' => $e->getStatusCode(),
+//                ];
+//
+//            }
+//
+//            return response()->json($error, $e->getStatusCode());
+//        });
+//
+//        app('Dingo\Api\Exception\Handler')->register(function (\Illuminate\Auth\AuthenticationException $e) {
+//            $error = [
+//                'message' => '请重新登录',
+//                'code' => '1001',
+//            ];
+//            return response()->json($error);
+//        });
     }
 }