|
|
@ -2,17 +2,21 @@ package com.sztzjy.trade.controller.stu;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import cn.hutool.core.convert.Convert;
|
|
|
|
import com.sztzjy.trade.annotation.AnonymousAccess;
|
|
|
|
import com.sztzjy.trade.annotation.AnonymousAccess;
|
|
|
|
import com.sztzjy.trade.annotation.OperateLog;
|
|
|
|
import com.sztzjy.trade.annotation.OperateLog;
|
|
|
|
import com.sztzjy.trade.config.exception.UnAuthorizedException;
|
|
|
|
import com.sztzjy.trade.config.exception.UnAuthorizedException;
|
|
|
|
import com.sztzjy.trade.config.security.JwtUser;
|
|
|
|
import com.sztzjy.trade.config.security.JwtUser;
|
|
|
|
import com.sztzjy.trade.config.security.LoginResult;
|
|
|
|
import com.sztzjy.trade.config.security.LoginResult;
|
|
|
|
import com.sztzjy.trade.config.security.TokenProvider;
|
|
|
|
import com.sztzjy.trade.config.security.TokenProvider;
|
|
|
|
|
|
|
|
import com.sztzjy.trade.controller.tch.TchLoginLogAndStuListController;
|
|
|
|
import com.sztzjy.trade.entity.StuUser;
|
|
|
|
import com.sztzjy.trade.entity.StuUser;
|
|
|
|
import com.sztzjy.trade.entity.StuUserExample;
|
|
|
|
import com.sztzjy.trade.entity.StuUserExample;
|
|
|
|
import com.sztzjy.trade.entity.ZYUserInfo;
|
|
|
|
import com.sztzjy.trade.entity.ZYUserInfo;
|
|
|
|
|
|
|
|
import com.sztzjy.trade.entity.dto.LoginLogDTO;
|
|
|
|
import com.sztzjy.trade.mapper.StuUserMapper;
|
|
|
|
import com.sztzjy.trade.mapper.StuUserMapper;
|
|
|
|
import com.sztzjy.trade.service.StuUserService;
|
|
|
|
import com.sztzjy.trade.service.StuUserService;
|
|
|
|
|
|
|
|
import com.sztzjy.trade.service.TchLoginLogAndStuListService;
|
|
|
|
import com.sztzjy.trade.util.*;
|
|
|
|
import com.sztzjy.trade.util.*;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.Api;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
@ -33,6 +37,7 @@ import javax.servlet.http.HttpServletRequest;
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
|
import javax.servlet.http.HttpSession;
|
|
|
|
import javax.servlet.http.HttpSession;
|
|
|
|
import java.io.IOException;
|
|
|
|
import java.io.IOException;
|
|
|
|
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.HashMap;
|
|
|
|
import java.util.HashMap;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
@ -56,6 +61,9 @@ public class UserController {
|
|
|
|
@Autowired
|
|
|
|
@Autowired
|
|
|
|
private RedisUtil redisUtil;
|
|
|
|
private RedisUtil redisUtil;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
|
|
|
private TchLoginLogAndStuListService tchLoginLogAndStuListService;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@AnonymousAccess
|
|
|
|
@AnonymousAccess
|
|
|
@ -106,9 +114,6 @@ public class UserController {
|
|
|
|
loginResult.setSchoolId(Integer.valueOf(stuUser.getSchoolId()));
|
|
|
|
loginResult.setSchoolId(Integer.valueOf(stuUser.getSchoolId()));
|
|
|
|
loginResult.setAccessToken(token);
|
|
|
|
loginResult.setAccessToken(token);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
redisUtil.set("userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
redisUtil.set("userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -129,6 +134,7 @@ public class UserController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
redisUtil.set("userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
redisUtil.set("userId:"+jwtUser.getUserId(),System.currentTimeMillis(),3600);
|
|
|
|
|
|
|
|
|
|
|
|
return new ResultDataEntity<>(HttpStatus.OK,loginResult);
|
|
|
|
return new ResultDataEntity<>(HttpStatus.OK,loginResult);
|
|
|
|
}else {
|
|
|
|
}else {
|
|
|
|
throw new UnAuthorizedException("密码错误");
|
|
|
|
throw new UnAuthorizedException("密码错误");
|
|
|
@ -224,4 +230,5 @@ public class UserController {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|