diff --git a/DA_data.yaml b/DA_data.yaml index fd0ac1e..4d13c6c 100644 --- a/DA_data.yaml +++ b/DA_data.yaml @@ -1,7 +1,6 @@ 婚介: UEC域名: http://dating-agency-api-test.qniao.cn - Client域名: https://dating-agency-api-test.qniao.cn - Header: {'Content-Type':'application/json','X-APP-ID':'50325897884795880','Authorization':'iHP4V/g6O5DXHixyNrf7tpCK+JiAdjwqvmEI29SAae3EMtjrMqMK0q3e/2IuIuhNQVUm9nfV0euEXrYU2hFWfA=='} + Header: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} Admin_Header: {'Content-Type':'application/json','X-APP-ID':'50325897884795880'} diff --git a/Login/Login.robot b/Login/Login.robot index 4b1792b..14e93cc 100644 --- a/Login/Login.robot +++ b/Login/Login.robot @@ -13,9 +13,13 @@ Plogin Given 用户打开小程序 When 输入手机号获取验证码 Then 登录 - ${/} + ${/} WLogin Given 用户打开小程序 Then 重新进入小程序 #Then 微信一键登录 + +open + Given 读取TXT文件 + Then 数据库操作 diff --git a/Login/LoginResource.robot b/Login/LoginResource.robot index 26f1c64..e0d3820 100644 --- a/Login/LoginResource.robot +++ b/Login/LoginResource.robot @@ -1,5 +1,10 @@ *** Settings *** +Library BuiltIn Library AppiumLibrary +Library OperatingSystem +Library Collections +Library DatabaseLibrary +Library String *** Keywords *** 用户打开小程序 @@ -31,3 +36,26 @@ Library AppiumLibrary Click Element xpath=//android.support.v7.widget.RecyclerView[@resource-id='com.tencent.mm:id/ab8']/android.widget.LinearLayout[4]/android.widget.RelativeLayout[1]/android.widget.ImageView[2] #重新进入小程序 sleep 1 Close Application + +读取TXT文件 + #读取TXT文件 + ${file} Get File D:\\LYL\\Test\\Dating\\phone-test.txt #读取文件 + ${skip-line} Set Variable 1 #跳过第一行 + ${lines} Set Variable -1 #读取整个文件,从第二行开始 + ${content} Get Lines Containing String ${file} ${skip-line} ${lines} + FOR ${id} IN ${content} + ${id} String.Split String ${id} \n + END + Set Global Variable ${id} + +数据库操作 + #操作数据库 + FOR ${tid} IN @{id} #遍历列表 + Connect To Database Using Custom Params pymysql database='dating-agency-uec',user='root',password='qniaothreetwoonego',host='8.135.8.221' + @{input-account} Execute Sql String insert into da_account SELECT * from uec.qn_account WHERE tid = '${tid}' and is_delete = 0 #插入uec.qn_account数据到da_account表 + ${check} Query select user_id from da_account where tid = '${tid}' and is_delete=0 #查询da_account表数据 + ${userid} Set Variable ${check[0][0]} + ${input-user} Execute Sql String insert into da_user SELECT * from uec.qn_user WHERE id = '${userid}' and is_delete = 0 #插入uec.qn_user表数据到da_user表中 + ${check} Execute Sql String UPDATE da_user SET app_from = 50325897884795880 WHERE id = ${userid} #更新da_user表app_from数据 + Disconnect From Database + END diff --git a/WriteInfo/InfoResource.robot b/WriteInfo/InfoResource.robot index 7c16c87..02c170e 100644 --- a/WriteInfo/InfoResource.robot +++ b/WriteInfo/InfoResource.robot @@ -5,15 +5,16 @@ Library demjson Library Collections Library JSONLibrary Library RequestsLibrary +Library OperatingSystem *** Keywords *** 用户首次填写${dating}资料 Disable Warnings #获取首次婚介资料信息 Create Session dating ${${dating}.UEC域名} ${${dating}.Header} - ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details + ${reps} GET On Session dating /dating-agency-service/user/get/first/fill/marriage/information/details params=userId=808374438260248576 ${Data} Get From Dictionary ${reps.json()} data - #${Data} Replace String ${Data} "None" null #将所有None改为null + log ${Data} ${id} Get From Dictionary ${reps.json()['data']} id #资料id ${height} Get From Dictionary ${reps.json()['data']} height #证婚人身高 ${nickName} Get From Dictionary ${reps.json()['data']} nickName #证婚人昵称 @@ -27,7 +28,7 @@ Library RequestsLibrary ${provinceCode} Get From Dictionary ${reps.json()['data']} provinceCode #省编码 ${provinceName} Get From Dictionary ${reps.json()['data']} provinceName #省名称 ${educationCode} Get From Dictionary ${reps.json()['data']} educationCode #证婚人学历编码 - ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber + ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #资料填写序号 ${maritalStatusCode} Get From Dictionary ${reps.json()['data']} maritalStatusCode #证婚人婚姻状况,0:未婚,1:离异,2:丧偶的 0:未婚,1:离异,2:丧偶的 #${Information} Create Dictionary Set Global Variable ${id} @@ -50,7 +51,7 @@ Library RequestsLibrary 检查首次填写${dating}资料序号 #检查首次填写序号 Create Session dating ${${dating}.UEC域名} ${${dating}.Header} - ${reps} GET On Session dating /dating-agency-service/user/check/first/fill/marriage/information/sn + ${reps} GET On Session dating /dating-agency-service/user/check/first/fill/marriage/information/sn params=userId=808374438260248576 ${fillSerialNumber} Get From Dictionary ${reps.json()['data']} fillSerialNumber #填写序号 Set Global Variable ${fillSerialNumber} @@ -60,16 +61,19 @@ Library RequestsLibrary Disable Warnings #用户首次填写婚介资料 ${SexCode} Evaluate 1 #男:0,女:1 + ${Number} Evaluate 0 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" Create Session dating ${${dating}.UEC域名} ${${dating}.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 Set Global Variable ${DataId} #检查首次填写婚介资料序号 -选择${dating}证婚人的城市 +选择${dating}征婚人的城市 #选择城市 #获取省市区 Disable Warnings @@ -98,9 +102,11 @@ Library RequestsLibrary Set Global Variable ${districtName} Set Global Variable ${provinceCode} Set Global Variable ${provinceName} - #选择证婚人地区资料 + #选择征婚人地区资料 + ${Number} Evaluate 1 #0:"性别",1:"所在城市",2:"出生年份",3:"身高",4:"学历",5:"婚姻状态",6:"月收入",7:"昵称",8:"首次填写完成" Create Session dating ${${dating}.UEC域名} ${${dating}.Header} ${Data} Update Value To Json ${Data} $.id ${DataId} + ${Data} Update Value To Json ${Data} $.fillSerialNumber ${Number} ${Data} Update Value To Json ${Data} $.fillSerialNumber ${fillSerialNumber} ${Data} Update Value To Json ${Data} $.cityCode ${cityCode} ${Data} Update Value To Json ${Data} $.cityName ${cityName} @@ -112,6 +118,7 @@ Library RequestsLibrary ${Data} Replace String ${Data} "None" null ${reps} POST On Session dating /dating-agency-service/user/save/first/fill/marriage/Information ${Data.encode('utf-8')} #检查首次填写婚介资料序号 + 用户首次填写婚介资料 出生年份 @@ -126,3 +133,18 @@ Library RequestsLibrary 昵称 返回上一步 + +测试${dating}资料填写 + #选择性别 + Create Session dating ${${dating}.UEC域名} ${${dating}.Header} + ${sex_data} Evaluate 1 + ${data} Set Variable {"id":null,"fillSerialNumber":0,"genderCode":1} + ${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 + #选择城市 + ${city_data} Set Variable { \ \ \ \ "id": "${id}", \ \ \ \ "fillSerialNumber": 1, \ \ \ \ "provinceCode": 440000, \ \ \ \ "provinceName": "广东省", \ \ \ \ "cityCode": 440100, \ \ \ \ "cityName": "广州市", \ \ \ \ "districtCode": 440106, \ \ \ \ "districtName": "天河区" } + ${reps} POST On Session dating dating-agency-service/user/save/first/fill/marriage/Information ${city_data.encode('utf-8')} + sleep 2 + #获取首次婚介资料信息 + ${reps} GET On Session dating dating-agency-service/user/get/first/fill/marriage/information/details params=userId=808374438260248576 + log ${reps.json()['data']} diff --git a/WriteInfo/Infomation.robot b/WriteInfo/Infomation.robot index 7b60ae8..11843af 100644 --- a/WriteInfo/Infomation.robot +++ b/WriteInfo/Infomation.robot @@ -94,6 +94,7 @@ region Set Global Variable ${provinceName} test - Given 用户首次填写婚介资料 - Then 选择婚介性别资料 - And 选择婚介证婚人的城市 + #Given 用户首次填写婚介资料 + #Then 选择婚介性别资料 + #And 选择婚介征婚人的城市 + 测试婚介资料填写