Merge branch '2021072201-gxh' into 'master'

修改了创建红包贺卡/礼物贺卡、访客开红包/领取礼物、代理人查看已发出贺卡详情的测试用例

See merge request test-group/kejiji!79

src/test/java/com/kjj/bean/gift/Gift.java

+package com.kjj.bean.gift;
+
+import lombok.Data;
+
+@Data
+public class Gift {
+    String id;
+    String giftName;
+    String giftPicUrl;
+    int giftType;
+}

src/test/java/com/kjj/cases/assistant/card/ArticalPersonCard.java

@@ -326,7 +326,6 @@ public class ArticalPersonCard implements Authorization  {
 
     @AfterClass
     public static void tearDown(){
-        network.agentCookies.put("tku",AGENT_TKU);        //tku 切换为访客的
         apiCount += 16;
     }
 

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

@@ -111,9 +111,9 @@ public class GreetingCard {
         Map<String, Object> params = new HashMap<String, Object>();
         params.put("pageIndex", 1);
         params.put("pageSize", 10);
-        Response response = network.getResponse(params,GREETING_CONFLIST);
+        Response response = network.getResponse(params, GREETING_confList);
         boolean hasList = response.jsonPath().getInt("data.list.size()") > 0;
-        Assert.assertFalse(hasList,network.message(params,GREETING_CONFLIST,"获取我的贺卡初始列表数量有误",response.body().asString()));
+        Assert.assertFalse(hasList,network.message(params, GREETING_confList,"获取我的贺卡初始列表数量有误",response.body().asString()));
     }
 
     @AfterClass

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

@@ -797,7 +797,7 @@ public class BasicConfig {
     public static final String GREETING_allForward = HOST + "/kjy/mp/greeting/allForward";
     public static final String GREETING_findByType = HOST + "/kjy/mp/tag/findByType";
     public static final String GREETING_pageList = HOST + "/kjy/mp/greeting/pageList";
-    public static final String GREETING_CONFLIST = HOST + "/kjy/mp/greeting/conf/list";
+    public static final String GREETING_confList = HOST + "/kjy/mp/greeting/conf/list";
     public static final String GREETING_H5SHARE = ACTIVITY_HOST + "/kjy/mp/greeting/conf/h5share";
     public static final String GREETING_H5INFO = ACTIVITY_HOST + "/kjy/mp/content/h5info";
     public static final String GREETING_SAVEDEFAULT = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault";
@@ -815,6 +815,24 @@ public class BasicConfig {
     public static final String GREETING_checkLimit = ACTIVITY_HOST + "/kjy/mp/greeting/conf/checkLimit";
     public static final String GREETING_more = ACTIVITY_HOST + "/kjy/mp/greeting/more";
     public static final String GREETING_saveDefault = ACTIVITY_HOST + "/kjy/mp/greeting/conf/saveDefault";
+    public static final String GREETING_redPacketDetail = ACTIVITY_HOST + "/kjy/mp/greeting/conf/redPacketDetail";
+    public static final String GREETING_effective = ACTIVITY_HOST + "/kjy/mp/greeting/conf/effective";
+    public static final String GREETING_spareBlessWordList = HOST + "/kjy/mp/greeting/spareBlessWordList";
+    public static final String GREETING_saveOrUpdate = HOST + "/kjy/mp/greeting/conf/saveOrUpdate";
+    public static final String GREETING_list = HOST + "/kjy/mp/marketing/list";
+    public static final String GREETING_detail= HOST + "/kjy/mp/greeting/gift/detail";
+    public static final String GREETING_giftSaveOrUpdate= HOST + "/kjy/mp/marketing/saveOrUpdate";
+    public static final String GREETING_save= HOST + "/kjy/mp/greeting/gift/save";
+    public static final String GREETING_delete= HOST + "/kjy/mp/greeting/gift/delete";
+    public static final String GREETING_create= HOST + "/kjy/mp/greeting/packet/create";
+    public static final String GREETING_editState= HOST + "/kjy/mp/greeting/gift/editState";
+    public static final String GREETING_getPosterConfig= HOST + "/kjy/mp/greeting/getPosterConfig";
+    public static final String GREETING_view= ACTIVITY_HOST + "/kjy/mp/greeting/view";
+    public static final String GREETING_open= ACTIVITY_HOST + "/kjy/mp/greeting/packet/open";
+    public static final String GREETING_openResult=  ACTIVITY_HOST + "/kjy/mp/greeting/packet/openResult";
+    public static final String GREETING_receive=  ACTIVITY_HOST + "/kjy/mp/greeting/gift/receive";
+    public static final String GREETING_receiveDetail=  HOST + "/kjy/mp/greeting/conf/detail";
+    public static final String GREETING_receiveList=  HOST + "/kjy/mp/greeting/conf/receiveList";
 
 
     // *************** 管理后台 ***************