Skip to content

Commit 5e5f3bb

Browse files
author
agile.zhou
committed
Correct naming;
1 parent 739a6e0 commit 5e5f3bb

File tree

9 files changed

+37
-39
lines changed

9 files changed

+37
-39
lines changed

‎src/AgileConfig.Server.Apisite/Controllers/AdminController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@ public class AdminController : Controller
2020
{
2121
private readonly ISettingService _settingService;
2222
private readonly IUserService _userService;
23-
private readonly IPremissionService _permissionService;
23+
private readonly IPermissionService _permissionService;
2424
private readonly IJwtService _jwtService;
2525
private readonly IOidcClient _oidcClient;
2626
private readonly ITinyEventBus _tinyEventBus;
2727

2828
public AdminController(
2929
ISettingService settingService,
3030
IUserService userService,
31-
IPremissionService permissionService,
31+
IPermissionService permissionService,
3232
IJwtService jwtService,
3333
IOidcClient oidcClient,
3434
ITinyEventBus tinyEventBus)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ namespace AgileConfig.Server.Apisite.Controllers
2020
public class AppController : Controller
2121
{
2222
private readonly IAppService _appService;
23-
private readonly IPremissionService _permissionService;
23+
private readonly IPermissionService _permissionService;
2424
private readonly IUserService _userService;
2525
private readonly ITinyEventBus _tinyEventBus;
2626

2727
public AppController(IAppService appService,
28-
IPremissionService permissionService,
28+
IPermissionService permissionService,
2929
IUserService userService,
3030
ITinyEventBus tinyEventBus)
3131
{

‎src/AgileConfig.Server.Apisite/Controllers/HomeController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,12 @@ public class HomeController : Controller
1515
{
1616
private readonly ISettingService _settingService;
1717
private readonly IUserService _userService;
18-
private readonly IPremissionService _permissionService;
18+
private readonly IPermissionService _permissionService;
1919

2020
public HomeController(
2121
ISettingService settingService,
2222
IUserService userService,
23-
IPremissionService permissionService
23+
IPermissionService permissionService
2424
)
2525
{
2626
_settingService = settingService;

‎src/AgileConfig.Server.Apisite/Filters/PermissionCheckAttribute.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ private static string GetEnvFromArgs(IDictionary<string, object> args, IConfigSe
3535
/// 因为 attribute 不能传递 func 参数，所有从 action 的参数内获取 appId 的操作只能提前内置在一个静态字典内。
3636
/// </summary>
3737
protected static readonly
38-
FrozenDictionary<string, Func<ActionExecutingContext, IPremissionService, IConfigService, string>>
38+
FrozenDictionary<string, Func<ActionExecutingContext, IPermissionService, IConfigService, string>>
3939
GetAppIdParamFuncs =
40-
new Dictionary<string, Func<ActionExecutingContext, IPremissionService, IConfigService, string>>
40+
new Dictionary<string, Func<ActionExecutingContext, IPermissionService, IConfigService, string>>
4141
{
4242
{
4343
"Config.Add", (args, premission, config) =>
@@ -194,16 +194,16 @@ protected static readonly
194194
protected const string GlobalMatchPatten = "GLOBAL_{0}";
195195
protected const string AppMatchPatten = "APP_{0}_{1}";
196196

197-
private readonly IPremissionService _permissionService;
197+
private readonly IPermissionService _permissionService;
198198
private readonly IConfigService _configService;
199199

200200
private readonly string _actionName;
201201
private readonly string _functionKey;
202202

203-
public PermissionCheckAttribute(IPremissionService premissionService, IConfigService configService,
203+
public PermissionCheckAttribute(IPermissionService permissionService, IConfigService configService,
204204
string actionName, string functionKey)
205205
{
206-
_permissionService = premissionService;
206+
_permissionService = permissionService;
207207
_configService = configService;
208208

209209
_actionName = actionName;

‎src/AgileConfig.Server.Apisite/Filters/PermissionCheckByBasicAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ public class PermissionCheckByBasicAttribute : PermissionCheckAttribute
1919
protected IUserService _userService;
2020

2121
public PermissionCheckByBasicAttribute(
22-
IPremissionService premissionService,
22+
IPermissionService permissionService,
2323
IConfigService configService,
2424
IAdmBasicAuthService basicAuthService,
2525
IUserService userService,
2626
string actionName,
27-
string functionKey) : base(premissionService, configService, actionName, functionKey)
27+
string functionKey) : base(permissionService, configService, actionName, functionKey)
2828
{
2929
_userService = userService;
3030
_basicAuthService = basicAuthService;

‎src/AgileConfig.Server.IService/IPremissionService.cs renamed to ‎src/AgileConfig.Server.IService/IPermissionService.cs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
1-
using AgileConfig.Server.Data.Entity;
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Text;
1+
using System.Collections.Generic;
52
using System.Threading.Tasks;
63

74
namespace AgileConfig.Server.IService
85
{
9-
public class Functions
6+
public static class Functions
107
{
118
public const string App_Add = "APP_ADD";
129
public const string App_Edit = "APP_EDIT";
@@ -30,7 +27,7 @@ public class Functions
3027
public const string User_Delete = "USER_DELETE";
3128
}
3229

33-
public interface IPremissionService
30+
public interface IPermissionService
3431
{
3532
string EditConfigPermissionKey { get; }
3633

‎src/AgileConfig.Server.Service/PremissionService.cs renamed to ‎src/AgileConfig.Server.Service/PermissionService.cs

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
namespace AgileConfig.Server.Service
99
{
10-
public class PermissionService : IPremissionService
10+
public class PermissionService : IPermissionService
1111
{
1212
private readonly IUserRoleRepository _userRoleRepository;
1313
private readonly IUserAppAuthRepository _userAppAuthRepository;
@@ -23,8 +23,8 @@ public PermissionService(
2323
_appRepository = appRepository;
2424
}
2525

26-
private static readonly List<string> Template_SuperAdminPermissions = new List<string>
27-
{
26+
private static readonly List<string> Template_SuperAdminPermissions =
27+
[
2828
"GLOBAL_" + Functions.App_Add,
2929
"GLOBAL_" + Functions.App_Delete,
3030
"GLOBAL_" + Functions.App_Edit,
@@ -43,11 +43,11 @@ public PermissionService(
4343

4444
"GLOBAL_" + Functions.User_Add,
4545
"GLOBAL_" + Functions.User_Edit,
46-
"GLOBAL_" + Functions.User_Delete,
47-
};
46+
"GLOBAL_" + Functions.User_Delete
47+
];
4848

49-
private static readonly List<string> Template_NormalAdminPermissions = new List<string>
50-
{
49+
private static readonly List<string> Template_NormalAdminPermissions =
50+
[
5151
"GLOBAL_" + Functions.App_Add,
5252
"GLOBAL_" + Functions.Node_Add,
5353
"GLOBAL_" + Functions.Node_Delete,
@@ -65,21 +65,21 @@ public PermissionService(
6565
"APP_{0}_" + Functions.Config_Delete,
6666
"APP_{0}_" + Functions.Config_Edit,
6767
"APP_{0}_" + Functions.Config_Offline,
68-
"APP_{0}_" + Functions.Config_Publish,
69-
};
68+
"APP_{0}_" + Functions.Config_Publish
69+
];
7070

71-
private static readonly List<string> Template_NormalUserPermissions_Edit = new List<string>
72-
{
71+
private static readonly List<string> Template_NormalUserPermissions_Edit =
72+
[
7373
"APP_{0}_" + Functions.Config_Add,
7474
"APP_{0}_" + Functions.Config_Delete,
75-
"APP_{0}_" + Functions.Config_Edit,
76-
};
75+
"APP_{0}_" + Functions.Config_Edit
76+
];
7777

78-
private static readonly List<string> Template_NormalUserPermissions_Publish = new List<string>
79-
{
78+
private static readonly List<string> Template_NormalUserPermissions_Publish =
79+
[
8080
"APP_{0}_" + Functions.Config_Offline,
8181
"APP_{0}_" + Functions.Config_Publish
82-
};
82+
];
8383

8484
private async Task<List<string>> GetAdminUserFunctions(string userId)
8585
{
@@ -181,7 +181,7 @@ private async Task<List<string>> GetNormalUserFunctions(string userId)
181181
/// <summary>
182182
/// 获取角色权限的模板
183183
/// </summary>
184-
/// <param name="role"></param>
184+
/// <param name="userId"></param>
185185
/// <returns></returns>
186186
public async Task<List<string>> GetUserPermission(string userId)
187187
{
@@ -210,6 +210,7 @@ public async Task<List<string>> GetUserPermission(string userId)
210210
/// 获取被授权给用户的app
211211
/// </summary>
212212
/// <param name="userId"></param>
213+
/// <param name="authPermissionKey"></param>
213214
/// <returns></returns>
214215
private async Task<List<App>> GetUserAuthApp(string userId, string authPermissionKey)
215216
{

‎src/AgileConfig.Server.Service/ServiceCollectionExt.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public static void AddBusinessServices(this IServiceCollection sc)
2525
sc.AddScoped<IAppBasicAuthService, AppBasicAuthService>();
2626
sc.AddScoped<IAdmBasicAuthService, AdmBasicAuthService>();
2727
sc.AddScoped<IUserService, UserService>();
28-
sc.AddScoped<IPremissionService, PermissionService>();
28+
sc.AddScoped<IPermissionService, PermissionService>();
2929
sc.AddScoped<IRegisterCenterService, RegisterCenterService>();
3030

3131
sc.AddScoped<ConfigStatusUpdateEventHandlersRegister>();

‎test/ApiSiteTests/TestAppController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public async Task TestAdd()
2424
var appService = new Mock<IAppService>();
2525
var logService = new Mock<ISysLogService>();
2626
var userService = new Mock<IUserService>();
27-
var permissionService = new Mock<IPremissionService>();
27+
var permissionService = new Mock<IPermissionService>();
2828
var eventBus = new Mock<ITinyEventBus>();
2929

3030
var ctl = new AgileConfig.Server.Apisite.Controllers.AppController(appService.Object, permissionService.Object, userService.Object, eventBus.Object);
@@ -45,7 +45,7 @@ public async Task TestAdd()
4545
var jr = result as JsonResult;
4646
Assert.IsNotNull(jr.Value);
4747
Console.WriteLine(jr.Value.ToString());
48-
//Assert.IsTrue(jr.Value.ToString().Contains("应用Id已存在，请重新输入"));
48+
//Assert.IsTrue(jr.Value.ToString().Contains("Ӧ��Id�Ѵ��ڣ�����������"));
4949
App nullApp = null;
5050

5151
appService.Setup(s => s.GetAsync("02")).ReturnsAsync(nullApp);

0 commit comments

Comments
 (0)