zr

src/test/java/http/cases/CollectActivityTest/集卡_助力集卡测试_DuibaTest.java

@@ -104,7 +104,7 @@ public class 集卡_助力集卡测试_DuibaTest extends DuibaTestBase {
                 break;
             case 4:
                 response = newActivityService.helpShareCodeV2(userId,"780","25902","hdtool",shareCode);
-                //logger.info("XXXXXXXXX"+response.asString());
+                logger.info("XXXXXXXXX"+response.asString());
                 Assert.assertEquals(response.jsonPath().getString("itmeId"),"29085","校验itmeId失败");
                 Assert.assertEquals(response.jsonPath().getString("success"),"true","校验success失败");
                 Assert.assertEquals(response.jsonPath().getString("message"),"请求成功","校验message失败");

src/test/profiles/aliyun/duiba.properties

@@ -24,65 +24,63 @@ trade.host = activity.m.duibatest.com.cn
 //\u6570\u636E\u5E93\u914D\u7F6E
 db.name = FjrtzzH
 db.password= 2Fe36uDap8TMqtfzob3f1u8r2aK8qjdnwPP
-<<<<<<< HEAD
+
 //db.url = jdbc:mysql://47.97.127.67:13001/?tinyInt1isBit=false
 db.url = jdbc:mysql://autotest-config.duibatest.com.cn:3306/?tinyInt1isBit=false&connectTimeout=10000&socketTimeout=10000
-=======
-db.url = jdbc:mysql://47.97.127.67:13001/?tinyInt1isBit=false&connectTimeout=60000&socketTimeout=20000
->>>>>>> master
+
 db.driver= com.mysql.cj.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-idc.deploy.dui88.com/view/duibaTest/job/duibaPlugin_interface/HTML_20Report/suite1_test1_results.html
 pluginTest.job=duibaPlugin_interface
 
-signTest.project=签到
+signTest.project=\u7B7E\u5230
 signTest.names=zhousongbo
-signTest.group=签到-接口自动化
+signTest.group=\u7B7E\u5230-\u63A5\u53E3\u81EA\u52A8\u5316
 signTest.resultUrl=http://tst-idc.deploy.dui88.com/view/duibaTest/job/duibaSign_interface/HTML_20Report/suite1_test1_results.html
 signTest.job=duibaSign_interface
 
-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-idc.deploy.dui88.com/view/duibaTest/job/duibaFloor_interface/HTML_20Report/suite1_test1_results.html
 FloorTest.job=duibaFloor_interface
 
-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-idc.deploy.dui88.com/view/duibaTest/job/duiba_interface/HTML_20Report/suite1_test1_results.html
 DuibaTest.job=duiba_interface
 
-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-idc.deploy.dui88.com/view/duibaTest/job/duibaAccess_interface/HTML_20Report/suite1_test1_results.html
 AccessTest.job=duibaAccess_interface
 
-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-idc.deploy.dui88.com/view/duibaTest/job/duibaAccess_interface/HTML_20Report/suite1_test1_results.html
 
-ExchangeTest.project=普兑业务
+ExchangeTest.project=\u666E\u5151\u4E1A\u52A1
 ExchangeTest.names=panyuli
-ExchangeTest.group=普兑业务-接口自动化
+ExchangeTest.group=\u666E\u5151\u4E1A\u52A1-\u63A5\u53E3\u81EA\u52A8\u5316
 ExchangeTest.resultUrl=http://tst-idc.deploy.dui88.com/view/duibaTest/job/duibaExchange_interface/HTML_20Report/suite1_test1_results.html
 ExchangeTest.job=duibaExchange_interface
 
-SeckillTest.project=秒杀业务
+SeckillTest.project=\u79D2\u6740\u4E1A\u52A1
 SeckillTest.names=qianwenjun
-SeckillTest.group=秒杀业务-接口自动化
+SeckillTest.group=\u79D2\u6740\u4E1A\u52A1-\u63A5\u53E3\u81EA\u52A8\u5316
 SeckillTest.resultUrl=http://tst-idc.deploy.dui88.com/view/duibaTest/job/Seckill_interface/HTML_20Report/suite1_test1_results.html
 SeckillTest.job=Seckill_interface
 
-ui.project=界面自动化核心业务
+ui.project=\u754C\u9762\u81EA\u52A8\u5316\u6838\u5FC3\u4E1A\u52A1
 ui.names=mabo
-ui.group=自动化
+ui.group=\u81EA\u52A8\u5316
 ui.resultUrl=http://101.68.72.146:18080/job/duiba_ui/HTML_20Report/suite1_test1_results.html
 ui.job=duiba_ui