Merge remote-tracking branch 'remotes/origin/dev' into release

# Conflicts:
#	epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml

epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.7
+    image: 192.168.1.130:10080/epmet-cloud-dev/epmet-openapi-scan:0.3.8
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络

epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/WebAppConfig.java

@@ -25,7 +25,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 		public void addInterceptors(InterceptorRegistry registry) {
 			registry.addInterceptor(scanApiAuthInterceptor)//添加拦截器
 					.addPathPatterns("/**") //拦截所有请求
-					.excludePathPatterns("/opback/addWhite*");//对应的不拦截的请求
+					.excludePathPatterns("/opback/**");//对应的不拦截的请求
 		}
 	}
 

epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/interceptor/ScanApiAuthInterceptor.java

@@ -31,6 +31,7 @@ public class ScanApiAuthInterceptor implements HandlerInterceptor {
 	@Override
 	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
 		String ip = IpUtils.getIpAddr(request);
+		log.info("preHandle requestUrl",request.getRequestURL());
 		SetOperations setOperations = redisTemplate.opsForSet();
 		if (!setOperations.isMember(RedisKeys.getWhiteList(), ip)) {
 			log.warn("preHandle ip:{} is not in whitelist", ip);