From a7db3400114f3e45a97053c77c8cb9935980832a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sedat=20=C3=96zt=C3=BCrk?= Date: Thu, 11 Jun 2026 00:52:50 +0300 Subject: [PATCH] =?UTF-8?q?cdn=20url=20d=C3=BCzenlemesi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Seeds/PlatformIdentityDataSeeder.cs | 18 +++++++++--------- .../appsettings.Dev.json | 3 +++ .../appsettings.Production.json | 3 +++ .../appsettings.json | 3 +++ .../Seeds/TenantIdentityDataSeeder.cs | 18 +++++++++--------- 5 files changed, 27 insertions(+), 18 deletions(-) diff --git a/api/src/Sozsoft.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs b/api/src/Sozsoft.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs index 5bcc11f..85d490f 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs +++ b/api/src/Sozsoft.Platform.DbMigrator/Seeds/PlatformIdentityDataSeeder.cs @@ -146,7 +146,6 @@ public class PlatformIdentityDataSeeder : IdentityDataSeeder adminUser.SetWorkHour(PlatformConsts.AbpIdentity.User.AdminWorkHourDefaultValue); adminUser.SetNationality(PlatformConsts.AbpIdentity.User.AdminNationalityDefaultValue); adminUser.SetBloodType(PlatformConsts.AbpIdentity.User.AdminBloodTypeDefaultValue); - // adminUser.SetAvatar(GetAvatar(tenantId?.ToString(), adminUser.Id.ToString())); adminUser.SetEducationLevel(PlatformConsts.AbpIdentity.User.AdminEducationLevelDefaultValue); adminUser.SetGraduationSchool(PlatformConsts.AbpIdentity.User.AdminGraduationSchoolDefaultValue); adminUser.SetHomeAddress(PlatformConsts.AbpIdentity.User.AdminHomeAddressDefaultValue); @@ -155,6 +154,7 @@ public class PlatformIdentityDataSeeder : IdentityDataSeeder adminUser.SetMaritalStatus(PlatformConsts.AbpIdentity.User.AdminMaritalStatusDefaultValue); adminUser.SetDepartmentId(PlatformConsts.AbpIdentity.User.AdminDepartmentIdDefaultValue); adminUser.SetJobPositionId(PlatformConsts.AbpIdentity.User.AdminJobPositionIdDefaultValue); + adminUser.SetAvatar(GetAvatar(tenantId?.ToString(), adminUser.Id.ToString())); (await UserManager.CreateAsync(adminUser, adminPassword, validatePassword: false)).CheckErrors(); result.CreatedAdminUser = true; @@ -201,15 +201,15 @@ public class PlatformIdentityDataSeeder : IdentityDataSeeder } } - // private string GetAvatar(string? tenantId, string? userId) - // { - // var tenantPart = !string.IsNullOrEmpty(tenantId) - // ? $"tenants/{tenantId}" - // : "host"; + private string GetAvatar(string? tenantId, string? userId) + { + var tenantPart = !string.IsNullOrEmpty(tenantId) + ? $"tenants/{tenantId}" + : "host"; - // var baseUrl = _configuration["App:CdnUrl"]?.TrimEnd('/'); + var baseUrl = _configuration["App:CdnUrl"]?.TrimEnd('/'); - // return $"{baseUrl}/{tenantPart}/avatar/{userId ?? "default"}.jpg"; - // } + return $"{baseUrl}/{tenantPart}/avatar/{userId ?? "default"}.jpg"; + } } diff --git a/api/src/Sozsoft.Platform.DbMigrator/appsettings.Dev.json b/api/src/Sozsoft.Platform.DbMigrator/appsettings.Dev.json index 4eeb561..09f7e0a 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/appsettings.Dev.json +++ b/api/src/Sozsoft.Platform.DbMigrator/appsettings.Dev.json @@ -1,4 +1,7 @@ { + "App": { + "CdnUrl": "https://cdn-api.sozsoft.com" + }, "ConnectionStrings": { "SqlServer": "Server=sql;Database=Sozsoft;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;Encrypt=False;TrustServerCertificate=True;Connection Timeout=60;", "PostgreSql": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Sozsoft;" diff --git a/api/src/Sozsoft.Platform.DbMigrator/appsettings.Production.json b/api/src/Sozsoft.Platform.DbMigrator/appsettings.Production.json index 0063c19..ed4b4d2 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/appsettings.Production.json +++ b/api/src/Sozsoft.Platform.DbMigrator/appsettings.Production.json @@ -1,4 +1,7 @@ { + "App": { + "CdnUrl": "https://cdn.sozsoft.com" + }, "ConnectionStrings": { "SqlServer": "Server=sql;Database=Sozsoft;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;Encrypt=False;TrustServerCertificate=True;Connection Timeout=60;", "PostgreSql": "User ID=sa;Password=NvQp8s@l;Host=postgres;Port=5432;Database=Sozsoft;" diff --git a/api/src/Sozsoft.Platform.DbMigrator/appsettings.json b/api/src/Sozsoft.Platform.DbMigrator/appsettings.json index 7d8ae94..abc15d5 100644 --- a/api/src/Sozsoft.Platform.DbMigrator/appsettings.json +++ b/api/src/Sozsoft.Platform.DbMigrator/appsettings.json @@ -1,5 +1,8 @@ { "Seed": false, + "App": { + "CdnUrl": "https://localhost:44344" + }, "ConnectionStrings": { "SqlServer": "Server=localhost;Database=Sozsoft;User Id=sa;password=NvQp8s@l;Trusted_Connection=False;Encrypt=False;TrustServerCertificate=True;Connection Timeout=60;", "PostgreSql": "User ID=sa;Password=NvQp8s@l;Host=localhost;Port=5432;Database=Sozsoft;" diff --git a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs index 1b16e6d..9664b63 100644 --- a/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs +++ b/api/src/Sozsoft.Platform.EntityFrameworkCore/Seeds/TenantIdentityDataSeeder.cs @@ -144,7 +144,6 @@ public class TenantIdentityDataSeeder : IdentityDataSeeder adminUser.SetWorkHour(PlatformConsts.AbpIdentity.User.AdminWorkHourDefaultValue); adminUser.SetNationality(PlatformConsts.AbpIdentity.User.AdminNationalityDefaultValue); adminUser.SetBloodType(PlatformConsts.AbpIdentity.User.AdminBloodTypeDefaultValue); - // adminUser.SetAvatar(GetAvatar(tenantId?.ToString(), adminUser.Id.ToString())); adminUser.SetEducationLevel(PlatformConsts.AbpIdentity.User.AdminEducationLevelDefaultValue); adminUser.SetGraduationSchool(PlatformConsts.AbpIdentity.User.AdminGraduationSchoolDefaultValue); adminUser.SetHomeAddress(PlatformConsts.AbpIdentity.User.AdminHomeAddressDefaultValue); @@ -153,6 +152,7 @@ public class TenantIdentityDataSeeder : IdentityDataSeeder adminUser.SetMaritalStatus(PlatformConsts.AbpIdentity.User.AdminMaritalStatusDefaultValue); adminUser.SetDepartmentId(PlatformConsts.AbpIdentity.User.AdminDepartmentIdDefaultValue); adminUser.SetJobPositionId(PlatformConsts.AbpIdentity.User.AdminJobPositionIdDefaultValue); + adminUser.SetAvatar(GetAvatar(tenantId?.ToString(), adminUser.Id.ToString())); (await UserManager.CreateAsync(adminUser, adminPassword, validatePassword: false)).CheckErrors(); result.CreatedAdminUser = true; @@ -184,15 +184,15 @@ public class TenantIdentityDataSeeder : IdentityDataSeeder } } - // private string GetAvatar(string? tenantId, string? userId) - // { - // var tenantPart = !string.IsNullOrEmpty(tenantId) - // ? $"tenants/{tenantId}" - // : "host"; + private string GetAvatar(string? tenantId, string? userId) + { + var tenantPart = !string.IsNullOrEmpty(tenantId) + ? $"tenants/{tenantId}" + : "host"; - // var baseUrl = _configuration["App:CdnUrl"]?.TrimEnd('/'); + var baseUrl = _configuration["App:CdnUrl"]?.TrimEnd('/'); - // return $"{baseUrl}/{tenantPart}/avatar/{userId ?? "default"}.jpg"; - // } + return $"{baseUrl}/{tenantPart}/avatar/{userId ?? "default"}.jpg"; + } }