调整使用RequestUtil工具类来获取登录用户的信息
This commit is contained in:
@@ -24,6 +24,7 @@ import com.njcn.gather.user.user.service.ISysUserService;
|
||||
import com.njcn.web.controller.BaseController;
|
||||
import com.njcn.web.utils.HttpResultUtil;
|
||||
import com.njcn.web.utils.HttpServletUtil;
|
||||
import com.njcn.web.utils.RequestUtil;
|
||||
import io.swagger.annotations.Api;
|
||||
import io.swagger.annotations.ApiOperation;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
@@ -100,13 +101,11 @@ public class AuthController extends BaseController {
|
||||
@OperateInfo(info = LogEnum.SYSTEM_SERIOUS, operateType = OperateType.LOGOUT)
|
||||
@ApiOperation("注销登录")
|
||||
@PostMapping("/logout")
|
||||
public HttpResult<Object> logout(HttpServletRequest request) {
|
||||
public HttpResult<Object> logout() {
|
||||
String methodDescribe = getMethodDescribe("logout");
|
||||
LogUtil.njcnDebug(log, "{},注销登录", methodDescribe);
|
||||
String accessTokenStr = request.getHeader(SecurityConstants.AUTHORIZATION_KEY);
|
||||
if (StrUtil.isNotBlank(accessTokenStr)) {
|
||||
String accessToken = accessTokenStr.replace(SecurityConstants.AUTHORIZATION_PREFIX, Strings.EMPTY);
|
||||
|
||||
String accessToken = RequestUtil.getAccessToken();
|
||||
if (StrUtil.isNotBlank(accessToken)) {
|
||||
CustomCacheUtil customCacheUtil = SpringUtil.getBean(CustomCacheUtil.CACHE_NAME);
|
||||
customCacheUtil.remove(accessToken);
|
||||
|
||||
@@ -122,14 +121,13 @@ public class AuthController extends BaseController {
|
||||
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
|
||||
@ApiOperation("刷新token")
|
||||
@GetMapping("/refreshToken")
|
||||
public HttpResult<Object> refreshToken(HttpServletRequest request) {
|
||||
public HttpResult<Object> refreshToken() {
|
||||
String methodDescribe = getMethodDescribe("refreshToken");
|
||||
LogUtil.njcnDebug(log, "{},刷新token", methodDescribe);
|
||||
String accessTokenStr = request.getHeader(SecurityConstants.AUTHORIZATION_KEY);
|
||||
String accessToken = RequestUtil.getAccessToken();
|
||||
|
||||
Token token = new Token();
|
||||
if (StrUtil.isNotBlank(accessTokenStr)) {
|
||||
String accessToken = accessTokenStr.replace(SecurityConstants.AUTHORIZATION_PREFIX, Strings.EMPTY);
|
||||
if (StrUtil.isNotBlank(accessToken)) {
|
||||
Map<String, Object> map = JwtUtil.parseToken(accessToken);
|
||||
String userId = (String) map.get(SecurityConstants.USER_ID);
|
||||
SysUser user = sysUserService.getById(userId);
|
||||
@@ -148,6 +146,4 @@ public class AuthController extends BaseController {
|
||||
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, null, methodDescribe);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user