Merge remote-tracking branch 'origin/dev' into dev

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

 package com.liquidnet.common.web.config;
 
-import com.liquidnet.common.web.filter.GlobalAuthorityInterceptor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 
 @Configuration
 public class WebMvcConfig extends WebMvcConfigurationSupport {
-    @Autowired
-    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+//    @Autowired
+//    GlobalAuthorityInterceptor globalAuthorityInterceptor;
 
     @Override
     public void addResourceHandlers(ResourceHandlerRegistry registry) {
@@ -29,12 +26,11 @@ public class WebMvcConfig extends WebMvcConfigurationSupport {
         super.addResourceHandlers(registry);
     }
 
-    @Override
-    protected void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
-//                .excludePathPatterns("/*/v2/api-docs*", "/*/swagger-resources/**", "/*/webjars/**", "/*/doc.html");
-        super.addInterceptors(registry);
-    }
+//    @Override
+//    protected void addInterceptors(InterceptorRegistry registry) {
+//        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+//        super.addInterceptors(registry);
+//    }
 
 //    @Bean
 //    public FilterRegistrationBean domainCrossFilterBean(){

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -34,4 +34,9 @@ liquidnet:
     host: s-2zef656730e5a1d4.mongodb.rds.aliyuncs.com:3717,s-2ze49872ed6aeb14.mongodb.rds.aliyuncs.com:3717
     port: 3717
     user: root
-    pwd: $hAh4SGcDQ
\ No newline at end of file
+    pwd: $hAh4SGcDQ
+  service:
+    executor-main:
+      xxl:
+        admin:
+          addresses: 172.17.121.166:8090
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/config/AdamWebMvcConfig.java

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

liquidnet-bus-service/liquidnet-service-executor-all/pom.xml

@@ -15,17 +15,15 @@
     </modules>
 
     <dependencies>
-        <dependency>
-            <groupId>com.liquidnet</groupId>
-            <artifactId>liquidnet-common-service-base</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
-
         <dependency>
             <groupId>com.xuxueli</groupId>
             <artifactId>xxl-job-core</artifactId>
             <version>2.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-common-web</artifactId>
+        </dependency>
     </dependencies>
 
 

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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
+
+@Configuration
+public class KylinWebMvcConfig extends WebMvcConfig {
+    @Autowired
+    GlobalAuthorityInterceptor globalAuthorityInterceptor;
+
+    @Override
+    protected void addInterceptors(InterceptorRegistry registry) {
+        registry.addInterceptor(globalAuthorityInterceptor).addPathPatterns("/**");
+        super.addInterceptors(registry);
+    }
+}