Merge branch '20250210_lj_zhanqun' into dev

app/Controller/LoginController.php

@@ -38,13 +38,13 @@ class LoginController extends AbstractController
                 'username' => 'required',
                 'password' => 'required',
                 'type' => 'required',
-                'code' => 'required',
+                // 'code' => 'required',
             ],
             [
                 'username.required' => '用户名不能为空',
                 'password.required' => '密码不能为空',
                 'type.required' => '登录方式必填',
-                'code.required' => 'code方式必填',
+                // 'code.required' => 'code方式必填',
             ]
         );
 
@@ -52,16 +52,16 @@ class LoginController extends AbstractController
             $errorMessage = $validator->errors()->first();
             return Result::error($errorMessage);
         }
-//        $comm = new CommonService();
-        $redis = $this->container->get(\Hyperf\Redis\Redis::class);
-        $code = $redis->get($reqData['code']);
-        if (empty($code)) {
-            return Result::error("验证码已过期");
-        }
-
-        if (strtolower($code) != strtolower($reqData['captcha'])) {
-            return Result::error("验证码错误");
-        }
+    //    $comm = new CommonService();
+        // $redis = $this->container->get(\Hyperf\Redis\Redis::class);
+        // $code = $redis->get($reqData['code']);
+        // if (empty($code)) {
+        //     return Result::error("验证码已过期");
+        // }
+
+        // if (strtolower($code) != strtolower($reqData['captcha'])) {
+        //     return Result::error("验证码错误");
+        // }
         $where = [];
         if ($reqData['type'] == 1) { //密码登录
             $where = [