From 00cf38f9ec036d4f1cc201182a05a484631ea75d Mon Sep 17 00:00:00 2001
From: = <liujianjun@git.elinkit.com.cn>
Date: Fri, 12 Jun 2020 11:22:42 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B7=B3=E8=BF=87=E5=90=8E=E9=97=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/openapi/scan/config/WebAppConfig.java   | 2 +-
 .../epmet/openapi/scan/interceptor/ScanApiAuthInterceptor.java  | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/WebAppConfig.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/WebAppConfig.java
index 6ec719587e..c955a7f555 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/config/WebAppConfig.java
+++ b/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/**");//对应的不拦截的请求
 		}
 	}
 
diff --git a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/interceptor/ScanApiAuthInterceptor.java b/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/interceptor/ScanApiAuthInterceptor.java
index 6ce851a45e..5df7bbb79e 100644
--- a/epmet-openapi/epmet-openapi-scan/src/main/java/com/epmet/openapi/scan/interceptor/ScanApiAuthInterceptor.java
+++ b/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);

From 8ef3928f7424b81cfb051231db6518ccd697f9dd Mon Sep 17 00:00:00 2001
From: = <liujianjun@git.elinkit.com.cn>
Date: Fri, 12 Jun 2020 11:24:46 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=8F=B7+1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml  | 2 +-
 epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml | 2 +-
 epmet-openapi/epmet-openapi-scan/pom.xml                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
index 40baa4aac6..5802d6a79c 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-dev.yml
+++ b/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 # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
index 0aa4c70549..b414c36287 100644
--- a/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
+++ b/epmet-openapi/epmet-openapi-scan/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   epmet-openapi-scan:
     container_name: epmet-openapi-scan-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-scan:0.3.1
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/epmet-user-scan:0.3.7
     ports:
       - "8107:8107"
     network_mode: host # 不会创建新的网络
diff --git a/epmet-openapi/epmet-openapi-scan/pom.xml b/epmet-openapi/epmet-openapi-scan/pom.xml
index 5aaf513999..9bb20ac89a 100644
--- a/epmet-openapi/epmet-openapi-scan/pom.xml
+++ b/epmet-openapi/epmet-openapi-scan/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.7</version>
+    <version>0.3.8</version>
     <artifactId>epmet-openapi-scan</artifactId>
     <packaging>jar</packaging>