Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/config-manage into develop

app/Http/Controllers/ConfigController.php

@@ -44,8 +44,8 @@ class ConfigController extends Controller
                 ],
                 //对应模板
                 'apply_type' => [
-                    '1' => '菜市场首页',
-                    '0' => '团购首页',
+                    '1' => '菜市场',
+                    '0' => '团购',
                 ],
                 //版块类型:
                 'area_type' => [

app/Http/Middleware/JwtAuthMiddleware.php

@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
 use Closure;
 use Tymon\JWTAuth\Exceptions\JWTException;
 use Tymon\JWTAuth\Exceptions\TokenExpiredException;
+use Tymon\JWTAuth\Exceptions\TokenInvalidException;
 use Tymon\JWTAuth\Facades\JWTAuth;
 use Tymon\JWTAuth\Http\Middleware\BaseMiddleware;
 
@@ -21,7 +22,15 @@ class JwtAuthMiddleware
     {
 
         try {
-            $data = JWTAuth::decode(JWTAuth::getToken());
+            $token = JWTAuth::getToken();
+            if(empty($token)){
+                $error = [
+                    'message' => 'token is required',
+                    'code' => 401,
+                ];
+                return response()->json($error);
+            }
+            $data = JWTAuth::decode($token);
         } catch (TokenExpiredException $e) {
             $error = [
                 'message' => 'Token is Expired',
@@ -40,6 +49,12 @@ class JwtAuthMiddleware
                 'code' => 401,
             ];
             return response()->json($error);
+        }catch (\Exception $e){
+            $error = [
+                'message' => $e->getMessage(),
+                'code' => 401,
+            ];
+            return response()->json($error);
         }
         return $next($request);
     }