diff --git a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
index b150780..18e304e 100644
--- a/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/SysNoticeController.cs
@@ -2,11 +2,11 @@
using Microsoft.AspNetCore.SignalR;
using SqlSugar;
using ZR.Admin.WebApi.Filters;
-using ZR.Admin.WebApi.Hubs;
using ZR.Model;
using ZR.Model.System;
using ZR.Model.System.Dto;
using ZR.Service.System.IService;
+using ZR.ServiceCore.Signalr;
namespace ZR.Admin.WebApi.Controllers.System
{
diff --git a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs b/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
index 0705a37..e0d6109 100644
--- a/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
+++ b/ZR.Admin.WebApi/Controllers/System/monitor/SysUserOnlineController.cs
@@ -1,9 +1,9 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.SignalR;
using ZR.Admin.WebApi.Filters;
-using ZR.Admin.WebApi.Hubs;
using ZR.Model;
using ZR.Model.System.Dto;
+using ZR.ServiceCore.Signalr;
namespace ZR.Admin.WebApi.Controllers.monitor
{
diff --git a/ZR.Admin.WebApi/Program.cs b/ZR.Admin.WebApi/Program.cs
index d81365c..7c3e820 100644
--- a/ZR.Admin.WebApi/Program.cs
+++ b/ZR.Admin.WebApi/Program.cs
@@ -5,10 +5,9 @@ using Microsoft.AspNetCore.DataProtection;
using Microsoft.IdentityModel.Tokens;
using System.Text.Json.Serialization;
using ZR.Admin.WebApi.Extensions;
-using ZR.Admin.WebApi.Hubs;
using ZR.Common.Cache;
using ZR.Infrastructure.WebExtensions;
-using ZR.ServiceCore.Middleware;
+using ZR.ServiceCore.Signalr;
using ZR.ServiceCore.SqlSugar;
var builder = WebApplication.CreateBuilder(args);
diff --git a/ZR.Model/ZR.Model.csproj b/ZR.Model/ZR.Model.csproj
index 14d4d43..d69320e 100644
--- a/ZR.Model/ZR.Model.csproj
+++ b/ZR.Model/ZR.Model.csproj
@@ -12,8 +12,4 @@
-
-
-
-
diff --git a/ZR.Admin.WebApi/Hubs/HubsConstant.cs b/ZR.ServiceCore/Signalr/HubsConstant.cs
similarity index 92%
rename from ZR.Admin.WebApi/Hubs/HubsConstant.cs
rename to ZR.ServiceCore/Signalr/HubsConstant.cs
index 35f9539..ba22cf0 100644
--- a/ZR.Admin.WebApi/Hubs/HubsConstant.cs
+++ b/ZR.ServiceCore/Signalr/HubsConstant.cs
@@ -1,4 +1,4 @@
-namespace ZR.Admin.WebApi.Hubs
+namespace ZR.ServiceCore.Signalr
{
public class HubsConstant
{
diff --git a/ZR.Admin.WebApi/Hubs/MessageHub.cs b/ZR.ServiceCore/Signalr/MessageHub.cs
similarity index 94%
rename from ZR.Admin.WebApi/Hubs/MessageHub.cs
rename to ZR.ServiceCore/Signalr/MessageHub.cs
index 2c9b22d..88303ce 100644
--- a/ZR.Admin.WebApi/Hubs/MessageHub.cs
+++ b/ZR.ServiceCore/Signalr/MessageHub.cs
@@ -1,10 +1,12 @@
-using IPTools.Core;
+using Infrastructure;
+using Infrastructure.Model;
+using IPTools.Core;
using Microsoft.AspNetCore.SignalR;
using System.Web;
using UAParser;
using ZR.Service.System.IService;
-namespace ZR.Admin.WebApi.Hubs
+namespace ZR.ServiceCore.Signalr
{
///
/// msghub
@@ -64,12 +66,12 @@ namespace ZR.Admin.WebApi.Hubs
ClientId = clientId ?? Context.ConnectionId
};
onlineClients.Add(onlineUser);
- Log.WriteLine(msg: $"{DateTime.Now}:{name},{Context.ConnectionId}连接服务端success,当前已连接{onlineClients.Count}个");
+ Log.WriteLine(msg: $"{name},{Context.ConnectionId}连接服务端success,当前已连接{onlineClients.Count}个");
//Clients.All.SendAsync("welcome", $"欢迎您:{name},当前时间:{DateTime.Now}");
Clients.Caller.SendAsync(HubsConstant.MoreNotice, SendNotice());
Clients.Caller.SendAsync(HubsConstant.ConnId, onlineUser.ConnnectionId);
}
- OnlineUsers? userInfo = GetUserById(userid);
+ OnlineUsers userInfo = GetUserById(userid);
if (userInfo == null)
{
userInfo = new OnlineUsers() { Userid = userid, Name = name, LoginTime = DateTime.Now };
@@ -105,7 +107,7 @@ namespace ZR.Admin.WebApi.Hubs
/// 连接终止时调用。
///
///
- public override Task OnDisconnectedAsync(Exception? exception)
+ public override Task OnDisconnectedAsync(Exception exception)
{
var user = onlineClients.Where(p => p.ConnnectionId == Context.ConnectionId).FirstOrDefault();
if (user != null)
@@ -120,7 +122,7 @@ namespace ZR.Admin.WebApi.Hubs
});
//累计用户时长
- OnlineUsers? userInfo = GetUserById(user.Userid);
+ OnlineUsers userInfo = GetUserById(user.Userid);
if (userInfo != null)
{
userInfo.TodayOnlineTime += user?.OnlineTime ?? 0;
@@ -176,7 +178,7 @@ namespace ZR.Admin.WebApi.Hubs
{
return onlineClients.Where(p => p.ConnnectionId == connId).FirstOrDefault();
}
- private static OnlineUsers? GetUserById(long userid)
+ private static OnlineUsers GetUserById(long userid)
{
return users.Where(f => f.Userid == userid).FirstOrDefault();
}
diff --git a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs b/ZR.ServiceCore/Signalr/OnlineUsers.cs
similarity index 86%
rename from ZR.Admin.WebApi/Hubs/OnlineUsers.cs
rename to ZR.ServiceCore/Signalr/OnlineUsers.cs
index 72b8a56..037c6c9 100644
--- a/ZR.Admin.WebApi/Hubs/OnlineUsers.cs
+++ b/ZR.ServiceCore/Signalr/OnlineUsers.cs
@@ -1,4 +1,4 @@
-namespace ZR.Admin.WebApi.Hubs
+namespace ZR.ServiceCore.Signalr
{
public class OnlineUsers
{
@@ -12,24 +12,24 @@
public long Userid { get; set; }
public string Name { get; set; }
public DateTime LoginTime { get; set; }
- public string? UserIP { get; set; }
+ public string UserIP { get; set; }
///
/// 登录地点
///
- public string? Location { get; set; }
+ public string Location { get; set; }
///
/// 判断用户唯一
///
- public string? Uuid { get; set; }
+ public string Uuid { get; set; }
///
/// 浏览器
///
- public string? Browser { get; set; }
+ public string Browser { get; set; }
///
/// 平台
///
- public string? Platform { get; set; } = string.Empty;
+ public string Platform { get; set; } = string.Empty;
///
/// 在线时长
///