ewide/number_zj
22
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

修改授权方式为手机号码和验证码方式

Browse Source 
测试出的问题修复
This commit is contained in:
范露尧
2023-07-12 16:11:42 +08:00
parent fbbabeb690
commit 589b8a0132
86 changed files with 365 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
20220330_Vote/Ewide.Core/Const/ClaimConst.cs
View File

@@ -1,4 +1,6 @@
namespace Ewide.Core
using System;
namespace Ewide.Core
{
public class ClaimConst
{
@@ -21,6 +23,10 @@
/// 是否超级管理
/// </summary>
public const string CLAINM_SUPERADMIN = "SuperAdmin";
/// <summary>
/// 过期时间
/// </summary>
public const string ExpireTime = "";
}
}

5
20220330_Vote/Ewide.Core/Ewide.Core.xml
View File

@@ -489,6 +489,11 @@
是否超级管理
</summary>
</member>
<member name="F:Ewide.Core.ClaimConst.ExpireTime">
<summary>
过期时间
</summary>
</member>
<member name="F:Ewide.Core.CommonConst.DEFAULT_PASSWORD">
<summary>
默认密码

14
20220330_Vote/Ewide.Core/Extension/PageExtensions.cs
View File

@@ -115,19 +115,19 @@ namespace Ewide.Core.Extension
return filter;
}
public static Task<PagedList<T>> ToPageData<T>(this IQueryable<T> source, PageInputBase input) where T : new()
public static async Task<PagedList<T>> ToPageData<T>(this IQueryable<T> source, PageInputBase input) where T : new()
{
return source.OrderBy(OrderBuilder<T>(input)).ToPagedListAsync(input.PageIndex, input.PageSize);
return await source.OrderBy(OrderBuilder<T>(input)).ToPagedListAsync(input.PageIndex, input.PageSize);
}
public static Task<PagedList<O>> ToPageData<T, O>(this IQueryable<T> source, PageInputBase input) where O : new()
public static async Task<PagedList<O>> ToPageData<T, O>(this IQueryable<T> source, PageInputBase input) where O : new()
{
return source.OrderBy(OrderBuilder<T>(input)).Select(u => u.Adapt<O>()).ToPagedListAsync(input.PageIndex, input.PageSize);
return await source.OrderBy(OrderBuilder<T>(input)).Select(u => u.Adapt<O>()).ToPagedListAsync(input.PageIndex, input.PageSize);
}
public static Task<PagedList<O>> ToPageData<T, O>(this IQueryable<T> source, PageInputBase input, TypeAdapterConfig config) where O : new()
public static async Task<PagedList<O>> ToPageData<T, O>(this IQueryable<T> source, PageInputBase input, TypeAdapterConfig config) where O : new()
{
return source.OrderBy(OrderBuilder<T>(input)).Select(u => u.Adapt<O>(config)).ToPagedListAsync(input.PageIndex, input.PageSize);
return await source.OrderBy(OrderBuilder<T>(input)).Select(u => u.Adapt<O>(config)).ToPagedListAsync(input.PageIndex, input.PageSize);
}
#region DAPPER
@@ -212,7 +212,7 @@ namespace Ewide.Core.Extension
return count;
}
private static string PageSqlBuilder(string sql , PageInputBase input)
private static string PageSqlBuilder(string sql, PageInputBase input)
{
var sqlStrList = new List<string>();
var orderStr = OrderBuilder(input);

1
20220330_Vote/Ewide.Core/Manager/IUserManager.cs
View File

@@ -11,6 +11,7 @@ namespace Ewide.Core
bool SuperAdmin { get; }
SysUser User { get; }
string UserId { get; }
bool IsExpire { get; }
Task<SysUser> CheckUserAsync(string userId);
Task<SysUser> CheckUserAsync();

36
20220330_Vote/Ewide.Core/Manager/UserManager.cs
View File

@@ -51,7 +51,23 @@ namespace Ewide.Core
{
get => _httpContextAccessor.HttpContext.User.FindFirst(ClaimConst.CLAINM_SUPERADMIN)?.Value == ((int)AdminType.SuperAdmin).ToString();
}
public bool IsExpire
{
get
{
var _extime = _httpContextAccessor.HttpContext.User.FindFirst(ClaimConst.ExpireTime)?.Value;
if (string.IsNullOrWhiteSpace(_extime))
return true;
else
{
var extime = Convert.ToDateTime(_extime);
if (extime > DateTime.Now)
return false;
else
return true;
}
}
}
public SysUser User
{
get => _sysUserRep.Find(UserId);
@@ -220,9 +236,9 @@ namespace Ewide.Core
.Select(u => u.SysOrgId).ToListAsync();
}
public Task<List<string>> GetUserExtraAreaScopeList()
public async Task<List<string>> GetUserExtraAreaScopeList()
{
return GetUserExtraAreaScopeList(UserId);
return await GetUserExtraAreaScopeList(UserId);
}
public async Task<List<string>> GetUserExtraAreaScopeList(string userId)
@@ -230,14 +246,14 @@ namespace Ewide.Core
return await _sysUserAreaRep.DetachedEntities.Where(u => u.SysUserId == userId).Select(u => u.AreaCode).ToListAsync();
}
public Task<List<string>> GetRoleExtraDataScopeList(string roleId)
public async Task<List<string>> GetRoleExtraDataScopeList(string roleId)
{
return _sysRoleDataRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.SysOrgId).ToListAsync();
return await _sysRoleDataRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.SysOrgId).ToListAsync();
}
public Task<List<string>> GetRoleExtraAreaScopeList(string roleId)
public async Task<List<string>> GetRoleExtraAreaScopeList(string roleId)
{
return _sysRoleAreaRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.AreaCode).ToListAsync();
return await _sysRoleAreaRep.DetachedEntities.Where(u => u.SysRoleId == roleId).Select(u => u.AreaCode).ToListAsync();
}
public Task<List<string>> GetUserAllDataScopeList()
{
@@ -361,15 +377,15 @@ namespace Ewide.Core
var areaCode = await GetCachedAreaCode();
if (roleDataTypeList.Any(r => r == (int)DataScopeType.ALL))
{
return areaCode.Select(a => a.Code).ToList();
return areaCode.Select(a => a.Code).ToList();
}
if (roleDataTypeList.Any(r => new[] { DataScopeType.DEPT_WITH_CHILD, DataScopeType.AREA_WITH_CHILD }.Cast<int>().Contains(r)))
{
return areaCode.Where(a => a.Code.StartsWith(orgAreaCode)).Select(a => a.Code).ToList();
return areaCode.Where(a => a.Code.StartsWith(orgAreaCode)).Select(a => a.Code).ToList();
}
if (roleDataTypeList.Any(r => new[] { DataScopeType.DEPT, DataScopeType.AREA }.Cast<int>().Contains(r)))
{
return areaCode.Where(a => a.Code == orgAreaCode).Select(a => a.Code).ToList();
return areaCode.Where(a => a.Code == orgAreaCode).Select(a => a.Code).ToList();
}
return new List<string>();
}

5
20220330_Vote/Ewide.Core/Service/Auth/AuthService.cs
View File

@@ -156,8 +156,8 @@ namespace Ewide.Core.Service
// 判断用户名和密码是否正确
var user = await _sysUserRep.FirstOrDefaultAsync(u => (u.Account.Equals(input.Account) || u.Phone.Equals(input.Account) || u.Email.Equals(input.Account)) && u.Password.Equals(encryptPasswod));
_ = user ?? throw Oops.Oh(ErrorCode.D1000);
#endif
#endif
_ = user ?? throw Oops.Oh(ErrorCode.D1000);
// 验证账号是否被冻结
if (user.Status == CommonStatus.DISABLE)
throw Oops.Oh(ErrorCode.D1017);
@@ -176,6 +176,7 @@ namespace Ewide.Core.Service
{ ClaimConst.CLAINM_ACCOUNT, user.Account },
{ ClaimConst.CLAINM_NAME, user.Name },
{ ClaimConst.CLAINM_SUPERADMIN, user.AdminType },
{ ClaimConst.ExpireTime,DateTime.Now.AddHours(2)},
});
// 设置Swagger自动登录

12
20220330_Vote/Ewide.Core/Service/Cache/SysCacheService.cs
View File

@@ -117,10 +117,10 @@ namespace Ewide.Core.Service
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
public Task<bool> DelAsync(string key)
public async Task<bool> DelAsync(string key)
{
_cache.DelAsync(key);
return Task.FromResult(true);
await _cache.DelAsync(key);
return true;
}
/// <summary>
@@ -128,10 +128,10 @@ namespace Ewide.Core.Service
/// </summary>
/// <param name="key"></param>
/// <returns></returns>
public Task<bool> DelByPatternAsync(string key)
public async Task<bool> DelByPatternAsync(string key)
{
_cache.DelByPatternAsync(key);
return Task.FromResult(true);
await _cache.DelByPatternAsync(key);
return true;
}
/// <summary>

2
20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenConfigService.cs
View File

@@ -141,7 +141,7 @@ namespace Ewide.Core.Service
codeGenConfig.EffectType = DataTypeToEff(codeGenConfig.NetType);
codeGenConfig.QueryType = "=="; // QueryTypeEnum.eq.ToString();
codeGenConfig.InsertAsync();
codeGenConfig.Insert();
}
}

12
20220330_Vote/Ewide.Core/Service/CodeGen/CodeGenService.cs
View File

@@ -209,7 +209,7 @@ namespace Ewide.Core.Service.CodeGen
var menuType0 = new SysMenu
{
Pid = emptyGuid,
Pids = "["+ emptyGuid + "],",
Pids = "[" + emptyGuid + "],",
Name = busName + "管理",
Code = "dilon_" + className.ToLower(),
Type = 1,
@@ -236,7 +236,7 @@ namespace Ewide.Core.Service.CodeGen
var pid1 = _sysMenuRep.InsertNowAsync(menuType1).GetAwaiter().GetResult().Entity.Id;
// 按钮-page
var menuType2 = new SysMenu
var menuType2 = await new SysMenu
{
Pid = pid1,
Pids = "[0],[" + pid0 + "],[" + pid1 + "],",
@@ -248,7 +248,7 @@ namespace Ewide.Core.Service.CodeGen
}.InsertAsync();
// 按钮-detail
var menuType2_1 = new SysMenu
var menuType2_1 = await new SysMenu
{
Pid = pid1,
Pids = "[0],[" + pid0 + "],[" + pid1 + "],",
@@ -260,7 +260,7 @@ namespace Ewide.Core.Service.CodeGen
}.InsertAsync();
// 按钮-add
var menuType2_2 = new SysMenu
var menuType2_2 = await new SysMenu
{
Pid = pid1,
Pids = "[0],[" + pid0 + "],[" + pid1 + "],",
@@ -272,7 +272,7 @@ namespace Ewide.Core.Service.CodeGen
}.InsertAsync();
// 按钮-delete
var menuType2_3 = new SysMenu
var menuType2_3 = await new SysMenu
{
Pid = pid1,
Pids = "[0],[" + pid0 + "],[" + pid1 + "],",
@@ -284,7 +284,7 @@ namespace Ewide.Core.Service.CodeGen
}.InsertAsync();
// 按钮-edit
var menuType2_4 = new SysMenu
var menuType2_4 = await new SysMenu
{
Pid = pid1,
Pids = "[0],[" + pid0 + "],[" + pid1 + "],",

8
20220330_Vote/Ewide.Core/applicationconfig.json
View File

@@ -97,7 +97,7 @@
"logout",
"sysDictType:dropDown",
"sysDictType:dropDowns",
"sysFileInfo:upload",
//"sysFileInfo:upload",
"sysFileInfo:download",
"sysFileInfo:detail",
"sysFileInfo:preview",
@@ -112,7 +112,11 @@
"sysNotice:detail",
"houseLog:list",
"houseLog:listByInfoId",
"houseLog:listByTaskId"
"houseLog:listByTaskId",
"gb:yjb:api:outsidewall:Communitys",
"gb:yjb:api:outsidewall:sysFileInfo:upload",
"gb:yjb:api:outsidewall:VerifyIsLogin",
"gb:yjb:api:outsidewall:submit"
]
},