diff --git a/Yi.Furion.Net6/Yi.Framework.Infrastructure/Yi.Framework.Infrastructure.csproj b/Yi.Furion.Net6/Yi.Framework.Infrastructure/Yi.Framework.Infrastructure.csproj
index 2bc8a350..dee903e2 100644
--- a/Yi.Furion.Net6/Yi.Framework.Infrastructure/Yi.Framework.Infrastructure.csproj
+++ b/Yi.Furion.Net6/Yi.Framework.Infrastructure/Yi.Framework.Infrastructure.csproj
@@ -8,11 +8,11 @@
-
-
-
+
+
+
-
+
diff --git a/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryService.cs b/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryService.cs
index 380c4cc3..af56dc99 100644
--- a/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryService.cs
+++ b/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryService.cs
@@ -7,11 +7,13 @@ using Yi.Framework.Infrastructure.Ddd.Services;
using Yi.Framework.Module.DictionaryManager.Dtos.Dictionary;
using Yi.Framework.Module.DictionaryManager.Entities;
+
namespace Yi.Framework.Module.DictionaryManager
{
///
/// Dictionary服务实现
///
+ [ApiDescriptionSettings("DictionaryManager")]
public class DictionaryService : CrudAppService,
IDictionaryService,IDynamicApiController,ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryTypeService.cs b/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryTypeService.cs
index c334fb43..d0c9c741 100644
--- a/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryTypeService.cs
+++ b/Yi.Furion.Net6/Yi.Framework.Module/DictionaryManager/DictionaryTypeService.cs
@@ -1,5 +1,6 @@
using Furion.DependencyInjection;
using Furion.DynamicApiController;
+using Microsoft.AspNetCore.Mvc;
using SqlSugar;
using Yi.Framework.Infrastructure.Ddd.Dtos;
using Yi.Framework.Infrastructure.Ddd.Services;
@@ -11,6 +12,7 @@ namespace Yi.Framework.Module.DictionaryManager
///
/// DictionaryType服务实现
///
+ [ApiDescriptionSettings("DictionaryManager")]
public class DictionaryTypeService : CrudAppService,
IDictionaryTypeService, IDynamicApiController, ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Framework.Module/FileManager/FileService.cs b/Yi.Furion.Net6/Yi.Framework.Module/FileManager/FileService.cs
index 8d4fd57d..dc792c63 100644
--- a/Yi.Furion.Net6/Yi.Framework.Module/FileManager/FileService.cs
+++ b/Yi.Furion.Net6/Yi.Framework.Module/FileManager/FileService.cs
@@ -16,6 +16,7 @@ namespace Yi.Framework.Module.FileManager
///
/// 文件处理
///
+ [ApiDescriptionSettings("FileManager")]
public class FileService : ApplicationService, IFileService, IDynamicApiController, ITransient
{
private readonly IRepository _repository;
diff --git a/Yi.Furion.Net6/Yi.Framework.Module/OperLogManager/OperationLogService.cs b/Yi.Furion.Net6/Yi.Framework.Module/OperLogManager/OperationLogService.cs
index c1f20bf4..2c152739 100644
--- a/Yi.Furion.Net6/Yi.Framework.Module/OperLogManager/OperationLogService.cs
+++ b/Yi.Furion.Net6/Yi.Framework.Module/OperLogManager/OperationLogService.cs
@@ -11,6 +11,7 @@ namespace Yi.Framework.Module.OperLogManager
/// OperationLog服务实现
///
//[AppService]
+ [ApiDescriptionSettings("OperLogManager")]
public class OperationLogService : CrudAppService,
IOperationLogService, IDynamicApiController, ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AccessLogService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AccessLogService.cs
index 1a6d1cb8..6ff6549a 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AccessLogService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AccessLogService.cs
@@ -10,6 +10,7 @@ using Yi.Furion.Core.Bbs.Entities;
namespace Yi.Furion.Application.Bbs.Services.Impl
{
+ [ApiDescriptionSettings("BBS")]
public class AccessLogService : IAccessLogService,IDynamicApiController
{
private readonly IRepository _repository;
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AgreeService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AgreeService.cs
index 7591c779..d1779ef2 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AgreeService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/AgreeService.cs
@@ -11,6 +11,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// 点赞功能
///
+ [ApiDescriptionSettings("BBS")]
public class AgreeService : ApplicationService, IApplicationService, IDynamicApiController, ITransient
{
public AgreeService(IRepository repository, IRepository discssRepository, ICurrentUser currentUser)
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs
index 392c833a..56c06a01 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/ArticleService.cs
@@ -13,6 +13,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// Article服务实现
///
+ [ApiDescriptionSettings("BBS")]
public class ArticleService : CrudAppService,
IArticleService, IDynamicApiController, ITransient
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/BannerService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/BannerService.cs
index d6ed6bb4..394ffbfc 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/BannerService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/BannerService.cs
@@ -7,6 +7,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// Banner服务实现
///
+ [ApiDescriptionSettings("BBS")]
public class BannerService : CrudAppService,
IBannerService,IDynamicApiController,ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs
index 542ddf2c..3af40a6d 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/CommentService.cs
@@ -14,6 +14,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// 评论
///
+ [ApiDescriptionSettings("BBS")]
public class CommentService : CrudAppService,
ICommentService, IDynamicApiController, ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs
index 6ac3a6bb..842db2bd 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/DiscussService.cs
@@ -19,6 +19,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// Discuss应用服务实现,用于参数效验、领域服务业务组合、日志记录、事务处理、账户信息
///
+ [ApiDescriptionSettings("BBS")]
public class DiscussService : CrudAppService,
IDiscussService,IDynamicApiController,ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/MyTypeService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/MyTypeService.cs
index 06654991..6c3e94cd 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/MyTypeService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/MyTypeService.cs
@@ -11,6 +11,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// Label服务实现
///
+ [ApiDescriptionSettings("BBS")]
public class MyTypeService : CrudAppService,
ILabelService, IDynamicApiController, ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/PlateService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/PlateService.cs
index ab7800dd..4b3aaf26 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/PlateService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/PlateService.cs
@@ -7,6 +7,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// Plate服务实现
///
+ [ApiDescriptionSettings("BBS")]
public class PlateService : CrudAppService,
IPlateService,IDynamicApiController,ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/SettingService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/SettingService.cs
index 9e9945ac..bdc2198b 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/SettingService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Bbs/Services/Impl/SettingService.cs
@@ -5,6 +5,7 @@ namespace Yi.Furion.Application.Bbs.Services.Impl
///
/// Setting服务实现
///
+ [ApiDescriptionSettings("BBS")]
public class SettingService : ApplicationService,
ISettingService,IDynamicApiController,ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs
index 1faa9396..35b4a570 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/AccountService.cs
@@ -23,6 +23,7 @@ using Yi.Furion.Sqlsugar.Core.Repositories;
namespace Yi.Furion.Application.Rbac.Services.Impl
{
+ [ApiDescriptionSettings("RBAC")]
public class AccountService : ApplicationService, IAccountService, ITransient, IDynamicApiController
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/ConfigService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/ConfigService.cs
index 07b91575..9ac63494 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/ConfigService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/ConfigService.cs
@@ -9,7 +9,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
///
/// Config服务实现
///
-
+ [ApiDescriptionSettings("RBAC")]
public class ConfigService : CrudAppService,
IConfigService,IDynamicApiController,ITransient
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs
index 28f7bc34..51edddf9 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/DeptService.cs
@@ -10,6 +10,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
///
/// Dept服务实现
///
+ [ApiDescriptionSettings("RBAC")]
public class DeptService : CrudAppService,
IDeptService, ITransient, IDynamicApiController
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/LoginLogService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/LoginLogService.cs
index d88e8803..2abff721 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/LoginLogService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/LoginLogService.cs
@@ -6,6 +6,7 @@ using Yi.Furion.Core.Rbac.Entities;
namespace Yi.Furion.Application.Rbac.Services.Impl
{
+ [ApiDescriptionSettings("RBAC")]
public class LoginLogService : CrudAppService,IDynamicApiController,ITransient
{
public override async Task> GetListAsync(LoginLogGetListInputVo input)
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MenuService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MenuService.cs
index a406c617..254dbe00 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MenuService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MenuService.cs
@@ -10,6 +10,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
///
/// Menu服务实现
///
+ [ApiDescriptionSettings("RBAC")]
public class MenuService : CrudAppService,
IMenuService, ITransient, IDynamicApiController
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorCacheService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorCacheService.cs
index a9f67244..26acb5d7 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorCacheService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorCacheService.cs
@@ -12,6 +12,7 @@ using Yi.Furion.Core.Rbac.Dtos.MonitorCache;
namespace Yi.Furion.Application.Rbac.Services.Impl
{
+ [ApiDescriptionSettings("RBAC")]
public class MonitorCacheService : IMonitorCacheService, IDynamicApiController, ITransient
{
private static List monitorCacheNames => new List()
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs
index 07bbc82b..5d296305 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/MonitorServerService.cs
@@ -14,7 +14,7 @@ using Yi.Framework.Infrastructure.Helper;
namespace Yi.Furion.Application.Rbac.Services
{
-
+ [ApiDescriptionSettings("RBAC")]
public class MonitorServerService: IMonitorServerService,IDynamicApiController, ITransient
{
private IWebHostEnvironment _hostEnvironment;
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/OnlineService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/OnlineService.cs
index 6b42cff6..6bb4a03e 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/OnlineService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/OnlineService.cs
@@ -11,6 +11,7 @@ using Yi.Furion.Application.Rbac.SignalRHub.Model;
namespace Yi.Furion.Application.Rbac.Services.Impl
{
+ [ApiDescriptionSettings("RBAC")]
public class OnlineService:IOnlineService,IDynamicApiController,ITransient
{
private ILogger _logger;
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/PostService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/PostService.cs
index 86a068aa..df53039f 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/PostService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/PostService.cs
@@ -9,6 +9,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
///
/// Post服务实现
///
+ [ApiDescriptionSettings("RBAC")]
public class PostService : CrudAppService,
IPostService, ITransient, IDynamicApiController
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/RoleService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/RoleService.cs
index 7156c599..9903e638 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/RoleService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/RoleService.cs
@@ -17,6 +17,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
///
/// Role服务实现
///
+ [ApiDescriptionSettings("RBAC")]
public class RoleService : CrudAppService,
IRoleService, ITransient, IDynamicApiController
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/TaskService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/TaskService.cs
index bf6f4892..e1841ae4 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/TaskService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/TaskService.cs
@@ -12,6 +12,7 @@ using Yi.Furion.Core.Rbac.Dtos.Task;
namespace Yi.Furion.Application.Rbac.Services.Impl
{
+ [ApiDescriptionSettings("RBAC")]
public class TaskService : ApplicationService, ITaskService, IDynamicApiController, ITransient
{
private readonly ISchedulerFactory _schedulerFactory;
diff --git a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs
index ca88a437..2af8dcac 100644
--- a/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Application/Rbac/Services/Impl/UserService.cs
@@ -16,6 +16,7 @@ namespace Yi.Furion.Application.Rbac.Services.Impl
///
/// User服务实现
///
+ [ApiDescriptionSettings("RBAC")]
public class UserService : CrudAppService,
IUserService, ITransient, IDynamicApiController
{
diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs
index 405fd0b1..447ad748 100644
--- a/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs
+++ b/Yi.Furion.Net6/Yi.Furion.Web.Core/Startup.cs
@@ -23,7 +23,8 @@ public class Startup : AppStartup
services.AddCorsAccessor();
- services.AddControllers().AddInjectWithUnifyResult().AddJsonOptions(x => {
+ services.AddControllers().AddInjectWithUnifyResult().AddJsonOptions(x =>
+ {
x.JsonSerializerOptions.Converters.Add(new DateTimeJsonConverter("yyyy-MM-dd HH:mm:ss"));
x.JsonSerializerOptions.Converters.Add(new LongToStringConverter());
});
@@ -37,7 +38,7 @@ public class Startup : AppStartup
{
// 注册作业,并配置作业触发器
//options.AddJob(Triggers.Period(10000));
- options.AddJob(Triggers.Cron("0 0 0,12 ? * ?",CronStringFormat.WithSeconds)); // 表示每天凌晨与12点
+ options.AddJob(Triggers.Cron("0 0 0,12 ? * ?", CronStringFormat.WithSeconds)); // 表示每天凌晨与12点
});
services.AddFileLogging("log/application-{0:yyyy}-{0:MM}-{0:dd}.log", options =>
{
@@ -52,6 +53,8 @@ public class Startup : AppStartup
});
services.AddMonitorLogging();
+
+ services.AddHealthChecks();
}
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
@@ -60,7 +63,7 @@ public class Startup : AppStartup
{
app.UseDeveloperExceptionPage();
}
-
+ app.UseHealthChecks();
app.UseHttpsRedirection();
app.UseRouting();
@@ -71,7 +74,7 @@ public class Startup : AppStartup
app.UseAuthorization();
app.UseInject(string.Empty);
-
+
}
}
diff --git a/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json b/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json
index da697e4d..8d1e4a63 100644
--- a/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json
+++ b/Yi.Furion.Net6/Yi.Furion.Web.Entry/appsettings.json
@@ -14,6 +14,29 @@
"StartUrl": "http://*:19001",
+ //swagger配置
+ "SpecificationDocumentSettings": {
+ "GroupOpenApiInfos": [
+ {
+ "Group": "RBAC",
+ "Order": 100,
+ "Title": "Yi框架-云Api接口",
+ "Description": "集大成者,终究轮子",
+ "Version": "v3.0.0",
+ "TermsOfService": "YI框架:https://ccnetcore.com与Furion:http://furion.baiqian.ltd",
+ "Contact": {
+ "Name": "橙子",
+ "Url": "https://ccnetcore.com",
+ "Email": "454313500@qq.com"
+ },
+ "License": {
+ "Name": "MIT",
+ "Url": "https://gitee.com/ccnetcore/Yi/blob/furion/LICENSE"
+ }
+ }
+ ]
+ },
+
//数据库类型列表
"DbList": [ "Sqlite", "Mysql", "Sqlserver", "Oracle" ],