Bladeren bron

优化 升级nuget包

zuohuaijun 4 jaren geleden
bovenliggende
commit
5ce8006b8c

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

@@ -18,17 +18,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Caching.CSRedis" Version="3.8.1" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.3.0" />
-    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.3.0" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.3.0" />
-    <PackageReference Include="Furion.Pure" Version="3.3.0" />
+    <PackageReference Include="Caching.CSRedis" Version="3.8.2" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="3.3.3" />
+    <PackageReference Include="Furion.Extras.Logging.Serilog" Version="3.3.3" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="3.3.3" />
+    <PackageReference Include="Furion.Pure" Version="3.3.3" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.6.4" />
     <PackageReference Include="MySql.Data" Version="8.0.29" />
     <PackageReference Include="OnceMi.AspNetCore.OSS" Version="1.1.5" />
     <PackageReference Include="SKIT.FlurlHttpClient.Wechat.Api" Version="2.14.0" />
-    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.9.0" />
-    <PackageReference Include="SqlSugarCore" Version="5.0.8.3" />
+    <PackageReference Include="SKIT.FlurlHttpClient.Wechat.TenpayV3" Version="2.9.1" />
+    <PackageReference Include="SqlSugarCore" Version="5.0.8.6" />
     <PackageReference Include="System.Linq.Dynamic.Core" Version="1.2.18" />
     <PackageReference Include="UAParser" Version="3.1.47" />
     <PackageReference Include="Yitter.IdGenerator" Version="1.0.12" />

+ 8 - 0
Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -2475,6 +2475,14 @@
             <param name="pi"></param>
             <returns></returns>
         </member>
+        <member name="M:Admin.NET.Core.Extension.RepositoryExtension.FakeDelete``1(SqlSugar.IUpdateable{``0})">
+            <summary>
+            实体假删除 _rep.Context.Updateable(entity).FakeDelete().ExecuteCommandAsync();
+            </summary>
+            <typeparam name="T"></typeparam>
+            <param name="updateable"></param>
+            <returns></returns>
+        </member>
         <member name="T:Admin.NET.Core.LogExceptionHandler">
             <summary>
             全局异常处理

+ 4 - 11
Admin.NET/Admin.NET.Core/Extension/RepositoryExtension.cs

@@ -1,18 +1,11 @@
-using Furion;
 using SqlSugar;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Admin.NET.Core.Extension
 {
     public static class RepositoryExtension
     {
         /// <summary>
-        /// 根据已有实体假删除 _rep.Context.Updateable(entity).FakeDelete().ExecuteCommandAsync();
+        /// 实体假删除 _rep.Context.Updateable(entity).FakeDelete().ExecuteCommandAsync();
         /// </summary>
         /// <typeparam name="T"></typeparam>
         /// <param name="updateable"></param>
@@ -21,9 +14,9 @@ namespace Admin.NET.Core.Extension
         {
             return updateable.ReSetValue(x => { x.IsDelete = true; })
                 .IgnoreColumns(ignoreAllNullColumns: true)
-                .EnableDiffLogEvent()   //记录差异日志
-                .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId });  //允许更新的字段, AOP拦截会自动设置UpdateTime,UpdateUserId
+                .EnableDiffLogEvent()   // 记录差异日志
+                .UpdateColumns(x => new { x.IsDelete, x.UpdateTime, x.UpdateUserId });  // 允许更新的字段-AOP拦截自动设置UpdateTime、UpdateUserId
         }
-        
+
     }
 }

+ 3 - 4
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarRepository.cs

@@ -12,12 +12,12 @@ namespace Admin.NET.Core
     {
         public SqlSugarRepository(ISqlSugarClient context = null) : base(context) // 默认值等于null不能少
         {
-            base.Context = App.GetService<ISqlSugarClient>(); // 用手动获取方式支持切换仓储
+            base.Context = App.GetService<ISqlSugarClient>(); // 切换仓储
 
-            // 数据库上下文根据实体切换,业务分库(使用环境例如微服务)
+            // 数据库上下文根据实体切换-业务分库(例如微服务环境)
             var entityType = typeof(T);
 
-            //审计日志,获取系统配置需要切库
+            // 审计日志切换数据
             if (entityType == typeof(SysLogAudit) || entityType == typeof(SysLogEx) || entityType == typeof(SysLogOp) || entityType == typeof(SysLogVis) || entityType == typeof(SysConfig))
             {
                 Context = Context.AsTenant().GetConnectionScope(SqlSugarConst.ConfigId);
@@ -38,7 +38,6 @@ namespace Admin.NET.Core
                     Context.AsTenant().ChangeDatabase(tenantAttribute.configId);
                 }
             }
-            
         }
     }
 }

+ 7 - 0
doc/Vben2前端框架修改记录.txt

@@ -54,6 +54,13 @@ src\layouts\default\header\index.vue
 src\layouts\default\header\components\user-dropdown\index.vue
 11、Tree组件添加滚动条
 src\components\Tree\src\Tree.vue
+12、改成中文
+Vben2/index.html	
+13、去掉时间戳
+\src\utils\http\axios
+14、解决表格设置不加载列名选项的问题
+/src/components/Table/src/components/settings/ColumnSetting.vue 
+
 
 /////////////////////////////////////////////////////////////////////