优化 拦截器工鞥呢

java110-core/src/main/java/com/java110/core/trace/FeignOkHttpClientConfigurer.java

@@ -0,0 +1,39 @@
+package com.java110.core.trace;
+
+import feign.Feign;
+import okhttp3.OkHttpClient;
+import org.springframework.boot.autoconfigure.AutoConfigureBefore;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
+import org.springframework.cloud.commons.httpclient.OkHttpClientFactory;
+import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.cloud.openfeign.support.FeignHttpClientProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+@ConditionalOnClass(Feign.class)
+@AutoConfigureBefore(FeignAutoConfiguration.class)
+public class FeignOkHttpClientConfigurer {
+
+
+    private OkHttpClient okHttpClient;
+
+    @Bean
+    public Java110FeignClientInterceptor okHttpInterceptor() {
+        return new Java110FeignClientInterceptor();
+    }
+
+    //注入okhttp
+    @Bean
+    public okhttp3.OkHttpClient okHttpClient(OkHttpClientFactory okHttpClientFactory,
+                                             FeignHttpClientProperties httpClientProperties) {
+        this.okHttpClient = okHttpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation()).connectTimeout(httpClientProperties.getConnectionTimeout(),
+                TimeUnit.SECONDS)
+                .followRedirects(httpClientProperties.isFollowRedirects())
+                .addInterceptor(okHttpInterceptor())
+                .build();
+        return this.okHttpClient;
+    }
+}

java110-core/src/main/java/com/java110/core/aop/Java110FeignClientAop.java

@@ -1,4 +1,4 @@
-package com.java110.core.aop;
+package com.java110.core.trace;
 
 import com.java110.core.factory.Java110TraceFactory;
 import com.java110.core.log.LoggerFactory;
@@ -7,23 +7,14 @@ import okhttp3.Interceptor;
 import okhttp3.Request;
 import okhttp3.Response;
 import org.slf4j.Logger;
+import org.springframework.stereotype.Component;
 
 import java.io.IOException;
 
+//@Component
+public class Java110FeignClientInterceptor implements Interceptor {
+    private static Logger logger = LoggerFactory.getLogger(Java110FeignClientInterceptor.class);
 
-public class Java110FeignClientAop implements Interceptor {
-    private static Logger logger = LoggerFactory.getLogger(Java110FeignClientAop.class);
-
-    //    @Around("execution (* feign.Client.*(..)) && !within(is(FinalType))")
-//    public Object feignClientWasCalled(final ProceedingJoinPoint pjp) throws Throwable {
-//
-//        logger.debug("feign 进入 Java110FeignClientAop>> feignClientWasCalled");
-//
-//        Java110TraceFactory.putAnnotations(TraceAnnotationsDto.VALUE_SERVER_SEND);
-//        Object clientHttpResponse = pjp.proceed();
-//        Java110TraceFactory.putAnnotations(TraceAnnotationsDto.VALUE_SERVER_RECEIVE);
-//        return clientHttpResponse;
-//    }
     @Override
     public Response intercept(Chain chain) throws IOException {
         Request request = chain.request();

java110-core/src/main/java/com/java110/core/aop/Java110RestTemplateInterceptor.java

@@ -1,4 +1,4 @@
-package com.java110.core.aop;
+package com.java110.core.trace;
 
 import com.java110.core.factory.Java110TraceFactory;
 import com.java110.core.log.LoggerFactory;

java110-core/src/main/java/com/java110/core/aop/Java110TraceConfigurer.java

@@ -1,4 +1,4 @@
-package com.java110.core.aop;
+package com.java110.core.trace;
 
 import okhttp3.ConnectionPool;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,7 +7,6 @@ import org.springframework.context.annotation.Bean;
 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.WebMvcConfigurer;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 import java.util.concurrent.TimeUnit;
@@ -28,9 +27,9 @@ public class Java110TraceConfigurer extends WebMvcConfigurerAdapter {
     }
 
     @Bean
-    @ConditionalOnBean(Java110FeignClientAop.class)
+    @ConditionalOnBean(Java110FeignClientInterceptor.class)
     public okhttp3.OkHttpClient okHttpClient(@Autowired
-                                                         Java110FeignClientAop okHttpLoggingInterceptor){
+                                                     Java110FeignClientInterceptor okHttpLoggingInterceptor){
         okhttp3.OkHttpClient.Builder ClientBuilder = new okhttp3.OkHttpClient.Builder()
                 .readTimeout(30, TimeUnit.SECONDS) //读取超时
                 .connectTimeout(10, TimeUnit.SECONDS) //连接超时

java110-core/src/main/java/com/java110/core/aop/Java110TraceHandlerInterceptor.java

@@ -1,11 +1,10 @@
-package com.java110.core.aop;
+package com.java110.core.trace;
 
 import com.java110.core.factory.Java110TraceFactory;
 import com.java110.core.log.LoggerFactory;
 import com.java110.dto.trace.TraceAnnotationsDto;
 import org.slf4j.Logger;
 import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
 import javax.servlet.http.HttpServletRequest;

service-acct/src/main/java/com/java110/acct/AcctServiceApplicationStart.java

@@ -2,7 +2,7 @@ package com.java110.acct;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;

service-api/src/main/java/com/java110/api/ApiApplicationStart.java

@@ -16,8 +16,8 @@
 package com.java110.api;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110FeignClientAop;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110FeignClientInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.service.api.ServiceDataFlowEventPublishing;
 import com.java110.core.log.LoggerFactory;
@@ -125,9 +125,9 @@ public class ApiApplicationStart {
 
 
     @Bean
-    @ConditionalOnBean(Java110FeignClientAop.class)
+    @ConditionalOnBean(Java110FeignClientInterceptor.class)
     public okhttp3.OkHttpClient okHttpClient(@Autowired
-                                                     Java110FeignClientAop okHttpLoggingInterceptor){
+                                                     Java110FeignClientInterceptor okHttpLoggingInterceptor){
         okhttp3.OkHttpClient.Builder ClientBuilder = new okhttp3.OkHttpClient.Builder()
                 .readTimeout(30, TimeUnit.SECONDS) //读取超时
                 .connectTimeout(10, TimeUnit.SECONDS) //连接超时

service-common/src/main/java/com/java110/common/CommonServiceApplicationStart.java

@@ -17,7 +17,7 @@ package com.java110.common;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;

service-community/src/main/java/com/java110/community/CommunityServiceApplicationStart.java

@@ -17,7 +17,7 @@ package com.java110.community;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;

service-dev/src/main/java/com/java110/dev/DevServiceApplicationStart.java

@@ -1,7 +1,7 @@
 package com.java110.dev;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.log.LoggerFactory;

service-fee/src/main/java/com/java110/fee/FeeServiceApplicationStart.java

@@ -2,7 +2,7 @@ package com.java110.fee;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;

service-job/src/main/java/com/java110/job/JobServiceApplication.java

@@ -1,7 +1,7 @@
 package com.java110.job;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
 import com.java110.service.init.ServiceStartInit;

service-oa/src/main/java/com/java110/oa/OaServiceApplicationStart.java

@@ -17,7 +17,7 @@ package com.java110.oa;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
@@ -26,7 +26,6 @@ import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration;
 import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
 import org.springframework.cloud.client.loadbalancer.LoadBalanced;

service-order/src/main/java/com/java110/order/OrderServiceApplicationStart.java

@@ -17,7 +17,7 @@ package com.java110.order;
 
 import com.java110.config.properties.code.ZookeeperProperties;
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.center.DataFlowEventPublishing;
 import com.java110.service.init.ServiceInfoListener;

service-report/src/main/java/com/java110/report/ReportServiceApplicationStart.java

@@ -1,11 +1,9 @@
 package com.java110.report;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
-import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
-import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
 import com.java110.service.init.ServiceStartInit;
 import org.slf4j.Logger;
 import com.java110.core.log.LoggerFactory;

service-store/src/main/java/com/java110/store/StoreServiceApplicationStart.java

@@ -16,7 +16,7 @@
 package com.java110.store;
 
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;
 import com.java110.service.init.ServiceStartInit;

service-user/src/main/java/com/java110/user/UserServiceApplicationStart.java

@@ -2,7 +2,7 @@ package com.java110.user;
 
 import com.java110.core.annotation.Java110CmdDiscovery;
 import com.java110.core.annotation.Java110ListenerDiscovery;
-import com.java110.core.aop.Java110RestTemplateInterceptor;
+import com.java110.core.trace.Java110RestTemplateInterceptor;
 import com.java110.core.client.RestTemplate;
 import com.java110.core.event.cmd.ServiceCmdEventPublishing;
 import com.java110.core.event.service.BusinessServiceDataFlowEventPublishing;