|
@@ -138,11 +138,17 @@ namespace MySystem.Areas.Api.Controllers
|
|
|
Obj.Add("province", province); //省
|
|
|
Obj.Add("city", city); //市
|
|
|
Obj.Add("district", district); //区
|
|
|
- Obj.Add("accessToken", GetToken(user.Id));
|
|
|
+ Dictionary<string, string> tokens = GetToken(user.Id);
|
|
|
+ Obj.Add("accessToken", tokens["access_token"]);
|
|
|
+ Obj.Add("refreshToken", tokens["refresh_token"]);
|
|
|
return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
|
|
|
}
|
|
|
- public string GetToken(int UserId)
|
|
|
+ public Dictionary<string, string> GetToken(int UserId)
|
|
|
{
|
|
|
+ Dictionary<string, string> obj = new Dictionary<string, string>();
|
|
|
+ string access_token = "";
|
|
|
+ string refresh_token = "";
|
|
|
+
|
|
|
PlateformModels.WebCMSEntities db = new PlateformModels.WebCMSEntities();
|
|
|
PlateformModels.Users user = db.Users.FirstOrDefault(m => m.Id == UserId) ?? new PlateformModels.Users();
|
|
|
PlateformModels.UserMoveInfo userMove = db.UserMoveInfo.FirstOrDefault(m => m.UserId == UserId) ?? new PlateformModels.UserMoveInfo();
|
|
@@ -165,9 +171,12 @@ namespace MySystem.Areas.Api.Controllers
|
|
|
JsonData jsonObj = JsonMapper.ToObject(result);
|
|
|
if(jsonObj["status"].ToString() == "1")
|
|
|
{
|
|
|
- return jsonObj["data"]["access_token"].ToString();
|
|
|
+ access_token = jsonObj["data"]["access_token"].ToString();
|
|
|
+ refresh_token = jsonObj["data"]["refresh_token"].ToString();
|
|
|
}
|
|
|
- return "";
|
|
|
+ obj.Add("access_token", access_token);
|
|
|
+ obj.Add("refresh_token", refresh_token);
|
|
|
+ return obj;
|
|
|
}
|
|
|
public string PostWebRequest(string postUrl, string paramData, Dictionary<string, string> headers)
|
|
|
{
|