Browse Source

Merge branch 'dev' of https://github.com/abpframework/abp into dev

pull/3851/head
mehmet-erim 6 years ago
parent
commit
9996226d0e
  1. 6
      docs/en/Getting-Started.md
  2. 5
      docs/zh-Hans/Getting-Started.md
  3. 3
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js
  4. 4
      npm/packs/utils/projects/utils/src/lib/linked-list.ts
  5. 3
      samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj
  6. 6
      samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs
  7. 3
      samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj
  8. 4
      samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs

6
docs/en/Getting-Started.md

@ -25,6 +25,12 @@ The following tools should be installed on your development machine:
* [Node v12+](https://nodejs.org)
* [Yarn v1.19+](https://classic.yarnpkg.com/)
{{ if Tiered == "Yes" }}
* [Redis](https://redis.io/): The applications use Redis as as [distributed cache](../Caching.md). So, you need to have Redis installed & running.
{{ end }}
> You can use another editor instead of Visual Studio as long as it supports .NET Core and ASP.NET Core.

5
docs/zh-Hans/Getting-Started.md

@ -24,6 +24,11 @@
* [Node v12+](https://nodejs.org)
* [Yarn v1.19+](https://classic.yarnpkg.com/)
{{ if Tiered == "Yes" }}
* [Redis](https://redis.io/): 应用程序将Redis用作[分布式缓存](../Caching.md). 因此你需要安装并运行Redis.
{{ end }}
> 你可以也使用其他支持.NET Core 和 ASP.NET Core的编辑器.

3
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/ui-extensions.js

@ -144,7 +144,8 @@
var tableProperty = properties[i];
columnConfigs.push({
title: localizeDisplayName(tableProperty.name, tableProperty.config.displayName),
data: "extraProperties." + tableProperty.name
data: "extraProperties." + tableProperty.name,
orderable: false
});
}

4
npm/packs/utils/projects/utils/src/lib/linked-list.ts

@ -103,7 +103,7 @@ export class LinkedList<T = any> {
};
}
addAfter(value: T, nextValue: T): ListNode<T>;
addAfter(value: T, previousValue: T): ListNode<T>;
addAfter(value: T, previousValue: any, compareFn: ListComparisonFn<T>): ListNode<T>;
addAfter(value: T, previousValue: any, compareFn: ListComparisonFn<T> = compare): ListNode<T> {
const previous = this.find(node => compareFn(node.value, previousValue));
@ -173,7 +173,7 @@ export class LinkedList<T = any> {
return previous ? this.attachMany(values, previous, previous.next) : this.addManyTail(values);
}
addManyBefore(values: T[], previousValue: T): ListNode<T>[];
addManyBefore(values: T[], nextValue: T): ListNode<T>[];
addManyBefore(values: T[], nextValue: any, compareFn: ListComparisonFn<T>): ListNode<T>[];
addManyBefore(
values: T[],

3
samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingService.Host.csproj

@ -36,6 +36,7 @@
<ProjectReference Include="..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.EntityFrameworkCore\Volo.Abp.SettingManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.EntityFrameworkCore.SqlServer\Volo.Abp.EntityFrameworkCore.SqlServer.csproj" />
<ProjectReference Include="..\..\shared\MsDemo.Shared\MsDemo.Shared.csproj" />
<ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.EntityFrameworkCore\Volo.Abp.TenantManagement.EntityFrameworkCore.csproj" />
</ItemGroup>
<ItemGroup>
@ -44,5 +45,5 @@
<EmbeddedResource Remove="Logs\**" />
<None Remove="Logs\**" />
</ItemGroup>
</Project>

6
samples/MicroserviceDemo/microservices/BloggingService.Host/BloggingServiceHostModule.cs

@ -29,6 +29,7 @@ using Volo.Abp.MultiTenancy;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.Security.Claims;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.TenantManagement.EntityFrameworkCore;
using Volo.Abp.Threading;
using Volo.Blogging;
using Volo.Blogging.Blogs;
@ -49,7 +50,8 @@ namespace BloggingService.Host
typeof(BloggingApplicationModule),
typeof(AbpHttpClientIdentityModelWebModule),
typeof(AbpIdentityHttpApiClientModule),
typeof(AbpAspNetCoreMultiTenancyModule)
typeof(AbpAspNetCoreMultiTenancyModule),
typeof(AbpTenantManagementEntityFrameworkCoreModule)
)]
public class BloggingServiceHostModule : AbpModule
{
@ -82,7 +84,7 @@ namespace BloggingService.Host
{
options.Languages.Add(new LanguageInfo("en", "en", "English"));
});
Configure<AbpDbContextOptions>(options =>
{
options.UseSqlServer();

3
samples/MicroserviceDemo/microservices/ProductService.Host/ProductService.Host.csproj

@ -34,6 +34,7 @@
<ProjectReference Include="..\..\modules\product\src\ProductManagement.EntityFrameworkCore\ProductManagement.EntityFrameworkCore.csproj" />
<ProjectReference Include="..\..\modules\product\src\ProductManagement.HttpApi\ProductManagement.HttpApi.csproj" />
<ProjectReference Include="..\..\shared\MsDemo.Shared\MsDemo.Shared.csproj" />
<ProjectReference Include="..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.EntityFrameworkCore\Volo.Abp.TenantManagement.EntityFrameworkCore.csproj" />
</ItemGroup>
<ItemGroup>
@ -42,5 +43,5 @@
<EmbeddedResource Remove="Logs\**" />
<None Remove="Logs\**" />
</ItemGroup>
</Project>

4
samples/MicroserviceDemo/microservices/ProductService.Host/ProductServiceHostModule.cs

@ -25,6 +25,7 @@ using Volo.Abp.MultiTenancy;
using Volo.Abp.PermissionManagement.EntityFrameworkCore;
using Volo.Abp.Security.Claims;
using Volo.Abp.SettingManagement.EntityFrameworkCore;
using Volo.Abp.TenantManagement.EntityFrameworkCore;
using Volo.Abp.Threading;
namespace ProductService.Host
@ -39,7 +40,8 @@ namespace ProductService.Host
typeof(ProductManagementApplicationModule),
typeof(ProductManagementHttpApiModule),
typeof(ProductManagementEntityFrameworkCoreModule),
typeof(AbpAspNetCoreMultiTenancyModule)
typeof(AbpAspNetCoreMultiTenancyModule),
typeof(AbpTenantManagementEntityFrameworkCoreModule)
)]
public class ProductServiceHostModule : AbpModule
{

Loading…
Cancel
Save