From 872b8dacca07f8f7559c0f35ae802a50e84029d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=86=9B?= <510423039@qq.com> Date: Fri, 9 Sep 2022 20:53:09 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=95=20=E8=B0=83=E6=95=B4Contracts?= =?UTF-8?q?=EF=BC=8CShared=E5=B1=82=E7=9B=AE=E6=A0=87=E6=A1=86=E6=9E=B6?= =?UTF-8?q?=E4=B8=BAnetstandard2.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- aspnet-core/Directory.Build.Microsoft.targets | 1 + .../Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj | 2 +- .../Lion.AbpPro.Extension.csproj | 2 +- .../appsettings.Production.json | 2 +- ...sicManagement.Application.Contracts.csproj | 8 ++- ....AbpPro.BasicManagement.Application.csproj | 1 + ...bpPro.BasicManagement.Domain.Shared.csproj | 2 +- ...pPro.BasicManagement.HttpApi.Client.csproj | 2 +- ...aryManagement.Application.Contracts.csproj | 2 +- ...aDictionaryManagement.Domain.Shared.csproj | 2 +- ...DictionaryManagement.HttpApi.Client.csproj | 2 +- .../appsettings.json | 11 +-- ...ileManagement.Application.Contracts.csproj | 2 +- ...AbpPro.FileManagement.Domain.Shared.csproj | 2 +- ...bpPro.FileManagement.HttpApi.Client.csproj | 2 +- ...ionManagement.Application.Contracts.csproj | 2 +- ...otificationManagement.Domain.Shared.csproj | 2 +- ...tificationManagement.HttpApi.Client.csproj | 2 +- .../appsettings.Production.json | 11 --- .../Lion.AbpPro.HttpApi.Host/appsettings.json | 13 +--- .../AbpProApplicationContractsModule.cs | 3 +- .../GlobalUsings.cs | 1 - .../Lion.AbpPro.Application.Contracts.csproj | 3 +- .../AbpProApplicationModule.cs | 1 - .../Lion.AbpPro.Application/GlobalUsings.cs | 1 - .../Lion.AbpPro.Application.csproj | 1 - .../DbMigratorHostedService.cs | 2 +- .../AbpProDomainSharedModule.cs | 1 - .../Lion.AbpPro.Domain.Shared/GlobalUsings.cs | 1 - .../Lion.AbpPro.Domain.Shared.csproj | 3 +- .../Lion.AbpPro.Domain/AbpProDomainModule.cs | 5 +- .../src/Lion.AbpPro.Domain/GlobalUsings.cs | 2 +- .../Lion.AbpPro.Domain.csproj | 1 - .../EntityFrameworkCore/AbpProDbContext.cs | 4 -- .../AbpProEntityFrameworkCoreModule.cs | 3 +- .../GlobalUsings.cs | 2 - .../Lion.AbpPro.EntityFrameworkCore.csproj | 1 - ...ner.cs => 20220909091823_Init.Designer.cs} | 70 +------------------ ...6093900_Init.cs => 20220909091823_Init.cs} | 41 ----------- .../AbpProDbContextModelSnapshot.cs | 68 ------------------ .../AbpProHttpApiClientModule.cs | 3 +- .../GlobalUsings.cs | 1 - .../Lion.AbpPro.HttpApi.Client.csproj | 3 +- .../AbpProHttpApiModule.cs | 3 +- .../src/Lion.AbpPro.HttpApi/GlobalUsings.cs | 1 - .../Lion.AbpPro.HttpApi.csproj | 1 - vben28/.env.production | 4 +- vben28/src/router/routes/modules/admin.ts | 20 +++--- 48 files changed, 51 insertions(+), 272 deletions(-) rename aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/{20220816093900_Init.Designer.cs => 20220909091823_Init.Designer.cs} (95%) rename aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/{20220816093900_Init.cs => 20220909091823_Init.cs} (96%) diff --git a/aspnet-core/Directory.Build.Microsoft.targets b/aspnet-core/Directory.Build.Microsoft.targets index d0a0e0e7..8f24d1c5 100644 --- a/aspnet-core/Directory.Build.Microsoft.targets +++ b/aspnet-core/Directory.Build.Microsoft.targets @@ -18,5 +18,6 @@ + \ No newline at end of file diff --git a/aspnet-core/frameworks/CAP/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj b/aspnet-core/frameworks/CAP/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj index d9f7844c..e5655f73 100644 --- a/aspnet-core/frameworks/CAP/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj +++ b/aspnet-core/frameworks/CAP/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 diff --git a/aspnet-core/frameworks/Extensions/src/Lion.AbpPro.Extension/Lion.AbpPro.Extension.csproj b/aspnet-core/frameworks/Extensions/src/Lion.AbpPro.Extension/Lion.AbpPro.Extension.csproj index affbea12..ab7c6771 100644 --- a/aspnet-core/frameworks/Extensions/src/Lion.AbpPro.Extension/Lion.AbpPro.Extension.csproj +++ b/aspnet-core/frameworks/Extensions/src/Lion.AbpPro.Extension/Lion.AbpPro.Extension.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 diff --git a/aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Production.json b/aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Production.json index a11d0236..cc6a82e1 100644 --- a/aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Production.json +++ b/aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Production.json @@ -9,7 +9,7 @@ "AllowedHosts": "*", "App": { "SelfUrl": "http://localhost:44314", - "CorsOrigins": "http://120.24.194.14:8012,http://localhost:4200,http://localhost:80" + "CorsOrigins": "http://*:*,https://*,http://*,http://localhost,http://116.205.176.173" }, "GlobalConfiguration": { }, diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Lion.AbpPro.BasicManagement.Application.Contracts.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Lion.AbpPro.BasicManagement.Application.Contracts.csproj index c15d3abb..529f875e 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Lion.AbpPro.BasicManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Lion.AbpPro.BasicManagement.Application.Contracts.csproj @@ -1,10 +1,12 @@ - + - net6.0 + netstandard2.1 Lion.AbpPro.BasicManagement + + @@ -14,7 +16,7 @@ - + diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj index be652333..69be1ccf 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj @@ -19,6 +19,7 @@ + diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj index 5ab9be30..d87e7295 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.BasicManagement true diff --git a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj index d6f31dad..280d34b9 100644 --- a/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.BasicManagement diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj index 1dacca4d..214b8e28 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.DataDictionaryManagement diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj index 0d27c860..4cac065d 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.DataDictionaryManagement true diff --git a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj index f822c360..48ffcc02 100644 --- a/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj @@ -1,7 +1,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.DataDictionaryManagement diff --git a/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/appsettings.json b/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/appsettings.json index 8b9c4f55..538fa4dd 100644 --- a/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/appsettings.json +++ b/aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/appsettings.json @@ -10,12 +10,13 @@ }, "AliYun": { "OSS": { - "AccessKeyId": "LTAI5tLkt3vvScGPVZ5qKJDc", - "AccessKeySecret": "BixV8vP5uPrbsdwjYzzsEXOPjkxPST", + // https://help.aliyun.com/document_detail/100624.html + "AccessKeyId": "AccessKeyId", + "AccessKeySecret": "AccessKeySecret", "Endpoint": "oss-cn-shenzhen.aliyuncs.com", - "ContainerName": "lion-abp-pro", - "RegionId": "oss-cn-shenzhen", - "RoleArn": "acs:ram::1846393972471789:role/ramosstest" + "ContainerName": "ContainerName", + "RegionId": "RegionId", + "RoleArn": "RoleArn" } } } \ No newline at end of file diff --git a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj index 3b1e4802..0acca856 100644 --- a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj @@ -2,7 +2,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.FileManagement diff --git a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj index 7a8490ef..11348083 100644 --- a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj @@ -2,7 +2,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.FileManagement true diff --git a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj index a4c4e4d1..34017086 100644 --- a/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.FileManagement diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj index 5b851014..63045eeb 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj @@ -3,7 +3,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.NotificationManagement diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj index 1f4f4b4f..41165cfb 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj @@ -3,7 +3,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.NotificationManagement true diff --git a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj index 27e4ea06..73e12480 100644 --- a/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj +++ b/aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj @@ -3,7 +3,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro.NotificationManagement diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json index 2078d998..55dbf9e1 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json @@ -66,16 +66,5 @@ "Enabled": false, "Host": "http://localhost:8500", "Service": "Project-Service" - }, - "AliYun": { - "OSS": { - // https://help.aliyun.com/document_detail/100624.html - "AccessKeyId": "AccessKeyId", - "AccessKeySecret": "AccessKeySecret", - "Endpoint": "oss-cn-shenzhen.aliyuncs.com", - "ContainerName": "ContainerName", - "RegionId": "RegionId", - "RoleArn": "RoleArn" - } } } \ No newline at end of file diff --git a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json index d8ec2914..10e6fb94 100644 --- a/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json +++ b/aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json @@ -64,17 +64,6 @@ "Consul": { "Enabled": false, "Host": "http://localhost:8500", - "Service": "Project-Service" - }, - "AliYun": { - "OSS": { - // https://help.aliyun.com/document_detail/100624.html - "AccessKeyId": "AccessKeyId", - "AccessKeySecret": "AccessKeySecret", - "Endpoint": "oss-cn-shenzhen.aliyuncs.com", - "ContainerName": "ContainerName", - "RegionId": "RegionId", - "RoleArn": "RoleArn" - } + "Service": "LionAbpPro-Service" } } \ No newline at end of file diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs index f937f72a..ec286633 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs @@ -6,8 +6,7 @@ namespace Lion.AbpPro typeof(AbpProDomainSharedModule), typeof(AbpObjectExtendingModule), typeof(BasicManagementApplicationContractsModule), - typeof(DataDictionaryManagementApplicationContractsModule), - typeof(FileManagementApplicationContractsModule) + typeof(DataDictionaryManagementApplicationContractsModule) )] public class AbpProApplicationContractsModule : AbpModule { diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs index ecf29b0a..dd1c25a3 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs @@ -4,7 +4,6 @@ global using System; global using System.Threading.Tasks; global using Lion.AbpPro.DataDictionaryManagement; global using Lion.AbpPro.Extension.Customs.Dtos; -global using Lion.AbpPro.FileManagement; global using Volo.Abp.Application.Services; global using Volo.Abp.Authorization.Permissions; global using Volo.Abp.DependencyInjection; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Lion.AbpPro.Application.Contracts.csproj b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Lion.AbpPro.Application.Contracts.csproj index f4d62686..3dd0a502 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Lion.AbpPro.Application.Contracts.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Lion.AbpPro.Application.Contracts.csproj @@ -2,14 +2,13 @@ - net6.0 + netstandard2.1 Lion.AbpPro - diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs b/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs index 2463a8a9..39371f62 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs @@ -6,7 +6,6 @@ namespace Lion.AbpPro typeof(BasicManagementApplicationModule), typeof(DataDictionaryManagementApplicationModule), typeof(NotificationManagementApplicationModule), - typeof(FileManagementApplicationModule), typeof(AbpProFreeSqlModule), typeof(AbpBackgroundJobsHangfireModule) )] diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs index 240c7428..b78b13ca 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs @@ -11,7 +11,6 @@ global using Lion.AbpPro.ElasticSearches.Dto; global using Lion.AbpPro.ElasticSearches.Providers; global using Lion.AbpPro.Extension.Customs.Dtos; global using Lion.AbpPro.Extension.System; -global using Lion.AbpPro.FileManagement; global using Lion.AbpPro.FreeSqlRepository; global using Lion.AbpPro.NotificationManagement; global using Lion.AbpPro.Permissions; diff --git a/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj b/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj index e38958e8..5f196931 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj @@ -9,7 +9,6 @@ - diff --git a/aspnet-core/services/src/Lion.AbpPro.DbMigrator/DbMigratorHostedService.cs b/aspnet-core/services/src/Lion.AbpPro.DbMigrator/DbMigratorHostedService.cs index 6c25e6c6..ea2e6345 100644 --- a/aspnet-core/services/src/Lion.AbpPro.DbMigrator/DbMigratorHostedService.cs +++ b/aspnet-core/services/src/Lion.AbpPro.DbMigrator/DbMigratorHostedService.cs @@ -21,7 +21,7 @@ namespace Lion.AbpPro.DbMigrator })) { await application.InitializeAsync(); - + var conn = _configuration.GetValue("ConnectionStrings:Default"); await application .ServiceProvider .GetRequiredService() diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs index 465d4b30..7f990d96 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs @@ -6,7 +6,6 @@ namespace Lion.AbpPro [DependsOn( typeof(BasicManagementDomainSharedModule), typeof(DataDictionaryManagementDomainSharedModule), - typeof(FileManagementDomainSharedModule), typeof(NotificationManagementDomainSharedModule) )] public class AbpProDomainSharedModule : AbpModule diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/GlobalUsings.cs index 35bce39a..f64fddaf 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/GlobalUsings.cs @@ -8,7 +8,6 @@ global using System.Reflection; global using System.Text; global using System.Threading.Tasks; global using Lion.AbpPro.DataDictionaryManagement; -global using Lion.AbpPro.FileManagement; global using Lion.AbpPro.NotificationManagement; global using Microsoft.Extensions.DependencyInjection; global using Microsoft.Extensions.Localization; diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj index b7771d0a..e8a3a31b 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj @@ -2,7 +2,7 @@ - net6.0 + netstandard2.1 Lion.AbpPro true @@ -18,7 +18,6 @@ - diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs index 4e60ac48..fbfbd2b5 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs @@ -1,13 +1,10 @@ -using Lion.AbpPro.BasicManagement; - namespace Lion.AbpPro { [DependsOn( typeof(AbpProDomainSharedModule), typeof(BasicManagementDomainModule), typeof(DataDictionaryManagementDomainModule), - typeof(NotificationManagementDomainModule), - typeof(FileManagementDomainModule) + typeof(NotificationManagementDomainModule) )] public class AbpProDomainModule : AbpModule { diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs index 2bde8b19..64b0bef0 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs @@ -7,8 +7,8 @@ global using System.IO; global using System.Linq; global using System.Runtime.InteropServices; global using System.Threading.Tasks; +global using Lion.AbpPro.BasicManagement; global using Lion.AbpPro.DataDictionaryManagement; -global using Lion.AbpPro.FileManagement; global using Lion.AbpPro.MultiTenancy; global using Lion.AbpPro.NotificationManagement; global using Lion.AbpPro.Users.Dto; diff --git a/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj b/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj index 4bb29551..94190fc7 100644 --- a/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj @@ -10,7 +10,6 @@ - diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs index 4dec7617..d7aaaf56 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs @@ -15,7 +15,6 @@ namespace Lion.AbpPro.EntityFrameworkCore [ConnectionStringName("Default")] public class AbpProDbContext : AbpDbContext, IAbpProDbContext, IBasicManagementDbContext, - IFileManagementDbContext, INotificationManagementDbContext, IDataDictionaryManagementDbContext { @@ -32,7 +31,6 @@ namespace Lion.AbpPro.EntityFrameworkCore public DbSet TenantConnectionStrings { get; set; } public DbSet BackgroundJobs { get; set; } public DbSet AuditLogs { get; set; } - public DbSet Files { get; set; } public DbSet Notifications { get; set; } public DbSet DataDictionary { get; set; } @@ -65,8 +63,6 @@ namespace Lion.AbpPro.EntityFrameworkCore // 消息通知 builder.ConfigureNotificationManagement(); - // 文件管理 - builder.ConfigureFileManagement(); } diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProEntityFrameworkCoreModule.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProEntityFrameworkCoreModule.cs index db923437..71d9839b 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProEntityFrameworkCoreModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProEntityFrameworkCoreModule.cs @@ -5,8 +5,7 @@ namespace Lion.AbpPro.EntityFrameworkCore typeof(BasicManagementEntityFrameworkCoreModule), typeof(AbpEntityFrameworkCoreMySQLModule), typeof(DataDictionaryManagementEntityFrameworkCoreModule), - typeof(NotificationManagementEntityFrameworkCoreModule), - typeof(FileManagementEntityFrameworkCoreModule) + typeof(NotificationManagementEntityFrameworkCoreModule) )] public class AbpProEntityFrameworkCoreModule : AbpModule { diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/GlobalUsings.cs index bfbd1e21..cea92b3e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/GlobalUsings.cs @@ -10,8 +10,6 @@ global using Lion.AbpPro.BasicManagement.EntityFrameworkCore; global using Lion.AbpPro.Data; global using Lion.AbpPro.DataDictionaryManagement; global using Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore; -global using Lion.AbpPro.FileManagement.EntityFrameworkCore; -global using Lion.AbpPro.FileManagement.Files; global using Lion.AbpPro.NotificationManagement; global using Lion.AbpPro.NotificationManagement.EntityFrameworkCore; global using Lion.AbpPro.Users; diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj index fdcdaa53..0a54b877 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj @@ -9,7 +9,6 @@ - diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.Designer.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.Designer.cs similarity index 95% rename from aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.Designer.cs rename to aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.Designer.cs index 07bf02e4..dee21bdc 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.Designer.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.Designer.cs @@ -12,7 +12,7 @@ using Volo.Abp.EntityFrameworkCore; namespace Lion.AbpPro.Migrations { [DbContext(typeof(AbpProDbContext))] - [Migration("20220816093900_Init")] + [Migration("20220909091823_Init")] partial class Init { protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -26,7 +26,6 @@ namespace Lion.AbpPro.Migrations modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionary", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Code") @@ -96,7 +95,6 @@ namespace Lion.AbpPro.Migrations modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionaryDetail", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Code") @@ -140,74 +138,9 @@ namespace Lion.AbpPro.Migrations b.ToTable("DataDictionaryDetail", (string)null); }); - modelBuilder.Entity("Lion.AbpPro.FileManagement.Files.File", b => - { - b.Property("Id") - .HasColumnType("char(36)"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasMaxLength(40) - .HasColumnType("varchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnType("datetime(6)") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("char(36)") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("char(36)") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime(6)") - .HasColumnName("DeletionTime"); - - b.Property("ExtraProperties") - .HasColumnType("longtext") - .HasColumnName("ExtraProperties"); - - b.Property("FileName") - .HasColumnType("varchar(255)"); - - b.Property("FilePath") - .HasColumnType("longtext"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("tinyint(1)") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime(6)") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("char(36)") - .HasColumnName("LastModifierId"); - - b.Property("TenantId") - .HasColumnType("char(36)") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("CreationTime"); - - b.HasIndex("FileName"); - - b.ToTable("File", (string)null); - }); - modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.Notification", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -277,7 +210,6 @@ namespace Lion.AbpPro.Migrations modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.NotificationSubscription", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("CreationTime") diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.cs similarity index 96% rename from aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.cs rename to aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.cs index 7aca8e12..d47b629e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.cs @@ -391,34 +391,6 @@ namespace Lion.AbpPro.Migrations }) .Annotation("MySql:CharSet", "utf8mb4"); - migrationBuilder.CreateTable( - name: "File", - columns: table => new - { - Id = table.Column(type: "char(36)", nullable: false, collation: "ascii_general_ci"), - TenantId = table.Column(type: "char(36)", nullable: true, collation: "ascii_general_ci"), - FileName = table.Column(type: "varchar(255)", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - FilePath = table.Column(type: "longtext", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - ExtraProperties = table.Column(type: "longtext", nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - ConcurrencyStamp = table.Column(type: "varchar(40)", maxLength: 40, nullable: true) - .Annotation("MySql:CharSet", "utf8mb4"), - CreationTime = table.Column(type: "datetime(6)", nullable: false), - CreatorId = table.Column(type: "char(36)", nullable: true, collation: "ascii_general_ci"), - LastModificationTime = table.Column(type: "datetime(6)", nullable: true), - LastModifierId = table.Column(type: "char(36)", nullable: true, collation: "ascii_general_ci"), - IsDeleted = table.Column(type: "tinyint(1)", nullable: false, defaultValue: false), - DeleterId = table.Column(type: "char(36)", nullable: true, collation: "ascii_general_ci"), - DeletionTime = table.Column(type: "datetime(6)", nullable: true) - }, - constraints: table => - { - table.PrimaryKey("PK_File", x => x.Id); - }) - .Annotation("MySql:CharSet", "utf8mb4"); - migrationBuilder.CreateTable( name: "Notification", columns: table => new @@ -956,16 +928,6 @@ namespace Lion.AbpPro.Migrations table: "DataDictionaryDetail", column: "DataDictionaryId"); - migrationBuilder.CreateIndex( - name: "IX_File_CreationTime", - table: "File", - column: "CreationTime"); - - migrationBuilder.CreateIndex( - name: "IX_File_FileName", - table: "File", - column: "FileName"); - migrationBuilder.CreateIndex( name: "IX_NotificationSubscription_NotificationId", table: "NotificationSubscription", @@ -1028,9 +990,6 @@ namespace Lion.AbpPro.Migrations migrationBuilder.DropTable( name: "DataDictionaryDetail"); - migrationBuilder.DropTable( - name: "File"); - migrationBuilder.DropTable( name: "NotificationSubscription"); diff --git a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs index 0fa02ffd..e379627e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs +++ b/aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs @@ -24,7 +24,6 @@ namespace Lion.AbpPro.Migrations modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionary", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Code") @@ -94,7 +93,6 @@ namespace Lion.AbpPro.Migrations modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionaryDetail", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("Code") @@ -138,74 +136,9 @@ namespace Lion.AbpPro.Migrations b.ToTable("DataDictionaryDetail", (string)null); }); - modelBuilder.Entity("Lion.AbpPro.FileManagement.Files.File", b => - { - b.Property("Id") - .HasColumnType("char(36)"); - - b.Property("ConcurrencyStamp") - .IsConcurrencyToken() - .HasMaxLength(40) - .HasColumnType("varchar(40)") - .HasColumnName("ConcurrencyStamp"); - - b.Property("CreationTime") - .HasColumnType("datetime(6)") - .HasColumnName("CreationTime"); - - b.Property("CreatorId") - .HasColumnType("char(36)") - .HasColumnName("CreatorId"); - - b.Property("DeleterId") - .HasColumnType("char(36)") - .HasColumnName("DeleterId"); - - b.Property("DeletionTime") - .HasColumnType("datetime(6)") - .HasColumnName("DeletionTime"); - - b.Property("ExtraProperties") - .HasColumnType("longtext") - .HasColumnName("ExtraProperties"); - - b.Property("FileName") - .HasColumnType("varchar(255)"); - - b.Property("FilePath") - .HasColumnType("longtext"); - - b.Property("IsDeleted") - .ValueGeneratedOnAdd() - .HasColumnType("tinyint(1)") - .HasDefaultValue(false) - .HasColumnName("IsDeleted"); - - b.Property("LastModificationTime") - .HasColumnType("datetime(6)") - .HasColumnName("LastModificationTime"); - - b.Property("LastModifierId") - .HasColumnType("char(36)") - .HasColumnName("LastModifierId"); - - b.Property("TenantId") - .HasColumnType("char(36)") - .HasColumnName("TenantId"); - - b.HasKey("Id"); - - b.HasIndex("CreationTime"); - - b.HasIndex("FileName"); - - b.ToTable("File", (string)null); - }); - modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.Notification", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("ConcurrencyStamp") @@ -275,7 +208,6 @@ namespace Lion.AbpPro.Migrations modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.NotificationSubscription", b => { b.Property("Id") - .ValueGeneratedOnAdd() .HasColumnType("char(36)"); b.Property("CreationTime") diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/AbpProHttpApiClientModule.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/AbpProHttpApiClientModule.cs index c43bd1ef..75bfed42 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/AbpProHttpApiClientModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/AbpProHttpApiClientModule.cs @@ -5,8 +5,7 @@ namespace Lion.AbpPro [DependsOn( typeof(AbpProApplicationContractsModule), typeof(BasicManagementHttpApiClientModule), - typeof(DataDictionaryManagementHttpApiClientModule), - typeof(FileManagementHttpApiClientModule) + typeof(DataDictionaryManagementHttpApiClientModule) )] public class AbpProHttpApiClientModule : AbpModule { diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/GlobalUsings.cs index b008f754..5a2ec99e 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/GlobalUsings.cs @@ -1,7 +1,6 @@ // Global using directives global using Lion.AbpPro.DataDictionaryManagement; -global using Lion.AbpPro.FileManagement; global using Microsoft.Extensions.DependencyInjection; global using Volo.Abp.Account; global using Volo.Abp.FeatureManagement; diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/Lion.AbpPro.HttpApi.Client.csproj b/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/Lion.AbpPro.HttpApi.Client.csproj index 75977d26..95edd9df 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/Lion.AbpPro.HttpApi.Client.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/Lion.AbpPro.HttpApi.Client.csproj @@ -3,14 +3,13 @@ - net6.0 + netstandard2.1 Lion.AbpPro - diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/AbpProHttpApiModule.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi/AbpProHttpApiModule.cs index e8c8b401..819a13ff 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/AbpProHttpApiModule.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/AbpProHttpApiModule.cs @@ -6,8 +6,7 @@ namespace Lion.AbpPro typeof(AbpProApplicationContractsModule), typeof(BasicManagementHttpApiModule), typeof(DataDictionaryManagementHttpApiModule), - typeof(NotificationManagementHttpApiModule), - typeof(FileManagementHttpApiModule) + typeof(NotificationManagementHttpApiModule) )] public class AbpProHttpApiModule : AbpModule { diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/GlobalUsings.cs b/aspnet-core/services/src/Lion.AbpPro.HttpApi/GlobalUsings.cs index 89e16125..5d61f705 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/GlobalUsings.cs +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/GlobalUsings.cs @@ -4,7 +4,6 @@ global using Lion.AbpPro.DataDictionaryManagement; global using Lion.AbpPro.ElasticSearches; global using Lion.AbpPro.ElasticSearches.Dto; global using Lion.AbpPro.Extension.Customs.Dtos; -global using Lion.AbpPro.FileManagement; global using Lion.AbpPro.NotificationManagement; global using Localization.Resources.AbpUi; global using Microsoft.AspNetCore.Mvc; diff --git a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Lion.AbpPro.HttpApi.csproj b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Lion.AbpPro.HttpApi.csproj index 8aa967af..2a1f7475 100644 --- a/aspnet-core/services/src/Lion.AbpPro.HttpApi/Lion.AbpPro.HttpApi.csproj +++ b/aspnet-core/services/src/Lion.AbpPro.HttpApi/Lion.AbpPro.HttpApi.csproj @@ -10,7 +10,6 @@ - diff --git a/vben28/.env.production b/vben28/.env.production index f98cd49d..aa9d740d 100644 --- a/vben28/.env.production +++ b/vben28/.env.production @@ -36,8 +36,8 @@ VITE_LEGACY = false # 接口地址 -VITE_API_URL= http://abp.cncore.club:8080 +VITE_API_URL= http://116.205.176.173:8080 # WEBSOCKE 地址 -VITE_WEBSOCKE_URL= http://abp.cncore.club:8080 +VITE_WEBSOCKE_URL= http://116.205.176.173:8080 diff --git a/vben28/src/router/routes/modules/admin.ts b/vben28/src/router/routes/modules/admin.ts index 627bc959..f72756c3 100644 --- a/vben28/src/router/routes/modules/admin.ts +++ b/vben28/src/router/routes/modules/admin.ts @@ -84,16 +84,16 @@ const admin: AppRouteModule = { policy: 'AbpIdentity.DataDictionaryManagement', }, }, - { - path: 'files', - name: 'files', - component: () => import('/@/views/admin/files/File.vue'), - meta: { - title: t('routes.admin.fileNameManagement'), - icon: 'ant-design:snippets-outlined', - policy: 'AbpIdentity.FileManagement', - }, - }, + // { + // path: 'files', + // name: 'files', + // component: () => import('/@/views/admin/files/File.vue'), + // meta: { + // title: t('routes.admin.fileNameManagement'), + // icon: 'ant-design:snippets-outlined', + // policy: 'AbpIdentity.FileManagement', + // }, + // }, ], };