Merge remote-tracking branch 'origin/master' into gifeature/20220629-gj

# Conflicts:
#	src/test/java/com/oto/cases/otoseller/Manager.java

src/test/java/com/oto/cases/admin/Authorization.java

@@ -22,10 +22,6 @@ public interface Authorization {
     default void otoLeaderAuth() {
         network.agentCookies.put(otoLeaderCookieKey, otoLeaderCookieValue);
     }
-    //oto销售工作台手机端-销售
-    default void otoSellerTku() {
-        network.agentCookies.put("tku", OTO_TKU);
-    }
 
     //oto销售工作台-管理员
     default void otoManagerAuth() {
@@ -36,6 +32,9 @@ public interface Authorization {
     default void jjbManagerAuth() {network.agentCookies.put(JJBManagerCookieKey,JJBManagerCookieValue);}
 
 
+    //oto销售工作台手机端-销售
+    default void otoSellerTku() { network.agentCookies.put("tku", OTO_TKU); }
+
     /**
      * 集客助手相关授权
      */
@@ -53,4 +52,12 @@ public interface Authorization {
 
     }
 
+    /**
+     * 直播小程序相关授权
+     */
+    default void visitorAuth() {
+        network.agentCookies.put("authKey", visitorAuth);
+        System.out.println("用户AUTH_KEY：" + visitorAuth);
+    }
+
 }

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

@@ -15,7 +15,8 @@ public class BasicConfig {
   /**
    * 直播账号授权key
    */
-
+  //直播访客 （吉吉）ID：907
+  public static String visitorAuth ="LEH7epeHVDJWzhZ6DiexTHnfZVkhkqorGGQahRpVDVGzx7dWtF6qSrZH5EJekTCXsUVsZSSj1giy6aNiJSTN1JdVtPHgU";
   /**
    * 集客助手授权key
    */
@@ -58,7 +59,7 @@ public class BasicConfig {
   public static final String TEST_testerDelete = MOBILE_HOST  + "/test/user/test/delete";
   public static final String MANAGER_encryptAuthKey = MANAGER_HOST  + "/kjy/manager/testUser/encryptAuthKey";
 
-  //*************** OTO销售工作台 ***************
+  //*************** 公域引流 ***************
   public static final String MANAGER_oto_saveTag = MANAGER_HOST  + "/kjy/manager/oto/tag/save";
   public static final String MANAGER_oto_updateTag = MANAGER_HOST  + "/kjy/manager/oto/tag/update";
   public static final String MANAGER_oto_deleteTag = MANAGER_HOST +"/kjy/manager/oto/tag/delete";
@@ -90,7 +91,27 @@ public class BasicConfig {
   public static final String MANAGER_oto_accountBind = MANAGER_HOST + "/kjy/manager/oto/seller/account/bind";
   public static final String MANAGER_oto_accountUnbind = MANAGER_HOST + "/kjy/manager/oto/seller/account/unbind";
   public static final String MANAGER_oto_change = MANAGER_HOST + "/kjy/manager/oto/seller/phone/change";
+  public static final String MANAGER_supplier_save = MANAGER_HOST + "/kjy/manager/oto/supplier/save";
+  public static final String MANAGER_supplier_update = MANAGER_HOST + "/kjy/manager/oto/supplier/update";
+  public static final String MANAGER_supplier_list = MANAGER_HOST + "/kjy/manager/oto/supplier/list";
+  public static final String MANAGER_notification_list = MANAGER_HOST + "/kjy/manager/oto/notification/list";
+  public static final String MANAGER_product_listByAttachUs = MANAGER_HOST + "/kjy/manager/oto/product/listByAttachUs";
+  public static final String MANAGER_notification_save = MANAGER_HOST + "/kjy/manager/oto/notification/save";
+  public static final String MANAGER_notification_update = MANAGER_HOST + "/kjy/manager/oto/notification/update";
+  public static final String MANAGER_notification_signInvalid = MANAGER_HOST + "/kjy/manager/oto/notification/signInvalid";
+  public static final String MANAGER_supplier_listAll = MANAGER_HOST + "/kjy/manager/oto/supplier/listAll";
+  public static final String MANAGER_notification_getNotificationTemplate = MANAGER_HOST + "/kjy/manager/oto/notification/getNotificationTemplate";
+  public static final String MANAGER_account_saveOrUpdate = MANAGER_HOST + "/kjy/manager/oto/account/saveOrUpdate";
+  public static final String MANAGER_account_list = MANAGER_HOST + "/kjy/manager/oto/account/list";
+  public static final String MANAGER_link_save = MANAGER_HOST + "/kjy/manager/oto/link/mapping/save";
+  public static final String MANAGER_link_getStatus = MANAGER_HOST + "/kjy/manager/live/link/getStatus";
+  public static final String MANAGER_link_list = MANAGER_HOST + "/kjy/manager/oto/link/mapping/list";
+  public static final String MANAGER_link_listByPathKey = MANAGER_HOST + "/kjy/manager/oto/link/mapping/listByPathKey";
+  public static final String MANAGER_link_fakeUpdate = MANAGER_HOST + "/kjy/manager/oto/link/mapping/fakeUpdate";
+  public static final String MANAGER_account_fuzzyByAccountName = MANAGER_HOST + "/kjy/manager/oto/account/fuzzyByAccountName";
+  public static final String live_mapping_getTrueLinkInfo = MOBILE_HOST + "/kjy/live/oto/link/mapping/getTrueLinkInfo";
 
+  //*************** OTO销售工作台 ***************
   public static final String WORK_getCaptcha = WORK_HOST +  "/kjy/oto/manager/auth/captcha";
   public static final String WORK_login = WORK_HOST + "/kjy/oto/manager/auth/login";
   public static final String WORK_userInfo = WORK_HOST + "/kjy/oto/manager/auth/userInfo";
@@ -137,7 +158,13 @@ public class BasicConfig {
   public static final String WORK_statisticHeader= WORK_HOST + "/kjy/oto/manager/sellerTask/statistic/header";
   public static final String WORK_taskDetailsList= WORK_HOST + "/kjy/oto/manager/sellerTask/taskDetailsList";
 
-
+  //***********************销售工作台手机端**********************
+  public static final String PHONE_custConfSave = WORK_HOST + "/kjy/oto/manager/custconf/save";
+  public static final String PHONE_custConfList = WORK_HOST + "/kjy/oto/manager/custconf/list";
+  public static final String PHONE_updateStatus = WORK_HOST + "/kjy/oto/manager/custconf/updateStatus";
+  public static final String PHONE_getCustPhase = WORK_HOST + "/kjy/oto/manager/customer/getCustPhase";
+  public static final String PHONE_updateCustPhase = WORK_HOST + "/kjy/oto/manager/customer/updateCustPhase";
+  public static final String PHONE_delete = WORK_HOST +  "/kjy/oto/manager/custconf/delete";
   public static final String PHONE_customerList = PHONE_HOST + "/kjy/oto/manager/customer/list";
   public static final String PHONE_customerSave = PHONE_HOST + "/kjy/oto/manager/customer/introduce/save";
   public static final String PHONE_appointmentDetail = PHONE_HOST + "/kjy/oto/interview/appointment/detail";
@@ -162,7 +189,15 @@ public class BasicConfig {
   public static final String PHONE_getUnusualTypes = PHONE_HOST + "/kjy/oto/h5/v1/getUnusualTypes";
   public static final String PHONE_fail = HOST + "/kjy/oto/interview/authorize/fail";
   public static final String PHONE_getReservationList = HOST + "/kjy/pub/form/getReservationList";
+  public static final String PHONE_listCustInterConf = PHONE_HOST + "/kjy/oto/interview/listCustInterConf";
+  public static final String PHONE_checkCustPhase = PHONE_HOST + "/kjy/oto/interview/checkCustPhase";
+  public static final String PHONE_notification_getDetail = PHONE_HOST +"/kjy/oto/notification/getDetail";
+  public static final String PHONE_notification_updateSignatureInfo = PHONE_HOST + "/kjy/oto/notification/updateSignatureInfo";
+  public static final String PHONE_paper_getReportFlag = PHONE_HOST + "/kjy/oto/seller/daily/paper/getReportFlag";
+  public static final String PHONE_paper_getCustomers = PHONE_HOST + "/kjy/oto/seller/daily/paper/getCustomers";
+  public static final String PHONE_paper_updateCustomer = PHONE_HOST + "/kjy/oto/seller/daily/paper/updateCustomer";
 
+  //******************专用测试接口****************************8
   public static final String WORK_verifyCode = WORK_HOST + "/kjy/oto/auto/test/verifyCode";
   public static final String WORK_delCust = WORK_HOST + "/kjy/oto/auto/test/delCust";
   public static final String WORK_delPubFormRecord = WORK_HOST + "/kjy/oto/auto/test/delPubFormRecord";

src/test/java/com/oto/utils/DingTalkUtils.java

@@ -23,7 +23,7 @@ public class DingTalkUtils {
         //测试结果
         context = "【接口自动化测试结果反馈】\n"
                 + context
-                + "报告地址: http://10.172.58.199/view/kkk/job/kejiji_interface/HTML_20Report\n";
+                + "报告地址: http://10.172.58.199/view/kkk/job/oto/HTML_20Report\n";
         System.out.println(context);
 
         Map<String, Object> contentParams = new HashMap<String, Object>();

src/test/java/com/oto/utils/IdConvertBase64Enum.java

-package com.oto.utils;
-
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author lizhi
- * @date 2020/4/9 11:36 AM
- */
-public enum IdConvertBase64Enum {
-
-    /**
-     * 注意，code只能是两位
-     */
-    DEF("j2", "默认类型"),
-    TRANS("t3", "短链接服务"),
-    ;
-
-    private String code;
-
-    private String desc;
-
-    IdConvertBase64Enum(String code, String desc) {
-        this.code = code;
-        this.desc = desc;
-    }
-
-    public String getCode() {
-        return "K"+ code;
-    }
-
-    private static final Map<String, IdConvertBase64Enum> ENUM_MAP = new HashMap<>();
-
-    static{
-        for(IdConvertBase64Enum lengthEnum : values()){
-            ENUM_MAP.put(lengthEnum.getCode(), lengthEnum);
-        }
-    }
-
-    public static IdConvertBase64Enum getByCode(String code) {
-        if (code == null) {
-            return null;
-        }
-        return ENUM_MAP.get(code);
-    }
-}
\ No newline at end of file

src/test/java/com/oto/utils/IdMakeUtil.java

@@ -78,14 +78,4 @@ public class IdMakeUtil implements Authorization {
         return decodeId;
     }
 
-    public static String encodingId(Long id, IdConvertBase64Enum base64Enum) {
-        if (id == null || base64Enum == null || base64Enum.getCode().length() != 3) {
-            return null;
-        }
-        id = (id << 3) ^ 7;
-        String encode = encoder.encodeToString(Long.toString(id).getBytes());
-        String replace = encode.replace("=", "");
-        return base64Enum.getCode() + (encode.length() - replace.length()) + replace;
-    }
-
 }

src/test/java/com/oto/utils/JmeterAccountFile.java

@@ -21,14 +21,6 @@ public class JmeterAccountFile {
     public static void main(String[] args) {
 //        String path = String.valueOf(JmeterAccountFile.class.getResource("/"));
 //        accountFile(path);
-        otoCookieMaker();
-    }
-
-    /**
-     * 生成otoCookie，仅用于压力测试文件
-     */
-    public static void otoCookieMaker() {
-
     }
 
     //仅用于生成直播账号Authkey文件

src/test/java/com/oto/utils/NetworkUtils.java

@@ -27,7 +27,7 @@ public class NetworkUtils {
         //cookies中的tku
         agentCookies.put("tku",AGENT_TKU);
         //多场景测试标志
-//        agentCookies.put("_duibaServiceGroupKey","miria-2652");
+//        agentCookies.put("_duibaServiceGroupKey","miria-3132");
         //json类型的headers
         agentHeaders.put("Content-Type","application/json");
         //二进制文件的headers

src/test/testNG.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
-<suite name="客集集" verbose="1" thread-count="3">
+<suite name="oto" verbose="1" thread-count="3">
     <suite-files>
 
         <suite-file path="workTestNG.xml"></suite-file>

src/test/workTestNG.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="保险OTO" verbose="1" thread-count="3">
-    <test preserve-order="true" name="销售管理">
+    <test preserve-order="true" name="管理后台-公域引流">
         <classes>
             <class name="com.oto.cases.otoseller.Manager"/>
         </classes>