Skip to content

Commit bc884ff

Browse files
committed
Fixes on migrator.
1 parent 7c6efb4 commit bc884ff

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

src/AbpCompanyName.AbpProjectName.Application/MultiTenancy/TenantAppService.cs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
using Abp.Application.Services.Dto;
55
using Abp.Authorization;
66
using Abp.AutoMapper;
7-
using Abp.Domain.Uow;
7+
using Abp.Extensions;
88
using Abp.MultiTenancy;
9+
using Abp.Runtime.Security;
910
using AbpCompanyName.AbpProjectName.Authorization;
1011
using AbpCompanyName.AbpProjectName.Authorization.Roles;
1112
using AbpCompanyName.AbpProjectName.Editions;
@@ -48,6 +49,10 @@ public async Task CreateTenant(CreateTenantInput input)
4849
{
4950
//Create tenant
5051
var tenant = input.MapTo<Tenant>();
52+
tenant.ConnectionString = input.ConnectionString.IsNullOrEmpty()
53+
? null
54+
: SimpleStringCipher.Instance.Encrypt(input.ConnectionString);
55+
5156
var defaultEdition = await _editionManager.FindByNameAsync(EditionManager.DefaultEditionName);
5257
if (defaultEdition != null)
5358
{

src/AbpCompanyName.AbpProjectName.EntityFramework/AbpProjectNameDataModule.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ public class AbpProjectNameDataModule : AbpModule
1111
{
1212
public override void PreInitialize()
1313
{
14+
Database.SetInitializer(new CreateDatabaseIfNotExists<AbpProjectNameDbContext>());
15+
1416
Configuration.DefaultNameOrConnectionString = "Default";
1517
}
1618

src/Tools/AbpCompanyName.AbpProjectName.Migrator/AbpProjectNameMigratorModule.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
1+
using System.Data.Entity;
12
using System.Reflection;
23
using Abp.Modules;
4+
using AbpCompanyName.AbpProjectName.EntityFramework;
35

46
namespace AbpCompanyName.AbpProjectName.Migrator
57
{
68
[DependsOn(typeof(AbpProjectNameDataModule))]
79
public class AbpProjectNameMigratorModule : AbpModule
810
{
11+
public override void PreInitialize()
12+
{
13+
Database.SetInitializer<AbpProjectNameDbContext>(null);
14+
15+
Configuration.BackgroundJobs.IsJobExecutionEnabled = false;
16+
}
17+
918
public override void Initialize()
1019
{
1120
IocManager.RegisterAssemblyByConvention(Assembly.GetExecutingAssembly());

src/Tools/AbpCompanyName.AbpProjectName.Migrator/MultiTenantMigrateExecuter.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Abp.Domain.Repositories;
66
using Abp.Extensions;
77
using Abp.MultiTenancy;
8+
using Abp.Runtime.Security;
89
using AbpCompanyName.AbpProjectName.MultiTenancy;
910

1011
namespace AbpCompanyName.AbpProjectName.Migrator
@@ -74,7 +75,7 @@ public void Run(bool skipConnVerification)
7475
Log.Write("Name : " + tenant.Name);
7576
Log.Write("TenancyName : " + tenant.TenancyName);
7677
Log.Write("Tenant Id : " + tenant.Id);
77-
Log.Write("Connection string : " + tenant.ConnectionString);
78+
Log.Write("Connection string : " + SimpleStringCipher.Instance.Decrypt(tenant.ConnectionString));
7879

7980
if (!migratedDatabases.Contains(tenant.ConnectionString))
8081
{

0 commit comments

Comments
 (0)