Skip to content

O
oto
Commit 5f9186a8 authored by 张艳玲's avatar 张艳玲
Browse files
Options

Merge branch '20210329bxl' into 'master' 

20210329bxl

See merge request test-group/kejiji!37
parents a6f97eba 778dbcc6
Hide whitespace changes
Inline Side-by-side
Showing with 616 additions and 51 deletions
src/test/java/com/kjj/bean/AgentBean.java
View file @ 5f9186a8
......@@ -21,6 +21,4 @@ public class AgentBean {
private String companyLogo;
private Long appointmentNum;
private int inviteAuthStatus;
}
src/test/java/com/kjj/bean/LiveVisitor.java 0 → 100644
View file @ 5f9186a8
package com.kjj.bean;
import lombok.Data;
@Data
public class LiveVisitor {
private String confId;
private String resourceBigImg;
private String resourceTitle;
private int resourceType;
private String resourceImg;
private String outLink;
private int outLinkType;
private String outLinkAppId;
private String resourceButtonTitle;
private String resourceSubTitle;
private String testType;
}
src/test/java/com/kjj/bean/ResourceForm.java 0 → 100644
View file @ 5f9186a8
package com.kjj.bean;
import lombok.Data;
import java.util.List;
@Data
public class ResourceForm {
private String banner;
private List<FieldList> fieldList;
private String received;
@Data
public static class FieldList
{
private String fieldId;
private String fieldName;
private int fieldType;
private int selectType;
}
}
src/test/java/com/kjj/bean/ResourceFree.java 0 → 100644
View file @ 5f9186a8
package com.kjj.bean;
import lombok.Data;
@Data
public class ResourceFree {
private String Kj21OTQ1NTk;
private String name;
private String img;
private String companyName;
private String companyId;
private String received;
private String receivedTime;
private int interactType;
private String recordId;
private String liveId;
private String outLink;
private String outLinkDesc;
private String resourceDesc;
private String resourcePictures;
private int resourceType;
private String resourceButtonTitle;
private int outLinkType;
private String outLinkAppId;
private String formBanner;
}
src/test/java/com/kjj/bean/ResourceLink.java 0 → 100644
View file @ 5f9186a8
package com.kjj.bean;
import lombok.Data;
@Data
public class ResourceLink {
private String name;
private String img;
private int interactType;
private String outLink;
private String outLinkType;
private String outLinkAppId;
}
src/test/java/com/kjj/bean/ResourceTestDetail.java 0 → 100644
View file @ 5f9186a8
package com.kjj.bean;
import lombok.Data;
import java.util.List;
@Data
public class ResourceTestDetail {
private int testType;
private int clueType;
private String tradeIntroducePictures;
private String suspendImg;
private String mainButtonTitle;
private String saleButtonTitle;
private List<FieldList> fieldList;
private String received;
@Data
public static class FieldList
{
private String fieldId;
private String fieldValue;
private String fieldSubmitIds;
}
private String liveId;
private String confId;
private int interactType;
}
src/test/java/com/kjj/bean/ResourceTestParticipate.java 0 → 100644
View file @ 5f9186a8
package com.kjj.bean;
import lombok.Data;
@Data
public class ResourceTestParticipate {
private int percent;
private String nickname;
}
src/test/java/com/kjj/cases/live/CloseLive.java
View file @ 5f9186a8
......@@ -23,7 +23,7 @@ public class CloseLive implements AdminAuthorization{
public void 结束直播() {
Map<String, Object> closeParam = new HashMap<>();
closeParam.put("liveid", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
closeParam.put("cid", 101);
closeParam.put("cid", 90);
Response closeRes = network.postResponse(closeParam, BasicConfig.ANCHOR_CLOSE);
Object data = closeRes.jsonPath().getJsonObject("data");
System.out.println(data);
......
src/test/java/com/kjj/cases/live/LiveMaterial.java
View file @ 5f9186a8
......@@ -11,6 +11,7 @@ import io.restassured.response.Response;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.*;
......@@ -33,7 +34,7 @@ public class LiveMaterial implements AdminAuthorization {
saveOrUpdateParam.put("welfareName", "盲盒锦鲤");
saveOrUpdateParam.put("welfarePictures", "https://yun.dui88.com/kjy/image/20210304/1614844198545.jpeg");
saveOrUpdateParam.put("welfarePicturesArr", "https://yun.dui88.com/kjy/image/20210304/1614844198545.jpeg");
saveOrUpdateParam.put("companyId", 101);
saveOrUpdateParam.put("companyId", 90);
Response saveOrUpdatePes = network.postResponse(saveOrUpdateParam, BasicConfig.MANAGER_SAVEORUPDATE6);
boolean data = saveOrUpdatePes.jsonPath().getBoolean("data");
......@@ -45,7 +46,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 查询福利并删除() {
Map<String, Object> params = new HashMap<>();
params.put("companyId", 101);
params.put("companyId", 90);
params.put("pageIndex", 1);
params.put("pageSize", 1);
......@@ -75,7 +76,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 添加投票() {
Map<String, Object> choiceParam = new HashMap<>();
choiceParam.put("companyId", 101);
choiceParam.put("companyId", 90);
choiceParam.put("question", "投票测试一");
List<VoteListBean> votes = new ArrayList<>();
VoteListBean vote = new VoteListBean();
......@@ -102,7 +103,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 查询投票并删除() {
Map<String, Object> choiceListPram = new HashMap<>();
choiceListPram.put("companyId", 101);
choiceListPram.put("companyId", 90);
choiceListPram.put("pageIndex", 1);
choiceListPram.put("pageSize", 1);
......@@ -130,7 +131,7 @@ public class LiveMaterial implements AdminAuthorization {
@Test(description = "问题管理", priority = 5)
public void 添加问题() {
Map<String, Object> questionParam = new HashMap<>();
questionParam.put("companyId", 101);
questionParam.put("companyId", 90);
questionParam.put("question", "测试问题");
Response questionRes = network.postResponse(questionParam, BasicConfig.MANAGER_QUESTION);
......@@ -143,7 +144,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 查询问题并删除() {
Map<String, Object> question1Param = new HashMap<>();
question1Param.put("companyId", 101);
question1Param.put("companyId", 90);
question1Param.put("pageIndex", 1);
question1Param.put("pageSize", 1);
......@@ -171,7 +172,7 @@ public class LiveMaterial implements AdminAuthorization {
@Test(description = "添加图文资料", priority = 7)
public void 添加图文资料() {
Map<String, Object> resourceParam = new HashMap<>();
resourceParam.put("companyId", 101);
resourceParam.put("companyId", 90);
resourceParam.put("resourceTitle", "图文资料2");
resourceParam.put("resourceButtonTitle", "我要报名");
resourceParam.put("resourceImg", "https://yun.dui88.com/kjy/image/20210306/1615023456356.jpeg");
......@@ -189,7 +190,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 查询图文并删除() {
Map<String, Object> imageTextParam = new HashMap<>();
imageTextParam.put("companyId", 101);
imageTextParam.put("companyId", 90);
imageTextParam.put("pageIndex", 1);
imageTextParam.put("pageSize", 1);
imageTextParam.put("resourceTypeList", 1);
......@@ -236,7 +237,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 查询链接并删除() {
Map<String, Object> linkParam = new HashMap<>();
linkParam.put("companyId", 101);
linkParam.put("companyId", 90);
linkParam.put("pageIndex", 1);
linkParam.put("pageSize", 1);
linkParam.put("resourceTypeList", 9);
......@@ -266,7 +267,7 @@ public class LiveMaterial implements AdminAuthorization {
@Test(description = "添加表单", priority = 11)
public void 添加表单() {
Map<String, Object> formParam = new HashMap<>();
formParam.put("companyId", 101);
formParam.put("companyId", 90);
formParam.put("resourceTitle", "表单");
formParam.put("resourceButtonTitle", "我要报名");
formParam.put("resourcePicturesArr", Arrays.asList("https://yun.dui88.com/kjy/image/20210306/1615033326937.jpg"));
......@@ -285,7 +286,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 查询表单并删除() {
Map<String, Object> form1Param = new HashMap<>();
form1Param.put("companyId", 101);
form1Param.put("companyId", 90);
form1Param.put("pageIndex", 1);
form1Param.put("pageSize", 1);
form1Param.put("resourceTypeList", 12);
......@@ -314,7 +315,7 @@ public class LiveMaterial implements AdminAuthorization {
@Test(description = "免费领资料", priority = 13)
public void 免费领资料() {
Map<String, Object> freeParam = new HashMap<>();
freeParam.put("companyId", 101);
freeParam.put("companyId", 90);
freeParam.put("resourceTitle", "免费领资料");
freeParam.put("resourceButtonTitle", "领取资料");
freeParam.put("resourcePicturesArr", Arrays.asList("https://yun.dui88.com/kjy/image/20210306/1615033326937.jpg"));
......@@ -333,7 +334,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 删除免费领资料() {
Map<String, Object> form1Param = new HashMap<>();
form1Param.put("companyId", 101);
form1Param.put("companyId", 90);
form1Param.put("pageIndex", 1);
form1Param.put("pageSize", 1);
form1Param.put("resourceTypeList", 11);
......@@ -362,7 +363,7 @@ public class LiveMaterial implements AdminAuthorization {
@Test(description = "秒薪测试", priority = 15)
public void 秒薪测试() {
Map<String, Object> testParam = new HashMap<>();
testParam.put("companyId", 101);
testParam.put("companyId", 90);
testParam.put("clueType", 1);
testParam.put("mainButtonTitle","领取门票");
testParam.put("resourcePicturesArr", Arrays.asList("https://yun.dui88.com/kjy/image/20210306/1615033326937.jpg"));
......@@ -384,7 +385,7 @@ public class LiveMaterial implements AdminAuthorization {
public void 删除秒薪测试() {
Map<String, Object> test1Param = new HashMap<>();
test1Param.put("companyId", 101);
test1Param.put("companyId", 90);
test1Param.put("pageIndex", 1);
test1Param.put("pageSize", 1);
test1Param.put("resourceTypeList", 13);
......
src/test/java/com/kjj/cases/live/LiveVisitors.java 0 → 100644
View file @ 5f9186a8
package com.kjj.cases.live;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.kjj.bean.*;
import com.kjj.config.BasicConfig;
import com.kjj.constants.LiveConstants;
import com.kjj.utils.JsonUtil;
import io.restassured.response.Response;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
public class LiveVisitors implements AdminAuthorization
{
@BeforeClass
public void setUp() {
visitorAuth();
}
public String confId_imagetext;
public String confId_form;
public String confId_link;
public String confId_test;
public String confId_free;
/*访客端权益列表*/
@Test(description = "访客端权益列表", priority = 1)
public void 访客端权益列表()
{
try {
Thread.sleep(30000);
} catch (InterruptedException e) {
e.printStackTrace();
}
Map<String, Object> params = new HashMap<>();
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_Resource);
List<LiveVisitor> liveVisitors = JsonUtil.parseResponseToListBean(response, LiveVisitor.class);
LiveVisitor one = liveVisitors.get(0);
System.out.println(one.getConfId());
confId_imagetext=one.getConfId();
LiveVisitor two = liveVisitors.get(3);
System.out.println(two.getConfId());
confId_free=two.getConfId();
LiveVisitor three = liveVisitors.get(4);
System.out.println(three.getConfId());
confId_form=three.getConfId();
LiveVisitor four = liveVisitors.get(5);
System.out.println(four.getConfId());
confId_test=four.getConfId();
LiveVisitor five = liveVisitors.get(6);
System.out.println(four.getConfId());
confId_link=five.getConfId();
System.out.println(liveVisitors);
Assert.assertNotNull(liveVisitors, network.message(params, BasicConfig.MOBILE_Resource, "查询权益列表失败", response.body().asString()));
}
/*表单资料-查询*/
@Test(description = "表单资料查询", priority = 2)
public ResourceForm 系统表单资料查询()
{
Map<String, Object> params = new HashMap<>();
params.put("confId",confId_form);
Response response = network.getResponse(params, BasicConfig.MOBILE_Form);
ResourceForm agentBeans = JsonUtil.parseResponseToBean(response, ResourceForm.class);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_Form, "查询表单资料失败", response.body().asString()));
return agentBeans;
}
/*表单资料-提交*/
@Test(description = "表单资料提交", priority = 3)
public void 系统表单资料提交()
{
ResourceForm list = 系统表单资料查询();
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_form);
params.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
List<ResourceForm.FieldList> fieldList = list.getFieldList();
List<JSONObject> fieldListparam = new ArrayList<>();
JSONObject one = new JSONObject();
one.put("fieldId", fieldList.get(0).getFieldId());
one.put("fieldValue","啦啦啦");
JSONObject two = new JSONObject();
two.put("fieldId", fieldList.get(1).getFieldId());
two.put("fieldValue","152588101691");
fieldListparam.add(one);
fieldListparam.add(two);
params.put("fieldList", fieldListparam);
System.out.println(JSONObject.toJSONString(params));
Response response = network.postResponse(params, BasicConfig.MOBILE_FormSubmit);
boolean data = response.jsonPath().getBoolean("data");
Assert.assertTrue(data,network.message(params,BasicConfig.MOBILE_FormSubmit,"提交表单资料失败",response.body().asString()));
}
/*免费领资料-查询*/
@Test(description = "免费领资料查询", priority = 4)
public void 免费领资料查询()
{
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_free);
params.put("liveid", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_ResourceFree);
ResourceFree agentBeans = JsonUtil.parseResponseToBean(response, ResourceFree.class);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_ResourceFree, "查询免费领资料失败", response.body().asString()));
}
/*免费领资料-领取*/
@Test(description = "免费领资料领取", priority = 5)
public void 免费领资料领取()
{
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_free);
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_Link);
boolean invite = response.jsonPath().getBoolean("success");
Assert.assertTrue(invite,network.message(params,BasicConfig.MOBILE_Link,"领取免费领资料失败",response.body().asString()));
}
/*链接小程序资料-查询*/
@Test(description = "链接资料查询", priority = 6)
public void 链接小程序资料查询()
{
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_link);
Response response = network.getResponse(params, BasicConfig.MOBILE_Link1);
ResourceLink agentBeans = JsonUtil.parseResponseToBean(response, ResourceLink.class);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_Link1, "查询链接资料失败", response.body().asString()));
}
/*链接资料资料-领取*/
@Test(description = "链接资料领取", priority = 7)
public void 链接小程序资料领取()
{
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_link);
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
Response response = network.getResponse(params, BasicConfig.MOBILE_Link);
boolean data = response.jsonPath().getBoolean("success");
Assert.assertTrue(data,network.message(params,BasicConfig.MOBILE_Link,"领取链接资料失败",response.body().asString()));
}
/*秒薪测试配置-查询*/
@Test(description = "秒薪测试查询", priority = 8)
public ResourceTestDetail 秒薪测试查询()
{
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_test);
Response response = network.getResponse(params, BasicConfig.MOBILE_ResourceTestDetail);
ResourceTestDetail agentBeans = JsonUtil.parseResponseToBean(response, ResourceTestDetail.class);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_ResourceTestDetail, "查询秒薪测试失败", response.body().asString()));
return agentBeans;
}
/*秒薪测试-参与*/
@Test(description = "秒薪测试参与", priority = 9)
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_ResourceTestParticipate);
List <ResourceTestParticipate> agentBeans = JsonUtil.parseResponseToListBean(response, ResourceTestParticipate.class);
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_ResourceTestParticipate, "秒薪测试参与失败", response.body().asString()));
}
/*权益测试-详情*/
@Test(description = "权益测试提交", priority = 10)
public void 权益测试详情提交()
{
ResourceTestDetail list = 秒薪测试查询();
Map<String, Object> params = new HashMap<>();
params.put("confId", confId_test);
params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
List<ResourceTestDetail.FieldList> fieldList = list.getFieldList();
List<JSONObject> fieldListparam = new ArrayList<>();
JSONObject one = new JSONObject();
one.put("fieldId", fieldList.get(0).getFieldId());
one.put("fieldValue","100000");
one.put("fieldSubmitIds","");
fieldListparam.add(one);
params.put("fieldList", fieldListparam);
System.out.println(JSONObject.toJSONString(params));
Response response = network.postResponse(params, BasicConfig.MOBILE_ResourceTestSubmit);
boolean data = response.jsonPath().getBoolean("data");
Assert.assertTrue(data,network.message(params,BasicConfig.MOBILE_ResourceTestSubmit,"提交秒薪测试失败",response.body().asString()));
}
}
src/test/java/com/kjj/cases/live/OpenLive.java
View file @ 5f9186a8
......@@ -18,7 +18,7 @@ public class OpenLive implements AdminAuthorization {
public void 开启直播() {
Map<String, Object> openParam = new HashMap<>();
openParam.put("liveid", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
openParam.put("cid", 101);
openParam.put("cid", 90);
Response openRes = network.postResponse(openParam, BasicConfig.ANCHOR_OPEN);
Object data = openRes.jsonPath().getJsonObject("data");
System.out.println(data);
......
src/test/java/com/kjj/cases/live/Procurator.java
View file @ 5f9186a8
......@@ -25,8 +25,8 @@ public class Procurator implements AdminAuthorization{
}
/*代理人首页直播列表*/
@Test(description = "代理人首页", priority = 1)
public void Agent() {
@Test(description = "代理人首页 ", priority = 1)
public void 代理人直播列表() {
Map<String, Object> params = new HashMap<>();
params.put("pageIndex", 1);
......@@ -38,13 +38,11 @@ public class Procurator implements AdminAuthorization{
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(bean, network.message(params, BasicConfig.MOBILE_Procurator, "查询直播列表失败", response.body().asString()));
}
}
/*代理人首页已结束的直播列表*/
@Test(description = "代理人首页已结束的直播列表", priority = 2)
public void AgentLiveEndList() {
public void 代理人直播结束列表() {
Map<String, Object> params = new HashMap<>();
params.put("pageIndex", 1);
......@@ -63,7 +61,7 @@ public class Procurator implements AdminAuthorization{
/*代理人信息*/
@Test(description = "代理人信息", priority = 3)
public void AgentCardInfo() {
public void 代理人名片信息() {
Map<String, Object> params = new HashMap<>();
Response response = network.getResponse(params, BasicConfig.MOBILE_AgentCardInfo);
......@@ -74,7 +72,7 @@ public class Procurator implements AdminAuthorization{
/*代理人信息*/
@Test(description = "代理人修改信息", priority = 4)
public void AgentEditCardInfo() {
public void 编辑代理人信息() {
Map<String, Object> params = new HashMap<>();
params.put("sellerName", "你好测试"+ RandomUtils.nextInt(1, 100));
......@@ -86,5 +84,4 @@ public class Procurator implements AdminAuthorization{
System.out.println(JSON.toJSONString(agentBeans));
Assert.assertNotNull(agentBeans, network.message(params, BasicConfig.MOBILE_AgentEditCardInfo, "修改代理人信息失败", response.body().asString()));
}
}
src/test/java/com/kjj/cases/live/SaveAndUpdate.java
View file @ 5f9186a8
......@@ -61,7 +61,6 @@ public class SaveAndUpdate implements AdminAuthorization {
Object data = response.jsonPath().getJsonObject("data");
System.out.println(data);
Assert.assertNotNull(data, network.message(params, BasicConfig.MANAGER_GETCONFDETAIL, "查询配置失败", response.body().asString()));
}
......
src/test/java/com/kjj/config/BasicConfig.java
View file @ 5f9186a8
......@@ -3,36 +3,53 @@ package com.kjj.config;
public class BasicConfig {
public static int apiCount; //接口数量统计
// 是否开启钉钉机器人推送
public static final boolean isPushReport =true; //true
public static final boolean isPushReport =false; //true
// 代理人微信昵称
public static final String WECHAT_NAME = "嘿保险";
public static final String WECHAT_NAME = "嘿保险"; //true
// 代理人的openid(固定)
public static final String OPEN_ID = "osi5w5ggFiEXk0tPJH9b0KO_XU08";
//直播管理员（嘿 保险）
public static String ADMIN_KEY="LEH7epeHVDJWzhZ6DiexTHnfZY1XcX7aBeCVXnN9q7y4raLKHyfe7RFy96seJBQ9NSPqtdNg8JjgUTDUcMu8pjJVo6Js6";
//直播代理人 （艳玲）
// 直播代理人 （艳玲）
public static String AUTH_KEY ="LEH7epeHVDJWzhZ6DiexTHnfZY2NrKorVWS9R85xTeuUZzyc2boHSYWYU56ttSUbcAb9ngEb3LJBB3qZ7a9eCkEoPV5yu";
//直播访客 （嘿 保险）
public static String VISITORKEY ="LEH7epeHVDJWzhZ6DiexTHnfZY2NrKnNHmHY52FxaDfigK3U4NQpLsQrodQUPUXwmumQ1kr3xsfZoGw7cEswYryWfUtMW";
// 基础线代理人 TKU
public static String AGENT_TKU = "T3gM31f18jCFEcfoYxvVk1LsF5T1YkcBNDbUaryi3TgvwatuP6mroJjZ2k7iCHjC9Srujh7k311i3vFuZm";
// 基础线访客 TKU
public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfHcRNmyhTEzEbfmwrGFy5doVEinb1k3SVwreYQE";
// 访客的sids
public static final String sids = "Kj21MjMwNTU";
// 访客的userId(固定)
public static final int VISITOR_USERID = 4425;
// 客集云公众号的oaSourceId(固定)
public static final String OASOURCE_ID = "gh_3b9884c7b0ee";
// 钉钉机器人 线上-告警群
public static final String DINGTALKPATH = "https://oapi.dingtalk.com/robot/send?access_token=f63c9cb36e89dd68e9af82d926933b3afc6544e57b23a3a55ed5b3b772d5e8d2";
// *************** 客集集域名 ***************
public static final String HOST = "https://kjj.m.duibatest.com.cn";
public static final String ACTIVITY_HOST = "https://kjj-activity.duibatest.com.cn";
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 ANCHOR_HOST ="https://live.duibatest.com.cn";
//手机端地址
public static final String MOBILE_HOST = "https://live.duibatest.com.cn";
// *************** 主播端 ***************
......@@ -53,36 +70,98 @@ public class BasicConfig {
// *************** 直播管理端 ***************
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";
public static final String MANAGER_SAVEORUPDATEMAXAMOUNT = MANAGER_HOST + "/kjy/manager/red/conf/saveOrUpdateMaxAmount";
public static final String MANAGER_SAVEORUPDATESHOWEAMOUNT = MANAGER_HOST + "/kjy/manager/red/conf/saveOrUpdateShowAmount";
public static final String MANAGER_SAVEORUPDATE = MANAGER_HOST + "/kjy/manager/question/conf/saveOrUpdate";
public static final String MANAGER_SAVEORUPDATE2 = MANAGER_HOST + "/kjy/manager/live/choice/pre/conf/saveOrUpdate";
public static final String MANAGER_SAVEORUPDATE3 = MANAGER_HOST + "/kjy/manager/live/resource/pre/conf/saveOrUpdate";
public static final String MANAGER_SAVEORUPDATE4 = MANAGER_HOST + "/kjy/manager/live/survey/saveOrUpdate";
public static final String MANAGER_SAVEAGENTPARTICIPATE = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/saveAgentParticipate";
public static final String MANAGER_SAVESPECIFYAWARD = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/saveSpecifyAward";
public static final String MANAGER_SAVEORUPDATE5 = MANAGER_HOST + "/kjy/manager/live/pk/reward/conf/saveOrUpdate";
public static final String MANAGER_GETSURPLUSAMOUNT = MANAGER_HOST + "/kjy/manager/red/conf/getSurplusAmount";
public static final String MANAGER_SAVEORUPDATERED = MANAGER_HOST + "/kjy/manager/red/conf/saveOrUpdateRed";
public static final String MANAGER_SAVEORUPDATE9 = MANAGER_HOST + "/kjy/manager/live/ques/red/pre/conf/saveOrUpdate";
public static final String MANAGER_ADD = MANAGER_HOST + "/kjy/manager/lottery/pre/conf/add";
public static final String MANAGER_ADD1 = MANAGER_HOST + "/kjy/manager/lottery/conf/add";
public static final String MANAGER_SAVEORUPDATE7 = MANAGER_HOST + "/kjy/manager/welfare/pre/conf/saveOrUpdate";
public static final String MANAGER_getLiveAwardList = MANAGER_HOST + "/kjy/manager/specifyAward/pre/conf/getLiveAwardList";
// *************** 代理人 ***************
//代理人列表//
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";
public static final String MOBILE_AgentEditCardInfo = MOBILE_HOST + "/kjy/live/agent/card/edit";
public static final String MOBILE_AgentPersonalCharts = MOBILE_HOST + "/kjy/live/agent/personalCharts";
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_Resource = MOBILE_HOST + "/clue/resource/list";
//表单资料查询//
public static final String MOBILE_Form = MOBILE_HOST + "/clue/resource/form/detail";
//表单资料查询//
public static final String MOBILE_FormSubmit = MOBILE_HOST + "/clue/resource/form/submit";
//链接资料查询
public static final String MOBILE_Link1 = MOBILE_HOST + "/clue/info/interact";
//链接资料领取
public static final String MOBILE_Link = MOBILE_HOST + "/kjy/live/user/resource/receive";
//免费领
public static final String MOBILE_ResourceFree = MOBILE_HOST + "/kjy/live/user/resource/findDetailByConfId";
//秒薪测试查询
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_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_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_AGENTSPECIFYAWARDSUBMIN = MOBILE_HOST + "/kjy/live/agent/agentSpecifyAwardSubmit";
public static final String MOBILE_GETSHARESIGN = MOBILE_HOST + "/kjy/live/getShareSign";
......@@ -91,164 +170,282 @@ public class BasicConfig {
//***************直播素材*****************
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_DEL = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/del";
public static final String MANAGER_CHOICE = MANAGER_HOST+ "/kjy/manager/conf/base/choice/saveOrUpdate";
public static final String MANAGER_GETLIST = MANAGER_HOST+ "/kjy/manager/conf/base/choice/getList";
public static final String MANAGER_DELCHOICE= MANAGER_HOST+ "/kjy/manager/conf/base/choice/delChoice";
public static final String MANAGER_LIST1= MANAGER_HOST+ "/kjy/manager/conf/base/question/list";
public static final String MANAGER_DEL1= MANAGER_HOST+ "/kjy/manager/conf/base/question/del";
public static final String MANAGER_QUESTION= MANAGER_HOST+ "/kjy/manager/conf/base/question/saveOrUpdate";
public static final String MANAGER_RESOURCE= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdatePic";
public static final String MANAGER_RESOURCELIST= MANAGER_HOST+ "/kjy/manager/live/resource/list";
public static final String MANAGER_GELRESOURCE= MANAGER_HOST+ "/kjy/manager/live/resource/delResource";
public static final String MANAGER_SAVEORUPDATELINK= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateLink";
public static final String MANAGER_FORM= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateForm";
public static final String MANAGER_FREE= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateFree";
public static final String MANAGER_TEST= MANAGER_HOST+ "/kjy/manager/live/resource/saveOrUpdateTest";
// *************** 素材ID ***************
public static final String ARTICLE_CONTENTID = "Kj21NjM4NDc";
public static final String ANIMATION_CONTENTID = "Kj21MzgzMTk";
public static final String GAME_CONTENTID = "Kj21NjIxNTk";
public static final String UPLOAD_CONTENTID = "Kj21NjA1NTE";
// *************** 公共 ***************
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_TKU = HOST + "/kjy/mp/autotest/tku";
public static final String VERSION_INFO = HOST + "/kjy/mp/version/info";
public static final String ISVIPSUBSCRIBE = HOST + "/kjy/mp/seller/isVipSubscribe";
public static final String USER_INFO = HOST + "/kjy/mp/user/info";
public static final String FORWARD = HOST + "/kjy/mp/forward";
public static final String GETSCID = HOST + "/kjy/mp/seller/getScId";
public static final String HASALREADYLIKE = HOST + "/kjy/mp/interaction/hasAlreadyLike";
public static final String CHECKUNREAD = HOST + "/kjy/mp/chat/checkUnread";
public static final String CONTENT_READ = HOST + "/kjy/mp/content/read";
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_HASSITESALEVALID = HOST + "/kjy/mp/seller/dist/hasSiteSaleValid";
public static final String PAY_GETPROMOCODE = HOST + "/kjy/order/getPromoCode";
public static final String PAY_COMBOLIST = HOST + "/kjy/mp/combo/list/v2";
public static final String PAY_ORDERCREATE = HOST + "/kjy/order/create";
public static final String PAY_ORDERCANCEL = HOST + "/kjy/order/cancel";
public static final String PAY_CALLOUT = HOST + "/kjy/order/payCallout";
public static final String PAY_VERSIONEXCHANGE = HOST + "/kjy/mp/version/exchange";
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_EDITBASEINFO = HOST + "/kjy/mp/sellerCard/editBaseInfo";
public static final String SELLERCARD_PERSONALPROFILE = HOST + "/kjy/mp/sellerCardV5/personalProfile";
public static final String SELLERCARD_EDITMAJORGOODAUTH = HOST + "/kjy/mp/sellerCard/editMajorGoodAuth";
public static final String SELLERCARD_APPRAISELISTNEW = HOST + "/kjy/mp/sellerCardV5/appraiseListNew";
public static final String SELLERCARD_GETQUESTIONS = HOST + "/kjy/mp/sellerCardV5/getQuestions";
public static final String SELLERCARD_ISDISPLAYACTIVITY = HOST + "/kjy/mp/clue/activity/isDisplayActivity";
public static final String SELLERCARD_COMPANYLIST = HOST + "/kjy/mp/company/list";
public static final String SELLERCARD_SELLERCARDCASENEW = HOST + "/kjy/mp/sellerCardV5/sellerCardCasesList";
public static final String SELLERCARD_PRODUCTLIST = HOST + "/kjy/mp/sellerCardV5/productList";
public static final String SELLERCARD_GETSELLERCARDCONFIG = HOST + "/kjy/mp/sellerConfig/getSellerCardConfig";
public static final String SELLERCARD_GETSELLERCARDSTYLE = HOST + "/kjy/mp/sellerConfig/getSellerCardStyle";
public static final String SELLERCARD_TOPOFCONTENT = HOST + "/kjy/mp/sellerCardV5/topOfContent";
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_TASKSTATUS = HOST + "/kjy/mp/seller/import/taskStatus";
public static final String UPLOAD_CONTENTDETAIL = HOST + "/kjy/mp/content/detail";
public static final String UPLOAD_UPDATEANDSHARE = HOST + "/kjy/mp/content/updateAndShare";
public static final String UPLOAD_UPLOADVEDIO = HOST + "/kjy/mp/upload/video";
public static final String UPLOAD_SELLERUPLOADVEDIO = HOST + "/kjy/mp/seller/upload/video";
public static final String UPLOAD_HOT = HOST + "/kjy/mp/seller/import/hot";
public static final String UPLOAD_VIDEOHOT = HOST + "/kjy/mp/seller/import/video/hot";
public static final String UPLOAD_LIST = HOST + "/kjy/mp/seller/import/list";
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_MONGOLIANLAYERISPLAY = HOST + "/kjy/mp/seller/novice/mongolianLayerDisplay";
// *************** 谁看过我 ***************
public static final String WHOSAWME_CUSTCLUELISTV2 = HOST + "/kjy/mp/whoSawMe/custClueList/v2";
// *************** 文章 ***************
public static final String ARTICLE_H5INFO = HOST + "/kjy/mp/article/h5info";
public static final String ARTICLE_GETEXPINFO = HOST + "/kjy/mp/explosioncontent/getexpinfo";
public static final String ARTICLE_GETTAGTYPESBYCONTENTID = HOST + "/kjy/mp/explosionContent/resource/getTagTypesByContentId";
public static final String ARTICLE_GETQUESTIONS = HOST + "/kjy/mp/explosioncontent/qa/getquestions";
public static final String ARTICLE_ISDISPLAYACTIVITY = HOST + "/kjy/mp/clue/activity/isDisplayActivity";
public static final String ARTICLE_GETENHANCEDCOLUMNCONFIG = HOST + "/kjy/mp/sellerConfig/getEnhancedColumnConfig";
public static final String ARTICLE_ENHANCEDCOLUMN_GETCONTENTS = HOST + "/kjy/mp/enhancedColumn/getContents";
public static final String ARTICLE_ENHANCEDCOLUMN_GETFAQS = HOST + "/kjy/mp/enhancedColumn/getFAQs";
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_ISUSERFIRSTENTERANDCOLLECT = HOST + "/kjy/mp/materialContent/isUserFirstEnterAndCollect";
public static final String FRIENDS_COUNTBYFIRSTTAG = HOST + "/kjy/mp/timelineContent/countByFirstTag";
public static final String FRIENDS_GETUNREADTIMELINSLIST = HOST + "/kjy/mp/timelineContent/getUnreadTimelineList";
public static final String FRIENDS_GETTIMELINELIST = HOST + "/kjy/mp/timelineContent/getTimelineList";
public static final String FRIENDS_GETNEWESTCOUNTBYTYPE = HOST + "/kjy/mp/home/getNewestCountByType";
public static final String FRIENDS_ASYNCMARKTIMELINEREAD = HOST + "/kjy/mp/timelineContent/asyncMarkTimelineRead";
public static final String FRIENDS_ADDORCANCELCOLLECT = HOST + "/kjy/mp/materialContent/addOrCancelCollect";
public static final String FRIENDS_QUERYLISTFORCOLLECT = HOST + "/kjy/mp/materialContent/queryListForCollect";
public static final String FRIENDS_GETCHANNELLIST = HOST + "/kjy/mp/materialContent/getChannelList";
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 HOME_GETHOMETIMELINECONTENT = HOST + "/kjy/mp/home/getHomeTimeLineContent";
// ************** 设置中心 ***************
public static final String SELLERCONFIG_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
// ************** BOSS看板 ***************
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_IDENTITY = HOST + "/kjy/mp/seller/team/member/identity";
public static final String BOSS_BOUND = HOST + "/kjy/mp/seller/team/bound";
public static final String BOSS_BOSS = HOST + "/kjy/mp/seller/team/boss";
public static final String BOSS_REMOVE = HOST + "/kjy/mp/seller/team/member/remove";
public static final String BOSS_MEMBER = HOST + "/kjy/mp/seller/team/member";
public static final String BOSS_EDITCONFIG = HOST + "/kjy/mp/sellerConfig/editConfig";
public static final String BOSS_ISDEMO = HOST + "/kjy/mp/seller/team/isDemo";
public static final String BOSS_TEAMTASKLIST = HOST + "/kjy/mp/seller/team/task/teamTaskList";
public static final String BOSS_CREATE = HOST + "/kjy/mp/seller/team/task/create";
public static final String BOSS_DETAIL = HOST + "/kjy/mp/seller/team/task/detail";
public static final String BOSS_PUBLISH = HOST + "/kjy/mp/seller/team/task/publish";
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_SHOW = HOST + "/kjy/mp/seller/parctice/show";
public static final String GREETING_ALLFORWARD = HOST + "/kjy/mp/greeting/allForward";
public static final String GREETING_FINDBYTYPE = HOST + "/kjy/mp/tag/findByType";
public static final String GREETING_GETTIPSBYPAGE = HOST + "/kjy/mp/tips/getTipsByPage";
public static final String GREETING_SHOWLAYER = HOST + "/kjy/mp/festival/showLayer";
public static final String GREETING_PAGELIST = HOST + "/kjy/mp/greeting/pageList";
public static final String GREETING_CONFLIST = HOST + "/kjy/mp/greeting/conf/list";
public static final String GREETING_H5SHARE = ACTIVITY_HOST + "/kjy/mp/greeting/conf/h5share";
public static final String GREETING_H5INFO = ACTIVITY_HOST + "/kjy/mp/content/h5info";
public static final String GREETING_SAVEDEFAULT = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault";
// *************** 管理后台 ***************
public static final int PROMOTION_CODE = 450; // 优惠码ID
public static final int PROMOTION_CODE = 398; // 优惠码ID
public static final String SSO_DOLOGIN = SSO_HOST + "/doLogin";
public static final String MANAGER_DISABLEUSER = MANAGER_HOST + "/kjy/manager/testUser/disableUser";
public static final String MANAGER_CHANGECOMPANY = MANAGER_HOST + "/kjy/manager/seller/changeCompany";
public static final String MANAGER_UPDATETYPEORDATE = MANAGER_HOST + "/kjy/manager/seller/updateTypeOrDate";
public static final String MANAGER_SETINTERALSELLER = MANAGER_HOST + "/kjy/manager/seller/setInternalSeller";
public static final String MANAGER_ADMININFO = MANAGER_HOST + "/kjy/manager/admin/info";
public static final String MANAGER_PROMOTIONCODELIST = MANAGER_HOST + "/kjy/manager/promotionCode/codeList";
public static final String MANAGER_PROMOTIONBATCHMODIFY = MANAGER_HOST + "/kjy/manager/promotionCode/batchModify";
public static final String MANAGER_PROMOTIONCODEBATCHDETAIL = MANAGER_HOST + "/kjy/manager/promotionCode/batchDetail";
}
src/test/java/com/kjj/utils/JsonUtil.java
View file @ 5f9186a8
......@@ -33,11 +33,17 @@ public class JsonUtil {
* @param <T>
* @return
*/
public static <T> List<T> parseResponseToListBean(Response response, Class<T> tClass){
public static <T> List<T> parseResponseToPageBean(Response response, Class<T> tClass){
Object data = response.jsonPath().getJsonObject("data");
String str = new JsonBuilder(data).toString();
JSONObject jsonObject = JSON.parseObject(str);
JSONArray array = jsonObject.getJSONArray("list");
return array.toJavaList(tClass);
}
public static <T> List<T> parseResponseToListBean(Response response, Class<T> tClass){
Object data = response.jsonPath().getJsonObject("data");
String str = new JsonBuilder(data).toString();
return JSON.parseArray(str, tClass);
}
}
src/test/liveTestNG.xml
View file @ 5f9186a8
......@@ -26,33 +26,42 @@
</test>
<test preserve-order="true" name="访客券码领取">
<classes>
<class name="com.kjj.cases.live.User"/>
</classes>
</test>
<test preserve-order="true" name="访客券码领取">
<classes>
<class name="com.kjj.cases.live.User"/>
</classes>
</test>
<test preserve-order="true" name="指定中奖">
<classes>
<class name="com.kjj.cases.live.DesignatedWinner"/>
</classes>
</test>
<test preserve-order="true" name="获取代理人排行榜及客户信息">
<classes>
<class name="com.kjj.cases.live.LiveAgent"/>
</classes>
</test>
<test preserve-order="true" name="助播-开启直播">
<classes>
<class name="com.kjj.cases.live.OpenLive"/>
</classes>
</test>
<test preserve-order="true" name="助播-结束直播">
<!-- <test preserve-order="true" name="指定中奖">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.live.DesignatedWinner"/>-->
<!-- </classes>-->
<!-- </test>-->
<test preserve-order="true" name="访客领取资料">
<classes>
<class name="com.kjj.cases.live.CloseLive"/>
<class name="com.kjj.cases.live.LiveVisitors"/>
</classes>
</test>
<!-- <test preserve-order="true" name="获取代理人排行榜及客户信息">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.live.LiveAgent"/>-->
<!-- </classes>-->
<!-- </test>-->
<!-- <test preserve-order="true" name="助播-结束直播">-->
<!-- <classes>-->
<!-- <class name="com.kjj.cases.live.CloseLive"/>-->
<!-- </classes>-->
<!-- </test>-->
......
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