feat: feign新增日志输出、清理代码.

This commit is contained in:
2024-06-15 22:51:03 +08:00
parent 28a69f37e2
commit 5e7a4eea34
5 changed files with 22 additions and 20 deletions

11
pom.xml
View File

@@ -59,6 +59,17 @@
<artifactId>feign-core</artifactId> <artifactId>feign-core</artifactId>
<version>${feign.core.version}</version> <version>${feign.core.version}</version>
</dependency> </dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-slf4j</artifactId>
<version>${feign.core.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency> <dependency>
<groupId>junit</groupId> <groupId>junit</groupId>
<artifactId>junit</artifactId> <artifactId>junit</artifactId>

View File

@@ -84,6 +84,10 @@ public abstract class AbstractInstance implements Instance {
return; return;
} }
} }
if (ipAddress == null) {
log.error("IP地址获取失败, 无法继续更新记录!");
return;
}
log.debug("正在尝试将记录旧IP: {} 更新为: {}", value, ipAddress); log.debug("正在尝试将记录旧IP: {} 更新为: {}", value, ipAddress);
value = ipAddress; value = ipAddress;
run0(); run0();

View File

@@ -11,7 +11,6 @@ import com.serliunx.ddns.support.feign.client.entity.IPAddressResponse;
import com.serliunx.ddns.thread.TaskThreadFactory; import com.serliunx.ddns.thread.TaskThreadFactory;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import java.io.File; import java.io.File;
import java.io.InputStream; import java.io.InputStream;
@@ -19,11 +18,9 @@ import java.io.OutputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Collection;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ScheduledFuture; import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@@ -75,9 +72,6 @@ public final class SystemInitializer implements Refreshable, Clearable {
// 初始化线程池 // 初始化线程池
initThreadPool(coreSize); initThreadPool(coreSize);
// 尝试链接dashboard
registerToDashboard();
// 加载实例(不同的容器加载时机不同) // 加载实例(不同的容器加载时机不同)
loadInstances(); loadInstances();
@@ -177,14 +171,6 @@ public final class SystemInitializer implements Refreshable, Clearable {
}, "DDNS-ShutDownHook")); }, "DDNS-ShutDownHook"));
} }
private void registerToDashboard() {
CompletableFuture.runAsync(() -> {
}, scheduledThreadPoolExecutor).whenComplete((r, t) -> {
});
}
private void checkAndCloseSafely() { private void checkAndCloseSafely() {
if (scheduledThreadPoolExecutor == null) if (scheduledThreadPoolExecutor == null)
return; return;

View File

@@ -4,10 +4,10 @@ import com.serliunx.ddns.support.feign.JacksonDecoder;
import com.serliunx.ddns.support.feign.JacksonEncoder; import com.serliunx.ddns.support.feign.JacksonEncoder;
import com.serliunx.ddns.support.feign.client.entity.IPAddressResponse; import com.serliunx.ddns.support.feign.client.entity.IPAddressResponse;
import feign.Feign; import feign.Feign;
import feign.Request; import feign.Logger;
import feign.RequestLine; import feign.RequestLine;
import feign.Retryer;
import java.util.concurrent.TimeUnit; import feign.slf4j.Slf4jLogger;
/** /**
* 本机外网IP地址获取 * 本机外网IP地址获取
@@ -30,11 +30,11 @@ public interface IPAddressClient {
static IPAddressClient getInstance() { static IPAddressClient getInstance() {
return Feign.builder() return Feign.builder()
.logger(new Slf4jLogger())
.logLevel(Logger.Level.BASIC)
.retryer(Retryer.NEVER_RETRY)
.encoder(JacksonEncoder.getInstance()) .encoder(JacksonEncoder.getInstance())
.decoder(JacksonDecoder.getInstance()) .decoder(JacksonDecoder.getInstance())
.options(new Request.Options(10,
TimeUnit.SECONDS, 10,
TimeUnit.SECONDS, true))
.target(IPAddressClient.class, url); .target(IPAddressClient.class, url);
} }
} }

View File

@@ -11,6 +11,7 @@
</appender> </appender>
<logger name="com.serliunx.ddns" level="DEBUG"/> <logger name="com.serliunx.ddns" level="DEBUG"/>
<logger name="feign" level="DEBUG"/>
<root level="INFO"> <root level="INFO">
<appender-ref ref="STDOUT" /> <appender-ref ref="STDOUT" />