diff --git a/src/ThingsGateway.Application/Aop/OperDispatchProxy.cs b/src/ThingsGateway.Application/Aop/OperDispatchProxy.cs index 7acb94565..cb6e1b510 100644 --- a/src/ThingsGateway.Application/Aop/OperDispatchProxy.cs +++ b/src/ThingsGateway.Application/Aop/OperDispatchProxy.cs @@ -1,8 +1,6 @@ using Furion.Reflection; using Furion.Reflection.Extensions; -using System.Text; - namespace ThingsGateway.Application { /// diff --git a/src/ThingsGateway.Web.Server/Controllers/AuthController.cs b/src/ThingsGateway.Application/Controllers/AuthController.cs similarity index 96% rename from src/ThingsGateway.Web.Server/Controllers/AuthController.cs rename to src/ThingsGateway.Application/Controllers/AuthController.cs index f570a27f0..158483ea6 100644 --- a/src/ThingsGateway.Web.Server/Controllers/AuthController.cs +++ b/src/ThingsGateway.Application/Controllers/AuthController.cs @@ -2,7 +2,7 @@ using Microsoft.AspNetCore.Mvc; -namespace ThingsGateway.Web.Entry.Controllers +namespace ThingsGateway.Application { /// /// B端登录控制器 diff --git a/src/ThingsGateway.Web.Server/Controllers/OpenApiAuthController.cs b/src/ThingsGateway.Application/Controllers/OpenApiAuthController.cs similarity index 96% rename from src/ThingsGateway.Web.Server/Controllers/OpenApiAuthController.cs rename to src/ThingsGateway.Application/Controllers/OpenApiAuthController.cs index 9098f546c..a49b513df 100644 --- a/src/ThingsGateway.Web.Server/Controllers/OpenApiAuthController.cs +++ b/src/ThingsGateway.Application/Controllers/OpenApiAuthController.cs @@ -4,7 +4,7 @@ using Microsoft.AspNetCore.Mvc; using ThingsGateway.Application.Services.Auth; -namespace ThingsGateway.Web.Entry.Controllers +namespace ThingsGateway.Application { /// /// OpenApi登录控制器 diff --git a/src/ThingsGateway.Web.Server/Controllers/SwaggerController.cs b/src/ThingsGateway.Application/Controllers/SwaggerController.cs similarity index 93% rename from src/ThingsGateway.Web.Server/Controllers/SwaggerController.cs rename to src/ThingsGateway.Application/Controllers/SwaggerController.cs index 08f73f9c9..fa59cdb9a 100644 --- a/src/ThingsGateway.Web.Server/Controllers/SwaggerController.cs +++ b/src/ThingsGateway.Application/Controllers/SwaggerController.cs @@ -1,11 +1,10 @@ -using Furion.DependencyInjection; -using Furion.DynamicApiController; +using Furion.DynamicApiController; using Furion.SpecificationDocument; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Caching.Memory; -namespace ThingsGateway.Web.Entry.Controllers +namespace ThingsGateway.Application { /// /// 系统登录授权服务 diff --git a/src/ThingsGateway.Application/Extension/ApplicationExtension.cs b/src/ThingsGateway.Application/Extension/ApplicationExtension.cs index f96707433..9e3ecac43 100644 --- a/src/ThingsGateway.Application/Extension/ApplicationExtension.cs +++ b/src/ThingsGateway.Application/Extension/ApplicationExtension.cs @@ -1,5 +1,4 @@ -using Microsoft.AspNetCore.Authorization; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using System.Globalization; diff --git a/src/ThingsGateway.Application/GlobalUsing.cs b/src/ThingsGateway.Application/GlobalUsing.cs index 7df1c414a..cbf537a78 100644 --- a/src/ThingsGateway.Application/GlobalUsing.cs +++ b/src/ThingsGateway.Application/GlobalUsing.cs @@ -5,6 +5,7 @@ global using Furion.FriendlyException; global using Mapster; +global using Microsoft.AspNetCore.Authorization; global using Microsoft.AspNetCore.Http; global using Microsoft.AspNetCore.SignalR; global using Microsoft.CodeAnalysis; @@ -15,13 +16,15 @@ global using NewLife.Serialization; global using SqlSugar; +global using System; global using System.ComponentModel; global using System.ComponentModel.DataAnnotations; global using System.Reflection; +global using System.Text; +global using System.Threading.Tasks; global using ThingsGateway.Core; global using ThingsGateway.Core.Extension; - global using ThingsGateway.Core.Utils; global using Yitter.IdGenerator; diff --git a/src/ThingsGateway.Web.Rcl/Page/Index.razor b/src/ThingsGateway.Web.Page/Page/Index.razor similarity index 100% rename from src/ThingsGateway.Web.Rcl/Page/Index.razor rename to src/ThingsGateway.Web.Page/Page/Index.razor diff --git a/src/ThingsGateway.Web.Rcl/BlazorApp.razor b/src/ThingsGateway.Web.Rcl/BlazorApp.razor index a0a157655..e1754d278 100644 --- a/src/ThingsGateway.Web.Rcl/BlazorApp.razor +++ b/src/ThingsGateway.Web.Rcl/BlazorApp.razor @@ -29,18 +29,18 @@ @code { - [Inject] - ThingsGateway.Web.Foundation.IDriverPluginService DriverPluginService { get; set; } + //[Inject] + //ThingsGateway.Web.Foundation.IDriverPluginService DriverPluginService { get; set; } IEnumerable GetAssemblys() { - var plugins = DriverPluginService.GetCacheListAsync(); + //var plugins = DriverPluginService.GetCacheListAsync(); var controllerTypes = App.EffectiveTypes. Where(u => !u.IsInterface && !u.IsAbstract && u.IsClass && u.IsDefined(typeof(Microsoft.AspNetCore.Components.RouteAttribute), false)) .Where(it => it.Assembly != typeof(BlazorApp).Assembly) - .Where(a => !(plugins.Select(b=>b.AssembleName).Contains(a.ToString()))) + //.Where(a => !(plugins.Select(b=>b.AssembleName).Contains(a.ToString()))) ; - var assemblys = controllerTypes?.Select(it => it.Assembly)?.Distinct(); + var assemblys = controllerTypes?.Select(it => it.Assembly)?.Distinct().ToList(); return assemblys; } diff --git a/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj b/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj index 156d422a1..b1f36e87c 100644 --- a/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj +++ b/src/ThingsGateway.Web.Rcl/ThingsGateway.Web.Rcl.csproj @@ -8,7 +8,6 @@ - diff --git a/src/ThingsGateway.Web.Server/GlobalUsing.cs b/src/ThingsGateway.Web.Server/GlobalUsing.cs index 83d25ff5b..0196ead45 100644 --- a/src/ThingsGateway.Web.Server/GlobalUsing.cs +++ b/src/ThingsGateway.Web.Server/GlobalUsing.cs @@ -1,13 +1,7 @@ global using Furion; -global using Microsoft.AspNetCore.Authorization; global using Microsoft.AspNetCore.Hosting; global using System; -global using System.ComponentModel; global using System.Reflection; global using System.Text; -global using System.Threading.Tasks; - -global using ThingsGateway.Application; -global using ThingsGateway.Core; \ No newline at end of file diff --git a/src/ThingsGateway.Web.Server/SingleFilePublish.cs b/src/ThingsGateway.Web.Server/SingleFilePublish.cs index 939dd1583..79670e262 100644 --- a/src/ThingsGateway.Web.Server/SingleFilePublish.cs +++ b/src/ThingsGateway.Web.Server/SingleFilePublish.cs @@ -14,7 +14,6 @@ "ThingsGateway.Foundation", "ThingsGateway.Web.Foundation", "ThingsGateway.Web.Page", - "BlazorComponent", "ThingsGateway.Web.Rcl", "ThingsGateway.Web.Rcl.Core", "ThingsGateway.Core", diff --git a/src/ThingsGateway.Web.Server/_Imports.razor b/src/ThingsGateway.Web.Server/_Imports.razor index f7ac5d6a3..d48e4a5a7 100644 --- a/src/ThingsGateway.Web.Server/_Imports.razor +++ b/src/ThingsGateway.Web.Server/_Imports.razor @@ -6,9 +6,6 @@ @using Microsoft.AspNetCore.Components.Web @using Microsoft.AspNetCore.Components.Web.Virtualization @using Microsoft.JSInterop -@using ThingsGateway.Application -@using ThingsGateway.Web.Rcl; -@using ThingsGateway.Core @using System.Globalization @using NewLife.Serialization; @using SqlSugar; diff --git a/src/ThingsGateway.sln b/src/ThingsGateway.sln index a32e858bf..14a6df1b0 100644 --- a/src/ThingsGateway.sln +++ b/src/ThingsGateway.sln @@ -1,3 +1,4 @@ + Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33213.308 @@ -48,6 +49,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Git", "Git", "{3B3C256C-A07 ..\.gitignore = ..\.gitignore ..\LICENSE.txt = ..\LICENSE.txt ..\README.md = ..\README.md + 关系图.dgml = 关系图.dgml EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OPCDA", "OPCDA", "{FCEDB40F-6FA3-4DD0-927B-B023EDBD01C1}" diff --git a/src/关系图.dgml b/src/关系图.dgml new file mode 100644 index 000000000..9c598ceef --- /dev/null +++ b/src/关系图.dgml @@ -0,0 +1,562 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file