++

OASystem/OASystem.Api/Controllers/AITestController.cs

@@ -1,6 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Options;
-using Microsoft.Identity.Client;
 using OASystem.API.OAMethodLib.DoubaoAPI;
 using OASystem.API.OAMethodLib.HotmailEmail;
 using OASystem.API.OAMethodLib.HunYuanAPI;
@@ -8,7 +6,9 @@ using OASystem.API.OAMethodLib.MicrosoftGraphMailbox;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI;
 using OASystem.Domain.ViewModels.QiYeWeChat;
 using System.IO;
+using System.Threading.Tasks;
 using TencentCloud.Hunyuan.V20230901.Models;
+using OASystem.RedisRepository;
 
 namespace OASystem.API.Controllers
 {
@@ -24,7 +24,6 @@ namespace OASystem.API.Controllers
         private readonly IQiYeWeChatApiService _qiYeWeChatApiService;
         private readonly IHotmailEmailService _hotmailEmailService;
         private readonly IMicrosoftGraphMailboxService _microsoftGraphMailboxService;
-        private readonly IOptionsMonitor<MicrosoftGraphMailboxOptions> _microsoftGraphMailboxOptions;
 
         public AITestController(
             IHunyuanService hunyuanService,
@@ -32,8 +31,7 @@ namespace OASystem.API.Controllers
             ILogger<AITestController> logger,
             IQiYeWeChatApiService qiYeWeChatApiService,
             IHotmailEmailService hotmailEmailService,
-            IMicrosoftGraphMailboxService microsoftGraphMailboxService,
-            IOptionsMonitor<MicrosoftGraphMailboxOptions> microsoftGraphMailboxOptions)
+            IMicrosoftGraphMailboxService microsoftGraphMailboxService)
         {
             _hunyuanService = hunyuanService;
             _doubaoService = doubaoService;
@@ -41,7 +39,6 @@ namespace OASystem.API.Controllers
             _qiYeWeChatApiService = qiYeWeChatApiService;
             _hotmailEmailService = hotmailEmailService;
             _microsoftGraphMailboxService = microsoftGraphMailboxService;
-            _microsoftGraphMailboxOptions = microsoftGraphMailboxOptions;
         }
 
         #region 企业微信发送邮件测试
@@ -366,67 +363,45 @@ namespace OASystem.API.Controllers
 
         #endregion
 
-        #region Microsoft Graph 邮箱测试（MSAL 公共客户端）
+        #region Microsoft Graph 邮箱测试（仅访问令牌）
+
+        private const string GraphAccessTokenHeader = "X-Graph-Access-Token";
 
         /// <summary>
-        /// 登录/令牌测试：获取 Graph 访问令牌（有缓存则静默；否则可能弹出浏览器完成交互式登录）。
+        /// 优先级：请求头 X-Graph-Access-Token → 查询 graphAccessToken → bodyToken（发信）。
         /// </summary>
-        [HttpGet("graph-mail/token-test")]
-        public async Task<IActionResult> GraphMailTokenTest(CancellationToken cancellationToken = default)
+        private string? ResolveGraphAccessToken(string? queryToken = null, string? bodyToken = null)
         {
-            var opt = _microsoftGraphMailboxOptions.CurrentValue;
-            if (string.IsNullOrWhiteSpace(opt.ClientId))
-                return BadRequest(new { message = "未配置 MicrosoftGraphMailbox:ClientId" });
-
-            try
-            {
-                var token = await _microsoftGraphMailboxService.GetAccessTokenAsync(cancellationToken);
-                var preview = token.Length <= 24
-                    ? "(过短，已隐藏)"
-                    : $"{token[..12]}…{token[^12..]}";
-                return Ok(new
-                {
-                    ok = true,
-                    message = "已获取访问令牌",
-                    tokenLength = token.Length,
-                    tokenPreview = preview,
-                    redirectUri = opt.RedirectUri,
-                    tenant = opt.Tenant
-                });
-            }
-            catch (MsalException ex)
-            {
-                _logger.LogWarning(ex, "Graph Mail token-test MSAL 失败");
-                return StatusCode(500, new { ok = false, message = "MSAL 认证失败", detail = ex.Message });
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Graph Mail token-test 异常");
-                return StatusCode(500, new { ok = false, message = ex.Message });
-            }
+            var header = Request.Headers[GraphAccessTokenHeader].FirstOrDefault();
+            if (!string.IsNullOrWhiteSpace(header))
+                return header.Trim();
+            if (!string.IsNullOrWhiteSpace(queryToken))
+                return queryToken.Trim();
+            if (!string.IsNullOrWhiteSpace(bodyToken))
+                return bodyToken.Trim();
+            return null;
         }
 
         /// <summary>
-        /// 查询当前登录用户：GET https://graph.microsoft.com/v1.0/me
+        /// 查询当前用户 GET /v1.0/me。必须提供 Graph 访问令牌。
         /// </summary>
         [HttpGet("graph-mail/me")]
-        public async Task<IActionResult> GraphMailMe(CancellationToken cancellationToken = default)
+        public async Task<IActionResult> GraphMailMe(
+            [FromQuery] string? graphAccessToken = null,
+            CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrWhiteSpace(_microsoftGraphMailboxOptions.CurrentValue.ClientId))
-                return BadRequest(new { message = "未配置 MicrosoftGraphMailbox:ClientId" });
+            var bearer = ResolveGraphAccessToken(graphAccessToken);
+            if (string.IsNullOrWhiteSpace(bearer))
+                return Unauthorized(new { message = "必须提供 Microsoft Graph 访问令牌：请求头 X-Graph-Access-Token 或查询参数 graphAccessToken" });
 
             try
             {
-                var json = await _microsoftGraphMailboxService.GetMeRawJsonAsync(cancellationToken);
+                var json = await _microsoftGraphMailboxService.GetMeRawJsonAsync(bearer, cancellationToken);
                 if (string.IsNullOrEmpty(json))
                     return StatusCode(502, new { message = "Graph 返回空正文" });
 
                 return Content(json, "application/json");
             }
-            catch (MsalException ex)
-            {
-                return StatusCode(500, new { message = "MSAL 认证失败", detail = ex.Message });
-            }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Graph Mail /me 失败");
@@ -435,32 +410,31 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 查询收件箱：receivedDateTime 大于等于 sinceUtc 的邮件（默认最近 24 小时，与 TopMessages 配置一致）。
+        /// 查询收件箱。必须提供 Graph 访问令牌（需 Mail.Read）。默认 sinceUtc 为 UTC 近 24 小时。
         /// </summary>
-        /// <param name="sinceUtc">起始时间（UTC），可传 ISO8601，如 2025-03-25T00:00:00Z</param>
+        /// <param name="sinceUtc">起始时间（UTC），ISO8601</param>
+        /// <param name="graphAccessToken">或使用请求头 X-Graph-Access-Token</param>
         /// <param name="cancellationToken">取消标记</param>
         [HttpGet("graph-mail/inbox")]
         public async Task<IActionResult> GraphMailInbox(
             [FromQuery] DateTime? sinceUtc = null,
+            [FromQuery] string? graphAccessToken = null,
             CancellationToken cancellationToken = default)
         {
-            if (string.IsNullOrWhiteSpace(_microsoftGraphMailboxOptions.CurrentValue.ClientId))
-                return BadRequest(new { message = "未配置 MicrosoftGraphMailbox:ClientId" });
+            var bearer = ResolveGraphAccessToken(graphAccessToken);
+            if (string.IsNullOrWhiteSpace(bearer))
+                return Unauthorized(new { message = "必须提供 Microsoft Graph 访问令牌：请求头 X-Graph-Access-Token 或查询参数 graphAccessToken" });
 
             var since = sinceUtc ?? DateTime.UtcNow.AddHours(-24);
 
             try
             {
-                var json = await _microsoftGraphMailboxService.GetInboxMessagesJsonSinceAsync(since, cancellationToken);
+                var json = await _microsoftGraphMailboxService.GetInboxMessagesJsonSinceAsync(since, bearer, cancellationToken);
                 if (string.IsNullOrEmpty(json))
                     return StatusCode(502, new { message = "Graph 返回空正文" });
 
                 return Content(json, "application/json");
             }
-            catch (MsalException ex)
-            {
-                return StatusCode(500, new { message = "MSAL 认证失败", detail = ex.Message });
-            }
             catch (Exception ex)
             {
                 _logger.LogError(ex, "Graph Mail inbox 失败");
@@ -469,18 +443,20 @@ namespace OASystem.API.Controllers
         }
 
         /// <summary>
-        /// 通过 Graph sendMail 发送纯文本邮件（需 Mail.Send 权限）。
+        /// Graph sendMail 纯文本。必须提供令牌（需 Mail.Send）：头 / 查询 / Body.graphAccessToken。
         /// </summary>
         [HttpPost("graph-mail/send")]
         public async Task<IActionResult> GraphMailSend(
             [FromBody] GraphMailSendTestRequest request,
+            [FromQuery] string? graphAccessToken = null,
             CancellationToken cancellationToken = default)
         {
             if (request == null || string.IsNullOrWhiteSpace(request.ToEmail))
                 return BadRequest(new { message = "ToEmail 不能为空" });
 
-            if (string.IsNullOrWhiteSpace(_microsoftGraphMailboxOptions.CurrentValue.ClientId))
-                return BadRequest(new { message = "未配置 MicrosoftGraphMailbox:ClientId" });
+            var bearer = ResolveGraphAccessToken(graphAccessToken, request.GraphAccessToken);
+            if (string.IsNullOrWhiteSpace(bearer))
+                return Unauthorized(new { message = "必须提供 Microsoft Graph 访问令牌：X-Graph-Access-Token、?graphAccessToken 或 Body.graphAccessToken" });
 
             var subject = string.IsNullOrWhiteSpace(request.Subject)
                 ? $"OASystem Graph 测试邮件 {DateTime.Now:yyyy-MM-dd HH:mm:ss}"
@@ -490,13 +466,9 @@ namespace OASystem.API.Controllers
 
             try
             {
-                await _microsoftGraphMailboxService.SendMailAsync(request.ToEmail.Trim(), subject, body, cancellationToken);
+                await _microsoftGraphMailboxService.SendMailAsync(request.ToEmail.Trim(), subject, body, bearer, cancellationToken);
                 return Ok(new { ok = true, message = "sendMail 已提交", to = request.ToEmail.Trim(), subject });
             }
-            catch (MsalException ex)
-            {
-                return StatusCode(500, new { message = "MSAL 认证失败", detail = ex.Message });
-            }
             catch (HttpRequestException ex)
             {
                 return StatusCode(502, new { message = "Graph HTTP 错误", detail = ex.Message });
@@ -508,6 +480,60 @@ namespace OASystem.API.Controllers
             }
         }
 
+
+
+        public class EmailAuthRedisCache
+        {
+            public string? AccessToken { get; set; }
+            public string? HomeAccountId { get; set; }
+            public string? UserTokenCacheBase64 { get; set; }
+            public string? ClientId { get; set; }
+        }
+
+
+        /// <summary>
+        /// 从 Redis 读取 MSAL 缓存与 HomeAccountId，静默刷新 Graph access_token。
+        /// </summary>
+        [HttpGet("graph-mail/refresh-token")]
+        public async Task<IActionResult> RefreshAccessToken([FromQuery] string? redisKey = null)
+        {
+            var key = string.IsNullOrWhiteSpace(redisKey) ? "Email:AuthCache:345" : redisKey.Trim();
+
+            var redis = RedisFactory.CreateRedisRepository();
+            var json = await redis.StringGetRawAsync(key);
+            if (string.IsNullOrWhiteSpace(json))
+            {
+                return BadRequest(new { message = $"Redis 键 {key} 不存在或为空" });
+            }
+
+            EmailAuthRedisCache? cacheEntry;
+            try
+            {
+                cacheEntry = JsonConvert.DeserializeObject<EmailAuthRedisCache>(json);
+            }
+            catch (JsonException ex)
+            {
+                _logger.LogWarning(ex, "Redis 键 {Key} 内容不是合法 JSON（应用 StringGetRawAsync + JSON，勿用 StringGetAsync<T>，后者为 BinaryFormatter）", key);
+                return BadRequest(new { message = "Redis 值为 JSON 文本时须用 StringGetRawAsync 再反序列化；StringGetAsync<T> 仅适用于 BinaryFormatter 写入的数据", detail = ex.Message });
+            }
+
+            if (cacheEntry == null
+                || string.IsNullOrWhiteSpace(cacheEntry.UserTokenCacheBase64)
+                || string.IsNullOrWhiteSpace(cacheEntry.HomeAccountId))
+            {
+                return BadRequest(new { message = "JSON 中缺少 UserTokenCacheBase64 或 HomeAccountId" });
+            }
+
+            var accessToken = await _microsoftGraphMailboxService.RefreshAccessTokenAsync(
+                cacheEntry.ClientId,
+                "common",
+                new[] { "Mail.Read", "User.Read", "Mail.Send" },
+                cacheEntry.UserTokenCacheBase64,
+                cacheEntry.HomeAccountId);
+
+            return Ok(new { accessToken });
+        }
+
         /// <summary>
         /// Graph 发信测试请求体
         /// </summary>
@@ -516,6 +542,8 @@ namespace OASystem.API.Controllers
             public string ToEmail { get; set; } = string.Empty;
             public string? Subject { get; set; }
             public string? Body { get; set; }
+            /// <summary>Microsoft Graph 访问令牌（也可用请求头 X-Graph-Access-Token）</summary>
+            public string? GraphAccessToken { get; set; }
         }
 
         #endregion

OASystem/OASystem.Api/OAMethodLib/MicrosoftGraphMailbox/IMicrosoftGraphMailboxService.cs

@@ -3,22 +3,27 @@ namespace OASystem.API.OAMethodLib.MicrosoftGraphMailbox;
 public interface IMicrosoftGraphMailboxService
 {
     /// <summary>
-    /// 获取 Graph 访问令牌（优先静默；失败则交互式浏览器登录）。
+    /// GET /me 原始 JSON（使用调用方提供的 Graph 访问令牌）。
     /// </summary>
-    Task<string> GetAccessTokenAsync(CancellationToken cancellationToken = default);
+    Task<string?> GetMeRawJsonAsync(string graphAccessToken, CancellationToken cancellationToken = default);
 
     /// <summary>
-    /// GET /me 原始 JSON（用于诊断）。
+    /// 拉取收件箱中 receivedDateTime &gt;= startUtc 的邮件列表 JSON。
     /// </summary>
-    Task<string?> GetMeRawJsonAsync(CancellationToken cancellationToken = default);
+    Task<string?> GetInboxMessagesJsonSinceAsync(DateTime startUtc, string graphAccessToken, CancellationToken cancellationToken = default);
 
     /// <summary>
-    /// 拉取收件箱中 receivedDateTime &gt;= startUtc 的邮件列表 JSON（与示例控制台相同查询）。
+    /// POST /me/sendMail 发送纯文本邮件。
     /// </summary>
-    Task<string?> GetInboxMessagesJsonSinceAsync(DateTime startUtc, CancellationToken cancellationToken = default);
+    Task SendMailAsync(string toEmail, string subject, string textBody, string graphAccessToken, CancellationToken cancellationToken = default);
 
     /// <summary>
-    /// POST /me/sendMail 发送纯文本邮件。
+    /// 刷新 access_token
     /// </summary>
-    Task SendMailAsync(string toEmail, string subject, string textBody, CancellationToken cancellationToken = default);
+    Task<string> RefreshAccessTokenAsync(string clientId,
+        string tenant,
+        string[] scopes,
+        string tokenCacheBase64,   // 从Redis拿到的缓存（Base64字符串）
+        string homeAccountId       // 用户标识（建议存这个）
+        );
 }

OASystem/OASystem.Api/OAMethodLib/MicrosoftGraphMailbox/MicrosoftGraphInboxPollerHostedService.cs

@@ -1,169 +0,0 @@
-using System.Text.Json;
-using Microsoft.Extensions.Options;
-using Microsoft.Identity.Client;
-
-namespace OASystem.API.OAMethodLib.MicrosoftGraphMailbox;
-
-/// <summary>
-/// 后台轮询收件箱：仅当 <see cref="MicrosoftGraphMailboxOptions.Enabled"/> 为 true 时才会登录并访问 Graph。
-/// 首次无缓存时会通过交互式浏览器完成授权（重定向 URI 与配置一致）。
-/// </summary>
-public sealed class MicrosoftGraphInboxPollerHostedService : BackgroundService
-{
-    private readonly IOptionsMonitor<MicrosoftGraphMailboxOptions> _optionsMonitor;
-    private readonly IMicrosoftGraphMailboxService _graphMailbox;
-    private readonly ILogger<MicrosoftGraphInboxPollerHostedService> _logger;
-
-    private readonly HashSet<string> _processedMessageIds = new(StringComparer.Ordinal);
-    private DateTime? _monitorStartUtc;
-    private bool _startupProfileLogged;
-
-    public MicrosoftGraphInboxPollerHostedService(
-        IOptionsMonitor<MicrosoftGraphMailboxOptions> optionsMonitor,
-        IMicrosoftGraphMailboxService graphMailbox,
-        ILogger<MicrosoftGraphInboxPollerHostedService> logger)
-    {
-        _optionsMonitor = optionsMonitor;
-        _graphMailbox = graphMailbox;
-        _logger = logger;
-    }
-
-    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
-    {
-        while (!stoppingToken.IsCancellationRequested)
-        {
-            var options = _optionsMonitor.CurrentValue;
-
-            if (!options.Enabled)
-            {
-                await Task.Delay(TimeSpan.FromSeconds(5), stoppingToken).ConfigureAwait(false);
-                continue;
-            }
-
-            if (_monitorStartUtc == null)
-                _monitorStartUtc = DateTime.UtcNow;
-
-            try
-            {
-                if (!_startupProfileLogged && options.LogProfileOnStartup)
-                {
-                    var meJson = await _graphMailbox.GetMeRawJsonAsync(stoppingToken).ConfigureAwait(false);
-                    if (!string.IsNullOrEmpty(meJson))
-                        _logger.LogInformation("Graph 邮箱：当前用户 /me 响应（节选） {Snippet}",
-                            meJson.Length > 500 ? meJson[..500] + "…" : meJson);
-                    _startupProfileLogged = true;
-                }
-
-                await PollInboxAsync(stoppingToken).ConfigureAwait(false);
-            }
-            catch (MsalException ex)
-            {
-                _logger.LogError(ex, "Graph 邮箱 MSAL 认证失败");
-            }
-            catch (HttpRequestException ex)
-            {
-                _logger.LogError(ex, "Graph 邮箱 HTTP 请求失败");
-            }
-            catch (OperationCanceledException) when (stoppingToken.IsCancellationRequested)
-            {
-                throw;
-            }
-            catch (Exception ex)
-            {
-                _logger.LogError(ex, "Graph 邮箱轮询异常");
-            }
-
-            var interval = TimeSpan.FromSeconds(Math.Clamp(options.PollIntervalSeconds, 5, 3600));
-            await Task.Delay(interval, stoppingToken).ConfigureAwait(false);
-        }
-    }
-
-    private async Task PollInboxAsync(CancellationToken cancellationToken)
-    {
-        var options = _optionsMonitor.CurrentValue;
-        var startUtc = _monitorStartUtc ?? DateTime.UtcNow;
-
-        var json = await _graphMailbox.GetInboxMessagesJsonSinceAsync(startUtc, cancellationToken)
-            .ConfigureAwait(false);
-
-        if (string.IsNullOrEmpty(json))
-        {
-            _logger.LogWarning("Graph 邮箱：未收到响应正文。");
-            return;
-        }
-
-        using var doc = JsonDocument.Parse(json);
-        if (!doc.RootElement.TryGetProperty("value", out var messages) ||
-            messages.ValueKind != JsonValueKind.Array)
-        {
-            if (json.Contains("error", StringComparison.OrdinalIgnoreCase))
-                _logger.LogWarning("Graph 邮箱接口错误响应: {Json}", json);
-            else
-                _logger.LogWarning("Graph 邮箱：响应中无 value 数组。");
-            return;
-        }
-
-        var newCount = 0;
-
-        foreach (var mail in messages.EnumerateArray())
-        {
-            var id = GetString(mail, "id");
-            if (string.IsNullOrWhiteSpace(id))
-                continue;
-
-            if (!_processedMessageIds.Add(id))
-                continue;
-
-            newCount++;
-
-            var subject = GetString(mail, "subject");
-            var from = GetNestedString(mail, "from", "emailAddress", "address");
-            var receivedDateTime = GetString(mail, "receivedDateTime");
-            var bodyPreview = GetString(mail, "bodyPreview");
-            var conversationId = GetString(mail, "conversationId");
-
-            _logger.LogInformation(
-                "Graph 新邮件 Id={Id} From={From} Subject={Subject} Received={Received} ConversationId={Conv} Preview={Preview}",
-                id, from, subject, receivedDateTime, conversationId, bodyPreview);
-
-            if (!string.IsNullOrWhiteSpace(subject) &&
-                subject.StartsWith("Re:", StringComparison.OrdinalIgnoreCase))
-            {
-                _logger.LogInformation("Graph 新邮件检测到回复主题: {Subject}", subject);
-            }
-        }
-
-        if (newCount == 0 && options.LogEachPollWhenEmpty)
-            _logger.LogDebug("Graph 邮箱轮询：无新邮件（起点 UTC {Start:O}）", startUtc);
-    }
-
-    private static string GetString(JsonElement element, string propertyName)
-    {
-        if (element.TryGetProperty(propertyName, out var value))
-        {
-            return value.ValueKind switch
-            {
-                JsonValueKind.String => value.GetString() ?? string.Empty,
-                JsonValueKind.Null => string.Empty,
-                _ => value.ToString()
-            };
-        }
-
-        return string.Empty;
-    }
-
-    private static string GetNestedString(JsonElement element, params string[] propertyPath)
-    {
-        var current = element;
-
-        foreach (var property in propertyPath)
-        {
-            if (!current.TryGetProperty(property, out current))
-                return string.Empty;
-        }
-
-        return current.ValueKind == JsonValueKind.String
-            ? current.GetString() ?? string.Empty
-            : current.ToString();
-    }
-}

OASystem/OASystem.Api/OAMethodLib/MicrosoftGraphMailbox/MicrosoftGraphMailboxOptions.cs

@@ -1,59 +1,14 @@
 namespace OASystem.API.OAMethodLib.MicrosoftGraphMailbox;
 
 /// <summary>
-/// Microsoft Graph 邮箱轮询（公共客户端 MSAL + 交互式首次登录）配置。
+/// Microsoft Graph 邮箱 API 相关配置（调用方自行获取并传入访问令牌）。
 /// </summary>
 public class MicrosoftGraphMailboxOptions
 {
     public const string SectionName = "MicrosoftGraphMailbox";
 
     /// <summary>
-    /// 是否启用后台收件箱轮询。关闭时不初始化 MSAL、不弹浏览器。
-    /// </summary>
-    public bool Enabled { get; set; }
-
-    /// <summary>
-    /// Azure AD 应用程序（公共客户端）ID。
-    /// </summary>
-    public string ClientId { get; set; } = string.Empty;
-
-    /// <summary>
-    /// 租户，例如 common、organizations 或具体租户 GUID。
-    /// </summary>
-    public string Tenant { get; set; } = "common";
-
-    /// <summary>
-    /// 须在 Azure 门户中注册的公共客户端重定向 URI（与交互式登录一致）。
-    /// </summary>
-    public string RedirectUri { get; set; } = "http://localhost:55649";
-
-    /// <summary>
-    /// 轮询间隔（秒）。
-    /// </summary>
-    public int PollIntervalSeconds { get; set; } = 30;
-
-    /// <summary>
-    /// 每次拉取的邮件条数上限。
+    /// 收件箱列表查询单次返回的最大邮件条数（$top）。
     /// </summary>
     public int TopMessages { get; set; } = 50;
-
-    /// <summary>
-    /// MSAL 令牌缓存目录；为空则使用 %LocalAppData%\OASystem\MicrosoftGraphMailbox。
-    /// </summary>
-    public string? CacheDirectory { get; set; }
-
-    /// <summary>
-    /// 令牌缓存文件名。
-    /// </summary>
-    public string CacheFileName { get; set; } = "msal_graph_mailbox_cache.bin";
-
-    /// <summary>
-    /// 启动并成功取 token 后是否调用 /me 打一条日志（便于确认账号）。
-    /// </summary>
-    public bool LogProfileOnStartup { get; set; } = true;
-
-    /// <summary>
-    /// 无新邮件时是否仍输出轮询心跳日志。
-    /// </summary>
-    public bool LogEachPollWhenEmpty { get; set; }
 }

OASystem/OASystem.Api/OAMethodLib/MicrosoftGraphMailbox/MicrosoftGraphMailboxService.cs

@@ -4,29 +4,15 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using Microsoft.Extensions.Options;
 using Microsoft.Identity.Client;
-using Microsoft.Identity.Client.Extensions.Msal;
 
 namespace OASystem.API.OAMethodLib.MicrosoftGraphMailbox;
 
 public class MicrosoftGraphMailboxService : IMicrosoftGraphMailboxService
 {
-    private static readonly string[] Scopes =
-    {
-        "Mail.Read",
-        "User.Read",
-        "Mail.Send"
-    };
-
     private readonly IHttpClientFactory _httpClientFactory;
     private readonly IOptionsMonitor<MicrosoftGraphMailboxOptions> _options;
     private readonly ILogger<MicrosoftGraphMailboxService> _logger;
 
-    private readonly SemaphoreSlim _initLock = new(1, 1);
-    private readonly SemaphoreSlim _tokenLock = new(1, 1);
-
-    private IPublicClientApplication? _pca;
-    private MsalCacheHelper? _cacheHelper;
-
     private const string HttpClientName = "MicrosoftGraph";
 
     public MicrosoftGraphMailboxService(
@@ -39,46 +25,9 @@ public class MicrosoftGraphMailboxService : IMicrosoftGraphMailboxService
         _logger = logger;
     }
 
-    public async Task<string> GetAccessTokenAsync(CancellationToken cancellationToken = default)
-    {
-        await EnsureInitializedAsync(cancellationToken).ConfigureAwait(false);
-
-        await _tokenLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-        try
-        {
-            var app = _pca ?? throw new InvalidOperationException("MSAL 未初始化。");
-            var accounts = await app.GetAccountsAsync().ConfigureAwait(false);
-            var account = accounts.FirstOrDefault();
-
-            try
-            {
-                var result = await app.AcquireTokenSilent(Scopes, account)
-                    .ExecuteAsync(cancellationToken)
-                    .ConfigureAwait(false);
-                return result.AccessToken;
-            }
-            catch (MsalUiRequiredException)
-            {
-                _logger.LogInformation("Graph 邮箱：需要交互式登录（将打开浏览器），重定向: {Redirect}",
-                    _options.CurrentValue.RedirectUri);
-
-                var result = await app.AcquireTokenInteractive(Scopes)
-                    .WithPrompt(Prompt.SelectAccount)
-                    .ExecuteAsync(cancellationToken)
-                    .ConfigureAwait(false);
-
-                return result.AccessToken;
-            }
-        }
-        finally
-        {
-            _tokenLock.Release();
-        }
-    }
-
-    public async Task<string?> GetMeRawJsonAsync(CancellationToken cancellationToken = default)
+    public async Task<string?> GetMeRawJsonAsync(string graphAccessToken, CancellationToken cancellationToken = default)
     {
-        using var client = await CreateAuthenticatedClientAsync(cancellationToken).ConfigureAwait(false);
+        using var client = CreateAuthenticatedClient(graphAccessToken);
         using var response = await client.GetAsync("me", cancellationToken).ConfigureAwait(false);
         var body = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
         if (!response.IsSuccessStatusCode)
@@ -86,7 +35,7 @@ public class MicrosoftGraphMailboxService : IMicrosoftGraphMailboxService
         return body;
     }
 
-    public async Task<string?> GetInboxMessagesJsonSinceAsync(DateTime startUtc, CancellationToken cancellationToken = default)
+    public async Task<string?> GetInboxMessagesJsonSinceAsync(DateTime startUtc, string graphAccessToken, CancellationToken cancellationToken = default)
     {
         var opt = _options.CurrentValue;
         var startTime = startUtc.ToString("o");
@@ -97,7 +46,7 @@ public class MicrosoftGraphMailboxService : IMicrosoftGraphMailboxService
             "&$orderby=receivedDateTime desc" +
             $"&$top={opt.TopMessages}";
 
-        using var client = await CreateAuthenticatedClientAsync(cancellationToken).ConfigureAwait(false);
+        using var client = CreateAuthenticatedClient(graphAccessToken);
         using var response = await client.GetAsync(url, cancellationToken).ConfigureAwait(false);
         var body = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
         if (!response.IsSuccessStatusCode)
@@ -105,7 +54,7 @@ public class MicrosoftGraphMailboxService : IMicrosoftGraphMailboxService
         return body;
     }
 
-    public async Task SendMailAsync(string toEmail, string subject, string textBody, CancellationToken cancellationToken = default)
+    public async Task SendMailAsync(string toEmail, string subject, string textBody, string graphAccessToken, CancellationToken cancellationToken = default)
     {
         var payload = new GraphSendMailRequest
         {
@@ -133,7 +82,7 @@ public class MicrosoftGraphMailboxService : IMicrosoftGraphMailboxService
             DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull
         });
 
-        using var client = await CreateAuthenticatedClientAsync(cancellationToken).ConfigureAwait(false);
+        using var client = CreateAuthenticatedClient(graphAccessToken);
         using var content = new StringContent(json, Encoding.UTF8, "application/json");
         using var response = await client.PostAsync("me/sendMail", content, cancellationToken).ConfigureAwait(false);
         var responseText = await response.Content.ReadAsStringAsync(cancellationToken).ConfigureAwait(false);
@@ -145,56 +94,75 @@ public class MicrosoftGraphMailboxService : IMicrosoftGraphMailboxService
         }
     }
 
-    private async Task<HttpClient> CreateAuthenticatedClientAsync(CancellationToken cancellationToken)
+    private HttpClient CreateAuthenticatedClient(string graphAccessToken)
     {
-        var token = await GetAccessTokenAsync(cancellationToken).ConfigureAwait(false);
+        if (string.IsNullOrWhiteSpace(graphAccessToken))
+            throw new ArgumentException("Graph 访问令牌不能为空。", nameof(graphAccessToken));
+
         var client = _httpClientFactory.CreateClient(HttpClientName);
-        client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Bearer", token);
+        client.DefaultRequestHeaders.Authorization =
+            new AuthenticationHeaderValue("Bearer", graphAccessToken.Trim());
         return client;
     }
 
-    private async Task EnsureInitializedAsync(CancellationToken cancellationToken)
-    {
-        if (_pca != null)
-            return;
 
-        await _initLock.WaitAsync(cancellationToken).ConfigureAwait(false);
-        try
+    public async Task<string> RefreshAccessTokenAsync(
+        string clientId,
+        string tenant,
+        string[] scopes,
+        string tokenCacheBase64,   // 从Redis拿到的缓存（Base64字符串）
+        string homeAccountId       // 用户标识（建议存这个）
+    )
+    {
+        // 1️⃣ 创建 MSAL 应用
+        var app = PublicClientApplicationBuilder
+            .Create(clientId)
+            .WithAuthority($"https://login.microsoftonline.com/{tenant}")
+            .WithDefaultRedirectUri()
+            .Build();
+
+        // 2️⃣ 恢复 TokenCache
+        if (!string.IsNullOrEmpty(tokenCacheBase64))
         {
-            if (_pca != null)
-                return;
+            var cacheBytes = Convert.FromBase64String(tokenCacheBase64);
 
-            var opt = _options.CurrentValue;
-            if (string.IsNullOrWhiteSpace(opt.ClientId))
-                throw new InvalidOperationException("MicrosoftGraphMailbox:ClientId 未配置。");
-
-            var cacheDir = string.IsNullOrWhiteSpace(opt.CacheDirectory)
-                ? Path.Combine(
-                    Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
-                    "OASystem",
-                    "MicrosoftGraphMailbox")
-                : opt.CacheDirectory;
+            app.UserTokenCache.SetBeforeAccess(args =>
+            {
+                args.TokenCache.DeserializeMsalV3(cacheBytes, false);
+            });
 
-            Directory.CreateDirectory(cacheDir);
+            app.UserTokenCache.SetAfterAccess(args =>
+            {
 
-            var storage = new StorageCreationPropertiesBuilder(opt.CacheFileName, cacheDir)
-                .Build();
+            });
+        }
+        else
+        {
+            throw new InvalidOperationException("TokenCache 为空，无法刷新");
+        }
 
-            _cacheHelper = await MsalCacheHelper.CreateAsync(storage).ConfigureAwait(false);
+        // 3️⃣ 找到对应用户
+        var accounts = await app.GetAccountsAsync();
+        var account = accounts.FirstOrDefault(a =>
+            string.Equals(a.HomeAccountId?.Identifier, homeAccountId, StringComparison.Ordinal));
 
-            _pca = PublicClientApplicationBuilder
-                .Create(opt.ClientId)
-                .WithAuthority($"https://login.microsoftonline.com/{opt.Tenant}")
-                .WithRedirectUri(opt.RedirectUri)
-                .Build();
+        if (account == null)
+        {
+            throw new InvalidOperationException("未找到匹配的用户账号，需要重新登录");
+        }
 
-            _cacheHelper.RegisterCache(_pca.UserTokenCache);
+        // 4️⃣ 刷新（核心）
+        try
+        {
+            var result = await app
+                .AcquireTokenSilent(scopes, account)
+                .ExecuteAsync();
 
-            _logger.LogInformation("Graph 邮箱 MSAL 已初始化，缓存目录: {Dir}", cacheDir);
+            return result.AccessToken;
         }
-        finally
+        catch (MsalUiRequiredException ex)
         {
-            _initLock.Release();
+            throw new InvalidOperationException("刷新失败，需要重新登录", ex);
         }
     }
 }

OASystem/OASystem.Api/OASystem.API.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -59,7 +59,6 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.11" />
     <PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.0" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.66.2" />
-    <PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.66.2" />
     <PackageReference Include="NodaTime" Version="3.2.0" />
     <PackageReference Include="NPOI" Version="2.7.1" />
     <PackageReference Include="PinYinConverterCore" Version="1.0.2" />

OASystem/OASystem.Api/Program.cs

@@ -36,7 +36,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)
@@ -45,10 +45,10 @@ var _config = new ConfigurationBuilder()
                  .Build();
 builder.Services.AddSingleton(new AppSettingsHelper(_config));
 
-//设置请求参数可不填
+//璁剧疆璇锋眰鍙傛暟鍙�涓嶅～
 builder.Services.AddControllers(options => options.SuppressImplicitRequiredAttributeForNonNullableReferenceTypes = true);
 
-//设置请求参数错误默认返回格式
+//璁剧疆璇锋眰鍙傛暟閿欒��榛樿�よ繑鍥炴牸寮�
 builder.Services.AddControllers()
     .ConfigureApiBehaviorOptions(options =>
     {
@@ -77,26 +77,26 @@ 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"));
 #endregion
@@ -122,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);
     //        //})
 
@@ -151,7 +151,7 @@ builder.Services.AddCors(options =>
 });
 #endregion
 
-#region 上传文件 
+#region 涓婁紶鏂囦欢 
 builder.Services.AddCors(policy =>
 {
     policy.AddPolicy("Cors", opt => opt
@@ -177,15 +177,15 @@ builder.Services.Configure<KestrelServerOptions>(options =>
 
 #endregion
 
-#region 接口分组
+#region 鎺ュ彛鍒嗙粍
 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
 
@@ -208,38 +208,38 @@ 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;
-                //执行完了可以输出SQL执行时间 (OnLogExecutedDelegate) 
+                //鎵ц�屽畬浜嗗彲浠ヨ緭鍑篠QL鎵ц�屾椂闂� (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执行前
+        //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);
-            //获取无参数SQL对性能有影响，特别大的SQL参数多的，调试使用
+            //鑾峰彇鏃犲弬鏁癝QL瀵规€ц兘鏈夊奖鍝嶏紝鐗瑰埆澶х殑SQL鍙傛暟澶氱殑锛岃皟璇曚娇鐢�
             //UtilMethods.GetSqlString(DbType.SqlServer, exp.sql, exp.parameters);
 
         };
-        //修改SQL和参数的值
+        //淇�鏀筍QL鍜屽弬鏁扮殑鍊�
         db.Aop.OnExecutingChangeSql = (sql, pars) =>
         {
             //sql=newsql
-            //foreach(var p in pars) //修改
+            //foreach(var p in pars) //淇�鏀�
             return new KeyValuePair<string, SugarParameter[]>(sql, pars);
         };
     }
@@ -250,27 +250,27 @@ builder.Services.AddScoped(options =>
 
 #endregion
 
-//#region Identity 配置
+//#region Identity 閰嶇疆
 //builder.Services.AddDataProtection();
-////不要用 AddIdentity ， AddIdentity 是于MVC框架中的
+////涓嶈�佺敤 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.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())
 {
@@ -280,11 +280,11 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
         {
             Version = "v1",
             Title = "Api",
-            Description = "Api接口文档"
+            Description = "Api鎺ュ彛鏂囨。"
         });
         foreach (var item in groups)
         {
-            a.SwaggerDoc(item.Item1, new OpenApiInfo { Version = item.Item1, Title = item.Item2, Description = $"{item.Item2}接口文档" });
+            a.SwaggerDoc(item.Item1, new OpenApiInfo { Version = item.Item1, Title = item.Item2, Description = $"{item.Item2}鎺ュ彛鏂囨。" });
         }
         a.DocumentFilter<SwaggerApi>();
         a.IncludeXmlComments(Path.Combine(basePath, "OASystem.Api.xml"), true);
@@ -313,7 +313,7 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
 }
 #endregion
 
-#region 添加校验
+#region 娣诲姞鏍￠獙
 
 builder.Services.AddTransient<OASystemAuthentication>();
 builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
@@ -328,7 +328,7 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             ValidAudience = "OASystem.com",
             ValidIssuer = "OASystem.com",
             IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_config["JwtSecurityKey"])),
-            ClockSkew = TimeSpan.FromSeconds(30), //过期时间容错值，解决服务器端时间不同步问题（秒）
+            ClockSkew = TimeSpan.FromSeconds(30), //杩囨湡鏃堕棿瀹归敊鍊硷紝瑙ｅ喅鏈嶅姟鍣ㄧ��鏃堕棿涓嶅悓姝ラ棶棰橈紙绉掞級
             RequireExpirationTime = true,
         };
         options.Events = new JwtBearerEvents
@@ -336,7 +336,7 @@ builder.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
             OnMessageReceived = context =>
             {
                 var path = context.HttpContext.Request.Path;
-                //如果是signalr请求，需要将token转存，否则JWT获取不到token。OPTIONS请求需要过滤到，因为OPTIONS请求获取不到Token，用NGINX过滤掉OPTION请求.
+                //濡傛灉鏄痵ignalr璇锋眰锛岄渶瑕佸皢token杞�瀛橈紝鍚﹀垯JWT鑾峰彇涓嶅埌token銆侽PTIONS璇锋眰闇€瑕佽繃婊ゅ埌锛屽洜涓篛PTIONS璇锋眰鑾峰彇涓嶅埌Token锛岀敤NGINX杩囨护鎺塐PTION璇锋眰.
                 if (path.StartsWithSegments("/ChatHub"))
                 {
                     string accessToken = context.Request.Query["access_token"].ToString();
@@ -353,10 +353,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))
@@ -376,20 +376,20 @@ Log.Logger = new LoggerConfiguration()
 
 // 
 
-#region 出入境费用明细 专用记录器
+#region 鍑哄叆澧冭垂鐢ㄦ槑缁� 涓撶敤璁板綍鍣�
 
-// 指定磁盘绝对路径（示例：D盘的AppLogs文件夹）
+// 鎸囧畾纾佺洏缁濆�硅矾寰勶紙绀轰緥锛欴鐩樼殑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;
 }
 
@@ -400,20 +400,20 @@ var eec_TextLogger = new LoggerConfiguration()
 
 #endregion
 
-#region 团组步骤操作 专用记录器
+#region 鍥㈢粍姝ラ�ゆ搷浣� 涓撶敤璁板綍鍣�
 
-// 指定磁盘绝对路径（示例：D盘的AppLogs文件夹）
+// 鎸囧畾纾佺洏缁濆�硅矾寰勶紙绀轰緥锛欴鐩樼殑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;
 }
 
@@ -424,20 +424,20 @@ var groupStepOP_TextLogger = new LoggerConfiguration()
 
 #endregion
 
-#region 任务分配操作 专用记录器
+#region 浠诲姟鍒嗛厤鎿嶄綔 涓撶敤璁板綍鍣�
 
-// 指定磁盘绝对路径（示例：D盘的AppLogs文件夹）
+// 鎸囧畾纾佺洏缁濆�硅矾寰勶紙绀轰緥锛欴鐩樼殑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;
 }
 
@@ -448,7 +448,7 @@ var task_TextLogger = new LoggerConfiguration()
 
 #endregion
 
-// 配置Serilog为Log;
+// 閰嶇疆Serilog涓篖og;
 builder.Host.UseSerilog();
 
 builder.Services.AddSingleton<ITextFileLogger>(new TextFileLogger(eec_TextLogger));
@@ -456,7 +456,7 @@ builder.Services.AddSingleton<IGroupTextFileLogger>(new GroupTextFileLogger(grou
 builder.Services.AddSingleton<ITaskTextFileLogger>(new TaskTextFileLogger(task_TextLogger));
 #endregion
 
-#region 引入注册Autofac Module
+#region 寮曞叆娉ㄥ唽Autofac Module
 builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory());
 var hostBuilder = builder.Host.ConfigureContainer<ContainerBuilder>(builder =>
 {
@@ -482,29 +482,29 @@ builder.Services.AddScoped<IMapper, Mapper>();
 
 #endregion
 
-#region DeepSeek AI 服务
+#region DeepSeek AI 鏈嶅姟
 
-// 配置HTTP客户端（DeepSeek 长耗时调用，默认 10 分钟）
+// 閰嶇疆HTTP瀹㈡埛绔�锛圖eepSeek 闀胯€楁椂璋冪敤锛岄粯璁� 10 鍒嗛挓锛�
 builder.Services.AddHttpClient<IDeepSeekService, DeepSeekService>(client =>
     client.Timeout = TimeSpan.FromMinutes(10));
 
 #endregion
 
-#region Doubao API 服务
+#region Doubao 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>();
@@ -512,17 +512,17 @@ builder.Services.AddHttpClient("PublicQiYeWeChatApi", c => c.BaseAddress = new U
 
 #endregion
 
-#region 混元API
+#region 娣峰厓API
 
-// 从配置中读取腾讯云密钥信息（请确保appsettings.json中有对应配置）
+// 浠庨厤缃�涓�璇诲彇鑵捐��浜戝瘑閽ヤ俊鎭�锛堣�风‘淇漚ppsettings.json涓�鏈夊�瑰簲閰嶇疆锛�
 var secretId = builder.Configuration["TencentCloud:SecretId"];
 var secretKey = builder.Configuration["TencentCloud:SecretKey"];
 var region = builder.Configuration["TencentCloud:Region"] ?? "ap-guangzhou";
 
-// 配置HttpClientFactory（SDK内部会用到）
+// 閰嶇疆HttpClientFactory锛圫DK鍐呴儴浼氱敤鍒帮級
 builder.Services.AddHttpClient();
 
-// 注册腾讯云Hunyuan Client为Singleton（推荐）
+// 娉ㄥ唽鑵捐��浜慔unyuan Client涓篠ingleton锛堟帹鑽愶級
 builder.Services.AddSingleton(provider =>
 {
     Credential cred = new Credential
@@ -535,17 +535,17 @@ builder.Services.AddSingleton(provider =>
     HttpProfile httpProfile = new HttpProfile
     {
         Endpoint = "hunyuan.tencentcloudapi.com",
-        Timeout = 60 * 10,  // 单位秒
+        Timeout = 60 * 10,  // 鍗曚綅绉�
     };
     clientProfile.HttpProfile = httpProfile;
 
     return new HunyuanClient(cred, region, clientProfile);
 });
 
-// 注册自定义服务接口及其实现为Scoped生命周期
+// 娉ㄥ唽鑷�瀹氫箟鏈嶅姟鎺ュ彛鍙婂叾瀹炵幇涓篠coped鐢熷懡鍛ㄦ湡
 builder.Services.AddScoped<IHunyuanService, HunyuanService>();
 
-// 注册混元服务
+// 娉ㄥ唽娣峰厓鏈嶅姟
 //builder.Services.AddHttpClient<IHunyuanService, HunyuanService>(client =>
 //{
 //    client.BaseAddress = new Uri("https://hunyuan.ap-chengdu.tencentcloudapi.com/");
@@ -555,17 +555,17 @@ builder.Services.AddScoped<IHunyuanService, HunyuanService>();
 //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 +600,7 @@ builder.Services.TryAddSingleton(typeof(CommonService));
 builder.Services.AddTransient<IHotmailEmailService, HotmailEmailService>();
 #endregion
 
-#region Microsoft Graph 邮箱服务
+#region Microsoft Graph 閭�绠辨湇鍔�
 
 builder.Services.Configure<MicrosoftGraphMailboxOptions>(
     builder.Configuration.GetSection(MicrosoftGraphMailboxOptions.SectionName));
@@ -611,56 +611,55 @@ builder.Services.AddHttpClient("MicrosoftGraph", c =>
 });
 
 builder.Services.AddSingleton<IMicrosoftGraphMailboxService, MicrosoftGraphMailboxService>();
-builder.Services.AddHostedService<MicrosoftGraphInboxPollerHostedService>();
 
 #endregion
 
 var app = builder.Build();
 
-//// 1. 异常处理器应该在最早的位置（除了日志等）
+//// 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;
         if (httpContext.Response.StatusCode > 499) return LogEventLevel.Error;
 
-        // 对健康检查等端点使用更低级别
+        // 瀵瑰仴搴锋�€鏌ョ瓑绔�鐐逛娇鐢ㄦ洿浣庣骇鍒�
         if (httpContext.Request.Path.StartsWithSegments("/health"))
             return LogEventLevel.Debug;
 
         return LogEventLevel.Information;
     };
 
-    // 丰富日志上下文
+    // 涓板瘜鏃ュ織涓婁笅鏂�
     options.EnrichDiagnosticContext = (diagnosticContext, httpContext) =>
     {
-        // 获取客户端IP（处理代理情况）
+        // 鑾峰彇瀹㈡埛绔疘P锛堝�勭悊浠ｇ悊鎯呭喌锛�
         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);
@@ -686,28 +685,28 @@ app.UseCors("Cors");  //Cors
 
 //app.UseMiddleware<FixedPromptMiddleware>();
 
-// 定义允许API的访问时间段
+// 瀹氫箟鍏佽�窤PI鐨勮�块棶鏃堕棿娈�
 //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 启用swaggerUI
+#region 鍚�鐢╯waggerUI
 if (AppSettingsHelper.Get("UseSwagger").ToBool())
 {
     app.UseSwagger();
@@ -722,15 +721,15 @@ if (AppSettingsHelper.Get("UseSwagger").ToBool())
         c.DocExpansion(Swashbuckle.AspNetCore.SwaggerUI.DocExpansion.None);
         c.DefaultModelsExpandDepth(-1);
 
-        //c.EnableFilter();// 添加搜索功能
-        //c.EnableDeepLinking(); // 启用深度链接
+        //c.EnableFilter();// 娣诲姞鎼滅储鍔熻兘
+        //c.EnableDeepLinking(); // 鍚�鐢ㄦ繁搴﹂摼鎺�
     });
 }
 #endregion
 
 #region Quartz
 
-//获取容器中的QuartzFactory
+//鑾峰彇瀹瑰櫒涓�鐨凲uartzFactory
 var quartz = app.Services.GetRequiredService<QuartzFactory>();
 app.Lifetime.ApplicationStarted.Register(async () =>
 {
@@ -739,7 +738,7 @@ app.Lifetime.ApplicationStarted.Register(async () =>
 
 app.Lifetime.ApplicationStopped.Register(() =>
 {
-    //Quzrtz关闭方法
+    //Quzrtz鍏抽棴鏂规硶
     //quartz.Stop();
 });
 

OASystem/OASystem.Api/appsettings.json

@@ -173,7 +173,6 @@
   // 商邀资料 AI 文件路径配置
   "InvitationAIAssistBasePath": "D:/FTP/File/OA2023/Office/Word/InvitationAIAssist/",
   "InvitationAIAssistFtpPath": "Office/Word/InvitationAIAssist/",
-
   "CTableCorrelationPageDatas": [
     {
       "CTableId": 76, //CtableId 酒店预订
@@ -597,7 +596,7 @@
     "Region": "ap-chengdu",
     "Version": "2023-09-01"
   },
-   // 邮件发送配置
+  // 邮件发送配置
   "HotEmailConfig": {
     "SmtpServer": "smtp-mail.outlook.com",
     "SmtpPort": 587,
@@ -606,25 +605,8 @@
     "SenderName": "Roy Lei",
     "AppPassword": "pqqrwkszdodzhift"
   },
-  // Microsoft Graph 邮箱：MSAL 公共客户端 + 收件箱轮询（首次登录会弹浏览器；须在 Azure 注册 RedirectUri）
+  // Microsoft Graph 邮箱：仅使用调用方传入的访问令牌；收件箱列表 $top 上限
   "MicrosoftGraphMailbox": {
-    // 是否启用后台轮询；false 时不初始化 MSAL、不弹浏览器
-    "Enabled": false,
-    // Azure AD 应用注册中的应用程序(客户端)ID（公共客户端）
-    "ClientId": "0dfaa938-d3f8-4b57-b723-d84709543892",
-    // 登录颁发机构租户：common / organizations / 或租户 GUID
-    "Tenant": "common",
-    // 公共客户端重定向 URI，须与 Azure 门户「身份验证」中配置完全一致（交互式登录回调）
-    "RedirectUri": "http://localhost:55649",
-    // 拉取收件箱的轮询间隔（秒），建议不小于 5
-    "PollIntervalSeconds": 30,
-    // 单次 Graph 请求返回的邮件条数上限（$top）
-    "TopMessages": 50,
-    // MSAL 令牌缓存文件名（目录为空时默认 %LocalAppData%\OASystem\MicrosoftGraphMailbox）
-    "CacheFileName": "msal_graph_mailbox_cache.bin",
-    // 首次成功取 token 后是否请求 /me 并写日志（便于确认登录账号）
-    "LogProfileOnStartup": true,
-    // 当本轮无新邮件时是否输出 Debug 级别心跳日志
-    "LogEachPollWhenEmpty": false
+    "TopMessages": 50
   }
 }

OASystem/OASystem.RedisRepository/RedisAsyncHelper/IRedisHelper.cs

@@ -1,4 +1,4 @@
-using StackExchange.Redis;
+using StackExchange.Redis;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -49,6 +49,11 @@ namespace OASystem.RedisRepository.RedisAsyncHelper
         /// <returns></returns>
         Task<T> StringGetAsync<T>(string key);
 
+        /// <summary>
+        /// 读取 string 键的原始文本（UTF-8）。不做 BinaryFormatter 反序列化，适用于存 JSON 等纯文本。
+        /// </summary>
+        Task<string?> StringGetRawAsync(string key);
+
         #endregion
 
         #region Redis数据类型—Hash

OASystem/OASystem.RedisRepository/RedisAsyncHelper/RedisStringHelperAsync.cs

@@ -1,4 +1,4 @@
-using OASystem.RedisRepository.CommonHelper;
+using OASystem.RedisRepository.CommonHelper;
 using OASystem.RedisRepository.Config;
 using StackExchange.Redis;
 using System;
@@ -60,6 +60,14 @@ namespace OASystem.RedisRepository.RedisAsyncHelper
             return SerializeHelper.Deserialize<T>(await _client.StringGetAsync(key, CommandFlags.PreferSlave));
         }
 
+        public async Task<string?> StringGetRawAsync(string key)
+        {
+            var v = await _client.StringGetAsync(key, CommandFlags.PreferSlave);
+            if (!v.HasValue)
+                return null;
+            return v.ToString();
+        }
+
         #endregion
 
     }