~web.config.authority;

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/config/WebMvcConfig.java

@@ -17,18 +17,18 @@ public class WebMvcConfig extends WebMvcConfigurationSupport {
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
-        registry.addResourceHandler("/**").addResourceLocations(
-                "classpath:/static/");
+//        registry.addResourceHandler("/**").addResourceLocations(
+//                "classpath:/static/");
         registry.addResourceHandler("doc.html").addResourceLocations(
                 "classpath:/META-INF/resources/");
         registry.addResourceHandler("/webjars/**").addResourceLocations(
                 "classpath:/META-INF/resources/webjars/");
-        registry.addResourceHandler("*.js").addResourceLocations(
-                "/webapp/js/**");
-        registry.addResourceHandler("*.css").addResourceLocations(
-                "webapp/css/**");
-        registry.addResourceHandler("*.img").addResourceLocations(
-                "webapp/img/**");
+//        registry.addResourceHandler("*.js").addResourceLocations(
+//                "/webapp/js/**");
+//        registry.addResourceHandler("*.css").addResourceLocations(
+//                "webapp/css/**");
+//        registry.addResourceHandler("*.img").addResourceLocations(
+//                "webapp/img/**");
         super.addResourceHandlers(registry);
     }
 

liquidnet-bus-common/liquidnet-common-web/src/main/java/com/liquidnet/common/web/filter/GlobalAuthorityInterceptor.java

@@ -63,7 +63,7 @@ public class GlobalAuthorityInterceptor extends HandlerInterceptorAdapter {
 
     @Autowired
     JwtValidator jwtValidator;
-    @Autowired(required = false)
+    @Autowired
     FeignAuthorityClient feignAuthorityClient;
 
     @Override

liquidnet-bus-config/liquidnet-config/liquidnet-service-stone.yml

@@ -126,7 +126,7 @@ global-auth:
     - ${liquidnet.info.context}/user/logs/in2111
     - ${liquidnet.info.context}/user/logs/de2111
   oncheck-url-pattern:
-#    - ${liquidnet.info.context}/**
+    - ${liquidnet.info.context}/**
 
 
 # -----------------------------------------------------------

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/src/main/java/com/liquidnet/service/candy/config/CandyWebMvcConfig.java

@@ -8,12 +8,10 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 
 @Configuration
 public class CandyWebMvcConfig extends WebMvcConfig {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(this.globalAuthorityInterceptor).addPathPatterns("/**");
         super.addInterceptors(registry);
     }
 }

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/ServiceChimeApplication.java

@@ -12,7 +12,7 @@ import java.net.InetAddress;
 import java.util.Arrays;
 
 @Slf4j
-@EnableFeignClients
+@EnableFeignClients(basePackages = {"com.liquidnet"})
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceChimeApplication implements CommandLineRunner {
     @Autowired

liquidnet-bus-service/liquidnet-service-chime/liquidnet-service-chime-impl/src/main/java/com/liquidnet/service/chime/config/ChimeWebMvcConfig.java

@@ -8,12 +8,10 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 
 @Configuration
 public class ChimeWebMvcConfig extends WebMvcConfig {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(this.globalAuthorityInterceptor).addPathPatterns("/**");
         super.addInterceptors(registry);
     }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/ServiceDragonApplication.java

@@ -5,12 +5,14 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.core.env.Environment;
 
 import java.net.InetAddress;
 import java.util.Arrays;
 
 @Slf4j
+@EnableFeignClients(basePackages = {"com.liquidnet"})
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceDragonApplication implements CommandLineRunner {
     @Autowired

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/config/KylinWebMvcConfig.java

 package com.liquidnet.service.kylin.config;
 
 import com.liquidnet.common.web.config.WebMvcConfig;
-import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
+import com.liquidnet.service.kylin.interceptor.KylinAuthorityInterceptor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
@@ -9,11 +9,11 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 @Configuration
 public class KylinWebMvcConfig extends WebMvcConfig {
     @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+    KylinAuthorityInterceptor kylinAuthorityInterceptor;
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(kylinAuthorityInterceptor).addPathPatterns("/**");
         super.addInterceptors(registry);
     }
 }

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/config/OrderWebMvcConfig.java

@@ -8,12 +8,10 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 
 @Configuration
 public class OrderWebMvcConfig  extends WebMvcConfig {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(this.globalAuthorityInterceptor).addPathPatterns("/**");
         super.addInterceptors(registry);
     }
 }

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/config/PlatformWebMvcConfig.java

@@ -8,12 +8,10 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 
 @Configuration
 public class PlatformWebMvcConfig extends WebMvcConfig {
-//    @Autowired
-//    GlobalAuthorityInterceptor globalAuthorityInterceptor;
-//
+
 //    @Override
 //    protected void addInterceptors(InterceptorRegistry registry) {
-//        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+//        registry.addInterceptor(this.globalAuthorityInterceptor).addPathPatterns("/**");
 //        super.addInterceptors(registry);
 //    }
 }

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/ServiceStoneApplication.java

@@ -12,7 +12,7 @@ import java.net.InetAddress;
 import java.util.Arrays;
 
 @Slf4j
-@EnableFeignClients
+@EnableFeignClients(basePackages = {"com.liquidnet"})
 @SpringBootApplication(scanBasePackages = {"com.liquidnet"})
 public class ServiceStoneApplication implements CommandLineRunner {
     @Autowired

liquidnet-bus-service/liquidnet-service-stone/liquidnet-service-stone-impl/src/main/java/com/liquidnet/service/stone/config/StoneWebMvcConfig.java

@@ -11,7 +11,7 @@ public class StoneWebMvcConfig extends WebMvcConfig {
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(this.globalAuthorityInterceptor).addPathPatterns("/**");
         super.addInterceptors(registry);
     }
 }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/config/SweetWebMvcConfig.java

@@ -8,12 +8,10 @@ import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 
 @Configuration
 public class SweetWebMvcConfig extends WebMvcConfig {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
 
     @Override
     protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        registry.addInterceptor(this.globalAuthorityInterceptor).addPathPatterns("/**");
         super.addInterceptors(registry);
     }
 }