!1736 获取配置参数值方法增加参数默认值

Merge pull request !1736 from Lzh666/N/A

Admin.NET/Admin.NET.Core/Service/Config/SysTenantConfigService.cs

@@ -159,7 +159,7 @@ public class SysTenantConfigService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 根据Code获取配置参数
+    /// 根据Code获取配置参数 🔖
     /// </summary>
     /// <param name="code"></param>
     /// <returns></returns>
@@ -172,7 +172,7 @@ public class SysTenantConfigService : IDynamicApiController, ITransient
     /// <summary>
     /// 根据Code获取配置参数值 🔖
     /// </summary>
-    /// <param name="code"></param>
+    /// <param name="code">编码</param>
     /// <returns></returns>
     [DisplayName("根据Code获取配置参数值")]
     public async Task<string> GetConfigValueByCode(string code)
@@ -183,12 +183,25 @@ public class SysTenantConfigService : IDynamicApiController, ITransient
     /// <summary>
     /// 获取配置参数值
     /// </summary>
-    /// <param name="code"></param>
+    /// <param name="code">编码</param>
+    /// <param name="defaultValue">默认值</param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task<string> GetConfigValueByCode(string code, string defaultValue = default)
+    {
+        return await GetConfigValueByCode<string>(code, defaultValue);
+    }
+
+    /// <summary>
+    /// 获取配置参数值
+    /// </summary>
+    /// <param name="code">编码</param>
+    /// <param name="defaultValue">默认值</param>
     /// <returns></returns>
     [NonAction]
-    public async Task<T> GetConfigValueByCode<T>(string code)
+    public async Task<T> GetConfigValueByCode<T>(string code, T defaultValue = default)
     {
-        if (string.IsNullOrWhiteSpace(code)) return default;
+        if (string.IsNullOrWhiteSpace(code)) return defaultValue;
 
         var value = _sysCacheService.Get<string>($"{CacheConst.KeyTenantConfig}{_userManager.TenantId}{code}");
         if (string.IsNullOrEmpty(value))
@@ -196,7 +209,7 @@ public class SysTenantConfigService : IDynamicApiController, ITransient
             value = (await VSysConfig.FirstAsync(u => u.Code == code))?.Value;
             _sysCacheService.Set($"{CacheConst.KeyTenantConfig}{_userManager.TenantId}{code}", value);
         }
-        if (string.IsNullOrWhiteSpace(value)) return default;
+        if (string.IsNullOrWhiteSpace(value)) return defaultValue;
         return (T)Convert.ChangeType(value, typeof(T));
     }
 

Admin.NET/Admin.NET.Core/Service/Config/SysUserConfigService.cs

@@ -160,7 +160,7 @@ public class SysUserConfigService : IDynamicApiController, ITransient
     }
 
     /// <summary>
-    /// 根据Code获取配置参数
+    /// 根据Code获取配置参数 🔖
     /// </summary>
     /// <param name="code"></param>
     /// <returns></returns>
@@ -173,7 +173,7 @@ public class SysUserConfigService : IDynamicApiController, ITransient
     /// <summary>
     /// 根据Code获取配置参数值 🔖
     /// </summary>
-    /// <param name="code"></param>
+    /// <param name="code">编码</param>
     /// <returns></returns>
     [DisplayName("根据Code获取配置参数值")]
     public async Task<string> GetConfigValueByCode(string code)
@@ -184,12 +184,25 @@ public class SysUserConfigService : IDynamicApiController, ITransient
     /// <summary>
     /// 获取配置参数值
     /// </summary>
-    /// <param name="code"></param>
+    /// <param name="code">编码</param>
+    /// <param name="defaultValue">默认值</param>
+    /// <returns></returns>
+    [NonAction]
+    public async Task<string> GetConfigValueByCode(string code, string defaultValue = default)
+    {
+        return await GetConfigValueByCode<string>(code, defaultValue);
+    }
+
+    /// <summary>
+    /// 获取配置参数值
+    /// </summary>
+    /// <param name="code">编码</param>
+    /// <param name="defaultValue">默认值</param>
     /// <returns></returns>
     [NonAction]
-    public async Task<T> GetConfigValueByCode<T>(string code)
+    public async Task<T> GetConfigValueByCode<T>(string code, T defaultValue = default)
     {
-        if (string.IsNullOrWhiteSpace(code)) return default;
+        if (string.IsNullOrWhiteSpace(code)) return defaultValue;
 
         var value = _sysCacheService.Get<string>($"{CacheConst.KeyUserConfig}{_userManager.UserId}{code}");
         if (string.IsNullOrEmpty(value))
@@ -197,7 +210,7 @@ public class SysUserConfigService : IDynamicApiController, ITransient
             value = (await VSysConfig.FirstAsync(u => u.Code == code))?.Value;
             _sysCacheService.Set($"{CacheConst.KeyUserConfig}{_userManager.UserId}{code}", value);
         }
-        if (string.IsNullOrWhiteSpace(value)) return default;
+        if (string.IsNullOrWhiteSpace(value)) return defaultValue;
         return (T)Convert.ChangeType(value, typeof(T));
     }