From 5c2ecf0936e53658fe4e18f58c487f287b7c7133 Mon Sep 17 00:00:00 2001
From: zpc <zpc1131@gmail.com>
Date: Mon, 2 Dec 2024 18:49:59 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B7=A8=E5=9F=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Api/CloudGaming.ExtApi/Program.cs         |  9 ++++++--
 .../CloudGaming.Code/Monitor/MonitorBLL.cs    | 22 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/src/CloudGaming/Api/CloudGaming.ExtApi/Program.cs b/src/CloudGaming/Api/CloudGaming.ExtApi/Program.cs
index e0815de..fc1cda5 100644
--- a/src/CloudGaming/Api/CloudGaming.ExtApi/Program.cs
+++ b/src/CloudGaming/Api/CloudGaming.ExtApi/Program.cs
@@ -4,6 +4,7 @@ using CloudGaming.Code.Filter;
 using CloudGaming.Code.Game;
 using CloudGaming.Code.Monitor;
 
+using HuanMeng.DotNetCore.CustomExtension;
 using HuanMeng.DotNetCore.MiddlewareExtend;
 using HuanMeng.DotNetCore.SwaggerUtile;
 
@@ -39,7 +40,10 @@ builder.Services.AddSingleton(typeof(ILogger<ExceptionMiddleware>), serviceProvi
     return loggerFactory.CreateLogger<ExceptionMiddleware>();
 });
 #endregion
-
+#region 添加跨域
+var _myAllowSpecificOrigins = "_myAllowSpecificOrigins";
+builder.Services.AddCustomCors(_myAllowSpecificOrigins);
+#endregion
 builder.Services.AddHttpContextAccessor(); //添加httpContext注入访问
 #region 返回数据解析  
 //builder.Services.AddControllers();
@@ -107,7 +111,8 @@ app.UseSwaggerUI(c =>
     c.InjectStylesheet("/custom.css");
 });
 //}
-
+//使用跨域
+app.UseCors(_myAllowSpecificOrigins);
 app.UseAuthorization();
 //数据库中间件
 app.UseMultiTenantExt();
diff --git a/src/CloudGaming/Code/CloudGaming.Code/Monitor/MonitorBLL.cs b/src/CloudGaming/Code/CloudGaming.Code/Monitor/MonitorBLL.cs
index 9e4f196..2b490d0 100644
--- a/src/CloudGaming/Code/CloudGaming.Code/Monitor/MonitorBLL.cs
+++ b/src/CloudGaming/Code/CloudGaming.Code/Monitor/MonitorBLL.cs
@@ -1,6 +1,7 @@
 using CloudGaming.DtoModel.Other;
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -30,9 +31,28 @@ public class MonitorBLL : CloudGamingBase
     /// 获取近一月活跃人数统计
     /// </summary>
     /// <returns></returns>
-    public async Task GetActiveUserCount()
+    public async Task GetActiveUserCount(long startTimeStamp = 0, long endTimeStamp = 0)
     {
+        if (endTimeStamp == 0)
+        {
+            endTimeStamp = DateTime.Now.ToUnixTimestamp();
+        }
+        if (startTimeStamp == 0)
+        {
+            startTimeStamp = DateTime.Now.AddMonths(-1).ToUnixTimestamp();
+        }
+        //开始时间
+        DateOnly startDate = DateOnly.FromDateTime(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddSeconds(startTimeStamp));
+        //结束时间
+        DateOnly endDate = DateOnly.FromDateTime(new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddSeconds(endTimeStamp));
+        DateOnly curr = startDate;
+        var userStatisticsList = await Dao.DaoExt.Context.T_Statistics_User.Where(it => it.LoginDate > startDate && it.LoginDate < endDate).ToListAsync();
+        while (curr <= endDate)
+        {
+            int day = int.Parse(curr.ToString("yyyyMMdd"));
 
+            curr.AddDays(1);
+        }
     }
 
     /// <summary>