moshaorui před 16 hodinami
rodič
revize
5875aab407

+ 8 - 1
app/Admin/Controllers/AuthController.php

@@ -25,6 +25,13 @@ class AuthController extends BaseAuthController
     {
 
         $credentials = $request->only([$this->username(), 'password', 'captcha']);
+        //去除前后空格
+        foreach (['username', 'password', 'captcha'] as $key) {
+            if (isset($credentials[$key])) {
+                $credentials[$key] = trim($credentials[$key]);
+            }
+        }
+
         $remember = (bool)$request->input('remember', false);
 
         /** @var \Illuminate\Validation\Validator $validator */
@@ -35,7 +42,7 @@ class AuthController extends BaseAuthController
         ]);
 
 
-        if ($request->input('captcha') != Session::get('captcha'))
+        if (trim($request->input('captcha')) != Session::get('captcha'))
         {
             $session_captcha = Session::get('captcha');
 

+ 7 - 1
app/Distributor/Controllers/AuthController.php

@@ -47,6 +47,12 @@ class AuthController extends BaseAuthController
     {
 
         $credentials = $request->only([$this->username(), 'password', 'captcha']);
+        //去除前后空格
+        foreach (['username', 'password', 'captcha'] as $key) {
+            if (isset($credentials[$key])) {
+                $credentials[$key] = trim($credentials[$key]);
+            }
+        }
         $remember = (bool)$request->input('remember', false);
 
         /** @var \Illuminate\Validation\Validator $validator */
@@ -56,7 +62,7 @@ class AuthController extends BaseAuthController
             'captcha' => 'required',
         ]);
 
-        if ($request->input('captcha') != Session::get('captcha'))
+        if (trim($request->input('captcha')) != Session::get('captcha'))
         {
             Session::forget('captcha');