Browse Source

Merge branch 'master' into Order_RejectedBill_version1.0

loustwo 4 years ago
parent
commit
2d4fec1e3e
2 changed files with 3 additions and 3 deletions
  1. 2 2
      app/Http/Controllers/Auth/LoginController.php
  2. 1 1
      app/Http/Kernel.php

+ 2 - 2
app/Http/Controllers/Auth/LoginController.php

@@ -85,7 +85,7 @@ class LoginController extends Controller
         }
 
         if ($this->attemptLogin($request)) {
-            Auth::logoutOtherDevices($request->input('password'));
+//            Auth::logoutOtherDevices($request->input('password'));
             if(env('DB_USERNAME')!='developer')
                 app('LogService')->log(__METHOD__,__FUNCTION__,'',Auth::user()['id']);
             if($request['is_json']){
@@ -100,7 +100,7 @@ class LoginController extends Controller
             if ($user){
                 $request->offsetSet("name",$user->name);
                 if ($this->attemptLogin($request)) {
-                    Auth::logoutOtherDevices($user->password);
+//                    Auth::logoutOtherDevices($user->password);
                     if($request['is_json']){
                         return ['success'=>true,'url'=>url($redirectTo),'menus'=>app("MenuService")->getVisibleFunctionList()];
                     }

+ 1 - 1
app/Http/Kernel.php

@@ -37,7 +37,7 @@ class Kernel extends HttpKernel
             \App\Http\Middleware\EncryptCookies::class,
             \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
             \Illuminate\Session\Middleware\StartSession::class,
-             \Illuminate\Session\Middleware\AuthenticateSession::class,
+            // \Illuminate\Session\Middleware\AuthenticateSession::class,
             \Illuminate\View\Middleware\ShareErrorsFromSession::class,
             \App\Http\Middleware\VerifyCsrfToken::class,
             \Illuminate\Routing\Middleware\SubstituteBindings::class,