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

.idea/compiler.xml

@@ -8,8 +8,8 @@
         <processorPath useClasspath="false">
           <entry name="$USER_HOME$/Applications/gradle-6.6.1/caches/modules-2/files-2.1/org.projectlombok/lombok/1.18.12/48e4e5d60309ebd833bc528dcf77668eab3cd72c/lombok-1.18.12.jar" />
         </processorPath>
-        <module name="kjj.test" />
         <module name="kjj.main" />
+        <module name="kjj.test" />
       </profile>
       <profile name="Maven default annotation processors profile" enabled="true">
         <sourceOutputDir name="target/generated-sources/annotations" />

src/test/java/com/kjj/bean/AgentBean.java

@@ -21,6 +21,4 @@ public class AgentBean {
     private String  companyLogo;
     private Long    appointmentNum;
     private int   inviteAuthStatus;
-
-
 }

src/test/java/com/kjj/bean/LiveVisitor.java

+package com.kjj.bean;
+
+public class LiveVisitor {
+}

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

+package com.kjj.cases.live;
+
+import com.alibaba.fastjson.JSON;
+import com.kjj.bean.AgentBean;
+import com.kjj.config.BasicConfig;
+import com.kjj.utils.JsonUtil;
+import io.restassured.response.Response;
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+public class LiveVisitors {
+
+
+    /*代理人首页直播列表*/
+    @Test(description = "代理人首页 ", priority = 1)
+    public void 代理人直播列表() {
+
+        Map<String, Object> params = new HashMap<>();
+        params.put("pageIndex", 1);
+        params.put("pageSize", 10);
+        Response response = network.getResponse(params, BasicConfig.MOBILE_Procurator);
+        List<AgentBean> agentBeans = JsonUtil.parseResponseToListBean(response, AgentBean.class);
+        if (agentBeans.size() > 0) {
+            AgentBean bean = agentBeans.get(0);
+            System.out.println(JSON.toJSONString(agentBeans));
+            Assert.assertNotNull(bean, network.message(params, BasicConfig.MOBILE_Procurator, "查询直播列表失败", response.body().asString()));
+        }
+    }
+}

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

@@ -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

@@ -58,7 +58,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

@@ -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