红娘

0-Login/Login-interface.robot

@@ -17,17 +17,20 @@ Library           Collections
     Then 数据库查询用户生效且未过期的验证码
     And 用户手机号验证码登录婚介平台
     And 查询用户的婚介组织
+    And 获取婚介平台用户baseinfo
 
 手机号验证码登录-888888
     #登录婚介平台
     Given 读取TXT文件
     And 用户手机号验证码登录婚介平台-888888
     And 查询用户的婚介组织
+    And 获取婚介平台用户baseinfo
 
 手机号验证码登录-888888,phone
     Given 生成随机手机号
     When 用户手机号验证码登录婚介平台-phone
     And 查询用户的婚介组织
+    And 获取婚介平台用户baseinfo
 
 手机号验证码已过期登录
     #验证码已过期

0-Login/LoginResource.robot

@@ -184,6 +184,17 @@ Library           OperatingSystem
         ...    ELSE    log    ${data}
     END
 
+获取${dating}平台用户baseinfo
+    #获取baseinfo
+    FOR    ${admin_header}    IN    @{Aheader_list}
+        Create Session    dating    ${${dating}.dating域名}    ${admin_header}
+        ${reps}    GET On Session    dating    dating-agency-uec/user/get/base-info
+        ${phone}    Get From Dictionary    ${reps.json()['data']}    phone    #登录用户手机号
+        ${matchmakerFlag}    Get From Dictionary    ${reps.json()['data']}    matchmakerFlag    #登录用户是否是红娘
+    END
+    Set Global Variable    ${phone}
+    Set Global Variable    ${matchmakerFlag}
+
 数据库删除用户数据
     FOR    ${userId}    IN    @{userid_list}
         Connect To Database Using Custom Params    pymysql    database='dating_agency_uec',user='root',password='qniaothreetwoonego',host='8.135.8.221'

1-Applet/2-Homepage/MarriageInfo/Authentication.robot

@@ -91,7 +91,7 @@ Resource          ../../../0-Login/LoginResource.robot
 
 提交${dating}征婚人身份证审核
     #提交征婚人身份证审核
-    #${value_list}    Create List    李博,429006198410300956    王颖勋,44058319951227041X    就是不吃饭,441481199509213863    王颖勋,4400
+    #${value_list}    Create List    李博,429006198410300956    王颖勋,44058319951227041X    就是不吃饭,441481199509213863    王颖勋,4400    李子懿,429006201701270931
     #女生身份证
     ${woman_value}    Set Variable    尤名雅,420101198605250747
     #男生身份证

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,2134],[[4,5,6,7,[],[1,15,261],[[8,9,10,11,[],[1,15,261],[],[[12,0,0,[],[1,110,166],[]]],[],[1,1,0,0]]],[],[],[1,1,0,0]],[13,14,15,0,[],[1,276,1858],[[16,17,18,0,[],[1,276,1857],[[19,20,21,22,[],[1,276,1856],[[23,24,25,0,[],[1,276,1856],[],[[26,0,0,[],[1,292,1838],[]]],[],[1,1,0,0]]],[],[],[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,365],[[4,5,6,7,[],[1,17,348],[[8,9,10,11,[],[1,17,348],[],[[12,0,0,[],[1,126,239],[]]],[],[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","*2-Homepage","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage","*../1-Applet/2-Homepage","*BlindDate","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\BlindDate","*../1-Applet/2-Homepage/BlindDate","*<p>相亲页面\x3c/p>","*Blind","*D:\\LYL\\Study\\Robot_framework\\space\\Dating-agency\\1-Applet\\2-Homepage\\BlindDate\\Blind.robot","*../1-Applet/2-Homepage/BlindDate/Blind.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"]);
 </script>
 <script type="text/javascript">
-window.output["stats"] = [[{"elapsed":"00:00:02","fail":0,"label":"All Tests","pass":2,"skip":0}],[],[{"elapsed":"00:00:02","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":2,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1-s1","label":"Dating-agency.0-Login.Login-interface","name":"Login-interface","pass":1,"skip":0},{"elapsed":"00:00:02","fail":0,"id":"s1-s2","label":"Dating-agency.1-Applet","name":"1-Applet","pass":1,"skip":0},{"elapsed":"00:00:02","fail":0,"id":"s1-s2-s1","label":"Dating-agency.1-Applet.2-Homepage","name":"2-Homepage","pass":1,"skip":0},{"elapsed":"00:00:02","fail":0,"id":"s1-s2-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate","name":"BlindDate","pass":1,"skip":0},{"elapsed":"00:00:02","fail":0,"id":"s1-s2-s1-s1-s1","label":"Dating-agency.1-Applet.2-Homepage.BlindDate.Blind","name":"Blind","pass":1,"skip":0}]];
+window.output["stats"] = [[{"elapsed":"00:00:00","fail":0,"label":"All Tests","pass":1,"skip":0}],[],[{"elapsed":"00:00:00","fail":0,"id":"s1","label":"Dating-agency","name":"Dating-agency","pass":1,"skip":0},{"elapsed":"00:00:00","fail":0,"id":"s1-s1","label":"Dating-agency.0-Login","name":"0-Login","pass":1,"skip":0},{"elapsed":"00:00:00","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"] = 1711964125713;
+window.output["baseMillis"] = 1712042546647;
 </script>
 <script type="text/javascript">
-window.output["generated"] = 2154;
+window.output["generated"] = 380;
 </script>
 <script type="text/javascript">
 window.output["expand_keywords"] = null;