diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index 52c4d71..9fd8acb 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -4,6 +4,7 @@ Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
Resource LoginResource.robot
Library String
Library Collections
+Library JSONLibrary
Library OperatingSystem
Library ImageHorizonLibrary
@@ -50,6 +51,11 @@ Library ImageHorizonLibrary
Given 扫描婚介红娘二维码
Then 获取婚介平台用户baseinfo并判断是否是红娘
+数据库删除用户
+ Given 读取TXT文件
+ When 用户手机号验证码登录婚介平台-888888
+ Then 数据库删除用户数据
+
000
[Template]
#Given 创建一个列表
@@ -112,12 +118,12 @@ Library ImageHorizonLibrary
#${file_path} Set Variable ${EXECDIR}\\Phone.txt
#Append To File ${file_path} ${phone},888888\n
#将'改为"
- ${ActivityData} Set Variable ['{"detailDesc":"学历认证详细描述","freebie":"true","mainCategory":1,"productDesc":"学历认证产品描述","productId":"975071861488619520","productSpecId":"975071861522173952","productSpecUnit":102,"productTitle":"学历认证","status":2,"subCategory":101,"unitOriginalPrice":2768.0,"unitSellingPrice":"0","validityPeriodValue":"174"}','{"detailDesc":"头像修改详细描述","freebie":"true","mainCategory":2,"productDesc":"头像修改产品描述","productId":"975071862004518912","productSpecId":"975071862038073344","productSpecUnit":102,"productTitle":"头像修改","status":2,"subCategory":201,"unitOriginalPrice":3639.0,"unitSellingPrice":"0","validityPeriodValue":"131"}','{"detailDesc":"解锁更多人数详细描述","freebie":"true","mainCategory":3,"productDesc":"解锁更多人数产品描述","productId":"975071862520418304","productSpecId":"975071862553972736","productSpecUnit":101,"productTitle":"解锁更多人数","status":2,"subCategory":301,"unitOriginalPrice":3868.0,"unitSellingPrice":"0","validityPeriodValue":"30"}','{"detailDesc":"高级搜索详细描述","freebie":"true","mainCategory":3,"productDesc":"高级搜索产品描述","productId":"975071863040512000","productSpecId":"975071863078260736","productSpecUnit":102,"productTitle":"高级搜索","status":2,"subCategory":302,"unitOriginalPrice":3350.0,"unitSellingPrice":"0","validityPeriodValue":"94"}','{"detailDesc":"线下约见面详情描述","freebie":"true","mainCategory":4,"productDesc":"线下约见面产品描述","productId":"975071863556411392","productSpecId":"975071863589965824","productSpecUnit":102,"productTitle":"线下约见面","status":2,"subCategory":401,"unitOriginalPrice":3792.0,"unitSellingPrice":"0","validityPeriodValue":"250"}','{"detailDesc":"会员详情描述","freebie":"false","mainCategory":3,"productDesc":"会员产品描述","productId":"975071864596598784","productSpecId":"975071864630153216","productSpecUnit":101,"productTitle":"会员","status":2,"subCategory":601,"unitOriginalPrice":3781.0,"unitSellingPrice":0.03,"validityPeriodValue":"1"}']
- ${data} Replace String Using Regexp ${ActivityData} '{ {
- ${data} Replace String Using Regexp ${data} }' }
- log ${data}
-
-数据库删除用户
- Given 读取TXT文件
- When 用户手机号验证码登录婚介平台-888888
- Then 数据库删除用户数据
+ #${ActivityData} Set Variable ['{"detailDesc":"学历认证详细描述","freebie":"true","mainCategory":1,"productDesc":"学历认证产品描述","productId":"975071861488619520","productSpecId":"975071861522173952","productSpecUnit":102,"productTitle":"学历认证","status":2,"subCategory":101,"unitOriginalPrice":2768.0,"unitSellingPrice":"0","validityPeriodValue":"174"}','{"detailDesc":"头像修改详细描述","freebie":"true","mainCategory":2,"productDesc":"头像修改产品描述","productId":"975071862004518912","productSpecId":"975071862038073344","productSpecUnit":102,"productTitle":"头像修改","status":2,"subCategory":201,"unitOriginalPrice":3639.0,"unitSellingPrice":"0","validityPeriodValue":"131"}','{"detailDesc":"解锁更多人数详细描述","freebie":"true","mainCategory":3,"productDesc":"解锁更多人数产品描述","productId":"975071862520418304","productSpecId":"975071862553972736","productSpecUnit":101,"productTitle":"解锁更多人数","status":2,"subCategory":301,"unitOriginalPrice":3868.0,"unitSellingPrice":"0","validityPeriodValue":"30"}','{"detailDesc":"高级搜索详细描述","freebie":"true","mainCategory":3,"productDesc":"高级搜索产品描述","productId":"975071863040512000","productSpecId":"975071863078260736","productSpecUnit":102,"productTitle":"高级搜索","status":2,"subCategory":302,"unitOriginalPrice":3350.0,"unitSellingPrice":"0","validityPeriodValue":"94"}','{"detailDesc":"线下约见面详情描述","freebie":"true","mainCategory":4,"productDesc":"线下约见面产品描述","productId":"975071863556411392","productSpecId":"975071863589965824","productSpecUnit":102,"productTitle":"线下约见面","status":2,"subCategory":401,"unitOriginalPrice":3792.0,"unitSellingPrice":"0","validityPeriodValue":"250"}','{"detailDesc":"会员详情描述","freebie":"false","mainCategory":3,"productDesc":"会员产品描述","productId":"975071864596598784","productSpecId":"975071864630153216","productSpecUnit":101,"productTitle":"会员","status":2,"subCategory":601,"unitOriginalPrice":3781.0,"unitSellingPrice":0.03,"validityPeriodValue":"1"}']
+ #${data} Replace String Using Regexp ${ActivityData} '{ {
+ #${data} Replace String Using Regexp ${data} }' }
+ #字典转换为str
+ #Convert To String
+ #将json内所有value是None改为null
+ #Replace String
+ #替换字段值
+ #${Data} Update Value To Json ${Data} $.id ${DataId}
diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index 9c19014..fbb6571 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,3 @@
手机号
-13476570483
\ No newline at end of file
+13448902715
+13525397706
\ No newline at end of file
diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot
index 8d2946c..c7a1079 100644
--- a/1-Applet/1-WriteInfo/InfoResource.robot
+++ b/1-Applet/1-WriteInfo/InfoResource.robot
@@ -11,27 +11,29 @@ 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}
- ${Data} Get From Dictionary ${reps.json()} data
- ${DataId} Get From Dictionary ${reps.json()['data']} id #资料id
+ ${miId} Get From Dictionary ${reps.json()['data']} id #资料id
+ ${message} Get From Dictionary ${reps.json()} message
${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_list}
+ Set Global Variable ${miId}
Set Global Variable ${genderCode}
- Set Global Variable ${DataId_list}
- Set Global Variable ${fillSerialNumber_list}
- 首次填写用户资料
+ Set Global Variable ${client_header}
+ Set Global Variable ${fillSerialNumber}
+ Run Keyword If ${fillSerialNumber}==9 填写婚介征婚人的基础资料
+ ... ELSE IF ${fillSerialNumber}==0 填写婚介征婚人资料-性别开始
+ ... ELSE IF ${fillSerialNumber}==1 填写婚介征婚人资料-城市开始
+ ... ELSE IF ${fillSerialNumber}==2 填写婚介征婚人的资料-家乡开始
+ ... ELSE IF ${fillSerialNumber}==3 填写婚介征婚人的资料-出生年份开始
+ ... ELSE IF ${fillSerialNumber}==4 填写婚介征婚人的资料-身高开始
+ ... ELSE IF ${fillSerialNumber}==5 填写婚介征婚人的资料-学历开始
+ ... ELSE IF ${fillSerialNumber}==6 填写婚介征婚人的资料-月收入开始
+ ... ELSE IF ${fillSerialNumber}==7 填写婚介征婚人的资料-昵称开始
+ ... ELSE 查询婚介用户资料
END
检查首次填写${dating}资料序号
@@ -46,26 +48,22 @@ Library OperatingSystem
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
- ${DataId} Get From Dictionary ${reps.json()['data']} id #资料id
- Set Global Variable ${DataId}
- END
-
-首次填写用户资料
- #首次填写用户资料
- FOR ${fillSerialNumber} IN @{fillSerialNumber_list}
- Run Keyword If ${fillSerialNumber}==0 填写婚介征婚人的基础资料
- ... ELSE IF ${fillSerialNumber}==1 填写婚介征婚人资料-城市开始
- ... ELSE IF ${fillSerialNumber}==2 填写婚介征婚人的资料-家乡开始
- ... ELSE IF ${fillSerialNumber}==3 填写婚介征婚人的资料-出生年份开始
- ... ELSE IF ${fillSerialNumber}==4 填写婚介征婚人的资料-身高开始
- ... ELSE IF ${fillSerialNumber}==5 填写婚介征婚人的资料-学历开始
- ... ELSE IF ${fillSerialNumber}==6 填写婚介征婚人的资料-月收入开始
- ... ELSE IF ${fillSerialNumber}==7 填写婚介征婚人的资料-昵称开始
- ... ELSE 查询婚介用户资料
+ ${miId} Get From Dictionary ${reps.json()['data']} id #资料id
+ Set Global Variable ${miId}
END
填写${dating}征婚人的基础资料
+ 选择婚介资料与账户关系
+ 选择婚介性别资料
+ 选择婚介征婚人的城市
+ 选择婚介征婚人的家乡
+ 选择婚介征婚人的出生年份
+ 选择婚介征婚人的身高
+ 选择婚介征婚人的学历
+ 选择婚介征婚人的月收入
+ 选择婚介征婚人的昵称
+
+填写${dating}征婚人资料-性别开始
选择婚介性别资料
选择婚介征婚人的城市
选择婚介征婚人的家乡
@@ -76,7 +74,6 @@ Library OperatingSystem
选择婚介征婚人的昵称
填写${dating}征婚人资料-城市开始
- 查询婚介用户资料
选择婚介征婚人的城市
选择婚介征婚人的家乡
选择婚介征婚人的出生年份
@@ -86,7 +83,6 @@ Library OperatingSystem
选择婚介征婚人的昵称
填写${dating}征婚人的资料-家乡开始
- 查询婚介用户资料
选择婚介征婚人的家乡
选择婚介征婚人的出生年份
选择婚介征婚人的身高
@@ -95,7 +91,6 @@ Library OperatingSystem
选择婚介征婚人的昵称
填写${dating}征婚人的资料-出生年份开始
- 查询婚介用户资料
选择婚介征婚人的出生年份
选择婚介征婚人的身高
选择婚介征婚人的学历
@@ -103,217 +98,176 @@ Library OperatingSystem
选择婚介征婚人的昵称
填写${dating}征婚人的资料-身高开始
- 查询婚介用户资料
选择婚介征婚人的身高
选择婚介征婚人的学历
选择婚介征婚人的月收入
选择婚介征婚人的昵称
填写${dating}征婚人的资料-学历开始
- 查询婚介用户资料
选择婚介征婚人的学历
选择婚介征婚人的月收入
选择婚介征婚人的昵称
填写${dating}征婚人的资料-婚姻状况开始
- 查询婚介用户资料
选择婚介征婚人的婚姻状况
选择婚介征婚人的月收入
选择婚介征婚人的昵称
填写${dating}征婚人的资料-月收入开始
- 查询婚介用户资料
选择婚介征婚人的月收入
选择婚介征婚人的昵称
填写${dating}征婚人的资料-昵称开始
- 查询婚介用户资料
选择婚介征婚人的昵称
+选择${dating}资料与账户关系
+ #资料与账户关系
+ #${relationship} Evaluate random.randint(0,3) random #随机获取关系 0本人，1父亲，2母亲，3亲友
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/identity/type/list
+ ${Data} Get From Dictionary ${reps.json()} data #关系json
+ ${relationshipData} Evaluate random.choice(${data}) random #随机获取关系
+ ${identityType} Get From Dictionary ${relationshipData} value #关系编码
+ Set Global Variable ${identityType}
+ #提交资料与用户关系
+ ${Number} Evaluate 9
+ ${miId} Set Variable If ${miId}==None null ${miId}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":${miId},"fillSerialNumber":${Number},"identityType":${identityType}}
+ ${reps} POST On Session dating dating-agency-service/user/save/first/fill/marriage/Information ${data.encode('utf-8')}
+ ${miId} Get From Dictionary ${reps.json()} data
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ Set Global Variable ${miId}
+ ${percentage} Evaluate 3
+ 查询婚介用户资料百分比
+ Should Be Equal As Numbers ${percentage} ${percentData}
+
选择${dating}性别资料
#选择性别
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
+ ${genderCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号
+ #${genderCode} Evaluate 1 #固定性别，男：0，女：1
${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
- 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
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":${miId},"fillSerialNumber":${Number},"genderCode":${genderCode}}
+ ${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 #获取证婚人资料id
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ Should Be Equal ${id} ${miId}
+ Set Global Variable ${id}
+ Set Global Variable ${genderCode}
+ ${percentage} Evaluate 6
+ 查询婚介用户资料百分比
+ Should Be Equal As Numbers ${percentage} ${percentData}
选择${dating}征婚人的城市
#选择城市
- 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
+ region固定省市-广州 #获取省市区
+ ${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成"
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":"${miId}","fillSerialNumber":${Number},"provinceCode":${provinceCode},"provinceName":"${provinceName}","cityCode":${districtCode},"cityName":"${cityName}","districtCode":${districtCode},"districtName":"${districtName}"}
+ ${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} ${miId}
+ 查询婚介用户资料百分比
选择${dating}征婚人的家乡
#选择家乡
- 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
+ region固定省市-汕头 #获取省市区
+ Disable Warnings
+ ${Number} Evaluate 2 #0:"性别",1:"所在城市",2:"家乡"3:"出生年份",4:"身高",5:"学历",6:"月收入",7:"昵称",8:"首次填写完成"
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":"${miId}","fillSerialNumber":${Number},"hometownProvinceCode":${provinceCode},"hometownProvinceName":"${provinceName}","hometownCityCode":${cityCode},"hometownCityName":"${cityName}"}
+ ${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} ${miId}
+ 查询婚介用户资料百分比
选择${dating}征婚人的出生年份
#选择征婚人出生年份
- 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
+ 查询婚介用户资料百分比
+ ${get_year} Get Current Date result_format=%Y
+ #${start-year} Evaluate 1950
+ #${end-year} Evaluate ${get_year}-18
+ #${birthYear} Evaluate random.randint(${start-year},${end-year}) random #随机获取年份
+ ${birthYear} Evaluate ${get_year}-20 #固定年龄
+ ${Number} Evaluate 3 #填写序号
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":"${miId}","fillSerialNumber":${Number},"birthYear":"${birthYear}"}
+ ${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} ${miId}
+ 查询婚介用户资料百分比
选择${dating}征婚人的身高
#选择征婚人身高
- FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
- ${manheight} Evaluate random.randint(170,200) random
- ${womanheight} Evaluate random.randint(140,170) 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
+ ${manheight} Evaluate random.randint(170,200) random
+ ${womanheight} Evaluate random.randint(140,170) random
+ ${height} Set Variable If ${genderCode}==1 ${womanheight} ${manheight}
+ ${Number} Evaluate 4
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":"${miId}","fillSerialNumber":${Number},"height":${height}}
+ ${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} ${miId}
+ 查询婚介用户资料百分比
选择${dating}征婚人的学历
+ #随机获取学历
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/education/list
+ ${data} Get From Dictionary ${reps.json()} data
+ ${educationData} Evaluate random.choice(${data}) random #随机获取学历json
+ ${educationCode} Get From Dictionary ${educationData} value #学历编码
+ #${educationCode} Get From List ${data} 2 #0高中以下，1中专，2大专，3本科。4硕士，5博士
#选择征婚人的学历
- 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
+ ${Number} Evaluate 5
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":"${miId}","fillSerialNumber":${Number},"educationCode":${educationCode}}
+ ${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} ${miId}
+ 查询婚介用户资料百分比
选择${dating}征婚人的婚姻状况
#选择征婚人的婚姻状况
- 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
+ #${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}
+ 查询婚介用户资料百分比
选择${dating}征婚人的月收入
+ #随机选择月收入
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${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 #随机获取收入范围
+ ${incomeCode} Get From Dictionary ${incomeData} value #收入编码
+ #${incomeCode} Get From Dictionary ${data[0]} value #随机月收入0：3000以下，1：3001~5000，2：5001~8000，3：8001~12000，4：12001~20000，5：20001~50000，6：50000以上
#选择征婚人的月收入
- 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
+ ${Number} Evaluate 6
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":"${miId}","fillSerialNumber":${Number},"incomeCode":${incomeCode}}
+ ${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} ${miId}
+ 查询婚介用户资料百分比
选择${dating}征婚人的昵称
#填写征婚人昵称
@@ -328,27 +282,19 @@ Library OperatingSystem
#${name} Set Variable ${name}${secondName}
#${nickName} Set Variable ${firstName}${name}
#END
- FOR ${client_header} ${Data} ${DataId} IN ZIP ${Cheader_list} ${Data_list} ${DataId_list}
- ${Name} Set Variable ["缘来是你","洛天神女","寻那个TA","一片烨","王小帅","牛仔","张先生","就等你了","故乡的原风景","万里&长城","雪落下的地方","天蝎座的宁静","烟火","白色气球","带你去浪漫的土耳其","诺贝尔可爱奖","死于脚气攻心","发型不乱，一切好办","朝颜","茯苓","不4辣妹好烦","拉粑粑小魔仙","榆木脑袋/(ㄒoㄒ)/~~","社交悍匪","西红柿炖前男友","^.^心碎小饭包","美女也会emo","爸道总裁","去银行整点金条","观input萨","4.435km/s","炉火糖粥","十一是亿","出桃公主","量贩草莓果泡","风止何安","钟于的尽头是终于","Komorebi","Agoni","Miratowa","Coisini","是牛奶味呀","偷走月亮的o(=•ェ•=)m","一口吃成大胖次","转角撞到小花花","恰似惊鸿落人间","阿啾啾","只吃一口不会胖滴","一贫如喜羊羊","鸭鸭进京赶烤","bug鸭陆","满圈猪猪我最肥","☀日落也会跑","不掉小珍🐖","快乐的刘油果","小地瓜🍠","火鸡味锅巴","晕头小🐕","钞票收割机","吃土豆长大的马铃薯","Tony带水","古塔拉黑暗之神","换胃思烤","你没好果汁吃","元气少女锅德缸","对方正在长头发","关你peace","狂炫老板画的大饼","皮蛋solo粥","梁山伯与祝英抬杠","讨一身可爱","半口奶酪","一丢丢可爱","小不忍则卖大萌","春风十里吹不动你","夏目友人赖账","狂踹瘸子那条好腿","三条腿瘸了两条","蛋黄派来的","BOB！！！","激萌美少女李逵","老衲我不用飘柔","村里在逃翠花❀","onetwo恰恰恰","果真不赖妈妈","不是山谷","十二","花未眠","小熊扁干","穿靴子的猫🐱","可乐无糖加冰","一勺刚刚好","呆熊吐泡泡ε=ε=ε=(~￣▽￣)~","25点说晚安","酿了一秋的甜","难哄小掌柜","未完结的故事","摆烂小鱼","控制不住喜欢你","这一秒的心动♥","乌梅子酱","十三月末","大不了胖点","零一秒","换个路口转弯","那场漫长雨季","MEI有一米六","大雨倾盆的情","去有风小院","发很久的呆","普通市民","每天都好困😴","不煲电话粥","奶椰西米露","Number one","4Udo","七月绝版","虞美人盛开的山坡","3kyo","想和你互相耽误","书柜里的情书","小石头爱上结巴","歌好听你好看","人生实难万圆，小满即可安心","半夏xia","这条小鱼在乎","那时我们不懂永远","碎不着","独角戏","甜梨","秋棠子淮南","有點困💤","许愿池🫧","小歪.Babyづ","⭐星偷走睡意","伞下铭","棠梨煎雪","直到遇见了你，我只喜欢你","勾指起誓","藏","又见江南雨","偶尔也会发呆","不做小困包","BB饼干🍪","水蜜桃🍑","下雨天🌧️","³º只花🌸","巧克力🍫饼干","带你去抓怪兽👾","想你时关键词","YoYo","偷听少女许愿","没哥帅就闭麦","一觉睡到小时候","花生了什么树","摘一口袋星星送给你","大糖糕僧","哇哒西蛙","著名奶茶鉴定家","睡眠艺术家","夜猫子协会常任理事","国家一级退堂鼓选手","我比纸巾还能扯","水煮美人鱼","话不投机养乐多","屁大点事分享者","月亮邮递员","妈妈说名字太长会有傻子跟着念","有关部门","过期小朋友","向晚"]
- ${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
+ ${Name} Set Variable ["缘来是你","洛天神女","寻那个TA","一片烨","王小帅","牛仔","张先生","就等你了","故乡的原风景","万里&长城","雪落下的地方","天蝎座的宁静","烟火","白色气球","带你去浪漫的土耳其","诺贝尔可爱奖","死于脚气攻心","发型不乱，一切好办","朝颜","茯苓","不4辣妹好烦","拉粑粑小魔仙","榆木脑袋/(ㄒoㄒ)/~~","社交悍匪","西红柿炖前男友","^.^心碎小饭包","美女也会emo","爸道总裁","去银行整点金条","观input萨","4.435km/s","炉火糖粥","十一是亿","出桃公主","量贩草莓果泡","风止何安","钟于的尽头是终于","Komorebi","Agoni","Miratowa","Coisini","是牛奶味呀","偷走月亮的o(=•ェ•=)m","一口吃成大胖次","转角撞到小花花","恰似惊鸿落人间","阿啾啾","只吃一口不会胖滴","一贫如喜羊羊","鸭鸭进京赶烤","bug鸭陆","满圈猪猪我最肥","☀日落也会跑","不掉小珍🐖","快乐的刘油果","小地瓜🍠","火鸡味锅巴","晕头小🐕","钞票收割机","吃土豆长大的马铃薯","Tony带水","古塔拉黑暗之神","换胃思烤","你没好果汁吃","元气少女锅德缸","对方正在长头发","关你peace","狂炫老板画的大饼","皮蛋solo粥","梁山伯与祝英抬杠","讨一身可爱","半口奶酪","一丢丢可爱","小不忍则卖大萌","春风十里吹不动你","夏目友人赖账","狂踹瘸子那条好腿","三条腿瘸了两条","蛋黄派来的","BOB！！！","激萌美少女李逵","老衲我不用飘柔","村里在逃翠花❀","onetwo恰恰恰","果真不赖妈妈","不是山谷","十二","花未眠","小熊扁干","穿靴子的猫🐱","可乐无糖加冰","一勺刚刚好","呆熊吐泡泡ε=ε=ε=(~￣▽￣)~","25点说晚安","酿了一秋的甜","难哄小掌柜","未完结的故事","摆烂小鱼","控制不住喜欢你","这一秒的心动♥","乌梅子酱","十三月末","大不了胖点","零一秒","换个路口转弯","那场漫长雨季","MEI有一米六","大雨倾盆的情","去有风小院","发很久的呆","普通市民","每天都好困😴","不煲电话粥","奶椰西米露","Number one","4Udo","七月绝版","虞美人盛开的山坡","3kyo","想和你互相耽误","书柜里的情书","小石头爱上结巴","歌好听你好看","人生实难万圆，小满即可安心","半夏xia","这条小鱼在乎","那时我们不懂永远","碎不着","独角戏","甜梨","秋棠子淮南","有點困💤","许愿池🫧","小歪.Babyづ","⭐星偷走睡意","伞下铭","棠梨煎雪","直到遇见了你，我只喜欢你","勾指起誓","藏","又见江南雨","偶尔也会发呆","不做小困包","BB饼干🍪","水蜜桃🍑","下雨天🌧️","³º只花🌸","巧克力🍫饼干","带你去抓怪兽👾","想你时关键词","YoYo","偷听少女许愿","没哥帅就闭麦","一觉睡到小时候","花生了什么树","摘一口袋星星送给你","大糖糕僧","哇哒西蛙","著名奶茶鉴定家","睡眠艺术家","夜猫子协会常任理事","国家一级退堂鼓选手","我比纸巾还能扯","水煮美人鱼","话不投机养乐多","屁大点事分享者","月亮邮递员","妈妈说名字太长会有傻子跟着念","有关部门","过期小朋友","向晚"]
+ ${nickName} Evaluate random.choice(${Name}) random
+ ${Number} Evaluate 7
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"id":"${miId}","fillSerialNumber":${Number},"nickName":"${nickName}"}
+ ${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} ${miId}
+ 查询婚介用户资料百分比
查询${dating}用户资料百分比
Create Session dating ${${dating}.dating域名} ${client_header}
- ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/data/scoring params=miId=${DataId}
+ ${reps} GET On Session dating dating-agency-service/user/get/marriage/information/data/scoring params=miId=${miId}
${percentData} Get From Dictionary ${reps.json()} data #资料进度百分比
${percentData} Set Variable If '${percentData}'=='null' 0 ${percentData} #如果为null设置为0
Set Global Variable ${percentData}
@@ -491,28 +437,3 @@ 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/Phone.txt b/Phone.txt
index c4a30da..0dcaf7b 100644
--- a/Phone.txt
+++ b/Phone.txt
@@ -103,3 +103,7 @@
18857719806,888888
13619457280,888888
18709613278,888888
+13251247789,888888
+13669248735,888888
+13525397706,888888
+13448902715,888888
diff --git a/output/log.html b/output/log.html
index b5e6cc5..a7e24cc 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,28 +1806,25 @@ function stopPropagation(event) {
window.output = {};
-