Skip to content

Commit f41d7ae

Browse files
tothetruthtothetruth
committed
update qcloud sdk to 5.7.1
1 parent ec11d4b commit f41d7ae

File tree

104 files changed

+10693
-567
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

104 files changed

+10693
-567
lines changed

‎QCloudCosXml/cosxml-ktx/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
defaultConfig {
99
minSdkVersion 15
1010
targetSdkVersion 29
11-
versionCode 50614
12-
versionName "5.6.14"
11+
versionCode 50701
12+
versionName "5.7.1"
1313

1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515
consumerProguardFiles "consumer-rules.pro"

‎QCloudCosXml/cosxml-ktx/src/androidTest/java/com/tencent/cos/xml/ktx/COSXmlTest.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,8 @@ import android.content.Context
44
import android.support.test.InstrumentationRegistry
55
import android.support.test.runner.AndroidJUnit4
66
import android.util.Log
7-
import com.tencent.cos.xml.common.COSACL
87
import com.tencent.cos.xml.exception.CosXmlServiceException
98
import com.tencent.cos.xml.model.tag.ACLAccount
10-
import com.tencent.qcloud.core.auth.SessionCredentialProvider
11-
import com.tencent.qcloud.core.auth.SessionQCloudCredentials
129
import com.tencent.qcloud.core.auth.ShortTimeCredentialProvider
1310
import kotlinx.coroutines.runBlocking
1411
import org.junit.Assert

‎QCloudCosXml/cosxml/build.gradle‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ def compileQuic() {
77
.toString().contains("Debug") && "QCloudCosXml".equalsIgnoreCase(rootProject.name)
88
}
99

10-
1110
android {
1211

1312
compileSdkVersion 28
@@ -17,8 +16,8 @@ android {
1716
minSdkVersion 15
1817
targetSdkVersion 28
1918

20-
versionCode 50614
21-
versionName "5.6.14"
19+
versionCode 50701
20+
versionName "5.7.1"
2221

2322
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
2423

@@ -68,14 +67,13 @@ android {
6867
}
6968

7069
// 切换发 normal 或者 slim 包，需要同步修改 pom.artifactId 信息
71-
defaultPublishConfig "normalRelease"
72-
// defaultPublishConfig "slimRelease"
70+
// defaultPublishConfig "normalRelease"
71+
defaultPublishConfig "slimRelease"
7372

7473
compileOptions {
7574
sourceCompatibility = JavaVersion.VERSION_1_7
7675
targetCompatibility = JavaVersion.VERSION_1_7
7776
}
78-
7977
buildToolsVersion = '28.0.2'
8078

8179
}
@@ -92,18 +90,21 @@ dependencies {
9290
api project(path: ':foundation')
9391
// api project(path: ':logUtils')
9492

95-
if (compileQuic() && false) {
96-
api project(path: ':quic')
97-
}
93+
// if (compileQuic() && false) {
94+
// api project(path: ':quic')
95+
// }
9896

9997
compileOnly project(':xmlAnnoation')
10098
annotationProcessor project(':xmlCompiler')
10199

102100
//lite版本使用normalApi
103-
normalApi 'com.qcloud.cos:beacon-android-release:4.1.22.11'
101+
// normalApi 'com.tencent.qcloud:beacon-android-release:4.1.13'
104102
//normal版本使用api
105-
// api 'com.qcloud.cos:beacon-android-release:4.1.22.11'
106-
slimCompileOnly 'com.qcloud.cos:beacon-android-release:4.1.22.11'
103+
implementation 'com.tencent.qcloud:beacon-android-release:4.1.13'
104+
105+
// kms 加密
106+
compileOnly 'com.tencentcloudapi:tencentcloud-sdk-java-kms:3.1.213'
107+
compileOnly 'xerces:xercesImpl:2.12.0'
107108
}
108109

109110

@@ -193,7 +194,7 @@ task(printEnvs) {
193194

194195
android.libraryVariants.all { variant ->
195196
variant.outputs.all {
196-
// System.out.println('variant is ' + variant.name)
197+
System.out.println('variant is ' + variant.name)
197198
// outputFileName = "${project.extensions.artifactId}-release.aar"
198199
}
199200
}

‎QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/core/ServiceFactory.java‎

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
import com.tencent.cos.xml.CosXmlService;
44
import com.tencent.cos.xml.CosXmlServiceConfig;
55
import com.tencent.cos.xml.CosXmlSimpleService;
6+
import com.tencent.cos.xml.crypto.KMSEncryptionMaterialsProvider;
67
import com.tencent.cos.xml.exception.CosXmlClientException;
78
import com.tencent.cos.xml.transfer.TransferConfig;
89
import com.tencent.cos.xml.transfer.TransferManager;
10+
import com.tencent.cos.xml.transfer.TransferService;
11+
import com.tencent.qcloud.core.auth.QCloudSigner;
912
import com.tencent.qcloud.core.auth.ShortTimeCredentialProvider;
1013

1114
import static com.tencent.cos.xml.core.TestUtils.getContext;
@@ -44,6 +47,19 @@ public CosXmlSimpleService newSignInUrlService() {
4447
return newService(cosXmlServiceConfig);
4548
}
4649

50+
public CosXmlSimpleService newSignerService(QCloudSigner signer) {
51+
52+
CosXmlServiceConfig cosXmlServiceConfig = new CosXmlServiceConfig.Builder()
53+
.isHttps(true)
54+
.setDebuggable(true)
55+
.setConnectionTimeout(4000)
56+
.setSocketTimeout(4000)
57+
.setRegion(TestConst.PERSIST_BUCKET_REGION)
58+
.builder();
59+
60+
return newSignerService(cosXmlServiceConfig, signer);
61+
}
62+
4763
public CosXmlSimpleService newCDNService() {
4864

4965
CosXmlServiceConfig cosXmlServiceConfig = new CosXmlServiceConfig.Builder()
@@ -58,10 +74,34 @@ public CosXmlSimpleService newCDNService() {
5874

5975
public TransferManager newDefaultTransferManager() {
6076

61-
TransferConfig transferConfig = new TransferConfig.Builder().build();
77+
TransferConfig transferConfig = new TransferConfig.Builder()
78+
.setDivisionForUpload(2 * 1024 * 1024)
79+
.setSliceSizeForUpload(1024 * 1024)
80+
.build();
6281
return new TransferManager(newDefaultService(), transferConfig);
6382
}
6483

84+
public TransferService newDefaultTransferService() {
85+
86+
TransferConfig transferConfig = new TransferConfig.Builder()
87+
.setDivisionForUpload(2 * 1024 * 1024)
88+
.setSliceSizeForUpload(1024 * 1024)
89+
.build();
90+
return new TransferService(newDefaultService(), transferConfig);
91+
}
92+
93+
public TransferManager newSingerTransferManager(QCloudSigner signer) {
94+
95+
TransferConfig transferConfig = new TransferConfig.Builder().build();
96+
return new TransferManager(newSignerService(signer), transferConfig);
97+
}
98+
99+
public TransferService newCesTransferService() {
100+
TransferConfig transferConfig = new TransferConfig.Builder().build();
101+
return new TransferService(newDefaultService(), transferConfig,
102+
new KMSEncryptionMaterialsProvider("kms-8xy4m0eb"));
103+
}
104+
65105
public TransferManager newForceSimpleUploadTransferManager() {
66106

67107
TransferConfig transferConfig = new TransferConfig.Builder()
@@ -114,4 +154,9 @@ private CosXmlSimpleService newService(CosXmlServiceConfig cosXmlServiceConfig)
114154
new ShortTimeCredentialProvider(TestConst.SECRET_ID, TestConst.SECRET_KEY,600) );
115155

116156
}
157+
158+
private CosXmlSimpleService newSignerService(CosXmlServiceConfig cosXmlServiceConfig, QCloudSigner signer) {
159+
return new CosXmlService(getContext(), cosXmlServiceConfig, signer);
160+
161+
}
117162
}

‎QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/core/TestConst.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,9 @@ public class TestConst {
3737
public static final String PERSIST_BUCKET_SMALL_OBJECT_PATH = "/do_not_remove/small_object";
3838
public static final String PERSIST_BUCKET_BIG_OBJECT_PATH = "/do_not_remove/big_object";
3939

40+
public static final String PERSIST_BUCKET_CSE_SMALL_OBJECT_PATH = "/do_not_remove/cse_small_object";
41+
public static final String PERSIST_BUCKET_CSE_BIG_OBJECT_PATH = "/do_not_remove/cse_big_object";
42+
4043
public static final String TEMP_BUCKET_REGION = BuildConfig.TEMP_BUCKET_REGION;
4144
public static final String TEMP_BUCKET = BuildConfig.TEMP_BUCKET;
4245

‎QCloudCosXml/cosxml/src/androidTest/java/com/tencent/cos/xml/core/TestUtils.java‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.tencent.cos.xml.exception.CosXmlClientException;
1111
import com.tencent.cos.xml.exception.CosXmlServiceException;
1212
import com.tencent.cos.xml.model.CosXmlResult;
13+
import com.tencent.cos.xml.transfer.COSTransferTask;
1314
import com.tencent.cos.xml.transfer.COSXMLTask;
1415
import com.tencent.cos.xml.transfer.TransferState;
1516
import com.tencent.qcloud.core.common.QCloudClientException;
@@ -50,6 +51,12 @@ public static void assertCOSXMLTaskSuccess(COSXMLTask cosxmlTask) {
5051
cosxmlTask.getTaskState() == TransferState.COMPLETED);
5152
}
5253

54+
public static void assertCOSXMLTaskSuccess(COSTransferTask cosxmlTask) {
55+
56+
Assert.assertTrue(getCosExceptionMessage(cosxmlTask.getClientException(), cosxmlTask.getServiceException()),
57+
cosxmlTask.getTaskState() == TransferState.COMPLETED);
58+
}
59+
5360
public static void assertErrorMessageNull(StringBuilder builder) {
5461
Assert.assertTrue(builder.toString(), TextUtils.isEmpty(builder.toString()));
5562
}
@@ -183,7 +190,7 @@ public static String getCosExceptionMessage(String source, QCloudClientException
183190
return source + clientException.getMessage();
184191
}
185192
if (serviceException != null) {
186-
return source + serviceException.getErrorCode() + " : " + serviceException.getErrorMessage();
193+
return source + serviceException.getErrorCode() + " : " + serviceException.getErrorMessage() + " " + serviceException.getRequestId();
187194
}
188195
return source + "Unknown Error";
189196
}

0 commit comments

Comments
 (0)