From 32d0752e85e3f1f9db57736e32d6e1e1580aed36 Mon Sep 17 00:00:00 2001 From: LG_lai Date: Wed, 3 Apr 2024 16:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 0-Login/Login-interface.robot | 7 +- 0-Login/phone-test.txt | 2 +- 1-Applet/1-WriteInfo/InfoResource.robot | 34 +- 1-Applet/2-Homepage/BlindDate/Blind.robot | 6 + .../2-Homepage/BlindDate/BlindResource.robot | 17 + .../MarriageInfo/Authentication.robot | 49 +- .../2-Homepage/MarriageInfo/Selection.robot | 50 +- output/log.html | 10 +- output/output.xml | 836 ++++++++++++------ output/report.html | 10 +- 资料/昵称.txt | 91 +- 11 files changed, 718 insertions(+), 394 deletions(-) diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot index fbdb1fc..3dbe94c 100644 --- a/0-Login/Login-interface.robot +++ b/0-Login/Login-interface.robot @@ -34,7 +34,7 @@ Library ImageHorizonLibrary Given 生成随机手机号 When 用户手机号验证码登录婚介平台-phone And 查询用户的婚介组织 - And 获取婚介平台用户baseinfo + #And 获取婚介平台用户baseinfo 手机号验证码已过期登录 #验证码已过期 @@ -46,10 +46,7 @@ Library ImageHorizonLibrary 删除已浏览数据次数 用户扫描红娘二维码注册登录 - Given 读取TXT文件 - And 用户手机号验证码登录婚介平台-888888 - And 查询用户的婚介组织 - When 扫描婚介红娘二维码 + Given 扫描婚介红娘二维码 Then 获取婚介平台用户baseinfo并判断是否是红娘 000 diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt index 443de94..808563b 100644 --- a/0-Login/phone-test.txt +++ b/0-Login/phone-test.txt @@ -1,2 +1,2 @@ 手机号 -19128859944 \ No newline at end of file +18898674523 \ No newline at end of file diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot index 65a1840..d837c86 100644 --- a/1-Applet/1-WriteInfo/InfoResource.robot +++ b/1-Applet/1-WriteInfo/InfoResource.robot @@ -160,7 +160,7 @@ Library OperatingSystem 选择${dating}征婚人的家乡 #选择城市 #获取省市区 - region固定省市-衡阳 + region固定省市-汕头 #选择征婚人地区资料 Disable Warnings ${Number} Evaluate 2 #0:"性别",1:"所在城市",2:"家乡"3:"出生年份",4:"身高",5:"学历",6:"月收入",7:"昵称",8:"首次填写完成" @@ -183,7 +183,7 @@ Library OperatingSystem #${start-year} Evaluate 1950 #${end-year} Evaluate ${get_year}-18 #${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份 - ${year} Evaluate ${get_year}-42 #固定年龄 + ${year} Evaluate ${get_year}-28 #固定年龄 ${Number} Evaluate 3 #填写序号 Create Session dating ${${dating}.dating域名} ${client_header} ${Data} Update Value To Json ${Data} $.id ${DataId} @@ -272,7 +272,7 @@ Library OperatingSystem #${name} Set Variable ${name}${secondName} #${nickName} Set Variable ${firstName}${name} #END - ${Name} Set Variable ["缘来是你","洛天神女","寻那个TA","一片烨","冲浪boy","小十七","人生若只如初见","王小帅","牛仔","张先生","细水长流","就等你了","弱水三千，我只取你一瓢","搬石头砸你的jio","遗落世间的小仙女","阳光正好，微风不燥","故乡的原风景","万里&长城","禁忌女孩","如果当时...","雪落下的地方","天蝎座的宁静","烟火","白色气球","带你去浪漫的土耳其","山东在逃挖掘机","餐桌C位","网名不要太长像我这样就好","村里在逃翠花❀","林黛玉醉打蒋门神","美少女壮士","诺贝尔可爱奖","虚天渊","死于脚气攻心","发型不乱，一切好办","农夫三拳有点疼","举不动的小公主","朝颜","茯苓","零碎小土豆📕","不4辣妹好烦","满山的猴子我腚最红","拉粑粑小魔仙","榆木脑袋/(ㄒoㄒ)/~~","北极甜虾","社交悍匪","西红柿炖前男友","骑猪追帅哥","^.^心碎小饭包","悲伤Kitty猫","美女也会emo","妈莎拉蒂","爸道总裁","去银行整点金条","我的人间鬼火","观input萨","冰糖葫芦娃","记忆煎成饼","4.435km/s","炉火糖粥","十一是亿","半截的诗","DokiDoki","该昵称已存在","七月半","出桃公主","量贩草莓guo'pao"] + ${Name} Set Variable ["缘来是你","洛天神女","寻那个TA","一片烨","冲浪boy","王小帅","牛仔","张先生","就等你了","故乡的原风景","万里&长城","禁忌女孩","如果当时...","雪落下的地方","天蝎座的宁静","烟火","白色气球","带你去浪漫的土耳其","村里在逃翠花❀","诺贝尔可爱奖","虚天渊","死于脚气攻心","发型不乱，一切好办","朝颜","茯苓","不4辣妹好烦","满山的猴子我腚最红","拉粑粑小魔仙","榆木脑袋/(ㄒoㄒ)/~~","北极甜虾","社交悍匪","西红柿炖前男友","骑猪追帅哥","^.^心碎小饭包","美女也会emo","妈莎拉蒂","爸道总裁","去银行整点金条","我的人间鬼火","观input萨","冰糖葫芦娃","记忆煎成饼","4.435km/s","炉火糖粥","十一是亿","半截的诗","DokiDoki","该昵称已存在","出桃公主","量贩草莓果泡","风止何安","钟于的尽头是终于","Komorebi","Agoni","Miratowa","Coisini","是牛奶味呀","偷走月亮的o(=•ェ•=)m","一口吃成大胖次","转角撞到小花花","恰似惊鸿落人间","阿啾啾","只吃一口不会胖滴","难过就首饰房间","辣条董事长","一贫如喜羊羊","鸭鸭进京赶烤","bug鸭陆","我愿嫁给财神爷哪怕是企妾","富婆与低保皆失","满圈猪猪我最肥","☀日落也会跑","不掉小珍🐖","快乐的刘油果","小地瓜☁","火鸡味锅巴","晕头小🐕","钞票收割机","吃土豆长大的马铃薯","Tony带水","古塔拉黑暗之神","换胃思烤","你没好果汁吃","元气少女锅德缸","对方正在长头发","关你peace","狂炫老板画的大饼","皮蛋solo粥","梁山伯与祝英抬杠","讨一身可爱","半口奶酪","一丢丢可爱","小不忍则卖大萌","春风十里吹不动你","夏目友人赖账","狂踹瘸子那条好腿","三条腿瘸了两条","蛋黄派来的","BOB！！！","激萌美少女李逵","老衲我不用飘柔"] ${nickName} Evaluate random.choice(${Name}) random ${Number} Evaluate 7 Create Session dating ${${dating}.dating域名} ${client_header} @@ -395,3 +395,31 @@ region固定省市-衡阳 Set Global Variable ${districtName} Set Global Variable ${provinceCode} Set Global Variable ${provinceName} + +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 + FOR ${province} IN @{local_data} #省列表数据 + ${provinceCode} Get From Dictionary ${province} value #获取省编码 + ${provinceName} Get From Dictionary ${province} label #获取省名称 + Exit For Loop If '${provinceName}'=='广州省' + END + ${city_data} Get From Dictionary ${province} children #广东省市列表数据 + FOR ${city} IN @{city_data} + ${cityCode} Get From Dictionary ${city} value #获取市编码 + ${cityName} Get From Dictionary ${city} label #获取市名称 + Exit For Loop If '${cityName}'=='汕头市' + END + ${district_data} Get From Dictionary ${city} children #市列表数据 + log ${district_data} + ${district} Evaluate random.choice(${district_data}) 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} diff --git a/1-Applet/2-Homepage/BlindDate/Blind.robot b/1-Applet/2-Homepage/BlindDate/Blind.robot index 33766ec..9f3f183 100644 --- a/1-Applet/2-Homepage/BlindDate/Blind.robot +++ b/1-Applet/2-Homepage/BlindDate/Blind.robot @@ -8,3 +8,9 @@ Resource BlindResource.robot Given 查询婚介征婚人的资料信息 When 查询婚介征婚人资料 And 查看婚介平台相亲列表 + +用户搜索征婚资料-无条件 + Given 查询婚介征婚人的资料信息 + And 查询婚介征婚人资料 + When 用户查询婚介搜索列表 + Then 数据库查询征婚资料数量 diff --git a/1-Applet/2-Homepage/BlindDate/BlindResource.robot b/1-Applet/2-Homepage/BlindDate/BlindResource.robot index 8090692..7ed1d62 100644 --- a/1-Applet/2-Homepage/BlindDate/BlindResource.robot +++ b/1-Applet/2-Homepage/BlindDate/BlindResource.robot @@ -2,6 +2,7 @@ Library urllib3 Library Collections Library RequestsLibrary +Library DatabaseLibrary *** Keywords *** 查询${dating}征婚人的资料信息 @@ -71,3 +72,19 @@ Library RequestsLibrary END Set Global Variable ${age_list} Set Global Variable ${height_list} + +用户查询${dating}搜索列表 + FOR ${client_header} IN @{Cheader_list} + Create Session dating ${${dating}.dating域名} ${client_header} + ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=advancedQuery=false&queryType=1&minAge=18&maxAge=80&minHeight=0&maxHeight=207&minimumIncome=0&maximumIncome=10000000&unlock=0&pageNum=1&pageSize=1000 + ${total} Get From Dictionary ${reps.json()['data']} total + Set Global Variable ${total} + END + +数据库查询征婚资料数量 + Connect To Database Using Custom Params pymysql database='dating_agency_service',user='root',password='qniaothreetwoonego',host='8.135.8.221' + ${genderCode} Set Variable If ${genderCode}==1 0 1 + ${check} Query SELECT COUNT(*) FROM `dating_agency_service`.`da_marriage_information` WHERE `gender_code` = '${genderCode}' AND `profile_photo` <> 'null' AND `is_delete` = '0' #查询数据库资料数量 + ${count} Set Variable ${check[0][0]} + Should Be Equal As Numbers ${count} ${total} + Disconnect From Database diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot index 336b9a6..a3b7851 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot @@ -134,7 +134,7 @@ Resource ../../../0-Login/LoginResource.robot Disconnect From Database 提交${dating}征婚人的户口所在地 - region固定省市-衡阳 + region固定省市-汕头 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "domicilePlaceProvinceCode": ${provinceCode}, \ \ \ \ "domicilePlaceProvinceName": "${provinceName}", \ \ \ \ "domicilePlaceCityCode": ${cityCode}, \ \ \ \ "domicilePlaceCityName": "${cityName}" } @@ -153,7 +153,7 @@ Resource ../../../0-Login/LoginResource.robot Disconnect From Database 提交${dating}征婚人现居地 - region固定省市-衡阳 + region固定省市-广州 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable {"id":"${miId}","provinceCode":${provinceCode},"provinceName":"${provinceName}","cityCode":${cityCode},"cityName":"${cityName}","districtCode":${districtCode},"districtName":"${districtName}"} @@ -166,7 +166,7 @@ Resource ../../../0-Login/LoginResource.robot 提交${dating}征婚人的家乡 #家乡 - region固定省市-衡阳 + region固定省市-汕头 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "hometownProvinceCode": ${provinceCode}, \ \ \ \ "hometownProvinceName": "${provinceName}", \ \ \ \ "hometownCityCode": ${cityCode}, \ \ \ \ "hometownCityName": "${cityName}" } @@ -183,7 +183,7 @@ Resource ../../../0-Login/LoginResource.robot #${start-year} Evaluate 1950 #${end-year} Evaluate ${get_year}-18 #${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份 - ${birthYear} Evaluate ${get_year}-29 #固定年龄 + ${birthYear} Evaluate ${get_year}-28 #固定年龄 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable {"id":"${miId}","birthYear":${birthYear}} @@ -244,9 +244,9 @@ Resource ../../../0-Login/LoginResource.robot ${reps} GET On Session dating dating-agency-service/user/get/nation/list ${data} Get From Dictionary ${reps.json()} data #${Nation_data} Evaluate random.choice(${data}) random - ${nationdata} Set Variable [{"cn":"土家族","id":15},{"cn":"苗族","id":6},{"cn":"侗族","id":12},{"cn":"瑶族","id":13},{"cn":"白族","id":14},{"cn":"回族","id":3},{"cn":"壮族","id":8},{"cn":"维吾尔族","id":5}] - ${Nation_data} Evaluate random.choice(${nationdata}) random - #${Nation_data} Get From List ${data} 5 #固定民族 + #${nationdata} Set Variable [{"cn":"土家族","id":15},{"cn":"苗族","id":6},{"cn":"侗族","id":12},{"cn":"瑶族","id":13},{"cn":"白族","id":14},{"cn":"回族","id":3},{"cn":"壮族","id":8},{"cn":"维吾尔族","id":5}] + #${Nation_data} Evaluate random.choice(${nationdata}) random + ${Nation_data} Get From List ${data} 0 #固定民族 ${nation} Get From Dictionary ${Nation_data} cn #获取民族名称 ${nationCode} Get From Dictionary ${Nation_data} id #获取民族编码 Set Global Variable ${nation} @@ -307,7 +307,7 @@ Resource ../../../0-Login/LoginResource.robot 提交${dating}征婚人的籍贯信息 #提交征婚人的籍贯信息 - region固定省市-衡阳 + region固定省市-汕头 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "nativePlaceName": "${provinceName}", \ \ \ \ "nativePlaceCode": "${provinceCode}" } @@ -359,7 +359,7 @@ Resource ../../../0-Login/LoginResource.robot ${reps} GET On Session dating dating-agency-service/user/get/income/list ${data} Get From Dictionary ${reps.json()} data ${incomeData} Evaluate random.choice(${data}) random - #${incomeData} Get From List ${data} 3 #0 3K以下，1 3K~5K，2 5K~8K,，3 8K~12K，4 12K~20K，5 20K~50K，6 50K以上 + #${incomeData} Get From List ${data} 4 #0 3K以下，1 3K~5K，2 5K~8K,，3 8K~12K，4 12K~20K，5 20K~50K，6 50K以上 ${income} Get From Dictionary ${incomeData} desc #收入 ${incomeCode} Get From Dictionary ${incomeData} value #收入编码 END @@ -379,7 +379,7 @@ Resource ../../../0-Login/LoginResource.robot ${reps} GET On Session dating dating-agency-service/user/get/education/list ${data_list} Get From Dictionary ${reps.json()} data ${education_data} Evaluate random.choice(${data_list}) random #随机获取学历 - #${education_data} Get From List ${data_list} 0 #0高中以下，1中专，2大专，3本科。4硕士，5博士 + #${education_data} Get From List ${data_list} 3 #0高中以下，1中专，2大专，3本科。4硕士，5博士 ${education} Get From Dictionary ${education_data} desc #学历名称 ${educationCode} Get From Dictionary ${education_data} value #学历编码 Set Global Variable ${education} @@ -423,7 +423,7 @@ Resource ../../../0-Login/LoginResource.robot #${name} Set Variable ${name}${secondName} #${nickName} Set Variable ${firstName}${name} #END - ${name_data} Set Variable ["缘来是你","洛天神女","寻那个TA","一片烨","冲浪boy","小十七","人生若只如初见","王小帅","牛仔","张先生","细水长流","就等你了","弱水三千，我只取你一瓢","搬石头砸你的jio","遗落世间的小仙女","阳光正好，微风不燥","故乡的原风景","万里&长城","禁忌女孩","如果当时...","雪落下的地方","天蝎座的宁静","烟火","白色气球","带你去浪漫的土耳其","山东在逃挖掘机","餐桌C位","网名不要太长像我这样就好","村里在逃翠花❀","林黛玉醉打蒋门神","美少女壮士","诺贝尔可爱奖","虚天渊","死于脚气攻心","发型不乱，一切好办","农夫三拳有点疼","举不动的小公主","朝颜","茯苓","零碎小土豆📕","不4辣妹好烦","满山的猴子我腚最红","拉粑粑小魔仙","榆木脑袋/(ㄒoㄒ)/~~","北极甜虾","社交悍匪","西红柿炖前男友","骑猪追帅哥","^.^心碎小饭包","悲伤Kitty猫","美女也会emo","妈莎拉蒂","爸道总裁","去银行整点金条","我的人间鬼火","观input萨","冰糖葫芦娃","记忆煎成饼","4.435km/s","炉火糖粥","十一是亿","半截的诗","DokiDoki","该昵称已存在","七月半","出桃公主","量贩草莓guo'pao"] + ${name_data} Set Variable ["缘来是你","洛天神女","寻那个TA","一片烨","冲浪boy","王小帅","牛仔","张先生","就等你了","故乡的原风景","万里&长城","禁忌女孩","如果当时...","雪落下的地方","天蝎座的宁静","烟火","白色气球","带你去浪漫的土耳其","村里在逃翠花❀","诺贝尔可爱奖","虚天渊","死于脚气攻心","发型不乱，一切好办","朝颜","茯苓","不4辣妹好烦","满山的猴子我腚最红","拉粑粑小魔仙","榆木脑袋/(ㄒoㄒ)/~~","北极甜虾","社交悍匪","西红柿炖前男友","骑猪追帅哥","^.^心碎小饭包","美女也会emo","妈莎拉蒂","爸道总裁","去银行整点金条","我的人间鬼火","观input萨","冰糖葫芦娃","记忆煎成饼","4.435km/s","炉火糖粥","十一是亿","半截的诗","DokiDoki","该昵称已存在","出桃公主","量贩草莓果泡","风止何安","钟于的尽头是终于","Komorebi","Agoni","Miratowa","Coisini","是牛奶味呀","偷走月亮的o(=•ェ•=)m","一口吃成大胖次","转角撞到小花花","恰似惊鸿落人间","阿啾啾","只吃一口不会胖滴","难过就首饰房间","辣条董事长","一贫如喜羊羊","鸭鸭进京赶烤","bug鸭陆","我愿嫁给财神爷哪怕是企妾","富婆与低保皆失","满圈猪猪我最肥","☀日落也会跑","不掉小珍🐖","快乐的刘油果","小地瓜☁","火鸡味锅巴","晕头小🐕","钞票收割机","吃土豆长大的马铃薯","Tony带水","古塔拉黑暗之神","换胃思烤","你没好果汁吃","元气少女锅德缸","对方正在长头发","关你peace","狂炫老板画的大饼","皮蛋solo粥","梁山伯与祝英抬杠","讨一身可爱","半口奶酪","一丢丢可爱","小不忍则卖大萌","春风十里吹不动你","夏目友人赖账","狂踹瘸子那条好腿","三条腿瘸了两条","蛋黄派来的","BOB！！！","激萌美少女李逵","老衲我不用飘柔"] ${nickName} Evaluate random.choice(${name_data}) random FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} @@ -645,3 +645,30 @@ region固定省市-梅州 Set Global Variable ${districtName} Set Global Variable ${provinceCode} Set Global Variable ${provinceName} + +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 + FOR ${province} IN @{local_data} #省列表数据 + ${provinceCode} Get From Dictionary ${province} value #获取省编码 + ${provinceName} Get From Dictionary ${province} label #获取省名称 + Exit For Loop If '${provinceName}'=='广东省' + END + ${city_data} Get From Dictionary ${province} children #广东省市列表数据 + FOR ${city} IN @{city_data} + ${cityCode} Get From Dictionary ${city} value #获取市编码 + ${cityName} Get From Dictionary ${city} label #获取市名称 + Exit For Loop If '${cityName}'=='汕头市' + END + ${district_data} Get From Dictionary ${city} children #广州市列表数据 + log ${district_data} + ${district} Evaluate random.choice(${district_data}) 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 ${provinceName} diff --git a/1-Applet/2-Homepage/MarriageInfo/Selection.robot b/1-Applet/2-Homepage/MarriageInfo/Selection.robot index 4ee3af3..9a37852 100644 --- a/1-Applet/2-Homepage/MarriageInfo/Selection.robot +++ b/1-Applet/2-Homepage/MarriageInfo/Selection.robot @@ -53,7 +53,7 @@ region END 提交${dating}征婚人择偶条件-户口所在地 - region固定省市-衡阳 + region固定省市-汕头 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "domicilePlaceProvinceCode": ${provinceCode}, \ \ \ \ "domicilePlaceProvinceName": "${provinceName}", \ \ \ \ "domicilePlaceCityCode": ${cityCode}, \ \ \ \ "domicilePlaceCityName": "${cityName}" } @@ -72,7 +72,7 @@ region END 提交${dating}征婚人择偶条件-家乡 - region固定省市-衡阳 + region固定省市-汕头 FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "hometownProvinceCode": ${provinceCode}, \ \ \ \ "hometownProvinceName": "${provinceName}", \ \ \ \ "hometownCityCode": ${cityCode}, \ \ \ \ "hometownCityName": "${cityName}" } @@ -112,7 +112,7 @@ region ${reps} GET On Session dating dating-agency-service/user/get/education/list ${data_list} Get From Dictionary ${reps.json()} data #${education_data} Evaluate random.choice(${data_list}) random #随机获取学历 - ${education_data} Get From List ${data_list} -1 #0高中以下，1中专，2大专，3本科。4硕士，5博士 + ${education_data} Get From List ${data_list} 3 #0高中以下，1中专，2大专，3本科。4硕士，5博士 ${education} Get From Dictionary ${education_data} desc #学历名称 ${educationCode} Get From Dictionary ${education_data} value #学历编码 Set Global Variable ${education} @@ -145,7 +145,7 @@ region ${reps} GET On Session dating dating-agency-service/user/get/marital/status/list ${data_list} Get From Dictionary ${reps.json()} data #${maritalStatusData} Evaluate random.choice(${data_list}) random #随机获取 - ${maritalStatusData} Get From List ${data_list} 1 #0未婚，1离异，2丧偶，-1无限 + ${maritalStatusData} Get From List ${data_list} 0 #0未婚，1离异，2丧偶，-1无限 ${maritalStatusCode} Get From Dictionary ${maritalStatusData} value #婚介状况编码 ${maritalStatusName} Get From Dictionary ${maritalStatusData} desc #婚介状况名称 Set Global Variable ${maritalStatusCode} @@ -167,9 +167,9 @@ region ${reps} GET On Session dating dating-agency-service/user/get/nation/list ${data} Get From Dictionary ${reps.json()} data #${nationData} Evaluate random.choice(${data}) random #随机获取名族数据 - ${nationdata} Set Variable [{"cn":"土家族","id":15},{"cn":"苗族","id":6},{"cn":"侗族","id":12},{"cn":"瑶族","id":13},{"cn":"白族","id":14},{"cn":"回族","id":3},{"cn":"壮族","id":8},{"cn":"维吾尔族","id":5}] - ${nationData} Evaluate random.choice(${nationdata}) random - #${nationData} Get From List ${data} 0 + #${nationdata} Set Variable [{"cn":"土家族","id":15},{"cn":"苗族","id":6},{"cn":"侗族","id":12},{"cn":"瑶族","id":13},{"cn":"白族","id":14},{"cn":"回族","id":3},{"cn":"壮族","id":8},{"cn":"维吾尔族","id":5}] + #${nationData} Evaluate random.choice(${nationdata}) random + ${nationData} Get From List ${data} 0 ${nation} Get From Dictionary ${nationData} cn #民族名称 ${nationCode} Get From Dictionary ${nationData} id #民族编码 Set Global Variable ${nation} @@ -207,7 +207,7 @@ region 提交${dating}征婚人的择偶条件-户籍 #提交征婚人的籍贯信息 - region固定省市-衡阳 + region固定省市-汕头 FOR ${client_header} IN @{Cheader_list} Create Session dating ${${dating}.dating域名} ${client_header} ${data} Set Variable { \ \ \ \ "miId": "${miId}", \ \ \ \ "nativePlaceName": "${provinceName}", \ \ \ \ "nativePlaceCode": "${provinceCode}" } @@ -260,7 +260,8 @@ region Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating dating-agency-service/user/get/car/purchase/situation ${data} Get From Dictionary ${reps.json()} data - ${carPurchaseSituationData} Evaluate random.choice(${data}) random #随机获取购车情况 + #${carPurchaseSituationData} Evaluate random.choice(${data}) random #随机获取购车情况 + ${carPurchaseSituationData} Get From List ${data} 0 #0已购车，1未购车 ${carPurchaseSituation} Get From Dictionary ${carPurchaseSituationData} desc #购车情况 ${carPurchaseSituationCode} Get From Dictionary ${carPurchaseSituationData} value #购车编码 Set Global Variable ${carPurchaseSituation} @@ -281,7 +282,8 @@ region Create Session dating ${${dating}.dating域名} ${client_header} ${reps} GET On Session dating dating-agency-service/user/get/property/permits ${data} Get From Dictionary ${reps.json()} data - ${propertyPermitsData} Evaluate random.choice(${data}) random #随机获取购房情况 + #${propertyPermitsData} Evaluate random.choice(${data}) random #随机获取购房情况 + ${propertyPermitsData} Get From List ${data} 0 #0家人同住，1已购房，2租房，3婚后购房，4单位宿舍 ${propertyPermits} Get From Dictionary ${propertyPermitsData} desc #购房情况 ${propertyPermitsCode} Get From Dictionary ${propertyPermitsData} value #购房编码 Set Global Variable ${propertyPermits} @@ -425,3 +427,31 @@ region固定省市-梅州 Set Global Variable ${districtName} Set Global Variable ${provinceCode} Set Global Variable ${provinceName} + +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 + FOR ${province} IN @{local_data} #省列表数据 + ${provinceCode} Get From Dictionary ${province} value #获取省编码 + ${provinceName} Get From Dictionary ${province} label #获取省名称 + Exit For Loop If '${provinceName}'=='广东省' + END + ${city_data} Get From Dictionary ${province} children #广东省市列表数据 + FOR ${city} IN @{city_data} + ${cityCode} Get From Dictionary ${city} value #获取市编码 + ${cityName} Get From Dictionary ${city} label #获取市名称 + Exit For Loop If '${cityName}'=='汕头市' + END + ${district_data} Get From Dictionary ${city} children #广州市列表数据 + log ${district_data} + ${district} Evaluate random.choice(${district_data}) 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} diff --git a/output/log.html b/output/log.html index c9fc965..a87a7df 100644 --- a/output/log.html +++ b/output/log.html @@ -1806,25 +1806,25 @@ function stopPropagation(event) { window.output = {};