提交 0da83cb3 编写于 作者: lakernote's avatar lakernote

解决sonarlint问题

上级 11c53e2b
......@@ -12,9 +12,23 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import javax.annotation.Resource;
import java.io.File;
/**
* @author laker
*/
@Configuration
@Slf4j
public class WebMvcConfig implements WebMvcConfigurer {
private static final String[] exclude_path = {"/admin/**",
"/admin/login.html",
"/error",
"/swagger-resources/**",
"/api/v1/login",
"/captcha",
"/thumbnail"};
private static final String[] trace_exclude_path = {"/admin/**",
"/admin/login.html",
"/error",
"/swagger-resources/**"};
@Resource
LakerConfig lakerConfig;
......@@ -34,18 +48,9 @@ public class WebMvcConfig implements WebMvcConfigurer {
public void addInterceptors(InterceptorRegistry registry) {
// 注册注解拦截器,并排除不需要注解鉴权的接口地址 (与登录拦截器无关)
registry.addInterceptor(new SaAnnotationInterceptor()).addPathPatterns("/**")
.excludePathPatterns("/admin/**",
"/admin/login.html",
"/error",
"/swagger-resources/**",
"/api/v1/login",
"/captcha",
"/thumbnail");
.excludePathPatterns(exclude_path);
registry.addInterceptor(new TraceAnnotationInterceptor()).addPathPatterns("/**")
.excludePathPatterns("/admin/**",
"/admin/login.html",
"/error",
"/swagger-resources/**");
.excludePathPatterns(trace_exclude_path);
}
@Override
......
......@@ -47,7 +47,7 @@ public class Trace {
activeSpanStack.addLast(span);
}
public boolean stopSpan(Span current) {
public boolean stopSpan() {
// 出栈
Span pop = pop();
// 栈不为空且是第一层栈 则加入到 trace的spans
......
......@@ -7,6 +7,11 @@ import java.util.function.Supplier;
* @author laker
*/
public class TraceCodeBlock {
private TraceCodeBlock() {
// do nothing
}
/**
* 有返回值
*
......
......@@ -17,6 +17,10 @@ public class TraceContext {
private static final String BAR = "+";
private static ThreadLocal<Trace> traceThreadLocal = new ThreadLocal<>();
private TraceContext() {
// do nothing
}
public static void addSpan(ProceedingJoinPoint pjp) {
MethodSignature methodSignature = ((MethodSignature) pjp.getSignature());
String className = methodSignature.getMethod().getDeclaringClass().getSimpleName();
......@@ -50,7 +54,7 @@ public class TraceContext {
Span current = trace.current();
current.setEndTime(System.currentTimeMillis());
current.setCost(current.getEndTime() - current.getStartTime());
if (trace.stopSpan(current)) {
if (trace.stopSpan()) {
if (current.getCost() > time) {
logSpan(trace.getSpans(), StringUtils.SPACE);
}
......
......@@ -31,6 +31,7 @@ public class TracingAspect {
*/
@Pointcut("execution(public * com.laker..remote..*(..))")
public void remoteAspect() {
// do nothing
}
......@@ -39,6 +40,7 @@ public class TracingAspect {
*/
@Pointcut("@annotation(com.laker.admin.framework.aop.trace.LakerTrace)")
public void annotationAspect() {
// do nothing
}
/**
......@@ -46,6 +48,7 @@ public class TracingAspect {
*/
@Pointcut("@within(com.laker.admin.framework.aop.trace.LakerTrace)")
public void withinAspect() {
// do nothing
}
/**
......@@ -56,19 +59,23 @@ public class TracingAspect {
*/
@Pointcut("!@annotation(com.laker.admin.framework.aop.trace.LakerIgnoreTrace)")
public void annotationIgnoreAspect() {
// do nothing
}
@Pointcut("execution(* com.laker..mapper.*.*(..))")
public void mapperAspect() {
// do nothing
}
@Pointcut("execution(public * com.laker..service.*.*(..)) || execution(public * com.laker..*Service.*(..))")
public void serviceAspect() {
// do nothing
}
@Pointcut("execution(public * com.laker..controller.*.*(..)) || execution(public * com.laker..*Controller.*(..))")
public void controllerAspect() {
// do nothing
}
//@Around("controllerAspect() || serviceAspect() || mapperAspect() || remoteAspect()")
......
......@@ -19,7 +19,7 @@ public class UserInfoAndPowers {
private String nickName;
private Long deptId;
private String deptName;
private Map metaData;
private Map<String, Object> metaData;
private String deptTableAlias;
private String userTableAlias;
private String sql;
......
......@@ -31,12 +31,12 @@ public class StpInterfaceImpl implements StpInterface {
@Override
public List<String> getPermissionList(Object loginId, String loginKey) {
List<SysUserRole> userRoles = sysUserRoleService.list(Wrappers.<SysUserRole>lambdaQuery().eq(SysUserRole::getUserId, loginId));
List<Long> roleIds = userRoles.stream().map(sysUserRole -> sysUserRole.getRoleId()).collect(Collectors.toList());
List<Long> roleIds = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
List<SysRolePower> rolePowerLists = sysRolePowerService.list(Wrappers.<SysRolePower>lambdaQuery().in(SysRolePower::getRoleId, roleIds));
List<Long> powerIds = rolePowerLists.stream().map(sysRolePower -> sysRolePower.getPowerId()).collect(Collectors.toList());
List<Long> powerIds = rolePowerLists.stream().map(SysRolePower::getPowerId).collect(Collectors.toList());
// 2是按钮
List<SysPower> sysPowers = menuService.list(Wrappers.<SysPower>lambdaQuery().in(SysPower::getMenuId, powerIds).eq(SysPower::getType, 2));
List<String> strings = sysPowers.stream().map(sysMenu -> sysMenu.getPowerCode()).collect(Collectors.toList());
List<String> strings = sysPowers.stream().map(SysPower::getPowerCode).collect(Collectors.toList());
return strings;
}
......
......@@ -24,11 +24,11 @@ public class WafFilter implements Filter {
/**
* 开启XSS脚本过滤
*/
private static boolean xssEnabled = true;
private boolean xssEnabled = true;
/**
* 开启SQL注入过滤
*/
private static boolean sqlEnabled = true;
private boolean sqlEnabled = true;
@Override
public void init(FilterConfig config) throws ServletException {
......@@ -42,8 +42,6 @@ public class WafFilter implements Filter {
public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException,
ServletException {
HttpServletRequest req = (HttpServletRequest) request;
// HttpServletResponse res = (HttpServletResponse) response;
if (handle(req)) {
try {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册