代码优化

master
xiaochanghai 1 year ago
parent 8840200874
commit 8f46733e79
  1. 22
      Tiobon.Core.Api/Controllers/LoginController.cs

@ -32,9 +32,7 @@ namespace Tiobon.Core.Controllers
/// <param name="requirement"></param>
/// <param name="roleModulePermissionServices"></param>
/// <param name="logger"></param>
public LoginController(ISysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices,
IRoleServices roleServices, PermissionRequirement requirement,
IRoleModulePermissionServices roleModulePermissionServices, ILogger<LoginController> logger)
public LoginController(ISysUserInfoServices sysUserInfoServices, IUserRoleServices userRoleServices, IRoleServices roleServices, PermissionRequirement requirement, IRoleModulePermissionServices roleModulePermissionServices, ILogger<LoginController> logger)
{
this._sysUserInfoServices = sysUserInfoServices;
this._userRoleServices = userRoleServices;
@ -64,7 +62,7 @@ namespace Tiobon.Core.Controllers
var user = await _sysUserInfoServices.GetUserRoleNameStr(name, MD5Helper.MD5Encrypt32(pass));
if (user != null)
{
TokenModelJwt tokenModel = new TokenModelJwt {Uid = 1, Role = user};
TokenModelJwt tokenModel = new TokenModelJwt { Uid = 1, Role = user };
jwtStr = JwtHelper.IssueJwt(tokenModel);
suc = true;
@ -115,7 +113,7 @@ namespace Tiobon.Core.Controllers
var result = new
{
data = new {success = suc, token = jwtStr}
data = new { success = suc, token = jwtStr }
};
return new ServiceResult<string>()
@ -138,7 +136,6 @@ namespace Tiobon.Core.Controllers
[HttpGet]
[Route("JWTToken3.0")]
public async Task<ServiceResult<TokenInfoViewModel>> GetJwtToken3(string name = "", string pass = "")
{
string jwtStr = string.Empty;
@ -218,9 +215,7 @@ namespace Tiobon.Core.Controllers
var user = await _sysUserInfoServices.QueryById(tokenModel.Uid);
var value = User.Claims.SingleOrDefault(s => s.Type == JwtRegisteredClaimNames.Iat)?.Value;
if (value != null && user.CriticalModifyTime > value.ObjToDate())
{
return Failed<TokenInfoViewModel>("很抱歉,授权已失效,请重新授权!");
}
if (user != null && !(value != null && user.CriticalModifyTime > value.ObjToDate()))
{
@ -259,8 +254,7 @@ namespace Tiobon.Core.Controllers
/// <returns></returns>
[HttpGet]
[Route("jsonp")]
public void Getjsonp(string callBack, long id = 1, string sub = "Admin", int expiresSliding = 30,
int expiresAbsoulute = 30)
public void Getjsonp(string callBack, long id = 1, string sub = "Admin", int expiresSliding = 30, int expiresAbsoulute = 30)
{
TokenModelJwt tokenModel = new TokenModelJwt
{
@ -299,7 +293,7 @@ namespace Tiobon.Core.Controllers
{
if (loginRequest is null)
{
return new {result = false};
return new { result = false };
}
try
@ -309,7 +303,7 @@ namespace Tiobon.Core.Controllers
{
HttpContext.SuccessSwagger();
HttpContext.SuccessSwaggerJwt(result.Data.token);
return new {result = true};
return new { result = true };
}
}
catch (Exception ex)
@ -317,7 +311,7 @@ namespace Tiobon.Core.Controllers
_logger.LogWarning(ex, "Swagger登录异常");
}
return new {result = false};
return new { result = false };
}
/// <summary>
@ -328,7 +322,7 @@ namespace Tiobon.Core.Controllers
[Route("wxLogin")]
public dynamic WxLogin(string g = "", string token = "")
{
return new {g, token};
return new { g, token };
}
}

Loading…
Cancel
Save