diff --git a/asg_form/Controllers/login.cs b/asg_form/Controllers/login.cs index cc9c5db..2941f83 100644 --- a/asg_form/Controllers/login.cs +++ b/asg_form/Controllers/login.cs @@ -344,18 +344,30 @@ namespace asg_form.Controllers [HttpGet] public async Task> getuser(bool showbase64=true) { - string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; - var user = await userManager.FindByIdAsync(id); - var isadmin = await userManager.IsInRoleAsync(user, "admin"); - List roles = (List)await userManager.GetRolesAsync(user); - if (showbase64) { - return new post_user { id = id.ToInt64(), money = user.Integral, Base64 = user.UserBase64, name = user.UserName, chinaname = user.chinaname, email = user.Email, isadmin = isadmin, Roles = roles, officium = user.officium ,qqnumber=user.qqnumber}; - } - else + int wp = 0; + try { - return new post_user { id = id.ToInt64(), money = user.Integral, name = user.UserName, chinaname = user.chinaname, email = user.Email, isadmin = isadmin, Roles = roles, officium = user.officium, qqnumber = user.qqnumber }; + string id = this.User.FindFirst(ClaimTypes.NameIdentifier)!.Value; + wp = 1; + var user = await userManager.FindByIdAsync(id); + wp = 2; + var isadmin = await userManager.IsInRoleAsync(user, "admin"); + wp = 3; + List roles = (List)await userManager.GetRolesAsync(user); + wp = 4; + if (showbase64) { + return new post_user { id = id.ToInt64(), money = user.Integral, Base64 = user.UserBase64, name = user.UserName, chinaname = user.chinaname, email = user.Email, isadmin = isadmin, Roles = roles, officium = user.officium ,qqnumber=user.qqnumber}; + } + else + { + return new post_user { id = id.ToInt64(), money = user.Integral, name = user.UserName, chinaname = user.chinaname, email = user.Email, isadmin = isadmin, Roles = roles, officium = user.officium, qqnumber = user.qqnumber }; + } + }catch (Exception ex) + { + return Ok(new { code = 500, message = "服务器错误", ex,wp }); } + }