diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index ba95afe..8f28038 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -17,17 +17,20 @@ Library Collections Then 数据库查询用户生效且未过期的验证码 And 用户手机号验证码登录婚介平台 And 查询用户的婚介组织 + And 获取婚介平台用户baseinfo 手机号验证码登录-888888 #登录婚介平台 Given 读取TXT文件 And 用户手机号验证码登录婚介平台-888888 And 查询用户的婚介组织 + And 获取婚介平台用户baseinfo 手机号验证码登录-888888,phone Given 生成随机手机号 When 用户手机号验证码登录婚介平台-phone And 查询用户的婚介组织 + And 获取婚介平台用户baseinfo 手机号验证码已过期登录 #验证码已过期 diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot index 752da62..63b1998 100644 --- a/0-Login/LoginResource.robot +++ b/0-Login/LoginResource.robot @@ -184,6 +184,17 @@ Library OperatingSystem ... ELSE log ${data} END +获取${dating}平台用户baseinfo + #获取baseinfo + FOR ${admin_header} IN @{Aheader_list} + Create Session dating ${${dating}.dating域名} ${admin_header} + ${reps} GET On Session dating dating-agency-uec/user/get/base-info + ${phone} Get From Dictionary ${reps.json()['data']} phone #登录用户手机号 + ${matchmakerFlag} Get From Dictionary ${reps.json()['data']} matchmakerFlag #登录用户是否是红娘 + END + Set Global Variable ${phone} + Set Global Variable ${matchmakerFlag} + 数据库删除用户数据 FOR ${userId} IN @{userid_list} Connect To Database Using Custom Params pymysql database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221' diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot index 39e51d8..336b9a6 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot @@ -91,7 +91,7 @@ Resource ../../../0-Login/LoginResource.robot 提交${dating}征婚人身份证审核 #提交征婚人身份证审核 - #${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X 就是不吃饭,441481199509213863 王颖勋,4400 + #${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X 就是不吃饭,441481199509213863 王颖勋,4400 李子懿,429006201701270931 #女生身份证 ${woman_value} Set Variable 尤名雅,420101198605250747 #男生身份证 diff --git a/output/log.html b/output/log.html index 32ae49e..0d407df 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};