From 8e8b1b9623aa7c3f364da1cf1ade2dd0992197c6 Mon Sep 17 00:00:00 2001 From: LG_lai Date: Sat, 8 Jun 2024 10:47:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=8A=A9=E5=8A=9B=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0-Login/Login-interface.robot | 6 +- 0-Login/phone-test.txt | 2 +- .../MarriageInfo/Authentication.robot | 4 +- .../SeekingReward/SeekingResource.robot | 0 .../SeekingReward/SeekingReward.robot | 6 - .../2-Homepage/SeekingReward/__init__.robot | 2 - 1-Applet/3-Customer/EquityResource.robot | 5 +- 1-Applet/6-Activity/ActivityResource.robot | 4 +- 1-Applet/6-Activity/Avtivity.robot | 2 + 2-Web/Mall/ActivityResource.robot | 8 +- 2-Web/SiteActivity/SiteActivity.robot | 8 + .../SiteActivity/SiteActivityResources.robot | 137 ++ output/log.html | 10 +- output/output.xml | 1748 +++++++---------- output/report.html | 10 +- 15 files changed, 854 insertions(+), 1098 deletions(-) delete mode 100644 1-Applet/2-Homepage/SeekingReward/SeekingResource.robot delete mode 100644 1-Applet/2-Homepage/SeekingReward/SeekingReward.robot delete mode 100644 1-Applet/2-Homepage/SeekingReward/__init__.robot create mode 100644 2-Web/SiteActivity/SiteActivity.robot create mode 100644 2-Web/SiteActivity/SiteActivityResources.robot diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index 56aa382..d94ba2f 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -128,4 +128,8 @@ Library ImageHorizonLibrary #替换字段值 #${Data} Update Value To Json ${Data} $.id ${DataId} #随机生成18位数字 - ${value} Generate Random String 18 [NUMBERS] + #${value} Generate Random String 18 [NUMBERS] + #日期计算 + ${datetime} Get Current Date result_format=%Y-%m-%d %H:%M:%S + ${time} Add Time To Date ${datetime} 1 days + ${T} Get Substring ${time} 0 19 diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 1528172..5e06aa7 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -15869737024 \ No newline at end of file +15014242835 \ No newline at end of file diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot index b940715..0c2e06b 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot @@ -96,9 +96,9 @@ Resource ../../../0-Login/LoginResource.robot #提交征婚人身份证审核 #${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X 就是不吃饭,441481199509213863 王颖勋,4400 李子懿,429006201701270931 #女生身份证 - ${womanvalue_list} Create List 赖勇兰,441481199509213863 赖敏怡,441521199410142320 + ${womanvalue_list} Set Variable ["赖勇兰,441481199509213863","赖敏怡,441521199410142320","刘景梅,371525198608012364","黄丽馨,441302199511296927","刘惠琼,441827198807146821"] #男生身份证 - ${manvalue_list} Create List 王颖勋,44058319951227041X 李博,429006198410300956 臧琨,654001198103171417 张山,522328199807132811 + ${manvalue_list} Set Variable ["张山,522328199807132811","臧琨,654001198103171417","李博,429006198410300956","王颖勋,44058319951227041X","刘文波,430426198402075198","董帅,411425199011117552","江志诚,43042619970207049X","杨仁丰,440923199311122678","陈越,445122199210152055","刘虎跃,43042619891011515X","李雷刚,430426198502033497","邝绍荣,440105198310224217","全拥军,430426197806302591"] ${code} Evaluate 0 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} diff --git a/1-Applet/2-Homepage/SeekingReward/SeekingResource.robot b/1-Applet/2-Homepage/SeekingReward/SeekingResource.robot deleted file mode 100644 index e69de29..0000000 diff --git a/1-Applet/2-Homepage/SeekingReward/SeekingReward.robot b/1-Applet/2-Homepage/SeekingReward/SeekingReward.robot deleted file mode 100644 index 1701ca8..0000000 --- a/1-Applet/2-Homepage/SeekingReward/SeekingReward.robot +++ /dev/null @@ -1,6 +0,0 @@ -*** Settings *** -Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml -Resource SeekingResource.robot - -*** Test Cases *** -用户发布招亲榜 diff --git a/1-Applet/2-Homepage/SeekingReward/__init__.robot b/1-Applet/2-Homepage/SeekingReward/__init__.robot deleted file mode 100644 index 8d92d94..0000000 --- a/1-Applet/2-Homepage/SeekingReward/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation 招亲榜 diff --git a/1-Applet/3-Customer/EquityResource.robot b/1-Applet/3-Customer/EquityResource.robot index e828681..99e8a42 100644 --- a/1-Applet/3-Customer/EquityResource.robot +++ b/1-Applet/3-Customer/EquityResource.robot @@ -142,9 +142,10 @@ Library DatabaseLibrary ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S ${Time} Add Time To Date ${dataTime} 5 days Connect To Database Using Custom Params pymysql database='dating_agency_mall',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 601, '${dataTime}', '${Time}', 1) #插入一条会员 + ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${Time}', '${dataTime}', ${userId}, ${miId}, 601, '${dataTime}', '${Time}', 1) #插入一条会员 ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '601' AND `enable` = '1' #查询权益id ${right_id} Set Variable ${check_1[0][0]} - ${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '规格', 1, 101, NULL) + ${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${Time}', ${right_id}, '规格', 1, 101, NULL) + ${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_acquire_record`(`id`, `create_time`, `user_id`, `mi_id`, `right_id`, `right_type`, `acquire_type`) VALUES (NULL, '${dataTime}', ${userId}, ${miId}, ${right_id}, 601, 2) #权益领取记录 Disconnect From Database END diff --git a/1-Applet/6-Activity/ActivityResource.robot b/1-Applet/6-Activity/ActivityResource.robot index 8073c7f..eff97f7 100644 --- a/1-Applet/6-Activity/ActivityResource.robot +++ b/1-Applet/6-Activity/ActivityResource.robot @@ -43,8 +43,8 @@ Library DatabaseLibrary ${womanNumber} Get From Dictionary ${records} womanNumber #女生已参与数 ${manNumber} Set Variable If ${manNumber}==None 0 ${manNumber} ${womanNumber} Set Variable If ${womanNumber}==None 0 ${womanNumber} - ${Number1} Set Variable If ${genderCode}==0 ${numberMan} ${numberWoman} - ${Number2} Set Variable If ${genderCode}==0 ${manNumber} ${womanNumber} + ${Number1} Set Variable If ${genderCode}==0 ${numberMan} ${numberWoman} #当用户性别为男，输出男士可参与人数，否则输出女生可参与人数 + ${Number2} Set Variable If ${genderCode}==0 ${manNumber} ${womanNumber} #当用户性别为男，输出男士已参与人数，否则输出女生已参与人数 ${totalNum} Evaluate ${manNumber}+${womanNumber} #总参与人数 ${registrationPopulation} Get From Dictionary ${records} registrationPopulation #已报名总数 Exit For Loop If ${status}==1 and ${Number1}!=${Number2} #活动状态，1报名中，2待开始，3进行中，4已取消，5已结束 diff --git a/1-Applet/6-Activity/Avtivity.robot b/1-Applet/6-Activity/Avtivity.robot index f6772b1..aef751a 100644 --- a/1-Applet/6-Activity/Avtivity.robot +++ b/1-Applet/6-Activity/Avtivity.robot @@ -7,3 +7,5 @@ Resource ActivityResource.robot Given 查询婚介用户资料 When 查询婚介活动列表 Then 用户报名婚介活动 + +用户邀请助力 diff --git a/2-Web/Mall/ActivityResource.robot b/2-Web/Mall/ActivityResource.robot index 44e574b..84d13d7 100644 --- a/2-Web/Mall/ActivityResource.robot +++ b/2-Web/Mall/ActivityResource.robot @@ -2,12 +2,13 @@ Library urllib3 Library String Library demjson +Library DateTime Library Collections Library HttpLibrary Library JSONLibrary Library RequestsLibrary Library DatabaseLibrary -Library HttpLibrary.HTTP +Library HttpLibrary.HTTP *** Keywords *** 查询${dating}平台商品定价列表 @@ -60,7 +61,10 @@ Library HttpLibrary.HTTP #创建活动 FOR ${admin_header} IN @{Aheader_list} Create Session dating ${${dating}.dating域名} ${admin_header} - ${data} Set Variable { \ \ \ \ "activityName":"测试活动", \ \ \ \ "startTime":"2024-04-11 00:00:00", \ \ \ \ "endTime":"2024-04-11 23:59:59", \ \ \ \ "remark":"创建测试活动2024-04-09", \ \ \ \ "activityProductList":${ActivityDataList} } + ${dateTime} Get Current Date result_format=%Y-%m-%d + ${startTime} Get Current Date result_format=%Y-%m-%d 00:00:00 + ${endTime} Get Current Date ${startTime} 5 days + ${data} Set Variable { \ \ \ \ "activityName":"会员测试活动", \ \ \ \ "startTime":"${startTime}", \ \ \ \ "endTime":"${endTime}", \ \ \ \ "remark":"创建测试活动${dateTime}", \ \ \ \ "activityProductList":${ActivityDataList} } log ${data} ${reps} POST On Session dating dating-agency-mall/user/save/activity ${data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data diff --git a/2-Web/SiteActivity/SiteActivity.robot b/2-Web/SiteActivity/SiteActivity.robot new file mode 100644 index 0000000..a542293 --- /dev/null +++ b/2-Web/SiteActivity/SiteActivity.robot @@ -0,0 +1,8 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml +Resource SiteActivityResources.robot + +*** Test Cases *** +创建助力活动 + 获取婚介平台社群信息 + 创建婚介平台活动 diff --git a/2-Web/SiteActivity/SiteActivityResources.robot b/2-Web/SiteActivity/SiteActivityResources.robot new file mode 100644 index 0000000..85dab70 --- /dev/null +++ b/2-Web/SiteActivity/SiteActivityResources.robot @@ -0,0 +1,137 @@ +*** Settings *** +Library urllib3 +Library String +Library DateTime +Library Collections +Library RequestsLibrary +Library DatabaseLibrary + +*** Keywords *** +获取${dating}平台社群信息 + #社群列表 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${reps} GET On Session dating dating-agency-service/user/get/association/page params=pageSize=100&enable=true&pageNum=1 + ${records} Get From Dictionary ${reps.json()['data']} records #社群数组 + Set Global Variable ${records} #设置全局变量 + ${communityData} Evaluate random.choice(${records}) random #随机获取一个社群 + ${communityId} Get From Dictionary ${communityData} id #社群id + ${communityName} Get From Dictionary ${communityData} name #社群name + Set Global Variable ${communityId} + Set Global Variable ${communityName} + ${reps} GET On Session dating dating-agency-service/user/get/association/detail params=id=${communityId} + ${contactPictureUrlList} Get From Dictionary ${reps.json()['data']} contactPictureUrlList #联系人图片列表 + ${communityQrCodeUrlList} Get From Dictionary ${reps.json()['data']} communityQrCodeUrlList #社群二维码图片列表 + ${contactPictureUrl} Evaluate random.choice(${contactPictureUrlList}) random #随机获取联系人图片 + ${communityQrCodeUrl} Evaluate random.choice(${communityQrCodeUrlList}) random #随机获取社群二维码图片 + Set Global Variable ${contactPictureUrl} + Set Global Variable ${communityQrCodeUrl} + END + +遍历社群列表 + FOR ${records} IN @{records} + ${enable} Get From Dictionary ${records} enable #社群状态 + ${communityId} Get From Dictionary ${records} id #社群id + ${communityName} Get From Dictionary ${records} name #社群name + Exit For Loop If ${communityId}==995313929934737408 and ${enable}==true #社群id和状态为启用 + Set Global Variable ${communityId} + Set Global Variable ${communityName} + END + +查询${dating}平台商品定价列表 + #商品定价列表 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${reps} GET On Session dating dating-agency-mall/user/page/product/by/operator params=pageSize=100&enable=true&pageNum=1 + ${records} Get From Dictionary ${reps.json()['data']} records #商品数组 + Set Global Variable ${records} + ${productData} Evaluate random.choice(${records}) random #随机获取商品定价 + ${productId} Get From Dictionary ${productData} productId #商品id + ${productSpecUnit} Get From Dictionary ${productData} productSpecUnit #商品规格分类 + Set Global Variable ${productId} + Set Global Variable ${productSpecUnit} + END + +遍历商品列表 + FOR ${product} IN @{records} + ${status} Get From Dictionary ${product} status #商品状态 + ${productId} Get From Dictionary ${product} productId #商品id + ${productTitle} Get From Dictionary ${product} productTitle #商品标题 + ${productSpecId} Get From Dictionary ${product} productSpecId #商品规格id + ${productSpecUnit} Get From Dictionary ${product} productSpecUnit #商品规格分类 + Set Global Variable ${status} + Set Global Variable ${productId} + Set Global Variable ${productTitle} + Set Global Variable ${productSpecId} + Set Global Variable ${productSpecUnit} + END + +查询${dating}平台会员活动 + #查询会员活动 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${reps} GET On Session dating dating-agency-mall/user/get/activity/by/operator/page params=pageSize=100&enable=true&pageNum=1 + ${records} Get From Dictionary ${reps.json()['data']} records #会员数组 + Set Global Variable ${records} + 遍历会员活动列表 + END + +遍历会员活动列表 + FOR ${activity} IN @{records} + ${status} Get From Dictionary ${activity} status #会员活动状态 + ${activityId} Get From Dictionary ${activity} id #会员活动id + ${activeState} Get From Dictionary ${activity} activeState #会员活动启停 + Exit For Loop If ${activityId}==978382562932166656 and ${status}==1 and ${activeState}==1 + END + Set Global Variable ${activityId} + Set Global Variable ${activeState} + +region + #获取户口所在地 + Disable Warnings + Create Session region http://qncloud.oss-cn-shenzhen.aliyuncs.com + ${reps} GET On Session region address.json + ${local_data} Get From Dictionary ${reps.json()} data + #随机获取省 + ${province} Evaluate random.choice(${local_data}) random #随机获取省区域 + ${provinceCode} Get From Dictionary ${province} value #获取省编码 + ${provinceName} Get From Dictionary ${province} label #获取省名称 + ${Children} Get From Dictionary ${province} children #获取省市 + #随机获取市 + ${city_data} Evaluate random.choice(${Children}) random #随机获取市区域 + ${cityCode} Get From Dictionary ${city_data} value #获取市编码 + ${cityName} Get From Dictionary ${city_data} label #获取市名称 + ${Children} Get From Dictionary ${city_data} children #获取省市 + #随机获取区 + ${district} Evaluate random.choice(${Children}) random + ${districtCode} Get From Dictionary ${district} value #随机获取区编码 + ${districtName} Get From Dictionary ${district} label #随机获取区名称 + Set Global Variable ${cityCode} + Set Global Variable ${cityName} + Set Global Variable ${districtCode} + Set Global Variable ${districtName} + Set Global Variable ${provinceCode} + Set Global Variable ${provinceName} + +创建${dating}平台活动 + #创建活动 + region + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${DateTime} Get Current Date result_format=%Y-%m-%d #获取当天日期 + ${applyStartTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S #获取当前时间，报名开始时间 + ${applyEndTime} Add Time To Date ${applyStartTime} 1 day #报名结束时间 + ${applyEndTime} Get Substring ${applyEndTime} 0 19 + ${beginTime} Add Time To Date ${applyStartTime} 2 days #活动开始时间 + ${beginTime} Get Substring ${beginTime} 0 19 + ${endTime} Add Time To Date ${applyStartTime} 5 days #活动结束时间 + ${endTime} Get Substring ${endTime} 0 19 + ${participationAllocations} Set Variable [{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":1,"genderCode":0,"userType":0,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":0,"userType":1,"discountAmount":0,"genderValue":"男","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.8,"genderCode":1,"userType":0,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0},{"enable":true,"validTime":0,"assistNumber":0,"originalPrice":0.6,"genderCode":1,"userType":1,"discountAmount":0,"genderValue":"女","transactionPrice":0,"assistRule":0}] #用户参数配置 + ${numberWoman} Evaluate random.randint(1,25) random #女士数随机获取~25间的正整数 + ${numberMan} Evaluate random.randint(1,25) random #男士随机获取1~25间的正整数 + ${numberParticipants} Evaluate ${numberWoman}+${numberMan} #总人数=女士人数+男士人数 + ${AvtivityData} Set Variable {"applyStartTime":"${applyStartTime}","name":"${DateTime}测试活动","activityType":1,"applyEndTime":"${applyEndTime}","beginTime":"${beginTime}","endTime":"${endTime}","detailedAddress":"报名后拉群发详细地址","communityId":"${communityId}","communityName":"${communityName}","imgList":[{"url":"https://dating-agency-test.oss-accelerate.aliyuncs.com/微信图片_20240412144009.png"}],"depict":"${DateTime}测试活动","contactPictureUrl":"${contactPictureUrl}","communityQrCodeUrl":"${communityQrCodeUrl}","provinceCode":${provinceCode},"cityCode":${cityCode},"districtCode":${districtCode},"provinceName":"${provinceName}","cityName":"${districtName}","districtName":"${cityName}","mutualAssistanceLimit":0,"numberParticipants":${numberParticipants},"numberMan":${numberMan},"numberWoman":${numberWoman},"participationAllocations":${participationAllocations}} #活动数据 + ${reps} POST On Session dating dating-agency-service/user/save/site/activity ${AvtivityData.encode('utf-8')} + ${AvtivityId} Get From Dictionary ${reps.json()} data #活动id + Set Global Variable ${AvtivityId} + END diff --git a/output/log.html b/output/log.html index 2f4d2e7..8e98886 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};