|
@@ -145,10 +145,6 @@ public class SysController {
|
|
tbSessionService.saveOrUpdate(tbSession);
|
|
tbSessionService.saveOrUpdate(tbSession);
|
|
redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
|
|
redisUtil.setUserSession(sessionId, tbSession, expireTime.getExpireSeconds());
|
|
|
|
|
|
-// JSONObject jsonObject = new JSONObject();
|
|
|
|
-// jsonObject.put("user", sysUserService.getUserRoles(sysUser));
|
|
|
|
-// jsonObject.put("token", UUID.fastUUID().toString());
|
|
|
|
-
|
|
|
|
LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
|
|
LoginResult loginResult = new LoginResult(sysUser, sessionId, test, roleType);
|
|
loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
|
|
loginResult.setSchoolInfo(Objects.nonNull(authBean.getSchool()) ? loginResult.new SchoolNativeBean(authBean.getSchool()) : null);
|
|
loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
|
|
loginResult.setOrgInfo(Objects.nonNull(authBean.getOrg()) ? loginResult.new OrgNativeBean(authBean.getOrg()) : null);
|