diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index 854e3f5..8b51277 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,3 @@
手机号
-13213049527
\ No newline at end of file
+13619457280
+13242150738
\ No newline at end of file
diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot
index 6d6724f..506f946 100644
--- a/1-Applet/1-WriteInfo/InfoResource.robot
+++ b/1-Applet/1-WriteInfo/InfoResource.robot
@@ -11,17 +11,36 @@ Library OperatingSystem
*** Keywords ***
首次查询${dating}征婚人资料
#获取首次婚介资料信息
+ ${fillSerialNumber_list} Create List
+ ${Data_list} Create List
FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list}
+ ${DataId_list} Create 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}
+ ${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
${DataId} Get From Dictionary ${reps.json()['data']} id #资料id
+ ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #资料性别
${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #查询资料填写序号
${message} Get From Dictionary ${reps.json()} message
Should Be Equal As Strings ${message} successful
+ Append To List ${Data_list} ${Data}
+ Append To List ${DataId_list} ${DataId}
+ Append To List ${fillSerialNumber_list} ${fillSerialNumber}
Set Global Variable ${Data}
Set Global Variable ${DataId}
+ Set Global Variable ${Data_list}
+ Set Global Variable ${genderCode}
+ Set Global Variable ${DataId_list}
+ #Run Keyword If ${fillSerialNumber}==0 填写婚介征婚人的基础资料
+ ... # ELSE 查询婚介用户资料
+ END
+ Set Global Variable ${Data_list}
+ Set Global Variable ${genderCode}
+ Set Global Variable ${DataId_list}
+ Set Global Variable ${fillSerialNumber_list}
+ #首次填写用户资料
+ FOR ${fillSerialNumber} IN @{fillSerialNumber_list}
Run Keyword If ${fillSerialNumber}==0 填写婚介征婚人的基础资料
... ELSE IF ${fillSerialNumber}==1 填写婚介征婚人资料-城市开始
... ELSE IF ${fillSerialNumber}==2 填写婚介征婚人的资料-家乡开始
@@ -32,7 +51,7 @@ Library OperatingSystem
... ELSE IF ${fillSerialNumber}==7 填写婚介征婚人的资料-昵称开始
... ELSE 查询婚介用户资料
END
- Sleep 1
+ sleep 1
检查首次填写${dating}资料序号
#检查首次填写序号
@@ -120,175 +139,190 @@ Library OperatingSystem
#选择性别
Log To Console ${CURDIR} #打印当前路径
Disable Warnings
- #${sex-code} Create List 0 1
- #${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号
- ${SexCode} Evaluate 1 #固定性别，男：0，女：1
+ ${DataId_list} Create List
+ ${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}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- log ${Data}
- ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')}
- ${DataId} Get From Dictionary ${reps.json()} data #获取证婚人资料id
- ${message} Get From Dictionary ${reps.json()} message
- Should Be Equal As Strings ${message} successful
- Set Global Variable ${DataId}
- ${percentage} Evaluate 3
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${Data} ${client_header} IN ZIP ${Data_list} ${Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.genderCode ${SexCode}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')}
+ ${DataId} Get From Dictionary ${reps.json()} data #获取证婚人资料id
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ Append To List ${DataId_list} ${DataId}
+ Set Global Variable ${DataId}
+ Set Global Variable ${SexCode}
+ Set Global Variable ${DataId_list}
+ ${percentage} Evaluate 3
+ Set Global Variable ${percentage}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的城市
#选择城市
- #获取省市区
- region固定省市-广州
- #选择征婚人地区资料
- 查询婚介用户资料百分比
- ${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.cityCode ${cityCode}
- ${Data} Update Value To Json ${Data} $.cityName ${cityName}
- ${Data} Update Value To Json ${Data} $.districtCode ${districtCode}
- ${Data} Update Value To Json ${Data} $.districtName ${districtName}
- ${Data} Update Value To Json ${Data} $.provinceCode ${provinceCode}
- ${Data} Update Value To Json ${Data} $.provinceName ${provinceName}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+2
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ region固定省市-广州 #获取省市区
+ ${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.cityCode ${cityCode}
+ ${Data} Update Value To Json ${Data} $.cityName ${cityName}
+ ${Data} Update Value To Json ${Data} $.districtCode ${districtCode}
+ ${Data} Update Value To Json ${Data} $.districtName ${districtName}
+ ${Data} Update Value To Json ${Data} $.provinceCode ${provinceCode}
+ ${Data} Update Value To Json ${Data} $.provinceName ${provinceName}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的家乡
- #选择城市
- #获取省市区
- region固定省市-汕头
- #选择征婚人地区资料
- 查询婚介用户资料百分比
- Disable Warnings
- ${Number} Evaluate 2 #0:"性别",1:"所在城市",2:"家乡"3:"出生年份",4:"身高",5:"学历",6:"月收入",7:"昵称",8:"首次填写完成"
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.hometownCityCode ${cityCode}
- ${Data} Update Value To Json ${Data} $.hometownCityName ${cityName}
- ${Data} Update Value To Json ${Data} $.hometownProvinceCode ${provinceCode}
- ${Data} Update Value To Json ${Data} $.hometownProvinceName ${provinceName}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+0
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ #选择家乡
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ region固定省市-汕头 #获取省市区
+ Disable Warnings
+ ${Number} Evaluate 2 #0:"性别",1:"所在城市",2:"家乡"3:"出生年份",4:"身高",5:"学历",6:"月收入",7:"昵称",8:"首次填写完成"
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.hometownCityCode ${cityCode}
+ ${Data} Update Value To Json ${Data} $.hometownCityName ${cityName}
+ ${Data} Update Value To Json ${Data} $.hometownProvinceCode ${provinceCode}
+ ${Data} Update Value To Json ${Data} $.hometownProvinceName ${provinceName}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的出生年份
#选择征婚人出生年份
- 查询婚介用户资料百分比
- ${get_year} Get Current Date result_format=%Y
- #${start-year} Evaluate 1950
- #${end-year} Evaluate ${get_year}-18
- #${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份
- ${year} Evaluate ${get_year}-28 #固定年龄
- ${Number} Evaluate 3 #填写序号
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.birthYear ${year}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+2
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ 查询婚介用户资料百分比
+ ${get_year} Get Current Date result_format=%Y
+ #${start-year} Evaluate 1950
+ #${end-year} Evaluate ${get_year}-18
+ #${year} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份
+ ${year} Evaluate ${get_year}-20 #固定年龄
+ ${Number} Evaluate 3 #填写序号
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.birthYear ${year}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的身高
#选择征婚人身高
- 查询婚介用户资料百分比
- ${low-height} Evaluate 150
- ${hight-height} Evaluate 175
- ${height} Evaluate random.randint(${low-height},${hight-height}) random
- ${Number} Evaluate 4
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.height ${height}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+1
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ ${manlow-height} Evaluate 170
+ ${manhight-height} Evaluate 200
+ ${manheight} Evaluate random.randint(${manlow-height},${manhight-height}) random
+ ${womanlow-height} Evaluate 150
+ ${womanhight-height} Evaluate 175
+ ${womanheight} Evaluate random.randint(${womanlow-height},${womanhight-height}) random
+ ${height} Set Variable If ${genderCode}==1 ${womanheight} ${manheight}
+ ${Number} Evaluate 4
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.height ${height}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的学历
#选择征婚人的学历
- 查询婚介用户资料百分比
- ${code} Create List 0 1 2 3 4 5 #0：高中及以下，1：中专，2：大专，3：大学本科，4：硕士，5：硕士
- ${educode} Evaluate random.choice(${code}) random #随机获取学历编码
- #${educode} Evaluate 0 #固定学历
- ${Number} Evaluate 5
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.educationCode ${educode}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+1
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ ${code} Create List 0 1 2 3 4 5 #0：高中及以下，1：中专，2：大专，3：大学本科，4：硕士，5：硕士
+ ${educode} Evaluate random.choice(${code}) random #随机获取学历编码
+ #${educode} Evaluate 0 #固定学历
+ ${Number} Evaluate 5
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.educationCode ${educode}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的婚姻状况
#选择征婚人的婚姻状况
- 查询婚介用户资料百分比
- #${code} Create List 0 1 2 #0：未婚，1：离异，2：丧偶的
- #${maritalCode} Evaluate random.choice(${code}) random #随机获取婚姻状态编码
- ${maritalCode} Evaluate 2 #固定婚姻状况
- ${Number} Evaluate 5
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.maritalStatusCode ${maritalCode}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+2
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ #${code} Create List 0 1 2 #0：未婚，1：离异，2：丧偶的
+ #${maritalCode} Evaluate random.choice(${code}) random #随机获取婚姻状态编码
+ ${maritalCode} Evaluate 2 #固定婚姻状况
+ ${Number} Evaluate 5
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.maritalStatusCode ${maritalCode}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的月收入
#选择征婚人的月收入
- 查询婚介用户资料百分比
- ${code} Create List 0 1 2 3 4 5 6 #0：3000以下，1：3001~5000，2：5001~8000，3：8001~12000，4：12001~20000，5：20001~50000，6：50000以上
- ${incomeCode} Evaluate random.choice(${code}) random #随机月收入
- #${incomeCode} Evaluate 0 #固定月收入
- ${Number} Evaluate 6
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.incomeCode ${incomeCode}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+1
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ ${code} Create List 0 1 2 3 4 5 6 #0：3000以下，1：3001~5000，2：5001~8000，3：8001~12000，4：12001~20000，5：20001~50000，6：50000以上
+ ${incomeCode} Evaluate random.choice(${code}) random #随机月收入
+ #${incomeCode} Evaluate 0 #固定月收入
+ ${Number} Evaluate 6
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.incomeCode ${incomeCode}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
选择${dating}征婚人的昵称
#填写征婚人昵称
@@ -303,22 +337,23 @@ Library OperatingSystem
#${name} Set Variable ${name}${secondName}
#${nickName} Set Variable ${firstName}${name}
#END
- 查询婚介用户资料百分比
- ${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}
- ${Data} Update Value To Json ${Data} $.id ${DataId}
- ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
- ${Data} Update Value To Json ${Data} $.nickName ${nickName}
- ${Data} Evaluate demjson.encode(${DATA}) demjson
- ${Data} Replace String ${Data} "None" null
- ${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}
- ${percentage} Evaluate ${percentData}+5
- 查询婚介用户资料百分比
- Should Be Equal As Numbers ${percentage} ${percentData}
+ FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
+ ${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}
+ ${Data} Update Value To Json ${Data} $.id ${DataId}
+ ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number}
+ ${Data} Update Value To Json ${Data} $.nickName ${nickName}
+ #${Data} Evaluate demjson.encode(${DATA}) demjson
+ ${Data} Convert To String ${Data}
+ ${Data} Replace String ${Data} None null
+ ${Data} Replace String Using Regexp ${Data} ' "
+ ${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}
+ 查询婚介用户资料百分比
+ END
查询${dating}用户资料百分比
Create Session dating ${${dating}.dating域名} ${client_header}
@@ -465,3 +500,28 @@ region固定省市-汕头
Set Global Variable ${districtName}
Set Global Variable ${provinceCode}
Set Global Variable ${provinceName}
+
+选择${dating}性别资料-0417
+ #选择性别
+ Log To Console ${CURDIR} #打印当前路径
+ Disable Warnings
+ ${DataId_list} Create List
+ ${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:"首次填写完成"
+ FOR ${client_header} IN @{Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":null,"fillSerialNumber":${Number},"genderCode":${SexCode}}
+ ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')}
+ ${DataId} Get From Dictionary ${reps.json()} data #获取证婚人资料id
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ Append To List ${DataId_list} ${DataId}
+ Set Global Variable ${DataId}
+ Set Global Variable ${SexCode}
+ Set Global Variable ${DataId_list}
+ ${percentage} Evaluate 3
+ 查询婚介用户资料百分比
+ Should Be Equal As Numbers ${percentage} ${percentData}
+ END
diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
index 47c7b3e..841728c 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
@@ -535,6 +535,15 @@ Resource ../../../0-Login/LoginResource.robot
Disconnect From Database
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/marriage/information/data/scoring params=miId=${DataId}
+ ${percentData} Get From Dictionary ${reps.json()} data #资料进度百分比
+ ${percentData} Set Variable If '${percentData}'=='null' 0 ${percentData} #如果为null设置为0
+ Set Global Variable ${percentData}
+ END
+
region
#获取户口所在地
Disable Warnings
diff --git a/Phone.txt b/Phone.txt
index 196c212..1a6640e 100644
--- a/Phone.txt
+++ b/Phone.txt
@@ -97,3 +97,8 @@
15121074365,888888
15810277849,888888
13213049527,888888
+13242150738,888888
+15646581737,888888
+13476570483,888888
+18857719806,888888
+13619457280,888888
diff --git a/output/log.html b/output/log.html
index ec9196c..5ffad1d 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,28 @@ function stopPropagation(event) {
window.output = {};
+