From ac2741eb376e8745da4d072fa5c6206e09bbaf6e Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gmail.com>
Date: Tue, 6 Aug 2024 03:31:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HuanMeng.MiaoYu.Code/Base/MiaoYuBase.cs   |  2 +-
 .../Cache/CommonDataEntityCache.cs            |  2 +-
 .../HuanMeng.MiaoYu.Code/Cache/MiaoYuCache.cs |  6 +++++
 .../Cache/Special/CharacterEntityCache.cs     |  1 -
 .../HuanMeng.MiaoYu.WebApi/appsettings.json   | 25 +++++++++++++++++--
 5 files changed, 31 insertions(+), 5 deletions(-)

diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Base/MiaoYuBase.cs b/src/0-core/HuanMeng.MiaoYu.Code/Base/MiaoYuBase.cs
index 9933ff5..f074c3a 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Base/MiaoYuBase.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Base/MiaoYuBase.cs
@@ -122,7 +122,7 @@ namespace HuanMeng.MiaoYu.Code.Base
         /// dto映射
         /// </summary>
         //[FromServices]
-        public IMapper Mapper
+        public override IMapper Mapper
         {
             get
             {
diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Cache/CommonDataEntityCache.cs b/src/0-core/HuanMeng.MiaoYu.Code/Cache/CommonDataEntityCache.cs
index 2a59e67..a25b94d 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Cache/CommonDataEntityCache.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Cache/CommonDataEntityCache.cs
@@ -43,7 +43,7 @@ namespace HuanMeng.MiaoYu.Code.Cache
         /// <summary>
         /// 数据
         /// </summary>
-        public List<T> DataList
+        public virtual List<T> DataList
         {
             get
             {
diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Cache/MiaoYuCache.cs b/src/0-core/HuanMeng.MiaoYu.Code/Cache/MiaoYuCache.cs
index 64e9ef8..f1b0f39 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Cache/MiaoYuCache.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Cache/MiaoYuCache.cs
@@ -17,6 +17,7 @@ namespace HuanMeng.MiaoYu.Code.Cache
     /// <param name="dao"></param>
     public partial class MiaoYuCache(CacheBase cacheBase)
     {
+
         #region 角色缓存表
 
         /// <summary>
@@ -169,6 +170,11 @@ namespace HuanMeng.MiaoYu.Code.Cache
 
     public static class MiaoYuCacheExtend
     {
+
+        /// <summary>
+        /// 缓存时间
+        /// </summary>
+        public static DateTime CacheTime { get; set; }
         #region 缓存锁
         /// <summary>
         /// 对话角色缓存表
diff --git a/src/0-core/HuanMeng.MiaoYu.Code/Cache/Special/CharacterEntityCache.cs b/src/0-core/HuanMeng.MiaoYu.Code/Cache/Special/CharacterEntityCache.cs
index 422bce0..08b776e 100644
--- a/src/0-core/HuanMeng.MiaoYu.Code/Cache/Special/CharacterEntityCache.cs
+++ b/src/0-core/HuanMeng.MiaoYu.Code/Cache/Special/CharacterEntityCache.cs
@@ -19,7 +19,6 @@ namespace HuanMeng.MiaoYu.Code.Cache.Special
         /// <summary>
         /// 锁
         /// </summary>
-        private static object CharacterCacheLock = new object();
         private IMapper mapper = cacheBase.Mapper;
 
         /// <summary>
diff --git a/src/2-api/HuanMeng.MiaoYu.WebApi/appsettings.json b/src/2-api/HuanMeng.MiaoYu.WebApi/appsettings.json
index f3ec8fc..a76754e 100644
--- a/src/2-api/HuanMeng.MiaoYu.WebApi/appsettings.json
+++ b/src/2-api/HuanMeng.MiaoYu.WebApi/appsettings.json
@@ -22,11 +22,32 @@
       {
         "Name": "File",
         "Args": {
-          "path": "../output/logs/log-.txt",
+          "path": "../output/logs/info/log-.txt",
           "rollingInterval": "Day",
-          "shared": true ,
+          "restrictedToMinimumLevel": "Information", //写入日志的级别
+          "shared": true
           //"outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}"
         }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "../output/logs/error/log-.txt",
+          "rollingInterval": "Day", //日志文件按天滚动生成。
+          "restrictedToMinimumLevel": "Error", //写入日志的级别  //包括 Verbose、Debug、Information、Warning、Error 和 Fatal
+          "shared": true, //不占用文件
+          // "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}"
+        }
+      },
+      {
+        "Name": "File",
+        "Args": {
+          "path": "../output/logs/debug/log-.txt",
+          "rollingInterval": "Day", //日志文件按天滚动生成。
+          "restrictedToMinimumLevel": "Debug", //写入日志的级别  //包括 Verbose、Debug、Information、Warning、Error 和 Fatal
+          "shared": true //不占用文件
+          // "outputTemplate": "{Timestamp:yyyy-MM-dd HH:mm:ss.fff zzz} [{Level}] {Message}{NewLine}{Exception}"
+        }
       }
     ],
     "Enrich": [ "FromLogContext", "WithMachineName", "WithThreadId" ]