Sfoglia il codice sorgente

😎1、修复打印sql语句错误 2、升级Furion v4.9.2.1

zuohuaijun 2 anni fa
parent
commit
232f295c8b

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

@@ -21,9 +21,9 @@
     <PackageReference Include="AspNet.Security.OAuth.Gitee" Version="6.0.15" />
     <PackageReference Include="AspNet.Security.OAuth.Weixin" Version="6.0.15" />
     <PackageReference Include="AspNetCoreRateLimit" Version="5.0.0" />
-    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2" />
-    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2" />
-    <PackageReference Include="Furion.Pure" Version="4.9.2" />
+    <PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.9.2.1" />
+    <PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.9.2.1" />
+    <PackageReference Include="Furion.Pure" Version="4.9.2.1" />
     <PackageReference Include="IPTools.China" Version="1.6.0" />
     <PackageReference Include="Lazy.Captcha.Core" Version="2.0.6" />
     <PackageReference Include="Magicodes.IE.Excel" Version="2.7.5.1" />

+ 8 - 16
Admin.NET/Admin.NET.Core/SqlSugar/SqlSugarSetup.cs

@@ -100,14 +100,6 @@ public static class SqlSugarSetup
         {
             db.Aop.OnLogExecuting = (sql, pars) =>
             {
-                // 若参数值超过100个字符则进行截取
-                foreach (var par in pars)
-                {
-                    if (par.DbType != System.Data.DbType.String || par.Value == null) continue;
-                    if (par.Value.ToString().Length > 100)
-                        par.Value = string.Concat(par.Value.ToString()[..100], "......");
-                }
-
                 var log = $"【{DateTime.Now}——执行SQL】\r\n{UtilMethods.GetNativeSql(sql, pars)}\r\n";
                 var originColor = Console.ForegroundColor;
                 if (sql.StartsWith("SELECT", StringComparison.OrdinalIgnoreCase))
@@ -132,17 +124,17 @@ public static class SqlSugarSetup
             };
             db.Aop.OnLogExecuted = (sql, pars) =>
             {
+                // 若参数值超过100个字符则进行截取
+                foreach (var par in pars)
+                {
+                    if (par.DbType != System.Data.DbType.String || par.Value == null) continue;
+                    if (par.Value.ToString().Length > 100)
+                        par.Value = string.Concat(par.Value.ToString()[..100], "......");
+                }
+
                 // 执行时间超过5秒时
                 if (db.Ado.SqlExecutionTime.TotalSeconds > 5)
                 {
-                    // 若参数值超过100个字符则进行截取
-                    foreach (var par in pars)
-                    {
-                        if (par.DbType != System.Data.DbType.String || par.Value == null) continue;
-                        if (par.Value.ToString().Length > 100)
-                            par.Value = string.Concat(par.Value.ToString()[..100], "......");
-                    }
-
                     var fileName = db.Ado.SqlStackTrace.FirstFileName; // 文件名
                     var fileLine = db.Ado.SqlStackTrace.FirstLine; // 行号
                     var firstMethodName = db.Ado.SqlStackTrace.FirstMethodName; // 方法名