Solution structure adjustment

EasyAbp · Apr 9, 2020 · 1e9abec · 1e9abec
1 parent 13f0bc2
commit 1e9abec
Show file tree

Hide file tree

Showing 61 changed files with 25 additions and 17 deletions.
diff --git a/common.props b/common.props
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
     <LangVersion>latest</LangVersion>
-    <Version>0.1.2</Version>
+    <Version>0.1.3</Version>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>EasyAbp Team</Authors>

diff --git a/...appManagement.Application.Contracts/EasyAbp.UniappManagement.Application.Contracts.csproj b/...appManagement.Application.Contracts/EasyAbp.UniappManagement.Application.Contracts.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ManagementPermissionDefinitionProvider.cs → ...ManagementPermissionDefinitionProvider.cs b/...ManagementPermissionDefinitionProvider.cs → ...ManagementPermissionDefinitionProvider.cs
diff --git a/...horization/UniappManagementPermissions.cs → ...horization/UniappManagementPermissions.cs b/...horization/UniappManagementPermissions.cs → ...horization/UniappManagementPermissions.cs
diff --git a/...ppManagementApplicationContractsModule.cs → ...ppManagementApplicationContractsModule.cs b/...ppManagementApplicationContractsModule.cs → ...ppManagementApplicationContractsModule.cs
diff --git a/...ions/Dtos/CreateUpdateUniappVersionDto.cs → ...ions/Dtos/CreateUpdateUniappVersionDto.cs b/...ions/Dtos/CreateUpdateUniappVersionDto.cs → ...ions/Dtos/CreateUpdateUniappVersionDto.cs
diff --git a/...s/UniappVersions/Dtos/UniappVersionDto.cs → ...t/UniappVersions/Dtos/UniappVersionDto.cs b/...s/UniappVersions/Dtos/UniappVersionDto.cs → ...t/UniappVersions/Dtos/UniappVersionDto.cs
diff --git a/...pVersions/Dtos/UniappVersionGetListDto.cs → ...pVersions/Dtos/UniappVersionGetListDto.cs b/...pVersions/Dtos/UniappVersionGetListDto.cs → ...pVersions/Dtos/UniappVersionGetListDto.cs
diff --git a/...niappVersions/IUniappVersionAppService.cs → ...niappVersions/IUniappVersionAppService.cs b/...niappVersions/IUniappVersionAppService.cs → ...niappVersions/IUniappVersionAppService.cs
diff --git a/...cts/Uniapps/Dtos/CreateUpdateUniappDto.cs → ...ent/Uniapps/Dtos/CreateUpdateUniappDto.cs b/...cts/Uniapps/Dtos/CreateUpdateUniappDto.cs → ...ent/Uniapps/Dtos/CreateUpdateUniappDto.cs
diff --git a/...ation.Contracts/Uniapps/Dtos/UniappDto.cs → ...niappManagement/Uniapps/Dtos/UniappDto.cs b/...ation.Contracts/Uniapps/Dtos/UniappDto.cs → ...niappManagement/Uniapps/Dtos/UniappDto.cs
diff --git a/...on.Contracts/Uniapps/IUniappAppService.cs → ...ppManagement/Uniapps/IUniappAppService.cs b/...on.Contracts/Uniapps/IUniappAppService.cs → ...ppManagement/Uniapps/IUniappAppService.cs
diff --git a/src/EasyAbp.UniappManagement.Application/EasyAbp.UniappManagement.Application.csproj b/src/EasyAbp.UniappManagement.Application/EasyAbp.UniappManagement.Application.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...Application/UniappManagementAppService.cs → ...pManagement/UniappManagementAppService.cs b/...Application/UniappManagementAppService.cs → ...pManagement/UniappManagementAppService.cs
diff --git a/...ManagementApplicationAutoMapperProfile.cs → ...ManagementApplicationAutoMapperProfile.cs b/...ManagementApplicationAutoMapperProfile.cs → ...ManagementApplicationAutoMapperProfile.cs
diff --git a/...tion/UniappManagementApplicationModule.cs → ...ment/UniappManagementApplicationModule.cs b/...tion/UniappManagementApplicationModule.cs → ...ment/UniappManagementApplicationModule.cs
diff --git a/...UniappVersions/UniappNotFoundException.cs → ...UniappVersions/UniappNotFoundException.cs b/...UniappVersions/UniappNotFoundException.cs → ...UniappVersions/UniappNotFoundException.cs
diff --git a/...appVersions/UniappUnavailableException.cs → ...appVersions/UniappUnavailableException.cs b/...appVersions/UniappUnavailableException.cs → ...appVersions/UniappUnavailableException.cs
diff --git a/...UniappVersions/UniappVersionAppService.cs → ...UniappVersions/UniappVersionAppService.cs b/...UniappVersions/UniappVersionAppService.cs → ...UniappVersions/UniappVersionAppService.cs
diff --git a/...t.Application/Uniapps/UniappAppService.cs → ...appManagement/Uniapps/UniappAppService.cs b/...t.Application/Uniapps/UniappAppService.cs → ...appManagement/Uniapps/UniappAppService.cs
diff --git a/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj b/src/EasyAbp.UniappManagement.Domain.Shared/EasyAbp.UniappManagement.Domain.Shared.csproj
@@ -4,16 +4,16 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.Validation" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Localization\UniappManagement\*.json" />
-    <Content Remove="Localization\UniappManagement\*.json" />
+    <EmbeddedResource Include="EasyAbp\UniappManagement\Localization\UniappManagement\*.json" />
+    <Content Remove="EasyAbp\UniappManagement\Localization\UniappManagement\*.json" />
   </ItemGroup>
 
 </Project>
diff --git a/...red/Localization/UniappManagement/cs.json → ...ent/Localization/UniappManagement/cs.json b/...red/Localization/UniappManagement/cs.json → ...ent/Localization/UniappManagement/cs.json
diff --git a/...red/Localization/UniappManagement/en.json → ...ent/Localization/UniappManagement/en.json b/...red/Localization/UniappManagement/en.json → ...ent/Localization/UniappManagement/en.json
diff --git a/...red/Localization/UniappManagement/pl.json → ...ent/Localization/UniappManagement/pl.json b/...red/Localization/UniappManagement/pl.json → ...ent/Localization/UniappManagement/pl.json
diff --git a/.../Localization/UniappManagement/pt-BR.json → .../Localization/UniappManagement/pt-BR.json b/.../Localization/UniappManagement/pt-BR.json → .../Localization/UniappManagement/pt-BR.json
diff --git a/...red/Localization/UniappManagement/sl.json → ...ent/Localization/UniappManagement/sl.json b/...red/Localization/UniappManagement/sl.json → ...ent/Localization/UniappManagement/sl.json
diff --git a/...red/Localization/UniappManagement/tr.json → ...ent/Localization/UniappManagement/tr.json b/...red/Localization/UniappManagement/tr.json → ...ent/Localization/UniappManagement/tr.json
diff --git a/...red/Localization/UniappManagement/vi.json → ...ent/Localization/UniappManagement/vi.json b/...red/Localization/UniappManagement/vi.json → ...ent/Localization/UniappManagement/vi.json
diff --git a/...ocalization/UniappManagement/zh-Hans.json → ...ocalization/UniappManagement/zh-Hans.json b/...ocalization/UniappManagement/zh-Hans.json → ...ocalization/UniappManagement/zh-Hans.json
diff --git a/...ocalization/UniappManagement/zh-Hant.json → ...ocalization/UniappManagement/zh-Hant.json b/...ocalization/UniappManagement/zh-Hant.json → ...ocalization/UniappManagement/zh-Hant.json
diff --git a/.../Localization/UniappManagementResource.cs → .../Localization/UniappManagementResource.cs b/.../Localization/UniappManagementResource.cs → .../Localization/UniappManagementResource.cs
diff --git a/...red/UniappManagementDomainSharedModule.cs → ...ent/UniappManagementDomainSharedModule.cs b/...red/UniappManagementDomainSharedModule.cs → ...ent/UniappManagementDomainSharedModule.cs
@@ -17,20 +17,20 @@ public override void ConfigureServices(ServiceConfigurationContext context)
         {
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                options.FileSets.AddEmbedded<UniappManagementDomainSharedModule>("EasyAbp.UniappManagement");
+                options.FileSets.AddEmbedded<UniappManagementDomainSharedModule>();
             });
 
             Configure<AbpLocalizationOptions>(options =>
             {
                 options.Resources
                     .Add<UniappManagementResource>("en")
                     .AddBaseTypes(typeof(AbpValidationResource))
-                    .AddVirtualJson("/Localization/UniappManagement");
+                    .AddVirtualJson("/EasyAbp/UniappManagement/Localization/UniappManagement");
             });
 
             Configure<AbpExceptionLocalizationOptions>(options =>
             {
-                options.MapCodeNamespace("UniappManagement", typeof(UniappManagementResource));
+                options.MapCodeNamespace("EasyAbp.UniappManagement", typeof(UniappManagementResource));
             });
         }
     }

diff --git a/...main.Shared/UniappManagementErrorCodes.cs → ...pManagement/UniappManagementErrorCodes.cs b/...main.Shared/UniappManagementErrorCodes.cs → ...pManagement/UniappManagementErrorCodes.cs
diff --git a/src/EasyAbp.UniappManagement.Domain/EasyAbp.UniappManagement.Domain.csproj b/src/EasyAbp.UniappManagement.Domain/EasyAbp.UniappManagement.Domain.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...appManagementSettingDefinitionProvider.cs → ...appManagementSettingDefinitionProvider.cs b/...appManagementSettingDefinitionProvider.cs → ...appManagementSettingDefinitionProvider.cs
diff --git a/...main/Settings/UniappManagementSettings.cs → ...ment/Settings/UniappManagementSettings.cs b/...main/Settings/UniappManagementSettings.cs → ...ment/Settings/UniappManagementSettings.cs
diff --git a/...nt.Domain/UniappManagementDbProperties.cs → ...anagement/UniappManagementDbProperties.cs b/...nt.Domain/UniappManagementDbProperties.cs → ...anagement/UniappManagementDbProperties.cs
diff --git a/...nt.Domain/UniappManagementDomainModule.cs → ...anagement/UniappManagementDomainModule.cs b/...nt.Domain/UniappManagementDomainModule.cs → ...anagement/UniappManagementDomainModule.cs
diff --git a/...niappVersions/IUniappVersionRepository.cs → ...niappVersions/IUniappVersionRepository.cs b/...niappVersions/IUniappVersionRepository.cs → ...niappVersions/IUniappVersionRepository.cs
diff --git a/...nt.Domain/UniappVersions/UniappVersion.cs → ...anagement/UniappVersions/UniappVersion.cs b/...nt.Domain/UniappVersions/UniappVersion.cs → ...anagement/UniappVersions/UniappVersion.cs
diff --git a/...ement.Domain/Uniapps/IUniappRepository.cs → ...ppManagement/Uniapps/IUniappRepository.cs b/...ement.Domain/Uniapps/IUniappRepository.cs → ...ppManagement/Uniapps/IUniappRepository.cs
diff --git a/...UniappManagement.Domain/Uniapps/Uniapp.cs → ...asyAbp/UniappManagement/Uniapps/Uniapp.cs b/...UniappManagement.Domain/Uniapps/Uniapp.cs → ...asyAbp/UniappManagement/Uniapps/Uniapp.cs
diff --git a/....UniappManagement.EntityFrameworkCore/EasyAbp.UniappManagement.EntityFrameworkCore.csproj b/....UniappManagement.EntityFrameworkCore/EasyAbp.UniappManagement.EntityFrameworkCore.csproj
@@ -1,15 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.EntityFrameworkCore" Version="2.3.0" />
     <ProjectReference Include="..\EasyAbp.UniappManagement.Domain\EasyAbp.UniappManagement.Domain.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="EasyAbp\UniappManagement" />
+  </ItemGroup>
+
 </Project>
diff --git a/...ameworkCore/IUniappManagementDbContext.cs → ...ameworkCore/IUniappManagementDbContext.cs b/...ameworkCore/IUniappManagementDbContext.cs → ...ameworkCore/IUniappManagementDbContext.cs
diff --git a/...rameworkCore/UniappManagementDbContext.cs → ...rameworkCore/UniappManagementDbContext.cs b/...rameworkCore/UniappManagementDbContext.cs → ...rameworkCore/UniappManagementDbContext.cs
diff --git a/...gementDbContextModelCreatingExtensions.cs → ...gementDbContextModelCreatingExtensions.cs b/...gementDbContextModelCreatingExtensions.cs → ...gementDbContextModelCreatingExtensions.cs
diff --git a/...appManagementEntityFrameworkCoreModule.cs → ...appManagementEntityFrameworkCoreModule.cs b/...appManagementEntityFrameworkCoreModule.cs → ...appManagementEntityFrameworkCoreModule.cs
diff --git a/...gementModelBuilderConfigurationOptions.cs → ...gementModelBuilderConfigurationOptions.cs b/...gementModelBuilderConfigurationOptions.cs → ...gementModelBuilderConfigurationOptions.cs
diff --git a/...UniappVersions/UniappVersionRepository.cs → ...UniappVersions/UniappVersionRepository.cs b/...UniappVersions/UniappVersionRepository.cs → ...UniappVersions/UniappVersionRepository.cs
diff --git a/...FrameworkCore/Uniapps/UniappRepository.cs → ...appManagement/Uniapps/UniappRepository.cs b/...FrameworkCore/Uniapps/UniappRepository.cs → ...appManagement/Uniapps/UniappRepository.cs
diff --git a/src/EasyAbp.UniappManagement.HttpApi.Client/EasyAbp.UniappManagement.HttpApi.Client.csproj b/src/EasyAbp.UniappManagement.HttpApi.Client/EasyAbp.UniappManagement.HttpApi.Client.csproj
@@ -1,10 +1,10 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...nt/UniappManagementHttpApiClientModule.cs → ...nt/UniappManagementHttpApiClientModule.cs b/...nt/UniappManagementHttpApiClientModule.cs → ...nt/UniappManagementHttpApiClientModule.cs
diff --git a/src/EasyAbp.UniappManagement.HttpApi/EasyAbp.UniappManagement.HttpApi.csproj b/src/EasyAbp.UniappManagement.HttpApi/EasyAbp.UniappManagement.HttpApi.csproj
@@ -4,7 +4,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...ent.HttpApi/UniappManagementController.cs → ...pManagement/UniappManagementController.cs b/...ent.HttpApi/UniappManagementController.cs → ...pManagement/UniappManagementController.cs
diff --git a/....HttpApi/UniappManagementHttpApiModule.cs → ...nagement/UniappManagementHttpApiModule.cs b/....HttpApi/UniappManagementHttpApiModule.cs → ...nagement/UniappManagementHttpApiModule.cs
diff --git a/src/EasyAbp.UniappManagement.MongoDB/EasyAbp.UniappManagement.MongoDB.csproj b/src/EasyAbp.UniappManagement.MongoDB/EasyAbp.UniappManagement.MongoDB.csproj
@@ -1,15 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <Import Project="..\..\common.props" />
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <RootNamespace>EasyAbp.UniappManagement</RootNamespace>
+    <RootNamespace />
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Volo.Abp.MongoDB" Version="2.3.0" />
     <ProjectReference Include="..\EasyAbp.UniappManagement.Domain\EasyAbp.UniappManagement.Domain.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="EasyAbp\UniappManagement" />
+  </ItemGroup>
+
 </Project>
diff --git a/...ongoDB/IUniappManagementMongoDbContext.cs → ...ongoDB/IUniappManagementMongoDbContext.cs b/...ongoDB/IUniappManagementMongoDbContext.cs → ...ongoDB/IUniappManagementMongoDbContext.cs
diff --git a/...MongoDB/UniappManagementMongoDbContext.cs → ...MongoDB/UniappManagementMongoDbContext.cs b/...MongoDB/UniappManagementMongoDbContext.cs → ...MongoDB/UniappManagementMongoDbContext.cs
diff --git a/...iappManagementMongoDbContextExtensions.cs → ...iappManagementMongoDbContextExtensions.cs b/...iappManagementMongoDbContextExtensions.cs → ...iappManagementMongoDbContextExtensions.cs
diff --git a/.../MongoDB/UniappManagementMongoDbModule.cs → .../MongoDB/UniappManagementMongoDbModule.cs b/.../MongoDB/UniappManagementMongoDbModule.cs → .../MongoDB/UniappManagementMongoDbModule.cs
diff --git a/...tMongoModelBuilderConfigurationOptions.cs → ...tMongoModelBuilderConfigurationOptions.cs b/...tMongoModelBuilderConfigurationOptions.cs → ...tMongoModelBuilderConfigurationOptions.cs