优化手机号登录短信验证码验证逻辑

src/platform/ZhonTai.Admin/Core/Consts/CacheKeys.cs

@@ -40,10 +40,10 @@ public static partial class CacheKeys
     public const string SmsCode = "admin:sms:code:";
 
     /// <summary>
-    /// 获取短信验证码
+    /// 获取短信验证码缓存键
     /// </summary>
     /// <param name="mobile">手机号</param>
     /// <param name="code">唯一码</param>
     /// <returns></returns>
-    public static string GetSmsCode(string mobile, string code) => $"{SmsCode}{mobile}:{code}";
+    public static string GetSmsCodeKey(string mobile, string code) => $"{SmsCode}{mobile}:{code}";
 }

src/platform/ZhonTai.Admin/Services/Auth/AuthService.cs

@@ -458,19 +458,20 @@ public class AuthService : BaseService, IAuthService, IDynamicApi
             sw.Start();
 
             #region 短信验证码验证
-            var codeKey = CacheKeys.GetSmsCode(input.Mobile, input.CodeId);
-            if (await Cache.ExistsAsync(codeKey))
+            if(input.CodeId.IsNull() || input.Code.IsNull())
             {
-                var code = await Cache.GetAsync(codeKey);
-                await Cache.DelAsync(codeKey);
-                if (code != input.Code)
-                {
-                    throw ResultOutput.Exception("验证码输入有误，请重新输入");
-                }
+                throw ResultOutput.Exception("验证码错误");
+            }
+            var codeKey = CacheKeys.GetSmsCodeKey(input.Mobile, input.CodeId);
+            var code = await Cache.GetAsync(codeKey);
+            if (code.IsNull())
+            {
+                throw ResultOutput.Exception("验证码错误");
             }
-            else
+            await Cache.DelAsync(codeKey);
+            if (code != input.Code)
             {
-                throw ResultOutput.Exception("验证码不存在，请重新发送");
+                throw ResultOutput.Exception("验证码错误");
             }
 
             #endregion

src/platform/ZhonTai.Admin/Services/Auth/Dto/AuthMobileLoginInput.cs

@@ -10,13 +10,13 @@ public class AuthMobileLoginInput
     /// <summary>
     /// 手机号
     /// </summary>
-    [Required(ErrorMessage = "手机号不能为空")]
+    [Required(ErrorMessage = "请输入手机号")]
     public string Mobile { get; set; }
 
     /// <summary>
     /// 验证码
     /// </summary>
-    [Required(ErrorMessage = "验证码不能为空")]
+    [Required(ErrorMessage = "请输入验证码")]
     public string Code { get; set; }
 
     /// <summary>

src/platform/ZhonTai.Admin/Services/Captcha/CaptchaService.cs

@@ -87,7 +87,7 @@ public class CaptchaService : BaseService, IDynamicApi
 
         var codeId = input.CodeId.IsNull() ? Guid.NewGuid().ToString() : input.CodeId;
         var code = StringHelper.GenerateRandomNumber();
-        await Cache.SetAsync(CacheKeys.GetSmsCode(input.Mobile, codeId), code, TimeSpan.FromMinutes(5));
+        await Cache.SetAsync(CacheKeys.GetSmsCodeKey(input.Mobile, codeId), code, TimeSpan.FromMinutes(5));
 
         //发送短信
         await LazyGetRequiredService<ICapPublisher>().PublishAsync(SubscribeNames.SmsSingleSend,

src/platform/ZhonTai.Admin/ZhonTai.Admin.xml

@@ -1045,9 +1045,9 @@
             短信验证码 admin:sms:code:guid
             </summary>
         </member>
-        <member name="M:ZhonTai.Admin.Core.Consts.CacheKeys.GetSmsCode(System.String,System.String)">
+        <member name="M:ZhonTai.Admin.Core.Consts.CacheKeys.GetSmsCodeKey(System.String,System.String)">
             <summary>
-            获取短信验证码
+            获取短信验证码缓存键
             </summary>
             <param name="mobile">手机号</param>
             <param name="code">唯一码</param>