no message

1 year ago · 74eb55e480
12 changed files with 290 additions and 562 deletions
--- a/0-Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@ -217,7 +217,7 @@ Library           ImageHorizonLibrary
    #${filepath}    Evaluate    open('./matchmaker.png','rb')
    FOR    ${client_header}    IN    @{Cheader_list}
        Create Session    dating    ${${dating}.dating域名}    ${client_header}
-        ${reps}    GET On Session    dating    dating-agency-uec/user/verify/qrcode    params=&qrCodeRecordId=982646887612026880
+        ${reps}    GET On Session    dating    dating-agency-uec/user/verify/qrcode    params=&qrCodeRecordId=989944284495089664
        ${code}    Get From Dictionary    ${reps.json()}    code
    END

@ -269,7 +269,7 @@ Library           ImageHorizonLibrary
    FOR    ${client_header}    IN    @{Cheader_list}
        Create Session    dating    ${${dating}.dating域名}    ${client_header}
        ${value}    Generate Random String    18    [NUMBERS]    #随机生成18位数字
-        ${data}    Set Variable    { \ \ \ \ "name": "${phone}", \ \ \ \ "identityCard": "${value}", \ \ \ \ "phone": "${phone}", \ \ \ \ "captcha": "888888", \ \ \ \ "serviceAreaList": [ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "provinceCode": ${provinceCode}, \ \ \ \ \ \ \ \ \ \ \ \ "provinceName": "${provinceName}", \ \ \ \ \ \ \ \ \ \ \ \ "cityCode": ${cityCode}, \ \ \ \ \ \ \ \ \ \ \ \ "cityName": "${cityName}", \ \ \ \ \ \ \ \ \ \ \ \ "districtCode": ${districtCode}, \ \ \ \ \ \ \ \ \ \ \ \ "districtName": "${districtName}" \ \ \ \ \ \ \ \ } \ \ \ \ ] }
+        ${data}    Set Variable    { \ \ \ \ "name": "${phone}", \ \ \ \ "identityCard": "${value}", \ \ \ \ "phone": "${phone}", \ \ \ \ "captcha": "666666", \ \ \ \ "serviceAreaList": [ \ \ \ \ \ \ \ \ { \ \ \ \ \ \ \ \ \ \ \ \ "provinceCode": ${provinceCode}, \ \ \ \ \ \ \ \ \ \ \ \ "provinceName": "${provinceName}", \ \ \ \ \ \ \ \ \ \ \ \ "cityCode": ${cityCode}, \ \ \ \ \ \ \ \ \ \ \ \ "cityName": "${cityName}", \ \ \ \ \ \ \ \ \ \ \ \ "districtCode": ${districtCode}, \ \ \ \ \ \ \ \ \ \ \ \ "districtName": "${districtName}" \ \ \ \ \ \ \ \ } \ \ \ \ ] }
        ${reps}    POST On Session    dating    dating-agency-uec/user/apply/matchmaker    ${data.encode('utf-8')}
        ${matchmakerId}    Get From Dictionary    ${reps.json()}    data    #红娘审核id
        Set Global Variable    ${matchmakerId}
@ -277,7 +277,8 @@ Library           ImageHorizonLibrary
    查询婚介红娘申请加盟列表

 数据库修改申请状态为待审核
-    Connect To Database Using Custom Params    pymysql    database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+    #Connect To Database Using Custom Params    pymysql    database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221'    #测试环境
+    Connect To Database Using Custom Params    pymysql    database='dating_agency_uec',user='jxh_user',password='jxh@2024db',host='rm-wz94koti4awpbd5t3ro.mysql.rds.aliyuncs.com'    #生产环境
    ${update}    Execute Sql String    UPDATE `dating_agency_uec`.`da_matchmaker_audit` SET `status` = 2 WHERE `id` = ${matchmakerId}    #更新数据库红娘加盟状态为待审核
    ${check}    Query    SELECT id FROM `dating_agency_uec`.`da_matchmaker_audit` WHERE `id` = '${matchmakerId}'    #查询数据库红娘加盟数据
    ${id}    Set Variable    ${check[0][0]}
--- a/0-Login/phone-test.txt
+++ b/0-Login/phone-test.txt
@ -1,2 +1,2 @@
 手机号
-15134891062
+13473579062
--- a/1-Applet/5-SeekingReward/SeekingReward.robot
+++ b/1-Applet/5-SeekingReward/SeekingReward.robot
@ -11,3 +11,9 @@ Resource          SeekingRewardResource.robot
 红娘推荐嘉宾
    Given 红娘查询婚介招亲榜列表
    Then 红娘查询可推荐婚介嘉宾列表
+
+用户选择嘉宾见面
+    Given 查询婚介用户资料
+    And 查询婚介征婚人发榜详情
+    When 用户查询婚介榜单待选嘉宾列表
+    Then 用户选择婚介待选嘉宾见面
--- a/1-Applet/5-SeekingReward/SeekingRewardResource.robot
+++ b/1-Applet/5-SeekingReward/SeekingRewardResource.robot
@ -59,7 +59,8 @@ Library           DatabaseLibrary
 数据库插入数据
    ${dataTime}    Get Current Date    result_format=%Y-%m-%d %H:%M:%S    #获取当前时间
    FOR    ${miId}    IN    @{miId_list}
-        Connect To Database Using Custom Params    pymysql    database='dating_agency_mall',user='jxh_user',password='jxh@2024db',host='rm-wz94koti4awpbd5t3ro.mysql.rds.aliyuncs.com'    #生产数据库
+        Connect To Database Using Custom Params    pymysql    database='dating_agency_mall',user='root',password='qniaothreetwoonego',host='8.135.8.221'    #测试环境数据库
+        #Connect To Database Using Custom Params    pymysql    database='dating_agency_mall',user='jxh_user',password='jxh@2024db',host='rm-wz94koti4awpbd5t3ro.mysql.rds.aliyuncs.com'    #生产数据库
        ${insert1}    Execute Sql String    INSERT INTO `dating_agency_mall`.`da_marriage_bounty_order`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `reward_amount`, `status`, `payment_status`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, ${rewardAmount}, 1, 1)    #悬赏招亲订单插入数据
        ${check1}    Query    SELECT id FROM `dating_agency_mall`.`da_marriage_bounty_order` WHERE `mi_id` = '${miId}' AND `status` = '1'    #查询悬赏订单Id
        ${bountyOrderId}    Set Variable    ${check1[0][0]}
@ -140,15 +141,32 @@ Library           DatabaseLibrary
    #...
    ...    # ELSE    log    推荐嘉宾成功！

-红娘给${dating}招亲榜推荐嘉宾
-
 用户查询${dating}榜单待选嘉宾列表
    #用户查询榜单待选嘉宾列表
    FOR    ${client_header}    IN    @{Cheader_list}
        Create Session    dating    ${${dating}.dating域名}    ${client_header}
        ${reps}    GET On Session    dating    dating-agency-service/user/get/my/candidate/guest/list    params=selectiveType=0
        ${data}    Get From Dictionary    ${reps.json()}    data    #获取待选嘉宾列表
-        ${guestData}    Evaluate    random.choice(${data})    random    #随机获取待选嘉宾
-        ${guestMiId}    Get From Dictionary    ${guestData}    miId    #嘉宾资料id
-        ${msrId}    Get From Dictionary    ${guestData}    msrId    #招亲榜id
-        ${msrpdId}    Get From Dictionary    ${guestData}    msrpdId    #
+        Set Global Variable    ${data}
+        Run Keyword If    ${data}==[]    log    暂无待选嘉宾，等待红娘推荐
+        ...    ELSE    获取待选嘉宾数据
+    END
+
+获取待选嘉宾数据
+    ${guestData}    Evaluate    random.choice(${data})    random    #随机获取待选嘉宾
+    ${guestMiId}    Get From Dictionary    ${guestData}    miId    #嘉宾资料id
+    ${msrId}    Get From Dictionary    ${guestData}    msrId    #招亲榜id
+    ${msrpdId}    Get From Dictionary    ${guestData}    msrpdId    #参与嘉宾id
+    Set Global Variable    ${msrId}
+    Set Global Variable    ${msrpdId}
+    Set Global Variable    ${guestMiId}
+
+用户选择${dating}待选嘉宾见面
+    #用户选择待选嘉宾见面
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
+        ${data}    Set Variable    {"miId":"${guestMiId}","msrId":"${msrId}"}
+        ${reps}    POST On Session    dating    dating-agency-service/user/selected/guest/    ${data.encode('utf-8')}
+        ${message}    Get From Dictionary    ${reps.json()}    message
+        Should Be Equal As Strings    ${message}    successful
+    END
--- a/1-Applet/6-Activity/ActivityResource.robot
+++ b/1-Applet/6-Activity/ActivityResource.robot
@ -0,0 +1,42 @@
+*** Settings ***
+Library           urllib3
+Library           String
+Library           DateTime
+Library           Collections
+Library           RequestsLibrary
+Library           DatabaseLibrary
+
+*** Keywords ***
+查询${dating}用户资料
+    ${miId_list}    Create List
+    FOR    ${userId}    ${client_header}    IN ZIP    ${userid_list}    ${Cheader_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}
+        ${miId}    Get From Dictionary    ${reps.json()['data']}    id    #资料id
+        Append To List    ${miId_list}    ${miId}
+        Set Global Variable    ${userId}
+        Set Global Variable    ${miId_list}
+    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/site/activity/page    params=queryType=0&pageNum=1&pageSize=10&status=
+        ${records}    Get From Dictionary    ${reps.json()['data']}    records    #近期活动列表
+        Set Global Variable    ${records}
+        遍历活动列表
+    END
+
+遍历活动列表
+    FOR    ${records}    IN    ${records}
+        ${status}    Get From Dictionary    ${records}    status    #活动状态
+        ${AvtivityId}    Get From Dictionary    ${records}    id    #活动id
+        Exit For Loop If    ${status}==1    #活动状态，1报名中，2待开始，3进行中，4已取消，5已结束
+        Set Global Variable    ${AvtivityId}
+    END
+
+用户报名${datign}活动
+    #用户报名活动
+    FOR    ${client_header}    IN    @{Cheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${client_header}
--- a/1-Applet/6-Activity/Avtivity.robot
+++ b/1-Applet/6-Activity/Avtivity.robot
@ -0,0 +1,4 @@
+*** Settings ***
+Resource          ActivityResource.robot
+
+*** Test Cases ***
--- a/DA_data.yaml
+++ b/DA_data.yaml
@ -9,4 +9,8 @@

 用户:
 手机号: 15014242835
- 验证码: 888888
+ 验证码: 888888
+
+
+
+  # dating域名: http://dating-agency-api-test.qniao.cn
--- a/Phone.txt
+++ b/Phone.txt
@ -118,3 +118,4 @@
 13262318547,888888
 18783540726,888888
 13537209187,888888
+18545198367,888888
--- a/output/log.html
+++ b/output/log.html
--- a/output/output.xml
+++ b/output/output.xml
--- a/output/report.html
+++ b/output/report.html
@ -1629,22 +1629,22 @@ storage = function () {
 window.output = {};
 </script>
 <script type="text/javascript">
-window.output["suite"] = [1,2,3,0,[],[1,0,737],[[4,5,6,7,[],[1,16,522],[[8,9,10,11,[],[1,16,522],[],[[12,0,0,[],[1,410,128],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,538,199],[[16,17,18,19,[],[1,538,199],[[20,21,22,0,[],[1,538,199],[],[[23,0,0,[],[1,554,183],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[2,2,0,0]];
+window.output["suite"] = [1,2,3,0,[],[1,0,701],[[4,5,6,7,[],[1,15,685],[[8,9,10,11,[],[1,15,684],[],[[12,0,0,[],[1,457,242],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]]],[],[],[1,1,0,0]];
 </script>
 <script type="text/javascript">
 window.output["strings"] = [];
 </script>
 <script type="text/javascript">
-window.output["strings"] = window.output["strings"].concat(["*","*Dating-agency","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency","*..","*0-Login","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login","*../0-Login","*<p>用户登录婚介平台\x3c/p>","*Login-interface","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login\\Login-interface.robot","*../0-Login/Login-interface.robot","*<p>接口：短信验证码登录认证\x3c/p>","*手机号验证码登录-888888","*1-Applet","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet","*../1-Applet","*5-SeekingReward","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\5-SeekingReward","*../1-Applet/5-SeekingReward","*<p>招亲榜\x3c/p>","*SeekingReward","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\5-SeekingReward\\SeekingReward.robot","*../1-Applet/5-SeekingReward/SeekingReward.robot","*红娘推荐嘉宾"]);
+window.output["strings"] = window.output["strings"].concat(["*","*Dating-agency","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency","*..","*0-Login","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login","*../0-Login","*<p>用户登录婚介平台\x3c/p>","*Login-interface","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\0-Login\\Login-interface.robot","*../0-Login/Login-interface.robot","*<p>接口：短信验证码登录认证\x3c/p>","*手机号验证码登录-888888,phone"]);
 </script>
 <script type="text/javascript">
-window.output["stats"] = [[{"elapsed":"00:00:00","fail":0,"label":"All Tests","pass":2,"skip":0}],[],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":2,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1-s1","label":"Dating-agency.0-Login.Login-interface","name":"Login-interface","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s2","label":"Dating-agency.1-Applet","name":"1-Applet","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s2-s1","label":"Dating-agency.1-Applet.5-SeekingReward","name":"5-SeekingReward","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s2-s1-s1","label":"Dating-agency.1-Applet.5-SeekingReward.SeekingReward","name":"SeekingReward","pass":1,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:00:00","fail":0,"label":"All Tests","pass":1,"skip":0}],[],[{"elapsed":"00:00:01","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:01","fail":0,"id":"s1-s1-s1","label":"Dating-agency.0-Login.Login-interface","name":"Login-interface","pass":1,"skip":0}]];
 </script>
 <script type="text/javascript">
-window.output["baseMillis"] = 1716017544329;
+window.output["baseMillis"] = 1716432577972;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 772;
+window.output["generated"] = 716;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;
--- a/phoneTest.txt
+++ b/phoneTest.txt
@ -0,0 +1,2 @@
+13247780613
+13710986989