diff --git a/0-Login/Login-interface.robot b/0-Login/Login-interface.robot
index 11aa8aa..4d27eee 100644
--- a/0-Login/Login-interface.robot
+++ b/0-Login/Login-interface.robot
@@ -47,5 +47,5 @@ Library Collections
#END
#随机生成字符串
${first_name} Set Variable ["王", "李", "张", "刘", "赵", "蒋", "孟", "陈", "徐", "杨", "沈", "马", "高", "殷", "上官", "钟", "常","赖","臧"]
- ${汉字} Evaluate chr(random.randint(0x4e00,0x9fff))+${first_name} random
- log ${汉字}
+ ${nickName} Evaluate random.choice(${first_name}) +chr(random.randint(0x4e00,0x9fbf)) random
+ log ${nickName}
diff --git a/0-Login/phone-test.txt b/0-Login/phone-test.txt
index 6f9f5cd..16296eb 100644
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@@ -1,2 +1,2 @@
手机号
-18888888888
\ No newline at end of file
+13000000046
\ No newline at end of file
diff --git a/1-Applet/1-WriteInfo/InfoResource.robot b/1-Applet/1-WriteInfo/InfoResource.robot
index 2543601..59b5e94 100644
--- a/1-Applet/1-WriteInfo/InfoResource.robot
+++ b/1-Applet/1-WriteInfo/InfoResource.robot
@@ -95,9 +95,8 @@ Library OperatingSystem
#选择性别
Log To Console ${CURDIR} #打印当前路径
Disable Warnings
- #${sex-code} Create List 0 1
- #${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号
- ${SexCode} Evaluate 1 #固定性别
+ ${sex-code} Create List 0 1
+ ${SexCode} Evaluate random.choice(${sex-code}) random #随机获取男女序号
${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}
@@ -238,7 +237,9 @@ Library OperatingSystem
选择${dating}征婚人的昵称
#填写征婚人昵称
${num} Evaluate random.randint(1,999) random #随机获取一个数字
- ${nickName} Set Variable 寻伴用户${num}
+ ${first_name} Set Variable ["王", "李", "张", "刘", "赵", "蒋", "孟", "陈", "徐", "杨", "沈", "马", "高", "殷", "上官", "钟", "常","赖","臧"]
+ ${nickName} Evaluate random.choice(${first_name})+chr(random.randint(0x4e00,0x9fbf)) random
+ #${nickName} Set Variable 寻伴用户${num}
${Number} Evaluate 7
Create Session dating ${${dating}.dating域名} ${client_header}
${Data} Update Value To Json ${Data} $.id ${DataId}
@@ -250,11 +251,29 @@ Library OperatingSystem
${id} Get From Dictionary ${reps.json()} data
Should Be Equal ${id} ${DataId}
-查询${dating}征婚人的资料信息
- #获取征婚人的资料
- FOR ${userId} ${client_header} IN ZIP ${userid_list} ${Cheader_list}
- Create Session dating ${${dating}.dating域名} ${client_header}
- ${reps} GET On Session dating /dating-agency-service/user/get/marriage/information/details params=userId=${userId}
- ${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}
diff --git a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
index cedb9ec..cdbfeaa 100644
--- a/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/Authentication.robot
@@ -4,6 +4,7 @@ Library String
Library Collections
Library RequestsLibrary
Library DatabaseLibrary
+Resource ../../1-WriteInfo/InfoResource.robot
*** Keywords ***
查询${dating}征婚人的资料信息
@@ -124,7 +125,7 @@ Library DatabaseLibrary
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}" }
@@ -142,26 +143,6 @@ Library DatabaseLibrary
Should Be Equal As Strings ${city_name} ${cityName} #断言
Disconnect From Database
-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 #获取市名称
- Set Global Variable ${cityCode}
- Set Global Variable ${cityName}
- Set Global Variable ${provinceCode}
- Set Global Variable ${provinceName}
-
提交${dating}征婚人的体重
查询婚介征婚人资料
FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
@@ -287,3 +268,18 @@ region
... ELSE Should Be Equal As Strings ${message} 正在审核中!请等待审核完成。
END
Set Global Variable ${auditId}
+
+修改${dating}征婚人昵称
+ FOR ${miId} ${client_header} IN ZIP ${miId_list} ${Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${first_name} Set Variable ["王", "李", "张", "刘", "赵", "蒋", "孟", "陈", "徐", "杨", "沈", "马", "高", "殷", "上官", "钟", "常","赖","臧"]
+ ${nickName} Evaluate random.choice(${first_name})+chr(random.randint(0x4e00,0x9fbf)) random
+ ${Number} Evaluate 7
+ ${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')}
+ ${Code} Get From Dictionary ${reps.json()} code
+ ${InfoId} Get From Dictionary ${reps.json()} data
+ ${message} Get From Dictionary ${reps.json()} message
+ Run Keyword If ${Code}==0 Should Be Equal As Strings ${message} successful
+ ... ELSE Should Be Equal As Strings ${message} 该昵称已被使用!
+ END
diff --git a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
index e5da2ee..a5fb78b 100644
--- a/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
+++ b/1-Applet/2-Homepage/MarriageInfo/DataAuthentication.robot
@@ -2,7 +2,7 @@
Documentation 资料认证
Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
Resource Authentication.robot
-Resource ../../0-Login/LoginResource.robot
+Resource ../../../0-Login/LoginResource.robot
*** Test Cases ***
提交征婚人头像审核信息-无审核中
@@ -60,3 +60,7 @@ Resource ../../0-Login/LoginResource.robot
提交征婚人学历认证
Given 查询婚介征婚人的资料信息
When 提交婚介征婚人的学历审核
+
+修改征婚人昵称
+ Given 查询婚介征婚人的资料信息
+ When 修改婚介征婚人昵称
diff --git a/output/log.html b/output/log.html
index 3d450d4..a10720e 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};