Merge remote-tracking branch 'origin/master' into 2021072101-gxh

# Conflicts:
#	src/test/java/com/kjj/cases/assistant/whoSawMe/WhoSawMe.java

src/test/java/com/kjj/cases/assistant/DailyPaper.java

@@ -254,7 +254,7 @@ public class DailyPaper implements Authorization {
             params.put("id",pId);
             System.out.println(pId);
             params.put("imageUrlConfig",pUrl);
-            params.put("clock","false");
+            params.put("clock","true");
             Response response = network.getResponse(params,HOME_getInfo);
             boolean isClock = response.jsonPath().getBoolean("data.isClock");
             Assert.assertTrue(isClock, network.message(params,HOME_getInfo,"打卡失败",response.body().asString()));

src/test/java/com/kjj/cases/assistant/whoSawMe/WhoSawMe.java

@@ -290,6 +290,7 @@ public class WhoSawMe implements Authorization {
     public void 转发名片() throws IOException{
         response = network.getResponse(BasicConfig.USER_INFO);
         String scId = network.getResponse(BasicConfig.SELLERCARD_topOfDetail).jsonPath().getString("data.scid");
+
         param = new HashMap<>();
         param.put("scId", scId);
         param.put("forwardType", 1);

src/test/java/com/kjj/cases/live/agent/LiveLater.java

@@ -30,7 +30,6 @@ public class LiveLater implements Authorization {
         ThreadSleepUtils.sleep(100000);
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         Response response = network.getResponse(params,BasicConfig.MOBILE_recycleSuccessCase);
         System.out.println(response.body().asString());
         Object data = response.jsonPath().getJsonObject("data");
@@ -41,7 +40,6 @@ public class LiveLater implements Authorization {
     public void 获取直播案例() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         Response response = network.getResponse(params,BasicConfig.MOBILE_successCase);
         boolean success =response.jsonPath().getBoolean("success");
         System.out.println(success);
@@ -56,7 +54,6 @@ public class LiveLater implements Authorization {
     public void 获取代理人各线索等级的线索数() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         Response response = network.getResponse(params,BasicConfig.MOBILE_ClueNum);
         boolean success =response.jsonPath().getBoolean("success");
         System.out.println(success);
@@ -84,7 +81,6 @@ public class LiveLater implements Authorization {
     public void 获取发奖人信息() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         Response response = network.getResponse(params,BasicConfig.MOBILE_providerInfo);
         Object data = response.jsonPath().getJsonObject("data");
         System.out.println(data);
@@ -99,7 +95,6 @@ public class LiveLater implements Authorization {
     public void 直播结束线索列表页() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("pageIndex",1);
         params.put("pageSize",30);
         Response response = network.getResponse(params,BasicConfig.MOBILE_ClueList);
@@ -119,7 +114,6 @@ public class LiveLater implements Authorization {
     public void 直接邀请tab数据()  {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("pageIndex",1);
         params.put("pageSize",30);
         params.put("actionTypeList",26);
@@ -136,7 +130,6 @@ public class LiveLater implements Authorization {
     public void 转介绍tab数据() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("pageIndex",1);
         params.put("pageSize",30);
         params.put("actionTypeList",22);
@@ -153,7 +146,6 @@ public class LiveLater implements Authorization {
     public void 中奖tab数据() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("pageIndex",1);
         params.put("pageSize",30);
         params.put("actionTypeList",17);
@@ -172,7 +164,6 @@ public class LiveLater implements Authorization {
     public void 报名tab数据() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("pageIndex",1);
         params.put("pageSize",30);
         params.put("actionTypeList",20);
@@ -190,7 +181,6 @@ public class LiveLater implements Authorization {
     public void 观看20分钟以上tab数据() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("pageIndex",1);
         params.put("pageSize",30);
         params.put("actionTypeList",4);
@@ -208,7 +198,6 @@ public class LiveLater implements Authorization {
     public void 客户A线索已读() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("liveUserId",this.liveUserId.get(0).getLiveUserId());
         Response response = network.postResponse(params,BasicConfig.MOBILE_readClue);
         boolean data = response.jsonPath().getBoolean("data");
@@ -222,14 +211,11 @@ public class LiveLater implements Authorization {
     public void 查看客户A线索详情() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("liveUserId",this.liveUserId.get(0).getLiveUserId());
         Response response = network.getResponse(params,BasicConfig.MOBILE_getClueDetail);
         System.out.println(response.body().asString());
         int visitorInviteNum=response.jsonPath().getInt("data.visitorInviteNum");
         Assert.assertTrue(visitorInviteNum==1, network.message(params, BasicConfig.MOBILE_getClueDetail, "访客邀请数不对", response.body().asString()));
-        String remarkName=response.jsonPath().getString("data.remarkName");
-        Assert.assertEquals(remarkName,"访客A", network.message(params, BasicConfig.MOBILE_getClueDetail, "访客备注名不正确", response.body().asString()));
         int speakNum=response.jsonPath().getInt("data.speakNum");
         Assert.assertTrue(speakNum>0, network.message(params, BasicConfig.MOBILE_getClueDetail, "没有评论数", response.body().asString()));
         Object questions=response.jsonPath().getJsonObject("data.questions");
@@ -253,11 +239,10 @@ public class LiveLater implements Authorization {
     public void 查看客户B答题线索详情() {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-//        params.put("liveId","Kj21MzYyNjM");
         params.put("liveUserId",this.liveUserId.get(1).getLiveUserId());
         Response response = network.getResponse(params,BasicConfig.MOBILE_getClueDetail);
         System.out.println(response.body().asString());
-        int answerRecords=response.jsonPath().getInt("data.answerRecords");
+        Object answerRecords=response.jsonPath().getJsonObject("data.answerRecords");
         Assert.assertNotNull(answerRecords, network.message(params, BasicConfig.MOBILE_getClueDetail, "答题线索为null", response.body().asString()));
 
     }