From d9e59ed2e947aff29b7c21a9b0e8b6e12d741692 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 30 八月 2024 14:54:18 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/Hub/TaskLogHub.cs | 66 ++++++++++++++++----------------
1 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/TaskLogHub.cs b/Admin.NET/WCS.Application/Hub/TaskLogHub.cs
index b4d018c..141e246 100644
--- a/Admin.NET/WCS.Application/Hub/TaskLogHub.cs
+++ b/Admin.NET/WCS.Application/Hub/TaskLogHub.cs
@@ -16,41 +16,41 @@
_taskLogHubContext = taskLogHubContext;
}
- /// <summary>
- /// 杩炴帴
- /// </summary>
- /// <returns></returns>
- public override async Task OnConnectedAsync()
- {
- await base.OnConnectedAsync();
- }
+ ///// <summary>
+ ///// 杩炴帴
+ ///// </summary>
+ ///// <returns></returns>
+ //public override async Task OnConnectedAsync()
+ //{
+ // await base.OnConnectedAsync();
+ //}
- /// <summary>
- /// 鏂紑
- /// </summary>
- /// <param name="exception"></param>
- /// <returns></returns>
- public override async Task OnDisconnectedAsync(Exception exception)
- {
- await base.OnDisconnectedAsync(exception);
- }
+ ///// <summary>
+ ///// 鏂紑
+ ///// </summary>
+ ///// <param name="exception"></param>
+ ///// <returns></returns>
+ //public override async Task OnDisconnectedAsync(Exception exception)
+ //{
+ // await base.OnDisconnectedAsync(exception);
+ //}
- /// <summary>
- /// 涓嬪彂浠诲姟
- /// </summary>
- /// <returns></returns>
- public async Task PublicTask(WcsTaskOutput context)
- {
- await _taskLogHubContext.Clients.All.PublicTask(context);
- }
+ ///// <summary>
+ ///// 涓嬪彂浠诲姟
+ ///// </summary>
+ ///// <returns></returns>
+ //public async Task PublicTask(WcsTaskOutput context)
+ //{
+ // await _taskLogHubContext.Clients.All.PublicTask(context);
+ //}
- /// <summary>
- /// 涓嬪彂浠诲姟鏄庣粏
- /// </summary>
- /// <returns></returns>
- public async Task PublicTaskMonitor(WcsTaskMonitorOutput context)
- {
- await _taskLogHubContext.Clients.All.PublicTaskMonitor(context);
- }
+ ///// <summary>
+ ///// 涓嬪彂浠诲姟鏄庣粏
+ ///// </summary>
+ ///// <returns></returns>
+ //public async Task PublicTaskMonitor(WcsTaskMonitorOutput context)
+ //{
+ // await _taskLogHubContext.Clients.All.PublicTaskMonitor(context);
+ //}
}
--
Gitblit v1.8.0