From 767b06c1b024d94aa71c386456d951a33e738cd8 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Tue, 16 May 2023 15:44:20 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E9=99=90=E5=88=B6=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81=E4=BB=A5=E5=8F=8A=E8=B4=A6=E5=8F=B7=E7=9A=84=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/adminapi/controller/Login.php         |  2 +-
 crmeb/app/api/controller/v1/LoginController.php | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/crmeb/app/adminapi/controller/Login.php b/crmeb/app/adminapi/controller/Login.php
index f8548a03b..a08209281 100644
--- a/crmeb/app/adminapi/controller/Login.php
+++ b/crmeb/app/adminapi/controller/Login.php
@@ -93,7 +93,7 @@ class Login extends AuthController
             ['captchaType', '']
         ], true);
 
-        if (count($password) > 32 || count($password) < 6) {
+        if (strlen(trim($password)) < 6 || strlen(trim($password)) > 32) {
             return app('json')->fail(400762);
         }
 
diff --git a/crmeb/app/api/controller/v1/LoginController.php b/crmeb/app/api/controller/v1/LoginController.php
index e160cb158..6c5403dd9 100644
--- a/crmeb/app/api/controller/v1/LoginController.php
+++ b/crmeb/app/api/controller/v1/LoginController.php
@@ -56,7 +56,7 @@ class LoginController
         if (!$account || !$password) {
             return app('json')->fail(410000);
         }
-        if (count($password) > 32 || count($password) < 6) {
+        if (strlen(trim($password)) < 6 || strlen(trim($password)) > 32) {
             return app('json')->fail(400762);
         }
         return app('json')->success(410001, $this->services->login($account, $password, $spread));
@@ -195,7 +195,7 @@ class LoginController
         } catch (ValidateException $e) {
             return app('json')->fail($e->getError());
         }
-        if (count($password) > 32 || count($password) < 6) {
+        if (strlen(trim($password)) < 6 || strlen(trim($password)) > 32) {
             return app('json')->fail(400762);
         }
         $verifyCode = CacheService::get('code_' . $account);
@@ -204,8 +204,6 @@ class LoginController
         $verifyCode = substr($verifyCode, 0, 6);
         if ($verifyCode != $captcha)
             return app('json')->fail(410010);
-        if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
-            return app('json')->fail(410011);
         if (md5($password) == md5('123456')) return app('json')->fail(410012);
 
         $registerStatus = $this->services->register($account, $password, $spread, 'h5');
@@ -231,7 +229,7 @@ class LoginController
         } catch (ValidateException $e) {
             return app('json')->fail($e->getError());
         }
-        if (count($password) > 32 || count($password) < 6) {
+        if (strlen(trim($password)) < 6 || strlen(trim($password)) > 32) {
             return app('json')->fail(400762);
         }
         $verifyCode = CacheService::get('code_' . $account);
@@ -241,8 +239,6 @@ class LoginController
         if ($verifyCode != $captcha) {
             return app('json')->fail(410010);
         }
-        if (strlen(trim($password)) < 6 || strlen(trim($password)) > 16)
-            return app('json')->fail(410011);
         if ($password == '123456') return app('json')->fail(410012);
         $resetStatus = $this->services->reset($account, $password);
         if ($resetStatus) return app('json')->success(100001);