Merge branch '20210329bxl' into 'master'

20210329bxl

See merge request test-group/kejiji!41

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

@@ -20,7 +20,7 @@ public class CloseLive implements AdminAuthorization{
 
 
         @Test(description = "结束直播", priority = 1)
-        public void 结束直播() {
+        public void closeLive() {
             Map<String, Object> closeParam = new HashMap<>();
             closeParam.put("liveid", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
             closeParam.put("cid", 101);
@@ -34,5 +34,6 @@ public class CloseLive implements AdminAuthorization{
 
 
 
+
     }
 

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

@@ -71,6 +71,7 @@ public class LiveMaterial implements AdminAuthorization {
     }
 
 
+
     //添加投票
     @Test(description = "添加投票", priority = 3)
     public void 添加投票() {

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

@@ -80,6 +80,7 @@ public class LiveVisitors implements AdminAuthorization
 
 
 
+
     /*表单资料-查询*/
     @Test(description = "表单资料查询", priority = 2)
     public ResourceForm 系统表单资料查询()

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

@@ -3,7 +3,9 @@ package com.kjj.cases.live;
 import com.kjj.utils.NetworkUtils;
 
 /**
- * 管理员小程序授权
+ * 管理员后台授权
+ * @author zhanghuifeng
+ * date 2021/2/20-13:46
  */
 public interface MngAuthorization {
 
@@ -12,7 +14,7 @@ public interface MngAuthorization {
     default void mngAuth(){
         // 创建sso用户 并传到network里
         network.agentCookies.put("csrf_token","ff715857c2234f6577cbf1a57600c316");
-        network.agentCookies.put("sso_ticket","dcdc60f6fe4a0c5a439d15d6790400cb");
+        network.agentCookies.put("sso_ticket","dcdc60f6fe4a0c5a439d15d67101400cb");
 
     }
 }

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

@@ -29,4 +29,6 @@ public class OpenLive implements AdminAuthorization {
 
 
 
+
+
 }

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

@@ -24,6 +24,8 @@ public class Procurator implements AdminAuthorization{
         agentAuth();
     }
 
+
+
     /*代理人首页直播列表*/
     @Test(description = "代理人首页 ", priority = 1)
     public void 代理人直播列表() {
@@ -32,7 +34,7 @@ public class Procurator implements AdminAuthorization{
         params.put("pageIndex", 1);
         params.put("pageSize", 10);
         Response response = network.getResponse(params, BasicConfig.MOBILE_Procurator);
-        List<AgentBean> agentBeans = JsonUtil.parseResponseToListBean(response, AgentBean.class);
+        List<AgentBean> agentBeans = JsonUtil.parseResponseToPageBean(response, AgentBean.class);
         if (agentBeans.size() > 0) {
             AgentBean bean = agentBeans.get(0);
             System.out.println(JSON.toJSONString(agentBeans));
@@ -48,7 +50,7 @@ public class Procurator implements AdminAuthorization{
         params.put("pageIndex", 1);
         params.put("pageSize", 10);
         Response response = network.getResponse(params, BasicConfig.MOBILE_AgentEndList);
-        List<AgentEndList> agentBeans = JsonUtil.parseResponseToListBean(response, AgentEndList.class);
+        List<AgentEndList> agentBeans = JsonUtil.parseResponseToPageBean(response, AgentEndList.class);
         if (agentBeans.size() > 0) {
             AgentEndList bean = agentBeans.get(0);
             System.out.println(JSON.toJSONString(agentBeans));
@@ -76,7 +78,7 @@ public class Procurator implements AdminAuthorization{
 
         Map<String, Object> params = new HashMap<>();
         params.put("sellerName", "你好测试"+ RandomUtils.nextInt(1, 100));
-        params.put("phoneNumber", "15258890691");
+        params.put("phoneNumber", "152588101691");
         params.put("jobNumber", "TTTTTT");
         params.put("wechatQrCode", "//yun.dui88.com/kjy/nc/qrcode1/1981ec88d22fe37041feac4724c627670817.png");
         Response response = network.postResponse(params, BasicConfig.MOBILE_AgentEditCardInfo);

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

@@ -51,6 +51,7 @@ public class SaveAndUpdate implements AdminAuthorization {
         Assert.assertNotNull(liveID, network.message(saveAndUpdateParam, BasicConfig.MANAGER_SAVEANDUPDATE, "新增直播失败", response.body().asString()));
         LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey());
     }
+    
 
     @Test(description = "查询直播配置", priority = 2)
     public void 查询直播配置() {

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

@@ -449,4 +449,5 @@ public class BasicConfig {
     public static final String MANAGER_PROMOTIONBATCHMODIFY = MANAGER_HOST + "/kjy/manager/promotionCode/batchModify";
 
     public static final String MANAGER_PROMOTIONCODEBATCHDETAIL = MANAGER_HOST + "/kjy/manager/promotionCode/batchDetail";
+
 }