瀏覽代碼

😁1、增加SqlSugar菜单 2、升级所有依赖及其他优化

zuohuaijun 2 年之前
父節點
當前提交
52cc340218

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

@@ -19,20 +19,20 @@
     <PackageReference Include="AspectCore.Extensions.Reflection" Version="2.4.0" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
     <PackageReference Include="FluentEmail.Smtp" Version="3.0.2" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.22" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.22" />
-    <PackageReference Include="Furion.Pure" Version="4.8.8.22" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.23" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.23" />
+    <PackageReference Include="Furion.Pure" Version="4.8.8.23" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.4" />
     <PackageReference Include="Magicodes.IE.Pdf" Version="2.7.4.4" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="6.0.16" />
     <PackageReference Include="NEST" Version="7.17.5" />
-    <PackageReference Include="NewLife.Redis" Version="5.3.2023.512" />
+    <PackageReference Include="NewLife.Redis" Version="5.4.2023.601" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.9" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.28.0" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.29.0" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.19.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.1.4.80" />
+    <PackageReference Include="SqlSugarCore" Version="5.1.4.81" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.2" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />

+ 1 - 0
Admin.NET/Admin.NET.Core/SeedData/SysMenuSeedData.cs

@@ -166,6 +166,7 @@ public class SysMenuSeedData : ISqlSugarEntitySeedData<SysMenu>
             new SysMenu{ Id=1310000000701, Pid=0, Title="帮助文档", Path="/doc", Name="doc", Component="Layout", Icon="ele-Notebook", Type=MenuTypeEnum.Dir, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=1400 },
             new SysMenu{ Id=1310000000711, Pid=1310000000701, Title="后台教程", Path="/doc/furion", Name="sysFurion", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://furion.baiqian.ltd/", Icon="ele-Promotion", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=100 },
             new SysMenu{ Id=1310000000712, Pid=1310000000701, Title="前端教程", Path="/doc/element", Name="sysElement", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://element-plus.gitee.io/zh-CN/", Icon="ele-Position", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=110 },
+            new SysMenu{ Id=1310000000713, Pid=1310000000701, Title="SqlSugar", Path="/doc/SqlSugar", Name="sysSqlSugar", Component="layout/routerView/link", IsIframe=false, IsKeepAlive=false, OutLink="https://www.donet5.com/Home/Doc", Icon="ele-Coin", Type=MenuTypeEnum.Menu, CreateTime=DateTime.Parse("2022-02-10 00:00:00"), OrderNo=120 },
         };
     }
 }

+ 7 - 7
Admin.NET/Admin.NET.Core/Util/CommonUtil.cs

@@ -40,26 +40,26 @@ public static class CommonUtil
     }
 
     /// <summary>
-    /// XML序列化
+    /// 对象序列化XML
     /// </summary>
     /// <typeparam name="T"></typeparam>
     /// <param name="obj"></param>
     /// <returns></returns>
-    public static string XmlSerialize<T>(T obj)
+    public static string SerializeObjectToXml<T>(T obj)
     {
-        if (obj == null) return "";
+        if (obj == null) return string.Empty;
 
         var xs = new XmlSerializer(obj.GetType());
         var stream = new MemoryStream();
         var setting = new XmlWriterSettings
         {
-            Encoding = new UTF8Encoding(false),
-            Indent = true
+            Encoding = new UTF8Encoding(false), // 不包含BOM
+            Indent = true // 设置格式化缩进
         };
         using (var writer = XmlWriter.Create(stream, setting))
         {
             var ns = new XmlSerializerNamespaces();
-            ns.Add("", "");
+            ns.Add("", ""); // 去除默认命名空间
             xs.Serialize(writer, obj, ns);
         }
         return Encoding.UTF8.GetString(stream.ToArray());
@@ -70,7 +70,7 @@ public static class CommonUtil
     /// </summary>
     /// <param name="xmlStr"></param>
     /// <returns></returns>
-    public static XElement XmlParse(string xmlStr)
+    public static XElement SerializeStringToXml(string xmlStr)
     {
         try
         {