From efc8a7e5554b75f156cb22c6676aecb7e1062b2a Mon Sep 17 00:00:00 2001
From: SkyeBeFreeman <928016560@qq.com>
Date: Wed, 23 Mar 2022 16:05:52 +0800
Subject: [PATCH] fix:fix import default log implement error
---
pom.xml | 14 ++++++--------
.../polaris/discovery/PolarisDiscoveryClient.java | 4 ----
.../com/tencent/cloud/feign/PluggableFeign.java | 15 +++++----------
.../MetadataRestTemplateInterceptor.java | 4 ----
.../plugin/feign/MetadataFirstFeignPlugin.java | 4 ----
.../core/scg/filter/DynamicRouteScgFilter.java | 5 -----
6 files changed, 11 insertions(+), 35 deletions(-)
diff --git a/pom.xml b/pom.xml
index 75a1b1d4..651c1390 100644
--- a/pom.xml
+++ b/pom.xml
@@ -84,14 +84,6 @@
1.2.7
-
-
- ch.qos.logback
- logback-classic
- ${logback.version}
-
-
-
@@ -120,6 +112,12 @@
pom
import
+
+
+ ch.qos.logback
+ logback-classic
+ ${logback.version}
+
diff --git a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java
index eaa555e9..90bec09c 100644
--- a/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java
+++ b/spring-cloud-tencent-starters/spring-cloud-starter-tencent-polaris-discovery/src/main/java/com/tencent/cloud/polaris/discovery/PolarisDiscoveryClient.java
@@ -18,8 +18,6 @@
package com.tencent.cloud.polaris.discovery;
import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
@@ -30,8 +28,6 @@ import org.springframework.cloud.client.discovery.DiscoveryClient;
*/
public class PolarisDiscoveryClient implements DiscoveryClient {
- private static final Logger log = LoggerFactory.getLogger(PolarisDiscoveryClient.class);
-
/**
* Polaris Discovery Client Description.
*/
diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-feign/src/main/java/com/tencent/cloud/feign/PluggableFeign.java b/spring-cloud-tencent-starters/spring-cloud-tencent-feign/src/main/java/com/tencent/cloud/feign/PluggableFeign.java
index d350f3be..44ca1fb7 100644
--- a/spring-cloud-tencent-starters/spring-cloud-tencent-feign/src/main/java/com/tencent/cloud/feign/PluggableFeign.java
+++ b/spring-cloud-tencent-starters/spring-cloud-tencent-feign/src/main/java/com/tencent/cloud/feign/PluggableFeign.java
@@ -23,14 +23,6 @@ import feign.Feign;
import feign.InvocationHandlerFactory;
import feign.Target;
import feign.hystrix.FallbackFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeansException;
-import org.springframework.cloud.openfeign.FeignContext;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.util.StringUtils;
-
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -38,6 +30,11 @@ import java.util.Comparator;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.springframework.beans.BeansException;
+import org.springframework.cloud.openfeign.FeignContext;
+import org.springframework.context.ApplicationContext;
+import org.springframework.context.ApplicationContextAware;
+import org.springframework.util.StringUtils;
/**
* Pluggable Feign builder.
@@ -46,8 +43,6 @@ import java.util.stream.Collectors;
*/
public class PluggableFeign {
- private static final Logger LOG = LoggerFactory.getLogger(PluggableFeign.class);
-
private PluggableFeign() {
}
diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java b/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java
index 090f572a..48322e66 100644
--- a/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java
+++ b/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/interceptor/resttemplate/MetadataRestTemplateInterceptor.java
@@ -25,8 +25,6 @@ import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.core.Ordered;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
@@ -42,8 +40,6 @@ import org.springframework.util.StringUtils;
*/
public class MetadataRestTemplateInterceptor implements ClientHttpRequestInterceptor, Ordered {
- private static final Logger LOG = LoggerFactory.getLogger(MetadataRestTemplateInterceptor.class);
-
@Override
public int getOrder() {
return MetadataConstant.OrderConstant.INTERCEPTOR_ORDER;
diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/plugin/feign/MetadataFirstFeignPlugin.java b/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/plugin/feign/MetadataFirstFeignPlugin.java
index 98d5d010..5d5f1148 100644
--- a/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/plugin/feign/MetadataFirstFeignPlugin.java
+++ b/spring-cloud-tencent-starters/spring-cloud-tencent-metadata/src/main/java/com/tencent/cloud/metadata/core/plugin/feign/MetadataFirstFeignPlugin.java
@@ -27,8 +27,6 @@ import com.tencent.cloud.metadata.context.MetadataContextHolder;
import feign.Feign;
import feign.MethodMetadata;
import feign.RequestTemplate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
* Plugin used for adding the metadata in http headers from context when web client is Feign.
@@ -37,8 +35,6 @@ import org.slf4j.LoggerFactory;
*/
public class MetadataFirstFeignPlugin implements PluggableFeignPlugin {
- private static final Logger LOG = LoggerFactory.getLogger(MetadataFirstFeignPlugin.class);
-
@Override
public int getOrder() {
return MetadataConstant.OrderConstant.METADATA_FIRST_FEIGN_PLUGIN_ORDER;
diff --git a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/core/scg/filter/DynamicRouteScgFilter.java b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/core/scg/filter/DynamicRouteScgFilter.java
index d3018884..f537d7ff 100644
--- a/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/core/scg/filter/DynamicRouteScgFilter.java
+++ b/spring-cloud-tencent-starters/spring-cloud-tencent-polaris-gateway/src/main/java/com/tencent/cloud/polaris/gateway/core/scg/filter/DynamicRouteScgFilter.java
@@ -18,14 +18,11 @@
package com.tencent.cloud.polaris.gateway.core.scg.filter;
import com.tencent.cloud.metadata.constant.MetadataConstant;
-import com.tencent.cloud.metadata.context.MetadataContextHolder;
import com.tencent.cloud.polaris.gateway.core.route.DynamicRouteService;
import java.net.URI;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.gateway.config.GatewayProperties;
import org.springframework.cloud.gateway.filter.FilterDefinition;
@@ -45,8 +42,6 @@ import reactor.core.publisher.Mono;
*/
public class DynamicRouteScgFilter implements WebFilter, Ordered {
- private static final Logger LOG = LoggerFactory.getLogger(DynamicRouteScgFilter.class);
-
@Autowired
private DynamicRouteService dynamicRouteService;