瀏覽代碼

chore: 从系统应用中获取当前应用信息

喵你个旺呀 1 年之前
父節點
當前提交
39f591cdb4

+ 11 - 0
Admin.NET/Admin.NET.Core/Service/Appliication/SysAppService.cs

@@ -162,4 +162,15 @@ public class SysAppService : IDynamicApiController, ITransient
         
         return await App.GetRequiredService<SysAuthService>().CreateToken(user, input.Id);
     }
+
+    /// <summary>
+    /// 获取当前应用信息
+    /// </summary>
+    /// <returns></returns>
+    [NonAction]
+    public async Task<SysApp> GetCurrentAppInfo()
+    {
+        var appId = _userManager.AppId > 0 ? _userManager.AppId : SqlSugarConst.DefaultAppId;
+        return await _sysAppRep.GetFirstAsync(u => u.Id == appId) ?? throw Oops.Oh(ErrorCodeEnum.D1002);
+    }
 }

+ 16 - 14
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -240,26 +240,28 @@ 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 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 app = await App.GetRequiredService<SysAppService>().GetCurrentAppInfo();
+        
         var sysIcpUrl = await GetConfigValue<string>(ConfigConst.SysWebIcpUrl);
         var sysSecondVer = await GetConfigValue<bool>(ConfigConst.SysSecondVer);
         var sysCaptcha = await GetConfigValue<bool>(ConfigConst.SysCaptcha);
 
         return new
         {
-            SysLogo = sysLogo,
-            SysTitle = sysTitle,
-            SysViceTitle = sysViceTitle,
-            SysViceDesc = sysViceDesc,
-            SysWatermark = sysWatermark,
-            SysCopyright = sysCopyright,
-            SysIcp = sysIcp,
+            SysLogo = app.Logo,
+            SysTitle = app.Title,
+            SysViceTitle = app.ViceTitle,
+            SysViceDesc = app.ViceDesc,
+            SysWatermark = app.Watermark,
+            SysCopyright = app.Copyright,
+            SysIcp = app.Icp,
             SysIcpUrl = sysIcpUrl,
             SysSecondVer = sysSecondVer,
             SysCaptcha = sysCaptcha