diff --git a/java/pom.xml b/java/pom.xml index 169193f..dc203e6 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -55,7 +55,7 @@ com.aliyun credentials-java - 0.2.10 + 0.3.0 com.aliyun @@ -66,7 +66,7 @@ com.aliyun openapiutil - 0.2.0 + 0.2.1 com.aliyun diff --git a/java/src/main/java/com/aliyun/teaopenapi/Client.java b/java/src/main/java/com/aliyun/teaopenapi/Client.java index 65eff97..1e372d9 100644 --- a/java/src/main/java/com/aliyun/teaopenapi/Client.java +++ b/java/src/main/java/com/aliyun/teaopenapi/Client.java @@ -780,14 +780,15 @@ public Client(com.aliyun.teaopenapi.models.Config config) throws Exception { request_.headers.put("x-acs-content-sha256", hashedRequestPayload); if (!com.aliyun.teautil.Common.equalString(params.authType, "Anonymous")) { - String authType = this.getType(); + com.aliyun.credentials.models.CredentialModel credentialModel = _credential.getCredential(); + String authType = credentialModel.type; if (com.aliyun.teautil.Common.equalString(authType, "bearer")) { - String bearerToken = this.getBearerToken(); + String bearerToken = credentialModel.bearerToken; request_.headers.put("x-acs-bearer-token", bearerToken); } else { - String accessKeyId = this.getAccessKeyId(); - String accessKeySecret = this.getAccessKeySecret(); - String securityToken = this.getSecurityToken(); + String accessKeyId = credentialModel.accessKeyId; + String accessKeySecret = credentialModel.accessKeySecret; + String securityToken = credentialModel.securityToken; if (!com.aliyun.teautil.Common.empty(securityToken)) { request_.headers.put("x-acs-accesskey-id", accessKeyId); request_.headers.put("x-acs-security-token", securityToken); diff --git a/main.tea b/main.tea index d8a1a6a..445f722 100644 --- a/main.tea +++ b/main.tea @@ -725,14 +725,15 @@ api doRequest(params: Params, request: OpenApiRequest, runtime: Util.RuntimeOpti __request.headers.x-acs-content-sha256 = hashedRequestPayload; if (!Util.equalString(params.authType, 'Anonymous')) { - var authType = getType(); + var credentialModel = @credential.getCredential(); + var authType = credentialModel.type; if (Util.equalString(authType, 'bearer')) { - var bearerToken = getBearerToken(); + var bearerToken = credentialModel.bearerToken; __request.headers.x-acs-bearer-token = bearerToken; } else { - var accessKeyId = getAccessKeyId(); - var accessKeySecret = getAccessKeySecret(); - var securityToken = getSecurityToken(); + var accessKeyId = credentialModel.accessKeyId; + var accessKeySecret = credentialModel.accessKeySecret; + var securityToken = credentialModel.securityToken; if (!Util.empty(securityToken)) { __request.headers.x-acs-accesskey-id = accessKeyId;