Skip to content

X
xm-sportstest
Commit cdafa469 by xuyamei
Options

更换上传获取签名接口

parent 424f18f2
Showing with 32 additions and 10 deletions
src/main/java/com/xiaomai/cases/polar/coupon/TestCreateCoupon.java
...@@ -9,7 +9,6 @@ import com.xiaomai.utils.RandomStringUtil; ...@@ -9,7 +9,6 @@ import com.xiaomai.utils.RandomStringUtil;
import com.xiaomai.utils.XMJSONPath; import com.xiaomai.utils.XMJSONPath;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.ArrayList; import java.util.ArrayList;
......
src/main/java/com/xiaomai/cases/polar/importExcel/TestImportDeposit.java
...@@ -45,19 +45,20 @@ public class TestImportDeposit extends XMBaseTest { ...@@ -45,19 +45,20 @@ public class TestImportDeposit extends XMBaseTest {
//2、获取签名 //2、获取签名
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("tenantId", xmAppApi.getLoginInfo().getBrandId()); object.put("brandId", xmAppApi.getLoginInfo().getBrandId());
object.put("tenantType", "BRAND"); // object.put("tenantType", "BRAND");
object.put("resourceName",filePathName); object.put("resourceName",filePathName);
object.put("resourceNameToMD5",false); object.put("resourceNameToMD5",false);
object.put("bizCode","IMPORT_TASK"); object.put("bizCode","IMPORT_TASK");
xmAppApi.doRequest(RequestType.JSON, params, object.toString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, object.toString(), headers).assetsSuccess(true);
JSONObject result1 = xmAppApi.getBodyInJSON(); JSONObject result1 = xmAppApi.getBodyInJSON();
String resourceId = XMJSONPath.readPath(result1, "$.result.resourceId"); String resourceId = XMJSONPath.readPath(result1, "$.result.resourceId");
String accessId = XMJSONPath.readPath(result1, "$.result.accessId"); String accessId = XMJSONPath.readPath(result1, "$.result.accessKeyId");
String policy = XMJSONPath.readPath(result1, "$.result.policy"); String policy = XMJSONPath.readPath(result1, "$.result.policy");
String signature = XMJSONPath.readPath(result1, "$.result.signature"); String signature = XMJSONPath.readPath(result1, "$.result.signature");
String key = XMJSONPath.readPath(result1, "$.result.key"); String key = XMJSONPath.readPath(result1, "$.result.key");
String callback = XMJSONPath.readPath(result1, "$.result.callback"); String callback = XMJSONPath.readPath(result1, "$.result.callback");
String securityToken = XMJSONPath.readPath(result1, "$.result.securityToken");
String host = XMJSONPath.readPath(result1, "$.result.host"); String host = XMJSONPath.readPath(result1, "$.result.host");
String time = XMJSONPath.readPath(result1, "$.result.extAttrs"); String time = XMJSONPath.readPath(result1, "$.result.extAttrs");
JSONObject time1 = JSONObject.parseObject(time); JSONObject time1 = JSONObject.parseObject(time);
...@@ -72,12 +73,15 @@ public class TestImportDeposit extends XMBaseTest { ...@@ -72,12 +73,15 @@ public class TestImportDeposit extends XMBaseTest {
signatureVO.setPolicy(policy); signatureVO.setPolicy(policy);
signatureVO.setSignature(signature); signatureVO.setSignature(signature);
signatureVO.setCallback(callback); signatureVO.setCallback(callback);
signatureVO.setSecurityToken(securityToken);
signatureVO.setExtAttrs(time1.getString("q-key-time")); signatureVO.setExtAttrs(time1.getString("q-key-time"));
signatureVO.setHost(host); signatureVO.setHost(host);
signatureVO.setResourceId(Long.valueOf(resourceId)); signatureVO.setResourceId(Long.valueOf(resourceId));
String result = String.valueOf(ResourceUtil.uploadFileContentToTencent(inputStream, filePathName, signatureVO, 5000,"multipart/form-data")); String result = String.valueOf(ResourceUtil.uploadFileContentToTencent(inputStream, filePathName, signatureVO, 5000,"multipart/form-data"));
Assert.assertEquals(result, "true"); Assert.assertEquals(result, "true");
Thread.sleep(6000);
//4.创建任务 //4.创建任务
JSONObject result2 = importTools.createImportTask("DEPOSIT_CARD_ORDER",resourceId,null,""); JSONObject result2 = importTools.createImportTask("DEPOSIT_CARD_ORDER",resourceId,null,"");
String recordId = XMJSONPath.readPath(result2, "$.result"); String recordId = XMJSONPath.readPath(result2, "$.result");
......
src/main/java/com/xiaomai/cases/polar/importExcel/TestImportMember.java
...@@ -50,19 +50,20 @@ public class TestImportMember extends XMBaseTest { ...@@ -50,19 +50,20 @@ public class TestImportMember extends XMBaseTest {
//2、获取签名 //2、获取签名
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("tenantId", xmAppApi.getLoginInfo().getBrandId()); object.put("brandId", xmAppApi.getLoginInfo().getBrandId());
object.put("tenantType", "BRAND"); // object.put("tenantType", "BRAND");
object.put("resourceName",filePathName); object.put("resourceName",filePathName);
object.put("resourceNameToMD5",false); object.put("resourceNameToMD5",false);
object.put("bizCode","IMPORT_TASK"); object.put("bizCode","IMPORT_TASK");
xmAppApi.doRequest(RequestType.JSON, params, object.toString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, object.toString(), headers).assetsSuccess(true);
JSONObject result1 = xmAppApi.getBodyInJSON(); JSONObject result1 = xmAppApi.getBodyInJSON();
String resourceId = XMJSONPath.readPath(result1, "$.result.resourceId"); String resourceId = XMJSONPath.readPath(result1, "$.result.resourceId");
String accessId = XMJSONPath.readPath(result1, "$.result.accessId"); String accessId = XMJSONPath.readPath(result1, "$.result.accessKeyId");
String policy = XMJSONPath.readPath(result1, "$.result.policy"); String policy = XMJSONPath.readPath(result1, "$.result.policy");
String signature = XMJSONPath.readPath(result1, "$.result.signature"); String signature = XMJSONPath.readPath(result1, "$.result.signature");
String key = XMJSONPath.readPath(result1, "$.result.key"); String key = XMJSONPath.readPath(result1, "$.result.key");
String callback = XMJSONPath.readPath(result1, "$.result.callback"); String callback = XMJSONPath.readPath(result1, "$.result.callback");
String securityToken = XMJSONPath.readPath(result1, "$.result.securityToken");
String host = XMJSONPath.readPath(result1, "$.result.host"); String host = XMJSONPath.readPath(result1, "$.result.host");
String time = XMJSONPath.readPath(result1, "$.result.extAttrs"); String time = XMJSONPath.readPath(result1, "$.result.extAttrs");
JSONObject time1 = JSONObject.parseObject(time); JSONObject time1 = JSONObject.parseObject(time);
...@@ -77,12 +78,14 @@ public class TestImportMember extends XMBaseTest { ...@@ -77,12 +78,14 @@ public class TestImportMember extends XMBaseTest {
signatureVO.setPolicy(policy); signatureVO.setPolicy(policy);
signatureVO.setSignature(signature); signatureVO.setSignature(signature);
signatureVO.setCallback(callback); signatureVO.setCallback(callback);
signatureVO.setSecurityToken(securityToken);
signatureVO.setExtAttrs(time1.getString("q-key-time")); signatureVO.setExtAttrs(time1.getString("q-key-time"));
signatureVO.setHost(host); signatureVO.setHost(host);
signatureVO.setResourceId(Long.valueOf(resourceId)); signatureVO.setResourceId(Long.valueOf(resourceId));
String result = String.valueOf(ResourceUtil.uploadFileContentToTencent(inputStream, filePathName, signatureVO, 5000,"multipart/form-data")); String result = String.valueOf(ResourceUtil.uploadFileContentToTencent(inputStream, filePathName, signatureVO, 5000,"multipart/form-data"));
Assert.assertEquals(result, "true"); Assert.assertEquals(result, "true");
Thread.sleep(6000);
//4.创建任务 //4.创建任务
JSONObject result2 = importTools.createImportTask("MEMBER",resourceId,"REPLACE_DUPLICATES",""); JSONObject result2 = importTools.createImportTask("MEMBER",resourceId,"REPLACE_DUPLICATES","");
String recordId = XMJSONPath.readPath(result2, "$.result"); String recordId = XMJSONPath.readPath(result2, "$.result");
......
src/main/java/com/xiaomai/cases/polar/importExcel/TestImportMemberCard.java
...@@ -46,19 +46,21 @@ public class TestImportMemberCard extends XMBaseTest { ...@@ -46,19 +46,21 @@ public class TestImportMemberCard extends XMBaseTest {
//2、获取签名 //2、获取签名
JSONObject object = new JSONObject(); JSONObject object = new JSONObject();
object.put("tenantId", xmAppApi.getLoginInfo().getBrandId()); // object.put("tenantId", xmAppApi.getLoginInfo().getBrandId()); //新接口参数更换成其他
object.put("tenantType", "BRAND"); // object.put("tenantType", "BRAND"); //新接口参数更换成其他
object.put("brandId", xmAppApi.getLoginInfo().getBrandId());
object.put("resourceName",filePathName); object.put("resourceName",filePathName);
object.put("resourceNameToMD5",false); object.put("resourceNameToMD5",false);
object.put("bizCode","IMPORT_TASK"); object.put("bizCode","IMPORT_TASK");
xmAppApi.doRequest(RequestType.JSON, params, object.toString(), headers).assetsSuccess(true); xmAppApi.doRequest(RequestType.JSON, params, object.toString(), headers).assetsSuccess(true);
JSONObject result1 = xmAppApi.getBodyInJSON(); JSONObject result1 = xmAppApi.getBodyInJSON();
String resourceId = XMJSONPath.readPath(result1, "$.result.resourceId"); String resourceId = XMJSONPath.readPath(result1, "$.result.resourceId");
String accessId = XMJSONPath.readPath(result1, "$.result.accessId"); String accessId = XMJSONPath.readPath(result1, "$.result.accessKeyId");
String policy = XMJSONPath.readPath(result1, "$.result.policy"); String policy = XMJSONPath.readPath(result1, "$.result.policy");
String signature = XMJSONPath.readPath(result1, "$.result.signature"); String signature = XMJSONPath.readPath(result1, "$.result.signature");
String key = XMJSONPath.readPath(result1, "$.result.key"); String key = XMJSONPath.readPath(result1, "$.result.key");
String callback = XMJSONPath.readPath(result1, "$.result.callback"); String callback = XMJSONPath.readPath(result1, "$.result.callback");
String securityToken = XMJSONPath.readPath(result1, "$.result.securityToken");
String host = XMJSONPath.readPath(result1, "$.result.host"); String host = XMJSONPath.readPath(result1, "$.result.host");
String time = XMJSONPath.readPath(result1, "$.result.extAttrs"); String time = XMJSONPath.readPath(result1, "$.result.extAttrs");
JSONObject time1 = JSONObject.parseObject(time); JSONObject time1 = JSONObject.parseObject(time);
...@@ -73,12 +75,14 @@ public class TestImportMemberCard extends XMBaseTest { ...@@ -73,12 +75,14 @@ public class TestImportMemberCard extends XMBaseTest {
signatureVO.setPolicy(policy); signatureVO.setPolicy(policy);
signatureVO.setSignature(signature); signatureVO.setSignature(signature);
signatureVO.setCallback(callback); signatureVO.setCallback(callback);
signatureVO.setSecurityToken(securityToken);
signatureVO.setExtAttrs(time1.getString("q-key-time")); signatureVO.setExtAttrs(time1.getString("q-key-time"));
signatureVO.setHost(host); signatureVO.setHost(host);
signatureVO.setResourceId(Long.valueOf(resourceId)); signatureVO.setResourceId(Long.valueOf(resourceId));
String result = String.valueOf(ResourceUtil.uploadFileContentToTencent(inputStream, filePathName, signatureVO, 5000,"multipart/form-data")); String result = String.valueOf(ResourceUtil.uploadFileContentToTencent(inputStream, filePathName, signatureVO, 5000,"multipart/form-data"));
Assert.assertEquals(result, "true"); Assert.assertEquals(result, "true");
Thread.sleep(6000);
//4.创建任务 //4.创建任务
JSONObject result2 = importTools.createImportTask("MEMBER_CARD_ORDER",resourceId,null,""); JSONObject result2 = importTools.createImportTask("MEMBER_CARD_ORDER",resourceId,null,"");
String recordId = XMJSONPath.readPath(result2, "$.result"); String recordId = XMJSONPath.readPath(result2, "$.result");
......
src/main/java/com/xiaomai/cases/polar/utils/Entity/SignatureVO.java
...@@ -24,6 +24,7 @@ public class SignatureVO { ...@@ -24,6 +24,7 @@ public class SignatureVO {
private String extAttrs; private String extAttrs;
//回调地址 //回调地址
private String callback; private String callback;
private String securityToken;
private String algorithm; private String algorithm;
...@@ -107,4 +108,14 @@ public class SignatureVO { ...@@ -107,4 +108,14 @@ public class SignatureVO {
public void setAlgorithm(String algorithm) { public void setAlgorithm(String algorithm) {
this.algorithm = algorithm; this.algorithm = algorithm;
} }
public String getSecurityToken() {
return securityToken;
}
public SignatureVO setSecurityToken(String securityToken) {
this.securityToken = securityToken;
return this;
}
} }
src/main/java/com/xiaomai/cases/polar/utils/ResourceUtil.java
...@@ -160,6 +160,7 @@ public class ResourceUtil { ...@@ -160,6 +160,7 @@ public class ResourceUtil {
formFields.put("q-signature", signatureVO.getSignature()); formFields.put("q-signature", signatureVO.getSignature());
formFields.put("success_action_status", RESPONSE_STATUS); formFields.put("success_action_status", RESPONSE_STATUS);
formFields.put("x-cos-callback", signatureVO.getCallback()); formFields.put("x-cos-callback", signatureVO.getCallback());
formFields.put("x-cos-security-token", signatureVO.getSecurityToken());
formFields.put("q-key-time", signatureVO.getExtAttrs()); formFields.put("q-key-time", signatureVO.getExtAttrs());
// 根据以上表单参数，构造最开始的body部分 // 根据以上表单参数，构造最开始的body部分
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment