diff --git a/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java b/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java index 3aa3edb..98696ad 100644 --- a/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java +++ b/tp-common/src/main/java/com/inscloudtech/common/filter/RequestLoggingFilter.java @@ -32,15 +32,18 @@ public class RequestLoggingFilter implements Filter { throws IOException, ServletException { ServletRequest requestWrapper = null; - if (request instanceof HttpServletRequest - && StringUtils.startsWithIgnoreCase(request.getContentType(), MediaType.APPLICATION_JSON_VALUE)) { + HttpServletRequest req = (HttpServletRequest) request; + String url = req.getServletPath(); + if (!url.contains("uploadToolAndTips")) { requestWrapper = new RepeatedlyRequestWrapper((HttpServletRequest) request, response); + handleLog(req); + } + if (null == requestWrapper) { + chain.doFilter(request, response); + } else { + chain.doFilter(requestWrapper, response); } - handleLog(request); - - // 记录请求信息 - chain.doFilter(ObjectUtil.defaultIfNull(requestWrapper, request), response); } @Override @@ -48,9 +51,8 @@ public class RequestLoggingFilter implements Filter { } - protected void handleLog(ServletRequest request) { + protected void handleLog(HttpServletRequest servletRequest) { try { - HttpServletRequest servletRequest = (HttpServletRequest) request; String requestURI = servletRequest.getRequestURI(); String method = servletRequest.getMethod(); Map paramMap = ServletUtils.getParamMap(servletRequest); @@ -70,7 +72,9 @@ public class RequestLoggingFilter implements Filter { if(StrUtil.isNotEmpty(authorization)){ authorization = authorization.replace("Bearer","").trim(); LoginUser user = LoginHelper.getLoginUser(authorization); - requestLog.setOperName(user.getUsername()); + if(user != null){ + requestLog.setOperName(user.getUsername()); + } } SpringUtils.context().publishEvent(requestLog); diff --git a/tp-system/src/main/java/com/inscloudtech/system/domain/vo/ToolManageVo.java b/tp-system/src/main/java/com/inscloudtech/system/domain/vo/ToolManageVo.java index 8ee8234..4aa1df3 100644 --- a/tp-system/src/main/java/com/inscloudtech/system/domain/vo/ToolManageVo.java +++ b/tp-system/src/main/java/com/inscloudtech/system/domain/vo/ToolManageVo.java @@ -8,6 +8,7 @@ import com.inscloudtech.common.convert.ExcelDictConvert; import lombok.Data; import java.io.Serializable; +import java.util.Date; /** * 测试包管理视图对象 tool_manage @@ -51,6 +52,8 @@ public class ToolManageVo implements Serializable { @ExcelProperty(value = "操作手册") private String tipsPath; + @ExcelProperty(value = "创建时间") + private Date createTime; }