Kaynağa Gözat

😎1、升级Furion v4.9.3.14 2、修复图标配置路径错误 3、代码优化

zuohuaijun 2 yıl önce
ebeveyn
işleme
72e7a6aacb

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

@@ -18,9 +18,9 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="Elastic.Clients.Elasticsearch" Version="8.13.15" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.3.13" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.3.13" />
-    <PackageReference Include="Furion.Pure" Version="4.9.3.13" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.3.14" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.3.14" />
+    <PackageReference Include="Furion.Pure" Version="4.9.3.14" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="IPTools.International" Version="1.6.0" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />
@@ -45,9 +45,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.30" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.30" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.30" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.31" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="6.0.31" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="6.0.31" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
   </ItemGroup>
 
@@ -55,9 +55,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="8.0.0" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="8.0.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.7" />
-    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.5" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="8.0.6" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="8.0.6" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.2.0" />
   </ItemGroup>
 

+ 1 - 0
Admin.NET/Admin.NET.Core/Service/CodeGen/SysCodeGenService.cs

@@ -406,6 +406,7 @@ public class SysCodeGenService : IDynamicApiController, ITransient
     /// <param name="className"></param>
     /// <param name="busName"></param>
     /// <param name="pid"></param>
+    /// <param name="menuIcon"></param>
     /// <param name="tableFieldList"></param>
     /// <returns></returns>
     private async Task AddMenu(string className, string busName, long pid, string menuIcon, List<CodeGenConfig> tableFieldList)

+ 3 - 5
Admin.NET/Admin.NET.Core/Service/Config/SysConfigService.cs

@@ -255,11 +255,8 @@ public class SysConfigService : IDynamicApiController, ITransient
             var base64Data = groups["data"].Value;
             var binData = Convert.FromBase64String(base64Data);
 
-            // 本地保存图标路径
+            // 本地图标保存路径
             var path = "Upload";
-
-            // 文件路径
-            var relativeUrl = $"{path}/logo.{type}";
             var absoluteFilePath = Path.Combine(App.WebHostEnvironment.WebRootPath, path, $"logo.{type}");
 
             // 删除已存在文件
@@ -271,10 +268,11 @@ public class SysConfigService : IDynamicApiController, ITransient
             //if (!Directory.Exists(absoluteFileDir))
             //    Directory.CreateDirectory(absoluteFileDir);
 
-            // 保存文件
+            // 保存图标文件
             await File.WriteAllBytesAsync(absoluteFilePath, binData);
 
             // 保存图标配置
+            var relativeUrl = $"/{path}/logo.{type}";
             await UpdateConfigValue("sys_web_logo", relativeUrl);
         }