diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index a13cb80..9ccd698 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -20,6 +20,11 @@ Library Collections
And 用户手机号验证码登录婚介平台-888888
And 查询用户的婚介组织
+手机号验证码登录-888888,phone
+ Given 生成随机手机号
+ When 用户手机号验证码登录婚介平台-phone
+ And 查询用户的婚介组织
+
手机号验证码已过期登录
#验证码已过期
Given 读取TXT文件
@@ -48,20 +53,22 @@ Library Collections
#FOR循环
#END
#随机生成字符串
- ${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
+ #${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
#创建变量
#${list} Set Variable ["过去都是假的，回忆是一条没有归途的路，以往的一切春天都无法复原，即使最狂热最坚贞的爱情，归根结底也不过是一种瞬息即逝的现实，唯有孤独永恒。","生命中真正重要的不是你遭遇了什么，而是你记住了哪些事，又是如何铭记的。","我们趋行在人生这个亘古的旅途，在坎坷中奔跑，在挫折里涅槃，忧愁缠满全身，痛苦飘洒一地。我们累，却无从止歇；我们苦，却无法回避。","所有人都显得很寂寞，用自己的方式想尽办法排遣寂寞，事实上仍是延续自己的寂寞。寂寞是造化对群居者的诅咒，孤独才是寂寞的唯一出口。","大部分人在二三十岁上就死去了，因为过了这个年龄，他们只是自己的影子，此后的余生则是在模仿自己中度过，日复一日，更机械，更装腔作势地重复他们在有生之年的所作所为，所思所想，所爱所恨。","虽然我身高只有170，但是我胖呀，我有160斤！不过，我以前更胖，有190斤。那时因为工作太忙了，实在没时间。最近闲下来了，我决定减肥，每周跑3个10km，半年减了30斤了！以后我还要跑下去，争取再减30斤","大学时候参加过学校的歌唱比赛，也自学过吉他。目前工作比较忙，没太多业余时间。如果以后能换个加班少的工作，我希望能有空重拾音乐的爱好","闲时喜爱打游戏，但不沉迷。我认为用心经营一段美好的事情，是比游戏更有趣、更有价值的事。","性格沉稳安静、不爱争吵计较，在感兴趣的领域会畅所欲言，对陌生的领域更多的是倾听。","女，95年，164/52。泰州人，在上海工作，外企财务会计。寻觅一个三品好，三观一致的男生为伴。","希望小哥哥人品好、善良，最好是南方人。一本以上，93-97最佳，要有长期在上海定居的打算，有能力和我一起首付买房。我喜欢讲话，所以希望你不要太内向，不然无法沟通。","身高最好172以上吧，不过长相喜欢干净斯文清瘦一点的，有少年感。希望是双眼皮或者是单眼皮大眼睛。至于三观是否一致，只有接触之后才能知道啦。","未来我肯定会有自己的事业，不过，更倾向于work life balance的生活。不求大富大贵，只希望平安快乐。喜欢自由一些的生活。","书香门第家庭，独生女，父母是泰州市的国企职工，即将退休，未来会有养老金，养老无压力。","93年天蝎座，163cm，海外留学本科毕业，在传媒公司做宣传策划，收入稳定，偶尔加班，较少应酬。信奉“活到老学到老”的箴言，始终在为更美好的生活努力奋斗着。","希望他170cm以上，定居在北京，最好有北京户口，以及最好在城里有房子。有阅历，见过世面，对自己的未来有规划，有不错的挣钱能力，不吸烟（对自己和他人健康负责），无任何不良嗜好。有责任心、上进心、事业心，心胸宽广脾气好，沉稳大度，家人脾气温和。","我内心渴望一份美好的感情，但不强求也不凑合，尊重他人和自己的情感，期待理想中的你能早日出现。在你还没有来到我身边之前，我会好好爱自己，照顾好自己，经营好自己，希望我早日遇到优秀的你，一起成长，共同努力！"]
#${get_list} Evaluate random.choice(${list}) random
#log ${get_list}
+ #生成手机号
+ ${phone} Evaluate "".join(random.sample("01234567897",8)) random,string
数据库删除用户
Given 读取TXT文件
diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot
index ea2db98..1e5b61f 100644
--- a/0-Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@@ -19,6 +19,12 @@ Library OperatingSystem
END
Set Global Variable ${id}
+生成随机手机号
+ ${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}
+ Set Global Variable ${phone}
+
用户获取${dating}平台短信验证码
#用户获取婚介平台短信验证码
Disable Warnings
@@ -115,6 +121,32 @@ Library OperatingSystem
Set Global Variable ${login_header}
Set Global Variable ${client_header}
+用户手机号验证码登录${dating}平台-phone
+ #用户手机号验证码登录婚介平台
+ ${userid_list} Create List
+ ${Cheader_list} Create List
+ ${Aheader_list} Create List
+ Disable Warnings
+ Create Session dating ${${dating}.dating域名} ${${dating}.AHeader}
+ ${data} Set Variable { \ \ "account":"${phone}", \ \ "accountType":2, \ \ "captcha":888888 } #手机号验证码登录参数
+ ${reps} POST On Session dating /dating-agency-uec/authorize/by-captcha ${data.encode('utf-8')}
+ ${code} Get From Dictionary ${reps.json()} code #获取相应状态码
+ ${token} Get From Dictionary ${reps.json()['data']} token #获取token
+ ${userId} Get From Dictionary ${reps.json()['data']} userId #获取用户id
+ ${message} Get From Dictionary ${reps.json()} message
+ ${login_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795881','Authorization':'QNT ${token}','X-Organization-Id':'963432943739605555'} #更新header
+ ${client_header} Set Variable {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'QNT ${token}'}
+ Append To List ${userid_list} ${userId}
+ Append To List ${Cheader_list} ${client_header}
+ Append To List ${Aheader_list} ${login_header}
+ Run Keyword If ${code}==0 Should Be Equal As Strings ${message} successful
+ ... ELSE Should Be Equal As Strings ${message} 验证码错误或无效验证码，请重试！
+ Set Global Variable ${userid_list}
+ Set Global Variable ${Aheader_list}
+ Set Global Variable ${Cheader_list}
+ Set Global Variable ${login_header}
+ Set Global Variable ${client_header}
+
用户手机号错误验证码登录${dating}平台
#用户手机号验证码登录婚介平台
FOR ${account} IN @{id}
diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
index 9bc763e..cbd74b4 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
@@ -5,6 +5,7 @@ Library Collections
Library RequestsLibrary
Library DatabaseLibrary
Resource ../../1-WriteInfo/InfoResource.robot
+Resource ../../../0-Login/LoginResource.robot
*** Keywords ***
查询${dating}征婚人的资料信息
@@ -284,3 +285,33 @@ Resource ../../1-WriteInfo/InfoResource.robot
Run Keyword If ${Code}==0 Should Be Equal As Strings ${message} successful
... ELSE Should Be Equal As Strings ${message} 该昵称已被使用！
END
+
+提交${dating}征婚人的联系方式
+ [Arguments] ${length}=8 @{num}
+ [Documentation] $length}=8 生成的手机号位数，不包含开头3位，默认8位
+ ...
+ ... @{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}
+ #${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}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/family/ties/list
+ ${data_list} Get From Dictionary ${reps.json()} data #获取关系
+ ${relationship} Evaluate random.choice(${data_list}) random #随机获取json
+ ${familyTies} Get From Dictionary ${relationship} desc #关系
+ ${familyTiesCode} Get From Dictionary ${relationship} value #关系编码
+ END
+ #提交联系方式
+ FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${relation_data} Set Variable {"familyTies":"${familyTies}","familyTiesCode":${familyTiesCode},"phone":"${phone}","wechatId":"","miId":"${miId}"}
+ ${reps} POST On Session dating dating-agency-service/user/save/marriage/seeking/contact ${relation_data.encode('utf-8')}
+ ${data} Get From Dictionary ${reps.json()} data
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ END
+ [Return] ${phone} #返回获取的值
diff --git a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
index a5fb78b..0a5ffe4 100644
--- a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
@@ -64,3 +64,7 @@ Resource ../../../0-Login/LoginResource.robot
修改征婚人昵称
Given 查询婚介征婚人的资料信息
When 修改婚介征婚人昵称
+
+添加征婚人联系方式
+ Given 查询婚介征婚人的资料信息
+ When 提交婚介征婚人的联系方式
diff --git a/output/log.html b/output/log.html
index 88233bb..27d1f14 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};