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

fix: format the code. #232

Browse Source
This commit is contained in:
anjoy8 2022-03-15 10:52:55 +08:00
parent 2bbc4279e5
commit 7c43929729
13 changed files with 669 additions and 671 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Blog.Core.Api/Blog.Core.Api.csproj
View File

@ -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" />

28
Blog.Core.Api/Blog.Core.Model.xml
View File

@ -691,57 +691,57 @@
修改时间
</summary>
</member>
<member name="T:Blog.Core.Model.Models.sysUserInfo">
<member name="T:Blog.Core.Model.Models.SysUserInfo">
<summary>
用户信息表
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uLoginName">
<member name="P:Blog.Core.Model.Models.SysUserInfo.LoginName">
<summary>
登录账号
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uLoginPWD">
<member name="P:Blog.Core.Model.Models.SysUserInfo.LoginPWD">
<summary>
登录密码
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uRealName">
<member name="P:Blog.Core.Model.Models.SysUserInfo.RealName">
<summary>
真实姓名
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uStatus">
<member name="P:Blog.Core.Model.Models.SysUserInfo.Status">
<summary>
状态
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uRemark">
<member name="P:Blog.Core.Model.Models.SysUserInfo.Remark">
<summary>
备注
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uCreateTime">
<member name="P:Blog.Core.Model.Models.SysUserInfo.CreateTime">
<summary>
创建时间
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uUpdateTime">
<member name="P:Blog.Core.Model.Models.SysUserInfo.UpdateTime">
<summary>
更新时间
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uLastErrTime">
<member name="P:Blog.Core.Model.Models.SysUserInfo.LastErrorTime">
<summary>
最后登录时间
最后异常时间
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.uErrorCount">
<member name="P:Blog.Core.Model.Models.SysUserInfo.ErrorCount">
<summary>
错误次数
</summary>
</member>
<member name="P:Blog.Core.Model.Models.sysUserInfo.name">
<member name="P:Blog.Core.Model.Models.SysUserInfo.Name">
<summary>
登录账号
</summary>
@ -1445,12 +1445,12 @@
泛型主键Tkey
</summary>
</member>
<member name="T:Blog.Core.Model.sysUserInfoRoot`1">
<member name="T:Blog.Core.Model.SysUserInfoRoot`1">
<summary>
用户信息表
</summary>
</member>
<member name="P:Blog.Core.Model.sysUserInfoRoot`1.uID">
<member name="P:Blog.Core.Model.SysUserInfoRoot`1.Id">
<summary>
uID
泛型主键Tkey

4
Blog.Core.Api/Blog.Core.xml
View File

@ -660,14 +660,14 @@
<param name="token">令牌</param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.UserController.Post(Blog.Core.Model.Models.sysUserInfo)">
<member name="M:Blog.Core.Controllers.UserController.Post(Blog.Core.Model.Models.SysUserInfo)">
<summary>
添加一个用户
</summary>
<param name="sysUserInfo"></param>
<returns></returns>
</member>
<member name="M:Blog.Core.Controllers.UserController.Put(Blog.Core.Model.Models.sysUserInfo)">
<member name="M:Blog.Core.Controllers.UserController.Put(Blog.Core.Model.Models.SysUserInfo)">
<summary>
更新用户与角色
</summary>

8
Blog.Core.Api/Controllers/LoginController.cs
View File

@ -152,14 +152,14 @@ namespace Blog.Core.Controllers
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)));
@ -209,10 +209,10 @@ namespace Blog.Core.Controllers
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)));

32
Blog.Core.Api/Controllers/UserController.cs
View File

@ -57,7 +57,7 @@ namespace Blog.Core.Controllers
/// <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))
{
@ -66,7 +66,7 @@ namespace Blog.Core.Controllers
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
@ -78,7 +78,7 @@ namespace Blog.Core.Controllers
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();
}
@ -87,7 +87,7 @@ namespace Blog.Core.Controllers
#endregion
return new MessageModel<PageModel<sysUserInfo>>()
return new MessageModel<PageModel<SysUserInfo>>()
{
msg = "获取成功",
success = data.dataCount >= 0,
@ -114,9 +114,9 @@ namespace Blog.Core.Controllers
/// <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);
@ -142,12 +142,12 @@ namespace Blog.Core.Controllers
/// <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;
@ -167,7 +167,7 @@ namespace Blog.Core.Controllers
/// <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)
{
// 这里使用事务处理
@ -176,12 +176,12 @@ namespace Blog.Core.Controllers
{
_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);
@ -191,7 +191,7 @@ namespace Blog.Core.Controllers
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);
@ -205,7 +205,7 @@ namespace Blog.Core.Controllers
if (data.success)
{
data.msg = "更新成功";
data.response = sysUserInfo?.uID.ObjToString();
data.response = sysUserInfo?.Id.ObjToString();
}
}
}
@ -231,12 +231,12 @@ namespace Blog.Core.Controllers
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();
}
}

4
Blog.Core.Api/Controllers/UserRoleController.cs
View File

@ -42,9 +42,9 @@ namespace Blog.Core.Controllers
/// <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 = "添加成功",

1170
Blog.Core.Api/wwwroot/BlogCore.Data.json/sysUserInfo.tsv
View File

File diff suppressed because it is too large Load Diff

6
Blog.Core.Common/Seed/DBSeed.cs
View File

@ -253,11 +253,11 @@ namespace Blog.Core.Common.Seed
#region sysUserInfo
if (!await myContext.Db.Queryable<sysUserInfo>().AnyAsync())
if (!await myContext.Db.Queryable<SysUserInfo>().AnyAsync())
{
var data = JsonConvert.DeserializeObject<List<sysUserInfo>>(FileHelper.ReadFile(string.Format(SeedDataFolder, "sysUserInfo"), Encoding.UTF8), setting);
var data = JsonConvert.DeserializeObject<List<SysUserInfo>>(FileHelper.ReadFile(string.Format(SeedDataFolder, "sysUserInfo"), Encoding.UTF8), setting);
myContext.GetEntityDB<sysUserInfo>().InsertRange(data);
myContext.GetEntityDB<SysUserInfo>().InsertRange(data);
Console.WriteLine("Table:sysUserInfo created success!");
}
else

4
Blog.Core.IServices/IsysUserInfoServices.cs
View File

@ -9,9 +9,9 @@ namespace Blog.Core.IServices
/// <summary>
/// sysUserInfoServices
/// </summary>
public interface ISysUserInfoServices :IBaseServices<sysUserInfo>
public interface ISysUserInfoServices :IBaseServices<SysUserInfo>
{
Task<sysUserInfo> SaveUserInfo(string loginName, string loginPwd);
Task<SysUserInfo> SaveUserInfo(string loginName, string loginPwd);
Task<string> GetUserRoleNameStr(string loginName, string loginPwd);
}
}

2
Blog.Core.Model/Models/OperateLog.cs
View File

@ -55,6 +55,6 @@ namespace Blog.Core.Model.Models
public int UserId { get; set; }
[SugarColumn(IsIgnore = true)]
public virtual sysUserInfo User { get; set; }
public virtual SysUserInfo User { get; set; }
}
}

4
Blog.Core.Model/Models/RootTkey/sysUserInfoRoot.cs
View File

@ -7,14 +7,14 @@ namespace Blog.Core.Model
/// <summary>
/// 用户信息表
/// </summary>
public class sysUserInfoRoot<Tkey> where Tkey : IEquatable<Tkey>
public class SysUserInfoRoot<Tkey> where Tkey : IEquatable<Tkey>
{
/// <summary>
/// uID
/// 泛型主键Tkey
/// </summary>
[SugarColumn(IsNullable = false, IsPrimaryKey = true)]
public Tkey uID { get; set; }
public Tkey Id { get; set; }
[SugarColumn(IsIgnore = true)]
public List<Tkey> RIDs { get; set; }

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

@ -8,90 +8,88 @@ namespace Blog.Core.Model.Models
/// 用户信息表
/// </summary>
[SugarTable("SysUserInfo")]
public class sysUserInfo : sysUserInfoRoot<int>
public class SysUserInfo : SysUserInfoRoot<int>
{
public sysUserInfo() { }
public SysUserInfo() { }
public sysUserInfo(string loginName, string loginPWD)
public SysUserInfo(string loginName, string loginPWD)
{
uLoginName = loginName;
uLoginPWD = loginPWD;
uRealName = uLoginName;
uStatus = 0;
uCreateTime = DateTime.Now;
uUpdateTime = DateTime.Now;
uLastErrTime = DateTime.Now;
uErrorCount = 0;
name = "";
LoginName = loginName;
LoginPWD = loginPWD;
RealName = LoginName;
Status = 0;
CreateTime = DateTime.Now;
UpdateTime = DateTime.Now;
LastErrorTime = DateTime.Now;
ErrorCount = 0;
Name = "";
}
/// <summary>
/// 登录账号
/// </summary>
[SugarColumn(Length = 200, IsNullable = true)]
public string uLoginName { get; set; }
public string LoginName { get; set; }
/// <summary>
/// 登录密码
/// </summary>
[SugarColumn(Length = 200, IsNullable = true)]
public string uLoginPWD { get; set; }
public string LoginPWD { get; set; }
/// <summary>
/// 真实姓名
/// </summary>
[SugarColumn(Length = 200, IsNullable = true)]
public string uRealName { get; set; }
public string RealName { get; set; }
/// <summary>
/// 状态
/// </summary>
public int uStatus { get; set; }
public int Status { get; set; }
/// <summary>
/// 备注
/// </summary>
[SugarColumn(Length = 2000, IsNullable = true)]
public string uRemark { get; set; }
public string Remark { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public System.DateTime uCreateTime { get; set; } = DateTime.Now;
public DateTime CreateTime { get; set; } = DateTime.Now;
/// <summary>
/// 更新时间
/// </summary>
public System.DateTime uUpdateTime { get; set; } = DateTime.Now;
public DateTime UpdateTime { get; set; } = DateTime.Now;
/// <summary>
///最后登录时间
///最后异常时间
/// </summary>
public DateTime uLastErrTime { get; set; } = DateTime.Now;
public DateTime LastErrorTime { get; set; } = DateTime.Now;
/// <summary>
///错误次数
/// </summary>
public int uErrorCount { get; set; }
public int ErrorCount { get; set; }
/// <summary>
/// 登录账号
/// </summary>
[SugarColumn(Length = 200, IsNullable = true)]
public string name { get; set; }
public string Name { get; set; }
// 性别
[SugarColumn(IsNullable = true)]
public int sex { get; set; } = 0;
public int Sex { get; set; } = 0;
// 年龄
[SugarColumn(IsNullable = true)]
public int age { get; set; }
public int Age { get; set; }
// 生日
[SugarColumn(IsNullable = true)]
public DateTime birth { get; set; } = DateTime.Now;
public DateTime Birth { get; set; } = DateTime.Now;
// 地址
[SugarColumn(Length = 200, IsNullable = true)]
public string addr { get; set; }
public string Address { get; set; }
[SugarColumn(IsNullable = true)]
public bool tdIsDelete { get; set; }
public bool IsDeleted { get; set; }
[SugarColumn(IsIgnore = true)]

18
Blog.Core.Services/sysUserInfoServices.cs
View File

@ -10,13 +10,13 @@ namespace Blog.Core.FrameWork.Services
/// <summary>
/// sysUserInfoServices
/// </summary>
public class SysUserInfoServices : BaseServices<sysUserInfo>, ISysUserInfoServices
public class SysUserInfoServices : BaseServices<SysUserInfo>, ISysUserInfoServices
{
private readonly IBaseRepository<sysUserInfo> _dal;
private readonly IBaseRepository<SysUserInfo> _dal;
private readonly IBaseRepository<UserRole> _userRoleRepository;
private readonly IBaseRepository<Role> _roleRepository;
public SysUserInfoServices(IBaseRepository<sysUserInfo> dal, IBaseRepository<UserRole> userRoleRepository, IBaseRepository<Role> roleRepository)
public SysUserInfoServices(IBaseRepository<SysUserInfo> dal, IBaseRepository<UserRole> userRoleRepository, IBaseRepository<Role> roleRepository)
{
this._dal = dal;
_userRoleRepository = userRoleRepository;
@ -29,11 +29,11 @@ namespace Blog.Core.FrameWork.Services
/// <param name="loginName"></param>
/// <param name="loginPwd"></param>
/// <returns></returns>
public async Task<sysUserInfo> SaveUserInfo(string loginName, string loginPwd)
public async Task<SysUserInfo> SaveUserInfo(string loginName, string loginPwd)
{
sysUserInfo sysUserInfo = new sysUserInfo(loginName, loginPwd);
sysUserInfo model = new sysUserInfo();
var userList = await base.Query(a => a.uLoginName == sysUserInfo.uLoginName && a.uLoginPWD == sysUserInfo.uLoginPWD);
SysUserInfo sysUserInfo = new SysUserInfo(loginName, loginPwd);
SysUserInfo model = new SysUserInfo();
var userList = await base.Query(a => a.LoginName == sysUserInfo.LoginName && a.LoginPWD == sysUserInfo.LoginPWD);
if (userList.Count > 0)
{
model = userList.FirstOrDefault();
@ -57,11 +57,11 @@ namespace Blog.Core.FrameWork.Services
public async Task<string> GetUserRoleNameStr(string loginName, string loginPwd)
{
string roleName = "";
var user = (await base.Query(a => a.uLoginName == loginName && a.uLoginPWD == loginPwd)).FirstOrDefault();
var user = (await base.Query(a => a.LoginName == loginName && a.LoginPWD == loginPwd)).FirstOrDefault();
var roleList = await _roleRepository.Query(a => a.IsDeleted == false);
if (user != null)
{
var userRoles = await _userRoleRepository.Query(ur => ur.UserId == user.uID);
var userRoles = await _userRoleRepository.Query(ur => ur.UserId == user.Id);
if (userRoles.Count > 0)
{
var arr = userRoles.Select(ur => ur.RoleId.ObjToString()).ToList();