Skip to content

Commit 7ef2c8e

Browse files
YangSen-qnYangSen-qn
YangSen-qn
and
YangSen-qn
authored
Resume Upload default version to v2 (#517)
* resume default version to v2 --------- Co-authored-by: YangSen-qn <[email protected]>
1 parent 1986efc commit 7ef2c8e

32 files changed

+272
-217
lines changed

‎.idea/gradle.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
#Changelog
2+
## 8.9.0（2025-06-12）
3+
* 调整
4+
* 分片上传版本默认调整为 V2
5+
26
## 8.8.0（2024-06-24）
37
* 增加
48
* 上传支持加速域名

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ https://github.com/qiniudemo/qiniu-lab-android
1515

1616
| Qiniu SDK 版本 | 最低 Android版本 | 依赖库版本 |
1717
|--------------|-----------------|------------------------|
18+
| 8.9.x | Android 4.0+ | okhttp 4+ |
1819
| 8.8.x | Android 4.0+ | okhttp 4+ |
1920
| 8.7.x | Android 4.0+ | okhttp 4+ |
2021
| 8.6.x | Android 4.0+ | okhttp 4+ |
@@ -56,10 +57,10 @@ https://github.com/qiniudemo/qiniu-lab-android
5657
* Android Studio中添加dependencies 或者 在项目中添加maven依赖
5758
```
5859
// 1. 直接导入
59-
implementation 'com.qiniu:qiniu-android-sdk:8.8.+'
60+
implementation 'com.qiniu:qiniu-android-sdk:8.9.+'
6061
6162
// 2. 如果要修改okhttp依赖的版本，可采用以下方式（强烈建议使用七牛库依赖的okhttp版本）
62-
implementation ('com.qiniu:qiniu-android-sdk:8.8.+'){
63+
implementation ('com.qiniu:qiniu-android-sdk:8.9.+'){
6364
exclude (group: 'com.squareup.okhttp3', module: 'okhttp')
6465
}
6566
implementation 'com.squareup.okhttp3:okhttp:4.9.1'

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Jul 06 18:09:15 CST 2023
1+
#Tue Jun 10 16:58:52 CST 2025
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
43
distributionPath=wrapper/dists
5-
zipStorePath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.2-bin.zip
65
zipStoreBase=GRADLE_USER_HOME
6+
zipStorePath=wrapper/dists

‎library/build.gradle‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,11 @@ String version = versionName()
2020
int code = versionNameToCode(version)
2121

2222
android {
23-
compileSdkVersion 33
24-
// buildToolsVersion '29.0.3'
23+
namespace 'com.qiniu.android'
24+
compileSdk 33
25+
2526
defaultConfig {
26-
//applicationId "com.qiniu.android"
2727
minSdkVersion 14
28-
targetSdkVersion 33
2928
versionCode code
3029
versionName version
3130

@@ -67,8 +66,8 @@ dependencies {
6766
implementation fileTree(include: ['*.jar'], dir: 'libs')
6867

6968
androidTestImplementation 'junit:junit:4.13.2'
70-
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
71-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
69+
androidTestImplementation 'androidx.test.ext:junit:1.2.1'
70+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
7271

7372
// androidTestImplementation "androidx.test:runner:1.4.0"
7473
// androidTestImplementation "androidx.test:core:1.4.0"
@@ -81,7 +80,7 @@ dependencies {
8180

8281
task releaseJar(type: Jar, dependsOn: 'build') {
8382
//指定生成的jar名
84-
baseName('qiniu-android-sdk-' + version)
83+
archiveBaseName = ('qiniu-android-sdk-' + version + '.jar')
8584
//从哪里打包class文件
8685
// from('build/intermediates/classes/release/com/qiniu/android/dns/')
8786
//打包到jar后的目录结构

‎library/gradle.properties‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,4 @@ POM_NAME=qiniu-android-sdk-library
22
POM_ARTIFACT_ID=qiniu-android-sdk
33
POM_PACKAGING=aar
44
android.debug.obsoleteApi=true
5-
android.enableAapt2=false
65
org.gradle.jvmargs=-Xmx2048m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8

‎library/src/androidTest/java/com/qiniu/android/TestConfig.java‎

Lines changed: 51 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,76 +1,74 @@
11
package com.qiniu.android;
22

3-
import com.qiniu.android.common.FixedZone;
4-
import com.qiniu.android.common.Zone;
5-
63
/**
7-
* Created by bailong on 14/10/12.
4+
* @author Created by bailong on 14/10/12.
5+
* 测试用例参数配置
86
*/
97
public final class TestConfig {
108
// TODO: 2020-05-09 bad token for testPutBytesWithFixedZoneUseBackupDomains
11-
// 华东上传凭证
12-
public static final String bucket_z0 = "kodo-phone-zone0-space";
13-
public static final String token_z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:gHBZrJTOKxxJlXjYoUxWmRSvuU8=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
14-
// 华北上传凭证
15-
public static final String bucket_z1 = "kodo-phone-zone1-space";
16-
public static final String token_z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:8kFB5kF7f3INNSUZLToOBDTGMbU=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
17-
// 华南上传凭证
18-
public static final String bucket_z2 = "kodo-phone-zone2-space";
19-
public static final String token_z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:CR7NjzaMWAqQAt6b7mPuwvwIzLs=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
20-
// 北美上传凭证
21-
public static final String bucket_na0 = "kodo-phone-zone-na0-space";
22-
public static final String token_na0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:4TBEbspih6VzaNbPYlrpRIkm7xU=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
23-
// 东南亚上传凭证
24-
public static final String bucket_as0 = "kodo-phone-zone-as0-space";
25-
public static final String token_as0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:JczpyfXUYEan2qrimbu6GlOCADo=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTcyMTcwMDU5MiwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
26-
// 华北浙江2上传凭证
27-
public static final String bucket_cn_east_2 = "kodo-phone-cn-east-2";
28-
public static final String token_cn_east_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:LWCzEeHkDWcYVBViMzZdJ4IaZ0U=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3MjE3MDA1OTIsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
29-
public static final String invalidBucketToken = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:FLgR-iEqqbGw-2vCdA9m5X7nOTY=:eyJzY29wZSI6InpvbmVfaW52YWxpZCIsImRlYWRsaW5lIjoxNzIxNzAwNTkyLCAicmV0dXJuQm9keSI6IntcImZvb1wiOiQoeDpmb28pLCBcImJhclwiOiQoeDpiYXIpLCBcIm1pbWVUeXBlXCI6JChtaW1lVHlwZSksIFwiaGFzaFwiOiQoZXRhZyksIFwia2V5XCI6JChrZXkpLCBcImZuYW1lXCI6JChmbmFtZSksIFwiZnNpemVcIjokKGZzaXplKX0ifQ==";
9+
/**
10+
* 华东上传 Bucket
11+
*/
12+
public static final String BUCKET_Z0 = "kodo-phone-zone0-space";
3013

31-
// -----------
32-
public static final String ak = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
14+
/**
15+
* 华东上传 Token
16+
*/
17+
public static final String TOKEN_Z0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:yOpxWejHk_3fbAgKMXrU2hcHdn4=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
18+
/**
19+
* 华北上传 Bucket
20+
*/
21+
public static final String BUCKET_Z1 = "kodo-phone-zone1-space";
3322

23+
/**
24+
* 华北上传 Token
25+
*/
26+
public static final String TOKEN_Z1 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:zfUWM_fef9HBm-rxBCr4vS7Cpew=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTEtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
27+
/**
28+
* 华南上传 Bucket
29+
*/
30+
public static final String BUCKET_Z2 = "kodo-phone-zone2-space";
3431

35-
//测试通用的token
36-
public static final String commonToken = token_na0;
37-
//dns prefetch token
38-
public static final String uptoken_prefetch = "MP_Ebql_lSsUrDr7WrXn_5vKocQDLvTPCNEFeVmp:3KJpXCGMqm6EAYU71RF1HDmQrcE=:eyJzY29wZSI6ImFuZHJvaWR0ZXN0IiwiZGVhZGxpbmUiOjE1Njc0OTAxODF9";
32+
/**
33+
* 华南上传 Token
34+
*/
35+
public static final String TOKEN_Z2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:KMKQCK93-eNG26UoTrvVbbdnriI=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZTItc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
36+
/**
37+
* 北美上传 Bucket
38+
*/
39+
public static final String BUCKET_NA0 = "kodo-phone-zone-na0-space";
3940

4041
/**
41-
* 华东机房
42+
* 北美上传 Token
43+
*/
44+
public static final String TOKEN_NA0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:HB0atzwUWFZM58cYyssBKtPrTOQ=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1uYTAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
45+
/**
46+
* 东南亚上传 Bucket
4247
*/
43-
public static final Zone mock_bucket_zone0 = new FixedZone(new String[]{
44-
"mock.upload.qiniup.com", "mock.upload-nb.qiniup.com",
45-
"mock.upload-xs.qiniup.com", "mock.up.qiniup.com",
46-
"mock.up-nb.qiniup.com", "mock.up-xs.qiniup.com",
47-
"mock.upload.qbox.me", "up.qbox.me"
48-
});
48+
public static final String BUCKET_AS0 = "kodo-phone-zone-as0-space";
4949

5050
/**
51-
* 华北机房
51+
* 东南亚上传 Token
5252
*/
53-
public static final Zone mock_bucket_zone1 = new FixedZone(new String[]{
54-
"mock.upload-z1.qiniup.com", "mock.up-z1.qiniup.com",
55-
"mock.upload-z1.qbox.me", "up-z1.qbox.me"
56-
});
53+
public static final String TOKEN_AS0 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:PLEc_wBAnhcWAqIw_BTC9lBhyzs=:eyJzY29wZSI6ImtvZG8tcGhvbmUtem9uZS1hczAtc3BhY2UiLCJkZWFkbGluZSI6MTc1NDczNTI2NSwgInJldHVybkJvZHkiOiJ7XCJmb29cIjokKHg6Zm9vKSwgXCJiYXJcIjokKHg6YmFyKSwgXCJtaW1lVHlwZVwiOiQobWltZVR5cGUpLCBcImhhc2hcIjokKGV0YWcpLCBcImtleVwiOiQoa2V5KSwgXCJmbmFtZVwiOiQoZm5hbWUpLCBcImZzaXplXCI6JChmc2l6ZSl9In0=";
54+
/**
55+
* 华北浙江2上传 Bucket
56+
*/
57+
public static final String BUCKET_CN_EAST_2 = "kodo-phone-cn-east-2";
5758

5859
/**
59-
* 华南机房
60+
* 华北浙江2上传 Token
6061
*/
61-
public static final Zone mock_bucket_zone2 = new FixedZone(new String[]{
62-
"mock.upload-z2.qiniup.com", "mock.upload-gz.qiniup.com",
63-
"mock.upload-fs.qiniup.com", "mock.up-z2.qiniup.com",
64-
"mock.up-gz.qiniup.com", "mock.up-fs.qiniup.com",
65-
"mock.upload-z2.qbox.me", "up-z2.qbox.me"
66-
});
62+
public static final String TOKEN_CN_EAST_2 = "dxVQk8gyk3WswArbNhdKIwmwibJ9nFsQhMNUmtIM:lrPAesFMWkyi310xoagnn5oKu08=:eyJzY29wZSI6ImtvZG8tcGhvbmUtY24tZWFzdC0yIiwiZGVhZGxpbmUiOjE3NTQ3MzUyNjUsICJyZXR1cm5Cb2R5Ijoie1wiZm9vXCI6JCh4OmZvbyksIFwiYmFyXCI6JCh4OmJhciksIFwibWltZVR5cGVcIjokKG1pbWVUeXBlKSwgXCJoYXNoXCI6JChldGFnKSwgXCJrZXlcIjokKGtleSksIFwiZm5hbWVcIjokKGZuYW1lKSwgXCJmc2l6ZVwiOiQoZnNpemUpfSJ9";
6763

6864
/**
69-
* 北美机房
65+
* 测试使用的 AK
7066
*/
71-
public static final Zone mock_bucket_zoneNa0 = new FixedZone(new String[]{
72-
"mock.upload-na0.qiniu.com", "mock.up-na0.qiniup.com",
73-
"mock.upload-na0.qbox.me", "up-na0.qbox.me"
74-
});
67+
public static final String AK = "bjtWBQXrcxgo7HWwlC_bgHg81j352_GhgBGZPeOW";
68+
7569

70+
/**
71+
* 测试通用的token
72+
*/
73+
public static final String COMMON_TOKEN = BUCKET_NA0;
7674
}

‎library/src/androidTest/java/com/qiniu/android/bigdata/client/ClientTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void testMultipartSyncPost() {
5252
postArgs.params = new StringMap();
5353
postArgs.params.put("x:foo", "foo");
5454

55-
UpToken token = UpToken.parse(TestConfig.commonToken);
55+
UpToken token = UpToken.parse(TestConfig.COMMON_TOKEN);
5656

5757
Client client = new Client(null, 90, 90, null, null);
5858
ResponseInfo responseInfo = client.syncMultipartPost("https://up.qiniup.com", postArgs, token);
@@ -70,7 +70,7 @@ public void testMultipartAsyncPost() {
7070
postArgs.mimeType = "text/plain";
7171
postArgs.params = new StringMap();
7272

73-
UpToken token = UpToken.parse(TestConfig.commonToken);
73+
UpToken token = UpToken.parse(TestConfig.COMMON_TOKEN);
7474

7575
Client client = new Client(null, 90, 90, null, null);
7676
client.asyncMultipartPost("https://up.qiniu.com", postArgs, token, null, new CompletionHandler() {

‎library/src/androidTest/java/com/qiniu/android/collect/UploadInfoReporterTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public void run() {
8585

8686
private void report(ReportItem item){
8787
UploadInfoReporter reporter = UploadInfoReporter.getInstance();
88-
reporter.report(item, TestConfig.token_z0);
88+
reporter.report(item, TestConfig.TOKEN_Z0);
8989
}
9090

9191
private static void showContent(File recordFile) {

0 commit comments

Comments
 (0)