zuohuaijun před 1 rokem
rodič
revize
d73d1c621e

+ 1 - 1
Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj

@@ -37,7 +37,7 @@
     <PackageReference Include="SqlSugarCore" Version="5.1.4.162" />
     <PackageReference Include="SSH.NET" Version="2024.1.0" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.4.3" />
-    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1046" />
+    <PackageReference Include="TencentCloudSDK.Sms" Version="3.0.1047" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
   </ItemGroup>

+ 1 - 1
Admin.NET/Admin.NET.Core/Const/ConfigConst.cs

@@ -39,7 +39,7 @@ public class ConfigConst
     /// <summary>
     /// 水印内容
     /// </summary>
-    public const string SysWebWatermark= "sys_web_watermark";
+    public const string SysWebWatermark = "sys_web_watermark";
 
     /// <summary>
     /// 版权说明

+ 1 - 1
Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs

@@ -41,7 +41,7 @@ public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable
         //var mailTempPath = Path.Combine(App.WebHostEnvironment.WebRootPath, "Temp\\ErrorMail.tp");
         //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 title = $"{webTitle} 系统异常";
         await _serviceScope.ServiceProvider.GetRequiredService<SysEmailService>().SendEmail(JSON.Serialize(context.Source.Payload), title);

+ 3 - 3
Admin.NET/Admin.NET.Core/Job/OnlineUserJob.cs

@@ -31,15 +31,15 @@ public class OnlineUserJob : IJob
         var rep = serviceScope.ServiceProvider.GetRequiredService<SqlSugarRepository<SysOnlineUser>>();
         await rep.CopyNew().AsDeleteable().ExecuteCommandAsync(stoppingToken);
 
+        // 缓存租户列表
+        await serviceScope.ServiceProvider.GetRequiredService<SysTenantService>().CacheTenant();
+
         string msg = $"【{DateTime.Now}】清理在线用户成功!服务已重启...";
         var originColor = Console.ForegroundColor;
         Console.ForegroundColor = ConsoleColor.Red;
         Console.WriteLine(msg);
         Console.ForegroundColor = originColor;
 
-        // 缓存租户列表
-        await serviceScope.ServiceProvider.GetRequiredService<SysTenantService>().CacheTenant();
-
         // 自定义日志
         _logger.LogInformation(msg);
     }

+ 1 - 1
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -275,7 +275,7 @@ public class SysConfigService : IDynamicApiController, ITransient
             var oldSysLogoAbsoluteFilePath = Path.Combine(App.WebHostEnvironment.WebRootPath, oldSysLogoRelativeFilePath.TrimStart('/'));
 
             var groups = Regex.Match(input.SysLogoBase64, @"data:image/(?<type>.+?);base64,(?<data>.+)").Groups;
-            var type = groups["type"].Value;
+            //var type = groups["type"].Value;
             var base64Data = groups["data"].Value;
             var binData = Convert.FromBase64String(base64Data);
             // 根据文件名取扩展名