diff --git a/Nop.Plugin.Misc.AIPlugin/FruitBankConst.cs b/Nop.Plugin.Misc.AIPlugin/FruitBankConst.cs index 014a5a4..f3b9d64 100644 --- a/Nop.Plugin.Misc.AIPlugin/FruitBankConst.cs +++ b/Nop.Plugin.Misc.AIPlugin/FruitBankConst.cs @@ -1,5 +1,5 @@ //using AyCode.Core.Consts; -using Mango.Nop.Core; +//using Mango.Nop.Core; namespace Nop.Plugin.Misc.FruitBankPlugin { diff --git a/Nop.Plugin.Misc.AIPlugin/Infrastructure/PluginNopStartup.cs b/Nop.Plugin.Misc.AIPlugin/Infrastructure/PluginNopStartup.cs index a76d59f..6fe8e4a 100644 --- a/Nop.Plugin.Misc.AIPlugin/Infrastructure/PluginNopStartup.cs +++ b/Nop.Plugin.Misc.AIPlugin/Infrastructure/PluginNopStartup.cs @@ -1,4 +1,10 @@ //using AyCode.Core.Loggers; + +using AyCode.Core.Loggers; +using FruitBank.Common; +using FruitBank.Common.Server.Controllers; +using FruitBank.Common.Server.Services.Loggers; +using FruitBank.Common.Server.Services.SignalRs; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Mvc.Razor; using Microsoft.AspNetCore.SignalR; @@ -39,11 +45,11 @@ public class PluginNopStartup : INopStartup //register services and interfaces - //services.AddSingleton(); - //services.AddSingleton(); - ////services.AddSingleton(); - //services.AddScoped(); - + services.AddSingleton(); + services.AddSingleton(); + //services.AddSingleton(); + services.AddScoped(); + //services.AddScoped(); services.AddScoped(); services.AddScoped(); @@ -61,27 +67,24 @@ public class PluginNopStartup : INopStartup /// Builder for configuring an application's request pipeline public void Configure(IApplicationBuilder application) { - //var fruitBankHubEndPoint = $"/{FruitBankConstClient.DefaultHubName}"; - //application.UseWhen(context => context.Request.Path.StartsWithSegments(fruitBankHubEndPoint), app => - //{ - // //app.UseCors("AllowBlazorClient"); - // //app.UseRouting(); - // app.UseEndpoints(endpoints => - // { - // //endpoints.MapHub("/fbhub"); - // endpoints.MapHub(fruitBankHubEndPoint); + var fruitBankHubEndPoint = $"/{FruitBankConstClient.DefaultHubName}"; + application.UseWhen(context => context.Request.Path.StartsWithSegments(fruitBankHubEndPoint), app => + { + app.UseEndpoints(endpoints => + { + endpoints.MapHub(fruitBankHubEndPoint); - // }); - //}); + }); + }); - //var loggrHubEndPoint = $"/{FruitBankConstClient.LoggerHubName}"; - //application.UseWhen(context => context.Request.Path.StartsWithSegments(loggrHubEndPoint), app => - //{ - // app.UseEndpoints(endpoints => - // { - // endpoints.MapHub(loggrHubEndPoint); - // }); - //}); + var loggrHubEndPoint = $"/{FruitBankConstClient.LoggerHubName}"; + application.UseWhen(context => context.Request.Path.StartsWithSegments(loggrHubEndPoint), app => + { + app.UseEndpoints(endpoints => + { + endpoints.MapHub(loggrHubEndPoint); + }); + }); } /// diff --git a/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj b/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj index d97c28c..929a710 100644 --- a/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj +++ b/Nop.Plugin.Misc.AIPlugin/Nop.Plugin.Misc.FruitBankPlugin.csproj @@ -9,6 +9,7 @@ to ensure that the dlls copied from the NuGet cache to the output of your project--> false enable + true @@ -42,6 +43,7 @@ + @@ -60,6 +62,71 @@ + + + + + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Core.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Core.Server.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Database.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Entities.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Entities.Server.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Interfaces.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Interfaces.Server.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Models.Server.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Services.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\AyCode.Services.Server.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\FruitBank.Common.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\FruitBank.Common.Server.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\MessagePack.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\MessagePack.Annotations.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.Http.Connections.Client.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.SignalR.Client.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.SignalR.Client.Core.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Microsoft.NET.StringTools.dll + + + ..\..\..\..\FruitBankHybridApp\FruitBank.Common.Server\bin\Debug\net9.0\Newtonsoft.Json.dll + diff --git a/Nop.Plugin.Misc.MangoCore/Infrastructure/PluginNopStartup.cs b/Nop.Plugin.Misc.MangoCore/Infrastructure/PluginNopStartup.cs index 2a431ac..9f9f140 100644 --- a/Nop.Plugin.Misc.MangoCore/Infrastructure/PluginNopStartup.cs +++ b/Nop.Plugin.Misc.MangoCore/Infrastructure/PluginNopStartup.cs @@ -41,16 +41,29 @@ public class PluginNopStartup : INopStartup public void Configure(IApplicationBuilder application) { - application.UseWhen(context => context.Request.Path.StartsWithSegments("/fbhub"), app => + //application.UseWhen(context => context.Request.Path.StartsWithSegments("/fbhub"), app => + //{ + // app.UseCors("AllowBlazorClient"); + // app.UseRouting(); + // //app.UseEndpoints(endpoints => + // //{ + // // endpoints.MapHub("/fbhub"); + // //}); + //}); + + var fruitBankHubEndPoint = "/fbHub";// $"/{FruitBankConstClient.DefaultHubName}"; + application.UseWhen(context => context.Request.Path.StartsWithSegments(fruitBankHubEndPoint), app => { app.UseCors("AllowBlazorClient"); app.UseRouting(); - //app.UseEndpoints(endpoints => - //{ - // endpoints.MapHub("/fbhub"); - //}); }); + var loggrHubEndPoint = "/loggerHub";//$"/{FruitBankConstClient.LoggerHubName}"; + application.UseWhen(context => context.Request.Path.StartsWithSegments(loggrHubEndPoint), app => + { + app.UseCors("AllowBlazorClient"); + app.UseRouting(); + }); } ///