xwl2023/Yi.Framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

9/06更新

Browse Source
This commit is contained in:
橙子
2022-09-06 23:32:17 +08:00
parent e4da8d4f15
commit bf17312a5f
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -12,7 +12,9 @@
### 简介: ### 简介:
**中文：意框架**（和他的名字一样“简易”） **中文：意框架**（和他的名字一样“简易”）
正在持续更进业务模块 模块分化较多，可根据业务自行引用或抛弃，集大成者，大而全乎，也许你能从中学习到一些独特见解
正在持续更进业务模块，正在接入ruoyi
**英文：YiFramework** **英文：YiFramework**

11
Yi.Framework.Net6/Yi.Framework.Core/JwtInvoker.cs
View File

@@ -23,15 +23,15 @@ namespace Yi.Framework.Core
} }
public string GetRefreshToken(UserEntity user) public string GetRefreshToken(UserEntity user)
{ {
return this.GetToken(_JWTTokenOptions.ReExpiration, user,null, true); return this.GetToken(_JWTTokenOptions.ReExpiration, user, null, true);
} }
public string GetAccessToken(UserEntity user,HashSet<MenuEntity> menus) public string GetAccessToken(UserEntity user, HashSet<MenuEntity> menus)
{ {
return this.GetToken(_JWTTokenOptions.Expiration, user, menus); return this.GetToken(_JWTTokenOptions.Expiration, user, menus);
} }
private string GetToken(int minutes, UserEntity user, HashSet<MenuEntity> menus,bool isRefresh = false) private string GetToken(int minutes, UserEntity user, HashSet<MenuEntity> menus, bool isRefresh = false)
{ {
List<Claim> claims = new List<Claim>(); List<Claim> claims = new List<Claim>();
claims.Add(new Claim(JwtRegisteredClaimNames.Nbf, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}")); claims.Add(new Claim(JwtRegisteredClaimNames.Nbf, $"{new DateTimeOffset(DateTime.Now).ToUnixTimeSeconds()}"));
@@ -42,7 +42,10 @@ namespace Yi.Framework.Core
foreach (var m in menus) foreach (var m in menus)
{ {
claims.Add(new Claim("permission", m.PermissionCode.ToString())); if (!string.IsNullOrEmpty(m.PermissionCode))
{
claims.Add(new Claim("permission", m.PermissionCode.ToString()));
}
} }
if (isRefresh) if (isRefresh)

2
Yi.Framework.Net6/Yi.Framework.Service/UserService.cs
View File

@@ -30,7 +30,7 @@ namespace Yi.Framework.Service
} }
public async Task<bool> Exist(string userName, Action<UserEntity> userAction = null) public async Task<bool> Exist(string userName, Action<UserEntity> userAction = null)
{ {
var user = await _repository.GetFirstAsync(u => u.UserName == userName); var user = await _repository.GetFirstAsync(u => u.UserName == userName&& u.IsDeleted==false);
if (userAction != null) if (userAction != null)
{ {
userAction.Invoke(user); userAction.Invoke(user);