From 28165e431375b6cfc82f2fce5b56770d639783e7 Mon Sep 17 00:00:00 2001 From: LG_lai Date: Wed, 13 Mar 2024 18:24:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=A1=AB=E5=86=99=E8=B5=84?= =?UTF-8?q?=E6=96=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dating/DA_data.yaml | 10 ---- Dating/__init__.robot | 2 - .../Blind/Blind.robot | 0 .../Blind/BlindDate.robot | 4 +- Homepage/Blind/__init__.robot | 2 + Homepage/MarriageInfo/MarriageInfo.robot | 17 ++++++ Homepage/MarriageInfo/MarryInfo.robot | 8 +++ Homepage/MarriageInfo/__init__.robot | 2 + InsertData.robot | 22 -------- Login/DA_data.yaml | 10 ---- Login/Login-interface.robot | 5 +- Login/{resource.robot => LoginResource.robot} | 31 ++++++----- Login/phone-test.txt | 4 +- WriteInfo/DA_data.yaml | 12 ---- WriteInfo/InfoResource.robot | 52 +++++++++++------- WriteInfo/Infomation.robot | 20 +++---- 相亲用户资料.xls | Bin 19456 -> 0 bytes {用户资料 => 资料}/DataBase.py | 0 {用户资料 => 资料}/Execl.py | 0 {用户资料 => 资料}/WXlogin.py | 0 .../__pycache__/Execl.cpython-36.pyc | Bin {用户资料 => 资料}/input.py | 0 {用户资料 => 资料}/phone.py | 0 23 files changed, 94 insertions(+), 107 deletions(-) delete mode 100644 Dating/DA_data.yaml delete mode 100644 Dating/__init__.robot rename Dating/dating.robot => Homepage/Blind/Blind.robot (100%) rename Dating/Dating_data.robot => Homepage/Blind/BlindDate.robot (54%) create mode 100644 Homepage/Blind/__init__.robot create mode 100644 Homepage/MarriageInfo/MarriageInfo.robot create mode 100644 Homepage/MarriageInfo/MarryInfo.robot create mode 100644 Homepage/MarriageInfo/__init__.robot delete mode 100644 InsertData.robot delete mode 100644 Login/DA_data.yaml rename Login/{resource.robot => LoginResource.robot} (84%) delete mode 100644 WriteInfo/DA_data.yaml delete mode 100644 相亲用户资料.xls rename {用户资料 => 资料}/DataBase.py (100%) rename {用户资料 => 资料}/Execl.py (100%) rename {用户资料 => 资料}/WXlogin.py (100%) rename {用户资料 => 资料}/__pycache__/Execl.cpython-36.pyc (100%) rename {用户资料 => 资料}/input.py (100%) rename {用户资料 => 资料}/phone.py (100%) diff --git a/Dating/DA_data.yaml b/Dating/DA_data.yaml deleted file mode 100644 index d13d5e0..0000000 --- a/Dating/DA_data.yaml +++ /dev/null @@ -1,10 +0,0 @@ -婚介: - dating域名: https://dating-agency-api-test.qniao.cn - Client域名: - CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} - - - -用户: - 手机号: 15014242835 - 验证码: 888888 \ No newline at end of file diff --git a/Dating/__init__.robot b/Dating/__init__.robot deleted file mode 100644 index 48df7b9..0000000 --- a/Dating/__init__.robot +++ /dev/null @@ -1,2 +0,0 @@ -*** Settings *** -Documentation 相亲页面 diff --git a/Dating/dating.robot b/Homepage/Blind/Blind.robot similarity index 100% rename from Dating/dating.robot rename to Homepage/Blind/Blind.robot diff --git a/Dating/Dating_data.robot b/Homepage/Blind/BlindDate.robot similarity index 54% rename from Dating/Dating_data.robot rename to Homepage/Blind/BlindDate.robot index 9a1204f..3b002a2 100644 --- a/Dating/Dating_data.robot +++ b/Homepage/Blind/BlindDate.robot @@ -1,6 +1,6 @@ *** Settings *** -Suite Setup Import Variables ${CURDIR}\\DA_data.yaml -Resource dating.robot +Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml +Resource Blind.robot *** Test Cases *** 游客使用婚介平台 diff --git a/Homepage/Blind/__init__.robot b/Homepage/Blind/__init__.robot new file mode 100644 index 0000000..18f63c1 --- /dev/null +++ b/Homepage/Blind/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 主页 diff --git a/Homepage/MarriageInfo/MarriageInfo.robot b/Homepage/MarriageInfo/MarriageInfo.robot new file mode 100644 index 0000000..0d40ada --- /dev/null +++ b/Homepage/MarriageInfo/MarriageInfo.robot @@ -0,0 +1,17 @@ +*** Settings *** +Library urllib3 +Library String +Library Collections +Library RequestsLibrary + +*** Keywords *** +查询${dating}征婚人的资料信息 + #获取征婚人的资料 + FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating /dating-agency-service/user/get/marriage/information/details params=userId=${userId} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END + +上传${dating}征婚人头像 diff --git a/Homepage/MarriageInfo/MarryInfo.robot b/Homepage/MarriageInfo/MarryInfo.robot new file mode 100644 index 0000000..22ac34c --- /dev/null +++ b/Homepage/MarriageInfo/MarryInfo.robot @@ -0,0 +1,8 @@ +*** Settings *** +Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml +Resource MarriageInfo.robot +Resource ../../Login/LoginResource.robot + +*** Test Cases *** +征婚人头像信息 + Given 查询婚介征婚人的资料信息 diff --git a/Homepage/MarriageInfo/__init__.robot b/Homepage/MarriageInfo/__init__.robot new file mode 100644 index 0000000..cae2ebe --- /dev/null +++ b/Homepage/MarriageInfo/__init__.robot @@ -0,0 +1,2 @@ +*** Settings *** +Documentation 征婚人资料 diff --git a/InsertData.robot b/InsertData.robot deleted file mode 100644 index c9f3852..0000000 --- a/InsertData.robot +++ /dev/null @@ -1,22 +0,0 @@ -*** Settings *** -Library Collections -Library ExcelLibrary -Library DatabaseLibrary - -*** Test Cases *** -ReadData - Import Variables ${CURDIR}\\用户资料\\Execl.py - #${DList} Set Variable ${cap} - log ${phone_list} - LOG ${phone} - FOR ${P} IN RANGE ${phone_list} - END - LOG ${P} - -Connect_Database - [Documentation] 连接数据库 - #连接数据库 - Connect To Database Using Custom Params pymysql database='dating-agency-service',user='root',password='qniaothreetwoonego',host='8.135.8.221' - ${UserData} Query SELECT * FROM `uec`.`qn_account` WHERE `tid` = '13517986787' AND `is_delete` = '0' - ${accountId} Set Variable ${UserData[0][0]} - Disconnect From Database diff --git a/Login/DA_data.yaml b/Login/DA_data.yaml deleted file mode 100644 index c48254c..0000000 --- a/Login/DA_data.yaml +++ /dev/null @@ -1,10 +0,0 @@ -婚介: - dating域名: https://dating-agency-api-test.qniao.cn - Client域名: - CHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} - AHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795881'} - - -用户: - 手机号: 15014242835 - 验证码: 888888 \ No newline at end of file diff --git a/Login/Login-interface.robot b/Login/Login-interface.robot index cc5d325..a20a2ed 100644 --- a/Login/Login-interface.robot +++ b/Login/Login-interface.robot @@ -1,7 +1,7 @@ *** Settings *** Documentation 接口：短信验证码登录认证 Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml -Resource resource.robot +Resource LoginResource.robot *** Test Cases *** 手机号验证码登录 @@ -9,9 +9,8 @@ Resource resource.robot Given 读取TXT文件 When 用户获取婚介平台短信验证码 Then 数据库查询用户生效且未过期的验证码 - #And 依次获取验证码 And 用户手机号验证码登录婚介平台 - #And 查询用户的婚介组织 + And 查询用户的婚介组织 手机号验证码已过期登录 #验证码已过期 diff --git a/Login/resource.robot b/Login/LoginResource.robot similarity index 84% rename from Login/resource.robot rename to Login/LoginResource.robot index c494421..b0535e7 100644 --- a/Login/resource.robot +++ b/Login/LoginResource.robot @@ -59,14 +59,11 @@ Library OperatingSystem Set Global Variable ${captcha} Set Global Variable ${captcha_list} -依次获取验证码 - #多用户时依次获取对应的验证码 - FOR ${captcha} IN @{captcha_list} - Set Global Variable ${captcha} - END - 用户手机号验证码登录${dating}平台 #用户手机号验证码登录婚介平台 + ${userid_list} Create List + ${Cheader_list} Create List + ${Lheader_list} Create List FOR ${account} ${captcha} IN ZIP ${id} ${captcha_list} Disable Warnings Create Session dating ${${dating}.dating域名} ${${dating}.AHeader} @@ -78,9 +75,15 @@ Library OperatingSystem ${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}'} - Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + Append To List ${userid_list} ${userId} + Append To List ${Cheader_list} ${client_header} + Append To List ${Lheader_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 ${Cheader_list} Set Global Variable ${login_header} Set Global Variable ${client_header} @@ -93,17 +96,19 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-uec/authorize/by-captcha ${data.encode('utf-8')} ${code} Get From Dictionary ${reps.json()} code #获取相应状态码 ${message} Get From Dictionary ${reps.json()} message - Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful + Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码，请重试！ END 查询用户的${dating}组织 #查询用户在婚介的组织数据 - Disable Warnings - Create Session dating ${${dating}.dating域名} ${login_header} - ${reps} GET On Session dating /dating-agency-uec/user/list/own-organization params=userId=${userid} - ${message} Get From Dictionary ${reps.json()} message - Should Be Equal As Strings ${message} successful + FOR ${userId} ${login_header} IN ZIP ${userid_list} ${Lheader_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} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END 000 ${result} Create List 4 5 6 diff --git a/Login/phone-test.txt b/Login/phone-test.txt index 4be3daa..75cdb36 100644 --- a/Login/phone-test.txt +++ b/Login/phone-test.txt @@ -1,3 +1,3 @@ 手机号 -15014242835 -19128859944 \ No newline at end of file +19128859944 +15014242835 \ No newline at end of file diff --git a/WriteInfo/DA_data.yaml b/WriteInfo/DA_data.yaml deleted file mode 100644 index a4b7e7a..0000000 --- a/WriteInfo/DA_data.yaml +++ /dev/null @@ -1,12 +0,0 @@ -婚介: - 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=='} - AHeader: {'Content-Type':'application/json','X-APP-ID':'50325897884795881'} - - - -用户: - 手机号: 15014242835 - 验证码: 888888 \ No newline at end of file diff --git a/WriteInfo/InfoResource.robot b/WriteInfo/InfoResource.robot index 0167fd4..67ad62a 100644 --- a/WriteInfo/InfoResource.robot +++ b/WriteInfo/InfoResource.robot @@ -9,14 +9,20 @@ Library RequestsLibrary Library OperatingSystem *** Keywords *** -用户首次填写${dating}资料 - Disable Warnings +首次查询${dating}征婚人资料 #获取首次婚介资料信息 - 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} - ${Data} Get From Dictionary ${reps.json()} data - log ${Data} - Set Global Variable ${Data} + 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} + ${Data} Get From Dictionary ${reps.json()} data + ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #查询资料填写序号 + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + Set Global Variable ${Data} + Run Keyword If ${fillSerialNumber}==0 填写婚介征婚人的基础资料 + ... ELSE 查询婚介征婚人的资料信息 + END 检查首次填写${dating}资料序号 #检查首次填写序号 @@ -25,14 +31,22 @@ Library OperatingSystem ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #填写序号 Set Global Variable ${fillSerialNumber} +填写${dating}征婚人的基础资料 + 选择婚介性别资料 + 选择婚介征婚人的城市 + 选择婚介征婚人的出生年份 + 选择婚介征婚人的身高 + 选择婚介征婚人的学历 + 选择婚介征婚人的婚姻状况 + 选择婚介征婚人的月收入 + 选择婚介征婚人的昵称 + 选择${dating}性别资料 #选择性别 Log To Console ${CURDIR} #打印当前路径 Disable Warnings - #用户首次填写婚介资料 ${sex-code} Create List 0 1 ${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号 - #${SexCode} Evaluate 1 #男:0，女:1 ${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.genderCode ${SexCode} @@ -45,7 +59,6 @@ Library OperatingSystem ${message} Get From Dictionary ${reps.json()} message Should Be Equal As Strings ${message} successful Set Global Variable ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的城市 #选择城市 @@ -92,7 +105,6 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的出生年份 #选择征婚人出生年份 @@ -110,7 +122,6 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的身高 #选择征婚人身高 @@ -127,7 +138,6 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的学历 #选择征婚人的学历 @@ -143,7 +153,6 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的婚姻状况 #选择征婚人的婚姻状况 @@ -159,7 +168,6 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的月收入 #选择征婚人的月收入 @@ -175,7 +183,6 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - 用户首次填写婚介资料 选择${dating}征婚人的昵称 #填写征婚人昵称 @@ -191,9 +198,12 @@ Library OperatingSystem ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} ${id} Get From Dictionary ${reps.json()} data Should Be Equal ${id} ${DataId} - 查询首次填写的婚介资料信息 -查询首次填写的${dating}资料信息 - #获取用户首次填写的资料 - 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} +查询${dating}征婚人的资料信息 + #获取征婚人的资料 + FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating /dating-agency-service/user/get/marriage/information/details params=userId=${userId} + ${message} Get From Dictionary ${reps.json()} message + Should Be Equal As Strings ${message} successful + END diff --git a/WriteInfo/Infomation.robot b/WriteInfo/Infomation.robot index 9b1fc66..474dbc5 100644 --- a/WriteInfo/Infomation.robot +++ b/WriteInfo/Infomation.robot @@ -1,21 +1,21 @@ *** Settings *** Suite Setup Import Variables ${EXECDIR}\\Dating-agency\\DA_data.yaml Resource InfoResource.robot -Resource ../Login/resource.robot +Resource ../Login/LoginResource.robot Library Collections Library RequestsLibrary *** Test Cases *** 用户首次填写资料 - Given 用户首次填写婚介资料 - Then 选择婚介性别资料 - And 选择婚介征婚人的城市 - And 选择婚介征婚人的出生年份 - And 选择婚介征婚人的身高 - And 选择婚介征婚人的学历 - And 选择婚介征婚人的婚姻状况 - And 选择婚介征婚人的月收入 - And 选择婚介征婚人的昵称 + Given 首次查询婚介征婚人资料 + #Then 选择婚介性别资料 + #And 选择婚介征婚人的城市 + #And 选择婚介征婚人的出生年份 + #And 选择婚介征婚人的身高 + #And 选择婚介征婚人的学历 + #And 选择婚介征婚人的婚姻状况 + #And 选择婚介征婚人的月收入 + #And 选择婚介征婚人的昵称 region Disable Warnings diff --git a/相亲用户资料.xls b/相亲用户资料.xls deleted file mode 100644 index 25ddbb31b0c9e0f3ccec664b8eef56100e314823..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19456 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 MfsgyKjDM#459yX(QUCw| diff --git a/用户资料/DataBase.py b/资料/DataBase.py similarity index 100% rename from 用户资料/DataBase.py rename to 资料/DataBase.py diff --git a/用户资料/Execl.py b/资料/Execl.py similarity index 100% rename from 用户资料/Execl.py rename to 资料/Execl.py diff --git a/用户资料/WXlogin.py b/资料/WXlogin.py similarity index 100% rename from 用户资料/WXlogin.py rename to 资料/WXlogin.py diff --git a/用户资料/__pycache__/Execl.cpython-36.pyc b/资料/__pycache__/Execl.cpython-36.pyc similarity index 100% rename from 用户资料/__pycache__/Execl.cpython-36.pyc rename to 资料/__pycache__/Execl.cpython-36.pyc diff --git a/用户资料/input.py b/资料/input.py similarity index 100% rename from 用户资料/input.py rename to 资料/input.py diff --git a/用户资料/phone.py b/资料/phone.py similarity index 100% rename from 用户资料/phone.py rename to 资料/phone.py