Преглед изворни кода

1. 程序入口 中文备注乱码处理
2. hotmail邮件多线程处理

Lyyyi пре 4 дана
родитељ
комит
d30b5ff683

+ 1 - 1
OASystem/OASystem.Api/Controllers/AuthController.cs

@@ -496,7 +496,7 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(LoginView), StatusCodes.Status200OK)]
         public async Task<IActionResult> MicrosoftHotmailRefreshToken()
         {
-            var hotmailConfigs = await _hotmailService.GetUserMailConfigListAsync();
+            var hotmailConfigs = await _hotmailService.GetUserMailConfigListAsync(_loginRep._sqlSugar);
 
             if (hotmailConfigs == null)
             {

+ 26 - 12
OASystem/OASystem.Api/OAMethodLib/Hotmail/HotmailService.cs

@@ -109,12 +109,26 @@ namespace OASystem.API.OAMethodLib.Hotmail
                 MaxDegreeOfParallelism = 5 // 根据服务器性能调整
             };
 
+            string connectionString = _config.GetConnectionString("OA2023DB");
+
             await Parallel.ForEachAsync(emails, parallelOptions, async (email, ct) =>
             {
+                var config = new ConnectionConfig()
+                {
+                    ConfigId = "Parallel_Task_" + email, // 动态 ID,防止干扰
+                    ConnectionString = connectionString,
+                    DbType = DbType.SqlServer,
+                    IsAutoCloseConnection = true, // 必须:执行完立即释放物理连接
+                    InitKeyType = InitKeyType.Attribute
+                };
+
+                // 每一个并发线程都拥有一个完全属于自己的“小炉子”(数据库客户端)
+                using var db = new SqlSugarClient(config);
+
                 try
                 {
                     _logger.LogInformation("Microsoft Hotmail -> [{Hotmail}] 获取token ",email);
-                    var client = await GetClientAsync(email);
+                    var client = await GetClientAsync(email, db);
                     _logger.LogInformation("Microsoft Hotmail -> [{Hotmail}] 获取Graph客户端,刷新token ", email);
                     var response = await client.Me.Messages.GetAsync(q =>
                     {
@@ -169,7 +183,7 @@ namespace OASystem.API.OAMethodLib.Hotmail
         {
             try
             {
-                var client = await GetClientAsync(fromEmail);
+                var client = await GetClientAsync(fromEmail, _sqlSugar);
 
                 var requestBody = new Microsoft.Graph.Me.SendMail.SendMailPostRequestBody
                 {
@@ -223,7 +237,7 @@ namespace OASystem.API.OAMethodLib.Hotmail
         /// <returns></returns>
         public async Task<HotmailConfig?> GetUserMailConfig(int userId)
         {
-            var allConfigs = await GetUserMailConfigListAsync();
+            var allConfigs = await GetUserMailConfigListAsync(_sqlSugar);
 
             if (allConfigs == null || !allConfigs.Any()) return null;
 
@@ -236,9 +250,9 @@ namespace OASystem.API.OAMethodLib.Hotmail
         /// 获取邮箱配置信息 - ALL
         /// </summary>
         /// <returns></returns>
-        public async Task<List<HotmailConfig>?> GetUserMailConfigListAsync()
+        public async Task<List<HotmailConfig>?> GetUserMailConfigListAsync(ISqlSugarClient db)
         {
-            var remark = await _sqlSugar.Queryable<Sys_SetData>()
+            var remark = await db.Queryable<Sys_SetData>()
                 .Where(x => x.IsDel == 0 && x.Id == 1555 && x.STid == 137)
                 .Select(x => x.Remark)
                 .FirstAsync();
@@ -263,7 +277,7 @@ namespace OASystem.API.OAMethodLib.Hotmail
         /// <summary>
         /// 获取 Graph 客户端,处理 Token 自动刷新 (线程安全版)
         /// </summary>
-        private async Task<GraphServiceClient> GetClientAsync(string email)
+        private async Task<GraphServiceClient> GetClientAsync(string email, ISqlSugarClient db)
         {
             // 获取或创建针对该 Email 的独立信号量锁
             var userLock = _userLocks.GetOrAdd(email, _ => new SemaphoreSlim(1, 1));
@@ -285,7 +299,7 @@ namespace OASystem.API.OAMethodLib.Hotmail
                 if (token.ExpiresAt < DateTime.UtcNow.AddMinutes(5))
                 {
                     // 内部逻辑:调用 Graph 刷新接口 -> 更新 token 对象 -> 写入 Redis
-                    token = await RefreshAndSaveTokenAsync(token);
+                    token = await RefreshAndSaveTokenAsync(token, db);
                     // 调试建议:记录刷新日志
                     // _logger.LogInformation("Token refreshed for {Email}", email);
                 }
@@ -300,7 +314,7 @@ namespace OASystem.API.OAMethodLib.Hotmail
             }
             catch (Exception ex)
             {
-                // _logger.LogError(ex, "GetClientAsync failed for {Email}", email);
+                 _logger.LogError(ex, "GetClientAsync failed for {Email}", email);
                 throw;
             }
             finally
@@ -309,11 +323,11 @@ namespace OASystem.API.OAMethodLib.Hotmail
             }
         }
 
-        public async Task<UserToken> RefreshAndSaveTokenAsync(UserToken oldToken)
+        public async Task<UserToken> RefreshAndSaveTokenAsync(UserToken oldToken, ISqlSugarClient db)
         {
             // 1. 实时获取该用户对应的配置信息
             // 准则:不再信任全局 _config,而是根据 Email 溯源配置
-            var allConfigs = await GetUserMailConfigListAsync();
+            var allConfigs = await GetUserMailConfigListAsync(db);
             var currentConfig = allConfigs?.FirstOrDefault(x =>
                 x.UserName.Equals(oldToken.Email, StringComparison.OrdinalIgnoreCase));
 
@@ -336,7 +350,7 @@ namespace OASystem.API.OAMethodLib.Hotmail
             if (!response.IsSuccessStatusCode)
             {
                 var error = await response.Content.ReadAsStringAsync();
-                throw new Exception($"微软刷新接口拒绝请求: {error}");
+                throw new Exception($"微软刷新token接口拒绝请求: {error}");
             }
 
             using var doc = await JsonDocument.ParseAsync(await response.Content.ReadAsStreamAsync());
@@ -381,7 +395,7 @@ namespace OASystem.API.OAMethodLib.Hotmail
                 var currentToken = System.Text.Json.JsonSerializer.Deserialize<UserToken>(cachedJson);
 
                 // 强制进入刷新逻辑
-                await RefreshAndSaveTokenAsync(currentToken!);
+                await RefreshAndSaveTokenAsync(currentToken!, _sqlSugar);
                 return true;
             }
             finally

+ 7 - 7
OASystem/OASystem.Api/OAMethodLib/Quartz/Business/ProcessAndNotifySummary.cs

@@ -28,7 +28,7 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
         public static async void ProcessAndNotifySummaryAsync()
         {
             _logger.LogInformation("Hotmail 定时发送邮件 -> 开始");
-            var hotmailConfigs = await _hotmailService.GetUserMailConfigListAsync();
+            var hotmailConfigs = await _hotmailService.GetUserMailConfigListAsync(_sqlSugar);
             if (hotmailConfigs == null || !hotmailConfigs.Any()) return;
 
             _logger.LogInformation("Hotmail 定时发送邮件 -> 获取基础配置");
@@ -104,11 +104,11 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                         var summary = aiSummaryResults?.FirstOrDefault(x => x.Recipient.Equals(hotmailConfig.UserName, StringComparison.OrdinalIgnoreCase));
 
                         string finalSubject = $"{DateTime.Now:yyyy-MM-dd} - 邮件汇总";
-                        string finalBody = "未能获取到hotmail邮件。";
-
+                        string finalBody = $"Hotmail账号 {hotmailConfig.UserName} 在 {yesterdayStart:yyyy-MM-dd HH:mm:ss} 至 {yesterdayEnd:yyyy-MM-dd HH:mm:ss} 时间段内,未查询到收件箱邮件信息。";
+                         
                         if (summary != null)
                         {
-                            finalSubject = $"[AI摘要] {summary.EmailSubject}";
+                            finalSubject = $"[AI汇总] {summary.EmailSubject}";
                             finalBody = summary.TextBody;
                         }
 
@@ -120,8 +120,8 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                         var seedRes = await _qiYeWeChatApiService.EmailSendAsync(new EmailRequestDto
                         {
                             ToEmails = new List<string> { 
-                                //qwEmail,
-                                //defualtEmail1,
+                                qwEmail,
+                                defualtEmail1,
                                 defualtEmail2
                             },
                             Subject = finalSubject,
@@ -147,7 +147,7 @@ namespace OASystem.API.OAMethodLib.Quartz.Business
                 }
             }
 
-            _logger.LogInformation("Hotmail 定时发送邮件 -> DeepSeek AI 分析汇总邮件 -> 分析失败");
+            _logger.LogInformation("Hotmail 定时发送邮件 -> DeepSeek AI 分析汇总邮件 -> 分析成功");
         }
 
         /// <summary>

+ 128 - 131
OASystem/OASystem.Api/Program.cs

@@ -35,7 +35,7 @@ Console.Title = $"FMGJ OASystem Server";
 var builder = WebApplication.CreateBuilder(args);
 var basePath = AppContext.BaseDirectory;
 
-//寮曞叆閰嶇疆鏂囦欢
+// 导入配置文件
 var _config = new ConfigurationBuilder()
                  .SetBasePath(basePath)
                  .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
@@ -44,10 +44,10 @@ var _config = new ConfigurationBuilder()
                  .Build();
 builder.Services.AddSingleton(new AppSettingsHelper(_config));
 
-//璁剧疆璇锋眰鍙傛暟鍙�涓嶅~
+// 设置请求参数发生异常
 builder.Services.AddControllers(options => options.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true);
 
-//璁剧疆璇锋眰鍙傛暟閿欒��榛樿�よ繑鍥炴牸寮�
+// 设置请求参数错误 默认返回格式
 builder.Services.AddControllers()
     .ConfigureApiBehaviorOptions(options =>
     {
@@ -76,28 +76,29 @@ builder.Services.AddControllersWithViews();
 builder.Services.AddControllers()
     .AddJsonOptions(options =>
     {
-        //绌哄瓧娈典笉鍝嶅簲Response
+        // 空字段不响应 Response
         //options.JsonSerializerOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
 
         options.JsonSerializerOptions.Converters.Add(new NullJsonConverter());
 
-        //鏃堕棿鏍煎紡鍖栧搷搴�
+        // 时间格式化响应
         options.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
 
-        //decimal 鍥涗綅灏忔暟
-        //options.JsonSerializerOptions.Converters.Add(new DecimalConverter(_decimalPlaces)); // 灏嗕繚鐣欏皬鏁颁綅鏁板弬鏁颁紶閫掔粰鑷�瀹氫箟搴忓垪鍖栧櫒
+        // decimal 四位小数
+        // 保留小数位数参数传递给自定义序列化器
+        //options.JsonSerializerOptions.Converters.Add(new DecimalConverter(_decimalPlaces)); 
     });
 
 builder.Services.TryAddSingleton<IHttpContextAccessor, HttpContextAccessor>();
 
-#region 娣诲姞闄愭祦涓�闂翠欢鏈嶅姟娉ㄥ唽
+#region 添加限流中间件服务注册
 
-// 娣诲姞鍐呭瓨缂撳瓨锛堥檺娴侀渶瑕侊級
+// 添加内存缓存,限流中间件使用
 builder.Services.AddMemoryCache();
 
-// 閰嶇疆闄愭祦璁剧疆
+// 配置限流设置
 builder.Services.Configure<RateLimitConfig>(
-    builder.Configuration.GetSection("RateLimiting"));
+builder.Configuration.GetSection("RateLimiting"));
 #endregion
 
 #region Gzip
@@ -121,14 +122,14 @@ builder.Services.AddCors(options =>
     //policy.AddPolicy("Cors", opt => opt
     //        //.SetIsOriginAllowed(origin =>
     //        //{
-    //        //    // 瀹氫箟鍏佽�哥殑鏉ユ簮鍒楄〃
+    //        //    // 定义允许的来源列表
     //        //    var allowedOrigins = new List<string>
     //        //        {
     //        //           "http://132.232.92.186:9002",
     //        //           "http://oa.pan-american-intl.com:4399"
     //        //        };
 
-    //        //    // 妫€鏌ヨ�锋眰鐨勬潵婧愭槸鍚﹀湪鍏佽�哥殑鍒楄〃涓�
+    //        //    // 检查请求的来源是否在允许的列表中
     //        //    return allowedOrigins.Contains(origin);
     //        //})
 
@@ -150,7 +151,7 @@ builder.Services.AddCors(options =>
 });
 #endregion
 
-#region 涓婁紶鏂囦欢 
+#region 上传文件 
 builder.Services.AddCors(policy =>
 {
     policy.AddPolicy("Cors", opt => opt
@@ -176,15 +177,17 @@ builder.Services.Configure<KestrelServerOptions>(options =>
 
 #endregion
 
-#region 鎺ュ彛鍒嗙粍
+#region 上传文件
+// 上传文件分组配置:Tuple<分组标识, 分组名称>
 var groups = new List<Tuple<string, string>>
 {
-    //new Tuple<string, string>("Group1","鍒嗙粍涓€"),
-    //new Tuple<string, string>("Group2","鍒嗙粍浜�")
+    // 示例分组(取消注释即可启用)
+    //new Tuple<string, string>("Group1","分组一"),
+    //new Tuple<string, string>("Group2","分组二")
 };
 #endregion
 
-#region 娉ㄥ叆鏁版嵁搴�
+#region 接口分组
 
 #region old
 
@@ -207,38 +210,36 @@ builder.Services.AddScoped(options =>
     }
     , db =>
     {
-        // SQL鎵ц�屽畬
+        // SQL 执行完
         db.Aop.OnLogExecuted = (sql, pars) =>
         {
-            // 瓒呰繃1绉�
+            // 超过 1 秒
             if (db.Ado.SqlExecutionTime.TotalSeconds > 1)
             {
                 var FirstMethodName = db.Ado.SqlStackTrace.FirstMethodName;
-                //鎵ц�屽畬浜嗗彲浠ヨ緭鍑篠QL鎵ц�屾椂闂� (OnLogExecutedDelegate) 
+                // 执行完成可以输出 SQL 执行时间 (OnLogExecutedDelegate)
                 Console.WriteLine("NowTime:" + DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss"));
                 Console.WriteLine("MethodName:" + FirstMethodName);
                 Console.WriteLine("ElapsedTime:" + db.Ado.SqlExecutionTime.ToString());
                 Console.WriteLine("ExecuteSQL:" + sql);
             }
         };
-        //SQL鎵ц�屽墠
+        //
         db.Aop.OnLogExecuting = (sql, pars) =>
         {
         };
-        //SQL鎶ラ敊
+        // SQL 执行前
         db.Aop.OnError = (exp) =>
         {
-            //鑾峰彇鍘熺敓SQL鎺ㄨ崘 5.1.4.63  鎬ц兘OK
+            // 获取原生 SQL 建议 5.1.4.63 性能 OK
             //UtilMethods.GetNativeSql(exp.Sql, exp.Parametres);
-            //鑾峰彇鏃犲弬鏁癝QL瀵规€ц兘鏈夊奖鍝嶏紝鐗瑰埆澶х殑SQL鍙傛暟澶氱殑锛岃皟璇曚娇鐢�
+            // 获取无参数 SQL 对性能有影响,特别是大的 SQL 参数多的,调试使用
             //UtilMethods.GetSqlString(DbType.SqlServer, exp.sql, exp.parameters);
 
         };
-        //淇�鏀筍QL鍜屽弬鏁扮殑鍊�
+        // 修改 SQL 和参数的值
         db.Aop.OnExecutingChangeSql = (sql, pars) =>
         {
-            //sql=newsql
-            //foreach(var p in pars) //淇�鏀�
             return new KeyValuePair<string, SugarParameter[]>(sql, pars);
         };
     }
@@ -249,27 +250,7 @@ builder.Services.AddScoped(options =>
 
 #endregion
 
-//#region Identity 閰嶇疆
-//builder.Services.AddDataProtection();
-////涓嶈�佺敤 AddIdentity 锛� AddIdentity 鏄�浜嶮VC妗嗘灦涓�鐨�
-//builder.Services.AddIdentityCore<User>(opt =>
-//{
-//    opt.Password.RequireDigit = false; //鏁板瓧
-//    opt.Password.RequireLowercase = false;//灏忓啓瀛楁瘝
-//    opt.Password.RequireNonAlphanumeric = false;//鐗规畩绗﹀彿 渚嬪�� 锟�#@锛� 
-//    opt.Password.RequireUppercase = false; //澶у啓瀛楁瘝
-//    opt.Password.RequiredLength = 6;//瀵嗙爜闀垮害 6 
-//    opt.Password.RequiredUniqueChars = 1;//鐩稿悓瀛楃�﹀彲浠ュ嚭鐜板嚑娆�
-//    opt.Lockout.MaxFailedAccessAttempts = 5; //鍏佽�告渶澶氳緭鍏ヤ簲娆$敤鎴峰悕/瀵嗙爜閿欒��
-//    opt.Lockout.DefaultLockoutTimeSpan = new TimeSpan(0, 5, 0);//閿佸畾浜斿垎閽�
-//    opt.Tokens.PasswordResetTokenProvider = TokenOptions.DefaultEmailProvider; // 淇�鏀瑰瘑鐮佷娇鐢ㄩ偖浠躲€愰獙璇佺爜妯″紡銆�
-//    opt.Tokens.EmailConfirmationTokenProvider = TokenOptions.DefaultEmailProvider;  //// 
-//});
-//var idBuilder = new IdentityBuilder(typeof(User), typeof(UserRole), services);
-//idBuilder.AddEntityFrameworkStores<swapDbContext>().AddDefaultTokenProviders().AddRoleManager<RoleManager<UserRole>>().AddUserManager<UserManager<User>>();
-//#endregion
-
-#region 娉ㄥ叆Swagger娉ㄩ噴(鍚�鐢�)
+#region 注入 Swagger 注解 (禁用)
 
 if (AppSettingsHelper.Get("UseSwagger").ToBool())
 {
@@ -279,7 +260,7 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
         {
             Version = "v1",
             Title = "Api",
-            Description = "Api鎺ュ彛鏂囨。"
+            Description = "Api 接口文档"
         });
         foreach (var item in groups)
         {
@@ -312,7 +293,7 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
 }
 #endregion
 
-#region 娣诲姞鏍¢獙
+#region 添加校验
 
 builder.Services.AddTransient<OASystemAuthentication>();
 builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
@@ -327,7 +308,7 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             ValidAudience = "OASystem.com",
             ValidIssuer = "OASystem.com",
             IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_config["JwtSecurityKey"])),
-            ClockSkew = TimeSpan.FromSeconds(30), //杩囨湡鏃堕棿瀹归敊鍊硷紝瑙e喅鏈嶅姟鍣ㄧ��鏃堕棿涓嶅悓姝ラ棶棰橈紙绉掞級
+            ClockSkew = TimeSpan.FromSeconds(30), // 过期时间默认值,解决服务器时间不同步问题(秒)
             RequireExpirationTime = true,
         };
         options.Events = new JwtBearerEvents
@@ -335,7 +316,7 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             OnMessageReceived = context =>
             {
                 var path = context.HttpContext.Request.Path;
-                //濡傛灉鏄痵ignalr璇锋眰锛岄渶瑕佸皢token杞�瀛橈紝鍚﹀垯JWT鑾峰彇涓嶅埌token銆侽PTIONS璇锋眰闇€瑕佽繃婊ゅ埌锛屽洜涓篛PTIONS璇锋眰鑾峰彇涓嶅埌Token锛岀敤NGINX杩囨护鎺塐PTION璇锋眰.
+                // 如果是 signalr 请求,需要将 token 迁移,否则 JWT 获取不到 token。OPTIONS 请求需要过滤到,因为 OPTIONS 请求获取不到 Token,用 NGINX 过滤掉 OPTIONS 请求。
                 if (path.StartsWithSegments("/ChatHub"))
                 {
                     string accessToken = context.Request.Query["access_token"].ToString();
@@ -352,10 +333,10 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
 
 #endregion
 
-#region 鍒濆�嬪寲鏃ュ織
+#region 初始化日志
 var environment = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT");
 Log.Logger = new LoggerConfiguration()
-        //涓嶈�板綍瀹氭椂璁块棶API
+        // 不记录定时访问API
         .Filter.ByIncludingOnly(logEvent =>
         {
             if (logEvent.Properties.TryGetValue("RequestPath", out var pathValue))
@@ -373,22 +354,20 @@ Log.Logger = new LoggerConfiguration()
        .WriteTo.File(Path.Combine("Logs", @"Log.txt"), rollingInterval: RollingInterval.Day)
        .CreateLogger();
 
-// 
+#region 出入境费用明细 专用记录器
 
-#region 鍑哄叆澧冭垂鐢ㄦ槑缁� 涓撶敤璁板綍鍣�
-
-// 鎸囧畾纾佺洏缁濆�硅矾寰勶紙绀轰緥锛欴鐩樼殑AppLogs鏂囦欢澶癸級
+// 出入境费用明细 专用记录器
 var logDirectory = @"D:\OASystem\Logs\EnterExitCost";
 
-// 鑷�鍔ㄥ垱寤虹洰褰曪紙濡傛灉涓嶅瓨鍦�锛�
+// 自动创建目录(如果不存在)
 try
 {
     Directory.CreateDirectory(logDirectory);
-    Log.Information($"鏃ュ織鐩�褰曞凡鍒涘缓/纭�璁ゅ瓨鍦�: {logDirectory}");
+    Log.Information($"日志目录已创建/确认存在: {logDirectory}");
 }
 catch (Exception ex)
 {
-    Log.Fatal($"鏃犳硶鍒涘缓鏃ュ織鐩�褰� {logDirectory}: {ex.Message}");
+    Log.Fatal($"无法创建日志目录{logDirectory}: {ex.Message}");
     throw;
 }
 
@@ -399,50 +378,61 @@ var eec_TextLogger = new LoggerConfiguration()
 
 #endregion
 
-#region 鍥㈢粍姝ラ�ゆ搷浣� 涓撶敤璁板綍鍣�
+#region 分组步骤操作 专用记录器
 
-// 鎸囧畾纾佺洏缁濆�硅矾寰勶紙绀轰緥锛欴鐩樼殑AppLogs鏂囦欢澶癸級
+// 指定磁盘绝对路径(示例:D盘的AppLogs文件夹)
 var groupLogDir = @"D:\OASystem\Logs\GroupStepOP";
 
-// 鑷�鍔ㄥ垱寤虹洰褰曪紙濡傛灉涓嶅瓨鍦�锛�
+// 自动创建目录(如果不存在)
 try
 {
+    // 创建目录,若已存在则不执行任何操作
     Directory.CreateDirectory(groupLogDir);
-    Log.Information($"鏃ュ織鐩�褰曞凡鍒涘缓/纭�璁ゅ瓨鍦�: {groupLogDir}");
+    // 记录日志:目录已创建/确认存在
+    Log.Information($"日志目录已创建/确认存在: {groupLogDir}");
 }
 catch (Exception ex)
 {
-    Log.Fatal($"鏃犳硶鍒涘缓鏃ュ織鐩�褰� {groupLogDir}: {ex.Message}");
+    // 记录致命错误:无法创建日志目录
+    Log.Fatal($"无法创建日志目录 {groupLogDir}: {ex.Message}");
+    // 抛出异常终止程序
     throw;
 }
 
+// 初始化分组步骤操作专用日志器
 var groupStepOP_TextLogger = new LoggerConfiguration()
-    .MinimumLevel.Information()
-    .WriteTo.File(Path.Combine(groupLogDir, "text-records-.txt"), rollingInterval: RollingInterval.Month)
-    .CreateLogger();
+    .MinimumLevel.Information()  // 最低日志级别:Information
+    .WriteTo.File(               // 输出到文件
+        Path.Combine(groupLogDir, "text-records-.txt"),  // 日志文件路径+名称
+        rollingInterval: RollingInterval.Month)          // 滚动规则:按月生成新文件
+    .CreateLogger();  // 创建日志实例
 
 #endregion
 
-#region 浠诲姟鍒嗛厤鎿嶄綔 涓撶敤璁板綍鍣�
+#region 任务分配操作 专用记录器
 
-// 鎸囧畾纾佺洏缁濆�硅矾寰勶紙绀轰緥锛欴鐩樼殑AppLogs鏂囦欢澶癸級
+// 指定磁盘绝对路径(示例:D盘的AppLogs文件夹)
 var taskLogDir = @"D:\OASystem\Logs\TaskAllocation";
 
-// 鑷�鍔ㄥ垱寤虹洰褰曪紙濡傛灉涓嶅瓨鍦�锛�
+// 自动创建目录(如果不存在)
 try
 {
     Directory.CreateDirectory(taskLogDir);
-    Log.Information($"鏃ュ織鐩�褰曞凡鍒涘缓/纭�璁ゅ瓨鍦�: {taskLogDir}");
+    Log.Information($"日志目录已创建/确认存在: {taskLogDir}");
 }
 catch (Exception ex)
 {
-    Log.Fatal($"鏃犳硶鍒涘缓鏃ュ織鐩�褰� {taskLogDir}: {ex.Message}");
+    Log.Fatal($"无法创建日志目录 {taskLogDir}: {ex.Message}");
     throw;
 }
 
+// 创建任务分配专用日志实例(按月滚动归档)
 var task_TextLogger = new LoggerConfiguration()
     .MinimumLevel.Information()
-    .WriteTo.File(Path.Combine(taskLogDir, "text-records-.txt"), rollingInterval: RollingInterval.Month)
+    .WriteTo.File(
+        Path.Combine(taskLogDir, "text-records-.txt"),
+        rollingInterval: RollingInterval.Month
+     )
     .CreateLogger();
 
 #endregion
@@ -455,16 +445,21 @@ builder.Services.AddSingleton<IGroupTextFileLogger>(new GroupTextFileLogger(grou
 builder.Services.AddSingleton<ITaskTextFileLogger>(new TaskTextFileLogger(task_TextLogger));
 #endregion
 
-#region 寮曞叆娉ㄥ唽Autofac Module
+#region 注入注册 Autofac 模块
+// 使用 Autofac 作为 DI 容器工厂,替换默认容器
 builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory());
+
+// 配置 Autofac 容器注册
 var hostBuilder = builder.Host.ConfigureContainer<ContainerBuilder>(builder =>
 {
     try
     {
+        // 注册自定义 Autofac 注册模块(批量注入服务)
         builder.RegisterModule(new AutofacRegister());
     }
     catch (Exception ex)
     {
+        // 捕获注册异常,拼接异常信息与内部异常,便于排查错误
         throw new Exception(ex.Message + "\n" + ex.InnerException);
     }
 });
@@ -481,29 +476,32 @@ builder.Services.AddScoped<IMapper, Mapper>();
 
 #endregion
 
-#region DeepSeek AI 鏈嶅姟
+#region DeepSeek AI 服务
 
-// 閰嶇疆HTTP瀹㈡埛绔�锛圖eepSeek 闀胯€楁椂璋冪敤锛岄粯璁� 10 鍒嗛挓锛�
+// 配置HTTP客户端:DeepSeek 为长耗时调用,设置超时时间 10 分钟
 builder.Services.AddHttpClient<IDeepSeekService, DeepSeekService>(client =>
     client.Timeout = TimeSpan.FromMinutes(10));
 
 #endregion
 
-#region Doubao API 鏈嶅姟
+#region 豆包API服务
+
 var doubaoSetting = builder.Configuration.GetSection("DouBao").Get<OASystem.API.OAMethodLib.DoubaoAPI.DoubaoSetting>();
 builder.Services.AddSingleton(doubaoSetting);
 builder.Services.AddHttpClient("Doubao", c => c.BaseAddress = new Uri(doubaoSetting.BaseAddress));
 builder.Services.AddScoped<OASystem.API.OAMethodLib.DoubaoAPI.IDoubaoService, OASystem.API.OAMethodLib.DoubaoAPI.DoubaoService>();
+
 #endregion
 
-#region 鑱氬悎API 鏈嶅姟
+#region 聚合API服务
+
 builder.Services.AddControllersWithViews();
 builder.Services.AddSingleton<IJuHeApiService, JuHeApiService>();
 builder.Services.AddHttpClient("PublicJuHeApi", c => c.BaseAddress = new Uri("http://web.juhe.cn"));
 builder.Services.AddHttpClient("PublicJuHeTranslateApi", c => c.BaseAddress = new Uri("http://apis.juhe.cn"));
 #endregion
 
-#region 浼佷笟寰�淇�API 鏈嶅姟
+#region 企业微信 API 服务
 
 builder.Services.AddControllersWithViews();
 builder.Services.AddSingleton<IQiYeWeChatApiService, QiYeWeChatApiService>();
@@ -511,17 +509,17 @@ builder.Services.AddHttpClient("PublicQiYeWeChatApi", c => c.BaseAddress = new U
 
 #endregion
 
-#region 娣峰厓API
+#region 混元API
 
-// 浠庨厤缃�涓�璇诲彇鑵捐��浜戝瘑閽ヤ俊鎭�锛堣�风‘淇漚ppsettings.json涓�鏈夊�瑰簲閰嶇疆锛�
+// 从配置文件读取腾讯云密钥信息(对应 appsettings.json 中的配置节点)
 var secretId = builder.Configuration["TencentCloud:SecretId"];
 var secretKey = builder.Configuration["TencentCloud:SecretKey"];
 var region = builder.Configuration["TencentCloud:Region"] ?? "ap-guangzhou";
 
-// 閰嶇疆HttpClientFactory锛圫DK鍐呴儴浼氱敤鍒帮級
+// 注册 HttpClient 工厂(SDK 内部依赖使用)
 builder.Services.AddHttpClient();
 
-// 娉ㄥ唽鑵捐��浜慔unyuan Client涓篠ingleton锛堟帹鑽愶級
+// 注册腾讯云混元客户端(单例模式,官方推荐)
 builder.Services.AddSingleton(provider =>
 {
     Credential cred = new Credential
@@ -534,37 +532,29 @@ builder.Services.AddSingleton(provider =>
     HttpProfile httpProfile = new HttpProfile
     {
         Endpoint = "hunyuan.tencentcloudapi.com",
-        Timeout = 60 * 10,  // 鍗曚綅绉�
+        Timeout = 60 * 10,  // 超时时间:10分钟
     };
     clientProfile.HttpProfile = httpProfile;
 
     return new HunyuanClient(cred, region, clientProfile);
 });
 
-// 娉ㄥ唽鑷�瀹氫箟鏈嶅姟鎺ュ彛鍙婂叾瀹炵幇涓篠coped鐢熷懡鍛ㄦ湡
+// 注册自定义混元业务接口(作用域生命周期)
 builder.Services.AddScoped<IHunyuanService, HunyuanService>();
 
-// 娉ㄥ唽娣峰厓鏈嶅姟
-//builder.Services.AddHttpClient<IHunyuanService, HunyuanService>(client =>
-//{
-//    client.BaseAddress = new Uri("https://hunyuan.ap-chengdu.tencentcloudapi.com/");
-//    client.Timeout = TimeSpan.FromSeconds(60);
-//});
-
-//builder.Services.Configure<HunyuanApiSettings>(builder.Configuration.GetSection("HunyuanApiSettings"));
 #endregion
 
-#region 鏈夐亾API 鏈嶅姟
+#region 有道 API 服务
 //builder.Services.AddControllersWithViews();
 //builder.Services.AddSingleton<IYouDaoApiService, YouDaoApiService>();
 //builder.Services.AddHttpClient("PublicYouDaoApi", c => c.BaseAddress = new Uri("https://openapi.youdao.com"));
 #endregion
 
-#region 楂樺痉鍦板浘API 鏈嶅姟
+#region 高德地图 API 服务
 builder.Services.AddHttpClient<GeocodeService>();
 #endregion
 
-#region 閫氱敤鎼滅储鏈嶅姟
+#region 通用搜索服务
 builder.Services.AddScoped(typeof(DynamicSearchService<>));
 
 #endregion
@@ -600,7 +590,7 @@ builder.Services.TryAddSingleton(typeof(CommonService));
 builder.Services.AddScoped<HotmailService>();
 #endregion
 
-#region Microsoft Graph 閭�绠辨湇鍔�
+#region Microsoft Graph 邮件服务
 
 builder.Services.Configure<MicrosoftGraphMailboxOptions>(
     builder.Configuration.GetSection(MicrosoftGraphMailboxOptions.SectionName));
@@ -616,57 +606,49 @@ builder.Services.AddSingleton<IMicrosoftGraphMailboxService, MicrosoftGraphMailb
 
 var app = builder.Build();
 
-//// 1. 寮傚父澶勭悊鍣ㄥ簲璇ュ湪鏈€鏃╃殑浣嶇疆锛堥櫎浜嗘棩蹇楃瓑锛�
-//app.UseExceptionHandler(new ExceptionHandlerOptions
-//{
-//    ExceptionHandlingPath = "/Home/Error", 
-//    AllowStatusCode404Response = true
-//});
-
-//鑷�瀹氫箟寮傚父涓�闂翠欢
-//app.UseMiddleware<ExceptionHandlingMiddleware>();
-
-//serilog鏃ュ織 璇锋眰涓�闂寸�¢亾
+// Serilog日志 请求中间件
 app.UseSerilogRequestLogging(options =>
 {
-    //options.MessageTemplate = "HTTP {RequestMethod} {RequestPath} from {ClientIP} (UA: {UserAgent}, Referer: {Referer}) - {StatusCode} in {Elapsed} ms";
-
+    // 自定义日志输出模板
     options.MessageTemplate = "HTTP {RequestMethod} {RequestPath} from {ClientIP} (UA: {UserAgent}) - {StatusCode} in {Elapsed} ms";
 
-    // 鑷�瀹氫箟鏃ュ織绾у埆
+    // 自定义日志级别
     options.GetLevel = (httpContext, elapsed, ex) =>
     {
+        // 存在异常 → 错误级别
         if (ex != null) return LogEventLevel.Error;
+        // 500+ 状态码 → 错误级别
         if (httpContext.Response.StatusCode > 499) return LogEventLevel.Error;
 
-        // 瀵瑰仴搴锋�€鏌ョ瓑绔�鐐逛娇鐢ㄦ洿浣庣骇鍒�
+        // 健康检查接口使用更低级别(Debug)
         if (httpContext.Request.Path.StartsWithSegments("/health"))
             return LogEventLevel.Debug;
 
+        // 默认信息级别
         return LogEventLevel.Information;
     };
 
-    // 涓板瘜鏃ュ織涓婁笅鏂�
+    // 丰富日志上下文(添加自定义字段)
     options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>
     {
-        // 鑾峰彇瀹㈡埛绔疘P锛堝�勭悊浠g悊鎯呭喌锛�
+        // 获取客户端IP(处理代理场景)
         var ipAddress = CommonFun.GetClientIpAddress(httpContext);
+        // 解析客户端操作系统
         var userAgent = CommonFun.DetectOS(httpContext.Request.Headers.UserAgent.ToString());
 
-        // 娣诲姞IP鍜屽叾浠栨湁鐢ㄤ俊鎭�鍒版棩蹇椾笂涓嬫枃
+        // 添加IP及其他有用信息到日志上下文
         diagnosticContext.Set("ClientIP", ipAddress);
         diagnosticContext.Set("RequestHost", httpContext.Request.Host.Value);
         diagnosticContext.Set("UserAgent", userAgent);
         diagnosticContext.Set("Referer", httpContext.Request.Headers.Referer.ToString());
 
-        // 瀵逛簬API璇锋眰娣诲姞棰濆�栦俊鎭�
+        // 对API请求额外添加请求头信息
         if (httpContext.Request.Path.StartsWithSegments("/api"))
         {
             diagnosticContext.Set("RequestContentType", httpContext.Request.ContentType);
             diagnosticContext.Set("RequestContentLength", httpContext.Request.ContentLength ?? 0);
         }
     };
-
 });
 
 AutofacIocManager.Instance.Container = app.UseHostFiltering().ApplicationServices.GetAutofacRoot();//AutofacIocManager
@@ -685,60 +667,75 @@ app.UseCors("Cors");  //Cors
 
 //app.UseMiddleware<FixedPromptMiddleware>();
 
-// 瀹氫箟鍏佽�窤PI鐨勮�块棶鏃堕棿娈�
+// 定义允许 API 访问的时间范围
 //var startTime = DateTime.Parse(_config["ApiAccessTime:StartTime"]);
 //var endTime = DateTime.Parse(_config["ApiAccessTime:EndTime"]);
 //app.UseMiddleware<TimeRestrictionMiddleware>(startTime, endTime);
 
-//鎸囧畾API鎿嶄綔璁板綍淇℃伅
+// 指定 API 操作记录信息
 app.UseMiddleware<RecordAPIOperationMiddleware>();
 
-app.UseAuthentication(); // 璁よ瘉
+app.UseAuthentication(); // 认证授权中间件
 
 app.UseMiddleware<RateLimitMiddleware>();
 
-app.UseAuthorization();  // 鎺堟潈
+app.UseAuthorization();  // 授权
 
 app.UseWhen(context =>
     context.Request.Path.StartsWithSegments("/api/MarketCustomerResources/QueryNewClientData"),
     branch => branch.UseResponseCompression());
 
-// 鎺堟潈璺�寰�
+// 授权路由
 //app.MapGet("generatetoken", c => c.Response.WriteAsync(JWTBearer.GenerateToken(c)));
 
-#region 鍚�鐢╯waggerUI
+#region 启用SwaggerUI
+
+// 从配置读取开关,动态启用Swagger文档
 if (AppSettingsHelper.Get("UseSwagger").ToBool())
 {
     app.UseSwagger();
     app.UseSwaggerUI(c =>
     {
+        // 默认接口文档版本
         c.SwaggerEndpoint("/swagger/v1/swagger.json", "Ver0.1");
+
+        // 遍历分组配置,动态加载多分组接口文档(上传文件分组)
         foreach (var item in groups)
         {
             c.SwaggerEndpoint($"/swagger/{item.Item1}/swagger.json", item.Item2);
         }
+
+        // 设置根路径访问Swagger(直接域名打开即文档)
         c.RoutePrefix = string.Empty;
+
+        // 默认不展开接口列表
         c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None);
+
+        // 隐藏模型结构,界面更简洁
         c.DefaultModelsExpandDepth(-1);
 
-        //c.EnableFilter();// 娣诲姞鎼滅储鍔熻兘
-        //c.EnableDeepLinking(); // 鍚�鐢ㄦ繁搴﹂摼鎺�
+        // 可选功能(已注释)
+        //c.EnableFilter();        // 启用搜索功能
+        //c.EnableDeepLinking();   // 启用深度链接
     });
 }
+
 #endregion
 
-#region Quartz
+#region Quartz 定时任务
 
-//鑾峰彇瀹瑰櫒涓�鐨凲uartzFactory
+// 容器中获取 Quartz 工厂实例
 var quartz = app.Services.GetRequiredService<QuartzFactory>();
+
+// 应用启动时启动 Quartz 定时任务
 app.Lifetime.ApplicationStarted.Register(async () =>
 {
     await quartz.Start();
 });
 
+// 应用停止时优雅关闭 Quartz 定时任务
 app.Lifetime.ApplicationStopped.Register(() =>
 {
-    //Quzrtz鍏抽棴鏂规硶
     //quartz.Stop();
 });