update

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

-package com.kjj.cases.live.admin;
+package com.kjj.cases.admin;
+import com.kjj.utils.BaseUtils;
 import com.kjj.utils.NetworkUtils;
 import static com.kjj.config.BasicConfig.*;
 
+
 /**
  * 管理员授权
  * @author 吉吉，ID：907
  */
-public interface AdminAuthorization {
+public interface Authorization {
 
     NetworkUtils network = NetworkUtils.getInstance();
 
@@ -16,6 +18,25 @@ public interface AdminAuthorization {
         System.out.println("用户AUTH_KEY："+ADMIN_KEY);
     }
 
+
+    /**
+     * 集客助手授权
+     */
+    //代理人
+    default void agentTku() {
+        AGENT_TKU = BaseUtils.createTku();
+        network.agentCookies.put("tku", AGENT_TKU);
+        System.out.println("代理人tku：" + AGENT_TKU);
+
+    }
+
+    // 获取访客tku
+    default void userTku() {
+        AGENT_TKU = BaseUtils.createTku();
+        VISITOR_TKU = BaseUtils.getTku(VISITOR_USERID);
+        System.out.println("访客tku：" + VISITOR_TKU);
+    }
+
     /**
      * 代理人(yl)授权，ID：826
      */

src/test/java/com/kjj/cases/basics/Article.java

@@ -2,7 +2,7 @@ package com.kjj.cases.basics;
 
 import static com.kjj.config.BasicConfig.*;
 
-import com.kjj.utils.NetworkUtils;
+import com.kjj.cases.admin.Authorization;
 import io.restassured.response.Response;
 
 import org.testng.Assert;
@@ -13,8 +13,8 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-public class Article {
-    private static final NetworkUtils network = NetworkUtils.getInstance();
+public class Article  implements Authorization {
+//    private static final NetworkUtils network = NetworkUtils.getInstance();
     public String sid;               //  加密的销售ID
     public String articleContentId;  // 文章的contentId
     public String scid;              // getScid后的文章id
@@ -22,11 +22,14 @@ public class Article {
     public String visitId;           // 访问记录ID
 
     @BeforeClass
-    public void setUp() { }
+    public void setUp() {
+        agentTku();
+        userTku();
+    }
 
     //文章内容页
     @Test(description="代理人_种草爆文列表页",priority = 1)
-    public void 代理人_种草爆文列表页() throws IOException {
+    public void 代理人_种草爆文列表页() {
         Response response = network.getResponse(ARTICLE_GETEXPLOSIONCONTENTLIST);
         articleContentId = response.jsonPath().getString("data[0].contentId");
         Assert.assertNotNull(articleContentId,network.message(ARTICLE_GETEXPLOSIONCONTENTLIST,"获取爆款素材文章失败",response.body().asString()));
@@ -34,7 +37,7 @@ public class Article {
 
     //文章内容页
     @Test(description="代理人_文章内容页",priority = 2)
-    public void 代理人_文章内容页() throws IOException{
+    public void 代理人_文章内容页() {
         //根据ContentId获取Scid
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("contentId",articleContentId);

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

 package com.kjj.cases.live.FreeReward;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
@@ -8,7 +8,7 @@ import org.testng.annotations.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-public class FreeReward implements AdminAuthorization {
+public class FreeReward implements Authorization {
     public String configId;
 
     @Test(description = "查询免费领福利", priority = 1)

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

@@ -2,29 +2,25 @@ package com.kjj.cases.live.agent;
 
 import com.alibaba.fastjson.JSON;
 import com.kjj.bean.agent.AgentBean;
-import com.kjj.bean.agent.AgentCard;
 import com.kjj.bean.agent.AgentEndList;
 import com.kjj.bean.agent.AgentVideo;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
-import io.restassured.path.json.JsonPath;
 import io.restassured.response.Response;
 import org.apache.commons.lang3.RandomUtils;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
 import static com.kjj.config.BasicConfig.*;
-import static com.kjj.config.BasicConfig.MOBILE_ClueList;
 
-public class Agent implements AdminAuthorization {
+public class Agent implements Authorization {
 
     @BeforeClass
     public void setUp() { agentAuth(); }

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

 package com.kjj.cases.live.agent;
 
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
@@ -14,7 +14,7 @@ import java.util.Map;
 import static com.kjj.config.BasicConfig.MOBILE_ClueList;
 import static com.kjj.config.BasicConfig.MOBILE_ClueNum;
 
-public class LiveAgent implements AdminAuthorization {
+public class LiveAgent implements Authorization {
 
     /**
      * 直播中查看线索

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

 package com.kjj.cases.live.agent;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
@@ -12,8 +12,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.kjj.config.BasicConfig.*;
-public class LiveBefore implements AdminAuthorization {
+public class LiveBefore implements Authorization {
     @BeforeClass
     public void setUp() {
         agentAuth(); }

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

 package com.kjj.cases.live.agent;
 
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
-import java.io.IOException;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import static com.kjj.config.BasicConfig.*;
-
-public class LiveLater implements AdminAuthorization {
+public class LiveLater implements Authorization {
 
     @BeforeClass
     public void setUp() {

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

 package com.kjj.cases.live.anchor;
 
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import io.restassured.response.Response;
@@ -11,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 Authorization {
 
 
         @BeforeClass

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

@@ -3,7 +3,7 @@ package com.kjj.cases.live.anchor;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kjj.bean.resources.*;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -17,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class LiveVisitors implements AdminAuthorization
+public class LiveVisitors implements Authorization
 {
 
 

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

 package com.kjj.cases.live.anchor;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.ThreadSleepUtils;
@@ -9,7 +9,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import java.util.HashMap;
 import java.util.Map;
-public class OpenLive implements AdminAuthorization {
+public class OpenLive implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/cases/live/answer/Answer.java

@@ -2,14 +2,10 @@ package com.kjj.cases.live.answer;
 
 import com.alibaba.fastjson.JSON;
 import com.kjj.bean.answer.*;
-import com.kjj.bean.manager.AnswerBean;
-import com.kjj.bean.manager.AnswerListBean;
-import com.kjj.bean.manager.TeamAssignmentList;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
-import com.kjj.utils.JsonUtil;
 import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
@@ -18,7 +14,7 @@ import org.testng.annotations.Test;
 
 import java.util.*;
 
-public class Answer implements AdminAuthorization {
+public class Answer implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/cases/live/choice/Choice.java

@@ -5,7 +5,7 @@ import com.kjj.bean.choice.Ansernum;
 import com.kjj.bean.choice.ChoiceList;
 import com.kjj.bean.choice.GetChoiceArray;
 import com.kjj.bean.choice.GetChoiceQues;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class Choice implements AdminAuthorization {
+public class Choice implements Authorization {
 
     public String id;
     public String answerid;

src/test/java/com/kjj/cases/live/flipCard/FlipCard.java

 package com.kjj.cases.live.flipCard;
 
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.ThreadSleepUtils;
@@ -11,7 +11,7 @@ import org.testng.annotations.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-public class FlipCard implements AdminAuthorization {
+public class FlipCard implements Authorization {
 
     public String cardConfId;
     public String shareSign;

src/test/java/com/kjj/cases/live/guess/LiveGuess.java

 package com.kjj.cases.live.guess;
 
 import com.kjj.bean.manager.GuessList;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class LiveGuess implements AdminAuthorization {
+public class LiveGuess implements Authorization {
     public List<GuessList> confId;
     public String ConfId;
     public String shareSign;

src/test/java/com/kjj/cases/live/liveConfig/LiveCase.java

 package com.kjj.cases.live.liveConfig;
 
 import com.kjj.bean.manager.CaseList;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class LiveCase implements AdminAuthorization {
+public class LiveCase implements Authorization {
 
     @BeforeClass
     public void setUp() {

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

@@ -4,7 +4,7 @@ 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.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.utils.BaseUtils;
 import com.kjj.utils.JsonUtil;
@@ -15,7 +15,7 @@ import org.testng.annotations.Test;
 
 import java.util.*;
 
-public class LiveMaterial implements AdminAuthorization {
+public class LiveMaterial implements Authorization {
     @BeforeClass
     public void setUp() {
         BaseUtils.ssoLogin();

src/test/java/com/kjj/cases/live/liveConfig/Paster.java

 package com.kjj.cases.live.liveConfig;
 
-import com.kjj.bean.manager.CaseList;
 import com.kjj.bean.manager.UsedList;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -12,12 +11,11 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.xml.crypto.Data;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class Paster implements AdminAuthorization {
+public class Paster implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/cases/live/liveConfig/SaveLive.java

@@ -6,8 +6,7 @@ import com.kjj.bean.answer.AddWelfareConf;
 import com.kjj.bean.answer.RewardList;
 import com.kjj.bean.lottery.ConfIdList;
 import com.kjj.bean.manager.*;
-import com.kjj.cases.live.admin.AdminAuthorization;
-import com.kjj.cases.live.treasure.TimeRed;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -21,7 +20,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import java.util.*;
-public class SaveLive implements AdminAuthorization {
+public class SaveLive implements Authorization {
     public String liveID;
     public String EncodeLiveID;
     public long welfareConfId;

src/test/java/com/kjj/cases/live/liveConfig/Share.java

 package com.kjj.cases.live.liveConfig;
 
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -12,7 +12,7 @@ import org.testng.annotations.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-public class Share implements AdminAuthorization {
+public class Share implements Authorization {
     @BeforeClass
     public void setUp() {
         BaseUtils.ssoLogin();

src/test/java/com/kjj/cases/live/liveConfig/Team.java

 package com.kjj.cases.live.liveConfig;
 
 import com.kjj.bean.manager.TeamList;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.utils.BaseUtils;
 import com.kjj.utils.JsonUtil;
@@ -14,7 +14,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class Team  implements AdminAuthorization {
+public class Team  implements Authorization {
     public List<TeamList> id;
 
     @BeforeClass

src/test/java/com/kjj/cases/live/liveConfig/Video.java

 package com.kjj.cases.live.liveConfig;
 import com.kjj.bean.manager.VideoBean;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.utils.BaseUtils;
 import com.kjj.utils.JsonUtil;
@@ -13,7 +13,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class Video implements AdminAuthorization {
+public class Video implements Authorization {
 
     @BeforeClass
     public void setUp() { BaseUtils.ssoLogin(); }

src/test/java/com/kjj/cases/live/liveConfig/WinningRules.java

@@ -4,7 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.kjj.bean.lottery.ConfIdList;
 import com.kjj.bean.manager.RuleBean;
 import com.kjj.bean.manager.SaveLimitBean;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -19,7 +19,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class WinningRules implements AdminAuthorization {
+public class WinningRules implements Authorization {
     public Integer taskId;
     public long Id;
     public List<ConfIdList> confIdList;

src/test/java/com/kjj/cases/live/liveConfig/spec.java

 package com.kjj.cases.live.liveConfig;
 
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -12,7 +12,7 @@ import org.testng.annotations.Test;
 import java.util.HashMap;
 import java.util.Map;
 
-public class spec implements AdminAuthorization {
+public class spec implements Authorization {
     @BeforeClass
     public void setUp() {
         BaseUtils.ssoLogin();

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

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

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

 package com.kjj.cases.live.lottery;
 import com.alibaba.fastjson.JSON;
 import com.kjj.bean.lottery.ConfIdList;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -16,7 +16,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 
-public class Lottery implements AdminAuthorization {
+public class Lottery implements Authorization {
 
     public List<ConfIdList> List_ConfId;
     public String shareSign;

src/test/java/com/kjj/cases/live/lotteryCode/LotteryCode.java

 package com.kjj.cases.live.lotteryCode;
 
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.ThreadSleepUtils;
@@ -13,7 +13,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class LotteryCode implements AdminAuthorization {
+public class LotteryCode implements Authorization {
     public String shareSign;
 
     @Test(description = "代理人A分享直播间", priority = 1)

src/test/java/com/kjj/cases/live/lotteryCode/SignIn.java

 package com.kjj.cases.live.lotteryCode;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.MyWebSocketUtil;
@@ -18,7 +18,7 @@ import java.util.Objects;
 import static com.kjj.config.BasicConfig.VISITORKEY;
 
 
-public class SignIn implements AdminAuthorization {
+public class SignIn implements Authorization {
     @BeforeClass
     public void setUp() { visitorAuth(); }
 

src/test/java/com/kjj/cases/live/question/Question.java

@@ -5,7 +5,7 @@ import com.kjj.bean.issue.QuestionList;
 import com.kjj.bean.issue.SpokeList;
 import com.kjj.bean.issue.Spolist;
 import com.kjj.bean.issue.issuelist;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.JsonUtil;
@@ -20,7 +20,7 @@ import java.util.List;
 import java.util.Map;
 
 
-public class Question implements AdminAuthorization {
+public class Question implements Authorization {
 
     List<String> questionIds = new ArrayList<>();
     public String questionId;

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

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

src/test/java/com/kjj/cases/live/signing/AgentOpen.java

 package com.kjj.cases.live.signing;
 
 import com.kjj.bean.manager.SaveRewardConfig;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class AgentOpen implements AdminAuthorization {
+public class AgentOpen implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/cases/live/signing/NuclearAward.java

@@ -2,7 +2,7 @@ package com.kjj.cases.live.signing;
 
 import com.alibaba.fastjson.JSON;
 import com.kjj.bean.manager.SaveRewardConfig;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -16,7 +16,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class NuclearAward implements AdminAuthorization {
+public class NuclearAward implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/cases/live/signing/SignAward.java

 package com.kjj.cases.live.signing;
 
 import com.kjj.bean.manager.SaveRewardConfig;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class SignAward implements AdminAuthorization {
+public class SignAward implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/cases/live/signing/UserOpen.java

 package com.kjj.cases.live.signing;
 
 import com.kjj.bean.manager.SaveRewardConfig;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -15,7 +15,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class UserOpen implements AdminAuthorization {
+public class UserOpen implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/cases/live/treasure/TimeRed.java

 package com.kjj.cases.live.treasure;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.kjj.bean.manager.RedList;
 import com.kjj.bean.red.RedConf;
 import com.kjj.bean.resources.ResourceForm;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -18,7 +15,7 @@ import org.testng.annotations.Test;
 
 import java.util.*;
 
-public class TimeRed  implements AdminAuthorization {
+public class TimeRed  implements Authorization {
 
     @BeforeClass
     public void setUp() { BaseUtils.ssoLogin(); }

src/test/java/com/kjj/cases/live/treasure/Treasure.java

@@ -2,29 +2,22 @@ package com.kjj.cases.live.treasure;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.kjj.bean.manager.TreasureAward;
-import com.kjj.bean.manager.TreasureCode;
-import com.kjj.bean.manager.TreasureRed;
-import com.kjj.bean.manager.WelfareList;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
-import com.kjj.utils.JsonUtil;
 import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
-import org.apache.commons.lang3.BooleanUtils;
 import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import javax.xml.crypto.Data;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class Treasure implements AdminAuthorization {
+public class Treasure implements Authorization {
 
     @BeforeClass
     public void setUp() { BaseUtils.ssoLogin(); }

src/test/java/com/kjj/cases/live/treasure/TreasureTime.java

@@ -2,8 +2,7 @@ package com.kjj.cases.live.treasure;
 
 import com.alibaba.fastjson.JSON;
 import com.kjj.bean.lottery.CondDetail;
-import com.kjj.bean.manager.*;
-import com.kjj.cases.live.admin.AdminAuthorization;
+import com.kjj.cases.admin.Authorization;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
 import com.kjj.utils.BaseUtils;
@@ -18,7 +17,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class TreasureTime implements AdminAuthorization {
+public class TreasureTime implements Authorization {
 
     @BeforeClass
     public void setUp() {

src/test/java/com/kjj/utils/BaseUtils.java

@@ -12,12 +12,6 @@ import static com.kjj.config.BasicConfig.*;
 public class BaseUtils {
     private static final NetworkUtils network = NetworkUtils.getInstance();
 
-//    public static String createAuthKey(){
-//        return "LEH7epeHVDJWzhZ6DiexTHnsxraeviLJA9bNdknyzwR7cXT557KHZA1Q7zWnN9N2E3vHcFrt8S3xhGApKa3NmE7oaxyXz";
-//    }
-//    public static String agentAuthKey(){
-//        return "LEH7epeHVDJWzhZ6DiexTHnsxs8JtX5mzCVwq1X5TSe6JEJMzL51umD812fWb8P5rLt5mw9SfPzLp6uwthsFnXAhKCYLq";
-//    }
 
     /**
      * 登录管理后台