Merge branch 'Feature/20211125-gxh' into 'master'

1.在新手引导中加入资料包优化、互助问答优化后的整体创建绑定线索流程。

See merge request test-group/kejiji!169

src/test/java/com/kjj/cases/assistant/markettools/InvitationLetter.java

@@ -487,7 +487,7 @@ public class InvitationLetter implements Authorization{
         Assert.assertTrue(size>0,network.message(params,GREETING_findByType,"标签列表为空",response.body().asString()));
     }
 
-    @Test(description = "代理人_获取趣味测试列表",priority = 25)
+    @Test(description = "代理人_获取趣味测试列表",priority = 26)
     public void 代理人_获取趣味测试列表(){
         HashMap<String,Object> params = new HashMap<String,Object>();
         params.put("pageIndex", 1);
@@ -502,7 +502,7 @@ public class InvitationLetter implements Authorization{
         Assert.assertTrue(size>0,network.message(params,GAME_answerPageList,"趣味测试列表为空",response.body().asString()));
     }
 
-    @Test(description = "代理人_获取测试线索列表",priority = 25)
+    @Test(description = "代理人_获取测试线索列表",priority = 27)
     public void 代理人_获取测试线索列表(){
         HashMap<String,Object> params = new HashMap<String,Object>();
         Response response = network.getResponse(params,GAME_clueList);

src/test/java/com/kjj/cases/assistant/pay/Cashback.java

@@ -70,7 +70,6 @@ public class Cashback implements Authorization {
         callbackParams.put("payTradeNo", "test");
         response = network.getResponse(callbackParams, PAY_CALLOUT);
         boolean result = response.jsonPath().getBoolean("data");
-        response.body().prettyPrint();
         Assert.assertTrue(result, network.message(callbackParams, PAY_CALLOUT, "mock微信支付回调成功,但我们订单处理失败", response.body().asString()));
 
 

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

@@ -956,6 +956,5 @@ public class WhoSawMe implements Authorization {
         String sCid = response.jsonPath().getString("data");
         Assert.assertNotNull(reportScid, network.message(param,GAME_consult,"获取sCid失败",response.body().asString()));
 
-        visitor2Tku();
     }
 }

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

@@ -3,20 +3,26 @@ package com.kjj.cases.live.anchor;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.kjj.bean.manager.EvaluationDetail;
+import com.kjj.bean.manager.Material;
 import com.kjj.bean.resources.*;
 import com.kjj.cases.admin.Authorization;
 import com.kjj.cases.live.liveConfig.LiveMaterial;
+import com.kjj.cases.live.treasure.TimeRed;
 import com.kjj.config.BasicConfig;
 import com.kjj.constants.LiveConstants;
+import com.kjj.utils.BaseUtils;
 import com.kjj.utils.IdMakeUtil;
 import com.kjj.utils.JsonUtil;
 import com.kjj.utils.ThreadSleepUtils;
 import io.restassured.response.Response;
 import org.testng.Assert;
+import org.testng.annotations.BeforeTest;
 import org.testng.annotations.Test;
 
 import java.util.*;
 
+import static com.kjj.utils.ThreadSleepUtils.sleep;
+
 public class LiveVisitors implements Authorization
 {
     public String confId_imageText;
@@ -32,6 +38,12 @@ public class LiveVisitors implements Authorization
     public static String resourceReceiveRecordId;
     public static String freeForEvaReceiveRecordId;
 
+    @BeforeTest
+    public void setUp(){
+        BaseUtils.ssoLogin();
+        TimeRed.offResource();
+    }
+
     /*助播端端权益列表*/
     @Test(description = "助播端权益列表", priority = 1)
     public void 助播端权益列表()
@@ -42,7 +54,6 @@ public class LiveVisitors implements Authorization
         Response response = network.getResponse(params, BasicConfig.MOBILE_ResourceList);
         List<ResourcePushList> list = JsonUtil.parseResponseToListBean(response, ResourcePushList.class);
         this.PushList=list;
-        System.out.println(list);
         Assert.assertNotNull(list, network.message(params, BasicConfig.MOBILE_ResourceList, "查询主播端权益列表失败", response.body().asString()));
 
     }
@@ -58,7 +69,6 @@ public class LiveVisitors implements Authorization
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.postResponse(params, BasicConfig.MOBILE_ResourceOn);
         boolean data = response.jsonPath().getBoolean("data");
-        System.out.println(data);
         Assert.assertNotNull(data, network.message(params, BasicConfig.MOBILE_ResourceOn, "主播端上架权益失败", response.body().asString()));
     }
 
@@ -67,13 +77,11 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端权益列表", priority = 3)
     public void 访客端权益列表()
     {
-        ThreadSleepUtils.sleep(3000);
+        sleep(10000);
         visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_Resource);
-        System.out.println(params);
-        System.out.println(response.body().asString());
         encodeEvaluationId = IdMakeUtil.managerEncodingId(LiveMaterial.evaluationId);
         List<LiveVisitor> liveVisitors = JsonUtil.parseResponseToListBean(response, LiveVisitor.class);
         LiveVisitor one = liveVisitors.get(0);
@@ -210,7 +218,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客端获取测试权益详情", priority = 10)
     public void 访客端获取测试权益详情() {
         visitorAuth1();
-        ThreadSleepUtils.sleep(3000);
+        sleep(3000);
         Map<String, Object> evaDetailPar = new HashMap<>();
         evaDetailPar.put("confId", confId_eva);
         evaDetailPar.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -245,7 +253,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "未提交所有问题答案", priority = 12)
     public void 未提交所有问题答案() {
-        ThreadSleepUtils.sleep(3000);
+        sleep(3000);
         Map<String, Object> submitPar = getEvaSubmitPar(LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()), confId_eva, LiveMaterial.evaluationId, LiveMaterial.getEvaDetails(LiveMaterial.evaluationId).getQuestions().size() - 1, 1, false, true);
         Response submitRes = network.postResponse(submitPar, BasicConfig.MOBILE_evaluationSubmit);
         try {
@@ -261,7 +269,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "提交不匹配的问题和答案", priority = 13)
     public void 提交不匹配的问题和答案() {
-        ThreadSleepUtils.sleep(3000);
+        sleep(3000);
         Map<String, Object> submitPar = getEvaSubmitPar(LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()), confId_eva, LiveMaterial.evaluationId, LiveMaterial.getEvaDetails(LiveMaterial.evaluationId).getQuestions().size(), 1, true, true);
         Response submitRes = network.postResponse(submitPar, BasicConfig.MOBILE_evaluationSubmit);
         try {
@@ -277,7 +285,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "不提交选项", priority = 14)
     public void 不提交选项() {
-        ThreadSleepUtils.sleep(3000);
+        sleep(3000);
         Map<String, Object> submitPar = getEvaSubmitPar(LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()), confId_eva, LiveMaterial.evaluationId, LiveMaterial.getEvaDetails(LiveMaterial.evaluationId).getQuestions().size(), 1, false, false);
         Response submitRes = network.postResponse(submitPar, BasicConfig.MOBILE_evaluationSubmit);
         try {
@@ -292,7 +300,7 @@ public class LiveVisitors implements Authorization
 
     @Test(description = "正常提交答案", priority = 15)
     public void 正常提交答案() {
-        ThreadSleepUtils.sleep(3000);
+        sleep(3000);
         Map<String, Object> submitPar = getEvaSubmitPar(LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()), confId_eva, LiveMaterial.evaluationId, LiveMaterial.getEvaDetails(LiveMaterial.evaluationId).getQuestions().size(), 1, false, true);
         Response submitRes = network.postResponse(submitPar, BasicConfig.MOBILE_evaluationSubmit);
         try {
@@ -417,7 +425,7 @@ public class LiveVisitors implements Authorization
     public void 代理人端权益列表查询()
     {
         agentAuth();
-        ThreadSleepUtils.sleep(3000);
+        sleep(3000);
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         Response response = network.getResponse(params, BasicConfig.MOBILE_Resource);
@@ -513,7 +521,7 @@ public class LiveVisitors implements Authorization
     public void 获取推送列表()
     {
         adminAuth();
-        ThreadSleepUtils.sleep(1000);
+        sleep(1000);
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         params.put("confId", this.PushList.get(5).getConfId());
@@ -529,7 +537,7 @@ public class LiveVisitors implements Authorization
     @Test(description = "访客获取贴片信息", priority = 30)
     public void 访客获取贴片信息()
     {
-        ThreadSleepUtils.sleep(1000);
+        sleep(1000);
         visitorAuth1();
         Map<String, Object> params = new HashMap<>();
         params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));

src/test/java/com/kjj/cases/live/customer/PersonalPage.java

@@ -26,6 +26,7 @@ public class PersonalPage implements Authorization {
     private String encodeCompanyId; // 加密的公司id
     private String welfareRecordId; // 福利领取记录id
     private String sourceRecordId; // 资料领取记录id
+    private String testRecordId; // 资料领取记录id
 
     @BeforeClass
     public void setUp(){
@@ -66,7 +67,6 @@ public class PersonalPage implements Authorization {
     public void 访客查看我的资料() {
         System.out.println("params:" + params);
         Response response = network.getResponse(params, BasicConfig.USER_resourceList);
-        System.out.println("访客资料列表: " + response.body().asString());
         Assert.assertTrue(response.jsonPath().getBoolean("success"), network.message(params, BasicConfig.USER_resourceList, "接口调用失败", response.body().asString()));
         List<ResourceList> resourceLists = JsonUtil.parseResponseToPageBean(response, ResourceList.class);
         ResourceList resourceList = resourceLists.get(0);
@@ -75,6 +75,15 @@ public class PersonalPage implements Authorization {
         String liveId = resourceList.getLiveId();
         Assert.assertEquals(liveId, LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()), network.message(params, BasicConfig.USER_resourceList, "资料领取直播id不正确", response.body().asString()));
 
+        for (ResourceList resource:resourceLists
+             ) {
+            if(resource.getType() == 23){
+                testRecordId = resource.getRecordId();
+                System.out.println(testRecordId);
+                break;
+            }
+        }
+
 
         companyName = resourceList.getCompanyName(); // 获取领取资料的公司名称
         System.out.println(companyName);
@@ -122,7 +131,7 @@ public class PersonalPage implements Authorization {
         Response liveOnListRes = network.getResponse(params, BasicConfig.USER_getLiveList);
         Assert.assertTrue(liveOnListRes.jsonPath().getBoolean("success"), network.message(params, BasicConfig.USER_getLiveList, "接口请求失败", liveOnListRes.body().asString()));
         boolean hasLiveOn = true;
-        try {
+        try{
             List liveList = liveOnListRes.jsonPath().getList("data.list");
             if (liveList.size() == 0){
                 hasLiveOn = false;
@@ -218,4 +227,19 @@ public class PersonalPage implements Authorization {
             e.printStackTrace();
         }
     }
+
+    @Test(description = "查看测试详情", priority = 15)
+    public void 查看测试详情() {
+        params.clear();
+        params.put("recordId", testRecordId);
+        params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
+        Response resourceDetailRes = network.getResponse(params, BasicConfig.USER_getTestResourceDetail);
+        Assert.assertTrue(resourceDetailRes.jsonPath().getBoolean("success"), network.message(params, BasicConfig.USER_getTestResourceDetail, "接口请求失败", resourceDetailRes.body().asString()));
+        try {
+            String companyName = resourceDetailRes.jsonPath().getString("data.companyName");
+            Assert.assertEquals(companyName, "【勿动】自动化专用公司", network.message(params, BasicConfig.USER_getTestResourceDetail, "领取记录对应的公司错误", resourceDetailRes.body().asString()));
+        }catch (NullPointerException e){
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -26,7 +26,7 @@ public class LiveBinding implements Authorization {
 
     public String shareSign=null;
 
-    public void binding(String shareParam) {
+    public static void binding(String shareParam) {
         Map<String, Object> bindingParam = new HashMap<>();
         bindingParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         bindingParam.put("shareSign",shareParam);
@@ -35,7 +35,7 @@ public class LiveBinding implements Authorization {
         Assert.assertTrue(success, network.message(bindingParam, BasicConfig.MOBILE_binding, "绑定失败", bindingRes.body().asString()));
     }
 
-    public void token() {
+    public static void token() {
         ThreadSleepUtils.sleep(2000);
         Map<String, Object> tokenParam = new HashMap<>();
         tokenParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
@@ -44,7 +44,7 @@ public class LiveBinding implements Authorization {
         Assert.assertTrue(type==3, network.message(tokenParam, BasicConfig.MOBILE_Token, "未获取到绑定结果", tokenRes.body().asString()));
     }
 
-    public String share() {
+    public static String share() {
         Map<String, Object> signParam = new HashMap<>();
         signParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         signParam.put("shareType",1);

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

@@ -36,7 +36,6 @@ public class GoldenEgg implements Authorization {
     public String shareSign;
     public JSONObject treasureConf;
     public String interactConfId;
-    public LiveBinding liveBinding = new LiveBinding();
     public List<WelfareList> id;
 
     /**
@@ -45,15 +44,15 @@ public class GoldenEgg implements Authorization {
     @Test(description = "代理人绑定", priority = 1)
     public void 代理人绑定() {
         agentAuth();
-        liveBinding.binding(this.shareSign);
-        this.shareSign = liveBinding.share();
+        LiveBinding.binding(this.shareSign);
+        this.shareSign = LiveBinding.share();
     }
 
     @Test(description = "代理人A与访客A邀请关系绑定", priority = 2)
     public void 代理人A与访客A邀请关系绑定() {
         visitorAuth1();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
     @Test(description = "查询配置奖品列表", priority = 3)
     public void 查询配置奖品列表() {
@@ -183,8 +182,8 @@ public class GoldenEgg implements Authorization {
     @Test(description = "代理人A与访客A邀请关系绑定", priority = 11)
     public void 代理人A与访客G邀请关系绑定() {
         visitorAuth7();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "黑名单用户仅不可砸中实物", priority = 12)
@@ -243,8 +242,8 @@ public class GoldenEgg implements Authorization {
     @Test(description = "代理人A与访客B邀请关系绑定", priority = 14)
     public void 代理人A与访客B邀请关系绑定() {
         visitorAuth7();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "第2个访客B砸金蛋砸出抽奖码", priority = 15)
@@ -301,8 +300,8 @@ public class GoldenEgg implements Authorization {
     @Test(description = "代理人A与访客C邀请关系绑定", priority = 18)
     public void 代理人A与访客C邀请关系绑定() {
         visitorAuth3();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "第3个访客C砸金蛋砸出实物", priority = 19)
@@ -413,8 +412,8 @@ public class GoldenEgg implements Authorization {
     @Test(description = "代理人A与访客D邀请关系绑定", priority = 24)
     public void 代理人A与访客D邀请关系绑定() {
         visitorAuth4();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "第3个用户再次超时后访客D砸蛋砸出实物奖品", priority = 25)
@@ -447,8 +446,8 @@ public class GoldenEgg implements Authorization {
     @Test(description = "代理人A与访客E邀请关系绑定", priority = 26)
     public void 代理人A与访客E邀请关系绑定() {
         visitorAuth5();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "第5个用户E砸蛋砸出抽奖码", priority = 27)
@@ -482,15 +481,15 @@ public class GoldenEgg implements Authorization {
     @Test(description = "访客A获取分享加密串", priority = 28)
     public void 访客A获取分享加密串() {
         visitorAuth1();
-        this.shareSign = liveBinding.share();
+        this.shareSign = LiveBinding.share();
 
     }
 
     @Test(description = "访客E与访客A邀请关系绑定", priority = 29)
     public void 访客F与访客A邀请关系绑定() {
         visitorAuth6();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "修改实物奖品数量为无限制", priority = 30)
@@ -593,8 +592,8 @@ public class GoldenEgg implements Authorization {
     @Test(description = "访客I与访客A邀请关系绑定", priority = 35)
     public void 访客I与访客A邀请关系绑定() {
         visitorAuth8();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "第6个访客F砸出红包", priority = 36)
@@ -627,8 +626,8 @@ public class GoldenEgg implements Authorization {
     @Test(description = "访客H与访客A邀请关系绑定", priority = 37)
     public void 访客H与访客A邀请关系绑定() {
         visitorAuth9();
-        liveBinding.binding(this.shareSign);;
-        liveBinding.token();
+        LiveBinding.binding(this.shareSign);;
+        LiveBinding.token();
     }
 
     @Test(description = "第7个访客H砸出抽奖码", priority = 38)
@@ -718,7 +717,7 @@ public class GoldenEgg implements Authorization {
     @Test(description = "访客B获取分享加密串", priority = 42)
     public void 访客B获取分享加密串() {
         visitorAuth2();
-        this.shareSign = liveBinding.share();
+        this.shareSign = LiveBinding.share();
     }
 
     @Test(description = "用户C给用户B助力", priority = 43)
@@ -761,7 +760,7 @@ public class GoldenEgg implements Authorization {
     @Test(description = "访客F获取分享加密串", priority = 45)
     public void 访客F获取分享加密串() {
         visitorAuth8();
-        this.shareSign = liveBinding.share();
+        this.shareSign = LiveBinding.share();
     }
 
     @Test(description = "用户D给用户F助力", priority = 46)

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

@@ -52,7 +52,6 @@ public class TimeRed  implements Authorization {
 
     @Test(description = "关注直播间", priority = 2)
     public void 关注直播间() {
-
         Map<String, Object> subscribeParam = new HashMap<>();
         subscribeParam.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.ENCODE_LIVE_ID.getKey()));
         List<Long> markIds2 = new ArrayList<>();
@@ -140,7 +139,6 @@ public class TimeRed  implements Authorization {
     @Test(description = "访客端表单资料提交", priority = 6)
     public void 访客端系统表单资料提交()
     {
-
         visitorAuth9();
         Map<String, Object> params = new HashMap<>();
         params.put("confId",this.bizConfId.get(3).getBizConfId());
@@ -531,8 +529,7 @@ public class TimeRed  implements Authorization {
         Assert.assertTrue(state1==2, network.message(Params, BasicConfig.ANCHOR_openState, "访客I未领取第5轮红包", stateRes.body().asString()));
     }
 
-    @Test(description = "下架第6轮红包任务对应的权益", priority = 23)
-    public void 下架第6轮红包任务对应的权益() {
+    public static void offResource() {
         Map<String, Object> Params = new HashMap<>();
         Params.put("liveId", LiveConstants.getValue(LiveConstants.StringKeyEnum.LIVE_ID.getKey()));
         List<Material> ids = new ArrayList<>();
@@ -553,6 +550,11 @@ public class TimeRed  implements Authorization {
         Assert.assertTrue(data, network.message(Params, BasicConfig.MANAGER_saveAndUpdate_8, "产品资料配置失败", response.body().asString()));
     }
 
+    @Test(description = "下架第6轮红包任务对应的权益", priority = 23)
+    public void 下架第6轮红包任务对应的权益() {
+        offResource();
+    }
+
     @Test(description = "查看第6轮红包任务完成情况", priority = 24)
     public void 查看第6轮红包任务完成情况() {
         Map<String, Object> Params = new HashMap<>();

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

@@ -433,6 +433,7 @@ public class BasicConfig {
   public static final String USER_companyLiving = MOBILE_HOST + "/kjy/live/company/living";
   public static final String USER_welfareDetail = MOBILE_HOST + "/kjy/live/user/welfare/findDetailByRecordId";
   public static final String USER_sourceDetail = MOBILE_HOST + "/kjy/live/user/resource/findDetailByRecordId";
+  public static final String USER_getTestResourceDetail = MOBILE_HOST + "/kjy/live/user/resource/getTestResourceDetail";
 
   // *************** 直播管理端 ***************
   public static final String MANAGER_saveAndUpdate_0 = MANAGER_HOST + "/kjy/manager/live/pre/conf/saveAndUpdate";
@@ -852,7 +853,6 @@ 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";
@@ -860,7 +860,6 @@ public class BasicConfig {
   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 DYNAMIC_ADDVISIT = HOST + "/kjy/mp/seller/dynamic/addVisit";
   public static final String CLUEINFO = HOST + "/kjy/mp/whoSawMe/clue/info";
   public static final String CLUEADVISE = HOST + "/kjy/mp/whoSawMe/clue/info/advise";
@@ -929,11 +928,11 @@ public class BasicConfig {
   public static final String ARTICLE_GETTAGTYPESBYCONTENTID = HOST + "/kjy/mp/explosionContent/resource/getTagTypesByContentId";
   public static final String ARTICLE_ISDISPLAYACTIVITY = HOST + "/kjy/mp/clue/activity/isDisplayActivity";
   public static final String ARTICLE_GETENHANCEDCOLUMNCONFIG = HOST + "/kjy/mp/sellerConfig/getEnhancedColumnConfig";
-  public static final String ARTICLE_ENHANCEDCOLUMN_GETCONTENTS = HOST + "/kjy/mp/enhancedColumn/getContents";
   public static final String ARTICLE_ENHANCEDCOLUMN_GETFAQS = HOST + "/kjy/mp/enhancedColumn/getFAQs";
   public static final String ARTICLE_getQuestionDetail = HOST +"/kjy/mp/explosioncontent/qa/getQuestionDetail";
   public static final String ARTICLE_GETEXPLOSIONCONTENTLIST = HOST + "/kjy/mp/explosioncontent/getExplosionContentList";
   public static final String ARTICLE_interact = HOST + "/kjy/mp/article/interact";
+  public static final String ARTICLE_findDetailById = HOST + "/kjy/mp/explosionContent/resource/findDetailById";
 
   // **************  发圈素材  ***************
   public static final String FRIENDS_GETMATERIALTAGS = HOST + "/kjy/mp/materialContent/getmaterialTags";
@@ -1168,7 +1167,18 @@ public class BasicConfig {
   public static final String MANAGER_exclusiveItemDel = MANAGER_HOST + "/kjy/manager/exclusiveItem/del";
   public static final String MANAGER_searchCompany = MANAGER_HOST + "/kjy/manager/live/company/search";
   public static final String MANAGER_liveList = MANAGER_HOST + "/kjy/manager/live/list";
-  public static final String MANAGER_manage = MANAGER_HOST + "/kjy/manager/tag/manage";
+  public static final String MANAGER_resource_allMaterial = MANAGER_HOST + "/kjy/manager/explosionContent/resource/allMaterial";
+  public static final String MANAGER_resource_addOrUpdate = MANAGER_HOST + "/kjy/manager/explosionContent/resource/addOrUpdate";
+  public static final String MANAGER_resource_findById = MANAGER_HOST + "/kjy/manager/explosionContent/resource/findById";
+  public static final String MANAGER_resource_deleteById = MANAGER_HOST + "/kjy/manager/explosionContent/resource/deleteById";
+  public static final String MANAGER_datagram_list = MANAGER_HOST + "/kjy/manager/datagram/v2/list";
+  public static final String MANAGER_datagram_addOrUpdate = MANAGER_HOST + "/kjy/manager/datagram/v2/addOrUpdate";
+  public static final String MANAGER_datagram_detail = MANAGER_HOST + "/kjy/manager/datagram/v2/detail";
+  public static final String MANAGER_resource_delete = MANAGER_HOST + "/kjy/manager/datagram/v2/delete";
+  public static final String MANAGER_qa_addOrUpdate = MANAGER_HOST + "/kjy/manager/qa/addOrUpdate";
+  public static final String MANAGER_article_edit = MANAGER_HOST + "/kjy/manager/grassContent/edit";
+  public static final String MANAGER_qa_pageList = MANAGER_HOST + "/kjy/manager/qa/pageList";
+  public static final String MANAGER_qa_del = MANAGER_HOST + "/kjy/manager/qa/del";
 
   // 企业后台
   public static final String MANAGER_corp_saveCorp = MANAGER_HOST + "/kjy/manager/corp/company/saveOrUpdate";