diff --git a/KonSoft.sln.DotSettings b/KonSoft.sln.DotSettings
index cb0b2c9..cffb367 100644
--- a/KonSoft.sln.DotSettings
+++ b/KonSoft.sln.DotSettings
@@ -20,4 +20,5 @@
False
False
SQL
+ True
\ No newline at end of file
diff --git a/microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs b/microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs
index b34891f..3f2fc14 100644
--- a/microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs
+++ b/microservices/KonSoft.Admin.HttpApi.Host/AdminHttpApiHostModule.cs
@@ -1,11 +1,9 @@
-using KonSoft.Admin.DbMigrations;
using KonSoft.Admin.EntityFrameworkCore;
using KonSoft.Shared.Hosting.AspNetCore;
using KonSoft.Shared.Hosting.Microservices;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
-using System.Threading.Tasks;
using Volo.Abp;
using Volo.Abp.BackgroundJobs;
using Volo.Abp.Modularity;
@@ -71,7 +69,7 @@ public class AdminHttpApiHostModule : AbpModule
options.OAuthClientId(configuration["AuthServer:SwaggerClientId"]);
options.OAuthScopes("Admin");
});
-
+
app.UseAuditing();
app.UseAbpSerilogEnrichers();
app.UseConfiguredEndpoints();
diff --git a/microservices/KonSoft.Admin.HttpApi.Host/appsettings.json b/microservices/KonSoft.Admin.HttpApi.Host/appsettings.json
index 5ea53ed..c1df4ef 100644
--- a/microservices/KonSoft.Admin.HttpApi.Host/appsettings.json
+++ b/microservices/KonSoft.Admin.HttpApi.Host/appsettings.json
@@ -1,29 +1,13 @@
{
- "App": {
- "CorsOrigins": "https://*.KonSoft.top"
- },
- "ConnectionStrings": {
- "Default": "Host=1.94.99.47;Port=26666;Database=Clean;User ID=postgres;Password=zzx7845zzx;"
- },
- "Redis": {
- "Configuration": "1.94.99.47:26668"
+ "AgileConfig": {
+ "appId": "KonSoft.Admin.HttpApi.Host",
+ "name": "KonSoft.Admin.HttpApi.Host",
+ "nodes": "https://config.konsoft.top/",
+ "secret": "DBE31703-14F9-4B01-893D-900B8380CE04"
},
"AuthServer": {
- "Authority": "https://localhost:44397",
+ "Authority": "https://localhost:44322",
"RequireHttpsMetadata": true,
"SwaggerClientId": "Admin_Swagger"
- },
- "StringEncryption": {
- "DefaultPassPhrase": "g3NdNOyDR9oYj0gK"
- },
- "RabbitMQ": {
- "Connections": {
- "Default": {
- "HostName": "1.94.99.47",
- "Port": 26667,
- "UserName": "admin",
- "Password": "zzx7845zzx"
- }
- }
}
-}
+}
\ No newline at end of file
diff --git a/modules/admin/src/KonSoft.Admin.Domain/AdminConsts.cs b/modules/admin/src/KonSoft.Admin.Domain/AdminConsts.cs
index 0c69cfb..336faa4 100644
--- a/modules/admin/src/KonSoft.Admin.Domain/AdminConsts.cs
+++ b/modules/admin/src/KonSoft.Admin.Domain/AdminConsts.cs
@@ -3,6 +3,6 @@
public static class AdminConsts
{
public const string DbTablePrefix = "App";
-
- public const string DbSchema = null;
+ public const string DbSchema = "";
+ public const string ConnectionStringName = "Default";
}
\ No newline at end of file
diff --git a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs
index 655c2b5..9e107af 100644
--- a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs
+++ b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContext.cs
@@ -18,7 +18,7 @@ namespace KonSoft.Admin.EntityFrameworkCore;
[ReplaceDbContext(typeof(IIdentityDbContext))]
[ReplaceDbContext(typeof(ITenantManagementDbContext))]
-[ConnectionStringName("Default")]
+[ConnectionStringName(AdminConsts.ConnectionStringName)]
public class AdminDbContext :
AbpDbContext,
IIdentityDbContext,
@@ -52,9 +52,7 @@ public class AdminDbContext :
public DbSet SecurityLogs { get; set; }
public DbSet LinkUsers { get; set; }
public DbSet UserDelegations { get; set; }
-
public DbSet Sessions { get; set; }
-
public DbSet Tenants { get; set; }
public DbSet TenantConnectionStrings { get; set; }
}
\ No newline at end of file
diff --git a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContextFactory.cs b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContextFactory.cs
index af1f52d..0e77c3e 100644
--- a/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContextFactory.cs
+++ b/modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContextFactory.cs
@@ -20,7 +20,7 @@ public class AdminDbContextFactory : IDesignTimeDbContextFactory
var configuration = BuildConfiguration();
var builder = new DbContextOptionsBuilder()
- .UseNpgsql(configuration.GetConnectionString("Default"));
+ .UseNpgsql(configuration.GetConnectionString(AdminConsts.ConnectionStringName));
return new AdminDbContext(builder.Options);
}
diff --git a/shared/KonSoft.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs b/shared/KonSoft.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs
index 18e2eee..220fb30 100644
--- a/shared/KonSoft.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs
+++ b/shared/KonSoft.Shared.Hosting.AspNetCore/ApplicationBuilderHelper.cs
@@ -1,8 +1,10 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Serilog;
+using System;
+using System.Threading.Tasks;
using Volo.Abp.Modularity;
namespace KonSoft.Shared.Hosting.AspNetCore;
@@ -13,6 +15,11 @@ public static class ApplicationBuilderHelper
where TStartupModule : IAbpModule
{
var builder = WebApplication.CreateBuilder(args);
+ builder.Configuration
+ .AddAgileConfig(option =>
+ {
+ option.ENV = Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT") ?? "Development";
+ });
builder.Host
.AddAppSettingsSecretsJson()
.UseAutofac()
diff --git a/shared/KonSoft.Shared.Hosting.AspNetCore/KonSoft.Shared.Hosting.AspNetCore.csproj b/shared/KonSoft.Shared.Hosting.AspNetCore/KonSoft.Shared.Hosting.AspNetCore.csproj
index c60ec75..67e692d 100644
--- a/shared/KonSoft.Shared.Hosting.AspNetCore/KonSoft.Shared.Hosting.AspNetCore.csproj
+++ b/shared/KonSoft.Shared.Hosting.AspNetCore/KonSoft.Shared.Hosting.AspNetCore.csproj
@@ -12,6 +12,7 @@
+