AGSS/Controllers/Admin/AdminRoleControllers.cs

@@ -88,7 +88,7 @@ public class AdminRoleControllers:ControllerBase
         var result = await _userManager.AddToRoleAsync(user, role.Name);
         if (result.Succeeded)
         {
-            return Ok(new ReturnTemplate(200, "现在该用户已经被赋予这个角色了", user));
+            return Ok(new ReturnTemplate(200, "角色分配成功", user));
         }
         else
         {
@@ -107,13 +107,13 @@ public class AdminRoleControllers:ControllerBase
     {
         if (string.IsNullOrWhiteSpace(userId))
         {
-            return Ok(new ReturnTemplate(400, "你打算拿个空的Id来骗我吗？", null));
+            return Ok(new ReturnTemplate(400, "你填写的用户ID是空的~", null));
         }
 
         var user = await _userManager.FindByIdAsync(userId);
         if (user == null)
         {
-            return Ok(new ReturnTemplate(404, "你输了个假的用户吧......", null));
+            return Ok(new ReturnTemplate(404, "未找到指定用户哦·~", null));
         }
 
         // 删除用户
@@ -150,7 +150,7 @@ public class AdminRoleControllers:ControllerBase
             }
             else
             {
-                return StatusCode(500, new ReturnTemplate(500, "删除用户时发生错误，原因请看ErrorResult", result.Errors));
+                return StatusCode(500, new ReturnTemplate(500, "删除用户时发生错误", result.Errors));
             }
 
 
@@ -170,13 +170,13 @@ public class AdminRoleControllers:ControllerBase
     {
         if (string.IsNullOrWhiteSpace(request.RoleName))
         {
-            return Ok(new ReturnTemplate(400, "角色名称不能为空，就像凌云心里不能没有我一样", null));
+            return Ok(new ReturnTemplate(400, "角色名称不能为空", null));
         }
 
         var role = await _roleManager.FindByNameAsync(request.RoleName);
         if (role == null)
         {
-            return Ok(new ReturnTemplate(400, "你输入的角色不存在哦！", null));
+            return Ok(new ReturnTemplate(400, "角色不存在", null));
         }
 
         var usersInRole = await _userManager.GetUsersInRoleAsync(role.Name);

AGSS/Controllers/User/UserControllers.cs

@@ -39,20 +39,21 @@ public class UserControllers:ControllerBase
     [HttpGet]
     public async Task<IActionResult> My()
     {
-      
-
-     
-
-        string userId = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value;
+        string userId = this.User.FindFirst(JwtRegisteredClaimNames.Sub)!.Value;
+        if (string.IsNullOrEmpty(userId))
+        {
+            return Ok(new ReturnTemplate(500,"获取用户失败（JWT解析错误）",null));
+        }
 
         try
         {
             var userProfile = await _userService.GetUserProfileAsync(userId);
-            return Ok(new ReturnTemplate(200, "获取成功！", userProfile));
+            return Ok(new ReturnTemplate(200,"获取成功！",userProfile));
         }
         catch (ArgumentException ex)
         {
             return NotFound(ex.Message);
         }
+
     }
 }

AGSS/Models/DTOs/UserProfile.cs

@@ -11,6 +11,4 @@ public class UserProfile
     public string? JobCode { get; set; }
     public string? JobName { get; set; }
     public string? Birthday { get; set; }
-    public string? MenuCode { get; set; }
-    public string? MenuName { get; set; }
 }

AGSS/Services/UserService.cs

@@ -29,9 +29,7 @@ public class UserService
             Config = user.Config,
             JobCode = user.JobCode,
             JobName = user.JobName,
-            Birthday = user.Birthday,
-            MenuCode = user.MenuCode,
-            MenuName = user.MenuName
+            Birthday = user.Birthday
         };
     }
 }