Merge branch 'zr' into develop

src/test/java/http/cases/DeveloperTest/自有活动出奖_DuibaTest.java

@@ -37,12 +37,13 @@ public class 自有活动出奖_DuibaTest extends DuibaTestBase {
         Response response = newActivityService.doJoin2("21803","h5ps61");
         String orderId = response.jsonPath().getString("orderId");
         response = newActivityService.getOrderStatus2(orderId);
+        response.print();
         String result = response.jsonPath().getString("result");
         int i = 30;
         while(i>0&&result.equals("0")){
             Thread.sleep(1000);
             response = newActivityService.getOrderStatus2(orderId);
-            response.prettyPeek();
+            response.print();
             result = response.jsonPath().getString("result");
             i--;
         }

src/test/java/http/service/Activity/ManagerService.java

@@ -461,6 +461,9 @@ public class ManagerService {
         map.put("gameStarting","true");
         map.put("channelType","0");
 
+        map.put("customFalg","false");
+        map.put("customKey","");
+
         logger.info("请求保存自定义活动工具接口:"+saveUrl);
         Response saveResponse=given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.ssoLogin()).params(map).post("http://"+saveUrl);
         saveResponse.prettyPrint();
@@ -668,6 +671,8 @@ public class ManagerService {
         map.put("directSendCoupon","FALSE");
         map.put("channelType","0");
 
+        map.put("customFalg","false");
+        map.put("customKey","");
         Response saveResponse=given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.ssoLogin()).params(map).post("http://"+saveUrl);
         saveResponse.prettyPrint();
         try{

src/test/java/http/service/Manager/EditManagerInfoService.java

@@ -176,7 +176,8 @@ public class EditManagerInfoService {
 
         map.put("token",token);
 
-
+        map.put("customFalg","false");
+        map.put("customKey","");
         Response saveResponse = given().contentType("application/x-www-form-urlencoded;charset=UTF-8").cookies(authorization.ssoLogin()).params(map).post("http://"+saveUrl);
         saveResponse.prettyPrint();
         try{

src/test/java/http/service/hd/CustomHdToolCtrlService.java

@@ -117,6 +117,9 @@ public class CustomHdToolCtrlService {
         //活动策划 & 视觉策划
         params.put("plotterUser","张三");
         params.put("createUser","李四");
+
+        params.put("customFalg","false");
+        params.put("customKey","");
         //获取创建活动的token
         String token = editConfig(customHdToolVO.getActId()).jsonPath().getString("data.token");
         params.put("token",token);