fly 5 tahun lalu
induk
melakukan
675b98273c

+ 2 - 1
app/Http/Controllers/QuickApp/Oauth/UsersController.php

@@ -7,6 +7,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Modules\User\Services\QappUserService;
 use JWTAuth;
+use Tymon\JWTAuth\Exceptions\JWTException;
 
 class UsersController extends Controller
 {
@@ -87,7 +88,7 @@ class UsersController extends Controller
             $token = JWTAuth::refresh($old_token);
             $time = time() + SysConsts::ONE_HOUR_SECONDS * 2;
             return response()->success(compact('token', 'time'));
-        } catch (Exception $e) {
+        } catch (JWTException $e) {
             return response()->error('QAPP_NOT_LOGIN');
         }
     }

+ 1 - 1
app/Http/Kernel.php

@@ -30,8 +30,8 @@ class Kernel extends HttpKernel
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
         ],
         'jwttoken' => [
-            \App\Http\Middleware\QuickAppRefreshToken::class,
             \App\Http\Middleware\QuickAppGetUserFromToken::class,
+            \App\Http\Middleware\QuickAppRefreshToken::class,
         ],
         'api' => [
             'throttle:60,1',

+ 0 - 2
app/Http/Middleware/CheckSign.php

@@ -20,8 +20,6 @@ class CheckSign
         $timestamp = $request->post('timestamp', 0);
         $key = 'a!A&AFRWT65Nb3NlklezUiqHyQAA@Z8M';
         $params = $request->except('_url');
-        myLog('test')->info($params);
-        myLog('test')->info(_sign($params, $key));
         if ($timestamp && time() - $timestamp <= (SysConsts::ONE_HOUR_SECONDS * 10) && $sign == _sign($params, $key)) {
             return $next($request);
         } else {

+ 2 - 2
app/Http/Routes/QuickApp/QuickAppRoutes.php

@@ -7,6 +7,8 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
     Route::any('pay/aliback', 'Order\OrdersController@aliback');
     Route::any('pay/wxapp/wait', 'Order\OrdersController@wait');
 
+    //刷新token
+    Route::get('api/refreshToken', 'Oauth\UsersController@refreshToken');
     //测试
     Route::any('testp', function () {
         dump($_GET);
@@ -20,8 +22,6 @@ Route::group(['domain' => env('QUICKAPP_DOMAIN'), 'namespace' => 'App\Http\Contr
 
     Route::group(['prefix' => 'api', 'middleware' => 'jwttoken'], function () {
         // Route::group(['prefix' => 'api'], function () {
-        //刷新token
-        Route::get('refreshToken', 'Oauth\UsersController@refreshToken');
         //首页
         Route::get('books/{sex}/index', 'Book\BookController@getBookLists');
         //书库

+ 2 - 2
config/jwt.php

@@ -33,7 +33,7 @@ return [
     |
     */
 
-    'ttl' => 120,
+    'ttl' => 2,
 
     /*
     |--------------------------------------------------------------------------
@@ -47,7 +47,7 @@ return [
     |
     */
 
-    'refresh_ttl' => 43200,
+    'refresh_ttl' => 1,
 
     /*
     |--------------------------------------------------------------------------