Mongodb 支持

.github/workflows/master-ci.yml

@@ -6,10 +6,6 @@ on:
     paths-ignore: 
       - '**/*.md'
       - '**/*.yml'
-  pull_request:
-    branches: [ master ]
-  workflow_dispatch:
-
 jobs:
   build-reactapp:
     runs-on: ubuntu-latest

.github/workflows/master-pr-ci.yml

@@ -0,0 +1,40 @@
+name: master pr ci workflow
+
+on:
+  pull_request:
+    branches: [ master ]
+  workflow_dispatch:
+
+jobs:
+  build-reactapp:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: src/AgileConfig.Server.UI/react-ui-antd
+    strategy:
+      matrix:
+        node-version: [16.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+
+    - run: npm install
+    - run: npm run build
+  build-dotnet:
+    needs: build-reactapp
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.*
+    - name: Install dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --configuration Release --no-restore

AgileConfig.sln

@@ -36,7 +36,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.ServiceT
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.CommonTests", "test\AgileConfig.Server.CommonTests\AgileConfig.Server.CommonTests.csproj", "{70724B0E-7D81-412C-BDA7-747F4845E990}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AgileConfig.Server.OIDC", "src\AgileConfig.Server.OIDC\AgileConfig.Server.OIDC.csproj", "{E49A2006-6D07-4434-AEC1-27E356A767AE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.OIDC", "src\AgileConfig.Server.OIDC\AgileConfig.Server.OIDC.csproj", "{E49A2006-6D07-4434-AEC1-27E356A767AE}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Mongodb", "src\AgileConfig.Server.Data.Mongodb\AgileConfig.Server.Data.Mongodb.csproj", "{4803646E-8327-4F69-8BA5-2244CB58BBA2}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Abstraction", "src\AgileConfig.Server.Data.Abstraction\AgileConfig.Server.Data.Abstraction.csproj", "{E8101403-72C9-40FB-BCEE-16ED5C23A495}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Repository.Freesql", "src\AgileConfig.Server.Data.Repository.Freesql\AgileConfig.Server.Data.Repository.Freesql.csproj", "{955F64CC-9EAC-4563-804D-6E2CF9547357}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Repository.Mongodb", "src\AgileConfig.Server.Data.Repository.Mongodb\AgileConfig.Server.Data.Repository.Mongodb.csproj", "{C6B7A5A6-7287-4A20-9336-EBE82A5256F1}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.Repository.Selector", "src\AgileConfig.Server.Data.Repository.Selector\AgileConfig.Server.Data.Repository.Selector.csproj", "{15089E5A-12E4-4953-BA35-0CBB2B1189C0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.AbstractionTests", "test\AgileConfig.Server.Data.AbstractionTests\AgileConfig.Server.Data.AbstractionTests.csproj", "{964F5F7A-3BBD-47B3-8C28-EC16B1038A5A}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AgileConfig.Server.Data.FreesqlTests", "test\AgileConfig.Server.Data.FreesqlTests\AgileConfig.Server.Data.FreesqlTests.csproj", "{AC7E4D24-D5E8-4E30-BFB0-5DDC581CB0C2}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -88,6 +102,34 @@ Global
 		{E49A2006-6D07-4434-AEC1-27E356A767AE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E49A2006-6D07-4434-AEC1-27E356A767AE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E49A2006-6D07-4434-AEC1-27E356A767AE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4803646E-8327-4F69-8BA5-2244CB58BBA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4803646E-8327-4F69-8BA5-2244CB58BBA2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4803646E-8327-4F69-8BA5-2244CB58BBA2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4803646E-8327-4F69-8BA5-2244CB58BBA2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8101403-72C9-40FB-BCEE-16ED5C23A495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8101403-72C9-40FB-BCEE-16ED5C23A495}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8101403-72C9-40FB-BCEE-16ED5C23A495}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8101403-72C9-40FB-BCEE-16ED5C23A495}.Release|Any CPU.Build.0 = Release|Any CPU
+		{955F64CC-9EAC-4563-804D-6E2CF9547357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{955F64CC-9EAC-4563-804D-6E2CF9547357}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{955F64CC-9EAC-4563-804D-6E2CF9547357}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{955F64CC-9EAC-4563-804D-6E2CF9547357}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6B7A5A6-7287-4A20-9336-EBE82A5256F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C6B7A5A6-7287-4A20-9336-EBE82A5256F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6B7A5A6-7287-4A20-9336-EBE82A5256F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C6B7A5A6-7287-4A20-9336-EBE82A5256F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{15089E5A-12E4-4953-BA35-0CBB2B1189C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{15089E5A-12E4-4953-BA35-0CBB2B1189C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{15089E5A-12E4-4953-BA35-0CBB2B1189C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{15089E5A-12E4-4953-BA35-0CBB2B1189C0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{964F5F7A-3BBD-47B3-8C28-EC16B1038A5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{964F5F7A-3BBD-47B3-8C28-EC16B1038A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{964F5F7A-3BBD-47B3-8C28-EC16B1038A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{964F5F7A-3BBD-47B3-8C28-EC16B1038A5A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AC7E4D24-D5E8-4E30-BFB0-5DDC581CB0C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AC7E4D24-D5E8-4E30-BFB0-5DDC581CB0C2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AC7E4D24-D5E8-4E30-BFB0-5DDC581CB0C2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AC7E4D24-D5E8-4E30-BFB0-5DDC581CB0C2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -104,6 +146,13 @@ Global
 		{8CE2DB53-3A35-4991-A419-0EC12B001F59} = {F277EC27-8C0E-4490-9645-F5F3244F9246}
 		{70724B0E-7D81-412C-BDA7-747F4845E990} = {F277EC27-8C0E-4490-9645-F5F3244F9246}
 		{E49A2006-6D07-4434-AEC1-27E356A767AE} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
+		{4803646E-8327-4F69-8BA5-2244CB58BBA2} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
+		{E8101403-72C9-40FB-BCEE-16ED5C23A495} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
+		{955F64CC-9EAC-4563-804D-6E2CF9547357} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
+		{C6B7A5A6-7287-4A20-9336-EBE82A5256F1} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
+		{15089E5A-12E4-4953-BA35-0CBB2B1189C0} = {1D2FD643-CB85-40F9-BC8A-CE4A39E9F43E}
+		{964F5F7A-3BBD-47B3-8C28-EC16B1038A5A} = {F277EC27-8C0E-4490-9645-F5F3244F9246}
+		{AC7E4D24-D5E8-4E30-BFB0-5DDC581CB0C2} = {F277EC27-8C0E-4490-9645-F5F3244F9246}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7F10DB58-5B6F-4EAC-994F-14E8046B306F}

src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj

@@ -38,9 +38,13 @@
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\AgileConfig.Server.Data.Abstraction\AgileConfig.Server.Data.Abstraction.csproj" />
+    <ProjectReference Include="..\AgileConfig.Server.Data.Repository.Freesql\AgileConfig.Server.Data.Repository.Freesql.csproj" />
+    <ProjectReference Include="..\AgileConfig.Server.Data.Repository.Mongodb\AgileConfig.Server.Data.Repository.Mongodb.csproj" />
     <ProjectReference Include="..\Agile.Config.Protocol\Agile.Config.Protocol.csproj" />
     <ProjectReference Include="..\AgileConfig.Server.Data.Entity\AgileConfig.Server.Data.Entity.csproj" />
     <ProjectReference Include="..\AgileConfig.Server.Data.Freesql\AgileConfig.Server.Data.Freesql.csproj" />
+    <ProjectReference Include="..\AgileConfig.Server.Data.Repository.Selector\AgileConfig.Server.Data.Repository.Selector.csproj" />
     <ProjectReference Include="..\AgileConfig.Server.OIDC\AgileConfig.Server.OIDC.csproj" />
     <ProjectReference Include="..\AgileConfig.Server.Service\AgileConfig.Server.Service.csproj" />
   </ItemGroup>

src/AgileConfig.Server.Apisite/ConfigureJwtBearerOptions.cs

@@ -0,0 +1,26 @@
+using System.Text;
+using AgileConfig.Server.IService;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.Extensions.Options;
+using Microsoft.IdentityModel.Tokens;
+
+namespace AgileConfig.Server.Apisite;
+
+public class ConfigureJwtBearerOptions(
+    IJwtService jwtService) : IConfigureNamedOptions<JwtBearerOptions>
+{
+    public void Configure(JwtBearerOptions options)
+    {
+        options.TokenValidationParameters = new TokenValidationParameters
+        {
+            ValidIssuer = jwtService.Issuer,
+            ValidAudience = jwtService.Audience,
+            IssuerSigningKey = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(jwtService.GetSecurityKey())),
+        };
+    }
+
+    public void Configure(string name, JwtBearerOptions options)
+    {
+        Configure(options);
+    }
+}

src/AgileConfig.Server.Apisite/Controllers/AppController.cs

@@ -53,7 +53,7 @@ public async Task<IActionResult> Search(string name, string id, string group, st
             {
                 query = query.Where(x => x.Group == group).ToList();
             }
-            
+
             var appvms = new List<AppListVM>();
             foreach (var app in query)
             {
@@ -78,7 +78,7 @@ public async Task<IActionResult> Search(string name, string id, string group, st
                         }
                     }
 
-                    if (children.Count>0)
+                    if (children.Count > 0)
                     {
                         first.children = children;
                     }
@@ -87,10 +87,10 @@ public async Task<IActionResult> Search(string name, string id, string group, st
 
                 appvms = appGroupList;
             }
-            
+
             if (tableGrouped)
             {
-                if ( sortField == "group" && ascOrDesc.StartsWith("desc"))
+                if (sortField == "group" && ascOrDesc.StartsWith("desc"))
                 {
                     appvms = appvms.OrderByDescending(x => x.Group).ToList();
                 }
@@ -146,7 +146,7 @@ public async Task<IActionResult> Search(string name, string id, string group, st
                     }
                 }
             }
-            
+
             var count = appvms.Count;
             var pageList = appvms.ToList().Skip((current - 1) * pageSize).Take(pageSize).ToList();
             await AppendInheritancedInfo(pageList);
@@ -158,7 +158,7 @@ public async Task<IActionResult> Search(string name, string id, string group, st
                 total = count,
                 data = pageList
             });
-        } 
+        }
 
         private async Task<AppListVM> AppToListVM(App item, bool appendInheritancedInfo)
         {
@@ -203,13 +203,13 @@ private async Task AppendInheritancedInfo(List<AppListVM> list)
                     ? new List<string>()
                     : (inheritancedApps).Select(ia => ia.Name).ToList();
                 appListVm.AppAdminName = (await _userService.GetUserAsync(appListVm.AppAdmin))?.UserName;
-                if (appListVm.children!=null)
+                if (appListVm.children != null)
                 {
                     await AppendInheritancedInfo(appListVm.children);
                 }
             }
         }
-        
+
         [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "App.Add", Functions.App_Add })]
         [HttpPost]
         public async Task<IActionResult> Add([FromBody] AppVM model)
@@ -309,7 +309,7 @@ public async Task<IActionResult> Edit([FromBody] AppVM model)
             app.Type = model.Inheritanced ? AppType.Inheritance : AppType.PRIVATE;
             app.AppAdmin = model.AppAdmin;
             app.Group = model.Group;
-            
+
             var inheritanceApps = new List<AppInheritanced>();
             if (!model.Inheritanced && model.inheritancedApps != null)
             {
@@ -546,7 +546,7 @@ public async Task<IActionResult> GetUserAppAuth(string appId)
             {
                 AppId = appId
             };
-            result.EditConfigPermissionUsers = (await _appService.GetUserAppAuth(appId, _premissionService.EditConfigPermissionKey)).Select(x=>x.Id).ToList();
+            result.EditConfigPermissionUsers = (await _appService.GetUserAppAuth(appId, _premissionService.EditConfigPermissionKey)).Select(x => x.Id).ToList();
             result.PublishConfigPermissionUsers = (await _appService.GetUserAppAuth(appId, _premissionService.PublishConfigPermissionKey)).Select(x => x.Id).ToList();
 
             return Json(new
@@ -557,12 +557,13 @@ public async Task<IActionResult> GetUserAppAuth(string appId)
         }
 
         [HttpGet]
-        public IActionResult GetAppGroups()
+        public async Task<IActionResult> GetAppGroups()
         {
+            var groups = await _appService.GetAppGroups();
             return Json(new
             {
                 success = true,
-                data = _appService.GetAppGroups().OrderBy(x=>x)
+                data = groups.OrderBy(x => x)
             });
         }
     }

src/AgileConfig.Server.Apisite/Controllers/ConfigController.cs

@@ -572,7 +572,7 @@ public async Task<IActionResult> Publish([FromBody] PublishLogVM model, string e
 
             var appId = model.AppId;
             var userId = await this.GetCurrentUserId(_userService);
-            var ret = _configService.Publish(appId, model.Ids, model.Log, userId, env);
+            var ret = await _configService.Publish(appId, model.Ids, model.Log, userId, env);
 
             if (ret.result)
             {

src/AgileConfig.Server.Apisite/Controllers/ReportController.cs

@@ -73,11 +73,11 @@ public async Task<IActionResult> SearchServerNodeClients(string address, int cur
             var nodes = await _serverNodeService.GetAllNodesAsync();
             if (string.IsNullOrEmpty(address))
             {
-                addressess.AddRange(nodes.Where(x=>x.Status == NodeStatus.Online).Select(n => n.Address));
+                addressess.AddRange(nodes.Where(x=>x.Status == NodeStatus.Online).Select(n => n.Id.ToString()));
             }
             else
             {
-                if (nodes.Any(x=>x.Status == NodeStatus.Online && x.Address.Equals(address, StringComparison.CurrentCultureIgnoreCase)))
+                if (nodes.Any(x=>x.Status == NodeStatus.Online && x.Id.ToString().Equals(address, StringComparison.CurrentCultureIgnoreCase)))
                 {
                     addressess.Add(address);
                 }
@@ -162,7 +162,7 @@ public async Task<IActionResult> RemoteNodesStatus()
                 result.Add(new
                 {
                     n = serverNode,
-                    server_status = await _remoteServerNodeProxy.GetClientsReportAsync(serverNode.Address)
+                    server_status = await _remoteServerNodeProxy.GetClientsReportAsync(serverNode.Id.ToString())
                 });
             }
 

src/AgileConfig.Server.Apisite/Controllers/ServerNodeController.cs

@@ -32,7 +32,7 @@ public ServerNodeController(IServerNodeService serverNodeService,
 
         [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "Node.Add", Functions.Node_Add })]
         [HttpPost]
-        public async Task<IActionResult> Add([FromBody]ServerNodeVM model)
+        public async Task<IActionResult> Add([FromBody] ServerNodeVM model)
         {
             if (model == null)
             {
@@ -50,7 +50,7 @@ public async Task<IActionResult> Add([FromBody]ServerNodeVM model)
             }
 
             var node = new ServerNode();
-            node.Address = model.Address.TrimEnd('/');
+            node.Id = model.Address.TrimEnd('/');
             node.Remark = model.Remark;
             node.Status = NodeStatus.Offline;
             node.CreateTime = DateTime.Now;
@@ -62,9 +62,9 @@ public async Task<IActionResult> Add([FromBody]ServerNodeVM model)
                 param.node = node;
                 param.userName = this.GetCurrentUserName();
                 TinyEventBus.Instance.Fire(EventKeys.ADD_NODE_SUCCESS, param);
-                await _remoteServerNodeProxy.TestEchoAsync(node.Address);
+                await _remoteServerNodeProxy.TestEchoAsync(node.Id);
             }
-           
+
             return Json(new
             {
                 data = node,
@@ -75,7 +75,7 @@ public async Task<IActionResult> Add([FromBody]ServerNodeVM model)
 
         [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "Node.Delete", Functions.Node_Delete })]
         [HttpPost]
-        public async Task<IActionResult> Delete([FromBody]ServerNodeVM model)
+        public async Task<IActionResult> Delete([FromBody] ServerNodeVM model)
         {
             if (Appsettings.IsPreviewMode)
             {
@@ -120,10 +120,21 @@ public async Task<IActionResult> All()
         {
             var nodes = await _serverNodeService.GetAllNodesAsync();
 
+            var vms = nodes.OrderBy(x => x.CreateTime).Select(x =>
+            {
+                return new ServerNodeVM
+                {
+                    Address = x.Id,
+                    Remark = x.Remark,
+                    LastEchoTime = x.LastEchoTime,
+                    Status = x.Status
+                };
+            });
+
             return Json(new
             {
                 success = true,
-                data = nodes.OrderBy(n => n.CreateTime)
+                data = vms
             });
         }
     }

src/AgileConfig.Server.Apisite/Controllers/UserController.cs

@@ -38,7 +38,7 @@ public async Task<IActionResult> Search(string userName, string team, int curren
             }
 
             var users = await _userService.GetAll();
-            users = users.Where(x => x.Status == UserStatus.Normal && x.Id != SettingService.SuperAdminId).ToList();
+            users = users.Where(x => x.Status == UserStatus.Normal && x.Id != SystemSettings.SuperAdminId).ToList();
             if (!string.IsNullOrEmpty(userName))
             {
                 users = users.Where(x => x.UserName != null && x.UserName.Contains(userName)).ToList();
@@ -264,7 +264,7 @@ public async Task<IActionResult> adminUsers()
         public async Task<IActionResult> AllUsers()
         {
             var users = await _userService.GetAll();
-            users = users.Where(x => x.Status == UserStatus.Normal && x.Id != SettingService.SuperAdminId).ToList();
+            users = users.Where(x => x.Status == UserStatus.Normal && x.Id != SystemSettings.SuperAdminId).ToList();
 
             return Json(new
             {

src/AgileConfig.Server.Apisite/Controllers/api/ConfigController.cs

@@ -58,7 +58,8 @@ public async Task<ActionResult<List<ApiConfigVM>>> GetAppConfig(string appId, [F
             }
 
             var cacheKey = $"ConfigController_APPCONFIG_{appId}_{env}";
-            _cacheMemory.TryGetValue(cacheKey, out List<ApiConfigVM> configs);
+            List<ApiConfigVM> configs = null;
+            _cacheMemory?.TryGetValue(cacheKey, out configs);
             if (configs != null)
             {
                 return configs;
@@ -83,7 +84,7 @@ public async Task<ActionResult<List<ApiConfigVM>>> GetAppConfig(string appId, [F
             //增加5s的缓存，防止同一个app同时启动造成db的压力过大
             var cacheOp = new MemoryCacheEntryOptions()
                 .SetAbsoluteExpiration(TimeSpan.FromSeconds(5));
-            _cacheMemory.Set(cacheKey, vms, cacheOp);
+            _cacheMemory?.Set(cacheKey, vms, cacheOp);
 
             return vms;
         }