Merge branch 'master' into gifeature/20211209-gj

src/test/java/com/kjj/cases/assistant/whoSawMe/ForwardAndRead.java

@@ -14,6 +14,7 @@ import java.util.*;
 
 import static com.kjj.config.BasicConfig.BOSS_EDITCONFIG;
 import static com.kjj.config.BasicConfig.TKU_COOKIE_NAME;
+import static com.kjj.utils.BaseUtils.ssoLogin;
 import static com.kjj.utils.ThreadSleepUtils.sleep;
 
 
@@ -32,7 +33,7 @@ public class ForwardAndRead implements Authorization {
     @BeforeClass
     public void setUp() throws IOException{
         agent2Tku();
-        BaseUtils.ssoLogin();
+        ssoLogin();
     }
 
     // 获取二度访客起始线索数据
@@ -234,6 +235,7 @@ public class ForwardAndRead implements Authorization {
     // 解密tku
     public static HashMap<String, Long> decodeTku(String tku){
         // 登陆管理后台
+        ssoLogin();
         param = new HashMap<>();
         param = new HashMap<>();
         param.put(TKU_COOKIE_NAME, tku);

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

@@ -73,7 +73,7 @@ public class BaseUtils {
         boolean success = response.jsonPath().getBoolean("success");
         Assert.assertTrue(success,network.message(ROOKIEGUIDE_homeGuide,"接口返回失败",response.body().asString()));
         tku = response.jsonPath().getString("data");
-        network.agentCookies.put("tku", tku);
+        network.agentCookies.put(TKU_COOKIE_NAME, tku);
         System.out.println("小葡萄tku：" + tku);
         return userId;
     }

src/test/wechatTestNG.xml

@@ -76,6 +76,16 @@
             <class name="com.kjj.cases.assistant.markettools.GameLottery"/>
         </classes>
     </test>
+    <test preserve-order="true" name = "邀请函">
+        <classes>
+            <class name="com.kjj.cases.assistant.markettools.InvitationLetter"/>
+        </classes>
+    </test>
+    <test preserve-order="true" name = "使用攻略和设置中心">
+        <classes>
+            <class name="com.kjj.cases.assistant.menu.PersonalCenter"/>
+        </classes>
+    </test>
     <test preserve-order="true" name = "企业后台">
         <classes>
             <class name="com.kjj.cases.assistant.enterprise.Enterprise"/>