feat: 同步

2023-09-15 18:05:59 +08:00
parent a271bc25c6
commit a0b35f4233
28 changed files with 61 additions and 10 deletions
--- 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 @@

 	<ItemGroup>

-		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.41" />
-		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.41" />
-		<PackageReference Include="Furion.Pure" Version="4.8.7.45" />
+		<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.8.43" />
+		<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.8.43" />
+		<PackageReference Include="Furion.Pure" Version="4.8.8.43" />

-		<PackageReference Include="SqlSugarCore" Version="5.1.4.67-preview06" />
+		<PackageReference Include="SqlSugarCore" Version="5.1.4.106-preview28" />
 		<PackageReference Include="IPTools.China" Version="1.6.0" />
 	</ItemGroup>

--- 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
 {
    /// <summary>
    /// Dictionary服务实现
    /// </summary>
+    [ApiDescriptionSettings("DictionaryManager")]
    public class DictionaryService : CrudAppService<DictionaryEntity, DictionaryGetOutputDto, DictionaryGetListOutputDto, long, DictionaryGetListInputVo, DictionaryCreateInputVo, DictionaryUpdateInputVo>,
       IDictionaryService,IDynamicApiController,ITransient
    {
--- 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
    /// <summary>
    /// DictionaryType服务实现
    /// </summary>
+    [ApiDescriptionSettings("DictionaryManager")]
    public class DictionaryTypeService : CrudAppService<DictionaryTypeEntity, DictionaryTypeGetOutputDto, DictionaryTypeGetListOutputDto, long, DictionaryTypeGetListInputVo, DictionaryTypeCreateInputVo, DictionaryTypeUpdateInputVo>,
       IDictionaryTypeService, IDynamicApiController, ITransient
    {
--- 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
    /// <summary>
    /// 文件处理
    /// </summary>
+    [ApiDescriptionSettings("FileManager")]
    public class FileService : ApplicationService, IFileService, IDynamicApiController, ITransient
    {
        private readonly IRepository<FileEntity> _repository;
--- 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服务实现
    /// </summary>
    //[AppService]
+    [ApiDescriptionSettings("OperLogManager")]
    public class OperationLogService : CrudAppService<OperationLogEntity, OperationLogGetListOutputDto, long, OperationLogGetListInputVo>,
       IOperationLogService, IDynamicApiController, ITransient
    {
--- 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<AccessLogEntity> _repository;
--- 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
    /// <summary>
    /// 点赞功能
    /// </summary>
+    [ApiDescriptionSettings("BBS")]
    public class AgreeService : ApplicationService, IApplicationService, IDynamicApiController, ITransient
    {
        public AgreeService(IRepository<AgreeEntity> repository, IRepository<DiscussEntity> discssRepository, ICurrentUser currentUser)
--- 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
    /// <summary>
    /// Article服务实现
    /// </summary>
+    [ApiDescriptionSettings("BBS")]

    public class ArticleService : CrudAppService<ArticleEntity, ArticleGetOutputDto, ArticleGetListOutputDto, long, ArticleGetListInputVo, ArticleCreateInputVo, ArticleUpdateInputVo>,
       IArticleService, IDynamicApiController, ITransient
--- 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
    /// <summary>
    /// Banner服务实现
    /// </summary>
+    [ApiDescriptionSettings("BBS")]
    public class BannerService : CrudAppService<BannerEntity, BannerGetOutputDto, BannerGetListOutputDto, long, BannerGetListInputVo, BannerCreateInputVo, BannerUpdateInputVo>,
       IBannerService,IDynamicApiController,ITransient
    {
--- 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
    /// <summary>
    /// 评论
    /// </summary>
+    [ApiDescriptionSettings("BBS")]
    public class CommentService : CrudAppService<CommentEntity, CommentGetOutputDto, CommentGetListOutputDto, long, CommentGetListInputVo, CommentCreateInputVo, CommentUpdateInputVo>,
       ICommentService, IDynamicApiController, ITransient
    {
--- 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
    /// <summary>
    /// Discuss应用服务实现,用于参数效验、领域服务业务组合、日志记录、事务处理、账户信息
    /// </summary>
+    [ApiDescriptionSettings("BBS")]
    public class DiscussService : CrudAppService<DiscussEntity, DiscussGetOutputDto, DiscussGetListOutputDto, long, DiscussGetListInputVo, DiscussCreateInputVo, DiscussUpdateInputVo>,
       IDiscussService,IDynamicApiController,ITransient
    {
--- 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
    /// <summary>
    /// Label服务实现
    /// </summary>
+    [ApiDescriptionSettings("BBS")]
    public class MyTypeService : CrudAppService<MyTypeEntity, MyTypeOutputDto, MyTypeGetListOutputDto, long, MyTypeGetListInputVo, MyTypeCreateInputVo, MyTypeUpdateInputVo>,
       ILabelService, IDynamicApiController, ITransient
    {
--- 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
    /// <summary>
    /// Plate服务实现
    /// </summary>
+    [ApiDescriptionSettings("BBS")]
    public class PlateService : CrudAppService<PlateEntity, PlateGetOutputDto, PlateGetListOutputDto, long, PlateGetListInputVo, PlateCreateInputVo, PlateUpdateInputVo>,
       IPlateService,IDynamicApiController,ITransient
    {
--- 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
    /// <summary>
    /// Setting服务实现
    /// </summary>
+    [ApiDescriptionSettings("BBS")]
    public class SettingService : ApplicationService,
       ISettingService,IDynamicApiController,ITransient
    {
--- 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
    {

--- 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
    /// <summary>
    /// Config服务实现
    /// </summary>
-
+    [ApiDescriptionSettings("RBAC")]
    public class ConfigService : CrudAppService<ConfigEntity, ConfigGetOutputDto, ConfigGetListOutputDto, long, ConfigGetListInputVo, ConfigCreateInputVo, ConfigUpdateInputVo>,
       IConfigService,IDynamicApiController,ITransient
    {
--- 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
    /// <summary>
    /// Dept服务实现
    /// </summary>
+    [ApiDescriptionSettings("RBAC")]
    public class DeptService : CrudAppService<DeptEntity, DeptGetOutputDto, DeptGetListOutputDto, long, DeptGetListInputVo, DeptCreateInputVo, DeptUpdateInputVo>,
       IDeptService, ITransient, IDynamicApiController
    {
--- 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<LoginLogEntity, LoginLogGetListOutputDto, long, LoginLogGetListInputVo>,IDynamicApiController,ITransient
    {
        public override async Task<PagedResultDto<LoginLogGetListOutputDto>> GetListAsync(LoginLogGetListInputVo input)
--- 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
    /// <summary>
    /// Menu服务实现
    /// </summary>
+    [ApiDescriptionSettings("RBAC")]
    public class MenuService : CrudAppService<MenuEntity, MenuGetOutputDto, MenuGetListOutputDto, long, MenuGetListInputVo, MenuCreateInputVo, MenuUpdateInputVo>,
       IMenuService, ITransient, IDynamicApiController
    {
--- 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<MonitorCacheNameGetListOutputDto> monitorCacheNames => new List<MonitorCacheNameGetListOutputDto>()
--- 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;
--- 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<OnlineService> _logger;
--- 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
    /// <summary>
    /// Post服务实现
    /// </summary>
+    [ApiDescriptionSettings("RBAC")]
    public class PostService : CrudAppService<PostEntity, PostGetOutputDto, PostGetListOutputDto, long, PostGetListInputVo, PostCreateInputVo, PostUpdateInputVo>,
       IPostService, ITransient, IDynamicApiController
    {
--- 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
    /// <summary>
    /// Role服务实现
    /// </summary>
+    [ApiDescriptionSettings("RBAC")]
    public class RoleService : CrudAppService<RoleEntity, RoleGetOutputDto, RoleGetListOutputDto, long, RoleGetListInputVo, RoleCreateInputVo, RoleUpdateInputVo>,
       IRoleService, ITransient, IDynamicApiController
    {
--- 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;
--- 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
    /// <summary>
    /// User服务实现
    /// </summary>
+    [ApiDescriptionSettings("RBAC")]
    public class UserService : CrudAppService<UserEntity, UserGetOutputDto, UserGetListOutputDto, long, UserGetListInputVo, UserCreateInputVo, UserUpdateInputVo>,
       IUserService, ITransient, IDynamicApiController
    {
--- 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<TestJob>(Triggers.Period(10000));
-            options.AddJob<SystemDataJob>(Triggers.Cron("0 0 0,12 ? * ?",CronStringFormat.WithSeconds)); // 表示每天凌晨与12点
+            options.AddJob<SystemDataJob>(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);
-      
+
    }
 }

--- 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" ],