Skip to content

O
oto
Commit 03c34ab2 authored by 张艳玲's avatar 张艳玲
Browse files
Options

update

parent 2f9cdc98
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 603 additions and 76 deletions
src/test/java/com/kjj/bean/lottery/LotteryList.java 0 → 100644
View file @ 03c34ab2
package com.kjj.bean.lottery;
import lombok.Data;
@Data
public class LotteryList {
private int drawDownNum;
}
src/test/java/com/kjj/cases/live/AdminAuthorization.java
View file @ 03c34ab2
......@@ -35,14 +35,43 @@ public interface AdminAuthorization {
}
/**
* 访客（🍗）授权
* 访客（慧锋）授权
*/
default void visitorAuth2() {
network.agentCookies.put("authKey", VISITORKEY1);
System.out.println("用户AUTH_KEY：" + VISITORKEY1);
network.agentCookies.put("authKey", VISITORKEY2);
System.out.println("用户AUTH_KEY：" + VISITORKEY2);
}
/**
* 访客（刘超）授权
*/
default void visitorAuth3() {
network.agentCookies.put("authKey", VISITORKEY3);
System.out.println("用户AUTH_KEY：" + VISITORKEY3);
}
/**
* 访客（志勇）授权
*/
default void visitorAuth4() {
network.agentCookies.put("authKey", VISITORKEY4);
System.out.println("用户AUTH_KEY：" + VISITORKEY4);
}
/**
* 访客（周成）授权
*/
default void visitorAuth5() {
network.agentCookies.put("authKey", VISITORKEY5);
System.out.println("用户AUTH_KEY：" + VISITORKEY5);
}
/**
* 访客（斌斌）授权
*/
default void visitorAuth6() {
network.agentCookies.put("authKey", VISITORKEY6);
System.out.println("用户AUTH_KEY：" + VISITORKEY6);
}
}
src/test/java/com/kjj/cases/live/OpenLive.java
View file @ 03c34ab2
package com.kjj.cases.live;
import com.kjj.config.BasicConfig;
import com.kjj.constants.LiveConstants;
import com.kjj.utils.ThreadSleepUtils;
import io.restassured.response.Response;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
......@@ -33,8 +34,7 @@ public class OpenLive implements AdminAuthorization {
Object data = openRes.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(openParam, BasicConfig.ANCHOR_OPEN, "开启直播失败", openRes.body().asString()));
ThreadSleepUtils.sleep(10000);
}
......
src/test/java/com/kjj/cases/live/SaveAndUpdate.java
View file @ 03c34ab2
......@@ -151,9 +151,9 @@ public class SaveAndUpdate implements AdminAuthorization {
saveOrUpdate4Param.put("surveyLink", "https://kjj.m.duibatest.com.cn/live/pages/survey/index?id=41");
Response saveOrUpdate4Res = network.postResponse(saveOrUpdate4Param, BasicConfig.MANAGER_SAVEORUPDATE4);
boolean data5 = saveOrUpdate4Res.jsonPath().getBoolean("data");
System.out.println(data5);
Assert.assertTrue(data5, network.message(saveOrUpdate4Param, BasicConfig.MANAGER_SAVEORUPDATE4, "问卷配置失败", saveOrUpdate4Res.body().asString()));
boolean data = saveOrUpdate4Res.jsonPath().getBoolean("data");
System.out.println(data);
Assert.assertTrue(data, network.message(saveOrUpdate4Param, BasicConfig.MANAGER_SAVEORUPDATE4, "问卷配置失败", saveOrUpdate4Res.body().asString()));
}
//直播中奖品配置
......@@ -161,8 +161,8 @@ public class SaveAndUpdate implements AdminAuthorization {
public void 直播中抽奖() {
Map<String, Object> add1Param = new HashMap<>();
add1Param.put("liveId", liveID);
add1Param.put("interactNum", 100);
add1Param.put("showInteractNum", 100);
add1Param.put("interactNum", 1);
add1Param.put("showInteractNum", 1);
add1Param.put("welfareId", 191);
add1Param.put("afterMin", 20);
Response add1Res = network.postResponse(add1Param, BasicConfig.MANAGER_ADD1);
......
src/test/java/com/kjj/config/BasicConfig.java
View file @ 03c34ab2
......@@ -14,8 +14,16 @@ public class BasicConfig {
public static String AUTH_KEY ="LEH7epeHVDJWzhZ6DiexTHnfZY2NrKorVWS9R85xTeuUZzyc2boHSYWYU56ttSUbcAb9ngEb3LJBB3qZ7a9eCkEoPV5yu";
//直播访客 （嘿 保险）
public static String VISITORKEY ="LEH7epeHVDJWzhZ6DiexTHnfZY2NrKnNHmHY52FxaDfigK3U4NQpLsQrodQUPUXwmumQ1kr3xsfZoGw7cEswYryWfUtMW";
//直播访客 （🍗）
public static String VISITORKEY1 ="LEH7epeHVDJWzhZ6DiexTHnsYWTEo46qxbPUiJ1xnTqmCJPHLGsoTuy5C2psyH1j5t5ppr3BNQLrBXrBmsmJUDJcXSivb";
//直播访客 （茶仔）
public static String VISITORKEY2 ="zFNkBc7JtvLPL6ifAfXbcgYH7WrugVmhv4CXQVq1CN1Y2C8pcBXoPvUPFbkWj7HbdkFpe4oX6SLjczK3ruYpQ8EaQ5";
//直播访客 （刘超）
public static String VISITORKEY3 ="LEH7epeHVDJWzhZ6DiexTHnsaP3ed5NWb7fwGDRPzUCcfxMKyEZr5fYSmKv5AZVQu1w2FRoEvz6mP3RzfeKLqjV8Kq1XE";
//直播访客 （志勇）
public static String VISITORKEY4 ="zFNkBc7JtvLPL6ifAfXbcgYH7WruadyTs58VQNVezBEHURWFkb861yA3TQfkngLojnBnDenawiYNbNADYRdv1vFcDi";
//直播访客 （周成）
public static String VISITORKEY5 ="zFNkBc7JtvLPL6ifAfXbcgYH7WruadzDMUjR7buv4kTkfKtxsjyzHLTi7V9HNnQ7ia7Reb5rk5k11dFQPNSuMzsEMW";
//直播访客 （斌斌）
public static String VISITORKEY6 ="DyGoVEPj7nANppy7P8NS4Z4v3PAwxeqJodqYrmwYkoHYMsV4yAxbTXwZ5wWmGQTddQgxdWoNCmN43P8fzhcuWRmdE";
// 基础线代理人 TKU
public static String AGENT_TKU = "T3gM31f18jCFEcfoYxvVk1LsF5T1YkcBNDbUaryi3TgvwatuP6mroJjZ2k7iCHjC9Srujh7k311i3vFuZm";
// 基础线访客 TKU
......@@ -40,17 +48,15 @@ public class BasicConfig {
public static final String MOBILE_HOST = "https://live.duibatest.com.cn";
public static final String MOBILE_HOST1 = "https://kjj.m.duibatest.com.cn";
// *************** 主播端 ***************
// *************** 开启&结束直播 ***************
public static final String ANCHOR_OPEN = MOBILE_HOST + "/conf/live/open";
public static final String ANCHOR_getConfDetail = MOBILE_HOST + "/conf/pre/getConfDetail";
public static final String ANCHOR_CLOSE = MOBILE_HOST + "/conf/live/close";
// *************** 代理人指定中奖 ***************
public static final String MOBILE_getSpecifyAwardConf = MOBILE_HOST + "/conf/pre/specifyAward/getSpecifyAwardConf";
public static final String MOBILE_getAgentParticipateCond = MOBILE_HOST + "/conf/pre/specifyAward/getAgentParticipateCond";
public static final String MOBILE_getLiveAwardList = MOBILE_HOST + "/conf/pre/specifyAward/getLiveAwardList";
public static final String ANCHOR_start = MOBILE_HOST + "/conf/live/lottery/start";
public static final String ANCHOR_status = MOBILE_HOST + "/conf/live/lottery/status";
public static final String ANCHOR_end = MOBILE_HOST + "/conf/live/lottery/end";
public static final String ANCHOR_list = MOBILE_HOST + "/conf/live/lottery/list";
public static final String ANCHOR_List = MOBILE_HOST + "/conf/pre/lottery/pre/list";
public static final String ANCHOR_add = MOBILE_HOST + "/conf/pre/lottery/add";
public static final String ANCHOR_preModify = MOBILE_HOST + "/conf/pre/lottery/pre/modify";
......@@ -60,7 +66,15 @@ public class BasicConfig {
public static final String ANCHOR_list1 = MOBILE_HOST + "/conf/pre/lottery/list";
public static final String ANCHOR_preAdd = MOBILE_HOST + "/conf/pre/lottery/pre/add";
public static final String ANCHOR_preDelete = MOBILE_HOST + "/conf/pre/lottery/pre/delete";
// *************** 直播抽奖 ***************
public static final String MOBILE_status1 = MOBILE_HOST + "/index/status";
public static final String MOBILE_AgentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
public static final String MOBILE_SpecifyAwardUserSelectList = MOBILE_HOST + "/kjy/live/agent/specifyAwardUserSelectList";
public static final String MOBILE_AgentSpecifyAwardSubmit = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit";
public static final String MOBILE_agentSpecifyAwardUserList = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardUserList";
public static final String MOBILE_agentSpecifyAwardInfo = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardInfo";
public static final String MOBILE_agentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
// *************** 直播中抽奖 ***************
public static final String USER_getLiveAwardList = MOBILE_HOST + "/kjy/live/conf/specifyAward/getLiveAwardList";
public static final String USER_listLiveLottery = MOBILE_HOST + "/kjy/live/lottery/listLiveLottery";
public static final String USER_pageList = MOBILE_HOST + "/clue/lottery/pageList";
......@@ -71,6 +85,13 @@ public class BasicConfig {
public static final String USER_hasEnd = MOBILE_HOST + "/clue/lottery/hasEnd";
public static final String USER_info = MOBILE_HOST + "/clue/lottery/info";
public static final String USER_connectSuccess = MOBILE_HOST + "/kjy/live/connectSuccess";
public static final String ANCHOR_start = MOBILE_HOST + "/conf/live/lottery/start";
public static final String ANCHOR_list = MOBILE_HOST + "/conf/live/lottery/list";
public static final String ANCHOR_status = MOBILE_HOST + "/conf/live/lottery/status";
public static final String ANCHOR_end = MOBILE_HOST + "/conf/live/lottery/end";
public static final String ANCHOR_luckDetail = MOBILE_HOST + "/clue/lottery/task/luckDetail";
public static final String ANCHOR_inviteDrawDetail = MOBILE_HOST + "/clue/lottery/task/inviteDrawDetail";
public static final String ANCHOR_flag = MOBILE_HOST + "/clue/lottery/flag";
// *************** 访客端 ***************
public static final String USER_SUBSCRIBE = MOBILE_HOST + "/kjy/live/user/appointment/subscribe";
public static final String USER_FIND = MOBILE_HOST + "/kjy/live/user/subscribe/find";
......@@ -79,8 +100,6 @@ public class BasicConfig {
public static final String USER_myCount = MOBILE_HOST + "/kjy/live/user/lottery/myCount";
public static final String USER_wxIdAllList = MOBILE_HOST1 + "/kjy/mp/msg/config/live/user/wxIdAllList";
// *************** 直播管理端 ***************
public static final String MANAGER_SAVEANDUPDATE = MANAGER_HOST + "/kjy/manager/live/pre/conf/saveAndUpdate";
public static final String MANAGER_GETCONFDETAIL = MANAGER_HOST + "/kjy/manager/live/conf/getConfDetail";
......@@ -129,18 +148,11 @@ public class BasicConfig {
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_ClueList = MOBILE_HOST + "/kjy/live/agent/clue/list";
public static final String MOBILE_AgentSpecifyAwardSubmit = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit";
public static final String MOBILE_GETSHARESIGN = MOBILE_HOST + "/kjy/live/getShareSign";
public static final String MOBILE_binding = MOBILE_HOST + "/clue/invitation/binding";
public static final String MOBILE_AgentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
public static final String MOBILE_Token = MOBILE_HOST + "/clue/invitation/token";
public static final String MOBILE_Code = MOBILE_HOST + "/clue/invitation/code";
public static final String MOBILE_MyLotteryCode = MOBILE_HOST + "/kjy/live/lottery/myLotteryCode";
public static final String MOBILE_SpecifyAwardUserSelectList = MOBILE_HOST + "/kjy/live/agent/specifyAwardUserSelectList";
public static final String MOBILE_status1 = MOBILE_HOST + "/index/status";
public static final String MOBILE_agentSpecifyAwardUserList = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardUserList";
public static final String MOBILE_agentSpecifyAwardInfo = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardInfo";
public static final String MOBILE_agentSpecifyAwardConf = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardConf";
//红包//
......
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