clearn code

agile.zhou · agile.zhou · commit 87bd8209e7b2 · 2025-11-24T01:39:04.000+08:00
diff --git a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.csproj
@@ -48,12 +48,15 @@
 	<ItemGroup>
 		<ProjectReference Include="..\AgileConfig.Server.Common\AgileConfig.Server.Common.csproj" />
 		<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="..\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.Data.Repository.Selector\AgileConfig.Server.Data.Repository.Selector.csproj" />
 		<ProjectReference Include="..\AgileConfig.Server.Event\AgileConfig.Server.Event.csproj" />
 		<ProjectReference Include="..\AgileConfig.Server.OIDC\AgileConfig.Server.OIDC.csproj" />
 		<ProjectReference Include="..\AgileConfig.Server.Service\AgileConfig.Server.Service.csproj" />
@@ -80,4 +83,4 @@
 		</VisualStudio>
 	</ProjectExtensions>
 
-</Project>
+</Project>
diff --git a/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.xml b/src/AgileConfig.Server.Apisite/AgileConfig.Server.Apisite.xml
@@ -513,4 +513,4 @@
 			<returns></returns>
 		</member>
 	</members>
-</doc>
+</doc>
diff --git a/src/AgileConfig.Server.Apisite/Controllers/AppController.cs b/src/AgileConfig.Server.Apisite/Controllers/AppController.cs
@@ -353,4 +353,4 @@ public async Task<IActionResult> GetAppGroups()
             data = groups.OrderBy(x => x)
         });
     }
-}
+}
diff --git a/src/AgileConfig.Server.Apisite/Controllers/SysLogController.cs b/src/AgileConfig.Server.Apisite/Controllers/SysLogController.cs
@@ -1,10 +1,10 @@
-﻿using AgileConfig.Server.Apisite.Filters;
+﻿using System;
+using System.Threading.Tasks;
+using AgileConfig.Server.Apisite.Filters;
 using AgileConfig.Server.Data.Entity;
 using AgileConfig.Server.IService;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
 
 namespace AgileConfig.Server.Apisite.Controllers;
 
diff --git a/src/AgileConfig.Server.Apisite/Controllers/api/Models/ApiAppVM.cs b/src/AgileConfig.Server.Apisite/Controllers/api/Models/ApiAppVM.cs
@@ -64,4 +64,4 @@ public static AppVM ToAppVM(this ApiAppVM vm)
             Enabled = vm.Enabled.GetValueOrDefault()
         };
     }
-}
+}
diff --git a/src/AgileConfig.Server.Apisite/Filters/PermissionCheckAttribute.cs b/src/AgileConfig.Server.Apisite/Filters/PermissionCheckAttribute.cs
@@ -1,11 +1,6 @@
-﻿using System;
-using System.Collections.Frozen;
-using System.Collections.Generic;
-using System.Linq;
+﻿using System.Collections.Generic;
 using System.Threading.Tasks;
-using AgileConfig.Server.Apisite.Models;
 using AgileConfig.Server.Common;
-using AgileConfig.Server.Data.Entity;
 using AgileConfig.Server.IService;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -19,7 +14,8 @@ public class PermissionCheckAttribute : ActionFilterAttribute
 
     private readonly IPermissionService _permissionService;
 
-    public PermissionCheckAttribute(IPermissionService permissionService, IConfigService configService, string functionKey)
+    public PermissionCheckAttribute(IPermissionService permissionService, IConfigService configService,
+        string functionKey)
     {
         _permissionService = permissionService;
         _configService = configService;
@@ -71,4 +67,4 @@ public override async Task OnActionExecutionAsync(ActionExecutingContext context
         context.Result = new ContentResult();
         await base.OnActionExecutionAsync(context, next);
     }
-}
+}
diff --git a/src/AgileConfig.Server.Apisite/Models/AppAuthVM.cs b/src/AgileConfig.Server.Apisite/Models/AppAuthVM.cs
@@ -9,4 +9,4 @@ public class AppAuthVM : IAppIdModel
     public List<string> AuthorizedUsers { get; set; }
 
     public string AppId { get; set; }
-}
+}
diff --git a/src/AgileConfig.Server.Apisite/Models/AppVM.cs b/src/AgileConfig.Server.Apisite/Models/AppVM.cs
@@ -96,4 +96,4 @@ public static ApiAppVM ToApiAppVM(this AppVM vm)
             CreateTime = vm.CreateTime
         };
     }
-}
+}
diff --git a/src/AgileConfig.Server.Apisite/Models/Mapping/ModelMappingExtension.cs b/src/AgileConfig.Server.Apisite/Models/Mapping/ModelMappingExtension.cs
@@ -150,4 +150,4 @@ public static ApiConfigVM ToApiConfigVM(this Config config)
 
         return vm;
     }
-}
+}
diff --git a/src/AgileConfig.Server.Data.Entity/App.cs b/src/AgileConfig.Server.Data.Entity/App.cs
@@ -54,4 +54,4 @@ public class App : IAppModel, IEntity<string>
     [Column(Name = "create_time")]
     [BsonDateTimeOptions(Kind = DateTimeKind.Local)]
     public DateTime CreateTime { get; set; }
-}
+}
diff --git a/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs b/src/AgileConfig.Server.Data.Freesql/EnsureTables.cs
@@ -63,7 +63,6 @@ public static bool ExistTable(IFreeSql instance)
     public static void Ensure(IFreeSql instance)
     {
         if (!ExistTable(instance))
-        {
             try
             {
                 if (instance.Ado.DataType == DataType.Oracle)
@@ -91,6 +90,5 @@ public static void Ensure(IFreeSql instance)
                 var logger = Global.LoggerFactory.CreateLogger<EnsureTables>();
                 logger.LogError(ex, "Ensure Tables failed .");
             }
-        }
     }
-}
+}
diff --git a/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs b/src/AgileConfig.Server.Data.Repository.Freesql/SysInitRepository.cs
@@ -218,4 +218,4 @@ private static void EnsureRolePermissions(IFreeSql sql, string roleId, List<stri
                 .Where(rf => roleFunctionsToRemove.Select(r => r.Id).Contains(rf.Id))
                 .ExecuteAffrows();
     }
-}
+}
diff --git a/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs b/src/AgileConfig.Server.Data.Repository.Mongodb/SysInitRepository.cs
@@ -142,4 +142,4 @@ private void EnsureRole(string id, string name)
             _roleAccess.Collection.ReplaceOne(x => x.Id == id, role, new ReplaceOptions { IsUpsert = true });
         }
     }
-}
+}
diff --git a/src/AgileConfig.Server.IService/IAppService.cs b/src/AgileConfig.Server.IService/IAppService.cs
@@ -47,4 +47,4 @@ public interface IAppService : IDisposable
     Task<List<User>> GetUserAppAuth(string appId);
 
     Task<List<string>> GetAppGroups();
-}
+}
diff --git a/src/AgileConfig.Server.IService/IPermissionService.cs b/src/AgileConfig.Server.IService/IPermissionService.cs
@@ -49,52 +49,51 @@ public static List<string> GetAllPermissions()
         return new List<string>
         {
             // Application permissions
-            Functions.App_Read,
-            Functions.App_Add,
-            Functions.App_Edit,
-            Functions.App_Delete,
-            Functions.App_Auth,
+            App_Read,
+            App_Add,
+            App_Edit,
+            App_Delete,
+            App_Auth,
 
             // Configuration permissions
-            Functions.Config_Read,
-            Functions.Config_Add,
-            Functions.Config_Edit,
-            Functions.Config_Delete,
-            Functions.Config_Publish,
-            Functions.Config_Offline,
+            Config_Read,
+            Config_Add,
+            Config_Edit,
+            Config_Delete,
+            Config_Publish,
+            Config_Offline,
 
             // Node permissions
-            Functions.Node_Read,
-            Functions.Node_Add,
-            Functions.Node_Delete,
+            Node_Read,
+            Node_Add,
+            Node_Delete,
 
             // Client permissions
-            Functions.Client_Refresh,
-            Functions.Client_Disconnect,
-            Functions.Client_Read,
+            Client_Refresh,
+            Client_Disconnect,
+            Client_Read,
 
             // User permissions
-            Functions.User_Read,
-            Functions.User_Add,
-            Functions.User_Edit,
-            Functions.User_Delete,
+            User_Read,
+            User_Add,
+            User_Edit,
+            User_Delete,
 
             // Role permissions
-            Functions.Role_Read,
-            Functions.Role_Add,
-            Functions.Role_Edit,
-            Functions.Role_Delete,
+            Role_Read,
+            Role_Add,
+            Role_Edit,
+            Role_Delete,
 
             // Service permissions
-            Functions.Service_Read,
-            Functions.Service_Add,
-            Functions.Service_Delete,
+            Service_Read,
+            Service_Add,
+            Service_Delete,
 
             // System permissions
-            Functions.Log_Read
+            Log_Read
         };
     }
-
 }
 
 public interface IPermissionService
diff --git a/src/AgileConfig.Server.Service/AppService.cs b/src/AgileConfig.Server.Service/AppService.cs
@@ -321,16 +321,6 @@ public void Dispose()
         _userRepository.Dispose();
     }
 
-    private async Task<List<string>> GetUserAuthorizedAppIds(string userId)
-    {
-        var authorizedAppIds = new List<string>();
-        if (string.IsNullOrWhiteSpace(userId)) return authorizedAppIds;
-
-        var auths = await _userAppAuthRepository.QueryAsync(x => x.UserId == userId);
-
-        return auths.Select(x => x.AppId).Distinct().ToList();
-    }
-
     public async Task<List<User>> GetUserAppAuth(string appId)
     {
         var auths = await _userAppAuthRepository.QueryAsync(x => x.AppId == appId);
@@ -349,4 +339,14 @@ public async Task<List<string>> GetAppGroups()
         var groups = apps.GroupBy(x => x.Group).Select(x => x.Key);
         return groups.Where(x => !string.IsNullOrEmpty(x)).ToList();
     }
-}
+
+    private async Task<List<string>> GetUserAuthorizedAppIds(string userId)
+    {
+        var authorizedAppIds = new List<string>();
+        if (string.IsNullOrWhiteSpace(userId)) return authorizedAppIds;
+
+        var auths = await _userAppAuthRepository.QueryAsync(x => x.UserId == userId);
+
+        return auths.Select(x => x.AppId).Distinct().ToList();
+    }
+}
diff --git a/src/AgileConfig.Server.Service/PermissionService.cs b/src/AgileConfig.Server.Service/PermissionService.cs
@@ -78,4 +78,4 @@ public async Task<List<string>> GetUserCategories(string userId)
     public string EditConfigPermissionKey => "EDIT_CONFIG";
 
     public string PublishConfigPermissionKey => "PUBLISH_CONFIG";
-}
+}
diff --git a/test/AgileConfig.Server.Data.AbstractionTests/DbConfig/DbConfigInfoFactoryTests.cs b/test/AgileConfig.Server.Data.AbstractionTests/DbConfig/DbConfigInfoFactoryTests.cs
@@ -1,7 +1,6 @@
 ﻿using AgileConfig.Server.Common;
 using AgileConfig.Server.Data.Abstraction.DbProvider;
 using Microsoft.Extensions.Configuration;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace AgileConfig.Server.Data.AbstractionTests.DbConfig;
 
diff --git a/test/AgileConfig.Server.Data.FreesqlTests/FreeSQLTests.cs b/test/AgileConfig.Server.Data.FreesqlTests/FreeSQLTests.cs
@@ -2,7 +2,6 @@
 using AgileConfig.Server.Data.Abstraction.DbProvider;
 using FreeSql;
 using Microsoft.Extensions.Configuration;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace AgileConfig.Server.Data.Freesql.Tests;
 
diff --git a/test/AgileConfig.Server.Data.FreesqlTests/FreeSqlUowTests.cs b/test/AgileConfig.Server.Data.FreesqlTests/FreeSqlUowTests.cs
@@ -1,6 +1,5 @@
 ﻿using AgileConfig.Server.Data.Abstraction.DbProvider;
 using Microsoft.Extensions.Configuration;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 namespace AgileConfig.Server.Data.Freesql.Tests;
 

Original file line number	Diff line number	Diff line change
`@@ -353,4 +353,4 @@ public async Task<IActionResult> GetAppGroups()`
`353`	`353`	`data = groups.OrderBy(x => x)`
`354`	`354`	`});`
`355`	`355`	`}`
`356`		`-}`
	`356`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -64,4 +64,4 @@ public static AppVM ToAppVM(this ApiAppVM vm)`
`64`	`64`	`Enabled = vm.Enabled.GetValueOrDefault()`
`65`	`65`	`};`
`66`	`66`	`}`
`67`		`-}`
	`67`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -96,4 +96,4 @@ public static ApiAppVM ToApiAppVM(this AppVM vm)`
`96`	`96`	`CreateTime = vm.CreateTime`
`97`	`97`	`};`
`98`	`98`	`}`
`99`		`-}`
	`99`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -150,4 +150,4 @@ public static ApiConfigVM ToApiConfigVM(this Config config)`
`150`	`150`
`151`	`151`	`return vm;`
`152`	`152`	`}`
`153`		`-}`
	`153`	`+}`