|
@@ -115,7 +115,6 @@ namespace MySystem.Areas.Api.Controllers
|
|
|
public JsonResult GetUserInfo(string value)
|
|
public JsonResult GetUserInfo(string value)
|
|
|
{
|
|
{
|
|
|
value = DesDecrypt(value);
|
|
value = DesDecrypt(value);
|
|
|
- function.WriteLog(DateTime.Now.ToString() + "\n" + value, "小程序-获取用户信息");
|
|
|
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
JsonData data = JsonMapper.ToObject(value);
|
|
|
string AppToken = data["appToken"].ToString(); //小程序获取用户信息的Token
|
|
string AppToken = data["appToken"].ToString(); //小程序获取用户信息的Token
|
|
|
string OpenId = data["openId"].ToString(); //小程序openId
|
|
string OpenId = data["openId"].ToString(); //小程序openId
|
|
@@ -144,18 +143,17 @@ namespace MySystem.Areas.Api.Controllers
|
|
|
Obj.Add("province", province); //省
|
|
Obj.Add("province", province); //省
|
|
|
Obj.Add("city", city); //市
|
|
Obj.Add("city", city); //市
|
|
|
Obj.Add("district", district); //区
|
|
Obj.Add("district", district); //区
|
|
|
- function.WriteLog(Newtonsoft.Json.JsonConvert.SerializeObject(Obj), "小程序-获取用户信息");
|
|
|
|
|
- try
|
|
|
|
|
- {
|
|
|
|
|
- Dictionary<string, string> tokens = GetToken(user.Id);
|
|
|
|
|
- Obj.Add("accessToken", tokens["access_token"]);
|
|
|
|
|
- Obj.Add("refreshToken", tokens["refresh_token"]);
|
|
|
|
|
- }
|
|
|
|
|
- catch
|
|
|
|
|
- {
|
|
|
|
|
- Obj.Add("accessToken", "");
|
|
|
|
|
- Obj.Add("refreshToken", "");
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // try
|
|
|
|
|
+ // {
|
|
|
|
|
+ // Dictionary<string, string> tokens = GetToken(user.Id);
|
|
|
|
|
+ // Obj.Add("accessToken", tokens["access_token"]);
|
|
|
|
|
+ // Obj.Add("refreshToken", tokens["refresh_token"]);
|
|
|
|
|
+ // }
|
|
|
|
|
+ // catch
|
|
|
|
|
+ // {
|
|
|
|
|
+ // Obj.Add("accessToken", "");
|
|
|
|
|
+ // Obj.Add("refreshToken", "");
|
|
|
|
|
+ // }
|
|
|
return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
|
|
return Json(new AppResultJson() { Status = "1", Info = "", Data = Obj });
|
|
|
}
|
|
}
|
|
|
public Dictionary<string, string> GetToken(int UserId)
|
|
public Dictionary<string, string> GetToken(int UserId)
|