diff --git a/src/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj b/src/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj index ff53c4b9f..c73170780 100644 --- a/src/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj +++ b/src/ThingsGateway.Web.Core/ThingsGateway.Web.Core.csproj @@ -51,7 +51,7 @@ - + diff --git a/src/ThingsGateway.Web.Page/ThingsGateway.Web.Page.csproj b/src/ThingsGateway.Web.Page/ThingsGateway.Web.Page.csproj index 881baa22d..23e7107ab 100644 --- a/src/ThingsGateway.Web.Page/ThingsGateway.Web.Page.csproj +++ b/src/ThingsGateway.Web.Page/ThingsGateway.Web.Page.csproj @@ -8,7 +8,7 @@ - + diff --git a/src/ThingsGateway.Web.Rcl.Core/GlobalUsings.cs b/src/ThingsGateway.Web.Rcl.Core/GlobalUsings.cs index 1a9642cf2..dda0d4c3b 100644 --- a/src/ThingsGateway.Web.Rcl.Core/GlobalUsings.cs +++ b/src/ThingsGateway.Web.Rcl.Core/GlobalUsings.cs @@ -20,5 +20,7 @@ global using System.Diagnostics.CodeAnalysis; global using System.Globalization; global using System.Linq; global using System.Threading.Tasks; +global using ThingsGateway.Web.Rcl.Core; +global using ThingsGateway.Application; global using ThingsGateway.Core; \ No newline at end of file diff --git a/src/ThingsGateway.Web.Rcl/Shared/Auth/Login.razor b/src/ThingsGateway.Web.Rcl.Core/Shared/Auth/Login.razor similarity index 100% rename from src/ThingsGateway.Web.Rcl/Shared/Auth/Login.razor rename to src/ThingsGateway.Web.Rcl.Core/Shared/Auth/Login.razor diff --git a/src/ThingsGateway.Web.Rcl/Shared/Auth/Login.razor.cs b/src/ThingsGateway.Web.Rcl.Core/Shared/Auth/Login.razor.cs similarity index 100% rename from src/ThingsGateway.Web.Rcl/Shared/Auth/Login.razor.cs rename to src/ThingsGateway.Web.Rcl.Core/Shared/Auth/Login.razor.cs diff --git a/src/ThingsGateway.Web.Rcl/Shared/Auth/SignalR.razor b/src/ThingsGateway.Web.Rcl.Core/Shared/Auth/SignalR.razor similarity index 100% rename from src/ThingsGateway.Web.Rcl/Shared/Auth/SignalR.razor rename to src/ThingsGateway.Web.Rcl.Core/Shared/Auth/SignalR.razor diff --git a/src/ThingsGateway.Web.Rcl/Shared/Auth/SignalR.razor.cs b/src/ThingsGateway.Web.Rcl.Core/Shared/Auth/SignalR.razor.cs similarity index 98% rename from src/ThingsGateway.Web.Rcl/Shared/Auth/SignalR.razor.cs rename to src/ThingsGateway.Web.Rcl.Core/Shared/Auth/SignalR.razor.cs index 976ee7b24..de4c6cfa8 100644 --- a/src/ThingsGateway.Web.Rcl/Shared/Auth/SignalR.razor.cs +++ b/src/ThingsGateway.Web.Rcl.Core/Shared/Auth/SignalR.razor.cs @@ -2,6 +2,8 @@ using BlazorComponent; using Microsoft.AspNetCore.SignalR.Client; +using System.Net.Http; + namespace ThingsGateway.Web.Rcl { public partial class SignalR diff --git a/src/ThingsGateway.Web.Rcl/Shared/BaseLayout.razor b/src/ThingsGateway.Web.Rcl.Core/Shared/BaseLayout.razor similarity index 100% rename from src/ThingsGateway.Web.Rcl/Shared/BaseLayout.razor rename to src/ThingsGateway.Web.Rcl.Core/Shared/BaseLayout.razor diff --git a/src/ThingsGateway.Web.Rcl/Shared/MainLayout.razor b/src/ThingsGateway.Web.Rcl.Core/Shared/MainLayout.razor similarity index 100% rename from src/ThingsGateway.Web.Rcl/Shared/MainLayout.razor rename to src/ThingsGateway.Web.Rcl.Core/Shared/MainLayout.razor diff --git a/src/ThingsGateway.Web.Rcl/Shared/MainLayout.razor.cs b/src/ThingsGateway.Web.Rcl.Core/Shared/MainLayout.razor.cs similarity index 100% rename from src/ThingsGateway.Web.Rcl/Shared/MainLayout.razor.cs rename to src/ThingsGateway.Web.Rcl.Core/Shared/MainLayout.razor.cs diff --git a/src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj b/src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj index 987a85501..9714858b6 100644 --- a/src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj +++ b/src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj @@ -25,6 +25,7 @@ + diff --git a/src/ThingsGateway.Web.Rcl.Core/_Imports.razor b/src/ThingsGateway.Web.Rcl.Core/_Imports.razor index 37c88eafd..dbe7d0889 100644 --- a/src/ThingsGateway.Web.Rcl.Core/_Imports.razor +++ b/src/ThingsGateway.Web.Rcl.Core/_Imports.razor @@ -2,3 +2,5 @@ @using Masa.Blazor @using BlazorComponent @using BlazorComponent.I18n; +@using ThingsGateway.Web.Rcl.Core; +@using ThingsGateway.Application; diff --git a/src/ThingsGateway.Web.Rcl/Page/Index.razor b/src/ThingsGateway.Web.Rcl/Page/Index.razor index df412e2bb..edaf4149b 100644 --- a/src/ThingsGateway.Web.Rcl/Page/Index.razor +++ b/src/ThingsGateway.Web.Rcl/Page/Index.razor @@ -34,8 +34,82 @@ +@if (UserManager.SuperAdmin) +{ + + + + + @T("RPC日志") + + + + @foreach (var item in RpcLogs) + { + + + + @item.LogTime + + +
+ @item.OperateObject.Substring(0,item.OperateObject.Length>100?100:item.OperateObject.Length) + @item.Description(a=>a.OperateObject) +
+
+ @item.OperateSource.Substring(0,item.OperateSource.Length>100?100:item.OperateSource.Length) + @item.Description(a=>a.OperateSource) +
+
+ @item.ParamJson.Substring(0,item.ParamJson.Length>100?100:item.ParamJson.Length) + @item.Description(a=>a.ParamJson) +
+
+ @item.ResultJson.Substring(0,item.ResultJson.Length>100?100:item.ResultJson.Length) + @item.Description(a=>a.ResultJson) +
- + + + + + } + + + + + + + + @T("后台日志") + + + + @foreach (var item in RuntimeLogs) + { + + + + @item.LogTime + + +
@item.LogSource.Substring(0,item.LogSource.Length>100?100:item.LogSource.Length)
+
@item.LogMessage.Substring(0,item.LogMessage.Length>100?100:item.LogMessage.Length)
+ + + + + } + + + + + +} + + @@ -93,15 +167,26 @@ @code { - + [Inject] + private ThingsGateway.Web.Foundation.IRpcLogService RpcLogService { get; set; } + [Inject] + private ThingsGateway.Web.Foundation.IRuntimeLogService RuntimeLogService { get; set; } [Inject] private IVisitLogService VisitLogService { get; set; } List DevLogVisits; + List DevLogOps; + List RpcLogs; + List RuntimeLogs; [Inject] private IOperateLogService OperateLogService { get; set; } - List DevLogOps; protected override async Task OnInitializedAsync() { + if (UserManager.SuperAdmin) + { + RpcLogs = (await RpcLogService.Page(new() { Size = 5 })).Records.ToList(); + RuntimeLogs = (await RuntimeLogService.Page(new() { Size = 5 })).Records.ToList(); + } + DevLogVisits = (await VisitLogService.Page(new() { Size = 5, Account = UserResoures.CurrentUser?.Account })).Records.ToList(); DevLogOps = (await OperateLogService.Page(new() { Size = 5, Account = UserResoures.CurrentUser?.Account })).Records.ToList(); await base.OnInitializedAsync(); diff --git a/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj b/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj index 383c5e647..00ee560b5 100644 --- a/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj +++ b/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj @@ -7,11 +7,7 @@ - - - - - +