Merge pull request #197 from dotnetcore/dev

Correct naming;
dotnetcore · Nov 2, 2024 · 861afaa · 861afaa
2 parents 7b9e57a + b10e889
commit 861afaa
Show file tree

Hide file tree

Showing 46 changed files with 1,811 additions and 921 deletions.
diff --git a/src/AgileConfig.Server.Apisite/Appsettings.cs b/src/AgileConfig.Server.Apisite/Appsettings.cs
@@ -1,8 +1,5 @@
 using AgileConfig.Server.Common;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace AgileConfig.Server.Apisite
 {

diff --git a/src/AgileConfig.Server.Apisite/Controllers/AdminController.cs b/src/AgileConfig.Server.Apisite/Controllers/AdminController.cs
@@ -8,7 +8,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using System.Linq;
-using System.Dynamic;
 using AgileConfig.Server.Apisite.Utilites;
 using AgileConfig.Server.OIDC;
 using System.Collections.Generic;
@@ -21,15 +20,15 @@ public class AdminController : Controller
     {
         private readonly ISettingService _settingService;
         private readonly IUserService _userService;
-        private readonly IPremissionService _permissionService;
+        private readonly IPermissionService _permissionService;
         private readonly IJwtService _jwtService;
         private readonly IOidcClient _oidcClient;
         private readonly ITinyEventBus _tinyEventBus;
 
         public AdminController(
             ISettingService settingService,
             IUserService userService,
-            IPremissionService permissionService,
+            IPermissionService permissionService,
             IJwtService jwtService,
             IOidcClient oidcClient,
             ITinyEventBus tinyEventBus)

diff --git a/src/AgileConfig.Server.Apisite/Controllers/AppController.cs b/src/AgileConfig.Server.Apisite/Controllers/AppController.cs
@@ -20,19 +20,19 @@ namespace AgileConfig.Server.Apisite.Controllers
     public class AppController : Controller
     {
         private readonly IAppService _appService;
-        private readonly IPremissionService _premissionService;
+        private readonly IPermissionService _permissionService;
         private readonly IUserService _userService;
         private readonly ITinyEventBus _tinyEventBus;
 
         public AppController(IAppService appService,
-            IPremissionService premissionService,
+            IPermissionService permissionService,
             IUserService userService,
             ITinyEventBus tinyEventBus)
         {
             _userService = userService;
             _tinyEventBus = tinyEventBus;
             _appService = appService;
-            _premissionService = premissionService;
+            _permissionService = permissionService;
         }
 
         public async Task<IActionResult> Search(string name, string id, string group, string sortField,
@@ -112,7 +112,7 @@ private async Task AppendInheritancedInfo(List<AppListVM> list)
             }
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "App.Add", Functions.App_Add })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "App.Add", Functions.App_Add })]
         [HttpPost]
         public async Task<IActionResult> Add([FromBody] AppVM model)
         {
@@ -161,7 +161,7 @@ public async Task<IActionResult> Add([FromBody] AppVM model)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "App.Edit", Functions.App_Edit })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "App.Edit", Functions.App_Edit })]
         [HttpPost]
         public async Task<IActionResult> Edit([FromBody] AppVM model)
         {
@@ -272,10 +272,10 @@ public async Task<IActionResult> Get(string id)
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(PremissionCheckAttribute),
-            Arguments = new object[] { "App.DisableOrEanble", Functions.App_Edit })]
+        [TypeFilter(typeof(PermissionCheckAttribute),
+            Arguments = new object[] { "App.DisableOrEnable", Functions.App_Edit })]
         [HttpPost]
-        public async Task<IActionResult> DisableOrEanble(string id)
+        public async Task<IActionResult> DisableOrEnable(string id)
         {
             ArgumentException.ThrowIfNullOrEmpty(id);
 
@@ -305,7 +305,7 @@ public async Task<IActionResult> DisableOrEanble(string id)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "App.Delete", Functions.App_Delete })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "App.Delete", Functions.App_Delete })]
         [HttpPost]
         public async Task<IActionResult> Delete(string id)
         {
@@ -372,16 +372,16 @@ public async Task<IActionResult> InheritancedApps(string currentAppId)
         /// </summary>
         /// <param name="model"></param>
         /// <returns></returns>
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "App.Auth", Functions.App_Auth })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "App.Auth", Functions.App_Auth })]
         [HttpPost]
         public async Task<IActionResult> SaveAppAuth([FromBody] AppAuthVM model)
         {
             ArgumentNullException.ThrowIfNull(model);
 
             var result = await _appService.SaveUserAppAuth(model.AppId, model.EditConfigPermissionUsers,
-                _premissionService.EditConfigPermissionKey);
+                _permissionService.EditConfigPermissionKey);
             var result1 = await _appService.SaveUserAppAuth(model.AppId, model.PublishConfigPermissionUsers,
-                _premissionService.PublishConfigPermissionKey);
+                _permissionService.PublishConfigPermissionKey);
 
             return Json(new
             {
@@ -399,10 +399,10 @@ public async Task<IActionResult> GetUserAppAuth(string appId)
                 AppId = appId
             };
             result.EditConfigPermissionUsers =
-                (await _appService.GetUserAppAuth(appId, _premissionService.EditConfigPermissionKey)).Select(x => x.Id)
+                (await _appService.GetUserAppAuth(appId, _permissionService.EditConfigPermissionKey)).Select(x => x.Id)
                 .ToList();
             result.PublishConfigPermissionUsers =
-                (await _appService.GetUserAppAuth(appId, _premissionService.PublishConfigPermissionKey))
+                (await _appService.GetUserAppAuth(appId, _permissionService.PublishConfigPermissionKey))
                 .Select(x => x.Id).ToList();
 
             return Json(new

diff --git a/src/AgileConfig.Server.Apisite/Controllers/ConfigController.cs b/src/AgileConfig.Server.Apisite/Controllers/ConfigController.cs
@@ -39,7 +39,7 @@ ITinyEventBus tinyEventBus
             _tinyEventBus = tinyEventBus;
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "Config.Add", Functions.Config_Add })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "Config.Add", Functions.Config_Add })]
         [HttpPost]
         public async Task<IActionResult> Add([FromBody] ConfigVM model, EnvString env)
         {
@@ -94,7 +94,7 @@ public async Task<IActionResult> Add([FromBody] ConfigVM model, EnvString env)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute),
+        [TypeFilter(typeof(PermissionCheckAttribute),
             Arguments = new object[] { "Config.AddRange", Functions.Config_Add })]
         [HttpPost]
         public async Task<IActionResult> AddRange([FromBody] List<ConfigVM> model, EnvString env)
@@ -163,7 +163,7 @@ public async Task<IActionResult> AddRange([FromBody] List<ConfigVM> model, EnvSt
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute),
+        [TypeFilter(typeof(PermissionCheckAttribute),
             Arguments = new object[] { "Config.Edit", Functions.Config_Edit })]
         [HttpPost]
         public async Task<IActionResult> Edit([FromBody] ConfigVM model, [FromQuery] EnvString env)
@@ -363,7 +363,7 @@ public async Task<IActionResult> Get(string id, EnvString env)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute),
+        [TypeFilter(typeof(PermissionCheckAttribute),
             Arguments = new object[] { "Config.Delete", Functions.Config_Delete })]
         [HttpPost]
         public async Task<IActionResult> Delete(string id, EnvString env)
@@ -406,7 +406,7 @@ public async Task<IActionResult> Delete(string id, EnvString env)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute),
+        [TypeFilter(typeof(PermissionCheckAttribute),
             Arguments = new object[] { "Config.DeleteSome", Functions.Config_Delete })]
         [HttpPost]
         public async Task<IActionResult> DeleteSome([FromBody] List<string> ids, EnvString env)
@@ -457,7 +457,7 @@ public async Task<IActionResult> DeleteSome([FromBody] List<string> ids, EnvStri
         }
 
 
-        [TypeFilter(typeof(PremissionCheckAttribute),
+        [TypeFilter(typeof(PermissionCheckAttribute),
             Arguments = new object[] { "Config.Rollback", Functions.Config_Publish })]
         [HttpPost]
         public async Task<IActionResult> Rollback(string publishTimelineId, EnvString env)
@@ -516,7 +516,7 @@ public async Task<IActionResult> ConfigPublishedHistory(string configId, EnvStri
         /// 发布所有待发布的配置项
         /// </summary>
         /// <returns></returns>
-        [TypeFilter(typeof(PremissionCheckAttribute),
+        [TypeFilter(typeof(PermissionCheckAttribute),
             Arguments = new object[] { "Config.Publish", Functions.Config_Publish })]
         [HttpPost]
         public async Task<IActionResult> Publish([FromBody] PublishLogVM model, EnvString env)
@@ -733,7 +733,7 @@ public async Task<IActionResult> CancelSomeEdit([FromBody] List<string> ids, Env
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute),
+        [TypeFilter(typeof(PermissionCheckAttribute),
             Arguments = new object[] { "Config.EvnSync", Functions.Config_Add })]
         [HttpPost]
         public async Task<IActionResult> SyncEnv([FromBody] List<string> toEnvs, [FromQuery] string appId,

diff --git a/src/AgileConfig.Server.Apisite/Controllers/HomeController.cs b/src/AgileConfig.Server.Apisite/Controllers/HomeController.cs
@@ -4,6 +4,7 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using System.Linq;
+using System.Reflection;
 using AgileConfig.Server.Apisite.Utilites;
 using AgileConfig.Server.OIDC;
 
@@ -14,13 +15,12 @@ public class HomeController : Controller
     {
         private readonly ISettingService _settingService;
         private readonly IUserService _userService;
-        private readonly IPremissionService _permissionService;
+        private readonly IPermissionService _permissionService;
 
         public HomeController(
             ISettingService settingService,
             IUserService userService,
-            IPremissionService permissionService,
-            IOidcClient oidcClient
+            IPermissionService permissionService
             )
         {
             _settingService = settingService;
@@ -76,7 +76,7 @@ public async Task<IActionResult> Current()
         [AllowAnonymous]
         public async Task<IActionResult> Sys()
         {
-            string appVer = System.Reflection.Assembly.GetAssembly(typeof(AgileConfig.Server.Apisite.Program)).GetName().Version.ToString();
+            string appVer = Assembly.GetAssembly(typeof(Program))?.GetName()?.Version?.ToString();
             string userName = this.GetCurrentUserName();
             if (string.IsNullOrEmpty(userName))
             {
@@ -110,7 +110,7 @@ public IActionResult Echo()
         [AllowAnonymous]
         public IActionResult GetIP()
         {
-            return Content(String.Join(',', IPExt.GetEndpointIp()));
+            return Content(String.Join(',', IpExt.GetEndpointIp()));
         }
     }
 }
diff --git a/src/AgileConfig.Server.Apisite/Controllers/RemoteOPController.cs b/src/AgileConfig.Server.Apisite/Controllers/RemoteOPController.cs
@@ -11,12 +11,12 @@ namespace AgileConfig.Server.Apisite.Controllers
     /// <summary>
     /// 这个Controller用来接受其它节点发送过来的命令
     /// </summary>
-    public class RemoteOPController : Controller
+    public class RemoteOpController : Controller
     {
         private readonly IConfigService _configService;
         private readonly IServiceInfoService _serviceInfoService;
         private readonly ILogger _logger;
-        public RemoteOPController(IConfigService configService,
+        public RemoteOpController(IConfigService configService,
             IServiceInfoService serviceInfoService,
             ILoggerFactory loggerFactory)
         {

diff --git a/src/AgileConfig.Server.Apisite/Controllers/ReportController.cs b/src/AgileConfig.Server.Apisite/Controllers/ReportController.cs
@@ -2,9 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using AgileConfig.Server.Apisite.Models;
 using AgileConfig.Server.Apisite.Websocket;
-using AgileConfig.Server.Common;
 using AgileConfig.Server.Data.Entity;
 using AgileConfig.Server.IService;
 using Microsoft.AspNetCore.Mvc;

diff --git a/src/AgileConfig.Server.Apisite/Controllers/SSOController.cs b/src/AgileConfig.Server.Apisite/Controllers/SSOController.cs
@@ -5,11 +5,11 @@
 
 namespace AgileConfig.Server.Apisite.Controllers
 {
-    public class SSOController : Controller
+    public class SsoController : Controller
     {
         private readonly IOidcClient _oidcClient;
 
-        public SSOController(IOidcClient oidcClient)
+        public SsoController(IOidcClient oidcClient)
         {
             _oidcClient = oidcClient;
         }

diff --git a/src/AgileConfig.Server.Apisite/Controllers/ServerNodeController.cs b/src/AgileConfig.Server.Apisite/Controllers/ServerNodeController.cs
@@ -34,7 +34,7 @@ ITinyEventBus tinyEventBus
             _tinyEventBus = tinyEventBus;
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "Node.Add", Functions.Node_Add })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "Node.Add", Functions.Node_Add })]
         [HttpPost]
         public async Task<IActionResult> Add([FromBody] ServerNodeVM model)
         {
@@ -74,7 +74,7 @@ public async Task<IActionResult> Add([FromBody] ServerNodeVM model)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "Node.Delete", Functions.Node_Delete })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "Node.Delete", Functions.Node_Delete })]
         [HttpPost]
         public async Task<IActionResult> Delete([FromBody] ServerNodeVM model)
         {

diff --git a/src/AgileConfig.Server.Apisite/Controllers/ServiceController.cs b/src/AgileConfig.Server.Apisite/Controllers/ServiceController.cs
@@ -37,7 +37,7 @@ public async Task<IActionResult> Add([FromBody] ServiceInfoVM model)
         {
             if (model == null)
             {
-                throw new ArgumentNullException("model");
+                throw new ArgumentNullException(nameof(model));
             }
 
             if ((await _serviceInfoService.GetByServiceIdAsync(model.ServiceId)) != null)

diff --git a/src/AgileConfig.Server.Apisite/Controllers/SysLogController.cs b/src/AgileConfig.Server.Apisite/Controllers/SysLogController.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Threading.Tasks;
-using AgileConfig.Server.Apisite.Filters;
 using AgileConfig.Server.Data.Entity;
 using AgileConfig.Server.IService;
 using Microsoft.AspNetCore.Authorization;
@@ -32,10 +31,8 @@ public async Task<IActionResult> Search(string appId, SysLogType? logType, DateT
 
             var pageList = await _sysLogService.SearchPage(appId, logType, startTime, endTime?.Date.AddDays(1), pageSize, current);
             var total = await _sysLogService.Count(appId, logType, startTime, endTime?.Date.AddDays(1));
-            var totalPages = total / pageSize;
             if ((total % pageSize) > 0)
             {
-                totalPages++;
             }
 
             return Json(new

diff --git a/src/AgileConfig.Server.Apisite/Controllers/UserController.cs b/src/AgileConfig.Server.Apisite/Controllers/UserController.cs
@@ -86,7 +86,7 @@ public async Task<IActionResult> Search(string userName, string team, int curren
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "User.Add", Functions.User_Add })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "User.Add", Functions.User_Add })]
         [HttpPost]
         public async Task<IActionResult> Add([FromBody] UserVM model)
         {
@@ -130,7 +130,7 @@ public async Task<IActionResult> Add([FromBody] UserVM model)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "User.Edit", Functions.User_Edit })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "User.Edit", Functions.User_Edit })]
         [HttpPost]
         public async Task<IActionResult> Edit([FromBody] UserVM model)
         {
@@ -169,7 +169,7 @@ public async Task<IActionResult> Edit([FromBody] UserVM model)
 
         const string DefaultPassword = "123456";
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "User.ResetPassword", Functions.User_Edit })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "User.ResetPassword", Functions.User_Edit })]
         [HttpPost]
         public async Task<IActionResult> ResetPassword(string userId)
         {
@@ -203,7 +203,7 @@ public async Task<IActionResult> ResetPassword(string userId)
             });
         }
 
-        [TypeFilter(typeof(PremissionCheckAttribute), Arguments = new object[] { "User.Delete", Functions.User_Delete })]
+        [TypeFilter(typeof(PermissionCheckAttribute), Arguments = new object[] { "User.Delete", Functions.User_Delete })]
         [HttpPost]
         public async Task<IActionResult> Delete(string userId)
         {