Commit 4dc1ca5c authored by 张艳玲's avatar 张艳玲

Merge branch '20210409bxl1' into 'master'

20210409bxl1

See merge request test-group/kejiji!44
parents 73cb6da5 704c5b14
package com.kjj.bean;
import lombok.Data;
import java.util.List;
@Data
public class AnchorRedList {
private String surplusAmount;
private List<RedList> redList;
@Data
public static class RedList
{
private String confId;
private int totalAmount;
private int totalNum;
private int luckAmount;
private int luckNum;
private int luckHelpNum;
private int generalNum;
private int showAmount;
private int totalSurplusNum;
private int luckSurplusNum;
private int redStatus;
}
private String redPackReceiving;
}
package com.kjj.bean;
import lombok.Data;
@Data
public class GetShareSign {
private String posterUrl;
private String mpQrcode;
private String mpShareUrl;
private String mpShareTitle;
private String shareSign;
private String shareContent;
private String liveType;
}
package com.kjj.bean;
import lombok.Data;
import java.util.Date;
@Data
public class RedGetSimple {
private Date startTime;
}
package com.kjj.bean;
import lombok.Data;
@Data
public class RedHelpInfo {
private String avatar;
private String confId;
private int myHelpNum;
private String nickname;
}
package com.kjj.bean;
import lombok.Data;
@Data
public class RedHelpQuery {
private String avatar;
private String end;
private String hasConfLuck;
private String help;
private String helpShareUser;
private String nickname;
private String selfShare;
}
package com.kjj.bean;
import lombok.Data;
@Data
public class RedHepDetail {
private String helpAvatarList;
private int myHelpNum;
}
package com.kjj.bean;
import lombok.Data;
import java.util.List;
@Data
public class RedLuckResult {
private List<LuckList> list;
@Data
public static class LuckList
{
private String avatar;
private String nickname;
private String receivedAmount;
}
}
package com.kjj.bean;
import lombok.Data;
@Data
public class RedNum {
private String totalAmount;
private String luckAmount;
private String luckNum;
}
package com.kjj.bean;
import lombok.Data;
import java.util.Date;
@Data
public class RedOrdinary {
private String confId;
private int redStatus;
private Date startTime;
private int showAmount;
private int luckHelpNum;
}
package com.kjj.bean;
import lombok.Data;
import java.util.Date;
@Data
public class RedSimpleDetail {
private int totalAmount;
private int luckAmount;
private int luckNum;
private int luckHelpNum;
private Date startTime;
private int redStatus;
}
package com.kjj.bean;
import lombok.Data;
@Data
public class RedState {
private int state;
private int amount;
private String luck;
private int code;
}
...@@ -6,6 +6,7 @@ import com.kjj.bean.*; ...@@ -6,6 +6,7 @@ import com.kjj.bean.*;
import com.kjj.config.BasicConfig; import com.kjj.config.BasicConfig;
import com.kjj.constants.LiveConstants; import com.kjj.constants.LiveConstants;
import com.kjj.utils.JsonUtil; import com.kjj.utils.JsonUtil;
import com.kjj.utils.ThreadSleepUtils;
import io.restassured.response.Response; import io.restassured.response.Response;
import org.testng.Assert; import org.testng.Assert;
import org.testng.annotations.BeforeClass; import org.testng.annotations.BeforeClass;
...@@ -40,11 +41,7 @@ public class LiveVisitors implements AdminAuthorization ...@@ -40,11 +41,7 @@ public class LiveVisitors implements AdminAuthorization
@Test(description = "访客端权益列表", priority = 1) @Test(description = "访客端权益列表", priority = 1)
public void 访客端权益列表() public void 访客端权益列表()
{ {
try { ThreadSleepUtils.sleep(30000);
Thread.sleep(30000);
} catch (InterruptedException e) {
e.printStackTrace();
}
Map<String, Object> params = new HashMap<>(); Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey())); params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_Resource); Response response = network.getResponse(params, BasicConfig.MOBILE_Resource);
......
package com.kjj.cases.live;
import com.alibaba.fastjson.JSON;
import com.kjj.bean.*;
import com.kjj.config.BasicConfig;
import com.kjj.constants.LiveConstants;
import com.kjj.utils.JsonUtil;
import com.kjj.utils.ThreadSleepUtils;
import io.restassured.response.Response;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class LiveVistorRed implements AdminAuthorization{
public String confId_Red;
@BeforeClass
public void setUp() {
adminAuth();
}
private AnchorRedList.RedList getRed(List<AnchorRedList.RedList> lists){
for (AnchorRedList.RedList red : lists) {
if (red.getRedStatus()==1){
return red;
}
}
return null;
}
/*主播端红包轮次查询*/
@Test(description = "主播端红包轮次查询", priority = 1)
public void 主播端红包轮次查询()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_AnchorRedList);
AnchorRedList Beans=JsonUtil.parseResponseToBean(response, AnchorRedList.class);
AnchorRedList.RedList notPublishRed = getRed(Beans.getRedList());
confId_Red = notPublishRed.getConfId();
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_AnchorRedList, "查询主播端红包轮次失败", response.body().asString()));
}
/*主播端上架普通红包*/
@Test(description = "主播端上架普通红包", priority = 2)
public void 主播端上架手气王红包()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId",confId_Red);
Response response = network.postResponse(params, BasicConfig.MOBILE_Grounding);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_Grounding, "上架普通红包失败", response.body().asString()));
}
/*主播端发放普通红包*/
@Test(description = "主播端发放普通红包", priority = 3)
public void 主播端发放普通红包()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId",confId_Red);
Response response = network.postResponse(params, BasicConfig.MOBILE_RedStart);
boolean data = response.jsonPath().getBoolean("data");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedStart, "上架普通红包失败", response.body().asString()));
}
/*开红包*/
@Test(description = "开红包", priority = 4)
public void 开红包()
{
ThreadSleepUtils.sleep(60000);
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.postResponse(params, BasicConfig.MOBILE_RedOpen);
boolean data = response.jsonPath().getBoolean("success");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedOpen, "开红包失败", response.body().asString()));
}
/*查询红包开始时间,倒计时*/
@Test(description = "查询红包开始时间", priority = 5)
public void 查询红包开始时间()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId",confId_Red);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedGetSimple);
RedGetSimple Beans = JsonUtil.parseResponseToBean(response, RedGetSimple.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_RedGetSimple, "查询主播端发放红包开始时间失败", response.body().asString()));
}
/*主播端获取剩余红包金额*/
@Test(description = "获取剩余红包金额", priority = 6)
public void 获取剩余红包金额()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_GetSurplusAmount);
boolean data = response.jsonPath().getBoolean("success");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_GetSurplusAmount, "查询剩余红包失败", response.body().asString()));
}
/*主播端添加红包*/
@Test(description = "主播端添加红包", priority = 7)
public void 主播端添加红包()
{
Map<String, Object> params = new HashMap<>();
params.put("luck","0");
params.put("general","0");
params.put("totalAmount","200");
params.put("showAmount","200");
params.put("luckAmount","80");
params.put("luckNum","1");
params.put("luckHelpNum","1");
params.put("generalNum","4");
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId","");
Response response = network.postResponse(params, BasicConfig.MOBILE_RedSaveOrUpdate);
Object data = response.jsonPath().getJsonObject("data");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedSaveOrUpdate, "主播端添加红包失败", response.body().asString()));
}
/*访客端领取红包*/
/*查询访客端红包状态*/
@Test(description = "红包状态查询", priority = 8)
public void 红包状态查询列表()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_FindRedList);
List<RedOrdinary> Beans = JsonUtil.parseResponseToListBean(response, RedOrdinary.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_FindRedList, "查询红包状态失败", response.body().asString()));
}
@Test(description = "红包个数", priority = 9)
public void 红包个数()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedNum);
RedNum Beans = JsonUtil.parseResponseToBean(response, RedNum.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_RedNum, "查询红包个数失败", response.body().asString()));
}
/*红包简介详情*/
@Test(description = "红包简介详情", priority = 10)
public void 红包查询列表()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedFindSimpleDetail);
RedSimpleDetail Beans = JsonUtil.parseResponseToBean(response, RedSimpleDetail.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_RedFindSimpleDetail, "查询红包列表失败", response.body().asString()));
}
/*红包详情助力信息*/
@Test(description = "红包详情助力信息", priority = 11)
public void 红包详情助力信息()
{
Map<String, Object> params = new HashMap<>();
params.put("confId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("liveId", confId_Red);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedHelpDetail);
RedHepDetail data = JsonUtil.parseResponseToBean(response, RedHepDetail.class);
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpDetail, "查询红包状态失败", response.body().asString()));
}
/*获取红包小程序分享信息*/
@Test(description = "获取红包小程序分享信息", priority = 12)
public void 获取红包小程序分享信息()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_GetRedMpShare);
System.out.println(JSON.toJSONString(response));
Assert.assertNotNull(response, network.message(params, BasicConfig.MOBILE_GetRedMpShare, "查询红包红包小程序分享信息", response.body().asString()));
}
/*查询红包领取列表*/
@Test(description = "查询红包领取列表", priority = 13)
public void 查询红包领取列表()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
params.put("pageIndex", 1);
params.put("pageSize", 10);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedResultList);
RedLuckResult Beans = JsonUtil.parseResponseToBean(response, RedLuckResult.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_RedResultList, "查询红包领取列表失败", response.body().asString()));
}
/*获取直播间参数-getShareSign*/
@Test(description = "获取直播间参数", priority = 14)
public void 获取直播间参数()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareType", 2);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedGetShareSign);
GetShareSign Beans = JsonUtil.parseResponseToBean(response, GetShareSign.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_RedGetShareSign, "获取直播间参数失败", response.body().asString()));
}
/*帮好友助力*/
@Test(description = "帮好友助力", priority = 15)
public void 帮好友助力()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("shareSign", "2fk2w3aVT6eyfgwFQZJEAqTFpYerrB8SZ2CuWvbmWTX6W42em1tNHR664Gzo9wU5fhSZyHYtLrFcWYrZURc8CU49UAw");
params.put("confRedPacketId", "Kj21NDE2NTU");
Response response = network.postResponse(params, BasicConfig.MOBILE_RedLuckHelp);
boolean data = response.jsonPath().getBoolean("success");
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedLuckHelp, "帮好友助力失败", response.body().asString()));
}
/*助力查询*/
@Test(description = "助力查询", priority = 16)
public void 助力查询()
{
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_Red);
params.put("shareSign", "2fk2w3aVT6eyfgwFQZJEAqTFpYerrB8SZ2CuWvbmWTZWET36mtkmgvaiyvG3hx95Zn1aoQ1KTKB5HYDKJVc9mbzmHL7");
Response response = network.postResponse(params, BasicConfig.MOBILE_RedHelpQuery);
RedHelpQuery data=JsonUtil.parseResponseToBean(response, RedHelpQuery.class);
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedHelpQuery, "帮好友助力失败", response.body().asString()));
}
/* 助力列表*/
@Test(description = "助力列表", priority = 17)
public void 助力列表()
{
Map<String, Object> params = new HashMap<>();
params.put("id", "Kj22NTM5MQ");
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_RedHelpInfo);
RedHelpInfo Beans = JsonUtil.parseResponseToBean(response, RedHelpInfo.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_RedHelpInfo, "查询助力列表失败", response.body().asString()));
}
/*手气王公示*/
@Test(description = "手气王公示", priority = 18)
public void 手气王公示()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedLuckResult);
RedLuckResult Beans = JsonUtil.parseResponseToBean(response, RedLuckResult.class);
System.out.println(JSON.toJSONString(Beans));
Assert.assertNotNull(Beans, network.message(params, BasicConfig.MOBILE_RedLuckResult, "查询手气王公示失败", response.body().asString()));
}
/*领红包结果*/
@Test(description = "领红包结果", priority = 19)
public void 领红包结果()
{
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("confId", confId_Red);
Response response = network.getResponse(params, BasicConfig.MOBILE_RedState);
RedState data=JsonUtil.parseResponseToBean(response, RedState.class);
System.out.println(JSON.toJSONString(data));
Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_RedState, "领红包结果查询失败", response.body().asString()));
}
}
...@@ -114,8 +114,6 @@ public class BasicConfig { ...@@ -114,8 +114,6 @@ public class BasicConfig {
public static final String MOBILE_ResourceTestDetail = MOBILE_HOST + "/clue/resource/test/detail"; public static final String MOBILE_ResourceTestDetail = MOBILE_HOST + "/clue/resource/test/detail";
public static final String MOBILE_ResourceTestParticipate = MOBILE_HOST + "/clue/resource/test/participate"; public static final String MOBILE_ResourceTestParticipate = MOBILE_HOST + "/clue/resource/test/participate";
public static final String MOBILE_ResourceTestSubmit = MOBILE_HOST + "/clue/resource/test/submit"; public static final String MOBILE_ResourceTestSubmit = MOBILE_HOST + "/clue/resource/test/submit";
public static final String MOBILE_OrdinaryRed = MOBILE_HOST + "/clue/red/findRedList";
public static final String MOBILE_OrdinaryRed1 = MOBILE_HOST + "/clue/red/findSimpleDetail";
public static final String MOBILE_GetAgentPosterInfo = MOBILE_HOST + "/kjy/live/share/getAgentPosterInfo"; public static final String MOBILE_GetAgentPosterInfo = MOBILE_HOST + "/kjy/live/share/getAgentPosterInfo";
public static final String MOBILE_ClueNum = MOBILE_HOST + "/kjy/live/agent/clue/clueNum"; public static final String MOBILE_ClueNum = MOBILE_HOST + "/kjy/live/agent/clue/clueNum";
public static final String MOBILE_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list"; public static final String MOBILE_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list";
...@@ -133,6 +131,31 @@ public class BasicConfig { ...@@ -133,6 +131,31 @@ public class BasicConfig {
public static final String MOBILE_agentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf"; public static final String MOBILE_agentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
//红包//
public static final String MOBILE_AnchorRedList = MOBILE_HOST + "/conf/live/red/findRedList";
public static final String MOBILE_GetSurplusAmount = MOBILE_HOST + "/conf/live/red/getSurplusAmount";
public static final String MOBILE_Grounding = MOBILE_HOST + "/conf/live/red/up";
public static final String MOBILE_RedStart = MOBILE_HOST + "/conf/live/red/start";
public static final String MOBILE_RedGetSimple = MOBILE_HOST + "/conf/live/red/getSimple";
public static final String MOBILE_RedSaveOrUpdate = MOBILE_HOST + "/conf/live/red/saveOrUpdate";
public static final String MOBILE_QuesSaveOrUpdate = MOBILE_HOST + "/conf/live/ques/reward/saveOrUpdate";
public static final String MOBILE_FindRedList = MOBILE_HOST + "/clue/red/findRedList";
public static final String MOBILE_RedFindSimpleDetail = MOBILE_HOST + "/clue/red/findSimpleDetail";
public static final String MOBILE_RedHelpDetail = MOBILE_HOST + "/kjy/live/user/red/help/detail";
public static final String MOBILE_GetRedMpShare = MOBILE_HOST + "/kjy/live/share/getRedMpShare";
public static final String MOBILE_RedOpen = MOBILE_HOST + "/clue/red/open";
public static final String MOBILE_RedNum = MOBILE_HOST + "/clue/red/num";
public static final String MOBILE_RedResultList = MOBILE_HOST + "/clue/red/resultList";
public static final String MOBILE_RedState = MOBILE_HOST + "/clue/red/state";
public static final String MOBILE_RedHelpQuery = MOBILE_HOST + "/kjy/live/user/red/helpQuery";
public static final String MOBILE_RedHelpInfo = MOBILE_HOST + "/kjy/live/user/red/helpInfo";
public static final String MOBILE_RedGetShareSign= MOBILE_HOST + "/kjy/live/getShareSign";
public static final String MOBILE_RedLuckResult = MOBILE_HOST + "/clue/red/luckResultList";
public static final String MOBILE_RedLuckHelp = MOBILE_HOST + "/kjy/live/user/red/help";
public static final String MOBILE_QuesRewardList = MOBILE_HOST + "/conf/live/ques/reward/list";
//***************直播素材***************** //***************直播素材*****************
public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate"; public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate";
public static final String MANAGER_WELFARELIST = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/list"; public static final String MANAGER_WELFARELIST = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/list";
...@@ -152,6 +175,7 @@ public class BasicConfig { ...@@ -152,6 +175,7 @@ public class BasicConfig {
public static final String MANAGER_TEST= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateTest"; public static final String MANAGER_TEST= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateTest";
// *************** 素材ID *************** // *************** 素材ID ***************
public static final String ARTICLE_CONTENTID = "Kj21NjM4NDc"; public static final String ARTICLE_CONTENTID = "Kj21NjM4NDc";
public static final String ANIMATION_CONTENTID = "Kj21MzgzMTk"; public static final String ANIMATION_CONTENTID = "Kj21MzgzMTk";
...@@ -159,6 +183,7 @@ public class BasicConfig { ...@@ -159,6 +183,7 @@ public class BasicConfig {
public static final String UPLOAD_CONTENTID = "Kj21NjA1NTE"; public static final String UPLOAD_CONTENTID = "Kj21NjA1NTE";
// *************** 公共 *************** // *************** 公共 ***************
public static final String CREATE_USER = HOST + "/kjy/mp/autotest/create/user"; public static final String CREATE_USER = HOST + "/kjy/mp/autotest/create/user";
public static final String AUTOTEST_UNSUBSCRIBE = HOST + "/kjy/mp/autotest/unsubscribe"; public static final String AUTOTEST_UNSUBSCRIBE = HOST + "/kjy/mp/autotest/unsubscribe";
...@@ -174,6 +199,7 @@ public class BasicConfig { ...@@ -174,6 +199,7 @@ public class BasicConfig {
public static final String INTERACTION_LIKE = HOST + "/kjy/mp/interaction/like"; public static final String INTERACTION_LIKE = HOST + "/kjy/mp/interaction/like";
// *************** 支付 *************** // *************** 支付 ***************
public static final String PAY_GETMIDDLEDETAIL = HOST + "/kjy/mp/payMiddle/getMiddleDetail"; public static final String PAY_GETMIDDLEDETAIL = HOST + "/kjy/mp/payMiddle/getMiddleDetail";
public static final String PAY_HASSITESALEVALID = HOST + "/kjy/mp/seller/dist/hasSiteSaleValid"; public static final String PAY_HASSITESALEVALID = HOST + "/kjy/mp/seller/dist/hasSiteSaleValid";
...@@ -186,6 +212,7 @@ public class BasicConfig { ...@@ -186,6 +212,7 @@ public class BasicConfig {
public static final String PAY_DISTRIBUTE = HOST + "/kjy/sp/visitorPayment/distribute"; public static final String PAY_DISTRIBUTE = HOST + "/kjy/sp/visitorPayment/distribute";
// *************** 名片 *************** // *************** 名片 ***************
public static final String SELLERCARD_TOPOFDETAIL = HOST + "/kjy/mp/sellerCardV5/topOfDetail"; public static final String SELLERCARD_TOPOFDETAIL = HOST + "/kjy/mp/sellerCardV5/topOfDetail";
public static final String SELLERCARD_EDITBASEINFO = HOST + "/kjy/mp/sellerCard/editBaseInfo"; public static final String SELLERCARD_EDITBASEINFO = HOST + "/kjy/mp/sellerCard/editBaseInfo";
...@@ -203,6 +230,7 @@ public class BasicConfig { ...@@ -203,6 +230,7 @@ public class BasicConfig {
public static final String SELLERCARD_BOTTOMOFCONTENT = HOST + "/kjy/mp/sellerCardV5/bottomOfContent"; public static final String SELLERCARD_BOTTOMOFCONTENT = HOST + "/kjy/mp/sellerCardV5/bottomOfContent";
// *************** 上传 *************** // *************** 上传 ***************
public static final String UPLOAD = HOST + "/kjy/mp/seller/import/upload"; public static final String UPLOAD = HOST + "/kjy/mp/seller/import/upload";
public static final String UPLOAD_TASKSTATUS = HOST + "/kjy/mp/seller/import/taskStatus"; public static final String UPLOAD_TASKSTATUS = HOST + "/kjy/mp/seller/import/taskStatus";
...@@ -216,6 +244,7 @@ public class BasicConfig { ...@@ -216,6 +244,7 @@ public class BasicConfig {
public static final String UPLOAD_UNBIND = HOST + "/kjy/mp/seller/import/unbind"; public static final String UPLOAD_UNBIND = HOST + "/kjy/mp/seller/import/unbind";
// *************** 新手任务 *************** // *************** 新手任务 ***************
public static final String NOVICE_LIST = HOST + "/kjy/mp/seller/novice/list"; public static final String NOVICE_LIST = HOST + "/kjy/mp/seller/novice/list";
public static final String NOVICE_MONGOLIANLAYERISPLAY = HOST + "/kjy/mp/seller/novice/mongolianLayerDisplay"; public static final String NOVICE_MONGOLIANLAYERISPLAY = HOST + "/kjy/mp/seller/novice/mongolianLayerDisplay";
...@@ -237,6 +266,7 @@ public class BasicConfig { ...@@ -237,6 +266,7 @@ public class BasicConfig {
public static final String ARTICLE_GETEXPLOSIONCONTENTLIST = HOST + "/kjy/mp/explosioncontent/getExplosionContentList"; public static final String ARTICLE_GETEXPLOSIONCONTENTLIST = HOST + "/kjy/mp/explosioncontent/getExplosionContentList";
// ************** 发圈素材 *************** // ************** 发圈素材 ***************
public static final String FRIENDS_GETMATERIALTAGS = HOST + "/kjy/mp/materialContent/getmaterialTags"; public static final String FRIENDS_GETMATERIALTAGS = HOST + "/kjy/mp/materialContent/getmaterialTags";
public static final String FRIENDS_ISUSERFIRSTENTERANDCOLLECT = HOST + "/kjy/mp/materialContent/isUserFirstEnterAndCollect"; public static final String FRIENDS_ISUSERFIRSTENTERANDCOLLECT = HOST + "/kjy/mp/materialContent/isUserFirstEnterAndCollect";
...@@ -251,12 +281,16 @@ public class BasicConfig { ...@@ -251,12 +281,16 @@ public class BasicConfig {
public static final String FRIENDS_CHANNELDETAIL = HOST + "/kjy/mp/materialContent/channelDetail"; public static final String FRIENDS_CHANNELDETAIL = HOST + "/kjy/mp/materialContent/channelDetail";
public static final String FRIENDS_GETCURRENTINFO = HOST + "/kjy/mp/timelineContent/getCurrentInfo"; public static final String FRIENDS_GETCURRENTINFO = HOST + "/kjy/mp/timelineContent/getCurrentInfo";
// ************** 首页 **************** // ************** 首页 ****************
public static final String HOME_GETHOMETIMELINECONTENT = HOST + "/kjy/mp/home/getHomeTimeLineContent"; public static final String HOME_GETHOMETIMELINECONTENT = HOST + "/kjy/mp/home/getHomeTimeLineContent";
// ************** 设置中心 *************** // ************** 设置中心 ***************
public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig"; public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
// ************** BOSS看板 *************** // ************** BOSS看板 ***************
public static final String BOSS_ROLE = HOST + "/kjy/mp/seller/team/member/role"; public static final String BOSS_ROLE = HOST + "/kjy/mp/seller/team/member/role";
public static final String BOSS_CODE = HOST + "/kjy/mp/seller/team/invite/code"; public static final String BOSS_CODE = HOST + "/kjy/mp/seller/team/invite/code";
...@@ -274,6 +308,7 @@ public class BasicConfig { ...@@ -274,6 +308,7 @@ public class BasicConfig {
public static final String BOSS_RECEIVERLIST = HOST + "/kjy/mp/seller/team/task/receiverList"; public static final String BOSS_RECEIVERLIST = HOST + "/kjy/mp/seller/team/task/receiverList";
// *************** 贺卡 *************** // *************** 贺卡 ***************
public static final String GREETING_BANNER = HOST + "/kjy/mp/greeting/banner"; public static final String GREETING_BANNER = HOST + "/kjy/mp/greeting/banner";
public static final String GREETING_SHOW = HOST + "/kjy/mp/seller/parctice/show"; public static final String GREETING_SHOW = HOST + "/kjy/mp/seller/parctice/show";
...@@ -288,6 +323,7 @@ public class BasicConfig { ...@@ -288,6 +323,7 @@ public class BasicConfig {
public static final String GREETING_SAVEDEFAULT = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault"; public static final String GREETING_SAVEDEFAULT = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault";
// *************** 管理后台 *************** // *************** 管理后台 ***************
public static final int PROMOTION_CODE = 451; // 优惠码ID public static final int PROMOTION_CODE = 451; // 优惠码ID
public static final String SSO_DOLOGIN = SSO_HOST + "/doLogin"; public static final String SSO_DOLOGIN = SSO_HOST + "/doLogin";
...@@ -300,4 +336,5 @@ public class BasicConfig { ...@@ -300,4 +336,5 @@ public class BasicConfig {
public static final String MANAGER_PROMOTIONBATCHMODIFY = MANAGER_HOST + "/kjy/manager/promotionCode/batchModify"; public static final String MANAGER_PROMOTIONBATCHMODIFY = MANAGER_HOST + "/kjy/manager/promotionCode/batchModify";
public static final String MANAGER_PROMOTIONCODEBATCHDETAIL = MANAGER_HOST + "/kjy/manager/promotionCode/batchDetail"; public static final String MANAGER_PROMOTIONCODEBATCHDETAIL = MANAGER_HOST + "/kjy/manager/promotionCode/batchDetail";
} }
package com.kjj.utils;
public class ThreadSleepUtils {
private ThreadSleepUtils() {}
public static void sleep(long millis) {
try {
Thread.sleep(millis);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
}
...@@ -59,6 +59,11 @@ ...@@ -59,6 +59,11 @@
</classes> </classes>
</test> </test>
<test preserve-order="true" name="红包领取">
<classes>
<class name="com.kjj.cases.live.LiveVistorRed"/>
</classes>
</test>
<test preserve-order="true" name="助播-结束直播"> <test preserve-order="true" name="助播-结束直播">
<classes> <classes>
<class name="com.kjj.cases.live.CloseLive"/> <class name="com.kjj.cases.live.CloseLive"/>
......
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