diff --git a/Directory.Build.JiShe.targets b/Directory.Build.JiShe.targets index c8305ca..f5174ca 100644 --- a/Directory.Build.JiShe.targets +++ b/Directory.Build.JiShe.targets @@ -69,6 +69,15 @@ + + + + + + + + + diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs index 0ff2bbf..a61b982 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.Configure.cs @@ -1,6 +1,9 @@ using Hangfire.Redis.StackExchange; +using JiShe.ServicePro.Core; using Medallion.Threading; using Medallion.Threading.Redis; +using Volo.Abp.BlobStoring; +using Volo.Abp.BlobStoring.FileSystem; namespace JiShe.IoT; @@ -271,4 +274,34 @@ public partial class IoTHttpApiHostModule return new RedisDistributedSynchronizationProvider(connection.GetDatabase()); }); } + + + /// + /// 配置 文件管理的 blob设置，默认使用本地文件系统 + /// + private void ConfigureBlobStorage() + { + Configure(options => + { + options.Containers.ConfigureDefault(container => + { + container.UseFileSystem(fileSystem => + { + string[] filePathArray = new string[] { + Environment.CurrentDirectory, + "UploadFile", + DateTime.Now.Date.ToString("yyyyMMdd") + }; + string filePath = Path.Combine(filePathArray); + + //检查文件夹是否存在 + if (!System.IO.Directory.Exists(filePath)) + { + System.IO.Directory.CreateDirectory(filePath); + } + fileSystem.BasePath = filePath; + }); + }); + }); + } } \ No newline at end of file diff --git a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs index c2aa509..18fdd13 100644 --- a/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs +++ b/host/JiShe.IoT.HttpApi.Host/IoTHttpApiHostModule.cs @@ -1,3 +1,5 @@ +using Volo.Abp.BlobStoring.FileSystem; + namespace JiShe.IoT { [DependsOn( @@ -13,6 +15,7 @@ namespace JiShe.IoT // typeof(AbpProCapEntityFrameworkCoreModule), typeof(AbpAspNetCoreMvcUiBasicThemeModule), typeof(AbpCachingStackExchangeRedisModule), + typeof(AbpBlobStoringFileSystemModule), typeof(AbpDistributedLockingModule) //typeof(AbpBackgroundJobsHangfireModule) )] @@ -39,7 +42,7 @@ namespace JiShe.IoT ConfigureAuditLog(context); ConfigurationSignalR(context); ConfigurationMultiTenancy(); - + ConfigureBlobStorage(); } public override void OnApplicationInitialization(ApplicationInitializationContext context) diff --git a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj index 7891fd6..d461817 100644 --- a/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj +++ b/host/JiShe.IoT.HttpApi.Host/JiShe.IoT.HttpApi.Host.csproj @@ -1,4 +1,4 @@ - + @@ -42,7 +42,8 @@ - + + diff --git a/host/JiShe.IoT.HttpApi.Host/UploadFile/20250527/host/abp-file-management/3a1a2465-af54-6f30-0714-9c00c778dea3 b/host/JiShe.IoT.HttpApi.Host/UploadFile/20250527/host/abp-file-management/3a1a2465-af54-6f30-0714-9c00c778dea3 new file mode 100644 index 0000000..6283fd8 Binary files /dev/null and b/host/JiShe.IoT.HttpApi.Host/UploadFile/20250527/host/abp-file-management/3a1a2465-af54-6f30-0714-9c00c778dea3 differ diff --git a/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json b/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json index a3ea4b9..667d801 100644 --- a/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json +++ b/host/JiShe.IoT.HttpApi.Host/appsettings.Development.json @@ -10,19 +10,19 @@ }, "Hangfire": { "Redis": { - "Host": "192.168.5.9:6380,password=1q2w3e!@#", + "Host": "47.110.60.222:6379,password=3JBGfyhTaD46nS", "DB": "2" } }, "Redis": { - "Configuration": "192.168.5.9:6380,password=1q2w3e!@#,defaultdatabase=5" + "Configuration": "47.110.60.222:6379,password=3JBGfyhTaD46nS,defaultdatabase=5" }, "Kafka": { - "BootstrapServers": "192.168.5.9:29092,192.168.5.9:39092,192.168.5.9:49092", + "BootstrapServers": "47.110.62.104:9092,47.110.53.196:9092,47.110.60.222:9092", "EnableFilter": true, - "EnableAuthorization": false, + "EnableAuthorization": true, "SaslUserName": "lixiao", - "SaslPassword": "lixiao1980", + "SaslPassword": "lixiao@1980", "KafkaReplicationFactor": 3, "NumPartitions": 30, "TaskThreadCount": -1, @@ -52,7 +52,7 @@ } }, "FreeRedisOptions": { - "ConnectionString": "192.168.5.9:6380,password=1q2w3e!@#,defaultdatabase=1", + "ConnectionString": "47.110.60.222:6379,password=3JBGfyhTaD46nS,defaultdatabase=1", "UseDistributedCache": true }, "FreeSqlProviderOptions": { diff --git a/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs b/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs index 6c6650f..6f34544 100644 --- a/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs +++ b/src/JiShe.IoT.Application.Contracts/IoTApplicationContractsModule.cs @@ -1,5 +1,5 @@ -using JiShe.ServicePro.CodeManagement; using JiShe.ServicePro.DynamicMenuManagement; +using JiShe.ServicePro.FileManagement; using JiShe.ServicePro.TemplateManagement; namespace JiShe.IoT @@ -11,8 +11,8 @@ namespace JiShe.IoT typeof(NotificationManagementApplicationContractsModule), typeof(DataDictionaryManagementApplicationContractsModule), typeof(LanguageManagementApplicationContractsModule), - typeof(CodeManagementApplicationContractsModule), typeof(TemplateManagementApplicationContractsModule), + typeof(FileManagementApplicationContractsModule), typeof(DynamicMenuManagementApplicationContractsModule) )] public class IoTApplicationContractsModule : AbpModule diff --git a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj index 3661f41..9456405 100644 --- a/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj +++ b/src/JiShe.IoT.Application.Contracts/JiShe.IoT.Application.Contracts.csproj @@ -1,4 +1,4 @@ - + net9.0 @@ -18,8 +18,9 @@ - - - + + + + \ No newline at end of file diff --git a/src/JiShe.IoT.Application/IoTApplicationModule.cs b/src/JiShe.IoT.Application/IoTApplicationModule.cs index 923a45c..dd7b35f 100644 --- a/src/JiShe.IoT.Application/IoTApplicationModule.cs +++ b/src/JiShe.IoT.Application/IoTApplicationModule.cs @@ -1,5 +1,5 @@ -using JiShe.ServicePro.CodeManagement; using JiShe.ServicePro.DynamicMenuManagement; +using JiShe.ServicePro.FileManagement; using JiShe.ServicePro.FreeRedisProvider; using JiShe.ServicePro.FreeSqlProvider; using JiShe.ServicePro.TemplateManagement; @@ -13,9 +13,9 @@ namespace JiShe.IoT typeof(NotificationManagementApplicationModule), typeof(DataDictionaryManagementApplicationModule), typeof(LanguageManagementApplicationModule), - typeof(CodeManagementApplicationModule), typeof(TemplateManagementApplicationModule), typeof(DynamicMenuManagementApplicationModule), + typeof(FileManagementApplicationModule), typeof(FreeRedisProviderModule) )] public class IoTApplicationModule : AbpModule diff --git a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj index 42ae8f0..0181f96 100644 --- a/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj +++ b/src/JiShe.IoT.Application/JiShe.IoT.Application.csproj @@ -16,9 +16,9 @@ - + diff --git a/src/JiShe.IoT.DbMigrator/appsettings.json b/src/JiShe.IoT.DbMigrator/appsettings.json index e531a8c..7fb7161 100644 --- a/src/JiShe.IoT.DbMigrator/appsettings.json +++ b/src/JiShe.IoT.DbMigrator/appsettings.json @@ -1,5 +1,5 @@ { "ConnectionStrings": { - "Default": "Data Source=118.190.144.92;Port=33306;Database=JiS;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;" + "Default": "Data Source=118.190.144.92;Port=33306;Database=JiSheIoTProDB;uid=root;pwd=admin123;charset=utf8mb4;Allow User Variables=true;AllowLoadLocalInfile=true;" } } \ No newline at end of file diff --git a/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs b/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs index 1e8fcd4..478bad6 100644 --- a/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs +++ b/src/JiShe.IoT.Domain.Shared/IoTDomainSharedModule.cs @@ -1,5 +1,5 @@ -using JiShe.ServicePro.CodeManagement; using JiShe.ServicePro.DynamicMenuManagement; +using JiShe.ServicePro.FileManagement; using JiShe.ServicePro.FreeSqlProvider; using JiShe.ServicePro.TemplateManagement; @@ -10,9 +10,9 @@ namespace JiShe.IoT typeof(NotificationManagementDomainSharedModule), typeof(DataDictionaryManagementDomainSharedModule), typeof(LanguageManagementDomainSharedModule), - typeof(CodeManagementDomainSharedModule), typeof(TemplateManagementDomainSharedModule), typeof(DynamicMenuManagementDomainSharedModule), + typeof(FileManagementDomainSharedModule), typeof(AbpFreeSqlProviderModule), typeof(ServiceProCoreModule) )] diff --git a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj index ef8c214..04a0d59 100644 --- a/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj +++ b/src/JiShe.IoT.Domain.Shared/JiShe.IoT.Domain.Shared.csproj @@ -17,9 +17,10 @@ - - + + + \ No newline at end of file diff --git a/src/JiShe.IoT.Domain/IoTDomainModule.cs b/src/JiShe.IoT.Domain/IoTDomainModule.cs index 866e1b1..9cea670 100644 --- a/src/JiShe.IoT.Domain/IoTDomainModule.cs +++ b/src/JiShe.IoT.Domain/IoTDomainModule.cs @@ -1,5 +1,5 @@ -using JiShe.ServicePro.CodeManagement; using JiShe.ServicePro.DynamicMenuManagement; +using JiShe.ServicePro.FileManagement; using JiShe.ServicePro.TemplateManagement; namespace JiShe.IoT @@ -10,8 +10,8 @@ namespace JiShe.IoT typeof(NotificationManagementDomainModule), typeof(DataDictionaryManagementDomainModule), typeof(LanguageManagementDomainModule), - typeof(CodeManagementDomainModule), typeof(TemplateManagementDomainModule), + typeof(FileManagementDomainModule), typeof(DynamicMenuManagementDomainModule) )] public class IoTDomainModule : AbpModule diff --git a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj index 57a1269..b0d1af7 100644 --- a/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj +++ b/src/JiShe.IoT.Domain/JiShe.IoT.Domain.csproj @@ -1,4 +1,4 @@ - + net9.0 JiShe.IoT @@ -13,10 +13,10 @@ - - + + - + \ No newline at end of file diff --git a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs index 5cdf840..06adeae 100644 --- a/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs +++ b/src/JiShe.IoT.EntityFrameworkCore/EntityFrameworkCore/IoTDbContext.cs @@ -1,12 +1,8 @@ -using JiShe.ServicePro.BasicManagement.UserRefreshTokens; -using JiShe.ServicePro.CodeManagement.DataTypes.Aggregates; -using JiShe.ServicePro.CodeManagement.EntityFrameworkCore; -using JiShe.ServicePro.CodeManagement.EntityModels.Aggregates; -using JiShe.ServicePro.CodeManagement.EnumTypes.Aggregates; -using JiShe.ServicePro.CodeManagement.Projects.Aggregates; -using JiShe.ServicePro.CodeManagement.Templates.Aggregates; +using JiShe.ServicePro.BasicManagement.UserRefreshTokens; using JiShe.ServicePro.DynamicMenuManagement.EntityFrameworkCore; using JiShe.ServicePro.DynamicMenuManagement.Menus; +using JiShe.ServicePro.FileManagement.EntityFrameworkCore; +using JiShe.ServicePro.FileManagement.Files; using JiShe.ServicePro.TemplateManagement.EntityFrameworkCore; using JiShe.ServicePro.TemplateManagement.TextTemplates; @@ -18,7 +14,6 @@ namespace JiShe.IoT.EntityFrameworkCore INotificationManagementDbContext, IDataDictionaryManagementDbContext, ILanguageManagementDbContext, - ICodeManagementDbContext, ITemplateManagementDbContext, IDynamicMenuManagementDbContext { @@ -47,20 +42,16 @@ namespace JiShe.IoT.EntityFrameworkCore public DbSet DataDictionaries { get; set; } public DbSet Languages { get; set; } public DbSet LanguageTexts { get; set; } - - public DbSet