wenyongda/ZrAdminNetCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

集成CSRedis分布式存储，调整创建者和更新者字段，登录RSA使用配置文件配置私钥

Browse Source
This commit is contained in:
wenyongda
2023-09-22 01:09:47 +08:00
parent de76f5872a
commit d3556cc058
25 changed files with 95 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
+2 -1
View File
@@ -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<DbColumnInfo> dbColumnInfos = _CodeGeneraterService.GetColumnInfo(table.DbName, tableName);
List<GenTableColumn> dbTableColumns = CodeGeneratorTool.InitGenTableColumn(table, dbColumnInfos);
ZR.Admin.WebApi/Controllers/System/SysDeptController.cs
+4 -2
View File
@@ -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));
}
ZR.Admin.WebApi/Controllers/System/SysDictDataController.cs
+4 -2
View File
@@ -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));
}
ZR.Admin.WebApi/Controllers/System/SysDictTypeController.cs
+4 -2
View File
@@ -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));
}
ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
+8 -1
View File
@@ -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");
/// <summary>
/// 登录
@@ -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<SysRole> roles = roleService.SelectUserRoleListByUserId(user.UserId);
ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
+4 -2
View File
@@ -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);
ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
+4 -2
View File
@@ -104,7 +104,8 @@ namespace ZR.Admin.WebApi.Controllers.System
public IActionResult UpdateSysNotice([FromBody] SysNoticeDto parm)
{
var model = parm.Adapt<SysNotice>().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
});
ZR.Admin.WebApi/Controllers/System/SysRoleController.cs
+6 -3
View File
@@ -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<SysRole>();
sysRoleDto.Create_by = HttpContext.GetName();
sysRoleDto.Create_by = HttpContext.GetUId();
sysRoleDto.Create_name = HttpContext.GetNickName();
sysRoleService.CheckRoleAllowed(sysRole);
bool result = sysRoleService.AuthDataScope(sysRoleDto);
ZR.Admin.WebApi/Controllers/System/SysUserController.cs
+4 -2
View File
@@ -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);
ZR.Admin.WebApi/Controllers/System/TasksController.cs
+4 -2
View File
@@ -87,7 +87,8 @@ namespace ZR.Admin.WebApi.Controllers
}
//从 Dto 映射到 实体
var tasksQz = parm.Adapt<SysTasks>().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<SysTasks>();
model.Update_by = HttpContextExtension.GetName(HttpContext);
model.Update_by = HttpContext.GetUId();
model.Update_name = HttpContext.GetNickName();
int response = _tasksQzService.UpdateTasks(model);
if (response > 0)
{