Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ch-wx-api/src/main/resources/application.yml

ch-wx-api/src/main/java/com/wwdz/ch/wx/interceptor/LoginInterceptor.java

@@ -6,7 +6,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
@@ -15,7 +14,6 @@ import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
-@Component
 public class LoginInterceptor implements HandlerInterceptor {
     Logger logger = LoggerFactory.getLogger(LoginInterceptor.class);
 
@@ -27,6 +25,7 @@ public class LoginInterceptor implements HandlerInterceptor {
      */
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+        logger.info("进入拦截器");
         String token = request.getHeader("Authorization");
         if (StringUtils.isNotBlank(token)) {
             if (userTokenManager.checkLogin(token)) {

ch-wx-api/src/main/java/com/wwdz/ch/wx/util/RedisUtil.java

 package com.wwdz.ch.wx.util;
 
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 /**
  * redis 工具类
@@ -77,7 +76,7 @@ public class RedisUtil {
             if (key.length == 1) {
                 redisTemplate.delete(key[0]);
             } else {
-                redisTemplate.delete(CollectionUtils.arrayToList(key));
+                redisTemplate.delete((Collection<String>) CollectionUtils.arrayToList(key));
             }
         }
     }