zq-erp/src/main/java/com/matrix/system/app/action/ApiCommonAction.java
@@ -94,7 +94,6 @@ String token = UUIDUtil.getRandomID(); redisClient.saveValueForever(token, JSONObject.toJSONString(user)); redisClient.saveValueForever(user.getSuId().toString(), token); userInfoVo.setId(user.getSuId()); userInfoVo.setName(user.getSuName()); zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java
@@ -13,6 +13,7 @@ import com.matrix.system.app.vo.UserAchieveVo; import com.matrix.system.app.vo.UserInfoDetailVo; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.interceptor.ApiUserLoginInterceptor; import com.matrix.system.common.service.SysUsersService; import com.matrix.system.common.tools.DataAuthUtil; import com.matrix.system.common.tools.PasswordUtil; @@ -31,6 +32,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; @@ -101,12 +103,9 @@ @ApiOperation(value = "退出登陆", notes = "退出登陆") @GetMapping(value = "/loginOut") public AjaxResult loginOut() { SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); String token = redisClient.getCachedValue(sysUsers.getSuId().toString()); public AjaxResult loginOut(HttpServletRequest request) { String token=ApiUserLoginInterceptor.resolveToken(request); redisClient.removeObject(token); redisClient.removeObject(sysUsers.getSuId().toString()); return AjaxResult.buildSuccessInstance("退出成功"); } zq-erp/src/main/java/com/matrix/system/common/interceptor/ApiUserLoginInterceptor.java
@@ -33,7 +33,7 @@ private RedisClient redisClient; @Value("${login_private_key}") private String privateKey; private static String privateKey; @Value("${evn}") private String evn; @@ -41,8 +41,8 @@ @Autowired private SysUsersDao sysUsersDao; private final String TOKEN_HEADER = "Authorization"; private final String TOKEN_START_WITH = "Bearer "; private static final String TOKEN_HEADER = "Authorization"; private static final String TOKEN_START_WITH = "Bearer "; @Override public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { @@ -95,7 +95,7 @@ * @param request * @return */ private String resolveToken(HttpServletRequest request) { public static String resolveToken(HttpServletRequest request) { String headToken = request.getHeader(TOKEN_HEADER); String sb = request.getRequestURI();