tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Use new IDataSeeder.

pull/947/head
Halil ibrahim Kalkan 7 years ago
parent
b1087887b9
commit
65a2d89b18
7 changed files with 20 additions and 85 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 16
      abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
  2. 14
      modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs
  3. 16
      modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs
  4. 16
      samples/MicroserviceDemo/applications/AuthServer.Host/AuthServerHostModule.cs
  5. 14
      templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs
  6. 20
      templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
  7. 9
      templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameTestDataBuilder.cs

16
abp_io/src/Volo.AbpWebSite.Web/AbpWebSiteWebModule.cs
View File

@ -1,5 +1,4 @@
using System.IO;
using System.Linq;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Http;
@ -14,7 +13,6 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theming;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Autofac;
using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore;
@ -182,18 +180,8 @@ namespace Volo.AbpWebSite
AsyncHelper.RunSync(async () =>
{
await scope.ServiceProvider
.GetRequiredService<IIdentityDataSeeder>()
.SeedAsync(
"1q2w3E*"
);
await scope.ServiceProvider
.GetRequiredService<IPermissionDataSeeder>()
.SeedAsync(
RolePermissionValueProvider.ProviderName,
"admin",
IdentityPermissions.GetAll().Union(BloggingPermissions.GetAll())
);
.GetRequiredService<IDataSeeder>()
.SeedAsync();
});
}
}

14
modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs
View File

@ -159,18 +159,8 @@ namespace Volo.BloggingTestApp
AsyncHelper.RunSync(async () =>
{
await scope.ServiceProvider
.GetRequiredService<IIdentityDataSeeder>()
.SeedAsync(
"1q2w3E*"
);
await scope.ServiceProvider
.GetRequiredService<IPermissionDataSeeder>()
.SeedAsync(
RolePermissionValueProvider.ProviderName,
"admin",
IdentityPermissions.GetAll().Union(BloggingPermissions.GetAll())
);
.GetRequiredService<IDataSeeder>()
.SeedAsync();
});
}
}

16
modules/docs/app/Volo.DocsTestApp/DocsTestAppModule.cs
View File

@ -1,7 +1,6 @@
using System.Collections.Generic;
using System.Globalization;
using System.IO;
using System.Linq;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Localization;
@ -16,7 +15,6 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
using Volo.Abp.AspNetCore.Mvc.UI.Theming;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Autofac;
using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore;
@ -136,19 +134,9 @@ namespace Volo.DocsTestApp
{
AsyncHelper.RunSync(async () =>
{
await context.ServiceProvider
.GetRequiredService<IIdentityDataSeeder>()
.SeedAsync(
"1q2w3E*"
);
await scope.ServiceProvider
.GetRequiredService<IPermissionDataSeeder>()
.SeedAsync(
RolePermissionValueProvider.ProviderName,
"admin",
IdentityPermissions.GetAll().Union(DocsAdminPermissions.GetAll())
);
.GetRequiredService<IDataSeeder>()
.SeedAsync();
});
}
}

16
samples/MicroserviceDemo/applications/AuthServer.Host/AuthServerHostModule.cs
View File

@ -11,6 +11,7 @@ using Volo.Abp.AuditLogging.EntityFrameworkCore;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.EventBus.RabbitMq;
using Volo.Abp.Autofac;
using Volo.Abp.Data;
using Volo.Abp.EntityFrameworkCore;
using Volo.Abp.EntityFrameworkCore.SqlServer;
using Volo.Abp.Identity;
@ -93,21 +94,10 @@ namespace AuthServer.Host
AsyncHelper.RunSync(async () =>
{
await scope.ServiceProvider
.GetRequiredService<IIdentityDataSeeder>()
.SeedAsync(
adminUserPassword: "1q2w3E*"
);
await scope.ServiceProvider
.GetRequiredService<IPermissionDataSeeder>()
.SeedAsync(
RolePermissionValueProvider.ProviderName,
"admin",
IdentityPermissions.GetAll()
);
.GetRequiredService<IDataSeeder>()
.SeedAsync();
});
}
}
}
}

14
templates/module/app/MyCompanyName.MyProjectName.DemoApp/DemoAppModule.cs
View File

@ -123,18 +123,8 @@ namespace MyCompanyName.MyProjectName.DemoApp
AsyncHelper.RunSync(async () =>
{
await scope.ServiceProvider
.GetRequiredService<IIdentityDataSeeder>()
.SeedAsync(
"1q2w3E*"
);
await scope.ServiceProvider
.GetRequiredService<IPermissionDataSeeder>()
.SeedAsync(
RolePermissionValueProvider.ProviderName,
"admin",
IdentityPermissions.GetAll().Union(MyProjectNamePermissions.GetAll())
);
.GetRequiredService<IDataSeeder>()
.SeedAsync();
});
}
}

20
templates/mvc/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs
View File

@ -20,6 +20,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
using Volo.Abp.Authorization.Permissions;
using Volo.Abp.Autofac;
using Volo.Abp.AutoMapper;
using Volo.Abp.Data;
using Volo.Abp.Identity;
using Volo.Abp.Identity.Web;
using Volo.Abp.Localization;
@ -195,22 +196,9 @@ namespace MyCompanyName.MyProjectName
{
AsyncHelper.RunSync(async () =>
{
var identitySeedResult = await scope.ServiceProvider
.GetRequiredService<IIdentityDataSeeder>()
.SeedAsync(
"1q2w3E*"
);
if (identitySeedResult.CreatedAdminRole)
{
await scope.ServiceProvider
.GetRequiredService<IPermissionDataSeeder>()
.SeedAsync(
RolePermissionValueProvider.ProviderName,
"admin",
IdentityPermissions.GetAll().Union(MyProjectNamePermissions.GetAll())
);
}
await scope.ServiceProvider
.GetRequiredService<IDataSeeder>()
.SeedAsync();
});
}
}

9
templates/mvc/test/MyCompanyName.MyProjectName.Application.Tests/MyProjectNameTestDataBuilder.cs
View File

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using Volo.Abp.Data;
using Volo.Abp.DependencyInjection;
using Volo.Abp.Identity;
using Volo.Abp.Threading;
@ -7,11 +8,11 @@ namespace MyCompanyName.MyProjectName
{
public class MyProjectNameTestDataBuilder : ITransientDependency
{
private readonly IIdentityDataSeeder _identityDataSeeder;
private readonly IDataSeeder _dataSeeder;
public MyProjectNameTestDataBuilder(IIdentityDataSeeder identityDataSeeder)
public MyProjectNameTestDataBuilder(IDataSeeder dataSeeder)
{
_identityDataSeeder = identityDataSeeder;
_dataSeeder = dataSeeder;
}
public void Build()
@ -21,7 +22,7 @@ namespace MyCompanyName.MyProjectName
public async Task BuildInternalAsync()
{
await _identityDataSeeder.SeedAsync("1q2w3E*");
await _dataSeeder.SeedAsync();
}
}
}
Write Preview
Loading…
Cancel
Save