Browse Source

👕 调整Contracts,Shared层目标框架为netstandard2.1

pull/73/head
王军 4 years ago
parent
commit
872b8dacca
  1. 1
      aspnet-core/Directory.Build.Microsoft.targets
  2. 2
      aspnet-core/frameworks/CAP/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj
  3. 2
      aspnet-core/frameworks/Extensions/src/Lion.AbpPro.Extension/Lion.AbpPro.Extension.csproj
  4. 2
      aspnet-core/gateways/Lion.AbpPro.WebGateway/appsettings.Production.json
  5. 8
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Lion.AbpPro.BasicManagement.Application.Contracts.csproj
  6. 1
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj
  7. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj
  8. 2
      aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj
  9. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj
  10. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj
  11. 2
      aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj
  12. 11
      aspnet-core/modules/FileManagement/host/Lion.AbpPro.FileManagement.HttpApi.Host/appsettings.json
  13. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj
  14. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj
  15. 2
      aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj
  16. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj
  17. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj
  18. 2
      aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj
  19. 11
      aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.Production.json
  20. 13
      aspnet-core/services/host/Lion.AbpPro.HttpApi.Host/appsettings.json
  21. 3
      aspnet-core/services/src/Lion.AbpPro.Application.Contracts/AbpProApplicationContractsModule.cs
  22. 1
      aspnet-core/services/src/Lion.AbpPro.Application.Contracts/GlobalUsings.cs
  23. 3
      aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Lion.AbpPro.Application.Contracts.csproj
  24. 1
      aspnet-core/services/src/Lion.AbpPro.Application/AbpProApplicationModule.cs
  25. 1
      aspnet-core/services/src/Lion.AbpPro.Application/GlobalUsings.cs
  26. 1
      aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj
  27. 2
      aspnet-core/services/src/Lion.AbpPro.DbMigrator/DbMigratorHostedService.cs
  28. 1
      aspnet-core/services/src/Lion.AbpPro.Domain.Shared/AbpProDomainSharedModule.cs
  29. 1
      aspnet-core/services/src/Lion.AbpPro.Domain.Shared/GlobalUsings.cs
  30. 3
      aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj
  31. 5
      aspnet-core/services/src/Lion.AbpPro.Domain/AbpProDomainModule.cs
  32. 2
      aspnet-core/services/src/Lion.AbpPro.Domain/GlobalUsings.cs
  33. 1
      aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj
  34. 4
      aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs
  35. 3
      aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProEntityFrameworkCoreModule.cs
  36. 2
      aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/GlobalUsings.cs
  37. 1
      aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj
  38. 70
      aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.Designer.cs
  39. 41
      aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220909091823_Init.cs
  40. 68
      aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/AbpProDbContextModelSnapshot.cs
  41. 3
      aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/AbpProHttpApiClientModule.cs
  42. 1
      aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/GlobalUsings.cs
  43. 3
      aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/Lion.AbpPro.HttpApi.Client.csproj
  44. 3
      aspnet-core/services/src/Lion.AbpPro.HttpApi/AbpProHttpApiModule.cs
  45. 1
      aspnet-core/services/src/Lion.AbpPro.HttpApi/GlobalUsings.cs
  46. 1
      aspnet-core/services/src/Lion.AbpPro.HttpApi/Lion.AbpPro.HttpApi.csproj
  47. 4
      vben28/.env.production
  48. 20
      vben28/src/router/routes/modules/admin.ts

1
aspnet-core/Directory.Build.Microsoft.targets

@ -18,5 +18,6 @@
<PackageReference Update="Microsoft.Extensions.Http.Polly" Version="6.0.7"/>
<PackageReference Update="Microsoft.EntityFrameworkCore.Abstractions" Version="6.0.7"/>
<PackageReference Update="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.7"/>
<PackageReference Update="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5"/>
</ItemGroup>
</Project>

2
aspnet-core/frameworks/CAP/src/Lion.AbpPro.CAP/Lion.AbpPro.CAP.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Volo.Abp.Core" />

2
aspnet-core/frameworks/Extensions/src/Lion.AbpPro.Extension/Lion.AbpPro.Extension.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyModel" />

2
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": {
},

8
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application.Contracts/Lion.AbpPro.BasicManagement.Application.Contracts.csproj

@ -1,10 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Magicodes.IE.Excel"/>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Core" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.Contracts" />
<PackageReference Include="Volo.Abp.Ddd.Application.Contracts" />
<PackageReference Include="Volo.Abp.Authorization" />
@ -14,7 +16,7 @@
<PackageReference Include="Volo.Abp.TenantManagement.Application.Contracts" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application.Contracts" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" />
<PackageReference Include="Magicodes.IE.Excel.AspNetCore" />
<ProjectReference Include="..\..\..\..\frameworks\Extensions\src\Lion.AbpPro.Extension\Lion.AbpPro.Extension.csproj" />
<ProjectReference Include="..\Lion.AbpPro.BasicManagement.Domain.Shared\Lion.AbpPro.BasicManagement.Domain.Shared.csproj" />
</ItemGroup>

1
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Application/Lion.AbpPro.BasicManagement.Application.csproj

@ -19,6 +19,7 @@
<PackageReference Include="Microsoft.IdentityModel.Tokens" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" />
<PackageReference Include="IdentityModel" />
<PackageReference Include="Magicodes.IE.Excel.AspNetCore" />
<ProjectReference Include="..\Lion.AbpPro.BasicManagement.Application.Contracts\Lion.AbpPro.BasicManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\Lion.AbpPro.BasicManagement.Domain\Lion.AbpPro.BasicManagement.Domain.csproj" />
</ItemGroup>

2
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.Domain.Shared/Lion.AbpPro.BasicManagement.Domain.Shared.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

2
aspnet-core/modules/BasicManagement/src/Lion.AbpPro.BasicManagement.HttpApi.Client/Lion.AbpPro.BasicManagement.HttpApi.Client.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.BasicManagement</RootNamespace>
</PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Application.Contracts/Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.Domain.Shared/Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

2
aspnet-core/modules/DataDictionaryManagement/src/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client/Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.DataDictionaryManagement</RootNamespace>
</PropertyGroup>

11
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"
}
}
}

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Application.Contracts/Lion.AbpPro.FileManagement.Application.Contracts.csproj

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup>

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.Domain.Shared/Lion.AbpPro.FileManagement.Domain.Shared.csproj

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

2
aspnet-core/modules/FileManagement/src/Lion.AbpPro.FileManagement.HttpApi.Client/Lion.AbpPro.FileManagement.HttpApi.Client.csproj

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.FileManagement</RootNamespace>
</PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Application.Contracts/Lion.AbpPro.NotificationManagement.Application.Contracts.csproj

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.Domain.Shared/Lion.AbpPro.NotificationManagement.Domain.Shared.csproj

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>

2
aspnet-core/modules/NotificationManagement/src/Lion.AbpPro.NotificationManagement.HttpApi.Client/Lion.AbpPro.NotificationManagement.HttpApi.Client.csproj

@ -3,7 +3,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro.NotificationManagement</RootNamespace>
</PropertyGroup>

11
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"
}
}
}

13
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"
}
}

3
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
{

1
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;

3
aspnet-core/services/src/Lion.AbpPro.Application.Contracts/Lion.AbpPro.Application.Contracts.csproj

@ -2,14 +2,13 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\modules\BasicManagement\src\Lion.AbpPro.BasicManagement.Application.Contracts\Lion.AbpPro.BasicManagement.Application.Contracts.csproj"/>
<ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\Lion.AbpPro.DataDictionaryManagement.Application.Contracts\Lion.AbpPro.DataDictionaryManagement.Application.Contracts.csproj"/>
<ProjectReference Include="..\..\..\modules\FileManagement\src\Lion.AbpPro.FileManagement.Application.Contracts\Lion.AbpPro.FileManagement.Application.Contracts.csproj"/>
<ProjectReference Include="..\Lion.AbpPro.Domain.Shared\Lion.AbpPro.Domain.Shared.csproj"/>
</ItemGroup>

1
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)
)]

1
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;

1
aspnet-core/services/src/Lion.AbpPro.Application/Lion.AbpPro.Application.csproj

@ -9,7 +9,6 @@
<ItemGroup>
<ProjectReference Include="..\..\..\modules\BasicManagement\src\Lion.AbpPro.BasicManagement.Application\Lion.AbpPro.BasicManagement.Application.csproj" />
<ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\Lion.AbpPro.DataDictionaryManagement.Application\Lion.AbpPro.DataDictionaryManagement.Application.csproj" />
<ProjectReference Include="..\..\..\modules\FileManagement\src\Lion.AbpPro.FileManagement.Application\Lion.AbpPro.FileManagement.Application.csproj" />
<ProjectReference Include="..\..\..\modules\NotificationManagement\src\Lion.AbpPro.NotificationManagement.Application\Lion.AbpPro.NotificationManagement.Application.csproj" />
<ProjectReference Include="..\Lion.AbpPro.Domain\Lion.AbpPro.Domain.csproj" />
<ProjectReference Include="..\Lion.AbpPro.Application.Contracts\Lion.AbpPro.Application.Contracts.csproj" />

2
aspnet-core/services/src/Lion.AbpPro.DbMigrator/DbMigratorHostedService.cs

@ -21,7 +21,7 @@ namespace Lion.AbpPro.DbMigrator
}))
{
await application.InitializeAsync();
var conn = _configuration.GetValue<string>("ConnectionStrings:Default");
await application
.ServiceProvider
.GetRequiredService<AbpProDbMigrationService>()

1
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

1
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;

3
aspnet-core/services/src/Lion.AbpPro.Domain.Shared/Lion.AbpPro.Domain.Shared.csproj

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
</PropertyGroup>
@ -18,7 +18,6 @@
<ProjectReference Include="..\..\..\frameworks\Extensions\src\Lion.AbpPro.Extension\Lion.AbpPro.Extension.csproj" />
<ProjectReference Include="..\..\..\modules\BasicManagement\src\Lion.AbpPro.BasicManagement.Domain.Shared\Lion.AbpPro.BasicManagement.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\Lion.AbpPro.DataDictionaryManagement.Domain.Shared\Lion.AbpPro.DataDictionaryManagement.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\modules\FileManagement\src\Lion.AbpPro.FileManagement.Domain.Shared\Lion.AbpPro.FileManagement.Domain.Shared.csproj" />
<ProjectReference Include="..\..\..\modules\NotificationManagement\src\Lion.AbpPro.NotificationManagement.Domain.Shared\Lion.AbpPro.NotificationManagement.Domain.Shared.csproj" />
</ItemGroup>

5
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
{

2
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;

1
aspnet-core/services/src/Lion.AbpPro.Domain/Lion.AbpPro.Domain.csproj

@ -10,7 +10,6 @@
<ItemGroup>
<ProjectReference Include="..\..\..\modules\BasicManagement\src\Lion.AbpPro.BasicManagement.Domain\Lion.AbpPro.BasicManagement.Domain.csproj" />
<ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\Lion.AbpPro.DataDictionaryManagement.Domain\Lion.AbpPro.DataDictionaryManagement.Domain.csproj" />
<ProjectReference Include="..\..\..\modules\FileManagement\src\Lion.AbpPro.FileManagement.Domain\Lion.AbpPro.FileManagement.Domain.csproj" />
<ProjectReference Include="..\..\..\modules\NotificationManagement\src\Lion.AbpPro.NotificationManagement.Domain\Lion.AbpPro.NotificationManagement.Domain.csproj" />
<ProjectReference Include="..\Lion.AbpPro.Domain.Shared\Lion.AbpPro.Domain.Shared.csproj" />
</ItemGroup>

4
aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/EntityFrameworkCore/AbpProDbContext.cs

@ -15,7 +15,6 @@ namespace Lion.AbpPro.EntityFrameworkCore
[ConnectionStringName("Default")]
public class AbpProDbContext : AbpDbContext<AbpProDbContext>, IAbpProDbContext,
IBasicManagementDbContext,
IFileManagementDbContext,
INotificationManagementDbContext,
IDataDictionaryManagementDbContext
{
@ -32,7 +31,6 @@ namespace Lion.AbpPro.EntityFrameworkCore
public DbSet<TenantConnectionString> TenantConnectionStrings { get; set; }
public DbSet<BackgroundJobRecord> BackgroundJobs { get; set; }
public DbSet<AuditLog> AuditLogs { get; set; }
public DbSet<Lion.AbpPro.FileManagement.Files.File> Files { get; set; }
public DbSet<Notification> Notifications { get; set; }
public DbSet<DataDictionary> DataDictionary { get; set; }
@ -65,8 +63,6 @@ namespace Lion.AbpPro.EntityFrameworkCore
// 消息通知
builder.ConfigureNotificationManagement();
// 文件管理
builder.ConfigureFileManagement();
}

3
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
{

2
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;

1
aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Lion.AbpPro.EntityFrameworkCore.csproj

@ -9,7 +9,6 @@
<ItemGroup>
<ProjectReference Include="..\..\..\modules\BasicManagement\src\Lion.AbpPro.BasicManagement.EntityFrameworkCore\Lion.AbpPro.BasicManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore\Lion.AbpPro.DataDictionaryManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\FileManagement\src\Lion.AbpPro.FileManagement.EntityFrameworkCore\Lion.AbpPro.FileManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\modules\NotificationManagement\src\Lion.AbpPro.NotificationManagement.EntityFrameworkCore\Lion.AbpPro.NotificationManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\Lion.AbpPro.Domain\Lion.AbpPro.Domain.csproj" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.MySQL" />

70
aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.Designer.cs → 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<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Code")
@ -96,7 +95,6 @@ namespace Lion.AbpPro.Migrations
modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionaryDetail", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Code")
@ -140,74 +138,9 @@ namespace Lion.AbpPro.Migrations
b.ToTable("DataDictionaryDetail", (string)null);
});
modelBuilder.Entity("Lion.AbpPro.FileManagement.Files.File", b =>
{
b.Property<Guid>("Id")
.HasColumnType("char(36)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("char(36)")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("char(36)")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime(6)")
.HasColumnName("DeletionTime");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<string>("FileName")
.HasColumnType("varchar(255)");
b.Property<string>("FilePath")
.HasColumnType("longtext");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
b.Property<Guid?>("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<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("ConcurrencyStamp")
@ -277,7 +210,6 @@ namespace Lion.AbpPro.Migrations
modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.NotificationSubscription", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<DateTime>("CreationTime")

41
aspnet-core/services/src/Lion.AbpPro.EntityFrameworkCore/Migrations/20220816093900_Init.cs → 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<Guid>(type: "char(36)", nullable: false, collation: "ascii_general_ci"),
TenantId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
FileName = table.Column<string>(type: "varchar(255)", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
FilePath = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
ExtraProperties = table.Column<string>(type: "longtext", nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
ConcurrencyStamp = table.Column<string>(type: "varchar(40)", maxLength: 40, nullable: true)
.Annotation("MySql:CharSet", "utf8mb4"),
CreationTime = table.Column<DateTime>(type: "datetime(6)", nullable: false),
CreatorId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
LastModificationTime = table.Column<DateTime>(type: "datetime(6)", nullable: true),
LastModifierId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
IsDeleted = table.Column<bool>(type: "tinyint(1)", nullable: false, defaultValue: false),
DeleterId = table.Column<Guid>(type: "char(36)", nullable: true, collation: "ascii_general_ci"),
DeletionTime = table.Column<DateTime>(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");

68
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<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Code")
@ -94,7 +93,6 @@ namespace Lion.AbpPro.Migrations
modelBuilder.Entity("Lion.AbpPro.DataDictionaryManagement.DataDictionaries.Aggregates.DataDictionaryDetail", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("Code")
@ -138,74 +136,9 @@ namespace Lion.AbpPro.Migrations
b.ToTable("DataDictionaryDetail", (string)null);
});
modelBuilder.Entity("Lion.AbpPro.FileManagement.Files.File", b =>
{
b.Property<Guid>("Id")
.HasColumnType("char(36)");
b.Property<string>("ConcurrencyStamp")
.IsConcurrencyToken()
.HasMaxLength(40)
.HasColumnType("varchar(40)")
.HasColumnName("ConcurrencyStamp");
b.Property<DateTime>("CreationTime")
.HasColumnType("datetime(6)")
.HasColumnName("CreationTime");
b.Property<Guid?>("CreatorId")
.HasColumnType("char(36)")
.HasColumnName("CreatorId");
b.Property<Guid?>("DeleterId")
.HasColumnType("char(36)")
.HasColumnName("DeleterId");
b.Property<DateTime?>("DeletionTime")
.HasColumnType("datetime(6)")
.HasColumnName("DeletionTime");
b.Property<string>("ExtraProperties")
.HasColumnType("longtext")
.HasColumnName("ExtraProperties");
b.Property<string>("FileName")
.HasColumnType("varchar(255)");
b.Property<string>("FilePath")
.HasColumnType("longtext");
b.Property<bool>("IsDeleted")
.ValueGeneratedOnAdd()
.HasColumnType("tinyint(1)")
.HasDefaultValue(false)
.HasColumnName("IsDeleted");
b.Property<DateTime?>("LastModificationTime")
.HasColumnType("datetime(6)")
.HasColumnName("LastModificationTime");
b.Property<Guid?>("LastModifierId")
.HasColumnType("char(36)")
.HasColumnName("LastModifierId");
b.Property<Guid?>("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<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<string>("ConcurrencyStamp")
@ -275,7 +208,6 @@ namespace Lion.AbpPro.Migrations
modelBuilder.Entity("Lion.AbpPro.NotificationManagement.Notifications.Aggregates.NotificationSubscription", b =>
{
b.Property<Guid>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("char(36)");
b.Property<DateTime>("CreationTime")

3
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
{

1
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;

3
aspnet-core/services/src/Lion.AbpPro.HttpApi.Client/Lion.AbpPro.HttpApi.Client.csproj

@ -3,14 +3,13 @@
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>netstandard2.1</TargetFramework>
<RootNamespace>Lion.AbpPro</RootNamespace>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\modules\BasicManagement\src\Lion.AbpPro.BasicManagement.HttpApi.Client\Lion.AbpPro.BasicManagement.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\Lion.AbpPro.DataDictionaryManagement.HttpApi.Client\Lion.AbpPro.DataDictionaryManagement.HttpApi.Client.csproj" />
<ProjectReference Include="..\..\..\modules\FileManagement\src\Lion.AbpPro.FileManagement.HttpApi.Client\Lion.AbpPro.FileManagement.HttpApi.Client.csproj" />
<ProjectReference Include="..\Lion.AbpPro.Application.Contracts\Lion.AbpPro.Application.Contracts.csproj" />
</ItemGroup>

3
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
{

1
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;

1
aspnet-core/services/src/Lion.AbpPro.HttpApi/Lion.AbpPro.HttpApi.csproj

@ -10,7 +10,6 @@
<ItemGroup>
<ProjectReference Include="..\..\..\modules\BasicManagement\src\Lion.AbpPro.BasicManagement.HttpApi\Lion.AbpPro.BasicManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\..\modules\DataDictionaryManagement\src\Lion.AbpPro.DataDictionaryManagement.HttpApi\Lion.AbpPro.DataDictionaryManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\..\modules\FileManagement\src\Lion.AbpPro.FileManagement.HttpApi\Lion.AbpPro.FileManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\..\modules\NotificationManagement\src\Lion.AbpPro.NotificationManagement.HttpApi\Lion.AbpPro.NotificationManagement.HttpApi.csproj" />
<ProjectReference Include="..\Lion.AbpPro.Application.Contracts\Lion.AbpPro.Application.Contracts.csproj" />
</ItemGroup>

4
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

20
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',
// },
// },
],
};

Loading…
Cancel
Save