Merge branch 'master' into publish

agile.zhou · agile.zhou · commit 8b90e77afca9 · 2026-07-06T02:01:46.000+08:00
diff --git a/README.md b/README.md
@@ -18,9 +18,12 @@
     
 
 
-# [English](https://github.com/kklldog/AgileConfig/blob/master/README_EN.md) | [中文看这里](https://github.com/kklldog/AgileConfig/blob/master/README_CN.md)
+# [English](https://github.com/dotnetcore/AgileConfig/blob/master/README_EN.md) | [中文看这里](https://github.com/dotnetcore/AgileConfig/blob/master/README_CN.md)
 
 This is a lightweight configuration center based on .net core . It is easy to deploy , easy to learn , easy to use .
+
+CN Atomgit Mirror site: [AgileConfig](https://atomgit.com/dotnetcore/AgileConfig)
+
 ## 😍Features
 1. easy to deploy (docker or IIS)
 2. support distributed deploy
diff --git a/README_CN.md b/README_CN.md
@@ -9,20 +9,20 @@
 
 [![Member project of .NET Core Community](https://img.shields.io/badge/member%20project%20of-NCC-9e20c9.svg)](https://github.com/dotnetcore)
 [![package workflow](https://github.com/dotnetcore/AgileConfig/actions/workflows/release-xxx.yml/badge.svg)](https://github.com/dotnetcore/AgileConfig/actions/workflows/release-xxx.yml)
-![GitHub stars](https://img.shields.io/github/stars/kklldog/AgileConfig)
-![Commit Date](https://img.shields.io/github/last-commit/kklldog/AgileConfig/master.svg?logo=github&logoColor=green&label=commit)
+![GitHub stars](https://img.shields.io/github/stars/dotnetcore/AgileConfig)
+![Commit Date](https://img.shields.io/github/last-commit/dotnetcore/AgileConfig/master.svg?logo=github&logoColor=green&label=commit)
 ![Nuget](https://img.shields.io/nuget/v/agileconfig.client?label=agileconfig.client)
 ![Nuget](https://img.shields.io/nuget/dt/agileconfig.client?label=client%20download)
 ![Docker image](https://img.shields.io/docker/v/kklldog/agile_config?label=docker%20image)
-![GitHub license](https://img.shields.io/github/license/kklldog/AgileConfig)
+![GitHub license](https://img.shields.io/github/license/dotnetcore/AgileConfig)
 ![build workflow](https://github.com/dotnetcore/AgileConfig/actions/workflows/master-ci.yml/badge.svg)
     
-# [English](https://github.com/kklldog/AgileConfig/blob/master/README_EN.md) | [中文看这里](https://github.com/kklldog/AgileConfig/blob/master/README.md)
+# [English](https://github.com/dotnetcore/AgileConfig/blob/master/README_EN.md) | [中文看这里](https://github.com/dotnetcore/AgileConfig/blob/master/README.md)
     
 这是一个基于.net core开发的轻量级配置中心。说起配置中心很容易让人跟微服务联系起来，如果你选择微服务架构，那么几乎逃不了需要一个配置中心。事实上我这里并不是要蹭微服务的热度。这个世界上有很多分布式程序但它并不是微服务。比如有很多传统的SOA的应用他们分布式部署，但并不是完整的微服务架构。这些程序由于分散在多个服务器上所以更改配置很困难。又或者某些程序即使不是分布式部署的，但是他们采用了容器化部署，他们修改配置同样很费劲。所以我开发AgileConfig并不是为了什么微服务，我更多的是为了那些分布式、容器化部署的应用能够更加简单的读取、修改配置。    
 AgileConfig秉承轻量化的特点，部署简单、配置简单、使用简单、学习简单，它只提取了必要的一些功能，并没有像Apollo那样复杂且庞大。但是它的功能也已经足够你替换webconfig，appsettings.json这些文件了。如果你不想用微服务全家桶，不想为了部署一个配置中心而需要看N篇教程跟几台服务器那么你可以试试AgileConfig  ：）   
     
-Gitee 仓库镜像（不定时更新）：[https://gitee.com/kklldog/AgileConfig](https://gitee.com/kklldog/AgileConfig)    
+国内 Atomgit 托管: [AgileConfig](https://atomgit.com/dotnetcore/AgileConfig)
 
 💖💖 镜像拉不下来的看这：  
 由于众所周知的原因，最近在国内很难从 docker hub 上拉取镜像，所以在 aliyun 上做了一个公共的仓库：   
diff --git a/README_EN.md b/README_EN.md
@@ -8,7 +8,7 @@
 
 [![Member project of .NET Core Community](https://img.shields.io/badge/member%20project%20of-NCC-9e20c9.svg)](https://github.com/dotnetcore)
 [![package workflow](https://github.com/dotnetcore/AgileConfig/actions/workflows/release-xxx.yml/badge.svg)](https://github.com/dotnetcore/AgileConfig/actions/workflows/release-xxx.yml)
-![GitHub stars](https://img.shields.io/github/stars/kklldog/AgileConfig)
+![GitHub stars](https://img.shields.io/github/stars/dotnetcore/AgileConfig)
 ![Commit Date](https://img.shields.io/github/last-commit/kklldog/AgileConfig/master.svg?logo=github&logoColor=green&label=commit)
 ![Nuget](https://img.shields.io/nuget/v/agileconfig.client?label=agileconfig.client)
 ![Nuget](https://img.shields.io/nuget/dt/agileconfig.client?label=client%20download)
@@ -21,6 +21,9 @@
 # [English](https://github.com/kklldog/AgileConfig/blob/master/README_EN.md) | [中文看这里](https://github.com/kklldog/AgileConfig/blob/master/README_CN.md)
 
 This is a lightweight configuration center based on .net core . It is easy to deploy , easy to learn , easy to use .
+
+CN Atomgit Mirror site: [AgileConfig](https://atomgit.com/dotnetcore/AgileConfig)
+
 ## 😍Features
 1. easy to deploy (docker or IIS)
 2. support distributed deploy
diff --git a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
@@ -3,11 +3,11 @@
 	<PropertyGroup>
 		<TargetFramework>net10.0</TargetFramework>
 		<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
-		<AssemblyVersion>1.12.0</AssemblyVersion>
-		<Version>1.12.0</Version>
-		<PackageVersion>1.12.0</PackageVersion>
+		<AssemblyVersion>1.12.1</AssemblyVersion>
+		<Version>1.12.1</Version>
+		<PackageVersion>1.12.1</PackageVersion>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-		<FileVersion>1.12.0</FileVersion>
+		<FileVersion>1.12.1</FileVersion>
 		<Authors>kklldog</Authors>
 		<Company>kklldog</Company>
 	</PropertyGroup>
diff --git a/src/AgileConfig.Server.Apisite/Filters/PermissionCheckByBasicAttribute.cs b/src/AgileConfig.Server.Apisite/Filters/PermissionCheckByBasicAttribute.cs
@@ -19,7 +19,6 @@ public PermissionCheckByBasicAttribute(
         IConfigService configService,
         IAdmBasicAuthService basicAuthService,
         IUserService userService,
-        string actionName,
         string functionKey) : base(permissionService, configService, functionKey)
     {
         _userService = userService;
diff --git a/src/AgileConfig.Server.Apisite/InitService.cs b/src/AgileConfig.Server.Apisite/InitService.cs
@@ -43,10 +43,10 @@ public async Task StartAsync(CancellationToken cancellationToken)
         if (Appsettings.IsAdminConsoleMode)
         {
             _systemInitializationService.TryInitJwtSecret(); // Initialize the JWT secret.
+            await _systemInitializationService
+                .TryInitSystemRolesAndPermissions(); // Initialize system roles, functions and permission bindings.
             _systemInitializationService.TryInitSaPassword(); // init super admin password
             _systemInitializationService.TryInitDefaultApp();
-            await _systemInitializationService
-                .TryInitSuperAdminRole(); // Initialize SuperAdministrator role and functions
             _ = _remoteServerNodeProxy.TestEchoAsync(); // Start node connectivity checks.
             _ = _serviceHealthCheckService.StartCheckAsync(); // Start service health monitoring.
             _eventRegister.Register(); // Register event bus callbacks.
diff --git a/src/AgileConfig.Server.Data.Abstraction/ISysInitRepository.cs b/src/AgileConfig.Server.Data.Abstraction/ISysInitRepository.cs
@@ -32,4 +32,10 @@ public interface ISysInitRepository
     bool HasSa();
 
     bool InitDefaultApp(string appName);
+
+    /// <summary>
+    ///     Ensure the built-in system roles and their function permission bindings exist and stay in sync.
+    ///     Idempotent: safe to call on every startup without creating duplicate bindings.
+    /// </summary>
+    void EnsureSystemRolePermissions();
 }
diff --git a/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs b/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs
@@ -45,8 +45,6 @@ public bool InitSa(string password)
 
         var sql = freeSqlFactory.Create();
 
-        EnsureSystemRoles(sql);
-
         var user = new User();
         user.Id = SystemSettings.SuperAdminId;
         user.Password = password;
@@ -103,6 +101,12 @@ public bool InitDefaultApp(string appName)
         return true;
     }
 
+    public void EnsureSystemRolePermissions()
+    {
+        var sql = freeSqlFactory.Create();
+        EnsureSystemRoles(sql);
+    }
+
     private static void EnsureSystemRoles(IFreeSql sql)
     {
         // Super Admin gets all permissions
diff --git a/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs b/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs
@@ -48,8 +48,6 @@ public bool InitSa(string password)
         var newSalt = Guid.NewGuid().ToString("N");
         password = Encrypt.Md5(password + newSalt);
 
-        EnsureSystemRoles();
-
         var user = new User();
         user.Id = SystemSettings.SuperAdminId;
         user.Password = password;
@@ -112,6 +110,11 @@ public bool InitDefaultApp(string appName)
         return true;
     }
 
+    public void EnsureSystemRolePermissions()
+    {
+        EnsureSystemRoles();
+    }
+
     private void EnsureSystemRoles()
     {
         EnsureRole(SystemRoleConstants.SuperAdminId, "Super Administrator");
diff --git a/src/AgileConfig.Server.IService/ISystemInitializationService.cs b/src/AgileConfig.Server.IService/ISystemInitializationService.cs
@@ -14,5 +14,5 @@ public interface ISystemInitializationService
 
     bool TryInitDefaultEnvironment();
 
-    Task<bool> TryInitSuperAdminRole();
+    Task<bool> TryInitSystemRolesAndPermissions();
 }
diff --git a/src/AgileConfig.Server.Service/SystemInitializationService.cs b/src/AgileConfig.Server.Service/SystemInitializationService.cs
@@ -14,9 +14,7 @@ public class SystemInitializationService(
     ISysInitRepository sysInitRepository,
     IConfiguration configuration,
     ILogger<SystemInitializationService> logger,
-    IRoleDefinitionRepository roleDefinitionRepository,
-    IFunctionRepository functionRepository,
-    IRoleFunctionRepository roleFunctionRepository) : ISystemInitializationService
+    IFunctionRepository functionRepository) : ISystemInitializationService
 {
     /// <summary>
     ///     Initialize the JWT secret if it is not configured via file or environment variables.
@@ -130,59 +128,25 @@ public bool TryInitDefaultApp(string appName = "")
         return true;
     }
 
-    public async Task<bool> TryInitSuperAdminRole()
+    public async Task<bool> TryInitSystemRolesAndPermissions()
     {
         try
         {
-            // Check if SuperAdministrator role already exists
-            var superAdminRole = await roleDefinitionRepository.GetAsync(SystemRoleConstants.SuperAdminId);
-            if (superAdminRole != null)
-            {
-                logger.LogInformation("SuperAdministrator role already exists.");
-                return true;
-            }
-
-            // Create SuperAdministrator role
-            superAdminRole = new Role
-            {
-                Id = SystemRoleConstants.SuperAdminId,
-                Name = "SuperAdministrator",
-                Description = "System super administrator with all permissions",
-                IsSystem = true,
-                CreateTime = DateTime.Now
-            };
-
-            await roleDefinitionRepository.InsertAsync(superAdminRole);
-            logger.LogInformation("SuperAdministrator role created successfully.");
-
-            // Get all existing functions
+            // Ensure the built-in permission (function) catalog exists first, because the
+            // system role-function bindings are matched against these function codes.
             var allFunctions = await functionRepository.AllAsync();
+            if (allFunctions.Count == 0) await InitializeFunctions();
 
-            // If no functions exist yet, create them from the Functions class constants
-            if (allFunctions.Count == 0) allFunctions = await InitializeFunctions();
-
-// Bind all functions to SuperAdministrator role
-            var roleFunctions = new List<RoleFunction>();
-            foreach (var function in allFunctions)
-                roleFunctions.Add(new RoleFunction
-                {
-                    Id = Guid.NewGuid().ToString("N"),
-                    RoleId = SystemRoleConstants.SuperAdminId,
-                    FunctionId = function.Id,
-                    CreateTime = DateTime.Now
-                });
-
-            if (roleFunctions.Count > 0)
-            {
-                await roleFunctionRepository.InsertAsync(roleFunctions);
-                logger.LogInformation("Bound {count} functions to SuperAdministrator role.", roleFunctions.Count);
-            }
+            // Delegate system role creation and role-function binding to the single
+            // idempotent implementation in the repository layer. It only adds missing
+            // bindings and removes stale ones, so it is safe to run on every startup.
+            sysInitRepository.EnsureSystemRolePermissions();
 
             return true;
         }
         catch (Exception e)
         {
-            logger.LogError(e, "Failed to initialize SuperAdministrator role.");
+            logger.LogError(e, "Failed to initialize system roles and permissions.");
             return false;
         }
     }
diff --git a/test/ApiSiteTests/AdmBasicAuthenticationEndpointsIntegrationTests.cs b/test/ApiSiteTests/AdmBasicAuthenticationEndpointsIntegrationTests.cs
diff --git a/test/ApiSiteTests/ApiSiteTests.csproj b/test/ApiSiteTests/ApiSiteTests.csproj

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,6 @@ public PermissionCheckByBasicAttribute(`
`19`	`19`	`IConfigService configService,`
`20`	`20`	`IAdmBasicAuthService basicAuthService,`
`21`	`21`	`IUserService userService,`
`22`		`- string actionName,`
`23`	`22`	`string functionKey) : base(permissionService, configService, functionKey)`
`24`	`23`	`{`
`25`	`24`	`_userService = userService;`
Original file line number	Diff line number	Diff line change
`@@ -14,5 +14,5 @@ public interface ISystemInitializationService`
`14`	`14`
`15`	`15`	`bool TryInitDefaultEnvironment();`
`16`	`16`
`17`		`- Task<bool> TryInitSuperAdminRole();`
	`17`	`+ Task<bool> TryInitSystemRolesAndPermissions();`
`18`	`18`	`}`