From 7c43929729b5408c77a04b3ad88e4b01c3ad5790 Mon Sep 17 00:00:00 2001 From: anjoy8 <3143422472@qq.com> Date: Tue, 15 Mar 2022 10:52:55 +0800 Subject: [PATCH] fix: format the code. #232 --- Blog.Core.Api/Blog.Core.Api.csproj | 2 +- Blog.Core.Api/Blog.Core.Model.xml | 28 +- Blog.Core.Api/Blog.Core.xml | 4 +- Blog.Core.Api/Controllers/LoginController.cs | 8 +- Blog.Core.Api/Controllers/UserController.cs | 32 +- .../Controllers/UserRoleController.cs | 4 +- .../BlogCore.Data.json/sysUserInfo.tsv | 1170 ++++++++--------- Blog.Core.Common/Seed/DBSeed.cs | 6 +- Blog.Core.IServices/IsysUserInfoServices.cs | 4 +- Blog.Core.Model/Models/OperateLog.cs | 2 +- .../Models/RootTkey/sysUserInfoRoot.cs | 4 +- Blog.Core.Model/Models/sysUserInfo.cs | 58 +- Blog.Core.Services/sysUserInfoServices.cs | 18 +- 13 files changed, 669 insertions(+), 671 deletions(-) diff --git a/Blog.Core.Api/Blog.Core.Api.csproj b/Blog.Core.Api/Blog.Core.Api.csproj index b5725ed..a9499b1 100644 --- a/Blog.Core.Api/Blog.Core.Api.csproj +++ b/Blog.Core.Api/Blog.Core.Api.csproj @@ -64,7 +64,7 @@ - + diff --git a/Blog.Core.Api/Blog.Core.Model.xml b/Blog.Core.Api/Blog.Core.Model.xml index d6c167e..6aef9cd 100644 --- a/Blog.Core.Api/Blog.Core.Model.xml +++ b/Blog.Core.Api/Blog.Core.Model.xml @@ -691,57 +691,57 @@ 修改时间 - + 用户信息表 - + 登录账号 - + 登录密码 - + 真实姓名 - + 状态 - + 备注 - + 创建时间 - + 更新时间 - + - 最后登录时间 + 最后异常时间 - + 错误次数 - + 登录账号 @@ -1445,12 +1445,12 @@ 泛型主键Tkey - + 用户信息表 - + uID 泛型主键Tkey diff --git a/Blog.Core.Api/Blog.Core.xml b/Blog.Core.Api/Blog.Core.xml index eb1ea54..ad1d8a9 100644 --- a/Blog.Core.Api/Blog.Core.xml +++ b/Blog.Core.Api/Blog.Core.xml @@ -660,14 +660,14 @@ 令牌 - + 添加一个用户 - + 更新用户与角色 diff --git a/Blog.Core.Api/Controllers/LoginController.cs b/Blog.Core.Api/Controllers/LoginController.cs index 52a7a8b..63ab143 100644 --- a/Blog.Core.Api/Controllers/LoginController.cs +++ b/Blog.Core.Api/Controllers/LoginController.cs @@ -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 { 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 { - 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))); diff --git a/Blog.Core.Api/Controllers/UserController.cs b/Blog.Core.Api/Controllers/UserController.cs index fa37fd1..2e23355 100644 --- a/Blog.Core.Api/Controllers/UserController.cs +++ b/Blog.Core.Api/Controllers/UserController.cs @@ -57,7 +57,7 @@ namespace Blog.Core.Controllers /// // GET: api/User [HttpGet] - public async Task>> Get(int page = 1, string key = "") + public async Task>> 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>() + return new MessageModel>() { msg = "获取成功", success = data.dataCount >= 0, @@ -114,9 +114,9 @@ namespace Blog.Core.Controllers /// [HttpGet] [AllowAnonymous] - public async Task> GetInfoByToken(string token) + public async Task> GetInfoByToken(string token) { - var data = new MessageModel(); + var data = new MessageModel(); if (!string.IsNullOrEmpty(token)) { var tokenModel = JwtHelper.SerializeJwt(token); @@ -142,12 +142,12 @@ namespace Blog.Core.Controllers /// // POST: api/User [HttpPost] - public async Task> Post([FromBody] sysUserInfo sysUserInfo) + public async Task> Post([FromBody] SysUserInfo sysUserInfo) { var data = new MessageModel(); - 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 /// // PUT: api/User/5 [HttpPut] - public async Task> Put([FromBody] sysUserInfo sysUserInfo) + public async Task> 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(); 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(); } } diff --git a/Blog.Core.Api/Controllers/UserRoleController.cs b/Blog.Core.Api/Controllers/UserRoleController.cs index 5225fbd..d36fef5 100644 --- a/Blog.Core.Api/Controllers/UserRoleController.cs +++ b/Blog.Core.Api/Controllers/UserRoleController.cs @@ -42,9 +42,9 @@ namespace Blog.Core.Controllers /// /// [HttpGet] - public async Task> AddUser(string loginName, string loginPwd) + public async Task> AddUser(string loginName, string loginPwd) { - return new MessageModel() + return new MessageModel() { success = true, msg = "添加成功", diff --git a/Blog.Core.Api/wwwroot/BlogCore.Data.json/sysUserInfo.tsv b/Blog.Core.Api/wwwroot/BlogCore.Data.json/sysUserInfo.tsv index cdd73ae..4eb742b 100644 --- a/Blog.Core.Api/wwwroot/BlogCore.Data.json/sysUserInfo.tsv +++ b/Blog.Core.Api/wwwroot/BlogCore.Data.json/sysUserInfo.tsv @@ -1,704 +1,704 @@ [ { "Id": 1, - "uLoginName": "laozhang", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "老张", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": "老张的哲学", - "sex": 1, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "laozhang", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "老张", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": "老张的哲学", + "Sex": 1, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 }, { "Id": 2, - "uLoginName": "laoli", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "laoli", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 1, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "laoli", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "laoli", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 1, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 }, { "Id": 3, - "uLoginName": "user", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "userli", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": "广告", - "sex": 1, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "user", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "userli", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": "广告", + "Sex": 1, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 }, { "Id": 4, - "uLoginName": "admins", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "admins", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 }, { "Id": 5, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 6, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 7, - "uLoginName": "tibug", - "uLoginPWD": "BB1C0516F0F4469549CD4A95833A78E5", - "uRealName": "提bug账号", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 1, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "tibug", + "LoginPWD": "BB1C0516F0F4469549CD4A95833A78E5", + "RealName": "提bug账号", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 1, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 }, { "Id": 8, - "uLoginName": "test", - "uLoginPWD": "098F6BCD4621D373CADE4E832627B4F6", - "uRealName": "后台测试1号", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": "测试是", - "sex": 1, - "age": 3, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "test", + "LoginPWD": "098F6BCD4621D373CADE4E832627B4F6", + "RealName": "后台测试1号", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": "测试是", + "Sex": 1, + "Age": 3, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 }, { "Id": 9, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 10, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 11, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 12, - "uLoginName": "blogadmin", - "uLoginPWD": "3FACF26687DAB7254848976256EDB56F", - "uRealName": "后台总管理员", - "uStatus": 0, - "uRemark": "t15", - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 1, - "age": 10, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "blogadmin", + "LoginPWD": "3FACF26687DAB7254848976256EDB56F", + "RealName": "后台总管理员", + "Status": 0, + "Remark": "t15", + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 1, + "Age": 10, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 }, { "Id": 13, - "uLoginName": "test2", - "uLoginPWD": "AD0234829205B9033196BA818F7A872B", - "uRealName": "后台测试2号", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 12, - "birth": "\/Date(1546272000000+0800)\/", - "addr": "北京市", - "tdIsDelete": 0 + "LoginName": "test2", + "LoginPWD": "AD0234829205B9033196BA818F7A872B", + "RealName": "后台测试2号", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 12, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": "北京市", + "IsDeleted": 0 }, { "Id": 14, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 15, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 16, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 17, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 18, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 19, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 20, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 21, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 22, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 23, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 24, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 25, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 26, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 27, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 28, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 29, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 30, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 31, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 32, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 33, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 34, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 35, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 36, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 37, - "uLoginName": "xx", - "uLoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", - "uRealName": "admins", - "uStatus": 0, - "uRemark": null, - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 0, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "xx", + "LoginPWD": "2AEFC34200A294A3CC7DB81B43A81873", + "RealName": "admins", + "Status": 0, + "Remark": null, + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 0, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 38, - "uLoginName": "99", - "uLoginPWD": "AC627AB1CCBDB62EC96E702F7F6425B", - "uRealName": "99", - "uStatus": 0, - "uRemark": "blogadmin", - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": -1, - "age": 0, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 1 + "LoginName": "99", + "LoginPWD": "AC627AB1CCBDB62EC96E702F7F6425B", + "RealName": "99", + "Status": 0, + "Remark": "blogadmin", + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": -1, + "Age": 0, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 1 }, { "Id": 39, - "uLoginName": "Kawhi", - "uLoginPWD": "96FEE3FD714358658BFB881A4E1642BE", - "uRealName": "Kawhi 测试员", - "uStatus": 0, - "uRemark": "blogadmin", - "uCreateTime": "\/Date(1546272000000+0800)\/", - "uUpdateTime": "\/Date(1546272000000+0800)\/", - "uLastErrTime": "\/Date(1546272000000+0800)\/", - "uErrorCount": 0, - "name": null, - "sex": 1, - "age": 18, - "birth": "\/Date(1546272000000+0800)\/", - "addr": null, - "tdIsDelete": 0 + "LoginName": "Kawhi", + "LoginPWD": "96FEE3FD714358658BFB881A4E1642BE", + "RealName": "Kawhi 测试员", + "Status": 0, + "Remark": "blogadmin", + "CreateTime": "\/Date(1546272000000+0800)\/", + "UpdateTime": "\/Date(1546272000000+0800)\/", + "LastErrorTime": "\/Date(1546272000000+0800)\/", + "ErrorCount": 0, + "Name": null, + "Sex": 1, + "Age": 18, + "Birth": "\/Date(1546272000000+0800)\/", + "Address": null, + "IsDeleted": 0 } ] diff --git a/Blog.Core.Common/Seed/DBSeed.cs b/Blog.Core.Common/Seed/DBSeed.cs index 1d00bbc..11fcdae 100644 --- a/Blog.Core.Common/Seed/DBSeed.cs +++ b/Blog.Core.Common/Seed/DBSeed.cs @@ -253,11 +253,11 @@ namespace Blog.Core.Common.Seed #region sysUserInfo - if (!await myContext.Db.Queryable().AnyAsync()) + if (!await myContext.Db.Queryable().AnyAsync()) { - var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "sysUserInfo"), Encoding.UTF8), setting); + var data = JsonConvert.DeserializeObject>(FileHelper.ReadFile(string.Format(SeedDataFolder, "sysUserInfo"), Encoding.UTF8), setting); - myContext.GetEntityDB().InsertRange(data); + myContext.GetEntityDB().InsertRange(data); Console.WriteLine("Table:sysUserInfo created success!"); } else diff --git a/Blog.Core.IServices/IsysUserInfoServices.cs b/Blog.Core.IServices/IsysUserInfoServices.cs index f46cba0..a2db873 100644 --- a/Blog.Core.IServices/IsysUserInfoServices.cs +++ b/Blog.Core.IServices/IsysUserInfoServices.cs @@ -9,9 +9,9 @@ namespace Blog.Core.IServices /// /// sysUserInfoServices /// - public interface ISysUserInfoServices :IBaseServices + public interface ISysUserInfoServices :IBaseServices { - Task SaveUserInfo(string loginName, string loginPwd); + Task SaveUserInfo(string loginName, string loginPwd); Task GetUserRoleNameStr(string loginName, string loginPwd); } } diff --git a/Blog.Core.Model/Models/OperateLog.cs b/Blog.Core.Model/Models/OperateLog.cs index 5d9cfe1..4086781 100644 --- a/Blog.Core.Model/Models/OperateLog.cs +++ b/Blog.Core.Model/Models/OperateLog.cs @@ -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; } } } diff --git a/Blog.Core.Model/Models/RootTkey/sysUserInfoRoot.cs b/Blog.Core.Model/Models/RootTkey/sysUserInfoRoot.cs index 5605374..1c09f18 100644 --- a/Blog.Core.Model/Models/RootTkey/sysUserInfoRoot.cs +++ b/Blog.Core.Model/Models/RootTkey/sysUserInfoRoot.cs @@ -7,14 +7,14 @@ namespace Blog.Core.Model /// /// 用户信息表 /// - public class sysUserInfoRoot where Tkey : IEquatable + public class SysUserInfoRoot where Tkey : IEquatable { /// /// uID /// 泛型主键Tkey /// [SugarColumn(IsNullable = false, IsPrimaryKey = true)] - public Tkey uID { get; set; } + public Tkey Id { get; set; } [SugarColumn(IsIgnore = true)] public List RIDs { get; set; } diff --git a/Blog.Core.Model/Models/sysUserInfo.cs b/Blog.Core.Model/Models/sysUserInfo.cs index ef51c74..d8ffeee 100644 --- a/Blog.Core.Model/Models/sysUserInfo.cs +++ b/Blog.Core.Model/Models/sysUserInfo.cs @@ -8,90 +8,88 @@ namespace Blog.Core.Model.Models /// 用户信息表 /// [SugarTable("SysUserInfo")] - public class sysUserInfo : sysUserInfoRoot + public class SysUserInfo : SysUserInfoRoot { - 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 = ""; } /// /// 登录账号 /// [SugarColumn(Length = 200, IsNullable = true)] - public string uLoginName { get; set; } + public string LoginName { get; set; } /// /// 登录密码 /// [SugarColumn(Length = 200, IsNullable = true)] - public string uLoginPWD { get; set; } + public string LoginPWD { get; set; } /// /// 真实姓名 /// [SugarColumn(Length = 200, IsNullable = true)] - public string uRealName { get; set; } + public string RealName { get; set; } /// /// 状态 /// - public int uStatus { get; set; } + public int Status { get; set; } /// /// 备注 /// [SugarColumn(Length = 2000, IsNullable = true)] - public string uRemark { get; set; } + public string Remark { get; set; } /// /// 创建时间 /// - public System.DateTime uCreateTime { get; set; } = DateTime.Now; + public DateTime CreateTime { get; set; } = DateTime.Now; /// /// 更新时间 /// - public System.DateTime uUpdateTime { get; set; } = DateTime.Now; + public DateTime UpdateTime { get; set; } = DateTime.Now; /// - ///最后登录时间 + ///最后异常时间 /// - public DateTime uLastErrTime { get; set; } = DateTime.Now; + public DateTime LastErrorTime { get; set; } = DateTime.Now; /// ///错误次数 /// - public int uErrorCount { get; set; } - + public int ErrorCount { get; set; } /// /// 登录账号 /// [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)] diff --git a/Blog.Core.Services/sysUserInfoServices.cs b/Blog.Core.Services/sysUserInfoServices.cs index 3d5521d..f536cf7 100644 --- a/Blog.Core.Services/sysUserInfoServices.cs +++ b/Blog.Core.Services/sysUserInfoServices.cs @@ -10,13 +10,13 @@ namespace Blog.Core.FrameWork.Services /// /// sysUserInfoServices /// - public class SysUserInfoServices : BaseServices, ISysUserInfoServices + public class SysUserInfoServices : BaseServices, ISysUserInfoServices { - private readonly IBaseRepository _dal; + private readonly IBaseRepository _dal; private readonly IBaseRepository _userRoleRepository; private readonly IBaseRepository _roleRepository; - public SysUserInfoServices(IBaseRepository dal, IBaseRepository userRoleRepository, IBaseRepository roleRepository) + public SysUserInfoServices(IBaseRepository dal, IBaseRepository userRoleRepository, IBaseRepository roleRepository) { this._dal = dal; _userRoleRepository = userRoleRepository; @@ -29,11 +29,11 @@ namespace Blog.Core.FrameWork.Services /// /// /// - public async Task SaveUserInfo(string loginName, string loginPwd) + public async Task 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 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();