|
|
@ -112,12 +112,15 @@ public class UserController {
|
|
|
|
SecurityContextHolder.getContext().setAuthentication(authentication);
|
|
|
|
SecurityContextHolder.getContext().setAuthentication(authentication);
|
|
|
|
jwtUser = (JwtUser) authentication.getPrincipal();
|
|
|
|
jwtUser = (JwtUser) authentication.getPrincipal();
|
|
|
|
String token = TokenProvider.createToken(jwtUser);
|
|
|
|
String token = TokenProvider.createToken(jwtUser);
|
|
|
|
|
|
|
|
loginResult.setClassId(Convert.toInt(stuUser.getClassId()));
|
|
|
|
loginResult.setUserId(stuUser.getUserId());
|
|
|
|
loginResult.setUserId(stuUser.getUserId());
|
|
|
|
loginResult.setUsername(stuUser.getSchoolId());
|
|
|
|
loginResult.setUsername(stuUser.getStudentId());
|
|
|
|
|
|
|
|
loginResult.setName(stuUser.getName());
|
|
|
|
loginResult.setRoleId(stuUser.getRoleId());
|
|
|
|
loginResult.setRoleId(stuUser.getRoleId());
|
|
|
|
|
|
|
|
loginResult.setSchoolName(stuUser.getSchoolName());
|
|
|
|
loginResult.setSchoolId(Integer.valueOf(stuUser.getSchoolId()));
|
|
|
|
loginResult.setSchoolId(Integer.valueOf(stuUser.getSchoolId()));
|
|
|
|
loginResult.setAccessToken(token);
|
|
|
|
loginResult.setAccessToken(token);
|
|
|
|
|
|
|
|
loginResult.setStudentId(stuUser.getStudentId());
|
|
|
|
redisUtil.set(itemName+"-token:"+jwtUser.getUserId(),token,3600);
|
|
|
|
redisUtil.set(itemName+"-token:"+jwtUser.getUserId(),token,3600);
|
|
|
|
redisUtil.set(itemName+"-userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
redisUtil.set(itemName+"-userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
|
|
|
|
|
|
|
@ -130,13 +133,15 @@ public class UserController {
|
|
|
|
SecurityContextHolder.getContext().setAuthentication(authentication);
|
|
|
|
SecurityContextHolder.getContext().setAuthentication(authentication);
|
|
|
|
jwtUser = (JwtUser) authentication.getPrincipal();
|
|
|
|
jwtUser = (JwtUser) authentication.getPrincipal();
|
|
|
|
String token = TokenProvider.createToken(jwtUser);
|
|
|
|
String token = TokenProvider.createToken(jwtUser);
|
|
|
|
|
|
|
|
loginResult.setClassId(Convert.toInt(stuUser.getClassId()));
|
|
|
|
loginResult.setUserId(stuUser.getUserId());
|
|
|
|
loginResult.setUserId(stuUser.getUserId());
|
|
|
|
loginResult.setUsername(stuUser.getSchoolId());
|
|
|
|
loginResult.setName(stuUser.getName());
|
|
|
|
|
|
|
|
loginResult.setUsername(stuUser.getStudentId());
|
|
|
|
loginResult.setRoleId(stuUser.getRoleId());
|
|
|
|
loginResult.setRoleId(stuUser.getRoleId());
|
|
|
|
loginResult.setSchoolId(Integer.valueOf(stuUser.getSchoolId()));
|
|
|
|
loginResult.setSchoolId(Integer.valueOf(stuUser.getSchoolId()));
|
|
|
|
|
|
|
|
loginResult.setStudentId(stuUser.getStudentId());
|
|
|
|
loginResult.setAccessToken(token);
|
|
|
|
loginResult.setAccessToken(token);
|
|
|
|
|
|
|
|
loginResult.setSchoolName(stuUser.getSchoolName());
|
|
|
|
redisUtil.set(itemName+"-token:"+jwtUser.getUserId(),token,3600);
|
|
|
|
redisUtil.set(itemName+"-token:"+jwtUser.getUserId(),token,3600);
|
|
|
|
redisUtil.set(itemName+"-userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
redisUtil.set(itemName+"-userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
|
|
|
|
|
|
|
|