提交 18cf4c6a 作者: obcy

修改接口响应码

上级 ccab2524
...@@ -35,6 +35,7 @@ public class KnowInterceptor implements HandlerInterceptor { ...@@ -35,6 +35,7 @@ public class KnowInterceptor implements HandlerInterceptor {
if (!request.getRequestURI().contains("js") && !request.getRequestURI().contains("css") if (!request.getRequestURI().contains("js") && !request.getRequestURI().contains("css")
&& !request.getRequestURI().contains("favicon") && !request.getRequestURI().contains("favicon")
&& !request.getRequestURI().contains("api/file") && !request.getRequestURI().contains("api/file")
&& !request.getRequestURI().contains("userPermission")
) { ) {
String token = request.getHeader("X-Access-Token"); String token = request.getHeader("X-Access-Token");
...@@ -61,7 +62,9 @@ public class KnowInterceptor implements HandlerInterceptor { ...@@ -61,7 +62,9 @@ public class KnowInterceptor implements HandlerInterceptor {
} }
public void doRes(HttpServletRequest request,HttpServletResponse response) throws IOException { public void doRes(HttpServletRequest request,HttpServletResponse response) throws IOException {
response.setStatus(550); if (!(response.getStatus()==401)) {
response.setStatus(550);
}
response.setContentType("application/json;charset=UTF-8"); response.setContentType("application/json;charset=UTF-8");
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("timestamp", DateUtil.formatDateTime(new Date())); map.put("timestamp", DateUtil.formatDateTime(new Date()));
......
...@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value; ...@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.servlet.http.HttpServletResponse;
import java.util.*; import java.util.*;
import java.util.stream.Collectors; import java.util.stream.Collectors;
...@@ -487,6 +488,8 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap ...@@ -487,6 +488,8 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
/**校验第三方用户是否进行了授权*/ /**校验第三方用户是否进行了授权*/
List<KbAuthorizedUser> list = super.list(Wrappers.<KbAuthorizedUser>lambdaQuery().eq(KbAuthorizedUser::getUserId, bean.getUserId())); List<KbAuthorizedUser> list = super.list(Wrappers.<KbAuthorizedUser>lambdaQuery().eq(KbAuthorizedUser::getUserId, bean.getUserId()));
if (CollectionUtil.isEmpty(list)){ if (CollectionUtil.isEmpty(list)){
HttpServletResponse httpServletResponse = SpringContextUtils.getHttpServletResponse();
httpServletResponse.setStatus(401);
return Result.error("该用户还未进行授权访问,请联系管理员进行授权"); return Result.error("该用户还未进行授权访问,请联系管理员进行授权");
} }
/**查询授权用户的角色和权限*/ /**查询授权用户的角色和权限*/
...@@ -584,7 +587,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap ...@@ -584,7 +587,7 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
try { try {
bean = JSONUtil.toBean(body, Result.class); bean = JSONUtil.toBean(body, Result.class);
} catch (Exception e) { } catch (Exception e) {
return Result.error("三方用户校验异常"); return Result.error("三方用户校验异常");
} }
return bean; return bean;
} }
...@@ -599,6 +602,8 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap ...@@ -599,6 +602,8 @@ public class KbAuthorizedUserServiceImpl extends ServiceImpl<KbAuthorizedUserMap
/**校验第三方用户是否进行了授权*/ /**校验第三方用户是否进行了授权*/
List<KbAuthorizedUser> list = super.list(Wrappers.<KbAuthorizedUser>lambdaQuery().eq(KbAuthorizedUser::getUserId, bean.getUserId())); List<KbAuthorizedUser> list = super.list(Wrappers.<KbAuthorizedUser>lambdaQuery().eq(KbAuthorizedUser::getUserId, bean.getUserId()));
if (CollectionUtil.isEmpty(list)) { if (CollectionUtil.isEmpty(list)) {
HttpServletResponse httpServletResponse = SpringContextUtils.getHttpServletResponse();
httpServletResponse.setStatus(401);
return Result.error("该用户还未进行授权访问,请联系管理员进行授权"); return Result.error("该用户还未进行授权访问,请联系管理员进行授权");
} }
/**查询授权用户,“所有”节点的角色优先*/ /**查询授权用户,“所有”节点的角色优先*/
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论