Skip to content

Commit

Permalink
fix: format the code. #232
Browse files Browse the repository at this point in the history
  • Loading branch information
@anjoy8
anjoy8 committed Mar 15, 2022
1 parent 2bbc427 commit 7c43929
Show file tree
Hide file tree
Showing 13 changed files with 669 additions and 671 deletions.
2 changes: 1 addition & 1 deletion Blog.Core.Api/Blog.Core.Api.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@
<None Include="wwwroot\BlogCore.Data.json\Permission.tsv" />
<None Include="wwwroot\BlogCore.Data.json\Role.tsv" />
<None Include="wwwroot\BlogCore.Data.json\RoleModulePermission.tsv" />
<None Include="wwwroot\BlogCore.Data.json\sysUserInfo.tsv" />
<None Include="wwwroot\BlogCore.Data.json\SysUserInfo.tsv" />
<None Include="wwwroot\BlogCore.Data.json\Topic.tsv" />
<None Include="wwwroot\BlogCore.Data.json\TopicDetail.tsv" />
<None Include="wwwroot\BlogCore.Data.json\UserRole.tsv" />
Expand Down
28 changes: 14 additions & 14 deletions Blog.Core.Api/Blog.Core.Model.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Blog.Core.Api/Blog.Core.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Blog.Core.Api/Controllers/LoginController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,14 @@ public async Task<MessageModel<TokenInfoViewModel>> GetJwtToken3(string name = "

pass = MD5Helper.MD5Encrypt32(pass);

var user = await _sysUserInfoServices.Query(d => d.uLoginName == name && d.uLoginPWD == pass && d.tdIsDelete == false);
var user = await _sysUserInfoServices.Query(d => d.LoginName == name && d.LoginPWD == pass && d.IsDeleted == false);
if (user.Count > 0)
{
var userRoles = await _sysUserInfoServices.GetUserRoleNameStr(name, pass);
//如果是基于用户的授权策略，这里要添加用户;如果是基于角色的授权策略，这里要添加角色
var claims = new List<Claim> {
new Claim(ClaimTypes.Name, name),
new Claim(JwtRegisteredClaimNames.Jti, user.FirstOrDefault().uID.ToString()),
new Claim(JwtRegisteredClaimNames.Jti, user.FirstOrDefault().Id.ToString()),
new Claim(ClaimTypes.Expiration, DateTime.Now.AddSeconds(_requirement.Expiration.TotalSeconds).ToString()) };
claims.AddRange(userRoles.Split(',').Select(s => new Claim(ClaimTypes.Role, s)));

Expand Down Expand Up @@ -209,10 +209,10 @@ public async Task<MessageModel<TokenInfoViewModel>> RefreshToken(string token =
var user = await _sysUserInfoServices.QueryById(tokenModel.Uid);
if (user != null)
{
var userRoles = await _sysUserInfoServices.GetUserRoleNameStr(user.uLoginName, user.uLoginPWD);
var userRoles = await _sysUserInfoServices.GetUserRoleNameStr(user.LoginName, user.LoginPWD);
//如果是基于用户的授权策略，这里要添加用户;如果是基于角色的授权策略，这里要添加角色
var claims = new List<Claim> {
new Claim(ClaimTypes.Name, user.uLoginName),
new Claim(ClaimTypes.Name, user.LoginName),
new Claim(JwtRegisteredClaimNames.Jti, tokenModel.Uid.ObjToString()),
new Claim(ClaimTypes.Expiration, DateTime.Now.AddSeconds(_requirement.Expiration.TotalSeconds).ToString()) };
claims.AddRange(userRoles.Split(',').Select(s => new Claim(ClaimTypes.Role, s)));
Expand Down
32 changes: 16 additions & 16 deletions Blog.Core.Api/Controllers/UserController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ public UserController(IUnitOfWork unitOfWork, ISysUserInfoServices sysUserInfoSe
/// <returns></returns>
// GET: api/User
[HttpGet]
public async Task<MessageModel<PageModel<sysUserInfo>>> Get(int page = 1, string key = "")
public async Task<MessageModel<PageModel<SysUserInfo>>> Get(int page = 1, string key = "")
{
if (string.IsNullOrEmpty(key) || string.IsNullOrWhiteSpace(key))
{
Expand All @@ -66,7 +66,7 @@ public async Task<MessageModel<PageModel<sysUserInfo>>> Get(int page = 1, string
int intPageSize = 50;


var data = await _sysUserInfoServices.QueryPage(a => a.tdIsDelete != true && a.uStatus >= 0 && ((a.uLoginName != null && a.uLoginName.Contains(key)) || (a.uRealName != null && a.uRealName.Contains(key))), page, intPageSize, " uID desc ");
var data = await _sysUserInfoServices.QueryPage(a => a.IsDeleted != true && a.Status >= 0 && ((a.LoginName != null && a.LoginName.Contains(key)) || (a.RealName != null && a.RealName.Contains(key))), page, intPageSize, " uID desc ");


#region MyRegion
Expand All @@ -78,7 +78,7 @@ public async Task<MessageModel<PageModel<sysUserInfo>>> Get(int page = 1, string
var sysUserInfos = data.data;
foreach (var item in sysUserInfos)
{
var currentUserRoles = allUserRoles.Where(d => d.UserId == item.uID).Select(d => d.RoleId).ToList();
var currentUserRoles = allUserRoles.Where(d => d.UserId == item.Id).Select(d => d.RoleId).ToList();
item.RIDs = currentUserRoles;
item.RoleNames = allRoles.Where(d => currentUserRoles.Contains(d.Id)).Select(d => d.Name).ToList();
}
Expand All @@ -87,7 +87,7 @@ public async Task<MessageModel<PageModel<sysUserInfo>>> Get(int page = 1, string
#endregion


return new MessageModel<PageModel<sysUserInfo>>()
return new MessageModel<PageModel<SysUserInfo>>()
{
msg = "获取成功",
success = data.dataCount >= 0,
Expand All @@ -114,9 +114,9 @@ public string Get(string id)
/// <returns></returns>
[HttpGet]
[AllowAnonymous]
public async Task<MessageModel<sysUserInfo>> GetInfoByToken(string token)
public async Task<MessageModel<SysUserInfo>> GetInfoByToken(string token)
{
var data = new MessageModel<sysUserInfo>();
var data = new MessageModel<SysUserInfo>();
if (!string.IsNullOrEmpty(token))
{
var tokenModel = JwtHelper.SerializeJwt(token);
Expand All @@ -142,12 +142,12 @@ public async Task<MessageModel<sysUserInfo>> GetInfoByToken(string token)
/// <returns></returns>
// POST: api/User
[HttpPost]
public async Task<MessageModel<string>> Post([FromBody] sysUserInfo sysUserInfo)
public async Task<MessageModel<string>> Post([FromBody] SysUserInfo sysUserInfo)
{
var data = new MessageModel<string>();

sysUserInfo.uLoginPWD = MD5Helper.MD5Encrypt32(sysUserInfo.uLoginPWD);
sysUserInfo.uRemark = _user.Name;
sysUserInfo.LoginPWD = MD5Helper.MD5Encrypt32(sysUserInfo.LoginPWD);
sysUserInfo.Remark = _user.Name;

var id = await _sysUserInfoServices.Add(sysUserInfo);
data.success = id > 0;
Expand All @@ -167,7 +167,7 @@ public async Task<MessageModel<string>> Post([FromBody] sysUserInfo sysUserInfo)
/// <returns></returns>
// PUT: api/User/5
[HttpPut]
public async Task<MessageModel<string>> Put([FromBody] sysUserInfo sysUserInfo)
public async Task<MessageModel<string>> Put([FromBody] SysUserInfo sysUserInfo)
{
// 这里使用事务处理

Expand All @@ -176,12 +176,12 @@ public async Task<MessageModel<string>> Put([FromBody] sysUserInfo sysUserInfo)
{
_unitOfWork.BeginTran();

if (sysUserInfo != null && sysUserInfo.uID > 0)
if (sysUserInfo != null && sysUserInfo.Id > 0)
{
if (sysUserInfo.RIDs.Count > 0)
{
// 无论 Update Or Add , 先删除当前用户的全部 U_R 关系
var usreroles = (await _userRoleServices.Query(d => d.UserId == sysUserInfo.uID)).Select(d => d.Id.ToString()).ToArray();
var usreroles = (await _userRoleServices.Query(d => d.UserId == sysUserInfo.Id)).Select(d => d.Id.ToString()).ToArray();
if (usreroles.Count() > 0)
{
var isAllDeleted = await _userRoleServices.DeleteByIds(usreroles);
Expand All @@ -191,7 +191,7 @@ public async Task<MessageModel<string>> Put([FromBody] sysUserInfo sysUserInfo)
var userRolsAdd = new List<UserRole>();
sysUserInfo.RIDs.ForEach(rid =>
{
userRolsAdd.Add(new UserRole(sysUserInfo.uID, rid));
userRolsAdd.Add(new UserRole(sysUserInfo.Id, rid));
});

await _userRoleServices.Add(userRolsAdd);
Expand All @@ -205,7 +205,7 @@ public async Task<MessageModel<string>> Put([FromBody] sysUserInfo sysUserInfo)
if (data.success)
{
data.msg = "更新成功";
data.response = sysUserInfo?.uID.ObjToString();
data.response = sysUserInfo?.Id.ObjToString();
}
}
}
Expand All @@ -231,12 +231,12 @@ public async Task<MessageModel<string>> Delete(int id)
if (id > 0)
{
var userDetail = await _sysUserInfoServices.QueryById(id);
userDetail.tdIsDelete = true;
userDetail.IsDeleted = true;
data.success = await _sysUserInfoServices.Update(userDetail);
if (data.success)
{
data.msg = "删除成功";
data.response = userDetail?.uID.ObjToString();
data.response = userDetail?.Id.ObjToString();
}
}

Expand Down
4 changes: 2 additions & 2 deletions Blog.Core.Api/Controllers/UserRoleController.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ public UserRoleController(ISysUserInfoServices sysUserInfoServices, IUserRoleSer
/// <param name="loginPwd"></param>
/// <returns></returns>
[HttpGet]
public async Task<MessageModel<sysUserInfo>> AddUser(string loginName, string loginPwd)
public async Task<MessageModel<SysUserInfo>> AddUser(string loginName, string loginPwd)
{
return new MessageModel<sysUserInfo>()
return new MessageModel<SysUserInfo>()
{
success = true,
msg = "添加成功",
Expand Down
Loading

0 comments on commit 7c43929

Please sign in to comment.