|
@@ -177,9 +177,10 @@ public class ThirdLoginController
|
|
|
RedisConnection redisConnection = redisConnectionFactory.getConnection();
|
|
|
String userInfo = redisConnection.get(ticket);
|
|
|
JSONObject userObject = JSONObject.parseObject(userInfo);
|
|
|
- result.put("userInfo", userInfo);
|
|
|
+ result.put("userInfo", JSONObject.toJSONString(userObject.get("userInfo")));
|
|
|
+ result.put("token", userObject.getString("token"));
|
|
|
redisConnection.close();
|
|
|
- return new RetResult().setMsg("请求成功").setData(userObject).setCode(RetCode.SUCCESS);
|
|
|
+ return new RetResult().setMsg("请求成功").setData(result).setCode(RetCode.SUCCESS);
|
|
|
}
|
|
|
|
|
|
/**
|