update

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

-package com.kjj.bean;
-
-import lombok.Data;
-
-@Data
-public class GetShareSign {
-    private String posterUrl;
-    private String mpQrcode;
-    private String mpShareUrl;
-    private String mpShareTitle;
-    private String shareSign;
-    private String shareContent;
-    private String liveType;
-}

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

-package com.kjj.bean;
-
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class LotteryList {
-    private List<List_Lottery> LotteryList;
-    private String welfareId;
-    private String configId;
-
-    @Data
-    public static class List_Lottery
-    {
-        private String id;
-        private String name;
-    }
-
-
-}

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

-package com.kjj.bean;
-
-import lombok.Data;
-
-import java.util.Date;
-
-
-@Data
-public class RedSimpleDetail {
-
-    private int totalAmount;
-    private int luckAmount;
-    private int luckNum;
-    private int luckHelpNum;
-    private Date startTime;
-    private int redStatus;
-}

src/test/java/com/kjj/bean/TokenUserBean.java → src/test/java/com/kjj/bean/admin/TokenUserBean.java

-package com.kjj.bean;
+package com.kjj.bean.admin;
 
 import lombok.Data;
 

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

-package com.kjj.bean;
+package com.kjj.bean.agent;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/AgentCard.java → src/test/java/com/kjj/bean/agent/AgentCard.java

-package com.kjj.bean;
+package com.kjj.bean.agent;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/AgentEndList.java → src/test/java/com/kjj/bean/agent/AgentEndList.java

-package com.kjj.bean;
+package com.kjj.bean.agent;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ConfidList.java → src/test/java/com/kjj/bean/lottery/ConfidList.java

-package com.kjj.bean;
+package com.kjj.bean.lottery;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/lottery/LotteryList.java

@@ -2,8 +2,20 @@ package com.kjj.bean.lottery;
 
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class LotteryList {
-    private int drawDownNum;
+    private List<List_Lottery> LotteryList;
+    private String welfareId;
+    private String configId;
+
+    @Data
+    public static class List_Lottery
+    {
+        private String id;
+        private String name;
+    }
+
 
 }

src/test/java/com/kjj/bean/AnswerBean.java → src/test/java/com/kjj/bean/manager/AnswerBean.java

-package com.kjj.bean;
+package com.kjj.bean.manager;
 
 
 import lombok.Data;

src/test/java/com/kjj/bean/AnswerListBean.java → src/test/java/com/kjj/bean/manager/AnswerListBean.java

-package com.kjj.bean;
+package com.kjj.bean.manager;
 import lombok.Data;
 
 import java.util.List;

src/test/java/com/kjj/bean/RewardPkBean.java → src/test/java/com/kjj/bean/manager/RewardPkBean.java

-package com.kjj.bean;
+package com.kjj.bean.manager;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/VoteBean.java → src/test/java/com/kjj/bean/manager/VoteBean.java

-package com.kjj.bean;
+package com.kjj.bean.manager;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/VoteListBean.java → src/test/java/com/kjj/bean/manager/VoteListBean.java

-package com.kjj.bean;
+package com.kjj.bean.manager;
 
+import com.kjj.bean.manager.VoteBean;
 import lombok.Data;
 
-import java.util.List;
-
 @Data
 public class VoteListBean {
 

src/test/java/com/kjj/bean/WelfareBean.java → src/test/java/com/kjj/bean/manager/WelfareBean.java

-package com.kjj.bean;
+package com.kjj.bean.manager;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/WelfareListBean.java → src/test/java/com/kjj/bean/manager/WelfareListBean.java

-package com.kjj.bean;
+package com.kjj.bean.manager;
 
+import com.kjj.bean.manager.WelfareBean;
 import lombok.Data;
 
 import java.util.List;

src/test/java/com/kjj/bean/AnchorRedList.java → src/test/java/com/kjj/bean/red/AnchorRedList.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedFindDetail.java → src/test/java/com/kjj/bean/red/RedFindDetail.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedGetSimple.java → src/test/java/com/kjj/bean/red/RedGetSimple.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedHelpInfo.java → src/test/java/com/kjj/bean/red/RedHelpInfo.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedHelpQuery.java → src/test/java/com/kjj/bean/red/RedHelpQuery.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedHepDetail.java → src/test/java/com/kjj/bean/red/RedHepDetail.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedLuckResult.java → src/test/java/com/kjj/bean/red/RedLuckResult.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedNum.java → src/test/java/com/kjj/bean/red/RedNum.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedOpendate.java → src/test/java/com/kjj/bean/red/RedOpendate.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedOrdinary.java → src/test/java/com/kjj/bean/red/RedOrdinary.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedState.java → src/test/java/com/kjj/bean/red/RedState.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/RedSultList.java → src/test/java/com/kjj/bean/red/RedSultList.java

-package com.kjj.bean;
+package com.kjj.bean.red;
 
 import lombok.Data;
 

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

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ResourceEditList.java → src/test/java/com/kjj/bean/resources/ResourceEditList.java

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ResourceForm.java → src/test/java/com/kjj/bean/resources/ResourceForm.java

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ResourceFree.java → src/test/java/com/kjj/bean/resources/ResourceFree.java

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ResourceLink.java → src/test/java/com/kjj/bean/resources/ResourceLink.java

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ResourcePushList.java → src/test/java/com/kjj/bean/resources/ResourcePushList.java

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ResourceTestDetail.java → src/test/java/com/kjj/bean/resources/ResourceTestDetail.java

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

src/test/java/com/kjj/bean/ResourceTestParticipate.java → src/test/java/com/kjj/bean/resources/ResourceTestParticipate.java

-package com.kjj.bean;
+package com.kjj.bean.resources;
 
 import lombok.Data;
 

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

-package com.kjj.cases.live;
-
-import com.kjj.utils.NetworkUtils;
-
-/**
- * 管理员后台授权
- */
-public interface MngAuthorization {
-
-    NetworkUtils network = NetworkUtils.getInstance();
-
-    default void mngAuth(){
-        // 创建sso用户 并传到network里
-        network.agentCookies.put("csrf_token","ff715857c2234f6577cbf1a57600c316");
-        network.agentCookies.put("sso_ticket","dcdc60f6fe4a0c5a439d15d67101400cb");
-
-    }
-}

src/test/java/com/kjj/cases/live/AdminAuthorization.java → src/test/java/com/kjj/cases/live/admin/AdminAuthorization.java

-package com.kjj.cases.live;
+package com.kjj.cases.live.admin;
 import com.kjj.utils.NetworkUtils;
 import static com.kjj.config.BasicConfig.*;
 

src/test/java/com/kjj/cases/live/Agent.java → src/test/java/com/kjj/cases/live/agent/Agent.java

-package com.kjj.cases.live;
+package com.kjj.cases.live.agent;
 
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;

src/test/java/com/kjj/cases/live/LiveAgent.java → src/test/java/com/kjj/cases/live/agent/LiveAgent.java

-package com.kjj.cases.live;
+package com.kjj.cases.live.agent;
 
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
@@ -11,7 +10,6 @@ import org.testng.annotations.Test;
 
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

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

-package com.kjj.cases.live;
+package com.kjj.cases.live.agent;
 
 import com.alibaba.fastjson.JSON;
-import com.kjj.bean.AgentBean;
-import com.kjj.bean.AgentCard;
-import com.kjj.bean.AgentEndList;
+import com.kjj.bean.agent.AgentBean;
+import com.kjj.bean.agent.AgentCard;
+import com.kjj.bean.agent.AgentEndList;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.utils.JsonUtil;
 import io.restassured.response.Response;
@@ -17,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 /*代理人端*/
-public class Procurator implements AdminAuthorization{
+public class Procurator implements AdminAuthorization {
 
     @BeforeClass
     public void setUp() {

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

-package com.kjj.cases.live;
+package com.kjj.cases.live.anchor;
 
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
@@ -10,7 +11,7 @@ import org.testng.annotations.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-public class CloseLive implements AdminAuthorization{
+public class CloseLive implements AdminAuthorization {
 
 
         @BeforeClass

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

-package com.kjj.cases.live;
+package com.kjj.cases.live.anchor;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.kjj.bean.*;
+import com.kjj.bean.resources.*;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;

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

-package com.kjj.cases.live;
+package com.kjj.cases.live.anchor;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.ThreadSleepUtils;

src/test/java/com/kjj/cases/live/DesignatedWinner.java → src/test/java/com/kjj/cases/live/lottery/DesignatedWinner.java

-package com.kjj.cases.live;
-import com.kjj.bean.LotteryList;
+package com.kjj.cases.live.lottery;
+import com.kjj.bean.lottery.LotteryList;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -13,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class DesignatedWinner implements AdminAuthorization{
+public class DesignatedWinner implements AdminAuthorization {
 
     public  List<LotteryList.List_Lottery> List_Lottery;
     public  List<LotteryList> welfareId;

src/test/java/com/kjj/cases/live/Lottery.java → src/test/java/com/kjj/cases/live/lottery/Lottery.java

-package com.kjj.cases.live;
+package com.kjj.cases.live.lottery;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.kjj.bean.AgentEndList;
-import com.kjj.bean.ConfidList;
+import com.kjj.bean.lottery.ConfidList;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
 import com.kjj.utils.ThreadSleepUtils;
 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;
@@ -364,19 +361,8 @@ public class Lottery implements AdminAuthorization {
         System.out.println(success);
         Assert.assertTrue(success, network.message(connectSuccessParam, BasicConfig.USER_connectSuccess, "访客到场请求失败", connectSuccessoRes.body().asString()));
     }
-    @Test(description = "访客C关注直播间", priority = 26)
-    public void 访客C关注直播间() {
-        visitorAuth3();
-        Map<String, Object> subscribeParam = new HashMap<>();
-        subscribeParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
-        Response subscribeRes = network.postResponse(subscribeParam, BasicConfig.USER_SUBSCRIBE);
-        boolean data = subscribeRes.jsonPath().getBoolean("data");
-        System.out.println(data);
-        Assert.assertTrue(data, network.message(subscribeParam, BasicConfig.USER_SUBSCRIBE, "关注失败", subscribeRes.body().asString()));
-    }
-
     //访客B绑定访客A后获取访客A的中奖任务信息
-    @Test(description = "访客C获取访客A的中奖任务信息", priority = 27)
+    @Test(description = "访客C获取访客A的中奖任务信息", priority = 26)
     public void 访客C获取访客A的中奖任务信息() {
         visitorAuth3();
         Map<String, Object> inviteDrawDetailParam = new HashMap<>();
@@ -387,6 +373,16 @@ public class Lottery implements AdminAuthorization {
         Assert.assertNotNull(result, network.message(inviteDrawDetailParam, BasicConfig.ANCHOR_inviteDrawDetail, "查询邀请人中奖信息失败", inviteDrawDetailRes.body().asString()));
 
     }
+    @Test(description = "访客C关注直播间", priority = 27)
+    public void 访客C关注直播间() {
+        visitorAuth3();
+        Map<String, Object> subscribeParam = new HashMap<>();
+        subscribeParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response subscribeRes = network.postResponse(subscribeParam, BasicConfig.USER_SUBSCRIBE);
+        boolean data = subscribeRes.jsonPath().getBoolean("data");
+        System.out.println(data);
+        Assert.assertTrue(data, network.message(subscribeParam, BasicConfig.USER_SUBSCRIBE, "关注失败", subscribeRes.body().asString()));
+    }
     @Test(description = "访客C抽奖码数量", priority = 28)
     public void 访客C抽奖码数量() {
         visitorAuth3();
@@ -400,7 +396,6 @@ public class Lottery implements AdminAuthorization {
 
     }
 
-
     @Test(description = "访客A中奖任务是否完成", priority = 29)
     public void 访客A中奖任务是否完成() {
         visitorAuth();
@@ -429,8 +424,20 @@ public class Lottery implements AdminAuthorization {
 
     }
 
+    @Test(description = "访客A抽奖码数量", priority = 31)
+    public void 访客A抽奖码数量() {
+        visitorAuth();
+        ThreadSleepUtils.sleep(500);
+        Map<String, Object> myCountParam = new HashMap<>();
+        myCountParam.put("liveId",LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
+        Response myCountRes = network.getResponse(myCountParam, BasicConfig.USER_myCount);
+        long data = myCountRes.jsonPath().getLong("data");
+        System.out.println(data);
+        Assert.assertNotNull(data, network.message(myCountParam, BasicConfig.USER_myCount, "获取抽奖码数量失败", myCountRes.body().asString()));
+
+    }
 
-    @Test(description = "访客B幸运任务", priority = 31)
+    @Test(description = "访客B幸运任务", priority = 32)
     public void 访客B幸运任务() {
         visitorAuth2();
         ThreadSleepUtils.sleep(3000);
@@ -444,7 +451,7 @@ public class Lottery implements AdminAuthorization {
     }
 
 //完成幸运任务逻辑
-    @Test(description = "访客B直播中分享直播间", priority = 32)
+    @Test(description = "访客B直播中分享直播间", priority = 33)
     public void 访客B直播中分享直播间() {
         visitorAuth2();
         Map<String, Object> signParam = new HashMap<>();
@@ -459,7 +466,7 @@ public class Lottery implements AdminAuthorization {
 }
 
 
-    @Test(description = "幸运任务邀请D关系绑定", priority = 33)
+    @Test(description = "幸运任务邀请D关系绑定", priority = 34)
     public void 幸运任务邀请D关系绑定() {
         visitorAuth4();
         Map<String, Object> bindingParam = new HashMap<>();
@@ -472,7 +479,7 @@ public class Lottery implements AdminAuthorization {
     }
 
 
-    @Test(description = "幸运任务邀请D绑定结果和绑定凭证", priority = 34)
+    @Test(description = "幸运任务邀请D绑定结果和绑定凭证", priority = 35)
     public void 幸运任务邀请D绑定结果和绑定凭证() {
         visitorAuth4();
         Map<String, Object> tokenParam = new HashMap<>();
@@ -487,7 +494,7 @@ public class Lottery implements AdminAuthorization {
     }
 
 
-    @Test(description = "幸运任务邀请D根据绑定凭证发放抽奖码", priority = 35)
+    @Test(description = "幸运任务邀请D根据绑定凭证发放抽奖码", priority = 36)
     public void 幸运任务邀请D根据绑定凭证发放抽奖码() {
         visitorAuth4();
         Map<String, Object> codeParam = new HashMap<>();
@@ -499,7 +506,7 @@ public class Lottery implements AdminAuthorization {
         Assert.assertTrue(success, network.message(codeParam, BasicConfig.MOBILE_Code, "发放抽奖码失败", codeRes.body().asString()));
     }
 
-    @Test(description = "幸运任务邀请E关系绑定", priority = 36)
+    @Test(description = "幸运任务邀请E关系绑定", priority = 37)
     public void 幸运任务邀请E关系绑定() {
         visitorAuth5();
         Map<String, Object> bindingParam = new HashMap<>();
@@ -512,7 +519,7 @@ public class Lottery implements AdminAuthorization {
     }
 
 
-    @Test(description = "幸运任务邀请E绑定结果和绑定凭证", priority = 37)
+    @Test(description = "幸运任务邀请E绑定结果和绑定凭证", priority = 38)
     public void 幸运任务邀请E绑定结果和绑定凭证() {
         visitorAuth5();
         Map<String, Object> tokenParam = new HashMap<>();
@@ -527,7 +534,7 @@ public class Lottery implements AdminAuthorization {
     }
 
 
-    @Test(description = "幸运任务邀请E根据绑定凭证发放抽奖码", priority = 38)
+    @Test(description = "幸运任务邀请E根据绑定凭证发放抽奖码", priority = 39)
     public void 幸运任务邀请E根据绑定凭证发放抽奖码() {
         visitorAuth5();
         Map<String, Object> codeParam = new HashMap<>();
@@ -539,7 +546,7 @@ public class Lottery implements AdminAuthorization {
         Assert.assertTrue(success, network.message(codeParam, BasicConfig.MOBILE_Code, "发放抽奖码失败", codeRes.body().asString()));
     }
 
-    @Test(description = "幸运任务邀请F关系绑定", priority = 39)
+    @Test(description = "幸运任务邀请F关系绑定", priority = 40)
     public void 幸运任务邀请F关系绑定() {
         visitorAuth6();
         Map<String, Object> bindingParam = new HashMap<>();
@@ -552,7 +559,7 @@ public class Lottery implements AdminAuthorization {
     }
 
 
-    @Test(description = "幸运任务邀请F绑定结果和绑定凭证", priority = 40)
+    @Test(description = "幸运任务邀请F绑定结果和绑定凭证", priority = 41)
     public void 幸运任务邀请F绑定结果和绑定凭证() {
         visitorAuth6();
         Map<String, Object> tokenParam = new HashMap<>();
@@ -566,7 +573,7 @@ public class Lottery implements AdminAuthorization {
         Assert.assertNotNull(token, network.message(tokenParam, BasicConfig.MOBILE_Token, "未获取到绑定结果", tokenRes.body().asString()));
     }
 
-    @Test(description = "幸运任务邀请F根据绑定凭证发放抽奖码", priority = 41)
+    @Test(description = "幸运任务邀请F根据绑定凭证发放抽奖码", priority = 42)
     public void 幸运任务邀请F根据绑定凭证发放抽奖码() {
         visitorAuth6();
         Map<String, Object> codeParam = new HashMap<>();
@@ -578,7 +585,7 @@ public class Lottery implements AdminAuthorization {
         Assert.assertTrue(success, network.message(codeParam, BasicConfig.MOBILE_Code, "发放抽奖码失败", codeRes.body().asString()));
     }
 
-    @Test(description = "访客B幸运任务是否完成", priority = 42)
+    @Test(description = "访客B幸运任务是否完成", priority = 43)
     public void 访客B幸运任务是否完成() {
         visitorAuth2();
         ThreadSleepUtils.sleep(3000);
@@ -591,7 +598,7 @@ public class Lottery implements AdminAuthorization {
 
     }
 
-    @Test(description = "访客B的抽奖券列表", priority = 43)
+    @Test(description = "访客B的抽奖券列表", priority = 44)
     public void 访客B的抽奖券列表() {
          visitorAuth2();
          ThreadSleepUtils.sleep(10000);
@@ -605,7 +612,7 @@ public class Lottery implements AdminAuthorization {
          Assert.assertNotNull(data, network.message(myLotteryCodeParam, BasicConfig.MOBILE_MyLotteryCode, "查询邀请人抽奖券列表失败", myLotteryCodeRes.body().asString()));
     }
 
-    @Test(description = "访客B的抽奖码数量", priority = 44)
+    @Test(description = "访客B的抽奖码数量", priority = 45)
     public void 访客B抽奖码数量() {
         visitorAuth2();
         ThreadSleepUtils.sleep(3000);
@@ -618,7 +625,7 @@ public class Lottery implements AdminAuthorization {
 
     }
 
-    @Test(description = "开始第二轮抽奖", priority = 45)
+    @Test(description = "开始第二轮抽奖", priority = 46)
     public void 开始第二轮抽奖() {
         adminAuth();
         ThreadSleepUtils.sleep(1000);
@@ -631,7 +638,7 @@ public class Lottery implements AdminAuthorization {
         Assert.assertNotNull(data, network.message(startParam, BasicConfig.ANCHOR_start, "开启第二轮抽奖失败", startRes.body().asString()));
     }
 
-    @Test(description = "查询第二轮正在抽奖的福利", priority = 46)
+    @Test(description = "查询第二轮正在抽奖的福利", priority = 47)
     public void 查询第二轮正在抽奖的福利() {
         visitorAuth3();
         ThreadSleepUtils.sleep(1000);
@@ -645,7 +652,7 @@ public class Lottery implements AdminAuthorization {
 
     }
 
-    @Test(description = "查询第二轮是否可以结束抽奖状态", priority = 47)
+    @Test(description = "查询第二轮是否可以结束抽奖状态", priority = 48)
     public void 查询第二轮是否可以结束抽奖状态() {
         adminAuth();
         ThreadSleepUtils.sleep(3000);
@@ -658,7 +665,7 @@ public class Lottery implements AdminAuthorization {
         Assert.assertTrue(data, network.message(statusParam, BasicConfig.ANCHOR_status, "抽奖状态查询失败", statusRes.body().asString()));
     }
 
-    @Test(description = "结束第二轮抽奖", priority = 48)
+    @Test(description = "结束第二轮抽奖", priority = 49)
     public void 结束第二轮抽奖() {
         adminAuth();
         Map<String, Object> endParam = new HashMap<>();
@@ -669,7 +676,7 @@ public class Lottery implements AdminAuthorization {
         System.out.println(data);
         Assert.assertTrue(data, network.message(endParam, BasicConfig.ANCHOR_end, "结束第二轮抽奖失败", endRes.body().asString()));
     }
-    @Test(description = "查看第二轮抽奖榜单", priority = 49)
+    @Test(description = "查看第二轮抽奖榜单", priority = 50)
     public void 查看第二轮抽奖榜单() {
         visitorAuth();
         ThreadSleepUtils.sleep(1000);
@@ -686,7 +693,7 @@ public class Lottery implements AdminAuthorization {
     }
 
 
-    @Test(description = "获取第二轮喜报", priority = 50)
+    @Test(description = "获取第二轮喜报", priority = 51)
     public void 获取第二轮喜报() {
         visitorAuth();
         ThreadSleepUtils.sleep(1000);

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

-package com.kjj.cases.live;
+package com.kjj.cases.live.manager;
 import com.alibaba.fastjson.JSON;
-import com.kjj.bean.VoteBean;
-import com.kjj.bean.VoteListBean;
-import com.kjj.bean.WelfareBean;
-import com.kjj.bean.WelfareListBean;
+import com.kjj.bean.manager.VoteBean;
+import com.kjj.bean.manager.VoteListBean;
+import com.kjj.bean.manager.WelfareBean;
+import com.kjj.bean.manager.WelfareListBean;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.utils.BaseUtils;
 import com.kjj.utils.JsonUtil;
@@ -14,16 +15,12 @@ import org.testng.annotations.Test;
 
 import java.util.*;
 
-
 public class LiveMaterial implements AdminAuthorization {
-
     @BeforeClass
     public void setUp() {
-//        adminAuth();
         BaseUtils.ssoLogin();
     }
 
-
     @Test(description = "添加奖品", priority = 1)
     public void 添加奖品() {
 

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

-package com.kjj.cases.live;
-import com.kjj.bean.AnswerBean;
-import com.kjj.bean.AnswerListBean;
-import com.kjj.bean.RewardPkBean;
+package com.kjj.cases.live.manager;
+import com.kjj.bean.manager.AnswerBean;
+import com.kjj.bean.manager.AnswerListBean;
+import com.kjj.bean.manager.RewardPkBean;
 import com.kjj.bean.answer.*;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;

src/test/java/com/kjj/cases/live/LiveVistorRed.java → src/test/java/com/kjj/cases/live/red/LiveVistorRed.java

-package com.kjj.cases.live;
+package com.kjj.cases.live.red;
 
 import com.alibaba.fastjson.JSON;
-import com.kjj.bean.*;
+import com.kjj.bean.red.*;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -14,7 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class LiveVistorRed implements AdminAuthorization{
+public class LiveVistorRed implements AdminAuthorization {
 
     public String confId_Red;
     public String visitor_red;

src/test/java/com/kjj/cases/live/QuestionAwards.java → src/test/java/com/kjj/cases/live/red/QuestionAwards.java

-package com.kjj.cases.live;
+package com.kjj.cases.live.red;
 
 
 import com.alibaba.fastjson.JSON;
 import com.kjj.bean.answer.*;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -16,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class QuestionAwards implements AdminAuthorization{
+public class QuestionAwards implements AdminAuthorization {
 
     public String confId_ques;
     public String confId_reward;

src/test/java/com/kjj/cases/live/User.java → src/test/java/com/kjj/cases/live/user/User.java

-package com.kjj.cases.live;
+package com.kjj.cases.live.user;
+import com.kjj.cases.live.admin.AdminAuthorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
@@ -10,7 +11,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class User implements AdminAuthorization{
+public class User implements AdminAuthorization {
 
     @BeforeClass
     public void setUp() { visitorAuth(); }