From d3556cc058a4750b1841018e93a36cf26a0d7111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=96=87=E6=B0=B8=E8=BE=BE?= Date: Fri, 22 Sep 2023 01:09:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9B=86=E6=88=90CSRedis=E5=88=86=E5=B8=83?= =?UTF-8?q?=E5=BC=8F=E5=AD=98=E5=82=A8=EF=BC=8C=E8=B0=83=E6=95=B4=E5=88=9B?= =?UTF-8?q?=E5=BB=BA=E8=80=85=E5=92=8C=E6=9B=B4=E6=96=B0=E8=80=85=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=EF=BC=8C=E7=99=BB=E5=BD=95RSA=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE=E7=A7=81?= =?UTF-8?q?=E9=92=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Infrastructure/Cache/RedisServer.cs | 2 ++ Infrastructure/JwtUtil.cs | 3 ++- Infrastructure/Model/TokenModel.cs | 1 + .../WebExtensions/HttpContextExtension.cs | 8 ++++++++ Infrastructure/ZR.Infrastructure.csproj | 2 ++ .../System/CodeGeneratorController.cs | 3 ++- .../Controllers/System/SysDeptController.cs | 6 ++++-- .../System/SysDictDataController.cs | 6 ++++-- .../System/SysDictTypeController.cs | 6 ++++-- .../Controllers/System/SysLoginController.cs | 9 ++++++++- .../Controllers/System/SysMenuController.cs | 6 ++++-- .../Controllers/System/SysNoticeController.cs | 6 ++++-- .../Controllers/System/SysRoleController.cs | 9 ++++++--- .../Controllers/System/SysUserController.cs | 6 ++++-- .../Controllers/System/TasksController.cs | 6 ++++-- ZR.Admin.WebApi/Program.cs | 7 +++++++ ZR.Admin.WebApi/appsettings.json | 2 +- ZR.Admin.WebApi/loginVerifyConf.json | 5 +++++ ZR.CodeGenerator/CodeGeneratorTool.cs | 2 +- ZR.ServiceCore/Model/Dto/SysNoticeDto.cs | 2 +- ZR.ServiceCore/Model/SysBase.cs | 19 +++++++++++++++---- ZR.ServiceCore/Model/SysRoleMenu.cs | 2 +- ZR.ServiceCore/Services/SysMenuService.cs | 2 +- ZR.ServiceCore/Services/SysNoticeService.cs | 6 ++++-- ZR.ServiceCore/Services/SysRoleService.cs | 2 -- 25 files changed, 95 insertions(+), 33 deletions(-) create mode 100644 ZR.Admin.WebApi/loginVerifyConf.json diff --git a/Infrastructure/Cache/RedisServer.cs b/Infrastructure/Cache/RedisServer.cs index aa3312c..a44c178 100644 --- a/Infrastructure/Cache/RedisServer.cs +++ b/Infrastructure/Cache/RedisServer.cs @@ -1,5 +1,6 @@ using CSRedis; using Infrastructure; +using Microsoft.Extensions.Caching.Distributed; namespace ZR.Common.Cache { @@ -12,6 +13,7 @@ namespace ZR.Common.Cache { Cache = new CSRedisClient(AppSettings.GetConfig("RedisServer:Cache")); Session = new CSRedisClient(AppSettings.GetConfig("RedisServer:Session")); + RedisHelper.Initialization(Cache); } } } diff --git a/Infrastructure/JwtUtil.cs b/Infrastructure/JwtUtil.cs index bf6a71d..39c68c4 100644 --- a/Infrastructure/JwtUtil.cs +++ b/Infrastructure/JwtUtil.cs @@ -157,7 +157,8 @@ namespace Infrastructure { new Claim(ClaimTypes.PrimarySid, user.UserId.ToString()), new Claim(ClaimTypes.Name, user.UserName), - new Claim(ClaimTypes.UserData, JsonConvert.SerializeObject(user)) + new Claim(ClaimTypes.UserData, JsonConvert.SerializeObject(user)), + new Claim("NickName", user.NickName) }; return claims; diff --git a/Infrastructure/Model/TokenModel.cs b/Infrastructure/Model/TokenModel.cs index bdfd86a..e624778 100644 --- a/Infrastructure/Model/TokenModel.cs +++ b/Infrastructure/Model/TokenModel.cs @@ -9,6 +9,7 @@ namespace Infrastructure.Model public long UserId { get; set; } public long DeptId { get; set; } public string UserName { get; set; } + public string NickName { get; set; } /// /// 角色集合 /// diff --git a/Infrastructure/WebExtensions/HttpContextExtension.cs b/Infrastructure/WebExtensions/HttpContextExtension.cs index 23efa03..83f1988 100644 --- a/Infrastructure/WebExtensions/HttpContextExtension.cs +++ b/Infrastructure/WebExtensions/HttpContextExtension.cs @@ -91,6 +91,14 @@ namespace Infrastructure.Extensions return uid; } + + public static string? GetNickName(this HttpContext context) + { + var nickName = context.User.FindFirstValue("NickName"); + if (string.IsNullOrEmpty(nickName)) + nickName = null; + return nickName; + } /// /// 判断是否是管理员 diff --git a/Infrastructure/ZR.Infrastructure.csproj b/Infrastructure/ZR.Infrastructure.csproj index f96d4e0..7f651dc 100644 --- a/Infrastructure/ZR.Infrastructure.csproj +++ b/Infrastructure/ZR.Infrastructure.csproj @@ -12,8 +12,10 @@ + + diff --git a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs index 61fb659..117bdd7 100644 --- a/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs +++ b/ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs @@ -304,7 +304,8 @@ namespace ZR.Admin.WebApi.Controllers if (string.IsNullOrEmpty(tableName) || tableId <= 0) throw new CustomException("参数错误"); GenTable table = GenTableService.GetGenTableInfo(tableId); if (table == null) { throw new CustomException("同步数据失败，原表结构不存在"); } - table.Update_by = HttpContext.GetName(); + table.Update_by = HttpContext.GetUId(); + table.Update_name = HttpContext.GetNickName(); List dbColumnInfos = _CodeGeneraterService.GetColumnInfo(table.DbName, tableName); List dbTableColumns = CodeGeneratorTool.InitGenTableColumn(table, dbColumnInfos); diff --git a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs index 2b53ac6..1c27be9 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDeptController.cs @@ -114,7 +114,8 @@ namespace ZR.Admin.WebApi.Controllers.System { return ToResponse(ResultCode.CUSTOM_ERROR, $"新增部门{dept.DeptName}失败，部门名称已存在"); } - dept.Create_by = HttpContext.GetName(); + dept.Create_by = HttpContext.GetUId(); + dept.Create_name = HttpContext.GetNickName(); return ToResponse(DeptService.InsertDept(dept)); } @@ -136,7 +137,8 @@ namespace ZR.Admin.WebApi.Controllers.System { return ToResponse(ResultCode.CUSTOM_ERROR, $"修改部门{dept.DeptName}失败，上级部门不能是自己"); } - dept.Update_by = HttpContext.GetName(); + dept.Update_by = HttpContext.GetUId(); + dept.Update_name = HttpContext.GetNickName(); return ToResponse(DeptService.UpdateDept(dept)); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs index 05d7dac..874f484 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs @@ -109,7 +109,8 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpPost()] public IActionResult Add([FromBody] SysDictData dict) { - dict.Create_by = HttpContext.GetName(); + dict.Create_by = HttpContext.GetUId(); + dict.Create_name = HttpContext.GetNickName(); dict.Create_time = DateTime.Now; return SUCCESS(SysDictDataService.InsertDictData(dict)); } @@ -124,7 +125,8 @@ namespace ZR.Admin.WebApi.Controllers.System [HttpPut()] public IActionResult Edit([FromBody] SysDictData dict) { - dict.Update_by = HttpContext.GetName(); + dict.Update_by = HttpContext.GetUId(); + dict.Update_name = HttpContext.GetNickName(); return SUCCESS(SysDictDataService.UpdateDictData(dict)); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs index a978d22..392d555 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs @@ -65,7 +65,8 @@ namespace ZR.Admin.WebApi.Controllers.System { return ToResponse(ApiResult.Error($"新增字典'{dict.DictName}'失败，字典类型已存在")); } - dict.Create_by = HttpContext.GetName(); + dict.Create_by = HttpContext.GetUId(); + dict.Create_name = HttpContext.GetNickName(); dict.Create_time = DateTime.Now; return SUCCESS(SysDictService.InsertDictType(dict)); } @@ -87,7 +88,8 @@ namespace ZR.Admin.WebApi.Controllers.System return ToResponse(ApiResult.Error($"修改字典'{dict.DictName}'失败，字典类型已存在")); } //设置添加人 - dict.Update_by = HttpContext.GetName(); + dict.Update_by = HttpContext.GetUId(); + dict.Update_name = HttpContext.GetNickName(); return SUCCESS(SysDictService.UpdateDictType(dict)); } diff --git a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs index 7e256cf..35696ec 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysLoginController.cs @@ -1,6 +1,7 @@ using Lazy.Captcha.Core; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; +using NETCore.Encrypt; using ZR.Admin.WebApi.Filters; using ZR.Model.System; using ZR.Model.System.Dto; @@ -47,7 +48,9 @@ namespace ZR.Admin.WebApi.Controllers.System roleService = sysRoleService; this.optionSettings = optionSettings.Value; } - + + // RSA私钥 + private static readonly string PrivatePem = AppSettings.GetConfig("RSA:PrivatePem"); /// /// 登录 @@ -69,6 +72,10 @@ namespace ZR.Admin.WebApi.Controllers.System sysLoginService.CheckLockUser(loginBody.Username); string location = HttpContextExtension.GetIpInfo(loginBody.LoginIP); + + // RSA解密 + loginBody.Password = EncryptProvider.RSADecryptWithPem(PrivatePem, loginBody.Password); + var user = sysLoginService.Login(loginBody, new SysLogininfor() { LoginLocation = location }); List roles = roleService.SelectUserRoleListByUserId(user.UserId); diff --git a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs index a6cff1f..5c0bc07 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysMenuController.cs @@ -113,7 +113,8 @@ namespace ZR.Admin.WebApi.Controllers.System { return ToResponse(ApiResult.Error($"修改菜单'{modal.MenuName}'失败，上级菜单不能选择自己")); } - modal.Update_by = HttpContext.GetName(); + modal.Update_by = HttpContext.GetUId(); + modal.Update_name = HttpContext.GetNickName(); long result = sysMenuService.EditMenu(modal); return ToResponse(result); @@ -145,7 +146,8 @@ namespace ZR.Admin.WebApi.Controllers.System return ToResponse(ApiResult.Error($"新增菜单'{menu.MenuName}'失败，地址必须以http(s)://开头")); } - menu.Create_by = HttpContext.GetName(); + menu.Create_by = HttpContext.GetUId(); + menu.Create_name = HttpContext.GetNickName(); long result = sysMenuService.AddMenu(menu); return ToResponse(result); diff --git a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs index 18e304e..1e9abb4 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs @@ -104,7 +104,8 @@ namespace ZR.Admin.WebApi.Controllers.System public IActionResult UpdateSysNotice([FromBody] SysNoticeDto parm) { var model = parm.Adapt().ToUpdate(HttpContext); - model.Update_by = HttpContext.GetName(); + model.Update_by = HttpContext.GetUId(); + model.Update_name = HttpContext.GetNickName(); var response = _SysNoticeService.Update(w => w.NoticeId == model.NoticeId, it => new SysNotice() { NoticeTitle = model.NoticeTitle, @@ -112,7 +113,8 @@ namespace ZR.Admin.WebApi.Controllers.System NoticeContent = model.NoticeContent, Status = model.Status, Remark = model.Remark, - Update_by = HttpContext.GetName(), + Update_by = HttpContext.GetUId(), + Update_name = HttpContext.GetNickName(), Update_time = DateTime.Now }); diff --git a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs index 35954c3..d39b4bc 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysRoleController.cs @@ -70,7 +70,8 @@ namespace ZR.Admin.WebApi.Controllers.System return ToResponse(ApiResult.Error((int)ResultCode.CUSTOM_ERROR, $"新增角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); } - sysRoleDto.Create_by = HttpContext.GetName(); + sysRoleDto.Create_by = HttpContext.GetUId(); + sysRoleDto.Create_name = HttpContext.GetNickName(); long roleId = sysRoleService.InsertRole(sysRoleDto); return ToResponse(roleId); @@ -101,7 +102,8 @@ namespace ZR.Admin.WebApi.Controllers.System return ToResponse(ApiResult.Error($"编辑角色'{sysRoleDto.RoleName}'失败，角色权限已存在")); } } - sysRoleDto.Update_by = HttpContext.GetName(); + sysRoleDto.Update_by = HttpContext.GetUId(); + sysRoleDto.Update_name = HttpContext.GetNickName(); int upResult = sysRoleService.UpdateRole(sysRoleDto); if (upResult > 0) { @@ -122,7 +124,8 @@ namespace ZR.Admin.WebApi.Controllers.System { if (sysRoleDto == null || sysRoleDto.RoleId <= 0) return ToResponse(ApiResult.Error(101, "请求参数错误")); SysRole sysRole = sysRoleDto.Adapt(); - sysRoleDto.Create_by = HttpContext.GetName(); + sysRoleDto.Create_by = HttpContext.GetUId(); + sysRoleDto.Create_name = HttpContext.GetNickName(); sysRoleService.CheckRoleAllowed(sysRole); bool result = sysRoleService.AuthDataScope(sysRoleDto); diff --git a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs index 9242360..d427265 100644 --- a/ZR.Admin.WebApi/Controllers/System/SysUserController.cs +++ b/ZR.Admin.WebApi/Controllers/System/SysUserController.cs @@ -92,7 +92,8 @@ namespace ZR.Admin.WebApi.Controllers.System return ToResponse(ApiResult.Error($"新增用户 '{user.UserName}'失败，登录账号已存在")); } - user.Create_by = HttpContext.GetName(); + user.Create_by = HttpContext.GetUId(); + user.Create_name = HttpContext.GetNickName(); user.Create_time = DateTime.Now; user.Password = NETCore.Encrypt.EncryptProvider.Md5(user.Password); @@ -111,7 +112,8 @@ namespace ZR.Admin.WebApi.Controllers.System { if (user == null || user.UserId <= 0) { return ToResponse(ApiResult.Error(101, "请求参数错误")); } - user.Update_by = HttpContext.GetName(); + user.Update_by = HttpContext.GetUId(); + user.Update_name = HttpContext.GetNickName(); int upResult = UserService.UpdateUser(user); return ToResponse(upResult); diff --git a/ZR.Admin.WebApi/Controllers/System/TasksController.cs b/ZR.Admin.WebApi/Controllers/System/TasksController.cs index c5daacd..96aa3a6 100644 --- a/ZR.Admin.WebApi/Controllers/System/TasksController.cs +++ b/ZR.Admin.WebApi/Controllers/System/TasksController.cs @@ -87,7 +87,8 @@ namespace ZR.Admin.WebApi.Controllers } //从 Dto 映射到 实体 var tasksQz = parm.Adapt().ToCreate(HttpContext); - tasksQz.Create_by = HttpContext.GetName(); + tasksQz.Create_by = HttpContext.GetUId(); + tasksQz.Create_name = HttpContext.GetNickName(); tasksQz.ID = SnowFlakeSingle.Instance.NextId().ToString(); return SUCCESS(_tasksQzService.AddTasks(tasksQz)); @@ -126,7 +127,8 @@ namespace ZR.Admin.WebApi.Controllers throw new CustomException($"该任务正在运行中，请先停止在更新"); } var model = parm.Adapt(); - model.Update_by = HttpContextExtension.GetName(HttpContext); + model.Update_by = HttpContext.GetUId(); + model.Update_name = HttpContext.GetNickName(); int response = _tasksQzService.UpdateTasks(model); if (response > 0) { diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs index abb03a4..a685668 100644 --- a/ZR.Admin.WebApi/Program.cs +++ b/ZR.Admin.WebApi/Program.cs @@ -4,6 +4,8 @@ using Microsoft.AspNetCore.DataProtection; using NLog.Web; using System.Text.Json; using System.Text.Json.Serialization; +using Microsoft.Extensions.Caching.Distributed; +using Microsoft.Extensions.Caching.Redis; using ZR.Admin.WebApi.Extensions; using ZR.Common.Cache; using ZR.Infrastructure.WebExtensions; @@ -11,6 +13,10 @@ using ZR.ServiceCore.Signalr; using ZR.ServiceCore.SqlSugar; var builder = WebApplication.CreateBuilder(args); + +//load json config by loginVerify +builder.Configuration.AddJsonFile("loginVerifyConf.json", true, true); + // NLog: Setup NLog for Dependency injection //builder.Logging.ClearProviders(); builder.Host.UseNLog(); @@ -52,6 +58,7 @@ var openRedis = builder.Configuration["RedisServer:open"]; if (openRedis == "1") { RedisServer.Initalize(); + builder.Services.AddSingleton(new CSRedisCache(RedisHelper.Instance)); } builder.Services.AddMvc(options => diff --git a/ZR.Admin.WebApi/appsettings.json b/ZR.Admin.WebApi/appsettings.json index 147f029..5d01ebf 100644 --- a/ZR.Admin.WebApi/appsettings.json +++ b/ZR.Admin.WebApi/appsettings.json @@ -51,7 +51,7 @@ "SECRET": "Klcm77KdpkIROAl2ffPemK5I1yDshM", "bucketName": "markdownhexo", "domainUrl": "https://markdownhexo.oss-cn-hangzhou.aliyuncs.com", //访问资源域名 - "maxSize": 1000//上传文件大小限制 1000M + "maxSize": 1000 //上传文件大小限制 1000M }, //企业微信通知配置 "WxCorp": { diff --git a/ZR.Admin.WebApi/loginVerifyConf.json b/ZR.Admin.WebApi/loginVerifyConf.json new file mode 100644 index 0000000..395771e --- /dev/null +++ b/ZR.Admin.WebApi/loginVerifyConf.json @@ -0,0 +1,5 @@ +{ + "RSA": { + "PrivatePem": "-----BEGIN PRIVATE KEY-----MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCjvJHH6V8fHL9zuVkW1mcDcYF5D72fEG45xLP8jyXR0/klmxZUT6My2ajGcWtOAKyca4Mcw2lKV7FRzchVyylsLi1JaH+vgbL0qwjDS0hjSm6Uqw39WFX//t1qMxX8OD5F3lvAYaNauVY6nYQ9VgEcjrq5nc+kRB7cVsR1ouQlFMQ1vLCAZwajW2pSmpjkEMYC70iJfBl7iF0za6eIVLZEpxgOi8KIkTWUDvLLH0cRR30+FgyE8wu8gh09ZbYarGyLchmAbbmERHT6jfMgKCob/ZVuh0EzrklMsFj4qdjofejzRvS/arA4HtOS1W1ZBHovPxR36quWB4DO9lvkWakNAgMBAAECggEADiLHizTQq4T12m3UDS6xchColuUO/96RRZd/2nwZTcY5Kk/7W4gMlOVJtugv1WolfNOjXCZavrpXarKTayTBDL/n1QCalXJjGtBxTzr+ouPYLCmgaZDoy9MbFoIWkdHhPnL2BOPpEHoTwbe7pPf53JdN85x2Qr5G08sB5w4LGFBRPAkOoD2LgW4QK7Ut5k4GAHmcn7nqHlkMM8ksdNGkQEhSHfoQOh7FFgR1GHJMeO0JgXprJCIFjyhtyzzDj47r02LWqEaaTdokvkYPEqyzjSI/Gufvq6nvgIlf2mU9KA2NC3VwJrXtAQQezy7yB6blvBceygwXChVKAuUtEyOf2QKBgQDaKC76PlG+p61DIwfIJIcP6JgzWVXj7gJr82hpu8NIf0Wz354eYRl1gdW6dkgpkPhnDvZ/b23P5FsWG8OR0f0VMgPvKVDo+Z+cHLsoroqeCw7B1MEdv2d69gbAk343BTVkTui94152GeCu3O/C0QmaZyqOtumEbxDl8K+lsusEkwKBgQDAI7XzXx+EqKD1m2DKnj2YILEplB4pmJnTWaZi5qAKO+XxbUTGcSxRALBYxuMEvd2AIEk9VhQiLpJ9DoOzVg5LY/zeRvK1vE2tUj/cx8X8jekdY7QayP6KigWbe3juqBHm9eD97wwmQgbFRg+ZZrpKhENym4BVqCuJwc7nC02/3wKBgFIvCyuIqKDraBE/tCHI6PysQhIuGHZKZq0mQHJ8op/AGpEdr+J/7+hdphedkaffDkU81M3DO5oyy8GzaeSYOABxHBxP80QhLejQxg0YW+4X+lI5BRtgzOn8nySTK9wsYSXNuE44xpA1RXh6kPRSbYy2SskCzUvvz2zgVDtXAMRzAoGABItTrFPdnPeYBvcLzP79GfH7/q3AIN+5E6SVKNWnh1ZvU8xvyfm3QJsxkIfzqpMLABLDaK32f/B2CnsjZkRsxh+xRViMOPwhIi5F0GTxK833a3iGM/P5ATHOfCTpcUuMUNgT4C2dLfJ10oibqdciJM0IA1fmKyB1Fyb8S76asiUCgYEAu6ZQ5BfxtbhZCjZ7/hYKHuzDjRzyiaBkKjtN5ZvqLgkG6Zdfjrm2/RcFCMVtqZKXcgVcD9yxy561fmS+5gE3yTfKiFcYoYITT/N26MJ5G7Qeb/FPpmDRVQGjCaAw0o8dvaqe3pUEROdYX+JVQMxQ4WOPiV45FXazAZtFNr8Z+xA=-----END PRIVATE KEY-----" + } +} \ No newline at end of file diff --git a/ZR.CodeGenerator/CodeGeneratorTool.cs b/ZR.CodeGenerator/CodeGeneratorTool.cs index feb82b7..63cbf79 100644 --- a/ZR.CodeGenerator/CodeGeneratorTool.cs +++ b/ZR.CodeGenerator/CodeGeneratorTool.cs @@ -439,7 +439,7 @@ namespace ZR.CodeGenerator TableName = tableName, TableComment = desc, FunctionName = desc, - Create_by = userName, + Create_name = userName, Options = new Options() { SortType = "asc", diff --git a/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs b/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs index e770064..6cd4957 100644 --- a/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs +++ b/ZR.ServiceCore/Model/Dto/SysNoticeDto.cs @@ -23,7 +23,7 @@ namespace ZR.Model.System.Dto { public string NoticeTitle { get; set; } public int? NoticeType { get; set; } - public string CreateBy { get; set; } + public string CreateName { get; set; } public int? Status { get; set; } } } diff --git a/ZR.ServiceCore/Model/SysBase.cs b/ZR.ServiceCore/Model/SysBase.cs index b46ce8e..7d6a922 100644 --- a/ZR.ServiceCore/Model/SysBase.cs +++ b/ZR.ServiceCore/Model/SysBase.cs @@ -11,11 +11,16 @@ namespace ZR.Model.System /// /// 创建人 /// - [SugarColumn(IsOnlyIgnoreUpdate = true, Length = 64, IsNullable = true)] + [SugarColumn(IsOnlyIgnoreUpdate = true)] [JsonProperty(propertyName: "CreateBy")] [ExcelIgnore] - public string Create_by { get; set; } + public long Create_by { get; set; } + [SugarColumn(IsOnlyIgnoreUpdate = true)] + [JsonProperty(propertyName: "CreateName")] + [ExcelIgnore] + public string Create_name { get; set; } + /// /// 创建时间 /// @@ -29,10 +34,16 @@ namespace ZR.Model.System /// [JsonIgnore] [JsonProperty(propertyName: "UpdateBy")] - [SugarColumn(IsOnlyIgnoreInsert = true, Length = 64, IsNullable = true)] + [SugarColumn(IsOnlyIgnoreInsert = true)] [ExcelIgnore] - public string Update_by { get; set; } + public long Update_by { get; set; } + [JsonIgnore] + [JsonProperty(propertyName: "UpdateName")] + [SugarColumn(IsOnlyIgnoreInsert = true)] + [ExcelIgnore] + public string Update_name { get; set; } + /// /// 更新时间 /// diff --git a/ZR.ServiceCore/Model/SysRoleMenu.cs b/ZR.ServiceCore/Model/SysRoleMenu.cs index 9a037a4..b0b7bd1 100644 --- a/ZR.ServiceCore/Model/SysRoleMenu.cs +++ b/ZR.ServiceCore/Model/SysRoleMenu.cs @@ -8,7 +8,7 @@ namespace ZR.Model.System /// [SugarTable("sys_role_menu", "角色菜单")] [Tenant("0")] - public class SysRoleMenu : SysBase + public class SysRoleMenu { [JsonProperty("roleId")] [SugarColumn(IsPrimaryKey = true, ExtendedAttribute = ProteryConstant.NOTNULL)] diff --git a/ZR.ServiceCore/Services/SysMenuService.cs b/ZR.ServiceCore/Services/SysMenuService.cs index 592fa93..828665a 100644 --- a/ZR.ServiceCore/Services/SysMenuService.cs +++ b/ZR.ServiceCore/Services/SysMenuService.cs @@ -606,7 +606,7 @@ namespace ZR.Service Visible = "0", Status = "0", Icon = "icon1", - Create_by = "system", + Create_name = "system" }; menu.MenuId = AddMenu(menu); } diff --git a/ZR.ServiceCore/Services/SysNoticeService.cs b/ZR.ServiceCore/Services/SysNoticeService.cs index 7c938a0..5743e15 100644 --- a/ZR.ServiceCore/Services/SysNoticeService.cs +++ b/ZR.ServiceCore/Services/SysNoticeService.cs @@ -38,9 +38,11 @@ namespace ZR.Service.System { var predicate = Expressionable.Create(); - predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeTitle), m => m.NoticeTitle.Contains(parm.NoticeTitle)); + predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.NoticeTitle), + m => m.NoticeTitle.Contains(parm.NoticeTitle)); predicate = predicate.AndIF(parm.NoticeType != null, m => m.NoticeType == parm.NoticeType); - predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CreateBy), m => m.Create_by.Contains(parm.CreateBy) || m.Update_by.Contains(parm.CreateBy)); + predicate = predicate.AndIF(!string.IsNullOrEmpty(parm.CreateName), + m => m.Create_name.Contains(parm.CreateName) || m.Update_name.Contains(parm.CreateName)); predicate = predicate.AndIF(parm.Status != null, m => m.Status == parm.Status); var response = GetPages(predicate.ToExpression(), parm); return response; diff --git a/ZR.ServiceCore/Services/SysRoleService.cs b/ZR.ServiceCore/Services/SysRoleService.cs index 3f45fbb..952a983 100644 --- a/ZR.ServiceCore/Services/SysRoleService.cs +++ b/ZR.ServiceCore/Services/SysRoleService.cs @@ -224,8 +224,6 @@ namespace ZR.Service { Menu_id = item, Role_id = sysRoleDto.RoleId, - Create_by = sysRoleDto.Create_by, - Create_time = DateTime.Now }; sysRoleMenus.Add(rm); }