diff --git a/Admin.NET/Admin.NET.Application/Configuration/Database.json b/Admin.NET/Admin.NET.Application/Configuration/Database.json index 448d7113..5104b145 100644 --- a/Admin.NET/Admin.NET.Application/Configuration/Database.json +++ b/Admin.NET/Admin.NET.Application/Configuration/Database.json @@ -11,7 +11,7 @@ "DbType": "Sqlite", // MySql、SqlServer、Sqlite、Oracle、PostgreSQL、Dm、Kdbndp、Oscar、MySqlConnector、Access、OpenGauss、QuestDB、HG、ClickHouse、GBase、Odbc、Custom "ConnectionString": "DataSource=./Admin.NET.db", // Sqlite //"ConnectionString": "PORT=5432;DATABASE=xxx;HOST=localhost;PASSWORD=xxx;USER ID=xxx", // PostgreSQL - //"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;", // MySql, + //"ConnectionString": "Server=localhost;Database=xxx;Uid=xxx;Pwd=xxx;SslMode=None;AllowLoadLocalInfile=true;AllowUserVariables=true;", // MySql, //"ConnectionString": "User Id=xxx; Password=xxx; Data Source=(DESCRIPTION=(ADDRESS=(PROTOCOL=tcp)(HOST=localhost)(PORT=1521))(CONNECT_DATA=(SERVICE_NAME=ORCL)))", // Oracle //"ConnectionString": "Server=localhost;Database=xxx;User Id=xxx;Password=xxx;Encrypt=True;TrustServerCertificate=True;", // SqlServer diff --git a/Admin.NET/Admin.NET.Application/OpenApi/DemoOpenApi.cs b/Admin.NET/Admin.NET.Application/Service/Test/DemoOpenApi.cs similarity index 51% rename from Admin.NET/Admin.NET.Application/OpenApi/DemoOpenApi.cs rename to Admin.NET/Admin.NET.Application/Service/Test/DemoOpenApi.cs index 22b91b3b..d09b5ac0 100644 --- a/Admin.NET/Admin.NET.Application/OpenApi/DemoOpenApi.cs +++ b/Admin.NET/Admin.NET.Application/Service/Test/DemoOpenApi.cs @@ -6,23 +6,23 @@ namespace Admin.NET.Application; -///// -///// 示例开放接口 -///// -//[ApiDescriptionSettings("开放接口", Name = "Demo", Order = 100)] -//[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)] -//public class DemoOpenApi : IDynamicApiController -//{ -// private readonly UserManager _userManager; +/// +/// 开放接口示例 +/// +[ApiDescriptionSettings("开放接口", Name = "Demo", Order = 100)] +[Authorize(AuthenticationSchemes = SignatureAuthenticationDefaults.AuthenticationScheme)] +public class DemoOpenApi : IDynamicApiController +{ + private readonly UserManager _userManager; -// public DemoOpenApi(UserManager userManager) -// { -// _userManager = userManager; -// } + public DemoOpenApi(UserManager userManager) + { + _userManager = userManager; + } -// [HttpGet("helloWord")] -// public Task HelloWord() -// { -// return Task.FromResult($"Hello word. {_userManager.Account}"); -// } -//} \ No newline at end of file + [HttpGet("helloWord")] + public Task HelloWord() + { + return Task.FromResult($"Hello, {_userManager.Account}."); + } +} \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Application/Service/Test/TestService.cs b/Admin.NET/Admin.NET.Application/Service/Test/TestService.cs new file mode 100644 index 00000000..eb47ba47 --- /dev/null +++ b/Admin.NET/Admin.NET.Application/Service/Test/TestService.cs @@ -0,0 +1,38 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证(版本 2.0)进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动!任何基于本项目二次开发而产生的一切法律纠纷和责任,我们不承担任何责任! + +using Furion.EventBus; + +namespace Admin.NET.Application; + +/// +/// 测试服务 +/// +[ApiDescriptionSettings(ApplicationConst.GroupName, Order = 100, Description = "测试服务")] +public class TestService : IDynamicApiController +{ + private readonly UserManager _userManager; + + public TestService(UserManager userManager) + { + _userManager = userManager; + } + + [HttpGet("helloWord")] + public Task HelloWord() + { + return Task.FromResult($"Hello, {_userManager.Account}."); + } + + /// + /// Redis事件测试 - Payload 🔖 + /// + /// + public async void EventTestAsync() + { + await App.GetRequiredService().PublishAsync(CommonConst.SendErrorMail, "Admin.NET"); + } +} \ No newline at end of file diff --git a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj index 31af2925..b12fe08d 100644 --- a/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj +++ b/Admin.NET/Admin.NET.Core/Admin.NET.Core.csproj @@ -17,10 +17,10 @@ - - - - + + + + @@ -47,7 +47,7 @@ - + diff --git a/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs b/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs index 396247cf..1bcc5625 100644 --- a/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs +++ b/Admin.NET/Admin.NET.Core/EventBus/AppEventSubscriber.cs @@ -27,7 +27,7 @@ public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable public async Task CreateExLog(EventHandlerExecutingContext context) { var db = _serviceScope.ServiceProvider.GetRequiredService(); - await db.CopyNew().Insertable((SysLogEx)context.Source.Payload).ExecuteCommandAsync(); + await db.CopyNew().Insertable(context.GetPayload()).ExecuteCommandAsync(); } /// @@ -44,7 +44,7 @@ public class AppEventSubscriber : IEventSubscriber, ISingleton, IDisposable var webTitle = await _serviceScope.ServiceProvider.GetRequiredService().GetConfigValueByCode(ConfigConst.SysWebTitle); var title = $"{webTitle} 系统异常"; - await _serviceScope.ServiceProvider.GetRequiredService().SendEmail(JSON.Serialize(context.Source.Payload), title); + await _serviceScope.ServiceProvider.GetRequiredService().SendEmail(JSON.Serialize(context.GetPayload()), title); } /// diff --git a/Web/index.html b/Web/index.html index 01e58e06..a239e99d 100644 --- a/Web/index.html +++ b/Web/index.html @@ -1,26 +1,25 @@ + + + + + + + + 正在加载中... + - - - - - - - 正在加载中... - - - -
- - - - + - - - \ No newline at end of file + +