*

front/package.json

@@ -39,8 +39,8 @@
     "animate.css": "^4.1.1",
     "babel-plugin-transform-imports": "2.0.0",
     "compression-webpack-plugin": "^11.1.0",
-    "cross-env": "^10.0.0",
-    "echarts": "^5.6.0",
+    "cross-env": "^10.1.0",
+    "echarts": "^6.0.0",
     "eslint": "^8.57.1",
     "eslint-plugin-import": "^2.32.0",
     "eslint-plugin-n": "^16.6.2",

src/Masuit.MyBlogs.Core/Controllers/DashboardController.cs

@@ -41,8 +41,7 @@ public sealed class DashboardController(IWebHostEnvironment env) : AdminControll
     {
         Response.ContentType = "text/event-stream";
         Response.Headers.Append("X-Accel-Buffering", "no");
-        Response.Headers.Add("Cache-Control", "no-cache");
-        Response.Headers.Add("Connection", "keep-alive");
+        Response.Headers.Append("Cache-Control", "no-cache");
         while (true)
         {
             try

src/Masuit.MyBlogs.Core/Controllers/DefaultController.cs

@@ -1,9 +1,11 @@
-using Masuit.MyBlogs.Core.Extensions.Firewall;
+using FreeRedis;
+using Masuit.MyBlogs.Core.Extensions.Firewall;
 using Masuit.Tools.AspNetCore.ModelBinder;
+using Masuit.Tools.DateTimeExt;
 
 namespace Masuit.MyBlogs.Core.Controllers;
 
-public sealed class DefaultController : Controller
+public sealed class DefaultController(IRedisClient redis) : Controller
 {
     /// <summary>
     /// 设置cookie
@@ -19,6 +21,42 @@ public sealed class DefaultController : Controller
         });
         return Ok();
     }
+
+    /// <summary>
+    /// 文章统计
+    /// </summary>
+    /// <returns></returns>
+    [Route("/ping")]
+    public async Task<IActionResult> Ping(CancellationToken cancellationToken = default)
+    {
+        Response.ContentType = "text/event-stream";
+        Response.Headers.Append("X-Accel-Buffering", "no");
+        Response.Headers.Append("Cache-Control", "no-cache");
+        var ip = HttpContext.Connection.RemoteIpAddress?.ToString();
+        await redis.SAddAsync("GlobalOnline", ip);
+        while (true)
+        {
+            try
+            {
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    break;
+                }
+
+                await Response.WriteAsync("event: message\n", cancellationToken);
+                await Response.WriteAsync("data:" + DateTime.Now.GetTotalMilliseconds() + "\r\r", cancellationToken: cancellationToken);
+                await Response.Body.FlushAsync(cancellationToken);
+                await Task.Delay(2000, cancellationToken);
+            }
+            catch (OperationCanceledException)
+            {
+                break;
+            }
+        }
+        await redis.SRemAsync("GlobalOnline", ip);
+        Response.Body.Close();
+        return Ok();
+    }
 }
 
 public class NameValuePair
@@ -26,4 +64,4 @@ public class NameValuePair
     public string Name { get; set; }
 
     public string Value { get; set; }
-}
+}

src/Masuit.MyBlogs.Core/Controllers/MsgController.cs

@@ -365,9 +365,8 @@ public sealed class MsgController : BaseController
     public async Task<ActionResult> GetUnreadMsgs(CancellationToken cancellationToken)
     {
         Response.ContentType = "text/event-stream";
-        Response.Headers.Add("X-Accel-Buffering", "no");
-        Response.Headers.Add("Cache-Control", "no-cache");
-        Response.Headers.Add("Connection", "keep-alive");
+        Response.Headers.Append("X-Accel-Buffering", "no");
+        Response.Headers.Append("Cache-Control", "no-cache");
         while (true)
         {
             try

src/Masuit.MyBlogs.Core/Controllers/PostController.cs

@@ -20,7 +20,6 @@ using Masuit.Tools.Logging;
 using Masuit.Tools.Mime;
 using Masuit.Tools.TextDiff;
 using Microsoft.AspNetCore.Http.Extensions;
-using Microsoft.EntityFrameworkCore.Metadata.Internal;
 using Microsoft.Net.Http.Headers;
 using System.Collections.Frozen;
 using System.Linq.Dynamic.Core;
@@ -524,9 +523,8 @@ public sealed class PostController : BaseController
     public async Task<ActionResult> Online(int id, CancellationToken cancellationToken)
     {
         Response.ContentType = "text/event-stream";
-        Response.Headers.Add("X-Accel-Buffering", "no");
-        Response.Headers.Add("Cache-Control", "no-cache");
-        Response.Headers.Add("Connection", "keep-alive");
+        Response.Headers.Append("X-Accel-Buffering", "no");
+        Response.Headers.Append("Cache-Control", "no-cache");
         var key = $"PostOnline:{id}";
         await RedisHelper.SAddAsync(key, ClientIP.ToString());
         await RedisHelper.ExpireAsync(key, TimeSpan.FromMinutes(60));
@@ -1143,8 +1141,7 @@ public sealed class PostController : BaseController
     {
         Response.ContentType = "text/event-stream";
         Response.Headers.Append("X-Accel-Buffering", "no");
-        Response.Headers.Add("Cache-Control", "no-cache");
-        Response.Headers.Add("Connection", "keep-alive");
+        Response.Headers.Append("Cache-Control", "no-cache");
         while (true)
         {
             try

src/Masuit.MyBlogs.Core/Views/Shared/Ping.razor

@@ -1,46 +0,0 @@
-@using FreeRedis
-
-@implements IAsyncDisposable
-@attribute [StreamRendering]
-@inject IRedisClient CacheManager
-
-<p style="display: table;margin-left:70px">
-    Ping:<span id="ping">50</span>ms
-</p>
-
-@code {
-    [Parameter]
-    public string IP { get; set; }
-
-    [JSInvokable]
-    public static long Latency()
-    {
-        return 0;
-    }
-
-    protected override void OnInitialized()
-    {
-        try
-        {
-            CacheManager.SAdd("GlobalOnline", IP);
-            CacheManager.Expire("GlobalOnline", TimeSpan.FromMinutes(60));
-        }
-        catch
-        {
-            // ignored
-        }
-    }
-
-    public ValueTask DisposeAsync()
-    {
-        try
-        {
-            CacheManager.SRem("GlobalOnline", IP);
-        }
-        catch
-        {
-            // ignored
-        }
-        return ValueTask.CompletedTask;
-    }
-}

src/Masuit.MyBlogs.Core/Views/Shared/_Layout.cshtml

@@ -6,7 +6,6 @@
 @using Masuit.MyBlogs.Core.Models.Entity
 @using Masuit.MyBlogs.Core.Models.Enum
 @using Masuit.MyBlogs.Core.Models.ViewModel
-@using Masuit.MyBlogs.Core.Views.Shared
 @using Masuit.Tools
 @using Masuit.Tools.Core.Net
 @using Microsoft.AspNetCore.Http.Extensions
@@ -315,9 +314,9 @@
           @Html.Raw(CommonHelper.SystemSettings.GetOrAdd("Scripts", ""))
         </div>
       </div>
-      @(await Html.RenderComponentAsync<Ping>(RenderMode.ServerPrerendered, new {
-        IP = Context.Connection.RemoteIpAddress.ToString()
-      }))
+      <p style="display: table;margin-left:70px">
+            Ping:<span id="ping">50</span>ms
+        </p>
     </footer>
   </main>
 </div>
@@ -328,7 +327,6 @@
 </div>
 <button class="btn btn-info btn-sm canvas-close" style="position: fixed;right: 0;bottom: 0;z-index: 200;display: none" type="button">不再显示canvas背景</button>
 <script color="0,104,183" count="100" opacity='1' src="~/Scripts/line.js" type="text/javascript" zIndex="-1"></script>
-<script src="/_framework/blazor.server.js"></script>
 </body>
 </html>
 @if (Context.Request.Headers["User-Agent"].ToString().Contains(new[] {

src/Masuit.MyBlogs.Core/Views/Tools/Loan.cshtml

@@ -16,3 +16,5 @@
     IP = Context.Connection.RemoteIpAddress.ToString()
   }))
 </div>
+
+<script src="/_framework/blazor.server.js"></script>

src/Masuit.MyBlogs.Core/wwwroot/Content/common/style.css

@@ -3806,4 +3806,12 @@ button:disabled:hover,
 .subscribe-btn:hover:not(:disabled) {
   background: linear-gradient(90deg, #2990f8 40%, #1e90ff 100%);
   color: #fff;
+}
+
+.fixtop {
+  color: red;
+}
+
+.new {
+  color: green;
 }

src/Masuit.MyBlogs.Core/wwwroot/Scripts/global/scripts.js

@@ -87,13 +87,40 @@ $(function () {
   }).catch(function (e) {
     console.log("Oops, error");
   });
+  initEventSource();
+  document.addEventListener('visibilitychange', () => {
+    if (document.hidden) {
+      // 页面变为不可见，断开连接
+      closeEventSources()
+    } else {
+      // 页面变为可见，恢复连接
+      initEventSource()
+    }
+  });
 
-  setInterval(function () {
-    let timestamp = new Date().getTime();
-    DotNet.invokeMethodAsync('Masuit.MyBlogs.Core', 'Latency').then(data => {
-      $("#ping").text(new Date().getTime() - timestamp);
-    });
-  }, 2000);
+  function initEventSource() {
+    // 如果页面不可见，不初始化连接
+    if (document.hidden) {
+      return
+    }
+
+    window.eventSource = new EventSource(`/ping`)
+    window.eventSource.onmessage = (event) => {
+      $("#ping").text((Date.now() - event.data) / 2);
+    }
+
+    window.eventSource.onerror = (error) => {
+      console.error('EventSource 连接错误！', error)
+    }
+  }
+
+  // 关闭 EventSource 连接
+  function closeEventSources() {
+    if (window.eventSource) {
+      window.eventSource.close()
+      window.eventSource = null
+    }
+  }
 
   // 自动重试加载图片
   $('img').on("error", function () {

src/Masuit.MyBlogs.Core/wwwroot/dashboard/index.html

@@ -1,3 +1,3 @@
 <!doctype html><html><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><script>// 设置UEditor资源路径
       window.UEDITOR_HOME_URL = '/UEditorPlus/';
-      window.UEDITOR_CORS_URL = '/UEditorPlus/';</script><script charset="utf-8" src="/UEditorPlus/ueditor.config.js"></script><script charset="utf-8" src="/UEditorPlus/ueditor.all.js"></script><script charset="utf-8" src="/UEditorPlus/lang/zh-cn/zh-cn.js"></script><script defer="defer" src="/dashboard/js/chunk-vue.1759237644631.js"></script><script defer="defer" src="/dashboard/js/chunk-quasar.1759237644631.js"></script><script defer="defer" src="/dashboard/js/chunk-vendors.1759237644631.js"></script><script defer="defer" src="/dashboard/js/index.1759237644631.js"></script><link href="/dashboard/css/chunk-quasar.1759237644631.css" rel="stylesheet"><link href="/dashboard/css/chunk-vendors.1759237644631.css" rel="stylesheet"><link href="/dashboard/css/index.1759237644631.css" rel="stylesheet"></head><body><div id="app"></div></body></html>
+      window.UEDITOR_CORS_URL = '/UEditorPlus/';</script><script charset="utf-8" src="/UEditorPlus/ueditor.config.js"></script><script charset="utf-8" src="/UEditorPlus/ueditor.all.js"></script><script charset="utf-8" src="/UEditorPlus/lang/zh-cn/zh-cn.js"></script><script defer="defer" src="/dashboard/js/chunk-vue.1759243989863.js"></script><script defer="defer" src="/dashboard/js/chunk-quasar.1759243989863.js"></script><script defer="defer" src="/dashboard/js/chunk-vendors.1759243989863.js"></script><script defer="defer" src="/dashboard/js/index.1759243989863.js"></script><link href="/dashboard/css/chunk-quasar.1759243989863.css" rel="stylesheet"><link href="/dashboard/css/chunk-vendors.1759243989863.css" rel="stylesheet"><link href="/dashboard/css/index.1759243989863.css" rel="stylesheet"></head><body><div id="app"></div></body></html>