diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index 56de67d..0e89c59 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,2 @@
手机号
-18024004975
\ No newline at end of file
+15873640527
\ No newline at end of file
diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot
index 7934a33..15727a5 100644
--- a/1-Applet/1-WriteInfo/InfoResource.robot
+++ b/1-Applet/1-WriteInfo/InfoResource.robot
@@ -30,7 +30,7 @@ Library OperatingSystem
... ELSE IF ${fillSerialNumber}==5 填写婚介征婚人的资料-学历开始
... ELSE IF ${fillSerialNumber}==6 填写婚介征婚人的资料-月收入开始
... ELSE IF ${fillSerialNumber}==7 填写婚介征婚人的资料-昵称开始
- ... ELSE 查询婚介用户资料
+ ... ELSE 查询婚介资料
END
Sleep 1
@@ -41,7 +41,7 @@ Library OperatingSystem
${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #填写序号
Set Global Variable ${fillSerialNumber}
-查询${dating}用户资料
+查询${dating}资料
FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list}
Disable Warnings
Create Session dating ${${dating}.dating域名} ${client_header}
@@ -112,7 +112,7 @@ Library OperatingSystem
选择婚介征婚人的昵称
填写${dating}征婚人的资料-昵称开始
- 查询婚介用户资料
+ 查询婚介资料
选择婚介征婚人的昵称
选择${dating}性别资料
@@ -138,7 +138,7 @@ Library OperatingSystem
选择${dating}征婚人的城市
#选择城市
#获取省市区
- region固定省市
+ region固定省市-广州
#选择征婚人地区资料
Disable Warnings
${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
@@ -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}-41 #固定年龄
+ ${year} Evaluate ${get_year}-21 #固定年龄
${Number} Evaluate 3 #填写序号
Create Session dating ${${dating}.dating域名} ${client_header}
${Data} Update Value To Json ${Data} $.id ${DataId}
@@ -261,17 +261,19 @@ Library OperatingSystem
选择${dating}征婚人的昵称
#填写征婚人昵称
- ${num} Evaluate random.randint(1,999) random #随机获取一个数字
- ${first_name} Set Variable ["赵", "钱", "孙", "李", "周", "吴", "郑", "王", "冯", "陈", "褚", "卫", "蒋", "沈", "韩", "杨", "朱", "秦", "尤", "许", "何", "吕", "施", "张", "孔", "曹", "严", "华", "金", "魏", "陶", "姜", "戚", "谢", "邹", "喻", "柏", "水", "窦", "章","云", "苏", "潘", "葛", "奚", "范", "彭", "郎", "鲁", "韦", "昌", "马", "苗", "凤", "花", "方", "俞", "任", "袁", "柳","酆", "鲍", "史", "唐", "费", "廉", "岑", "薛", "雷", "贺", "倪", "汤", "滕", "殷", "罗", "毕", "郝", "邬", "安", "常", "乐", "于", "时", "傅", "皮", "卞", "齐", "康", "伍", "余", "元", "卜", "顾", "孟", "平", "黄", "和", "穆", "萧", "尹", "姚", "邵", "堪", "汪", "祁", "毛", "禹", "狄", "米", "贝", "明", "臧", "计", "伏", "成", "戴", "谈", "宋", "茅", "庞","熊", "纪", "舒", "屈", "项", "祝", "董", "梁"]
- ${second_name} Set Variable [ "秀", "娟", "英", "华", "慧", "巧", "美", "娜", "静", "淑", "惠", "珠", "翠", "雅", "芝", "玉", "萍", "红", "娥", "玲","芬", "芳", "燕", "彩", "春", "菊", "兰", "凤", "洁", "梅", "琳", "素", "云", "莲", "真", "环", "雪", "荣", "爱", "畅","霞", "香", "月", "莺", "媛", "艳", "瑞", "凡", "佳", "嘉", "琼", "勤", "珍", "贞", "莉", "桂", "娣", "叶", "璧", "璐", "娅", "琦", "晶", "妍", "茜", "秋", "珊", "莎", "锦", "黛", "青", "倩", "婷", "姣", "婉", "娴", "瑾", "颖", "露", "瑶", "怡", "婵", "雁", "蓓", "纨", "仪", "荷", "丹", "蓉", "眉", "君", "琴", "蕊", "薇", "菁", "梦", "岚", "苑", "婕", "馨","瑗", "琰", "韵", "融", "园", "艺", "咏", "卿", "聪", "澜", "纯", "毓", "悦", "昭", "冰", "爽", "琬", "茗", "羽", "希", "宁", "欣", "飘", "育", "滢", "馥", "筠", "柔", "竹", "霭", "凝", "晓", "欢", "霄", "枫", "芸", "菲", "寒", "伊", "亚","宜", "可", "姬", "舒", "影", "荔", "枝", "思", "丽", "伟", "刚", "勇", "毅", "俊", "峰", "强", "军", "平", "保", "东", "文", "辉", "力", "明", "永", "健", "世", "广", "志", "义", "兴", "良", "海", "山", "仁", "波", "宁", "贵", "福", "生","龙", "元", "全", "国", "胜", "学", "祥", "才", "发", "武", "新", "利", "清", "飞", "彬", "富", "顺", "信", "子", "杰", "涛", "昌", "成", "康", "星", "光", "天", "达", "安", "岩", "中", "茂", "进", "林", "有", "坚", "和", "彪", "博", "诚", "先", "敬", "震", "振", "壮", "会", "思", "群", "豪", "心", "邦", "承", "乐", "绍", "功", "松", "善", "厚", "庆", "磊", "民", "友", "裕", "河", "哲", "江", "超", "浩", "亮", "政", "谦", "亨", "奇", "固", "之", "轮", "翰", "朗", "伯", "宏","言", "若", "鸣", "朋", "斌", "梁", "栋", "维", "启", "克", "伦", "翔", "旭", "鹏", "泽", "晨", "辰", "士", "以", "建","家", "致", "树", "炎", "德", "行", "时", "泰", "盛", "雄", "琛", "钧", "冠", "策", "腾", "楠", "榕", "风", "航", "弘"]
- ${firstName} Evaluate random.choice(${first_name}) random
- ${secondName} Evaluate random.choice(${second_name}) random
- ${number} Evaluate random.randint(1,2) random
- ${name} Set Variable
- FOR ${i} IN RANGE ${number}
- ${name} Set Variable ${name}${secondName}
- ${nickName} Set Variable ${firstName}${name}
- END
+ #${num} Evaluate random.randint(1,999) random #随机获取一个数字
+ #${first_name} Set Variable ["赵","钱","孙","李","周","吴","郑","王","冯","陈","褚","卫","蒋","沈","韩","杨","朱","秦","尤","许","何","吕","施","张","孔","曹","严","华","金","魏","陶","姜","戚","谢","邹","喻","柏","水","窦","章","云","苏","潘","葛","奚","范","彭","郎","鲁","韦","昌","马","苗","凤","花","方","俞","任","袁","柳","酆","鲍","史","唐","费","廉","岑","薛","雷","贺","倪","汤","滕","殷","罗","毕","郝","邬","安","常","乐","于","时","傅","皮","卞","齐","康","伍","余","元","卜","顾","孟","平","黄","和","穆","萧","尹","姚","邵","堪","汪","祁","毛","禹","狄","米","贝","明","臧","计","伏","成","戴","谈","宋","茅","庞","熊","纪","舒","屈","项","祝","董","梁"]
+ #${second_name} Set Variable ["秀","娟","英","华","慧","巧","美","娜","静","淑","惠","珠","翠","雅","芝","玉","萍","红","娥","玲","芬","芳","燕","彩","春","菊","兰","凤","洁","梅","琳","素","云","莲","真","环","雪","荣","爱","畅","霞","香","月","莺","媛","艳","瑞","凡","佳","嘉","琼","勤","珍","贞","莉","桂","娣","叶","璧","璐","娅","琦","晶","妍","茜","秋","珊","莎","锦","黛","青","倩","婷","姣","婉","娴","瑾","颖","露","瑶","怡","婵","雁","蓓","纨","仪","荷","丹","蓉","眉","君","琴","蕊","薇","菁","梦","岚","苑","婕","馨","瑗","琰","韵","融","园","艺","咏","卿","聪","澜","纯","毓","悦","昭","冰","爽","琬","茗","羽","希","宁","欣","飘","育","滢","馥","筠","柔","竹","霭","凝","晓","欢","霄","枫","芸","菲","寒","伊","亚","宜","可","姬","舒","影","荔","枝","思","丽","伟","刚","勇","毅","俊","峰","强","军","平","保","东","文","辉","力","明","永","健","世","广","志","义","兴","良","海","山","仁","波","宁","贵","福","生","龙","元","全","国","胜","学","祥","才","发","武","新","利","清","飞","彬","富","顺","信","子","杰","涛","昌","成","康","星","光","天","达","安","岩","中","茂","进","林","有","坚","和","彪","博","诚","先","敬","震","振","壮","会","思","群","豪","心","邦","承","乐","绍","功","松","善","厚","庆","磊","民","友","裕","河","哲","江","超","浩","亮","政","谦","亨","奇","固","之","轮","翰","朗","伯","宏","言","若","鸣","朋","斌","梁","栋","维","启","克","伦","翔","旭","鹏","泽","晨","辰","士","以","建","家","致","树","炎","德","行","时","泰","盛","雄","琛","钧","冠","策","腾","楠","榕","风","航","弘"]
+ #${firstName} Evaluate random.choice(${first_name}) random
+ #${secondName} Evaluate random.choice(${second_name}) random
+ #${number} Evaluate random.randint(1,2) random
+ #${name} Set Variable
+ #FOR ${i} IN RANGE ${number}
+ #${name} Set Variable ${name}${secondName}
+ #${nickName} Set Variable ${firstName}${name}
+ #END
+ ${Name} Set Variable ["缘来是你","一枚普通人","向阳","洛天神女","寻那个TA","一片烨","有一个朋友","Tough","陌上花开李公子","冲浪boy","小十七","黑色星期四","Alan","人生若只如初见","Te-amo","王小帅","王先生","牛仔","张先生","伞下铭","骑士","细水长流","就等你了","弱水三千,我只取你一瓢","搬石头砸你的jio","遗落世间的小仙女","阳光正好,微风不燥","故乡的原风景","万里&长城","遥远的旅途2024","禁忌女孩","如果当时...","漫天星河不及你回朦一瞥","雪落下的地方","故事的小黄花","天蝎座的宁静","心之所向","烟火","白色气球","带你去浪漫的土耳其","风居住的城堡","别打了我是酱油","山东在逃挖掘机","餐桌C位","网名不要太长像我这样就好","村里在逃翠花❀","林黛玉醉打蒋门神","萝莉啰嗦","美少女壮士","百变少女猪刚","诺贝尔可爱奖","睡到人间煮饭时","虚天渊","用发际线换对象","龙卷风卷走爱情","死于脚气攻心","发型不乱,一切好办","农夫三拳有点疼","举不动的小公主"]
+ ${nickName} Evaluate random.choice(${Name}) random
${Number} Evaluate 7
Create Session dating ${${dating}.dating域名} ${client_header}
${Data} Update Value To Json ${Data} $.id ${DataId}
@@ -310,7 +312,7 @@ region
Set Global Variable ${provinceCode}
Set Global Variable ${provinceName}
-region固定省市
+region固定省市-广州
Disable Warnings
Create Session region http://qncloud.oss-cn-shenzhen.aliyuncs.com
${reps} GET On Session region address.json
@@ -337,3 +339,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/1-WriteInfo/Infomation.robot b/1-Applet/1-WriteInfo/Infomation.robot
index 5124c3d..83ab43e 100644
--- a/1-Applet/1-WriteInfo/Infomation.robot
+++ b/1-Applet/1-WriteInfo/Infomation.robot
@@ -1,7 +1,7 @@
*** Settings ***
Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
Resource InfoResource.robot
-Resource ../0-Login/LoginResource.robot
+Resource ../../0-Login/LoginResource.robot
Library Collections
Library RequestsLibrary
diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
index 6231a11..2e66bf6 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
@@ -4,7 +4,6 @@ Library String
Library Collections
Library RequestsLibrary
Library DatabaseLibrary
-Resource ../../1-WriteInfo/InfoResource.robot
Resource ../../../0-Login/LoginResource.robot
*** Keywords ***
@@ -65,11 +64,11 @@ Resource ../../../0-Login/LoginResource.robot
提价${dating}征婚人相册审核
#男生相册
${man_imgUrllist} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/30464b28455d6ddbc1f049ce4adfda7a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c7c968a93cff69375df767aefe112da4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e1c238e45a3c9264b83c0b1d4054019.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/0c1e15d1c956cb8bb678b2a1f7992f76.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/aea0caca25438b7490305cd4c704d515.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/14eee17ccd0333cda335d68004885f1f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/863db444113cabe238ce37e1ff12d8c8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/42e77d2434934a6fc24638fd5bf130d6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/122668a4d1cc4fcffd91fc3d2934fc8b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/24ef3e3c4e781b97c9e3da52cc2a6a88.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c91757deace453ee22c3d12ea9913bd0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b2b34146d7354dab2d7a7c6e65395762.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/905cbc906449e997be51c6b129c9481e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/18a7ce70dbba030da53442f0ad55e63b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/991c4bc6f06c1c3fb1d6a9a5178ee34c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/df8705ac114d936428d0765f78fc3af8.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5d4eeebbf9f7df899a8964d3c802a2b7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/61971786fabc9be4718e10f9323649ef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f99a80033c77b990f9d2c75c2e6b6c1e.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6647f59b5f8057c9aa67324261153cdd.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/fde465e0db7e83a6a29ad133c270c8ba.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/647e941c007594cd32d977b172efe58a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ca8faec9558e2aae046f8620fd21fed6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82e53568724f2010025231a600fd78b2.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e40ca792f19cb70f045ebfe04c57c52c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/9e62e2e3ad1b53d20a933a651c958201.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7f7e09f9c1f83b68de7967df210716d4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/3d9ccb6c9206e28c3dd6104d38eccd19.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/ccc7a8fea47b80921b7cc790c87d6bc1.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/71a5453ecfd81a21c7fbbbcea50ec6ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bc07ad3c778a592b48a48a01a6e6bcee.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/228b58091bcdac00789bcefd77886cf2.jpg"]
- ${manimgUrl_data} Evaluate random.sample(${man_imgUrllist},2) random,string #随机获取3张图片
+ ${manimgUrl_data} Evaluate random.sample(${man_imgUrllist},1) random,string #随机获取3张图片
${manimgUrl_List} Evaluate demjson.encode(${manimgUrl_data}) demjson
#女生相册
${woman_imgUrllist} Set Variable ["https://dating-agency-test.oss-accelerate.aliyuncs.com/71e2ac4806378e5c6f29e2e9d01f1b3b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/cd5dda0a1f539861cc78f1bef4a8e8ab.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/82d51050e13fea977a054a0208d1e616.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c6fc977ab1effc2f57c1b61ea0b4a10b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/59aae418037d0bf103f63de805eeb86b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/960b3d371ed4af8788c1fc4a8c889933.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/884c65f91e6b346bb7c9e26e750ce4d3.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c5e4bca3b533fdfbcc2557e83512215c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/bbef238ab2bea9bd3e831d0e9d9557e4.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/1c771bf0c01eb0e5fab3fede9dab7608.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/6df02f3978e72f14fb2b33b9a3e56fe9.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/c9525ae0873fe94a5dd15a01717c07a0.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/417ebe61e78592b42d212eb00a2ec23c.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/1adabba412cc81d3fa40fdf78eba46d7.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/afcf0ad64c7224a8a08163cc98ef6cb6.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/84b55bb41fcf7350d2c86d0d518bf546.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/80d9c390581014ea327efabc749cf042.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7ea11516b07156a1bcfa227c4fef9207.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/abae88e4e07536531d0ac7d03f7f576b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/a2826ad22aab2d082bb3598b387f1689.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b26399e635fa7dd44808342595fa334a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/b3a641d16e9e547228a8ccbc8e7e5aef.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/cc28a387d249a8673a0cd24cf9e49896.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/7615cc23bd2cf922e50e5fb3810e749f.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/d0d15693e059e2525d4ea469451e4387.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/f43b18d37584c0797d8ef3606d578a11.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/55f9f41f1ff9f2b71837af94ec02126a.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/af74f07f326842a4c958f855ce11544b.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/753745c3d3bdbffc9fecff9b3869d880.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/5e3fb99b37448612749dd8b3fc5cf917.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/91b79f1e3eb2b13fa334de8157a6b9be.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/94ebc0dc461bea0feea8876620a922fb.jpg","https://dating-agency-test.oss-accelerate.aliyuncs.com/e94e9f29216a38527dbdc3aa75f7f415.jpg"]
- ${womanimgUrl_data} Evaluate random.sample(${woman_imgUrllist},3) random,string #随机获取5张图片
+ ${womanimgUrl_data} Evaluate random.sample(${woman_imgUrllist},5) random,string #随机获取5张图片
${womanimgUrl_List} Evaluate demjson.encode(${womanimgUrl_data}) demjson
${Code} Evaluate 6
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
@@ -96,7 +95,7 @@ Resource ../../../0-Login/LoginResource.robot
#女生身份证
${woman_value} Set Variable 赖勇兰,441481199509213863
#男生身份证
- ${value_list} Create List 李博,429006198410300956 王颖勋,44058319951227041X
+ ${value_list} Create List 李博,429006198410300956
${man_value} Evaluate random.choice(${value_list}) random
${code} Evaluate 0
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
@@ -135,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}" }
@@ -155,7 +154,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}" }
@@ -166,6 +165,27 @@ Resource ../../../0-Login/LoginResource.robot
Set Global Variable ${miId}
END
+提交${dating}征婚人的婚姻状况
+ #查询婚姻状况,随机获取
+ FOR ${client_header} IN @{Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${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 #随机获取
+ ${maritalStatusCode} Get From Dictionary ${maritalStatusData} value #婚介状况编码
+ ${maritalStatusName} Get From Dictionary ${maritalStatusData} desc #婚介状况名称
+ Set Global Variable ${maritalStatusCode}
+ Set Global Variable ${maritalStatusName}
+ END
+ #提交择偶婚姻状况
+ FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable { \ \ \ \ "id": "${miId}", \ \ \ \ "maritalStatusName": "${maritalStatusName}", \ \ \ \ "maritalStatusCode": ${maritalStatusCode} }
+ ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${data.encode('utf-8')}
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ END
+
修改${dating}征婚人的身高
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
@@ -184,7 +204,7 @@ Resource ../../../0-Login/LoginResource.robot
${man_weight} Evaluate random.randint(45,120) random #获取随机体重-男
${woman_weight} Evaluate random.randint(35,100) random #获取随机体重-女
${weight_data} Set Variable If ${genderCode}==0 { \ \ \ \ "id": "${miId}", \ \ \ \ "weight": "${man_weight}", \ \ \ \ "height": "${height}" } { \ \ \ \ "id": "${miId}", \ \ \ \ "weight": "${woman_weight}", \ \ \ \ "height": "${height}" }
- ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${data.encode('utf-8')}
+ ${reps} POST On Session dating dating-agency-service/user/save/marriage/Information ${weight_data.encode('utf-8')}
${message} Get From Dictionary ${reps.json()} message
Should Be Equal As Strings ${message} successful
END
@@ -290,6 +310,7 @@ Resource ../../../0-Login/LoginResource.robot
提交${dating}征婚人的学历审核
#提交征婚人学历审核
+ 数据库新增学历认证次数
${value} Generate Random String 18 [NUMBERS] #随机生成18位数字
${authenticationCode} Evaluate 1 #学历编码
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
@@ -305,17 +326,19 @@ Resource ../../../0-Login/LoginResource.robot
Set Global Variable ${auditId}
修改${dating}征婚人昵称
- ${num} Evaluate random.randint(1,999) random #随机获取一个数字
- ${first_name} Set Variable ["赵", "钱", "孙", "李", "周", "吴", "郑", "王", "冯", "陈", "褚", "卫", "蒋", "沈", "韩", "杨", "朱", "秦", "尤", "许", "何", "吕", "施", "张", "孔", "曹", "严", "华", "金", "魏", "陶", "姜", "戚", "谢", "邹", "喻", "柏", "水", "窦", "章","云", "苏", "潘", "葛", "奚", "范", "彭", "郎", "鲁", "韦", "昌", "马", "苗", "凤", "花", "方", "俞", "任", "袁", "柳","酆", "鲍", "史", "唐", "费", "廉", "岑", "薛", "雷", "贺", "倪", "汤", "滕", "殷", "罗", "毕", "郝", "邬", "安", "常", "乐", "于", "时", "傅", "皮", "卞", "齐", "康", "伍", "余", "元", "卜", "顾", "孟", "平", "黄", "和", "穆", "萧", "尹", "姚", "邵", "堪", "汪", "祁", "毛", "禹", "狄", "米", "贝", "明", "臧", "计", "伏", "成", "戴", "谈", "宋", "茅", "庞","熊", "纪", "舒", "屈", "项", "祝", "董", "梁"]
- ${second_name} Set Variable [ "秀", "娟", "英", "华", "慧", "巧", "美", "娜", "静", "淑", "惠", "珠", "翠", "雅", "芝", "玉", "萍", "红", "娥", "玲","芬", "芳", "燕", "彩", "春", "菊", "兰", "凤", "洁", "梅", "琳", "素", "云", "莲", "真", "环", "雪", "荣", "爱", "畅","霞", "香", "月", "莺", "媛", "艳", "瑞", "凡", "佳", "嘉", "琼", "勤", "珍", "贞", "莉", "桂", "娣", "叶", "璧", "璐", "娅", "琦", "晶", "妍", "茜", "秋", "珊", "莎", "锦", "黛", "青", "倩", "婷", "姣", "婉", "娴", "瑾", "颖", "露", "瑶", "怡", "婵", "雁", "蓓", "纨", "仪", "荷", "丹", "蓉", "眉", "君", "琴", "蕊", "薇", "菁", "梦", "岚", "苑", "婕", "馨","瑗", "琰", "韵", "融", "园", "艺", "咏", "卿", "聪", "澜", "纯", "毓", "悦", "昭", "冰", "爽", "琬", "茗", "羽", "希", "宁", "欣", "飘", "育", "滢", "馥", "筠", "柔", "竹", "霭", "凝", "晓", "欢", "霄", "枫", "芸", "菲", "寒", "伊", "亚","宜", "可", "姬", "舒", "影", "荔", "枝", "思", "丽", "伟", "刚", "勇", "毅", "俊", "峰", "强", "军", "平", "保", "东", "文", "辉", "力", "明", "永", "健", "世", "广", "志", "义", "兴", "良", "海", "山", "仁", "波", "宁", "贵", "福", "生","龙", "元", "全", "国", "胜", "学", "祥", "才", "发", "武", "新", "利", "清", "飞", "彬", "富", "顺", "信", "子", "杰", "涛", "昌", "成", "康", "星", "光", "天", "达", "安", "岩", "中", "茂", "进", "林", "有", "坚", "和", "彪", "博", "诚", "先", "敬", "震", "振", "壮", "会", "思", "群", "豪", "心", "邦", "承", "乐", "绍", "功", "松", "善", "厚", "庆", "磊", "民", "友", "裕", "河", "哲", "江", "超", "浩", "亮", "政", "谦", "亨", "奇", "固", "之", "轮", "翰", "朗", "伯", "宏","言", "若", "鸣", "朋", "斌", "梁", "栋", "维", "启", "克", "伦", "翔", "旭", "鹏", "泽", "晨", "辰", "士", "以", "建","家", "致", "树", "炎", "德", "行", "时", "泰", "盛", "雄", "琛", "钧", "冠", "策", "腾", "楠", "榕", "风", "航", "弘"]
- ${firstName} Evaluate random.choice(${first_name}) random
- ${secondName} Evaluate random.choice(${second_name}) random
- ${number} Evaluate random.randint(1,2) random
- ${name} Set Variable
- FOR ${i} IN RANGE ${number}
- ${name} Set Variable ${name}${secondName}
- ${nickName} Set Variable ${firstName}${name}
- END
+ #${num} Evaluate random.randint(1,999) random #随机获取一个数字
+ #${first_name} Set Variable ["赵", "钱", "孙", "李", "周", "吴", "郑", "王", "冯", "陈", "褚", "卫", "蒋", "沈", "韩", "杨", "朱", "秦", "尤", "许", "何", "吕", "施", "张", "孔", "曹", "严", "华", "金", "魏", "陶", "姜", "戚", "谢", "邹", "喻", "柏", "水", "窦", "章","云", "苏", "潘", "葛", "奚", "范", "彭", "郎", "鲁", "韦", "昌", "马", "苗", "凤", "花", "方", "俞", "任", "袁", "柳","酆", "鲍", "史", "唐", "费", "廉", "岑", "薛", "雷", "贺", "倪", "汤", "滕", "殷", "罗", "毕", "郝", "邬", "安", "常", "乐", "于", "时", "傅", "皮", "卞", "齐", "康", "伍", "余", "元", "卜", "顾", "孟", "平", "黄", "和", "穆", "萧", "尹", "姚", "邵", "堪", "汪", "祁", "毛", "禹", "狄", "米", "贝", "明", "臧", "计", "伏", "成", "戴", "谈", "宋", "茅", "庞","熊", "纪", "舒", "屈", "项", "祝", "董", "梁"]
+ #${second_name} Set Variable [ "秀", "娟", "英", "华", "慧", "巧", "美", "娜", "静", "淑", "惠", "珠", "翠", "雅", "芝", "玉", "萍", "红", "娥", "玲","芬", "芳", "燕", "彩", "春", "菊", "兰", "凤", "洁", "梅", "琳", "素", "云", "莲", "真", "环", "雪", "荣", "爱", "畅","霞", "香", "月", "莺", "媛", "艳", "瑞", "凡", "佳", "嘉", "琼", "勤", "珍", "贞", "莉", "桂", "娣", "叶", "璧", "璐", "娅", "琦", "晶", "妍", "茜", "秋", "珊", "莎", "锦", "黛", "青", "倩", "婷", "姣", "婉", "娴", "瑾", "颖", "露", "瑶", "怡", "婵", "雁", "蓓", "纨", "仪", "荷", "丹", "蓉", "眉", "君", "琴", "蕊", "薇", "菁", "梦", "岚", "苑", "婕", "馨","瑗", "琰", "韵", "融", "园", "艺", "咏", "卿", "聪", "澜", "纯", "毓", "悦", "昭", "冰", "爽", "琬", "茗", "羽", "希", "宁", "欣", "飘", "育", "滢", "馥", "筠", "柔", "竹", "霭", "凝", "晓", "欢", "霄", "枫", "芸", "菲", "寒", "伊", "亚","宜", "可", "姬", "舒", "影", "荔", "枝", "思", "丽", "伟", "刚", "勇", "毅", "俊", "峰", "强", "军", "平", "保", "东", "文", "辉", "力", "明", "永", "健", "世", "广", "志", "义", "兴", "良", "海", "山", "仁", "波", "宁", "贵", "福", "生","龙", "元", "全", "国", "胜", "学", "祥", "才", "发", "武", "新", "利", "清", "飞", "彬", "富", "顺", "信", "子", "杰", "涛", "昌", "成", "康", "星", "光", "天", "达", "安", "岩", "中", "茂", "进", "林", "有", "坚", "和", "彪", "博", "诚", "先", "敬", "震", "振", "壮", "会", "思", "群", "豪", "心", "邦", "承", "乐", "绍", "功", "松", "善", "厚", "庆", "磊", "民", "友", "裕", "河", "哲", "江", "超", "浩", "亮", "政", "谦", "亨", "奇", "固", "之", "轮", "翰", "朗", "伯", "宏","言", "若", "鸣", "朋", "斌", "梁", "栋", "维", "启", "克", "伦", "翔", "旭", "鹏", "泽", "晨", "辰", "士", "以", "建","家", "致", "树", "炎", "德", "行", "时", "泰", "盛", "雄", "琛", "钧", "冠", "策", "腾", "楠", "榕", "风", "航", "弘"]
+ #${firstName} Evaluate random.choice(${first_name}) random
+ #${secondName} Evaluate random.choice(${second_name}) random
+ #${number} Evaluate random.randint(1,2) random
+ #${name} Set Variable
+ #FOR ${i} IN RANGE ${number}
+ #${name} Set Variable ${name}${secondName}
+ #${nickName} Set Variable ${firstName}${name}
+ #END
+ ${name_data} Set Variable ["草泥马"]
+ ${nickName} Evaluate random.choice(${name_data}) random
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
Create Session dating ${${dating}.dating域名} ${client_header}
${Number} Evaluate 7
@@ -334,9 +357,9 @@ Resource ../../../0-Login/LoginResource.robot
...
... @{num} 设置手机号开头前3位
#生成手机号
- ${num} Evaluate random.choice(["139","188","185","136","158","151","132","156","189","187","135","134"]) random
- ${number} Evaluate "".join(random.sample("01234567897",8)) random,string
- ${phone} Evaluate ${num}${number}
+ #${num} Evaluate random.choice(["139","188","185","136","158","151","132","156","189","187","135","134"]) random
+ #${number} Evaluate "".join(random.sample("01234567897",8)) random,string
+ #${phone} Evaluate ${num}${number}
#${phone} Evaluate random.choice(["139","188","185","136","158","151","132","156","189","187","135","134",@(num)])+"".join(random.sample("01234567897",8)) random,string #获取手机号
#获取家庭关系
FOR ${client_header} IN @{Cheader_list}
@@ -399,3 +422,100 @@ Resource ../../../0-Login/LoginResource.robot
${message} Get From Dictionary ${reps.json()} message
Should Be Equal As Strings ${message} successful
END
+
+数据库新增学历认证次数
+ FOR ${userId} ${miId} IN ZIP ${userid_list} ${miId_list}
+ ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S
+ ${Time} Add Time To Date ${dataTime} 30 days
+ Connect To Database Using Custom Params pymysql database='dating_agency_mall',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+ ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 101, '${dataTime}', '${Time}', 1) #插入一条学历认证数据
+ ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '101' #查询权益id
+ ${right_id} Set Variable ${check_1[0][0]}
+ ${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '规格', 1, 102, NULL)
+ ${insert_3} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益上限额度', 2, 1, '10')
+ ${insert_4} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益剩余额度', 3, 1, '10')
+ Disconnect From Database
+ END
+
+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
+ #随机获取省
+ ${province} Evaluate random.choice(${local_data}) random #随机获取省区域
+ ${provinceCode} Get From Dictionary ${province} value #获取省编码
+ ${provinceName} Get From Dictionary ${province} label #获取省名称
+ ${Children} Get From Dictionary ${province} children #获取省市
+ #随机获取市
+ ${city_data} Evaluate random.choice(${Children}) random #随机获取市区域
+ ${cityCode} Get From Dictionary ${city_data} value #获取市编码
+ ${cityName} Get From Dictionary ${city_data} label #获取市名称
+ ${Children} Get From Dictionary ${city_data} children #获取省市
+ #随机获取区
+ ${district} Evaluate random.choice(${Children}) 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}
+
+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}
+
+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/MarriageInfo/DataAuthentication.robot b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
index 64e0166..d393c8c 100644
--- a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
@@ -49,6 +49,10 @@ Resource ../../../0-Login/LoginResource.robot
Given 查询婚介征婚人的资料信息
Then 提交婚介征婚人民族信息
+提交征婚人的婚姻状况信息
+ Given 查询婚介征婚人的资料信息
+ Then 提交婚介征婚人的婚姻状况
+
提交征婚人的星座信息
Given 查询婚介征婚人的资料信息
Then 提交婚介征婚人星座信息
diff --git a/1-Applet/2-Homepage/MarriageInfo/Selection.robot b/1-Applet/2-Homepage/MarriageInfo/Selection.robot
index 1276041..74e1e15 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Selection.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Selection.robot
@@ -4,7 +4,6 @@ Library String
Library Collections
Library RequestsLibrary
Library DatabaseLibrary
-Resource ../../1-WriteInfo/InfoResource.robot
*** Keywords ***
region
@@ -54,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}" }
@@ -73,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}" }
@@ -99,7 +98,7 @@ region
${man_minHeight} Evaluate random.randint(150,160) random #随机获取最小择偶身高-女
${man_maxHeight} Evaluate random.randint(${man_minHeight},180) random #随机获取最大择偶身高-女
${woman_minHeight} Evaluate random.randint(170,180) random #随机获取最小择偶身高-男
- ${woman_minHeight} Evaluate random.randint(${woman_minHeight},207) random #随机获取最大择偶身高-男
+ ${woman_maxHeight} Evaluate random.randint(${woman_minHeight},207) random #随机获取最大择偶身高-男
${data} Set Variable If ${genderCode}==0 { \ \ \ \ "miId": "${miId}", \ \ \ \ "minHeight": ${man_minHeight}, \ \ \ \ "maxHeight": ${man_maxHeight} } { \ \ \ \ "miId": "${miId}", \ \ \ \ "minHeight": ${woman_minHeight}, \ \ \ \ "maxHeight": ${woman_maxHeight} }
${reps} POST On Session dating dating-agency-service/user/save/demand/marriage ${data.encode('utf-8')}
${message} Get From Dictionary ${reps.json()} message
@@ -310,3 +309,86 @@ region
${message} Get From Dictionary ${reps.json()} message
Should Be Equal As Strings ${message} successful
END
+
+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
+ #随机获取省
+ ${province} Evaluate random.choice(${local_data}) random #随机获取省区域
+ ${provinceCode} Get From Dictionary ${province} value #获取省编码
+ ${provinceName} Get From Dictionary ${province} label #获取省名称
+ ${Children} Get From Dictionary ${province} children #获取省市
+ #随机获取市
+ ${city_data} Evaluate random.choice(${Children}) random #随机获取市区域
+ ${cityCode} Get From Dictionary ${city_data} value #获取市编码
+ ${cityName} Get From Dictionary ${city_data} label #获取市名称
+ ${Children} Get From Dictionary ${city_data} children #获取省市
+ #随机获取区
+ ${district} Evaluate random.choice(${Children}) 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}
+
+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}
+
+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 c069c20..974e457 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};