admin/JiShe.IOT.Admin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: admin:5b0a85b882926fc736338c7ad435957a2b97b91d
Branches Tags
admin:master
admin:master_net9_Pomelo
..
compare: admin:ce768e005cd51fc740ed06047f8e7168c902deb3
Branches Tags
admin:master
admin:master_net9_Pomelo

No commits in common. "5b0a85b882926fc736338c7ad435957a2b97b91d" and "ce768e005cd51fc740ed06047f8e7168c902deb3" have entirely different histories.
5b0a85b882 ... ce768e005c

4 changed files with 31 additions and 33 deletions
Show Stats Expand all files Collapse all files

2
JiShe.ServicePro

@ -1 +1 @@
Subproject commit 05c64c7c04909ce504f79c092b104a6b40de1338
Subproject commit 2ed918f8dc2c40f679726fff1d71aea6603362ae

2
host/JiShe.IoT.HttpApi.Host/Program.cs
View File

@ -1,5 +1,4 @@
using Microsoft.Extensions.Configuration;
using static Volo.Abp.Identity.Settings.IdentitySettingNames;
namespace JiShe.IoT;
@ -9,7 +8,6 @@ public class Program
{
try
{
//string text = Convert.ToBase64String(Encoding.UTF8.GetBytes("admin:admin123"));
Log.Information("JiShe.IoT.HttpApi.Host.");
var builder = WebApplication.CreateBuilder(args);
builder.Host

4
host/JiShe.IoT.HttpApi.Host/configs/appsettings.Development.json
View File

@ -32,8 +32,8 @@
"TaskThreadCount": -1
},
"Pulsar": {
"ServiceUrl": "pulsar://47.110.53.196:9093",
"WebUrl": "http://47.110.53.196:9094",
"ServiceUrl": "pulsar://47.110.60.222:9093",
"WebUrl": "http://47.110.60.222:9094",
"UserName": "admin",
"TenantName": "1YMVZZkAkRArjxSD8457",
"Namespace": "OneNET",

52
src/JiShe.IoT.Domain/Data/IoTDbMigrationService.cs
View File

@ -40,41 +40,41 @@ namespace JiShe.IoT.Data
Logger.LogInformation("Started database migrations...");
await MigrateDatabaseSchemaAsync();
await SeedDataAsync();
//await MigrateDatabaseSchemaAsync();
//await SeedDataAsync();
await InitIoTDBTable();
Logger.LogInformation($"Successfully completed host database migrations.");
//Logger.LogInformation($"Successfully completed host database migrations.");
var tenants = await _tenantRepository.GetListAsync(includeDetails: true);
//var tenants = await _tenantRepository.GetListAsync(includeDetails: true);
var migratedDatabaseSchemas = new HashSet<string>();
foreach (var tenant in tenants)
{
using (_currentTenant.Change(tenant.Id))
{
if (tenant.ConnectionStrings.Any())
{
var tenantConnectionStrings = tenant.ConnectionStrings
.Select(x => x.Value)
.ToList();
//var migratedDatabaseSchemas = new HashSet<string>();
//foreach (var tenant in tenants)
//{
// using (_currentTenant.Change(tenant.Id))
// {
// if (tenant.ConnectionStrings.Any())
// {
// var tenantConnectionStrings = tenant.ConnectionStrings
// .Select(x => x.Value)
// .ToList();
if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings))
{
await MigrateDatabaseSchemaAsync(tenant);
// if (!migratedDatabaseSchemas.IsSupersetOf(tenantConnectionStrings))
// {
// await MigrateDatabaseSchemaAsync(tenant);
migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings);
}
}
// migratedDatabaseSchemas.AddIfNotContains(tenantConnectionStrings);
// }
// }
await SeedDataAsync(tenant);
}
// await SeedDataAsync(tenant);
// }
Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations.");
}
// Logger.LogInformation($"Successfully completed {tenant.Name} tenant database migrations.");
//}
Logger.LogInformation("Successfully completed all database migrations.");
Logger.LogInformation("You can safely end this process...");
//Logger.LogInformation("Successfully completed all database migrations.");
//Logger.LogInformation("You can safely end this process...");
}
private async Task MigrateDatabaseSchemaAsync(Tenant tenant = null)