AccessTokenInvalid and TokenExpired

Update QPS for list and downloadurl open.aliyundrive.com => openapi.aliyundrive.com bump version to 3.1.0
eritpchy · May 25, 2023 · ec1d6d5 · ec1d6d5
1 parent 26fb009
commit ec1d6d5
Show file tree

Hide file tree

Showing 18 changed files with 32 additions and 29 deletions.
diff --git a/README.md b/README.md
@@ -146,18 +146,18 @@ implementation "com.squareup.okhttp3:logging-interceptor:3.12.13" //api19
 implementation "com.google.code.gson:gson:2.8.9"
 
 //主要
-implementation "net.xdow:aliyundrive-sdk-openapi:1.0.5"
-implementation "net.xdow:aliyundrive-sdk-webapi:1.0.5"
+implementation "net.xdow:aliyundrive-sdk-openapi:1.0.6"
+implementation "net.xdow:aliyundrive-sdk-webapi:1.0.6"
 
 //可选
-implementation "net.xdow:webdav:1.0.5"
-implementation "net.xdow:webdav-jakarta:1.0.5"
-implementation "net.xdow:webdav-javax:1.0.5"
-implementation "net.xdow:aliyundrive-webdav-internal:1.0.5"
-implementation "net.xdow:aliyundrive-android-core:1.0.5"
-implementation "net.xdow:jap-http:1.0.5"
-implementation "net.xdow:jap-http-jakarta-adapter:1.0.5"
-implementation "net.xdow:jap-http-javax-adapter:1.0.5"
+implementation "net.xdow:webdav:1.0.6"
+implementation "net.xdow:webdav-jakarta:1.0.6"
+implementation "net.xdow:webdav-javax:1.0.6"
+implementation "net.xdow:aliyundrive-webdav-internal:1.0.6"
+implementation "net.xdow:aliyundrive-android-core:1.0.6"
+implementation "net.xdow:jap-http:1.0.6"
+implementation "net.xdow:jap-http-jakarta-adapter:1.0.6"
+implementation "net.xdow:jap-http-javax-adapter:1.0.6"
 ```
 ## 基础用法
 ```java

diff --git a/aliyundrive-android-core/build.gradle b/aliyundrive-android-core/build.gradle
@@ -15,7 +15,7 @@ buildscript {
 apply plugin: 'com.android.library'
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav Android Core'
 
 repositories {

diff --git a/aliyundrive-sdk-openapi/build.gradle b/aliyundrive-sdk-openapi/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive OpenApi SDK'
 
 java {

diff --git a/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/AliyunDriveConstant.java b/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/AliyunDriveConstant.java
@@ -5,7 +5,7 @@ public class AliyunDriveConstant {
     public static final int MAX_DOWNLOAD_URL_EXPIRE_TIME_SEC = 115200; //32h
     public static final int MAX_FILE_CREATE_PART_INFO_LIST_SIZE = 10000;
     public static final String REFERER = "https://www.aliyundrive.com/";
-    public static final String API_HOST = "https://open.aliyundrive.com";
+    public static final String API_HOST = "https://openapi.aliyundrive.com";
     public static final String API_ACCESS_TOKEN = API_HOST + "/oauth/access_token";
     public static final String API_QRCODE_GENERATE = API_HOST + "/oauth/authorize/qrcode";
     public static final String API_QRCODE_IMAGE = API_HOST + "/oauth/qrcode/%s";

diff --git a/...undrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/impl/AliyunDriveOpenApiImplV1.java b/...undrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/impl/AliyunDriveOpenApiImplV1.java
@@ -52,7 +52,7 @@ public Response intercept(Chain chain) throws IOException {
                             if (code == 401 || code == 400) {
                                 ResponseBody body = response.peekBody(40960);
                                 String res = body.string();
-                                if (res.contains("AccessTokenInvalid")) {
+                                if (res.contains("AccessTokenInvalid") || res.contains("TokenExpired")) {
                                     AliyunDriveOpenApiImplV1.this.requestNewAccessToken();
                                     return chain.proceed(AliyunDriveOpenApiImplV1.this.buildCommonRequestHeader(request));
                                 }

diff --git a/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/net/AliyunDriveCall.java b/aliyundrive-sdk-openapi/src/main/java/net/xdow/aliyundrive/net/AliyunDriveCall.java
@@ -68,6 +68,9 @@ public void checkAuthorize(T t) {
         if ("AccessTokenInvalid".equals(t.getCode())) {
             throw new NotAuthenticatedException(t.getMessage() + "(" + t.getCode() + ")");
         }
+        if ("TokenExpired".equals(t.getCode())) {
+            throw new NotAuthenticatedException(t.getMessage() + "(" + t.getCode() + ")");
+        }
     }
 
     public AliyunDriveCall<T> disableAuthorizeCheck() {

diff --git a/...api/src/main/java/net/xdow/aliyundrive/net/interceptor/AccessTokenInvalidInterceptor.java b/...api/src/main/java/net/xdow/aliyundrive/net/interceptor/AccessTokenInvalidInterceptor.java
@@ -24,7 +24,7 @@ public Response intercept(Chain chain) throws IOException {
             if (code == 401 || code == 400) {
                 ResponseBody body = response.peekBody(40960);
                 String res = body.string();
-                if (res.contains("AccessTokenInvalid")) {
+                if (res.contains("AccessTokenInvalid") || res.contains("TokenExpired")) {
                     listener.run();
                 }
             }

diff --git a/aliyundrive-sdk-webapi/build.gradle b/aliyundrive-sdk-webapi/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive WebApi SDK'
 
 java {

diff --git a/aliyundrive-webdav-internal/build.gradle b/aliyundrive-webdav-internal/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav internal'
 
 java {

diff --git a/...internal/src/main/java/com/github/zxbu/webdavteambition/config/AliyunDriveProperties.java b/...internal/src/main/java/com/github/zxbu/webdavteambition/config/AliyunDriveProperties.java
@@ -31,7 +31,7 @@ public class AliyunDriveProperties {
     private transient String clientId;
 
     private transient String authorizationCode;
-    private transient String aliyunAccessTokenUrl = "https://adrive.xdow.net/oauth/access_token?code=%s&refresh_token=%s&ver=1.0.5";
+    private transient String aliyunAccessTokenUrl = "https://adrive.xdow.net/oauth/access_token?code=%s&refresh_token=%s&ver=1.0.6";
     private transient String aliyunAuthorizeUrl = "https://adrive.xdow.net/oauth/authorize?redirect_uri=%s";
 
     private transient Auth auth = new Auth();

diff --git a/...ternal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java b/...ternal/src/main/java/com/github/zxbu/webdavteambition/store/AliyunDriveClientService.java
@@ -138,7 +138,7 @@ private List<AliyunDriveFileInfo> fileListFromApi(String nodeId, String marker,
             if (res.isError()) {
                 if ("TooManyRequests".equals(res.getCode())) {
                     try {
-                        TimeUnit.SECONDS.sleep(6);
+                        TimeUnit.MILLISECONDS.sleep(300);
                     } catch (InterruptedException e) {
                     }
                     res = this.mAliyunDrive.fileList(query).execute();
@@ -147,7 +147,7 @@ private List<AliyunDriveFileInfo> fileListFromApi(String nodeId, String marker,
             if (res.isError()) {
                 if ("TooManyRequests".equals(res.getCode())) {
                     try {
-                        TimeUnit.SECONDS.sleep(6);
+                        TimeUnit.MILLISECONDS.sleep(300);
                     } catch (InterruptedException e) {
                     }
                     res = this.mAliyunDrive.fileList(query).execute();
@@ -468,7 +468,7 @@ private synchronized AliyunDriveResponse.FileGetDownloadUrlInfo fileGetDownloadU
         if (res.isError()) {
             if ("TooManyRequests".equals(res.getCode())) {
                 try {
-                    TimeUnit.SECONDS.sleep(6);
+                    TimeUnit.SECONDS.sleep(1);
                 } catch (InterruptedException e) {
                 }
                 res = this.mAliyunDrive.fileGetDownloadUrl(query).execute();
@@ -477,7 +477,7 @@ private synchronized AliyunDriveResponse.FileGetDownloadUrlInfo fileGetDownloadU
         if (res.isError()) {
             if ("TooManyRequests".equals(res.getCode())) {
                 try {
-                    TimeUnit.SECONDS.sleep(6);
+                    TimeUnit.SECONDS.sleep(1);
                 } catch (InterruptedException e) {
                 }
                 res = this.mAliyunDrive.fileGetDownloadUrl(query).execute();

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ plugins {
 }
 
 group 'com.github'
-version '3.0.8'
+version '3.1.0'
 sourceCompatibility = '17'
 
 configurations {

diff --git a/jap-http-adapter/jap-http-jakarta-adapter/build.gradle b/jap-http-adapter/jap-http-jakarta-adapter/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'jap-http servlet interface jakarta adapter'
 
 java {

diff --git a/jap-http-adapter/jap-http-javax-adapter/build.gradle b/jap-http-adapter/jap-http-javax-adapter/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'jap-http servlet interface javax adapter'
 
 java {

diff --git a/jap-http/build.gradle b/jap-http/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'jap-http servlet interface'
 
 java {

diff --git a/webdav-jakarta/build.gradle b/webdav-jakarta/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav jakarta implement'
 
 java {

diff --git a/webdav-javax/build.gradle b/webdav-javax/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav javax implement'
 
 java {

diff --git a/webdav/build.gradle b/webdav/build.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'net.xdow'
-version '1.0.5'
+version '1.0.6'
 description 'AliyunDrive Webdav core'
 
 java {