Merge branch 'feature/20210726-xmc' into 'master'

Feature/20210726 xmc

See merge request test-group/kejiji!81

src/test/java/com/kjj/bean/agent/CustOrigins.java

+package com.kjj.bean.agent;
+
+import lombok.Data;
+
+@Data
+public class CustOrigins {
+    private String avatar;
+    private String name;
+    private long UserId;
+}

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

@@ -71,6 +71,8 @@ public class BasicConfig {
     public static String AGENT_TKU = "T3gM31f18jCFEcfTyJdjfJAfSjDmKNMHfH7CvpLDC6UCLbai6Pc41VyJK3bXHe1wg7Hb5FGFZheeLvHjbE";
     // 基础线访客 TKU
     public static String VISITOR_TKU = "T3gM31f18jCGvqvoyJRzyMTdpcPDJWUJJP4VQje7p9sfC4HKmj5NJfCUkxusAyFb5SpkWS31srDTYr6KtV";
+    // 基础线访客(小雪人) TKU
+    public static String VISITOR1_TKU = "T3gM31f18jCFXzk692pKjJCqJZdDv8Nb3htkzNk983cPMspUQD6pVEn2FNMefM2nieKPicXG9c1tDg8qtN";
     // 访客的sids
     public static final String sids = "Kj21MjMwNTU";
     // 访客的userId(固定)
@@ -596,7 +598,7 @@ public class BasicConfig {
     public static final String ANIMATION_CONTENTID = "Kj21MzgzMTk";
     public static final String GAME_CONTENTID = "Kj21NjIxNTk";
     public static final String UPLOAD_CONTENTID = "Kj21NjA1NTE";
-    public static final String LOTTERY_CONTENTID = "Kj21MzQ3ODM";  // 营销工具抽奖暖冬大转盘素材ID
+    public static final String LOTTERY_CONTENTID = "Kj21MzQ3ODM";  // 抽奖
 
     // ***************   公共  ***************
     public static final String CREATE_USER = HOST + "/kjy/mp/autotest/create/user";
@@ -702,6 +704,30 @@ public class BasicConfig {
     // ***************   谁看过我  ***************
     public static final String WHOSAWME_CUSTCLUELISTV2 = HOST + "/kjy/mp/whoSawMe/custClueList/v2";
     public static final String WHOSAWME_CUSTCLUELISTV3 = HOST + "/kjy/mp/whoSawMe/custClueList/v3";
+    public static final String FORWARDHEADER = HOST + "/kjy/mp/whoSawMe/forward/header";
+    public static final String FORWARD_LIST = HOST + "/kjy/mp/whoSawMe/forward/list/v2";
+    public static final String FORWARD_CONTENTHEADER = HOST + "/kjy/mp/whoSawMe/forward/contentHeader";
+    public static final String FORWARD_VISITRECORD = HOST + "/kjy/mp/whoSawMe/forward/visitRecordList/v2";
+    public static final String SELLERUNREADMESSAGE = HOST + "/kjy/mp/custmarketing/sellerUnreadMsg";
+    public static final String CUSTOMERSEARCH = HOST + "/kjy/mp/whoSawMe/customerSearch";
+    public static final String SEARCHCUSTOMERBYCONTENT = HOST + "/kjy/mp/custmarketing/searchCustomer";
+
+    // ***************   客户信息  ***************
+    public static final String CUSTINFOHEADER = HOST + "/kjy/mp/whoSawMe/custInfoHeader";
+    public static final String CUSTINFO = HOST + "/kjy/mp/seller/v2/custInfo";
+    public static final String CLUESTATISTICS = HOST + "/kjy/mp/whoSawMe/clue/statistics";
+    public static final String CUSTRELATION = HOST + "/kjy/mp/seller/customer/relation";
+    public static final String CUSTOMERSTATISTICS = HOST + "/kjy/mp/whoSawMe/customerStatistics";
+    public static final String CUSTREADPERFERENCE = HOST + "/kjy/mp/seller/customer/getReadPerference";
+    public static final String CUSTSTATISTIC = HOST + "/kjy/mp/whoSawMe/customerInfo/statistic";
+    public static final String CUSTVISITLIST = HOST + "/kjy/mp/whoSawMe/customerInfo/list";
+    public static final String ISDISPLAYSPECIAL = HOST + "/kjy/mp/whoSawMe/isDisplaySpecialCustomerLayer";
+    public static final String CONTENTVISITRECORD = HOST + "/kjy/mp/whoSawMe/contentVisitRecord";
+    public static final String INVITATIONCHAIN = HOST + "/kjy/mp/whoSawMe/forward/forwardList";
+    // ***************   标签管理  ***************
+    public static final String TAG_ADDORUPDATE = HOST + "/kjy/mp/sellerTag/addOrUpdateTag";
+    public static final String TAG_GETLIST = HOST + "/kjy/mp/sellerTag/getTagList";
+    public static final String TAG_DELETE = HOST + "/kjy/mp/sellerTag/deleteTag";
 
 
     // ***************   文章   ***************
@@ -851,6 +877,6 @@ public class BasicConfig {
     public static final String MANAGER_addOrUpdate = MANAGER_HOST + "/kjy/manager/dailyPosters/addOrUpdate";
     public static final String MANAGER_dailyPostersDelete = MANAGER_HOST + "/kjy/manager/dailyPosters/delete";
     public static final String MANAGER_SELLERTEAM_REMOVEMEMBER = MANAGER_HOST + "/kjy/manager/sellerTeam/removeMember";
-    public static final String MANAGER_SELLERID_ENCODE = MANAGER_HOST + "/kjy/manager/testUser/encode";
+    public static final String MANAGER_ID_ENCODE = MANAGER_HOST + "/kjy/manager/testUser/encode";
     public static final String MANAGER_TKU_DECODE = MANAGER_HOST + "/kjy/manager/testUser/decryptTku";
 }

src/test/wechatTestNG.xml

@@ -32,11 +32,21 @@
             <class name="com.kjj.cases.assistant.DailyPaper"/>
         </classes>
     </test>
-    <test preserve-order="true" name = "谁看过我_团队看板">
+    <test preserve-order="true" name = "获取访客">
+        <classes>
+            <class name="com.kjj.cases.assistant.whoSawMe.ForwardAndRead"/>
+        </classes>
+    </test>
+    <test preserve-order="true" name = "谁看过我">
         <classes>
             <class name="com.kjj.cases.assistant.whoSawMe.WhoSawMe"/>
         </classes>
     </test>
+    <test preserve-order="true" name = "我的转发">
+        <classes>
+            <class name="com.kjj.cases.assistant.whoSawMe.MyForward"/>
+        </classes>
+    </test>
     <test preserve-order="true" name = "贺卡">
         <classes>
             <class name="com.kjj.cases.assistant.markettools.greetingCrad"/>