Commit d79ac8a0 authored by 杨钧's avatar 杨钧

过滤器去掉对system判断

parent a09e45da
...@@ -47,14 +47,14 @@ public class ValidOperatePermitFilter implements Filter { ...@@ -47,14 +47,14 @@ public class ValidOperatePermitFilter implements Filter {
} }
String token = request.getHeader("x-auth-token"); String token = request.getHeader("x-auth-token");
String system = request.getHeader("x-auth-system"); //String system = request.getHeader("x-auth-system");
if (StringUtils.isAnyBlank(token, system)) { if (StringUtils.isBlank(token)) {
log.error("根据token信息查询用户信息,当前 requestUrl={}",request.getRequestURL()); log.error("根据token信息查询用户信息,当前 requestUrl={}",request.getRequestURL());
renderErrorMsg(servletResponse,ErrorCodeEnum.NO_TOKEN); renderErrorMsg(servletResponse,ErrorCodeEnum.NO_TOKEN);
return; return;
} }
JsonResult<OpUser> opUserResult = IOpSystemService.findUserByToken(token, system); JsonResult<OpUser> opUserResult = IOpSystemService.findUserByToken(token, null);
if (Objects.isNull(opUserResult) || !opUserResult.isSuccess()) { if (Objects.isNull(opUserResult) || !opUserResult.isSuccess()) {
log.error("根据token查询不到用户信息 token:{}", token); log.error("根据token查询不到用户信息 token:{}", token);
renderErrorMsg(servletResponse,ErrorCodeEnum.ILLEGAL_TOKEN); renderErrorMsg(servletResponse,ErrorCodeEnum.ILLEGAL_TOKEN);
......
...@@ -44,8 +44,11 @@ public class OpSystemServiceImpl implements IOpSystemService { ...@@ -44,8 +44,11 @@ public class OpSystemServiceImpl implements IOpSystemService {
try { try {
Map<String, String> param = Maps.newHashMap(); Map<String, String> param = Maps.newHashMap();
param.put("x-auth-token", token); param.put("x-auth-token", token);
param.put("x-auth-system", system); if(StringUtils.isNotBlank(system)){
String result = null; param.put("x-auth-system", system);
}
String result;
try { try {
result = httpService.post(url, param, null); result = httpService.post(url, param, null);
} catch (Exception e) { } catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment