Merge branch 'dev-activity-faw' of...

Merge branch 'dev-activity-faw' of http://gitlab.afanticar.com:13140/java-ms/afanti-open-api into uat

 Conflicts:
	src/main/java/com/afanticar/afantiopenapi/config/TokenInterceptor.java

src/main/java/com/afanticar/afantiopenapi/config/IgnoredUri.java

+package com.afanticar.afantiopenapi.config;
+
+import lombok.Data;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.Set;
+
+@Data
+@Configuration
+@ConfigurationProperties(prefix = "ignored")
+public class IgnoredUri {
+
+    private Set<String> uris;
+}

src/main/java/com/afanticar/afantiopenapi/config/TokenInterceptor.java

@@ -33,22 +33,22 @@ import java.util.concurrent.TimeUnit;
 @Slf4j
 @Setter
 @Component
-@ConfigurationProperties(prefix = "ignored")
 public class TokenInterceptor implements HandlerInterceptor {
 
     @Autowired
-    AfantiCasFeign casFeign;
+    private AfantiCasFeign casFeign;
 
     @Autowired
     RedissonClient redissonClient;
 
-    private Set<String> uris;
+    @Autowired
+    private IgnoredUri ignoredUri;
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         String requestUri = request.getRequestURI();
         log.info("请求uri" + requestUri);
-        if (uris.contains(requestUri)) {
+        if (ignoredUri.getUris().contains(requestUri)) {
             return true;
         }
         String token = request.getHeader("authorization");
@@ -94,9 +94,9 @@ public class TokenInterceptor implements HandlerInterceptor {
 //            RLock lock = redissonClient.getLock(Constant.TOKEN_REDIS_LOCK+clientId);
 //            lock.lock(5,TimeUnit.SECONDS);
 //            try{
-                TokenCheckVO checkVO = casFeign.checkToken(token);
+        TokenCheckVO checkVO = casFeign.checkToken(token);
 //                rBucket.set(checkVO,24, TimeUnit.HOURS);
-                return checkVO;
+        return checkVO;
 //            }catch (Exception e){
 //                throw e;
 //            }finally {