gaoxing/UNIVPLMDataIntegration
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

😎调整sysConfigService接口名称

Browse Source
This commit is contained in:
zuohuaijun 2024-09-05 13:08:32 +08:00
parent e470eb510a
commit 3b362a937f
14 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Admin.NET/Admin.NET.Application/Service/App/Auth/AppAuthService.cs
View File

@ -59,12 +59,12 @@ public class AppAuthService : IDynamicApiController, ITransient
// 判断密码错误次数（缓存30分钟）
var keyPasswordErrorTimes = $"{CacheConst.KeyPasswordErrorTimes}{input.Account}";
var passwordErrorTimes = _sysCacheService.Get<int>(keyPasswordErrorTimes);
var passwdMaxErrorTimes = await _sysConfigService.GetConfigValue<int>(ConfigConst.SysPasswordMaxErrorTimes);
var passwdMaxErrorTimes = await _sysConfigService.GetConfigValueByCode<int>(ConfigConst.SysPasswordMaxErrorTimes);
if (passwordErrorTimes >= passwdMaxErrorTimes)
throw Oops.Oh(ErrorCodeEnum.D1027);
// 是否开启验证码
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysCaptcha))
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysCaptcha))
{
// 判断验证码
if (!_captcha.Validate(input.CodeId.ToString(), input.Code))

2
Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs
View File

@ -42,7 +42,7 @@ public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable
//var mailTemp = File.ReadAllText(mailTempPath);
//var mail = await _serviceScope.ServiceProvider.GetRequiredService<IViewEngine>().RunCompileFromCachedAsync(mailTemp, );
var webTitle = await _serviceScope.ServiceProvider.GetRequiredService<SysConfigService>().GetConfigValue<string>(ConfigConst.SysWebTitle);
var webTitle = await _serviceScope.ServiceProvider.GetRequiredService<SysConfigService>().GetConfigValueByCode<string>(ConfigConst.SysWebTitle);
var title = $"{webTitle} 系统异常";
await _serviceScope.ServiceProvider.GetRequiredService<SysEmailService>().SendEmail(JSON.Serialize(context.Source.Payload), title);
}

4
Admin.NET/Admin.NET.Core/Hub/OnlineUserHub.cs
View File

@ -68,7 +68,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
await _sysOnlineUerRep.InsertAsync(user);
// 是否开启单用户登录
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysSingleLogin))
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysSingleLogin))
{
_sysCacheService.HashAdd(CacheConst.KeyUserOnline, "" + user.UserId + loginMode, user);
}
@ -108,7 +108,7 @@ public class OnlineUserHub : Hub<IOnlineUserHub>
await _sysOnlineUerRep.DeleteByIdAsync(user.Id);
// 是否开启单用户登录
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysSingleLogin))
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysSingleLogin))
{
_sysCacheService.HashDel<SysOnlineUser>(CacheConst.KeyUserOnline, "" + user.UserId + user.LoginMode);
// _sysCacheService.Remove(CacheConst.KeyUserOnline + user.UserId);

4
Admin.NET/Admin.NET.Core/Job/LogJob.cs
View File

@ -29,7 +29,7 @@ public class LogJob : IJob
var db = serviceScope.ServiceProvider.GetRequiredService<ISqlSugarClient>().CopyNew();
var sysConfigService = serviceScope.ServiceProvider.GetRequiredService<SysConfigService>();
var daysAgo = await sysConfigService.GetConfigValue<int>(ConfigConst.SysLogRetentionDays); // 日志保留天数
var daysAgo = await sysConfigService.GetConfigValueByCode<int>(ConfigConst.SysLogRetentionDays); // 日志保留天数
await db.Deleteable<SysLogVis>().Where(u => u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除访问日志
await db.Deleteable<SysLogOp>().Where(u => u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除操作日志
await db.Deleteable<SysLogDiff>().Where(u => u.CreateTime < DateTime.Now.AddDays(-daysAgo)).ExecuteCommandAsync(stoppingToken); // 删除差异日志
@ -44,7 +44,7 @@ public class LogJob : IJob
_logger.LogInformation(msg);
// 默认 3个月/90天 强制修改一次密码（将最新修改密码时间置空）
if (await sysConfigService.GetConfigValue<bool>(ConfigConst.SysForceChangePassword))
if (await sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysForceChangePassword))
{
var userIds = await db.Queryable<SysUser>()
.Where(u => SqlFunc.IsNullOrEmpty(u.LastChangePasswordTime) || (DateTime.Now - (DateTime)u.LastChangePasswordTime).Days > 90)

6
Admin.NET/Admin.NET.Core/Logging/DatabaseLoggingWriter.cs
View File

@ -51,7 +51,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter, IDisposable
var loggingMonitor = JSON.Deserialize<dynamic>(jsonStr);
// 记录数据校验日志
if (loggingMonitor.validation != null && !await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysValidationLog)) return;
if (loggingMonitor.validation != null && !await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysValidationLog)) return;
// 获取当前操作者
string account = "", realName = "", userId = "", tenantId = "";
@ -125,7 +125,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter, IDisposable
}).ExecuteCommandAsync();
// 将异常日志发送到邮件
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysErrorMail))
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysErrorMail))
{
await App.GetRequiredService<IEventPublisher>().PublishAsync(CommonConst.SendErrorMail, logMsg.Exception ?? loggingMonitor.exception);
}
@ -160,7 +160,7 @@ public class DatabaseLoggingWriter : IDatabaseLoggingWriter, IDisposable
}
// 记录操作日志
if (!await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysOpLog)) return;
if (!await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysOpLog)) return;
await _db.Insertable(new SysLogOp
{
ControllerName = loggingMonitor.controllerName,

2
Admin.NET/Admin.NET.Core/Logging/ElasticSearchLoggingWriter.cs
View File

@ -27,7 +27,7 @@ public class ElasticSearchLoggingWriter : IDatabaseLoggingWriter, IDisposable
public async Task WriteAsync(LogMessage logMsg, bool flush)
{
// 是否启用操作日志
var sysOpLogEnabled = await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysOpLog);
var sysOpLogEnabled = await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysOpLog);
if (!sysOpLogEnabled) return;
var jsonStr = logMsg.Context?.Get("loggingMonitor")?.ToString();

8
Admin.NET/Admin.NET.Core/Service/Auth/SysAuthService.cs
View File

@ -65,7 +65,7 @@ public class SysAuthService : IDynamicApiController, ITransient
// 判断密码错误次数（缓存30分钟）
var keyPasswordErrorTimes = $"{CacheConst.KeyPasswordErrorTimes}{input.Account}";
var passwordErrorTimes = _sysCacheService.Get<int>(keyPasswordErrorTimes);
var passwordMaxErrorTimes = await _sysConfigService.GetConfigValue<int>(ConfigConst.SysPasswordMaxErrorTimes);
var passwordMaxErrorTimes = await _sysConfigService.GetConfigValueByCode<int>(ConfigConst.SysPasswordMaxErrorTimes);
// 若未配置或误配置为0、负数, 则默认密码错误次数最大为5次
if (passwordMaxErrorTimes < 1)
passwordMaxErrorTimes = 5;
@ -73,7 +73,7 @@ public class SysAuthService : IDynamicApiController, ITransient
throw Oops.Oh(ErrorCodeEnum.D1027);
// 是否开启验证码
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysCaptcha))
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysCaptcha))
{
// 判断验证码
if (!_captcha.Validate(input.CodeId.ToString(), input.Code))
@ -104,7 +104,7 @@ public class SysAuthService : IDynamicApiController, ITransient
}
// 是否开启域登录验证
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysDomainLogin))
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysDomainLogin))
{
var userLdap = await _sysUserLdap.GetFirstAsync(u => u.UserId == user.Id && u.TenantId == tenant.Id);
if (userLdap == null)
@ -279,7 +279,7 @@ public class SysAuthService : IDynamicApiController, ITransient
// 接口集合
var apis = (await _sysRoleService.GetUserApiList())[0];
// 水印文字（若系统水印为空则禁止显示）
var watermarkText = await _sysConfigService.GetConfigValue<string>(ConfigConst.SysWebWatermark);
var watermarkText = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SysWebWatermark);
if (!string.IsNullOrWhiteSpace(watermarkText))
watermarkText += $"-{user.RealName}"; // $"-{user.RealName}-{_httpContextAccessor.HttpContext.GetRemoteIpAddressToIPv4(true)}-{DateTime.Now}";

34
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs
View File

@ -137,12 +137,12 @@ public class SysConfigService : IDynamicApiController, ITransient
}
/// <summary>
/// 获取参数配置值
/// 根据Code获取参数配置值
/// </summary>
/// <param name="code"></param>
/// <returns></returns>
[NonAction]
public async Task<T> GetConfigValue<T>(string code)
[DisplayName("根据Code获取参数配置值")]
public async Task<T> GetConfigValueByCode<T>(string code)
{
if (string.IsNullOrWhiteSpace(code)) return default;
@ -195,7 +195,7 @@ public class SysConfigService : IDynamicApiController, ITransient
[NonAction]
public async Task<int> GetTokenExpire()
{
var tokenExpireStr = await GetConfigValue<string>(ConfigConst.SysTokenExpire);
var tokenExpireStr = await GetConfigValueByCode<string>(ConfigConst.SysTokenExpire);
_ = int.TryParse(tokenExpireStr, out var tokenExpire);
return tokenExpire == 0 ? 20 : tokenExpire;
}
@ -207,7 +207,7 @@ public class SysConfigService : IDynamicApiController, ITransient
[NonAction]
public async Task<int> GetRefreshTokenExpire()
{
var refreshTokenExpireStr = await GetConfigValue<string>(ConfigConst.SysRefreshTokenExpire);
var refreshTokenExpireStr = await GetConfigValueByCode<string>(ConfigConst.SysRefreshTokenExpire);
_ = int.TryParse(refreshTokenExpireStr, out var refreshTokenExpire);
return refreshTokenExpire == 0 ? 40 : refreshTokenExpire;
}
@ -237,17 +237,17 @@ public class SysConfigService : IDynamicApiController, ITransient
[DisplayName("获取系统信息")]
public async Task<dynamic> GetSysInfo()
{
var sysLogo = await GetConfigValue<string>(ConfigConst.SysWebLogo);
var sysTitle = await GetConfigValue<string>(ConfigConst.SysWebTitle);
var sysViceTitle = await GetConfigValue<string>(ConfigConst.SysWebViceTitle);
var sysViceDesc = await GetConfigValue<string>(ConfigConst.SysWebViceDesc);
var sysWatermark = await GetConfigValue<string>(ConfigConst.SysWebWatermark);
var sysCopyright = await GetConfigValue<string>(ConfigConst.SysWebCopyright);
var sysIcp = await GetConfigValue<string>(ConfigConst.SysWebIcp);
var sysIcpUrl = await GetConfigValue<string>(ConfigConst.SysWebIcpUrl);
var sysSecondVer = await GetConfigValue<bool>(ConfigConst.SysSecondVer);
var sysCaptcha = await GetConfigValue<bool>(ConfigConst.SysCaptcha);
var sysForceChangePassword = await GetConfigValue<bool>(ConfigConst.SysForceChangePassword);
var sysLogo = await GetConfigValueByCode<string>(ConfigConst.SysWebLogo);
var sysTitle = await GetConfigValueByCode<string>(ConfigConst.SysWebTitle);
var sysViceTitle = await GetConfigValueByCode<string>(ConfigConst.SysWebViceTitle);
var sysViceDesc = await GetConfigValueByCode<string>(ConfigConst.SysWebViceDesc);
var sysWatermark = await GetConfigValueByCode<string>(ConfigConst.SysWebWatermark);
var sysCopyright = await GetConfigValueByCode<string>(ConfigConst.SysWebCopyright);
var sysIcp = await GetConfigValueByCode<string>(ConfigConst.SysWebIcp);
var sysIcpUrl = await GetConfigValueByCode<string>(ConfigConst.SysWebIcpUrl);
var sysSecondVer = await GetConfigValueByCode<bool>(ConfigConst.SysSecondVer);
var sysCaptcha = await GetConfigValueByCode<bool>(ConfigConst.SysCaptcha);
var sysForceChangePassword = await GetConfigValueByCode<bool>(ConfigConst.SysForceChangePassword);
return new
{
@ -277,7 +277,7 @@ public class SysConfigService : IDynamicApiController, ITransient
if (!string.IsNullOrEmpty(input.SysLogoBase64))
{
// 旧图标文件相对路径
var oldSysLogoRelativeFilePath = await GetConfigValue<string>(ConfigConst.SysWebLogo) ?? "";
var oldSysLogoRelativeFilePath = await GetConfigValueByCode<string>(ConfigConst.SysWebLogo) ?? "";
var oldSysLogoAbsoluteFilePath = Path.Combine(App.WebHostEnvironment.WebRootPath, oldSysLogoRelativeFilePath.TrimStart('/'));
var groups = Regex.Match(input.SysLogoBase64, @"data:image/(?<type>.+?);base64,(?<data>.+)").Groups;

2
Admin.NET/Admin.NET.Core/Service/Job/JobMonitor.cs
View File

@ -30,7 +30,7 @@ public class JobMonitor : IJobMonitor
public async Task OnExecutedAsync(JobExecutedContext context, CancellationToken stoppingToken)
{
// 将异常作业发送到邮件
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysErrorMail) && context.Exception != null)
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysErrorMail) && context.Exception != null)
{
var errorInfo = $"【{context.Trigger.Description}】定时任务错误：{context.Exception}";
await _eventPublisher.PublishAsync(CommonConst.SendErrorMail, errorInfo, stoppingToken);

2
Admin.NET/Admin.NET.Core/Service/Message/SysEmailService.cs
View File

@ -33,7 +33,7 @@ public class SysEmailService : IDynamicApiController, ITransient
[DisplayName("发送邮件")]
public async Task SendEmail([Required] string content, string title = "")
{
var webTitle = await _sysConfigService.GetConfigValue<string>(ConfigConst.SysWebTitle);
var webTitle = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SysWebTitle);
title = string.IsNullOrWhiteSpace(title) ? $"{webTitle} 系统邮件" : title;
var message = new MimeMessage();
message.From.Add(new MailboxAddress(_emailOptions.DefaultFromEmail, _emailOptions.DefaultFromEmail));

2
Admin.NET/Admin.NET.Core/Service/OnlineUser/SysOnlineUserService.cs
View File

@ -80,7 +80,7 @@ public class SysOnlineUserService : IDynamicApiController, ITransient
[NonAction]
public async Task SingleLogin(long userId, LoginModeEnum loginMode)
{
if (await _sysConfigService.GetConfigValue<bool>(ConfigConst.SysSingleLogin))
if (await _sysConfigService.GetConfigValueByCode<bool>(ConfigConst.SysSingleLogin))
{
var users = await _sysOnlineUerRep.GetListAsync(u => u.UserId == userId);
foreach (var user in users)

2
Admin.NET/Admin.NET.Core/Service/Region/SysRegionService.cs
View File

@ -153,7 +153,7 @@ public class SysRegionService : IDynamicApiController, ITransient
[DisplayName("同步行政区域（国家统计局）")]
public async Task SyncRegionStats(SyncInput input)
{
var syncLevel = await _sysConfigService.GetConfigValue<int>(ConfigConst.SysRegionSyncLevel);
var syncLevel = await _sysConfigService.GetConfigValueByCode<int>(ConfigConst.SysRegionSyncLevel);
if (syncLevel < 1 || syncLevel > 5)
syncLevel = 3;//默认区县级

4
Admin.NET/Admin.NET.Core/Service/Tenant/SysTenantService.cs
View File

@ -210,7 +210,7 @@ public class SysTenantService : IDynamicApiController, ITransient
await _sysPosRep.InsertAsync(newPos);
// 初始化系统账号
var password = await _sysConfigService.GetConfigValue<string>(ConfigConst.SysPassword);
var password = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SysPassword);
var newUser = new SysUser
{
Id = tenantId,
@ -381,7 +381,7 @@ public class SysTenantService : IDynamicApiController, ITransient
[DisplayName("重置租户管理员密码")]
public async Task<string> ResetPwd(TenantUserInput input)
{
var password = await _sysConfigService.GetConfigValue<string>(ConfigConst.SysPassword);
var password = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SysPassword);
var encryptPassword = CryptogramUtil.Encrypt(password);
await _sysUserRep.UpdateAsync(u => new SysUser() { Password = encryptPassword }, u => u.Id == input.UserId);
return password;

4
Admin.NET/Admin.NET.Core/Service/User/SysUserService.cs
View File

@ -97,7 +97,7 @@ public class SysUserService : IDynamicApiController, ITransient
var isExist = await _sysUserRep.AsQueryable().ClearFilter().AnyAsync(u => u.Account == input.Account);
if (isExist) throw Oops.Oh(ErrorCodeEnum.D1003);
var password = await _sysConfigService.GetConfigValue<string>(ConfigConst.SysPassword);
var password = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SysPassword);
var user = input.Adapt<SysUser>();
user.Password = CryptogramUtil.Encrypt(password);
@ -320,7 +320,7 @@ public class SysUserService : IDynamicApiController, ITransient
public virtual async Task<string> ResetPwd(ResetPwdUserInput input)
{
var user = await _sysUserRep.GetByIdAsync(input.Id) ?? throw Oops.Oh(ErrorCodeEnum.D0009);
var password = await _sysConfigService.GetConfigValue<string>(ConfigConst.SysPassword);
var password = await _sysConfigService.GetConfigValueByCode<string>(ConfigConst.SysPassword);
user.Password = CryptogramUtil.Encrypt(password);
user.LastChangePasswordTime = null;
await _sysUserRep.AsUpdateable(user).UpdateColumns(u => new { u.Password, u.LastChangePasswordTime }).ExecuteCommandAsync();