Merge branch 'master' of /Users/biexiangling/Documents/kejiji with conflicts.

src/test/java/com/kjj/cases/live/Procurator.java

+package com.kjj.cases.live;
+
+import com.kjj.bean.AnswerBean;
+import com.kjj.bean.AnswerListBean;
+import com.kjj.bean.RewardPkBean;
+import com.kjj.config.BasicConfig;
+import com.kjj.utils.BaseUtils;
+import io.restassured.response.Response;
+import org.apache.commons.lang3.time.DateUtils;
+import org.testng.Assert;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import java.io.IOException;
+import java.util.*;
+
+import static com.kjj.config.BasicConfig.ISVIPSUBSCRIBE;
+
+
+public class Procurator implements AdminAuthorization{
+
+    @BeforeClass
+    public void setUp() {
+        adminAuth();
+    }
+
+    public String liveID;
+
+    /*代理人端*/
+
+    /*代理人首页*/
+    @Test(description = "代理人首页", priority = 1)
+    public void Agent() {
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("liveId", liveID);
+
+        Response response = network.getResponse(params, BasicConfig.MANAGER_Procurator);
+
+        Object data = response.jsonPath().getJsonObject("data.list.[0].liveid");
+        System.out.println(data);
+        Assert.assertNotNull(data, network.message(params, BasicConfig.MANAGER_Procurator, "查询代理人直播列表", response.body().asString()));
+
+    }
+
+
+
+    /*代理人个人信息*/
+
+
+
+}

src/test/java/com/kjj/config/BasicConfig.java

@@ -4,7 +4,7 @@ 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 = "客集集-梦晨";  //true
@@ -74,6 +74,19 @@ public class BasicConfig {
 
     public static final String MANAGER_SAVEORUPDATE7 = MANAGER_HOST + "/kjy/manager/welfare/pre/conf/saveOrUpdate";
 
+    // ***************  代理人  ***************
+
+    //用户信息//
+    public static final String MANAGER_ISProcurator = MANAGER_HOST + "/kjy/live/userInfo";
+
+    public static final String MANAGER_Procurator = MANAGER_HOST + "/kjy/live/agent/liveList";
+
+
+
+
+
+
+
 
     //***************直播素材*****************
     public static final String MANAGER_SAVEORUPDATE6 = MANAGER_HOST+ "/kjy/manager/conf/base/welfare/saveOrUpdate";

src/test/liveTestNG.xml

@@ -6,6 +6,11 @@
             <class name="com.kjj.cases.live.SaveAndUpdate"/>
         </classes>
     </test>
+    <test preserve-order="true" name="代理人首页">
+        <classes>
+            <class name="com.kjj.cases.live.Procurator"/>
+        </classes>
+    </test>
 
 <!--    <test preserve-order="true" name="直播素材">-->
 <!--        <classes>-->