King_Tech/Blog.Core
King_Tech/Blog.Core
2
0
Fork 0
mirror of https://github.com/anjoy8/Blog.Core.git synced 2024-09-20 23:48:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

vue.admin : user & role

Browse Source
This commit is contained in:
anjoy8 2019-02-19 00:33:35 +08:00
parent ff4be7aa81
commit f152067f89
5 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Blog.Core.Model/Models/UserRole.cs
View File

@ -19,6 +19,9 @@ namespace Blog.Core.Model.Models
UserId = uid;
RoleId = rid;
CreateTime = DateTime.Now;
IsDeleted = false;
CreateId = uid;
CreateTime = DateTime.Now;
}

4
Blog.Core.Model/Models/sysUserInfo.cs
View File

@ -101,7 +101,9 @@ namespace Blog.Core.Model.Models
[SugarColumn(IsIgnore = true)]
public string RID { get; set; }
public int RID { get; set; }
[SugarColumn(IsIgnore = true)]
public string RoleName { get; set; }
}
}

6
Blog.Core/Blog.Core.Model.xml
View File

@ -69,7 +69,7 @@
创建时间
</summary>
</member>
<!-- Badly formed XML comment ignored for member "T:Blog.Core.Model.Models.BlogArticle" -->
<!-- 对于成员“T:Blog.Core.Model.Models.BlogArticle”忽略有格式错误的 XML 注释 -->
<member name="P:Blog.Core.Model.Models.BlogArticle.bID">
<summary>
主键
@ -616,8 +616,8 @@
登录账号
</summary>
</member>
<!-- Badly formed XML comment ignored for member "T:Blog.Core.Model.Models.Topic" -->
<!-- Badly formed XML comment ignored for member "T:Blog.Core.Model.Models.TopicDetail" -->
<!-- 对于成员“T:Blog.Core.Model.Models.Topic”忽略有格式错误的 XML 注释 -->
<!-- 对于成员“T:Blog.Core.Model.Models.TopicDetail”忽略有格式错误的 XML 注释 -->
<member name="T:Blog.Core.Model.Models.UserRole">
<summary>
用户跟角色关联表

3
Blog.Core/Blog.Core.xml
View File

@ -304,12 +304,13 @@
<param name="tname">专题类型</param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.UserController.#ctor(Blog.Core.IServices.IsysUserInfoServices,Blog.Core.IServices.IUserRoleServices)">
<member name="M:Blog.Core.Controllers.UserController.#ctor(Blog.Core.IServices.IsysUserInfoServices,Blog.Core.IServices.IUserRoleServices,Blog.Core.IServices.IRoleServices)">
<summary>
构造函数
</summary>
<param name="sysUserInfoServices"></param>
<param name="userRoleServices"></param>
<param name="roleServices"></param>
</member>
<member name="M:Blog.Core.Controllers.UserController.GetUserInfoByToken(System.String)">
<summary>

24
Blog.Core/Controllers/UserController.cs
View File

@ -19,16 +19,19 @@ namespace Blog.Core.Controllers
{
IsysUserInfoServices _sysUserInfoServices;
IUserRoleServices _userRoleServices;
IRoleServices _roleServices;
/// <summary>
/// 构造函数
/// </summary>
/// <param name="sysUserInfoServices"></param>
/// <param name="userRoleServices"></param>
public UserController(IsysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices )
/// <param name="roleServices"></param>
public UserController(IsysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices, IRoleServices roleServices)
{
_sysUserInfoServices = sysUserInfoServices;
_userRoleServices = userRoleServices;
_roleServices = roleServices;
}
// GET: api/User
@ -58,9 +61,11 @@ namespace Blog.Core.Controllers
foreach (var item in sysUserInfos)
{
if (item!=null)
if (item != null)
{
item.RID =(await _userRoleServices.Query(d => d.UserId == item.uID)).FirstOrDefault()?.RoleId.ObjToString();
var userrole = (await _userRoleServices.Query(d => d.UserId == item.uID)).OrderByDescending(d => d.Id).FirstOrDefault();
item.RID = (userrole?.RoleId).ObjToInt();
item.RoleName = ((await _roleServices.QueryByID(item.RID))?.Name);
}
}
@ -104,11 +109,11 @@ namespace Blog.Core.Controllers
if (tokenModel != null && tokenModel.Uid > 0)
{
var userinfo = await _sysUserInfoServices.QueryByID(tokenModel.Uid);
if (userinfo!=null)
if (userinfo != null)
{
data.response = userinfo;
data.success = true;
data.msg = "获取成功";
data.msg = "获取成功";
}
}
@ -140,6 +145,15 @@ namespace Blog.Core.Controllers
var data = new MessageModel<string>();
if (sysUserInfo != null && sysUserInfo.uID > 0)
{
if (sysUserInfo.RID > 0)
{
var usrerole = await _userRoleServices.Query(d => d.UserId == sysUserInfo.uID && d.RoleId == sysUserInfo.RID);
if (usrerole.Count==0)
{
await _userRoleServices.Add(new UserRole(sysUserInfo.uID, sysUserInfo.RID));
}
}
data.success = await _sysUserInfoServices.Update(sysUserInfo);
if (data.success)
{