feat 增加配置中心支持

KonSoft.sln.DotSettings

@@ -20,4 +20,5 @@
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Async/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Generate/=Overrides/Options/=Mutable/@EntryIndexedValue">False</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=SQL/@EntryIndexedValue">SQL</s:String>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Consts/@EntryIndexedValue">True</s:Boolean>
 </wpf:ResourceDictionary>

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();

microservices/KonSoft.Admin.HttpApi.Host/appsettings.json

@@ -1,29 +1,13 @@
 {
-  "App": {
+  "AgileConfig": {
-    "CorsOrigins": "https://*.KonSoft.top"
+    "appId": "KonSoft.Admin.HttpApi.Host",
-  },
+    "name": "KonSoft.Admin.HttpApi.Host",
-  "ConnectionStrings": {
+    "nodes": "https://config.konsoft.top/",
-    "Default": "Host=1.94.99.47;Port=26666;Database=Clean;User ID=postgres;Password=zzx7845zzx;"
+    "secret": "DBE31703-14F9-4B01-893D-900B8380CE04"
-  },
-  "Redis": {
-    "Configuration": "1.94.99.47:26668"
   },
   "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"
-      }
-    }
   }
-}
+}

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 = "";
-    public const string DbSchema = null;
+    public const string ConnectionStringName = "Default";
 }

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<AdminDbContext>,
     IIdentityDbContext,
@@ -52,9 +52,7 @@ public class AdminDbContext :
     public DbSet<IdentitySecurityLog> SecurityLogs { get; set; }
     public DbSet<IdentityLinkUser> LinkUsers { get; set; }
     public DbSet<IdentityUserDelegation> UserDelegations { get; set; }
-
     public DbSet<IdentitySession> Sessions { get; set; }
-
     public DbSet<Tenant> Tenants { get; set; }
     public DbSet<TenantConnectionString> TenantConnectionStrings { get; set; }
 }

modules/admin/src/KonSoft.Admin.EntityFrameworkCore/EntityFrameworkCore/AdminDbContextFactory.cs

@@ -20,7 +20,7 @@ public class AdminDbContextFactory : IDesignTimeDbContextFactory<AdminDbContext>
         var configuration = BuildConfiguration();
 
         var builder = new DbContextOptionsBuilder<AdminDbContext>()
-            .UseNpgsql(configuration.GetConnectionString("Default"));
+            .UseNpgsql(configuration.GetConnectionString(AdminConsts.ConnectionStringName));
 
         return new AdminDbContext(builder.Options);
     }

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()

shared/KonSoft.Shared.Hosting.AspNetCore/KonSoft.Shared.Hosting.AspNetCore.csproj

@@ -12,6 +12,7 @@
   </ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="AgileConfig.Client" Version="1.8.0" />
 		<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
 		<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="8.3.4" />
 		<PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="8.3.4" />