|
|
|
@ -141,11 +141,7 @@ namespace UserCenter.Controllers
|
|
|
|
var result = new
|
|
|
|
var result = new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Code = 0,
|
|
|
|
Code = 0,
|
|
|
|
Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } }),
|
|
|
|
Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } })
|
|
|
|
user.NickName,
|
|
|
|
|
|
|
|
user.UserName,
|
|
|
|
|
|
|
|
Title = this._cfg["name"],
|
|
|
|
|
|
|
|
IoTServer = list.FirstOrDefault(o => o.Name == "物联网平台").Home
|
|
|
|
|
|
|
|
};
|
|
|
|
};
|
|
|
|
return Json(result);
|
|
|
|
return Json(result);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@ -155,6 +151,19 @@ namespace UserCenter.Controllers
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[AllowAnonymous]
|
|
|
|
|
|
|
|
public IActionResult GetUserInfo(string token)
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
var userName = this._jwtHelper.GetPayload(token)["UserName"].ToString();
|
|
|
|
|
|
|
|
var user = this._userRepo.ReadOnlyTable().FirstOrDefault(o => o.UserName == userName);
|
|
|
|
|
|
|
|
return Json(new
|
|
|
|
|
|
|
|
{
|
|
|
|
|
|
|
|
Name = this._cfg["Name"],
|
|
|
|
|
|
|
|
user.UserName,
|
|
|
|
|
|
|
|
user.NickName
|
|
|
|
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
[AllowAnonymous]
|
|
|
|
[AllowAnonymous]
|
|
|
|
public IActionResult LoginInternal(LoginModel model, bool isAppLogin, string returnUrl = null)
|
|
|
|
public IActionResult LoginInternal(LoginModel model, bool isAppLogin, string returnUrl = null)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
@ -223,12 +232,8 @@ namespace UserCenter.Controllers
|
|
|
|
return Json(new
|
|
|
|
return Json(new
|
|
|
|
{
|
|
|
|
{
|
|
|
|
Code = 0,
|
|
|
|
Code = 0,
|
|
|
|
Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } }),
|
|
|
|
Token = this._jwtHelper.GetToken(new Dictionary<string, object>() { { nameof(user.UserName), user.UserName } })
|
|
|
|
user.NickName,
|
|
|
|
});
|
|
|
|
Title = this._cfg["name"],
|
|
|
|
|
|
|
|
IoTServer = list.FirstOrDefault(o => o.Name == "物联网平台").Home
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
else
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
