fix: 修复校验与效验拼写

This commit is contained in:
陈淳
2024-03-07 11:32:49 +08:00
parent 4ce9ee520a
commit a7a794c709
6 changed files with 15 additions and 15 deletions

View File

@@ -75,7 +75,7 @@ namespace Yi.Framework.Core.Extensions
result = result.Replace("::ffff:", "127.0.0.1"); result = result.Replace("::ffff:", "127.0.0.1");
//Ip规则 //Ip规则
var regResult = Regex.IsMatch(result, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$"); var regResult = Regex.IsMatch(result, @"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$");
result = regResult ? result : "127.0.0.1"; result = regResult ? result : "127.0.0.1";

View File

@@ -178,7 +178,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
/// <summary> /// <summary>
/// 验创建权限userId为主题创建者 /// 验创建权限userId为主题创建者
/// </summary> /// </summary>
/// <param name="disucssId"></param> /// <param name="disucssId"></param>
/// <returns></returns> /// <returns></returns>

View File

@@ -27,7 +27,7 @@ using Yi.Framework.SqlSugarCore.Abstractions;
namespace Yi.Framework.Bbs.Application.Services.Forum namespace Yi.Framework.Bbs.Application.Services.Forum
{ {
/// <summary> /// <summary>
/// Discuss应用服务实现,用于参数验、领域服务业务组合、日志记录、事务处理、账户信息 /// Discuss应用服务实现,用于参数验、领域服务业务组合、日志记录、事务处理、账户信息
/// </summary> /// </summary>
public class DiscussService : YiCrudAppService<DiscussEntity, DiscussGetOutputDto, DiscussGetListOutputDto, Guid, DiscussGetListInputVo, DiscussCreateInputVo, DiscussUpdateInputVo>, public class DiscussService : YiCrudAppService<DiscussEntity, DiscussGetOutputDto, DiscussGetListOutputDto, Guid, DiscussGetListInputVo, DiscussCreateInputVo, DiscussUpdateInputVo>,
IDiscussService IDiscussService
@@ -221,7 +221,7 @@ namespace Yi.Framework.Bbs.Application.Services.Forum
} }
/// <summary> /// <summary>
/// 验主题查询权限 /// 验主题查询权限
/// </summary> /// </summary>
/// <param name="discussId"></param> /// <param name="discussId"></param>
/// <returns></returns> /// <returns></returns>

View File

@@ -43,7 +43,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
var sigInLast = await _signInRepository._DbQueryable.Where(x => x.CreatorId == userId).OrderByDescending(x => x.CreationTime).FirstAsync(); var sigInLast = await _signInRepository._DbQueryable.Where(x => x.CreatorId == userId).OrderByDescending(x => x.CreationTime).FirstAsync();
//verify 验是否允许签到了 //verify 验是否允许签到了
if (sigInLast is not null) if (sigInLast is not null)
{ {
VerifySignInTime(sigInLast.CreationTime); VerifySignInTime(sigInLast.CreationTime);
@@ -65,7 +65,7 @@ namespace Yi.Framework.Bbs.Domain.Managers
} }
/// <summary> /// <summary>
/// 验签到时间 /// 验签到时间
/// </summary> /// </summary>
/// <param name="dataTime"></param> /// <param name="dataTime"></param>
/// <exception cref="UserFriendlyException"></exception> /// <exception cref="UserFriendlyException"></exception>

View File

@@ -64,14 +64,14 @@ namespace Yi.Framework.Rbac.Application.Services
private IAccountManager _accountManager; private IAccountManager _accountManager;
private ISqlSugarRepository<MenuEntity> _menuRepository; private ISqlSugarRepository<MenuEntity> _menuRepository;
/// <summary> /// <summary>
/// 验图片登录验证码,无需和账号绑定 /// 验图片登录验证码,无需和账号绑定
/// </summary> /// </summary>
[AllowAnonymous] [AllowAnonymous]
private void ValidationImageCaptcha(LoginInputVo input) private void ValidationImageCaptcha(LoginInputVo input)
{ {
if (_rbacOptions.EnableCaptcha) if (_rbacOptions.EnableCaptcha)
{ {
//登录不想要验证码 ,可不 //登录不想要验证码 ,可不
if (!_captcha.Validate(input.Uuid, input.Code)) if (!_captcha.Validate(input.Uuid, input.Code))
{ {
throw new UserFriendlyException("验证码错误"); throw new UserFriendlyException("验证码错误");
@@ -94,11 +94,11 @@ namespace Yi.Framework.Rbac.Application.Services
throw new UserFriendlyException("请输入合理数据!"); throw new UserFriendlyException("请输入合理数据!");
} }
//验验证码 //验验证码
ValidationImageCaptcha(input); ValidationImageCaptcha(input);
UserEntity user = new(); UserEntity user = new();
// //
await _accountManager.LoginValidationAsync(input.UserName, input.Password, x => user = x); await _accountManager.LoginValidationAsync(input.UserName, input.Password, x => user = x);
//获取token //获取token
@@ -186,7 +186,7 @@ namespace Yi.Framework.Rbac.Application.Services
} }
/// <summary> /// <summary>
/// 验电话验证码,需要与电话号码绑定 /// 验电话验证码,需要与电话号码绑定
/// </summary> /// </summary>
private async Task ValidationPhoneCaptchaAsync(RegisterDto input) private async Task ValidationPhoneCaptchaAsync(RegisterDto input)
{ {
@@ -240,10 +240,10 @@ namespace Yi.Framework.Rbac.Application.Services
throw new UserFriendlyException("密码需大于等于6位"); throw new UserFriendlyException("密码需大于等于6位");
} }
//验用户名 //验用户名
ValidateUserName(input); ValidateUserName(input);
//验验证码,根据电话号码获取 value比对验证码已经uuid //验验证码,根据电话号码获取 value比对验证码已经uuid
await ValidationPhoneCaptchaAsync(input); await ValidationPhoneCaptchaAsync(input);

View File

@@ -139,7 +139,7 @@ namespace Yi.Framework.Rbac.Domain.Managers
} }
/// <summary> /// <summary>
/// 登录 /// 登录
/// </summary> /// </summary>
/// <param name="userName"></param> /// <param name="userName"></param>
/// <param name="password"></param> /// <param name="password"></param>
@@ -176,7 +176,7 @@ namespace Yi.Framework.Rbac.Domain.Managers
{ {
userAction.Invoke(user); userAction.Invoke(user);
} }
//这里为了兼容解决数据库开启了大小写不敏感问题,还要将用户名进行二次 //这里为了兼容解决数据库开启了大小写不敏感问题,还要将用户名进行二次
if (user != null&&user.UserName==userName) if (user != null&&user.UserName==userName)
{ {
return true; return true;