diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index 95ed353..999d328 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -12,6 +12,12 @@ Resource LoginResource.robot And 用户手机号验证码登录婚介平台 And 查询用户的婚介组织 +手机号验证码登录-888888 + #登录婚介平台 + Given 读取TXT文件 + And 用户手机号验证码登录婚介平台-888888 + And 查询用户的婚介组织 + 手机号验证码已过期登录 #验证码已过期 Given 读取TXT文件 diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot index a7b0b83..dda5180 100644 --- a/0-Login/LoginResource.robot +++ b/0-Login/LoginResource.robot @@ -36,7 +36,7 @@ Library OperatingSystem ${captcha_list} Create List FOR ${account} IN @{id} ${Time} Get Current Date result_format=%Y-%m-%d %H:%M:%S - Connect To Database Using Custom Params pymysql database='dating-agency-uec',user='root',password='qniaothreetwoonego',host='8.135.8.221' + Connect To Database Using Custom Params pymysql database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221' ${check} Query SELECT code FROM da_captcha WHERE verifiable_account = '${account}' AND status = 1 AND is_delete = 0 AND expired_time > '${Time}' #查询手机号获取的验证码 ${captcha} Set Variable ${check[0][0]} Set Global Variable ${captcha} @@ -50,7 +50,7 @@ Library OperatingSystem ${captcha_list} Create List FOR ${account} IN @{id} ${Time} Get Current Date result_format=%Y-%m-%d %H:%M:%S - Connect To Database Using Custom Params pymysql database='dating-agency-uec',user='root',password='qniaothreetwoonego',host='8.135.8.221' + Connect To Database Using Custom Params pymysql database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221' ${check} Query SELECT code FROM da_captcha WHERE verifiable_account = '${account}' AND status = 1 AND is_delete = 0 AND expired_time < '${Time}' #查询手机号获取的验证码 ${captcha} Set Variable ${check[0][0]} Append To List ${captcha_list} ${captcha} @@ -63,7 +63,7 @@ Library OperatingSystem #用户手机号验证码登录婚介平台 ${userid_list} Create List ${Cheader_list} Create List - ${Lheader_list} Create List + ${Aheader_list} Create List FOR ${account} ${captcha} IN ZIP ${id} ${captcha_list} Disable Warnings Create Session dating ${${dating}.dating域名} ${${dating}.AHeader} @@ -77,12 +77,40 @@ Library OperatingSystem ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'} Append To List ${userid_list} ${userId} Append To List ${Cheader_list} ${client_header} - Append To List ${Lheader_list} ${login_header} + Append To List ${Aheader_list} ${login_header} Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码，请重试！ END Set Global Variable ${userid_list} - Set Global Variable ${Lheader_list} + Set Global Variable ${Aheader_list} + Set Global Variable ${Cheader_list} + Set Global Variable ${login_header} + Set Global Variable ${client_header} + +用户手机号验证码登录${dating}平台-888888 + #用户手机号验证码登录婚介平台 + ${userid_list} Create List + ${Cheader_list} Create List + ${Aheader_list} Create List + FOR ${account} IN @{id} + Disable Warnings + Create Session dating ${${dating}.dating域名} ${${dating}.AHeader} + ${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 + ${userId} Get From Dictionary ${reps.json()['data']} userId #获取用户id + ${message} Get From Dictionary ${reps.json()} message + ${login_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795881','Authorization':'QNT ${token}'} #更新header + ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'} + Append To List ${userid_list} ${userId} + Append To List ${Cheader_list} ${client_header} + Append To List ${Aheader_list} ${login_header} + Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码，请重试！ + END + Set Global Variable ${userid_list} + Set Global Variable ${Aheader_list} Set Global Variable ${Cheader_list} Set Global Variable ${login_header} Set Global Variable ${client_header} @@ -102,7 +130,7 @@ Library OperatingSystem 查询用户的${dating}组织 #查询用户在婚介的组织数据 - FOR ${userId} ${login_header} IN ZIP ${userid_list} ${Lheader_list} + FOR ${userId} ${login_header} IN ZIP ${userid_list} ${Aheader_list} Disable Warnings Create Session dating ${${dating}.dating域名} ${login_header} ${reps} GET On Session dating /dating-agency-uec/user/list/own-organization params=userId=${userid} diff --git a/2-Homepage/MarriageInfo/Authentication.robot b/2-Homepage/MarriageInfo/Authentication.robot index 103aab5..df0e86b 100644 --- a/2-Homepage/MarriageInfo/Authentication.robot +++ b/2-Homepage/MarriageInfo/Authentication.robot @@ -12,12 +12,14 @@ Library DatabaseLibrary Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating /dating-agency-service/user/get/marriage/information/details params=userId=${userId} ${miId} Get From Dictionary ${reps.json()['data']} id #获取资料id + ${nickName} Get From Dictionary ${reps.json()['data']} nickName #获取用户名称 ${miId_list} Create List ${message} Get From Dictionary ${reps.json()} message Append To List ${miId_list} ${miId} Should Be Equal As Strings ${message} successful END Set Global Variable ${miId_list} + Set Global Variable ${nickName} 查询${dating}征婚人资料 #通过miId查询征婚人资料 @@ -44,8 +46,8 @@ Library DatabaseLibrary END 查询数据库头像审核表 - Connect To Database Using Custom Params pymysql database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${check} Query SELECT id FROM `dating-agency-service`.`da_marriage_information_certification_audit` WHERE `id` = '${auditId}' AND `authentication_code` = '8' AND `is_delete` = '0' #查询头像审核语句 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT id FROM `dating_agency_service`.`da_marriage_information_certification_audit` WHERE `id` = '${auditId}' AND `authentication_code` = '8' AND `is_delete` = '0' #查询头像审核语句 ${id} Set Variable ${check[0][0]} Should Be Equal As Strings ${id} ${auditId} #断言 Disconnect From Database @@ -64,8 +66,8 @@ Library DatabaseLibrary Set Global Variable ${auditId} 查询数据库相册审核表 - Connect To Database Using Custom Params pymysql database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${check} Query SELECT id FROM `dating-agency-service`.`da_marriage_information_certification_audit` WHERE `id` = '${auditId}' AND `authentication_code` = '6' AND `is_delete` = '0' #查询相册审核语句 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT id FROM `dating_agency_service`.`da_marriage_information_certification_audit` WHERE `id` = '${auditId}' AND `authentication_code` = '6' AND `is_delete` = '0' #查询相册审核语句 ${id} Set Variable ${check[0][0]} Should Be Equal As Strings ${id} ${auditId} #断言 Disconnect From Database @@ -87,8 +89,8 @@ Library DatabaseLibrary END 查询数据库身份证审核数据 - Connect To Database Using Custom Params pymysql database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${check} Query SELECT id FROM `dating-agency-service`.`da_marriage_information_certification_audit` WHERE `id` = '${data}' AND `authentication_code` = '0' AND `is_delete` = '0' #查询相册审核语句 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT id FROM `dating_agency_service`.`da_marriage_information_certification_audit` WHERE `id` = '${data}' AND `authentication_code` = '0' AND `is_delete` = '0' #查询相册审核语句 ${id} Set Variable ${check[0][0]} Should Be Equal As Strings ${id} ${data} #断言 Disconnect From Database @@ -106,8 +108,8 @@ Library DatabaseLibrary END 查询数据库户口所在地数据 - Connect To Database Using Custom Params pymysql database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${check} Query SELECT domicile_place_city_name FROM `dating-agency-service`.`da_marriage_information` WHERE `id` = '${miId}' AND `is_delete` = '0' #查询相册审核语句 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT domicile_place_city_name FROM `dating_agency_service`.`da_marriage_information` WHERE `id` = '${miId}' AND `is_delete` = '0' #查询相册审核语句 ${city_name} Set Variable ${check[0][0]} Should Be Equal As Strings ${city_name} ${cityName} #断言 Disconnect From Database diff --git a/2-Homepage/MarriageInfo/Selection.robot b/2-Homepage/MarriageInfo/Selection.robot index fce9209..1868683 100644 --- a/2-Homepage/MarriageInfo/Selection.robot +++ b/2-Homepage/MarriageInfo/Selection.robot @@ -61,8 +61,8 @@ region END 查询数据库择偶表的数据 - Connect To Database Using Custom Params pymysql database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${check} Query SELECT domicile_place_city_name FROM `dating-agency-service`.`da_demand_marriage` WHERE `mi_id` = '${miId}' #查询择偶表中城市数据 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT domicile_place_city_name FROM `dating_agency_service`.`da_demand_marriage` WHERE `mi_id` = '${miId}' #查询择偶表中城市数据 ${city_name} Set Variable ${check[0][0]} Should Be Equal As Strings ${city_name} ${cityName} #断言 Disconnect From Database diff --git a/Web/InfoAudit/AuditInfomation.robot b/Web/InfoAudit/AuditInfomation.robot new file mode 100644 index 0000000..48d0803 --- /dev/null +++ b/Web/InfoAudit/AuditInfomation.robot @@ -0,0 +1,9 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml +Resource Infomation.robot + +*** Test Cases *** +审核征婚人提交的资料-相册 + Given 查询婚介平台用户资料数据 + When 查询婚介平台审核资料-相册审核通过 + Then 查询数据库审核表数据 diff --git a/Web/InfoAudit/Infomation.robot b/Web/InfoAudit/Infomation.robot new file mode 100644 index 0000000..01e39b9 --- /dev/null +++ b/Web/InfoAudit/Infomation.robot @@ -0,0 +1,48 @@ +*** Settings *** +Library urllib3 +Library String +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/marriage/information/audit/page params=pageSize=10&name=${nickName}&pageNum=1 + ${records} Get From Dictionary ${reps.json()['data']} records #获取资料审核列表 + END + FOR ${info} IN @{records} + ${InfoId} Get From Dictionary ${info} id #获取资料审核id + Exit For Loop If ${InfoId}==${auditId} + END + Set Global Variable ${InfoId} + +查询${dating}平台审核资料-相册审核通过 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${data} Set Variable {"id":"${InfoId}","status":1} + ${reps} POST On Session dating dating-agency-service/user/exe/certification/audit ${data.encode('utf-8')} + ${data} Get From Dictionary ${reps.json()} data + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + Set Global Variable ${data} + END + +查询${dating}平台审核资料-相册审核不通过 + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${data} Set Variable {"id":"${InfoId}","status":0} + ${reps} POST On Session dating dating-agency-service/user/exe/certification/audit ${data.encode('utf-8')} + ${data} Get From Dictionary ${reps.json()} data + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + Set Global Variable ${data} + END + +查询数据库审核表数据 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${check} Query SELECT status FROM `dating_agency_service`.`da_marriage_information_certification_audit` WHERE `id` = '${data}' + ${status} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${status} 1 diff --git a/Web/InfoAudit/__init__.robot b/Web/InfoAudit/__init__.robot new file mode 100644 index 0000000..03276fb --- /dev/null +++ b/Web/InfoAudit/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 资料审核