|
@@ -148,11 +148,11 @@ public class ThirdLoginController
|
|
|
Jackson2JsonRedisSerializer<UserInfo> jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer<UserInfo>(UserInfo.class);
|
|
|
UserInfo user = JSONObject.parseObject(userInfo, UserInfo.class);
|
|
|
result.put("token", token);
|
|
|
- result.put("user", user);
|
|
|
+ result.put("userInfo", user);
|
|
|
if(user==null){
|
|
|
return new RetResult().setMsg("请求失败,token无效").setData(null).setCode(RetCode.SUCCESS);
|
|
|
}
|
|
|
- redisConnection.setex(ticket, 60 * 60 * 24 * 1, JSON.toJSONString(result));
|
|
|
+ redisConnection.setex(ticket, 60 * 60 * 24 * 1, result.toString());
|
|
|
redisConnection.close();
|
|
|
result = new JSONObject();
|
|
|
result.put("ticket", ticket);
|
|
@@ -178,7 +178,7 @@ public class ThirdLoginController
|
|
|
String userInfo = redisConnection.get(ticket);
|
|
|
result.put("userInfo", userInfo);
|
|
|
redisConnection.close();
|
|
|
- return new RetResult().setMsg("请求成功").setData(result).setCode(RetCode.SUCCESS);
|
|
|
+ return new RetResult().setMsg("请求成功").setData(userInfo).setCode(RetCode.SUCCESS);
|
|
|
}
|
|
|
|
|
|
/**
|