Skip to content

O
oto
Commit 32c8ac0c authored by 张艳玲's avatar 张艳玲
Browse files
Options

Merge branch 'featrue/20210712-zyl' into 'master' 

update

See merge request test-group/kejiji!62
parents 1e1a4e4d 167dc9a0
Expand all Show whitespace changes
Inline Side-by-side
Showing with 273 additions and 48 deletions
src/test/java/com/kjj/bean/agent/LiveUserList.java 0 → 100644
View file @ 32c8ac0c
package com.kjj.bean.agent;
import lombok.Data;
@Data
public class LiveUserList {
private String liveUserId;
}
src/test/java/com/kjj/cases/assistant/RecommendMaterial.java
View file @ 32c8ac0c
......@@ -2,7 +2,7 @@ package com.kjj.cases.assistant;
import static com.kjj.config.BasicConfig.*;
import com.kjj.bean.welfare.Welfare;
//import com.kjj.bean.welfare.Welfare;
import com.kjj.cases.admin.Authorization;
import com.kjj.utils.BaseUtils;
import com.kjj.utils.JsonUtil;
......
src/test/java/com/kjj/cases/live/agent/LiveBefore.java
View file @ 32c8ac0c
......@@ -22,7 +22,7 @@ public class LiveBefore implements Authorization {
//直播前我的客户页面
// 获取直播前我的客户页面全部tab；
@Test(description="获取直播前我的客户页面全部tab数据",priority = 1)
public void 获取直播前我的客户页面全部tab数据() throws IOException {
public void 获取直播前我的客户页面全部tab数据() {
Map<String, Object> params = new HashMap<String, Object>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
params.put("pageIndex",1);
......
src/test/java/com/kjj/cases/live/liveConfig/SaveLive.java
View file @ 32c8ac0c
......@@ -377,7 +377,7 @@ public class SaveLive implements Authorization {
public void 上传发奖团队名单() {
Map<String, Object> Params = new HashMap<>();
Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
Params.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210425/45c95c5bf7d8fb8aeb40c2ab307e0681.xlsx");
Params.put("excelUrl", "https://yun.dui88.com/kjy/media/file/20210707/fb54c08f13bae40e294e538c613478fa.xlsx");
Params.put("fileName", "团队发奖人模板");
Response response = network.postResponse(Params, BasicConfig.MANAGER_importGroupProvider);
taskId = response.jsonPath().getInt("data");
......
src/test/java/com/kjj/config/BasicConfig.java
View file @ 32c8ac0c
......@@ -82,10 +82,8 @@ public class BasicConfig {
public static final String SSO_HOST = "https://sso.duibatest.com.cn";
public static final String MANAGER_HOST = "https://kjj-mng.duibatest.com.cn";
//手机端地址
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 MOBILE_HOST1 = "https://kjj.m.duibatest.com.cn";
public static final String MOBILE_SPOKEHOST = "https://tt.duibatest.com.cn";
// *************** 开启&结束直播 ***************
......@@ -287,7 +285,7 @@ public class BasicConfig {
public static final String USER_SYCAPPOINTMENT = MOBILE_HOST + "/kjy/live/user/sycAppointment";
public static final String USER_savePoster = MOBILE_HOST + "/kjy/live/user/share/savePoster";
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 USER_wxIdAllList = HOST + "/kjy/mp/msg/config/live/user/wxIdAllList";
// *************** 直播管理端 ***************
public static final String MANAGER_saveAndUpdate_0 = MANAGER_HOST + "/kjy/manager/live/pre/conf/saveAndUpdate";
......@@ -322,7 +320,25 @@ public class BasicConfig {
// public static final String MANAGER_ = MANAGER_HOST + "";
// *************** 代理人 ***************
//代理人列表//
//回收成功案例//
public static final String MOBILE_recycleSuccessCase = MOBILE_HOST + "/kjy/live/agent/clue/recycleSuccessCase";
public static final String MOBILE_providerInfo = MOBILE_HOST + "/kjy/live/agent/clue/providerInfo";
public static final String MOBILE_successCase = HOST + "/kjy/mp/liveClue/successCase";
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_readClue = MOBILE_HOST + "/kjy/live/agent/clue/readClue";
public static final String MOBILE_getClueDetail = MOBILE_HOST + "/kjy/live/agent/clue/getClueDetail";
public static final String MOBILE_userInviteList = MOBILE_HOST + "/kjy/live/agent/clue/userInviteList";
public static final String MOBILE_getReplyAdvice = MOBILE_HOST + "/kjy/live/agent/clue/getReplyAdvice";
public static final String MOBILE_updateRemarkName = MOBILE_HOST + "/kjy/live/agent/customer/updateRemarkName";
public static final String MOBILE_clueNum = MOBILE_HOST + "/kjy/live/agent/clueNum";
public static final String MOBILE_head = MOBILE_HOST + "/kjy/live/reward/agent/head";
public static final String MOBILE_RewardAgentList = MOBILE_HOST + "/kjy/live/reward/agent/list";
public static final String MOBILE_signInfo= MOBILE_HOST + "/kjy/live/reward/agent/signInfo";
public static final String MOBILE_getDeliveryWay= MOBILE_HOST + "/kjy/live/getDeliveryWay";
public static final String MOBILE_clueTextList= HOST + "/kjy/mp/liveClue/advice/clueTextList";
public static final String MOBILE_Procurator = MOBILE_HOST + "/kjy/live/agent/liveList";
public static final String MOBILE_AgentEndList = MOBILE_HOST + "/kjy/live/agent/liveEndList";
public static final String MOBILE_AgentCardInfo = MOBILE_HOST + "/kjy/live/agent/card/info";
......@@ -331,10 +347,8 @@ public class BasicConfig {
public static final String MOBILE_TeamTeamCharts = MOBILE_HOST + "/kjy/live/team/teamCharts";
public static final String MOBILE_AgentPersonalTeamCharts = MOBILE_HOST + "/kjy/live/agent/personalTeamCharts";
public static final String MOBILE_AgentOwnCharts = MOBILE_HOST + "/kjy/live/agent/ownCharts";
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_MyCustomerList = MOBILE_HOST + "/kjy/live/agent/clue/myCustomerList";
public static final String MOBILE_RewardAgentList = MOBILE_HOST + "/kjy/live/reward/agent/list";
public static final String MOBILE_VideoList = MOBILE_HOST + "/kjy/live/company/video/list";
public static final String MOBILE_VideoGetDetail = MOBILE_HOST + "/kjy/live/company/video/getDetail";
public static final String MOBILE_VideoShareInfo = MOBILE_HOST + "/kjy/live/company/video/shareInfo";
......@@ -344,7 +358,7 @@ public class BasicConfig {
public static final String MOBILE_LiveGuideList = MOBILE_HOST + "/kjy/live/guide/list";
public static final String MOBILE_userInfo1 = MOBILE_HOST + "/kjy/live/userInfo";
public static final String MOBILE_isForbidden = MOBILE_HOST + "/kjy/live/share/isForbidden";
public static final String MOBILE_wxIdAllList = MOBILE_HOST1 + "/kjy/mp/msg/config/live/user/wxIdAllList";
public static final String MOBILE_wxIdAllList = HOST + "/kjy/mp/msg/config/live/user/wxIdAllList";
public static final String MOBILE_listDetail = MOBILE_HOST + "/kjy/live/guide/list/detail";
public static final String MOBILE_feedbackSave = MOBILE_HOST + "/kjy/live/user/feedback/save";
public static final String MOBILE_agentInfo = MOBILE_HOST + "/kjy/live/share/help/agent/info";
......@@ -511,6 +525,11 @@ public class BasicConfig {
public static final String MANAGER_rewardSignQrCode = MANAGER_HOST+ "/kjy/manager/live/awardGrant/rewardSignQrCode";
public static final String MANAGER_saveRewardConfig = MANAGER_HOST+ "/kjy/manager/live/awardGrant/saveRewardConfig";
public static final String MOBILE_small = MOBILE_HOST + "/kjy/live/card/user/small";
public static final String MOBILE_visitorSignInfo = MOBILE_HOST + "/kjy/live/reward/visitor/signInfo";
public static final String MOBILE_doSign = MOBILE_HOST + "/kjy/live/reward/visitor/doSign";
//***************有奖答题*****************
......
src/test/liveTestNG.xml
View file @ 32c8ac0c
......@@ -114,13 +114,6 @@
</classes>
</test>
<test preserve-order="true" name="闯关答题">
<classes>
<class name="com.kjj.cases.live.answer.passQues"/>
</classes>
</test>
<test preserve-order="true" name="看直播攒现金">
<classes>
<class name="com.kjj.cases.live.treasure.TimeRed"/>
......@@ -169,6 +162,12 @@
</classes>
</test>
<test preserve-order="true" name="闯关答题">
<classes>
<class name="com.kjj.cases.live.answer.passQues"/>
</classes>
</test>
<test preserve-order="true" name="直播中获取线索统计">
<classes>
<class name="com.kjj.cases.live.agent.LiveAgent"/>
......@@ -187,6 +186,12 @@
</classes>
</test>
<!-- <test preserve-order="true" name="奖品发放配置-不开启核奖">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.live.agent.Reward"/>-->
<!-- </classes>-->
<!-- </test>-->
<test preserve-order="true" name="奖品发放配置-不开启核奖">
<classes>
<class name="com.kjj.cases.live.signing.NuclearAward"/>
......
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