Fix user list lang issue

Author: agile.zhou

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

@@ -56,11 +56,6 @@ public async Task<IActionResult> Search(string userName, string team, int curren
 
             var pageList = users.Skip((current - 1) * pageSize).Take(pageSize);
             var total = users.Count;
-            var totalPages = total / pageSize;
-            if ((total % pageSize) > 0)
-            {
-                totalPages++;
-            }
 
             var vms = new List<UserVM>();
             foreach (var item in pageList)
@@ -93,7 +88,7 @@ public async Task<IActionResult> Add([FromBody] UserVM model)
         {
             if (model == null)
             {
-                throw new ArgumentNullException("model");
+                throw new ArgumentNullException(nameof(model));
             }
 
             var oldUsers = await _userService.GetUsersByNameAsync(model.UserName);
@@ -137,7 +132,7 @@ public async Task<IActionResult> Edit([FromBody] UserVM model)
         {
             if (model == null)
             {
-                throw new ArgumentNullException("model");
+                throw new ArgumentNullException(nameof(model));
             }
 
             var user = await _userService.GetUserAsync(model.Id);
@@ -210,7 +205,7 @@ public async Task<IActionResult> Delete(string userId)
         {
             if (string.IsNullOrEmpty(userId))
             {
-                throw new ArgumentNullException("userId");
+                throw new ArgumentNullException(nameof(userId));
             }
 
             var user = await _userService.GetUserAsync(userId);
@@ -238,7 +233,7 @@ public async Task<IActionResult> Delete(string userId)
         }
 
         [HttpGet]
-        public async Task<IActionResult> adminUsers()
+        public async Task<IActionResult> AdminUsers()
         {
             var adminUsers = await _userService.GetUsersByRoleAsync(Role.Admin);
             adminUsers = adminUsers.Where(x => x.Status == UserStatus.Normal).ToList();

src/AgileConfig.Server.Data.Entity/UserRole.cs

@@ -27,19 +27,11 @@ public class UserRole: IEntity<string>
 
     public enum Role
     {
-        [Description("超级管理员")]
+        [Description("Super Administrator")]
         SuperAdmin = 0,
-        [Description("管理员")]
+        [Description("Administrator")]
         Admin = 1,
-        [Description("操作员")]
+        [Description("Operator")]
         NormalUser = 2, 
     }
-
-    public enum AppRole
-    {
-        APP_Editor = 10, //app维护
-        Config_Publisher = 11, // 配置项发布下线
-        Config_Editor = 12 //配置项编辑
-    }
-
 }

src/AgileConfig.Server.UI/react-ui-antd/src/pages/User/comps/updateUser.tsx

@@ -69,19 +69,19 @@ const UpdateForm : React.FC<UpdateUserProps> = (props)=>{
             {
               value: 1,
               label: intl.formatMessage({
-                id: 'pages.user.role.admin',
+                id: 'pages.user.usertype.admin',
               }),
             },
             {
               value: 2,
               label: intl.formatMessage({
-                id: 'pages.user.role.operator',
+                id: 'pages.user.usertype.normaluser',
               }),
             }
           ]:[{
             value: 2,
             label: intl.formatMessage({
-              id: 'pages.user.role.operator',
+              id: 'pages.user.usertype.normaluser',
             }),
           }]
         }