删除IP白名单拦截器，统一采用AOP切面的白名单拦截器（为方便使用redis可选白名单参数），同时在切面中提供对原测试参数configserver.disable的支持

src/main/java/cn/quantgroup/xyqb/aspect/accessable/IpValidateAdvisor.java

@@ -7,6 +7,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
 import org.aspectj.lang.annotation.Pointcut;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -36,12 +37,18 @@ public class IpValidateAdvisor {
     @Qualifier("stringRedisTemplate")
     private RedisTemplate<String, String> redisTemplate;
 
-    @Pointcut("@annotation(cn.quantgroup.xyqb.aspect.accessable.IpValidator)")
-    private void needIpValidate() {
+    @Value("${configserver.disable}")
+    private Integer isDebug;
+
+    @Pointcut("execution(public * cn.quantgroup.xyqb.controller.external.user.InnerController.*(..))")
+    private void whiteIpMatch() {
     }
 
-    @Around("needIpValidate()")
-    private Object doCapchaValidate(ProceedingJoinPoint pjp) throws Throwable {
+    @Before("whiteIpMatch()")
+    private Object doWhiteIpMatch(ProceedingJoinPoint pjp) throws Throwable {
+        if(isDebug != 0){
+            return pjp.proceed();
+        }
         HttpServletRequest request = ((ServletRequestAttributes)RequestContextHolder.getRequestAttributes()).getRequest();
         // 客户端IP
         String clientIp = IPUtil.getRemoteIP(request);
@@ -57,4 +64,13 @@ public class IpValidateAdvisor {
         LOGGER.error("Lock_ipv4: don't match white ip access:{}", clientIp);
         return JsonResult.buildErrorStateResult("非法访问", null);
     }
+
+    @Pointcut("@annotation(cn.quantgroup.xyqb.aspect.accessable.IpValidator)")
+    private void needIpValidate() {
+    }
+
+    @Around("needIpValidate()")
+    private Object doCapchaValidate(ProceedingJoinPoint pjp) throws Throwable {
+        return pjp.proceed();
+    }
 }

src/main/java/cn/quantgroup/xyqb/config/web/InterceptorConfig.java

-package cn.quantgroup.xyqb.config.web;
-
-import cn.quantgroup.xyqb.interceptors.IPWhiteListInterceptor;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
-
-/**
- * Created by Miraculous on 15/7/10.
- */
-@Configuration
-public class InterceptorConfig extends WebMvcConfigurerAdapter {
-
-    @Value("${configserver.disable}")
-    private Integer isDebug;
-
-    public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(new IPWhiteListInterceptor(isDebug)).addPathPatterns("/innerapi/**");
-    }
-
-}

src/main/java/cn/quantgroup/xyqb/interceptors/IPWhiteListInterceptor.java

-package cn.quantgroup.xyqb.interceptors;
-
-import cn.quantgroup.xyqb.util.IPUtil;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.web.servlet.HandlerInterceptor;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-/**
- * 内部服务白名单拦截器
- * Created by Administrator on 2017/5/9.
- * @Modify by renwc
- * @date 2017-12-06
- */
-public class IPWhiteListInterceptor implements HandlerInterceptor {
-    private static final Logger LOGGER = LoggerFactory.getLogger(IPWhiteListInterceptor.class);
-    private Integer isDebug;
-
-    public IPWhiteListInterceptor(Integer isDebug) {
-        this.isDebug = isDebug;
-    }
-
-    @Override
-    public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if(isDebug !=0){
-            return true;
-        }
-        String remoteIP = IPUtil.getRemoteIP(request);
-        if(IPUtil.whiteOf(remoteIP)) {
-            return true;
-        }
-        LOGGER.info("Lock_ipv4: don't match white ip access:{}",remoteIP);
-        return false;
-    }
-
-    @Override
-    public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
-
-    }
-
-    @Override
-    public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-
-    }
-}