Merge branch 'zr' into develop

src/test/java/http/cases/DefinedActivityTest/答题_创建答题活动_DuibaTest.java

@@ -34,6 +34,7 @@ public class 答题_创建答题活动_DuibaTest extends DuibaTestBase {
 
     @Test
     public void 创建答题活动() throws Exception{
+
         logger.info("创建答题活动");
         CustomHdToolVO customHdToolVO = new CustomHdToolVO();
         customHdToolVO.setActId(null);

src/test/java/http/cases/NewActivityTest/抽奖异常测试_DuibaTest.java

@@ -188,9 +188,9 @@ public class 抽奖异常测试_DuibaTest extends DuibaTestBase {
 
         logger.info("-------------------------------------"+data.get("casename")+"-------------------------------------");
         //获取管理员后台活动信息
-        Response ManagerResponse = managerService.edit(data.get("actId"));
+        Response ManagerResponse = managerService.getDataEditConfig(data.get("actId"));
         //获取奖品剩余库存
-        String appItemId =  String.valueOf(ManagerResponse.jsonPath().getString("data.awards[1].appItemId"));
+        String appItemId =  String.valueOf(ManagerResponse.jsonPath().getString("awards[1].appItemId"));
         String Objremaind = this.getremind(appItemId);
         logger.info("预设必中奖品类型为："+ManagerResponse.jsonPath().getString("data.awards[1].type"));
         logger.info("预设中奖几率为："+ManagerResponse.jsonPath().getString("data.awards[1].probability")+"%");
@@ -198,7 +198,7 @@ public class 抽奖异常测试_DuibaTest extends DuibaTestBase {
         logger.info("预设剩余奖品数："+ManagerResponse.jsonPath().getString("data.awards[1].remaind")+"个");
         logger.info("预设奖品库存："+Objremaind+"个");
         if (Objremaind.equals("0")){
-            Assert.assertEquals(ManagerResponse.jsonPath().getString("data.awards[1].valid"),"false","校验奖品是否有效失败");
+            Assert.assertEquals(ManagerResponse.jsonPath().getString("awards[1].valid"),"false","校验奖品是否有效失败");
         }
 
         //进行接口测试传参

src/test/profiles/aliyun/duiba.properties

@@ -21,45 +21,50 @@ home.host = activity.m.duibatest.com.cn
 manager.host = mng.duibatest.com.cn
 trade.host = activity.m.duibatest.com.cn
 
-//数据库配置
+//\u6570\u636E\u5E93\u914D\u7F6E
 db.name = duiba_test
 db.password= svbP3KUw2PurAnBb2rbs3vohF
 db.url = jdbc:mysql://rdswy2b9wy53044250u1o.mysql.rds.aliyuncs.com:3306/
 db.driver= com.mysql.jdbc.Driver
 db.maxtotal = 6
 
-//钉钉报告配置
-pluginTest.project=插件
+//\u9489\u9489\u62A5\u544A\u914D\u7F6E
+pluginTest.project=\u63D2\u4EF6
 pluginTest.names=zhaoran,qianwenjun
-pluginTest.group=插件-接口自动化
+pluginTest.group=\u63D2\u4EF6-\u63A5\u53E3\u81EA\u52A8\u5316
 pluginTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duibaPlugin_interface/HTML_Report/suite1_test1_results.html
 
-signTest.project=签到
+signTest.project=\u7B7E\u5230
 signTest.names=zhousongbo
-signTest.group=签到-接口自动化
+signTest.group=\u7B7E\u5230-\u63A5\u53E3\u81EA\u52A8\u5316
 signTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duibaSign_interface/HTML_Report/suite1_test1_results.html
 
-FloorTest.project=楼层
+FloorTest.project=\u697C\u5C42
 FloorTest.names=zhaoran,qianwenjun
-FloorTest.group=楼层-接口自动化
+FloorTest.group=\u697C\u5C42-\u63A5\u53E3\u81EA\u52A8\u5316
 FloorTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duibaFloor_interface/HTML_Report/suite1_test1_results.html
 
-DuibaTest.project=活动工具
+DuibaTest.project=\u6D3B\u52A8\u5DE5\u5177
 DuibaTest.names=zhaoran,qianwenjun
-DuibaTest.group=活动工具-接口自动化
+DuibaTest.group=\u6D3B\u52A8\u5DE5\u5177-\u63A5\u53E3\u81EA\u52A8\u5316
 DuibaTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duiba_interface/HTML_Report/suite1_test1_results.html
 
-AccessTest.project=综合业务(单品抽奖/秒杀/游戏)
+AccessTest.project=\u7EFC\u5408\u4E1A\u52A1(\u5355\u54C1\u62BD\u5956/\u79D2\u6740/\u6E38\u620F)
 AccessTest.names=zhaoran,qianwenjun
-AccessTest.group=综合业务-接口自动化
+AccessTest.group=\u7EFC\u5408\u4E1A\u52A1-\u63A5\u53E3\u81EA\u52A8\u5316
 AccessTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duibaAccess_interface/HTML_Report/suite1_test1_results.html
 
-JenkinsTest.project=综合业务(单品抽奖/秒杀/游戏)
+JenkinsTest.project=\u7EFC\u5408\u4E1A\u52A1(\u5355\u54C1\u62BD\u5956/\u79D2\u6740/\u6E38\u620F)
 JenkinsTest.names=zhaoran,qianwenjun
-JenkinsTest.group=综合业务-接口自动化
+JenkinsTest.group=\u7EFC\u5408\u4E1A\u52A1-\u63A5\u53E3\u81EA\u52A8\u5316
 JenkinsTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duibaAccess_interface/HTML_Report/suite1_test1_results.html
 
-ExchangeTest.project=普兑业务
+ExchangeTest.project=\u666E\u5151\u4E1A\u52A1
 ExchangeTest.names=panyuli
-ExchangeTest.group=普兑业务-接口自动化
-ExchangeTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duibaExchange_interface/HTML_Report/suite1_test1_results.html
\ No newline at end of file
+ExchangeTest.group=\u666E\u5151\u4E1A\u52A1-\u63A5\u53E3\u81EA\u52A8\u5316
+ExchangeTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/duibaExchange_interface/HTML_Report/suite1_test1_results.html
+
+SeckillTest.project=\u79D2\u6740\u4E1A\u52A1
+SeckillTest.names=qianwenjun
+SeckillTest.group=\u79D2\u6740\u4E1A\u52A1-\u63A5\u53E3\u81EA\u52A8\u5316
+SeckillTest.resultUrl=http://tst.deploy.dui88.com/view/duibaTest/job/Seckill_interface/HTML_Report/suite1_test1_results.html
\ No newline at end of file