diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot index b7f2dc7..5eced2e 100644 --- a/0-Login/LoginResource.robot +++ b/0-Login/LoginResource.robot @@ -118,7 +118,7 @@ Library ImageHorizonLibrary FOR ${account} IN @{id} Disable Warnings Create Session dating ${${dating}.dating域名} ${${dating}.AHeader} - ${data} Set Variable { \ \ "account":"${account}", \ \ "accountType":2, \ \ "captcha":666666 } #手机号验证码登录参数 + ${data} Set Variable { \ \ "account":"${account}", \ \ "accountType":2, \ \ "captcha":888888 } #手机号验证码登录参数 ${reps} POST On Session dating /dating-agency-uec/authorize/by-captcha ${data.encode('utf-8')} ${code} Get From Dictionary ${reps.json()} code #获取相应状态码 ${token} Get From Dictionary ${reps.json()['data']} token #获取token diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index af0574a..1528172 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -13473579062 \ No newline at end of file +15869737024 \ No newline at end of file diff --git a/1-Applet/6-Activity/ActivityResource.robot b/1-Applet/6-Activity/ActivityResource.robot index e529147..8073c7f 100644 --- a/1-Applet/6-Activity/ActivityResource.robot +++ b/1-Applet/6-Activity/ActivityResource.robot @@ -9,34 +9,62 @@ Library DatabaseLibrary *** Keywords *** 查询${dating}用户资料 ${miId_list} Create List + ${genderCodeList} Create List FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} - Disable Warnings Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=${userId} ${miId} Get From Dictionary ${reps.json()['data']} id #资料id + ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #男0,女1 Append To List ${miId_list} ${miId} + Append To List ${genderCodeList} ${genderCode} Set Global Variable ${userId} Set Global Variable ${miId_list} + Set Global Variable ${genderCodeList} END -用户查询${dating}活动列表 - FOR ${client-header} IN @{Cheader_list} +查询${dating}活动列表 + FOR ${genderCode} ${client-header} IN ZIP ${genderCodeList} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client-header} ${reps} GET On Session dating dating-agency-service/user/get/site/activity/page params=queryType=0&pageNum=1&pageSize=10&status= ${records} Get From Dictionary ${reps.json()['data']} records #近期活动列表 Set Global Variable ${records} + Set Global Variable ${genderCode} 遍历活动列表 END 遍历活动列表 - FOR ${records} IN ${records} + FOR ${records} IN @{records} + ${name} Get From Dictionary ${records} name #活动名称 ${status} Get From Dictionary ${records} status #活动状态 ${AvtivityId} Get From Dictionary ${records} id #活动id - Exit For Loop If ${status}==1 #活动状态,1报名中,2待开始,3进行中,4已取消,5已结束 - Set Global Variable ${AvtivityId} + ${numberMan} Get From Dictionary ${records} numberMan #男生可参与数 + ${numberWoman} Get From Dictionary ${records} numberWoman #女生可参与数 + ${manNumber} Get From Dictionary ${records} manNumber #男生已参与数 + ${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} + ${totalNum} Evaluate ${manNumber}+${womanNumber} #总参与人数 + ${registrationPopulation} Get From Dictionary ${records} registrationPopulation #已报名总数 + Exit For Loop If ${status}==1 and ${Number1}!=${Number2} #活动状态,1报名中,2待开始,3进行中,4已取消,5已结束 + #Set Global Variable ${AvtivityId} END + Set Global Variable ${AvtivityId} -用户报名${datign}活动 +用户报名${dating}活动 #用户报名活动 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} + ${data} Set Variable {"id":"${AvtivityId}"} + ${reps} POST On Session dating dating-agency-service/user/participate/in/site/activity ${data.encode('utf-8')} + 数据库新增活动参与人 + END + +数据库新增活动参与人 + FOR ${userid} ${miId} ${genderCode} IN ZIP ${userid_list} ${miId_list} ${genderCodeList} + ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${insert} Execute Sql String INSERT INTO `dating_agency_service`.`da_site_activity_participant`(`id`, `site_activity_id`, `mi_id`, `user_id`, `gender_code`, `status`, `is_delete`, `create_time`, `update_time`) VALUES (NULL, ${AvtivityId}, ${miId}, ${userid}, ${genderCode}, 0, 0, '${dataTime}', '${dataTime}') #活动参与表插入一条用户数据 + Disconnect From Database + END diff --git a/1-Applet/6-Activity/Avtivity.robot b/1-Applet/6-Activity/Avtivity.robot index c3952dd..5f32112 100644 --- a/1-Applet/6-Activity/Avtivity.robot +++ b/1-Applet/6-Activity/Avtivity.robot @@ -1,4 +1,9 @@ *** Settings *** +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml Resource ActivityResource.robot *** Test Cases *** +用户参加待开始活动 + Given 查询婚介用户资料 + When 查询婚介活动列表 + Then 用户报名婚介活动 diff --git a/DA_data.yaml b/DA_data.yaml index 2ee0a34..4652765 100644 --- a/DA_data.yaml +++ b/DA_data.yaml @@ -1,5 +1,5 @@ 婚介: - dating域名: http://dating-agency-api.quzhaoqin.com + dating域名: http://dating-agency-api-test.qniao.cn Client域名: CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} Header: {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'iHP4V/g6O5DXHixyNrf7tn7+VIdU5Zwq5m1fgO3jm5PtMrj2OlLQWd+AfAy9eJMn9vowK3P78Iz93vXw55+blg=='} @@ -13,4 +13,5 @@ - # dating域名: http://dating-agency-api-test.qniao.cn \ No newline at end of file + # dating域名: http://dating-agency-api-test.qniao.cn + # http://dating-agency-api.quzhaoqin.com \ No newline at end of file diff --git a/output/log.html b/output/log.html index b0a16ef..2f4d2e7 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};