Commit d892c3da authored by zhouqian's avatar zhouqian

login info

parent b8f53625
...@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.controller.internal.login; ...@@ -2,6 +2,7 @@ package cn.quantgroup.xyqb.controller.internal.login;
import cn.quantgroup.xyqb.controller.IBaseController; import cn.quantgroup.xyqb.controller.IBaseController;
import cn.quantgroup.xyqb.model.JsonResult; import cn.quantgroup.xyqb.model.JsonResult;
import cn.quantgroup.xyqb.model.UserRet;
import cn.quantgroup.xyqb.model.session.LoginInfo; import cn.quantgroup.xyqb.model.session.LoginInfo;
import cn.quantgroup.xyqb.model.session.SessionStruct; import cn.quantgroup.xyqb.model.session.SessionStruct;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
...@@ -18,7 +19,7 @@ public class AuthInfoController implements IBaseController { ...@@ -18,7 +19,7 @@ public class AuthInfoController implements IBaseController {
public JsonResult loginInfo() { public JsonResult loginInfo() {
SessionStruct sessionStruct = getSessionStruct(); SessionStruct sessionStruct = getSessionStruct();
LoginInfo loginInfo = new LoginInfo(); LoginInfo loginInfo = new LoginInfo();
loginInfo.setUser(sessionStruct.getValues().getUser()); loginInfo.setUser(UserRet.getUserRet(sessionStruct.getValues().getUser()));
LoginInfo.LoginContext context = new LoginInfo.LoginContext(); LoginInfo.LoginContext context = new LoginInfo.LoginContext();
context.setChannelId(getChannelId()); context.setChannelId(getChannelId());
context.setCreatedFrom(getCreatedFrom()); context.setCreatedFrom(getCreatedFrom());
......
package cn.quantgroup.xyqb.model.session; package cn.quantgroup.xyqb.model.session;
import cn.quantgroup.xyqb.entity.User; import cn.quantgroup.xyqb.entity.User;
import cn.quantgroup.xyqb.model.UserRet;
import lombok.Data; import lombok.Data;
/** /**
...@@ -9,7 +10,7 @@ import lombok.Data; ...@@ -9,7 +10,7 @@ import lombok.Data;
@Data @Data
public class LoginInfo { public class LoginInfo {
private User user; private UserRet user;
private LoginContext loginContext; private LoginContext loginContext;
@Data @Data
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment