[fix] 修复日志写入错误导致程序异常问题

xianhc · xianhc · commit 92dbe3abab03 · 2024-05-19T14:01:24.000+08:00
diff --git a/Ape.Volo.Api/Filter/GlobalExceptionFilter.cs b/Ape.Volo.Api/Filter/GlobalExceptionFilter.cs
@@ -89,11 +89,23 @@ public async Task OnExceptionAsync(ExceptionContext context)
             MiniProfiler.Current.CustomTiming("Errors：", throwMsg);
         }
 
-        //记录日志
-        _logger.LogError(WriteLog(context.HttpContext, remoteIp, ipAddress, context.Exception,
-            _httpUser.Account,
-            _browserDetector.Browser?.OS, _browserDetector.Browser?.DeviceType, _browserDetector.Browser?.Name,
-            _browserDetector.Browser?.Version), context.Exception);
+        try
+        {
+            //记录日志
+            _logger.LogError(WriteLog(context.HttpContext, remoteIp, ipAddress, context.Exception,
+                _httpUser.Account,
+                _browserDetector.Browser?.OS, _browserDetector.Browser?.DeviceType, _browserDetector.Browser?.Name,
+                _browserDetector.Browser?.Version));
+        }
+        catch (Exception e)
+        {
+            //_logger.LogCritical("LogError出错:" + e.ToString());
+            FileHelper.WriteLog(WriteLog(context.HttpContext, remoteIp, ipAddress, e,
+                _httpUser.Account,
+                _browserDetector.Browser?.OS, _browserDetector.Browser?.DeviceType, _browserDetector.Browser?.Name,
+                _browserDetector.Browser?.Version));
+        }
+
         var settingDto = await _settingService.FindSettingByName("IsExceptionLogSaveDB");
         if (settingDto != null && settingDto.Value.ToBool() && exceptionType != typeof(DemoRequestException))
         {
diff --git a/Ape.Volo.Api/appsettings.Development.json b/Ape.Volo.Api/appsettings.Development.json
@@ -53,19 +53,19 @@
         "Enabled": true,
         "ConnectionString": "apevoloMaster.db"
       },
-      {
-        "ConnId": "Ape.Volo.Log",
-        "HitRate": 0,
-        "DBType": 2,
-        "Enabled": true,
-        "ConnectionString": "apevoloLog.db"
-      },
       {
         "ConnId": "Ape.Volo.Oracle",
         "HitRate": 20,
         "DBType": 3,
         "Enabled": false,
         "ConnectionString": "Data Source=localhost/orcl;User ID=system;Password=123456;Persist Security Info=True;Connection Timeout=60;"
+      },
+      {
+        "ConnId": "Ape.Volo.Log",
+        "HitRate": 0,
+        "DBType": 2,
+        "Enabled": true,
+        "ConnectionString": "apevoloLog.db"
       }
     ]
   },
diff --git a/Ape.Volo.Api/appsettings.json b/Ape.Volo.Api/appsettings.json
@@ -53,19 +53,19 @@
         "Enabled": true,
         "ConnectionString": "apevoloMaster.db"
       },
-      {
-        "ConnId": "Ape.Volo.Log",
-        "HitRate": 0,
-        "DBType": 2,
-        "Enabled": true,
-        "ConnectionString": "apevoloLog.db"
-      },
       {
         "ConnId": "Ape.Volo.Oracle",
         "HitRate": 20,
         "DBType": 3,
         "Enabled": false,
         "ConnectionString": "Data Source=localhost/orcl;User ID=system;Password=123456;Persist Security Info=True;Connection Timeout=60;"
+      },
+      {
+        "ConnId": "Ape.Volo.Log",
+        "HitRate": 0,
+        "DBType": 2,
+        "Enabled": true,
+        "ConnectionString": "apevoloLog.db"
       }
     ]
   },
diff --git a/Ape.Volo.Common/Helper/FileHelper.cs b/Ape.Volo.Common/Helper/FileHelper.cs
@@ -3,6 +3,7 @@
 using System.IO;
 using System.Text;
 using Ape.Volo.Common.Extention;
+using Ape.Volo.Common.Global;
 
 namespace Ape.Volo.Common.Helper;
 
@@ -167,12 +168,11 @@ private static void WriteTxt(string content, string path, Encoding encoding, Fil
     /// 输出日志到指定文件
     /// </summary>
     /// <param name="msg">日志消息</param>
-    /// <param name="path">日志文件位置（默认为D:\测试\a.log）</param>
-    public static void WriteLog(string msg, string path = @"Log.txt")
+    public static void WriteLog(string msg)
     {
-        string content = $"{DateTime.Now.ToCstTime().ToString("yyyy-MM-dd HH:mm:ss")}:{msg}";
-
-        WriteTxt(content, $"{GetCurrentDir()}{content}");
+        string content = $"/Logs/{DateTime.Now.ToCstTime():yyyy-MM-dd}.log";
+        msg = "【当前时间】 : " + DateTime.Now.ToCstTime().ToString("yyyy-MM-dd HH:mm:ss") + msg;
+        WriteText(msg, $"{AppSettings.ContentRootPath}{content}", Encoding.UTF8);
     }
 
 
diff --git a/Ape.Volo.Entity/Monitor/AuditLog.cs b/Ape.Volo.Entity/Monitor/AuditLog.cs
@@ -53,13 +53,13 @@ public class AuditLog : BaseEntity, ISoftDeletedEntity
     /// <summary>
     /// 请求参数
     /// </summary>
-    [SugarColumn(Length = 4000, IsNullable = true)]
+    [SugarColumn(ColumnDataType = "longtext,text,clob", IsNullable = true)]
     public string RequestParameters { get; set; }
 
     /// <summary>
     /// 响应数据
     /// </summary>
-    [SugarColumn(Length = 4000, IsNullable = true)]
+    [SugarColumn(ColumnDataType = "longtext,text,clob", IsNullable = true)]
     public string ResponseData { get; set; }
 
     /// <summary>
diff --git a/Ape.Volo.Entity/Monitor/ExceptionLog.cs b/Ape.Volo.Entity/Monitor/ExceptionLog.cs
@@ -53,7 +53,7 @@ public class ExceptionLog : BaseEntity, ISoftDeletedEntity
     /// <summary>
     /// 请求参数
     /// </summary>
-    [SugarColumn(Length = 4000, IsNullable = true)]
+    [SugarColumn(ColumnDataType = "longtext,text,clob", IsNullable = true)]
     public string RequestParameters { get; set; }
 
     /// <summary>
@@ -65,13 +65,13 @@ public class ExceptionLog : BaseEntity, ISoftDeletedEntity
     /// <summary>
     /// 异常完整信息
     /// </summary>
-    [SugarColumn(IsNullable = true)]
+    [SugarColumn(ColumnDataType = "longtext,text,clob", IsNullable = true)]
     public string ExceptionMessageFull { get; set; }
 
     /// <summary>
     /// 异常堆栈信息
     /// </summary>
-    [SugarColumn(Length = 500, IsNullable = true)]
+    [SugarColumn(ColumnDataType = "longtext,text,clob", IsNullable = true)]
     public string ExceptionStack { get; set; }
 
     /// <summary>
diff --git a/Ape.Volo.Entity/Seed/DataSeeder.cs b/Ape.Volo.Entity/Seed/DataSeeder.cs
@@ -49,7 +49,8 @@ public static async Task InitSystemDataAsync(DataContext dataContext, bool isIni
             }
             else
             {
-                throw new Exception("sqlsugar官方表示Oracle不支持代码建库，请先建库再启动项目");
+                //已有库得情况下 把抛异常代码注释掉
+                throw new Exception("sqlSugar不支持Oracle使用代码建库,请先建库后注释该代码重新启动！");
             }
 
             ConsoleHelper.WriteLine("初始化主库成功。", ConsoleColor.Green);
@@ -441,7 +442,16 @@ await dataContext.GetEntityDb<RoleApis>().InsertRangeAsync(
             ConsoleHelper.WriteLine($"Log Db ConnectString: {logDb.CurrentConnectionConfig.ConnectionString}");
             ConsoleHelper.WriteLine("初始化日志库成功。", ConsoleColor.Green);
             ConsoleHelper.WriteLine("初始化日志库数据表....");
-            logDb.DbMaintenance.CreateDatabase();
+            if (logDb.CurrentConnectionConfig.DbType != DbType.Oracle)
+            {
+                logDb.DbMaintenance.CreateDatabase();
+            }
+            else
+            {
+                //已有库得情况下 把抛异常代码注释掉
+                throw new Exception("sqlSugar不支持Oracle使用代码建库,请先建库后注释该代码重新启动！");
+            }
+
             var logEntityList = GlobalData.GetEntityAssembly().GetTypes()
                 .Where(x => x.IsClass && x != typeof(SerilogBase) && x.Namespace != null &&
                             x.Namespace.StartsWith("Ape.Volo.Entity.Monitor")).ToList();
diff --git a/Ape.Volo.IBusiness/Dto/Permission/CreateUpdateUserDto.cs b/Ape.Volo.IBusiness/Dto/Permission/CreateUpdateUserDto.cs
@@ -46,25 +46,24 @@ public class CreateUpdateUserDto : BaseEntityDto<long>
     /// <summary>
     /// 性别
     /// </summary>
-    [Display(Name = "User.Gender")]
-    [Required(ErrorMessage = "{0}required")]
+    [Required]
     public string Gender { get; set; }
 
     /// <summary>
     /// 部门
     /// </summary>
-    [Required(ErrorMessage = "{0}required")]
+    [Required]
     public UserDeptDto Dept { get; set; }
 
     /// <summary>
     /// 角色
     /// </summary>
-    [Required(ErrorMessage = "{0}required")]
+    [Required]
     public List<UserRoleDto> Roles { get; set; }
 
     /// <summary>
     /// 岗位
     /// </summary>
-    [Required(ErrorMessage = "{0}required")]
+    [Required]
     public List<UserJobDto> Jobs { get; set; }
 }
