3.0.6 优化网络解析

eritpchy · eritpchy · commit 6780709a19e2 · 2023-04-07T15:49:29.000+08:00
diff --git a/aliyundrive-sdk-openapi/build.gradle b/aliyundrive-sdk-openapi/build.gradle
@@ -35,6 +35,7 @@ dependencies {
     compileOnly 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19
     testImplementation 'com.squareup.okhttp3:okhttp:3.12.13' //api19
     testImplementation 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19
+    implementation 'dnsjava:dnsjava:3.5.2'
 }
 
 test {
diff --git a/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/impl/AliyunDriveOpenApiImplV1.java b/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/impl/AliyunDriveOpenApiImplV1.java
@@ -14,8 +14,11 @@
 import net.xdow.aliyundrive.util.JsonUtils;
 import net.xdow.aliyundrive.util.StringUtils;
 import okhttp3.*;
+import org.xbill.DNS.Address;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -63,6 +66,15 @@ public Response intercept(Chain chain) throws IOException {
                 .readTimeout(1, TimeUnit.MINUTES)
                 .writeTimeout(1, TimeUnit.MINUTES)
                 .connectTimeout(1, TimeUnit.MINUTES)
+                .dns(new Dns() {
+                    @Override
+                    public List<InetAddress> lookup(String hostname) throws UnknownHostException {
+                        return Arrays.asList(Address.getAllByName(hostname));
+                    }
+                })
+                .followRedirects(true)
+                .followSslRedirects(true)
+                .retryOnConnectionFailure(true)
                 .build();
     }
 
diff --git a/aliyundrive-sdk-webapi/build.gradle b/aliyundrive-sdk-webapi/build.gradle
@@ -34,6 +34,7 @@ dependencies {
     compileOnly 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19
     implementation 'org.slf4j:slf4j-api:2.0.6'
     implementation project(':aliyundrive-sdk-openapi')
+    implementation 'dnsjava:dnsjava:3.5.2'
 }
 
 test {
diff --git a/aliyundrive-sdk-webapi/src/main/java/net/xdow/aliyundrive/webapi/impl/AliyunDriveWebApiImplV1.java b/aliyundrive-sdk-webapi/src/main/java/net/xdow/aliyundrive/webapi/impl/AliyunDriveWebApiImplV1.java
@@ -18,8 +18,11 @@
 import okhttp3.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.xbill.DNS.Address;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -103,6 +106,15 @@ public Request authenticate(Route route, Response response) throws IOException {
                 .readTimeout(1, TimeUnit.MINUTES)
                 .writeTimeout(1, TimeUnit.MINUTES)
                 .connectTimeout(1, TimeUnit.MINUTES)
+                .dns(new Dns() {
+                    @Override
+                    public List<InetAddress> lookup(String hostname) throws UnknownHostException {
+                        return Arrays.asList(Address.getAllByName(hostname));
+                    }
+                })
+                .followRedirects(true)
+                .followSslRedirects(true)
+                .retryOnConnectionFailure(true)
                 .build();
     }
 
diff --git a/aliyundrive-webdav-internal/build.gradle b/aliyundrive-webdav-internal/build.gradle
@@ -40,6 +40,7 @@ dependencies {
     implementation 'com.google.guava:guava:20.0' //java7
     compileOnly 'com.squareup.okhttp3:okhttp:3.12.13' //api19
     compileOnly 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19
+    implementation 'dnsjava:dnsjava:3.5.2'
 }
 
 test {
diff --git a/aliyundrive-webdav-internal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java b/aliyundrive-webdav-internal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java
@@ -27,6 +27,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.xbill.DNS.config.PropertyResolverConfigProvider;
 
 import java.io.File;
 import java.io.IOException;
@@ -59,6 +60,7 @@ public Set<AliyunDriveFileInfo> load(String key) throws Exception {
     private final T mAliyunDrive;
 
     public AliyunDriveClientService(Class<? extends IAliyunDrive> aliyunDriveCls, AliyunDriveProperties aliyunDriveProperties) {
+        System.setProperty(PropertyResolverConfigProvider.DNS_SERVER_PROP, "223.5.5.5,114.114.114.114");
         this.mAliyunDriveProperties = aliyunDriveProperties;
         this.mAliyunDrive = (T) AliyunDrive.newAliyunDrive(aliyunDriveCls);
         this.mAliyunDrive.setAuthorizer(this);
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'com.github'
-version '3.0.5'
+version '3.0.6'
 sourceCompatibility = '17'
 
 configurations {
diff --git a/conf/.gitkeep b/conf/.gitkeep
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,7 +6,7 @@ services:
     restart: always
     volumes:
       - /etc/localtime:/etc/localtime
-      - ./docker/conf:/conf
+      - ./conf:/conf
     ports:
       - "8080:8080"
     tty: true
diff --git a/ext/script/docker_up.sh b/ext/script/docker_up.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e
+cd ${0%/*}
+cd ../../
+docker compose up -d --pull always
+docker compose logs -f
diff --git a/src/main/java/com/github/zxbu/webdavteambition/config/AliyunDrivePropertiesSpring.java b/src/main/java/com/github/zxbu/webdavteambition/config/AliyunDrivePropertiesSpring.java
@@ -23,7 +23,11 @@ public void afterPropertiesSet() throws Exception {
         if (StringUtils.isEmpty(this.getDeviceId())) {
             this.setDeviceId(UUID.randomUUID().toString().replace("-", "").substring(0, 24));
         }
-        this.setRefreshTokenNext(refreshToken);
+        if (StringUtils.isEmpty(this.getRefreshToken())) {
+            this.setRefreshToken(refreshToken);
+        } else {
+            this.setRefreshTokenNext(refreshToken);
+        }
         if (StringUtils.isEmpty(this.getAuth().getUserName())) {
             this.getAuth().setUserName("admin");
         }

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,7 @@ dependencies {`
`35`	`35`	`compileOnly 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19`
`36`	`36`	`testImplementation 'com.squareup.okhttp3:okhttp:3.12.13' //api19`
`37`	`37`	`testImplementation 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19`
	`38`	`+ implementation 'dnsjava:dnsjava:3.5.2'`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ dependencies {`
`34`	`34`	`compileOnly 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19`
`35`	`35`	`implementation 'org.slf4j:slf4j-api:2.0.6'`
`36`	`36`	`implementation project(':aliyundrive-sdk-openapi')`
	`37`	`+ implementation 'dnsjava:dnsjava:3.5.2'`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ dependencies {`
`40`	`40`	`implementation 'com.google.guava:guava:20.0' //java7`
`41`	`41`	`compileOnly 'com.squareup.okhttp3:okhttp:3.12.13' //api19`
`42`	`42`	`compileOnly 'com.squareup.okhttp3:logging-interceptor:3.12.13' //api19`
	`43`	`+ implementation 'dnsjava:dnsjava:3.5.2'`
`43`	`44`	`}`
`44`	`45`
`45`	`46`	`test {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`group 'com.github'`
`9`		`-version '3.0.5'`
	`9`	`+version '3.0.6'`
`10`	`10`	`sourceCompatibility = '17'`
`11`	`11`
`12`	`12`	`configurations {`