diff --git a/Yi.Framework.Net6/Yi.Framework.sln b/Yi.Framework.Net6/Yi.Framework.sln
index 182280d5..8dfb69a5 100644
--- a/Yi.Framework.Net6/Yi.Framework.sln
+++ b/Yi.Framework.Net6/Yi.Framework.sln
@@ -95,7 +95,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Version.cs = Version.cs
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.OperLog", "src\module\Yi.Framework.OperLog\Yi.Framework.OperLog.csproj", "{8A604A6B-D1FA-4CFF-BCF5-557519B10FCB}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.OperLogManager", "src\module\Yi.Framework.OperLogManager\Yi.Framework.OperLogManager.csproj", "{8A604A6B-D1FA-4CFF-BCF5-557519B10FCB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yi.Framework.FileManager", "src\module\Yi.Framework.FileManager\Yi.Framework.FileManager.csproj", "{1BF3115D-B027-4805-AF7B-41B3AE9CB355}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -251,6 +253,10 @@ Global
{8A604A6B-D1FA-4CFF-BCF5-557519B10FCB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8A604A6B-D1FA-4CFF-BCF5-557519B10FCB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8A604A6B-D1FA-4CFF-BCF5-557519B10FCB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1BF3115D-B027-4805-AF7B-41B3AE9CB355}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1BF3115D-B027-4805-AF7B-41B3AE9CB355}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1BF3115D-B027-4805-AF7B-41B3AE9CB355}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1BF3115D-B027-4805-AF7B-41B3AE9CB355}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -296,6 +302,7 @@ Global
{60E54034-792C-4A90-BCDF-4D5FFB45089E} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806}
{FC559052-36EC-4379-B447-298FAD6045F4} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806}
{8A604A6B-D1FA-4CFF-BCF5-557519B10FCB} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806}
+ {1BF3115D-B027-4805-AF7B-41B3AE9CB355} = {EEF5F221-0E32-4A3D-B647-B4B5E7305806}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {6C1A3808-0F4F-43FB-A9FE-5F27A3BB2ECF}
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/Yi.Framework.FileManager.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/Yi.Framework.FileManager.csproj
new file mode 100644
index 00000000..4317b5b8
--- /dev/null
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/Yi.Framework.FileManager.csproj
@@ -0,0 +1,13 @@
+
+
+
+ net6.0
+ enable
+ enable
+
+
+
+
+
+
+
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/YiFrameworkFileManagerModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/YiFrameworkFileManagerModule.cs
new file mode 100644
index 00000000..371a8b6a
--- /dev/null
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.FileManager/YiFrameworkFileManagerModule.cs
@@ -0,0 +1,7 @@
+namespace Yi.Framework.FileManager
+{
+ public class YiFrameworkFileManagerModule
+ {
+
+ }
+}
\ No newline at end of file
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/GlobalOperLogAttribute.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/GlobalOperLogAttribute.cs
similarity index 98%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/GlobalOperLogAttribute.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/GlobalOperLogAttribute.cs
index c1460a6f..97ce9b78 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/GlobalOperLogAttribute.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/GlobalOperLogAttribute.cs
@@ -14,7 +14,7 @@ using Yi.Framework.Core.Helper;
using Yi.Framework.Ddd.Repositories;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
public class GlobalOperLogAttribute : ActionFilterAttribute
{
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/IOperationLogService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/IOperationLogService.cs
similarity index 90%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/IOperationLogService.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/IOperationLogService.cs
index 3a17ed0f..ccb3019b 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/IOperationLogService.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/IOperationLogService.cs
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Ddd.Services.Abstract;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
///
/// OperationLog服务抽象
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperEnum.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperEnum.cs
similarity index 90%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperEnum.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperEnum.cs
index 9aa024d3..1c8d0a13 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperEnum.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperEnum.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
public enum OperEnum
{
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperLogAttribute.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperLogAttribute.cs
similarity index 96%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperLogAttribute.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperLogAttribute.cs
index 5b1102b5..d9d3e4b9 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperLogAttribute.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperLogAttribute.cs
@@ -4,7 +4,7 @@ using System.Linq;
using System.Text;
using System.Threading.Tasks;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
[AttributeUsage(AttributeTargets.Method)]
public class OperLogAttribute : Attribute
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogEntity.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogEntity.cs
similarity index 98%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogEntity.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogEntity.cs
index defd5de9..4ae76ca9 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogEntity.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogEntity.cs
@@ -6,7 +6,7 @@ using SqlSugar;
using Yi.Framework.Data.Auditing;
using Yi.Framework.Ddd.Entities;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
///
/// 操作日志表
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogGetListInputVo.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogGetListInputVo.cs
similarity index 89%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogGetListInputVo.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogGetListInputVo.cs
index 3c1def75..7fecb292 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogGetListInputVo.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogGetListInputVo.cs
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Ddd.Dtos;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
public class OperationLogGetListInputVo : PagedAllResultRequestDto
{
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogGetListOutputDto.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogGetListOutputDto.cs
similarity index 95%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogGetListOutputDto.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogGetListOutputDto.cs
index 1e3191b6..11af25a2 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogGetListOutputDto.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogGetListOutputDto.cs
@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using Yi.Framework.Ddd.Dtos;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
public class OperationLogGetListOutputDto : IEntityDto
{
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogService.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogService.cs
similarity index 97%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogService.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogService.cs
index 8c92681b..5dab47fb 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/OperationLogService.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/OperationLogService.cs
@@ -5,7 +5,7 @@ using Yi.Framework.Core.Attributes;
using Microsoft.AspNetCore.Mvc;
using SqlSugar;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
///
/// OperationLog服务实现
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/Yi.Framework.OperLog.csproj b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/Yi.Framework.OperLogManager.csproj
similarity index 100%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/Yi.Framework.OperLog.csproj
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/Yi.Framework.OperLogManager.csproj
diff --git a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/YiFrameworkOperLogModule.cs b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/YiFrameworkOperLogManagerModule.cs
similarity index 62%
rename from Yi.Framework.Net6/src/module/Yi.Framework.OperLog/YiFrameworkOperLogModule.cs
rename to Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/YiFrameworkOperLogManagerModule.cs
index ee0db3bc..973f80e5 100644
--- a/Yi.Framework.Net6/src/module/Yi.Framework.OperLog/YiFrameworkOperLogModule.cs
+++ b/Yi.Framework.Net6/src/module/Yi.Framework.OperLogManager/YiFrameworkOperLogManagerModule.cs
@@ -4,10 +4,10 @@ using StartupModules;
using Yi.Framework.Core;
using Yi.Framework.Core.Attributes;
-namespace Yi.Framework.OperLog
+namespace Yi.Framework.OperLogManager
{
[DependsOn(typeof(YiFrameworkCoreModule))]
- public class YiFrameworkOperLogModule : IStartupModule
+ public class YiFrameworkOperLogManagerModule : IStartupModule
{
public void Configure(IApplicationBuilder app, ConfigureMiddlewareContext context)
{
@@ -18,6 +18,13 @@ namespace Yi.Framework.OperLog
services.AddControllers(options => {
options.Filters.Add();
});
+ services.AddAutoApiService(opt =>
+ {
+ //NETServiceTest所在程序集添加进动态api配置
+ opt.CreateConventional(typeof(YiFrameworkOperLogManagerModule).Assembly, option => option.RootPath = string.Empty);
+
+ });
+
services.AddSingleton();
}
}
diff --git a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs
index f7417fd2..93d27737 100644
--- a/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs
+++ b/Yi.Framework.Net6/src/project/BBS/Yi.BBS.Web/YiBBSWebModule.cs
@@ -10,7 +10,7 @@ using Yi.Framework.Core.Autofac;
using Yi.RBAC.Application;
using Yi.Framework.AspNetCore;
using Yi.Framework.Data.Json;
-using Yi.Framework.OperLog;
+using Yi.Framework.OperLogManager;
namespace Yi.BBS.Web
{
@@ -32,8 +32,6 @@ namespace Yi.BBS.Web
{
//NETServiceTest所在程序集添加进动态api配置
opt.CreateConventional(typeof(YiBBSApplicationModule).Assembly, option => option.RootPath = string.Empty);
- opt.CreateConventional(typeof(YiRBACApplicationModule).Assembly, option => option.RootPath = string.Empty);
- opt.CreateConventional(typeof(YiFrameworkOperLogModule).Assembly, option => option.RootPath = string.Empty);
});
//添加swagger
diff --git a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs
index f7417fd2..93d27737 100644
--- a/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs
+++ b/Yi.Framework.Net6/src/project/bbs/Yi.BBS.Web/YiBBSWebModule.cs
@@ -10,7 +10,7 @@ using Yi.Framework.Core.Autofac;
using Yi.RBAC.Application;
using Yi.Framework.AspNetCore;
using Yi.Framework.Data.Json;
-using Yi.Framework.OperLog;
+using Yi.Framework.OperLogManager;
namespace Yi.BBS.Web
{
@@ -32,8 +32,6 @@ namespace Yi.BBS.Web
{
//NETServiceTest所在程序集添加进动态api配置
opt.CreateConventional(typeof(YiBBSApplicationModule).Assembly, option => option.RootPath = string.Empty);
- opt.CreateConventional(typeof(YiRBACApplicationModule).Assembly, option => option.RootPath = string.Empty);
- opt.CreateConventional(typeof(YiFrameworkOperLogModule).Assembly, option => option.RootPath = string.Empty);
});
//添加swagger
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj
index 3eb4861c..e4000629 100644
--- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/Yi.RBAC.Domain.csproj
@@ -17,7 +17,7 @@
-
+
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs
index 40ecf429..06869cdb 100644
--- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Domain/YiRBACDomainModule.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
using Yi.Framework.Core.Attributes;
using Yi.Framework.Data;
using Yi.Framework.EventBus;
-using Yi.Framework.OperLog;
+using Yi.Framework.OperLogManager;
using Yi.Framework.ThumbnailSharp;
using Yi.RBAC.Domain.Logs;
using Yi.RBAC.Domain.Shared;
@@ -22,7 +22,7 @@ namespace Yi.RBAC.Domain
typeof(YiFrameworkDataModule),
typeof(YiFrameworkThumbnailSharpModule),
typeof(YiFrameworkEventBusModule),
- typeof(YiFrameworkOperLogModule)
+ typeof(YiFrameworkOperLogManagerModule)
)]
public class YiRBACDomainModule : IStartupModule
{
diff --git a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs
index 275e2fd7..59fcbaad 100644
--- a/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs
+++ b/Yi.Framework.Net6/src/project/rbac/Yi.RBAC.Web/YiRBACWebModule.cs
@@ -7,7 +7,7 @@ using Yi.Framework.Core;
using Yi.Framework.Core.Attributes;
using Yi.Framework.Core.Autofac;
using Yi.Framework.Data.Json;
-using Yi.Framework.OperLog;
+using Yi.Framework.OperLogManager;
using Yi.RBAC.Application;
using Yi.RBAC.Sqlsugar;
@@ -33,7 +33,7 @@ namespace Yi.RBAC.Web
{
//NETServiceTest所在程序集添加进动态api配置
opt.CreateConventional(typeof(YiRBACApplicationModule).Assembly, option => option.RootPath = string.Empty);
- opt.CreateConventional(typeof(YiFrameworkOperLogModule).Assembly, option => option.RootPath = string.Empty);
+
});
//添加swagger