Parcourir la source

feat: NC-45: 结算后台登陆增加邮箱验证码.

kevin il y a 1 an
Parent
commit
b79b3c55b7

+ 4 - 4
backendApi/modules/v1/components/UserAuth.php

@@ -412,13 +412,13 @@ class UserAuth extends User
         if (!$admin) {
             return [
                 'code' => 500,
-                'errDes' => '管理员账号错误',
+                'message' => '管理员账号错误',
             ];
         }
         if (!$admin['EMAIL'] || !filter_var($admin['EMAIL'], FILTER_VALIDATE_EMAIL)) {
             return [
                 'code' => 500,
-                'errDes' => '管理员未绑定邮箱, 或邮箱无效',
+                'message' => '管理员未绑定邮箱, 或邮箱无效',
             ];
         }
 
@@ -427,7 +427,7 @@ class UserAuth extends User
         if (!$result) {
             return [
                 'code' => 500,
-                'errDes' => '验证码发送失败',
+                'message' => '验证码发送失败',
             ];
         }
 
@@ -442,7 +442,7 @@ class UserAuth extends User
 
         return [
             'code' => 200,
-            'email' => sprintf('验证码已发送, 请检查邮箱%s', Tool::hideEmail($admin['EMAIL'])),
+            'message' => sprintf('验证码已发送, 请检查邮箱%s', Tool::hideEmail($admin['EMAIL'])),
         ];
     }
 }

+ 2 - 2
backendApi/modules/v1/controllers/OauthController.php

@@ -134,9 +134,9 @@ class OauthController extends BaseController
         // 发送邮箱验证码
         $result = UserAuth::sendEmailCode($adminName);
         if ($result['code'] == 200) {
-            return static::notice(sprintf('验证码已发送到邮箱 %s, 有效期%d分钟. ', $result['email'], 5));
+            return static::notice($result['message']);
         } else {
-            return static::notice(sprintf('验证码发送失败. %s', $result['errDes']), 401);
+            return static::notice($result['message'], 401);
         }
     }
 }

+ 1 - 1
common/helpers/Tool.php

@@ -262,7 +262,7 @@ class Tool {
     public static function hideEmail($email): string
     {
         $emailExp = explode('@', $email);
-        $mask = substr_replace($emailExp[0], str_repeat('*', strlen($emailExp[0]) - 2), 1, strlen($emailExp[0]) ? strlen($emailExp[0]) : strlen($emailExp[0]) - 2);
+        $mask = substr_replace($emailExp[0], str_repeat('*', strlen($emailExp[0]) - 2), 1, strlen($emailExp[0]) ?: strlen($emailExp[0]) - 2);
 
         return $mask . '@' . $emailExp[1];
     }