diff --git a/0-Login/LoginResource.robot b/0-Login/LoginResource.robot
index 5eced2e..f0e6454 100644
--- a/0-Login/LoginResource.robot
+++ b/0-Login/LoginResource.robot
@@ -149,7 +149,7 @@ Library ImageHorizonLibrary
Disable Warnings
FOR ${phone} IN @{phoneList}
Create Session dating ${${dating}.dating域名} ${${dating}.AHeader}
- ${data} Set Variable { \ \ "account":"${phone}", \ \ "accountType":2, \ \ "captcha":666666 } #手机号验证码登录参数
+ ${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
diff --git a/1-Applet/3-Customer/EquityResource.robot b/1-Applet/3-Customer/EquityResource.robot
index 99e8a42..16e78d2 100644
--- a/1-Applet/3-Customer/EquityResource.robot
+++ b/1-Applet/3-Customer/EquityResource.robot
@@ -127,13 +127,15 @@ Library DatabaseLibrary
FOR ${userId} ${miId} IN ZIP ${userid_list} ${miId_list}
${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S
${Time} Add Time To Date ${dataTime} 5 days
+ ${end_time} Get Substring ${Time} 0 19
Connect To Database Using Custom Params pymysql database='dating_agency_mall',user='root',password='qniaothreetwoonego',host='8.135.8.221'
- ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 501, '${dataTime}', '${Time}', 1) #插入一条聊天卡
- ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '501' AND `enable` = '1' #查询权益id
+ ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 501, '${dataTime}', '${end_time}', 1) #插入一条聊天卡
+ ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '501' AND `enable` = '1'AND `end_time` = '${end_time}' #查询权益id
${right_id} Set Variable ${check_1[0][0]}
${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '规格', 1, 102, NULL)
${insert_3} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益上限额度', 2, 1, '3')
${insert_4} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益剩余额度', 3, 1, '3')
+ ${insert_5} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_acquire_record`(`id`, `create_time`, `user_id`, `mi_id`, `right_id`, `right_type`, `acquire_type`) VALUES (NULL, '${dataTime}', ${userId}, ${miId}, ${right_id}, 501, 2) #权益领取记录表
Disconnect From Database
END
diff --git a/1-Applet/7-Chat/Chat.robot b/1-Applet/7-Chat/Chat.robot
new file mode 100644
index 0000000..aba57ff
--- /dev/null
+++ b/1-Applet/7-Chat/Chat.robot
@@ -0,0 +1,9 @@
+*** Settings ***
+Suite Setup Import Variables ${EXECDIR}\\DA_data.yaml
+Resource ChatResource.robot
+
+*** Test Cases ***
+用户发起聊天
+ Given 查询婚介征婚人的资料信息
+ When 查询婚介消息列表
+ Then 查询婚介用户的聊天权益
diff --git a/1-Applet/7-Chat/ChatResource.robot b/1-Applet/7-Chat/ChatResource.robot
new file mode 100644
index 0000000..48091e9
--- /dev/null
+++ b/1-Applet/7-Chat/ChatResource.robot
@@ -0,0 +1,127 @@
+*** Settings ***
+Library urllib3
+Library String
+Library DateTime
+Library Collections
+Library RequestsLibrary
+Library DatabaseLibrary
+
+*** Keywords ***
+查询${dating}征婚人的资料信息
+ #通过userid获取征婚人的资料
+ ${miId_list} Create List
+ 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}
+ ${miId} Get From Dictionary ${reps.json()['data']} id #获取资料id
+ ${nickName} Get From Dictionary ${reps.json()['data']} nickName #获取用户名称
+ ${genderCode} Get From Dictionary ${reps.json()['data']} genderCode #用户性别
+ ${message} Get From Dictionary ${reps.json()} message
+ Append To List ${miId_list} ${miId}
+ Should Be Equal As Strings ${message} successful
+ END
+ Set Global Variable ${miId_list}
+ Set Global Variable ${nickName}
+ Set Global Variable ${genderCode}
+ Set Global Variable ${client_header}
+
+查询${dating}消息列表
+ #查询当前登录用户的消息列表
+ FOR ${client_header} ${selfMiId} IN ZIP ${Cheader_list} ${miId_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-cim/user/page/room params=pageNum=1&pageSize=10&selfMiId=${selfMiId}
+ ${InfomationData} Get From Dictionary ${reps.json()['data']} records #消息数组
+ Set Global Variable ${InfomationData}
+ Run Keyword If ${InfomationData}==[] 查询婚介平台相亲列表
+ ... ELSE 遍历消息列表
+ END
+
+遍历消息列表
+ ${infomation} Evaluate random.choice(${InfomationData}) random #随机获取聊天对象信息
+ ${roomId} Get From Dictionary ${infomation} roomId #聊天室id
+ ${roomName} Get From Dictionary ${infomation} roomName #聊天对象名称
+ #Set Global Variable ${roomId}
+ Set Global Variable ${roomName}
+ ${roomId} Set Variable 1001948869078159360
+ ${roomId} Convert To String ${roomId}
+ Set Global Variable ${roomId}
+
+查询${dating}平台相亲列表
+ #相亲推荐页
+ FOR ${client_header} IN @{Cheader_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-service/user/get/marriage/recommendation/page params=queryType=0&pageNum=1&pageSize=30
+ ${records} Get From Dictionary ${reps.json()['data']} records #推荐列表
+ ${userData} Evaluate random.choice(${records}) random
+ ${otherMiId} Get From Dictionary ${userData} miId #资料id
+ Set Global Variable ${otherMiId}
+ END
+ 创建聊天室
+
+创建聊天室
+ #创建聊天室
+ FOR ${client_header} ${selfMiId} IN ZIP ${Cheader_list} ${miId_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"otherMiId":"${otherMiId}","selfMiId":"${selfMiId}"}
+ ${reps} POST On Session dating dating-agency-cim/user/join/private-chat/room ${data.encode('utf-8')}
+ ${roomId} Get From Dictionary ${reps.json()['data']} roomId #聊天室id
+ Set Global Variable ${roomId}
+ END
+
+查询${dating}用户的聊天权益
+ #查询用户的聊天权益
+ FOR ${client_header} ${selfMiId} IN ZIP ${Cheader_list} ${miId_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating /dating-agency-cim/user/get/chat-right-consume params=roomId=${roomId}&selfMiId=${selfMiId}
+ ${chatRight} Get From Dictionary ${reps.json()['data']} chatRight #能否聊天
+ ${reps} GET On Session dating dating-agency-mall/user/list/right/by/customer params=miId=${selfMiId}&type=501
+ ${data} Get From Dictionary ${reps.json()} data #当前用户的聊天权益
+ Run Keyword If ${chatRight}==False and ${data}==[] 数据库新增聊天卡权益
+ ... ELSE IF ${chatRight}==False and ${data}!=[] 聊天消耗婚介用户权益
+ ... ELSE IF ${chatRight}==True 使用婚介常用语聊天
+ ... ELSE LOG 正常聊天
+ END
+
+数据库新增聊天卡权益
+ FOR ${userId} ${miId} IN ZIP ${userid_list} ${miId_list}
+ ${dataTime} Get Current Date result_format=%Y-%m-%d %H:%M:%S
+ ${Time} Add Time To Date ${dataTime} 5 days
+ ${end_time} Get Substring ${Time} 0 19
+ Connect To Database Using Custom Params pymysql database='dating_agency_mall',user='root',password='qniaothreetwoonego',host='8.135.8.221'
+ ${insert_1} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right`(`id`, `is_delete`, `create_time`, `update_time`, `user_id`, `mi_id`, `type`, `start_time`, `end_time`, `enable`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${userId}, ${miId}, 501, '${dataTime}', '${end_time}', 1) #插入一条聊天卡
+ ${check_1} Query SELECT id FROM `dating_agency_mall`.`da_right` WHERE `mi_id` = '${miId}' AND `type` = '501' AND `enable` = '1'AND `end_time` = '${end_time}' #查询权益id
+ ${right_id} Set Variable ${check_1[0][0]}
+ ${insert_2} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '规格', 1, 102, NULL)
+ ${insert_3} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益上限额度', 2, 1, '3')
+ ${insert_4} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_term`(`id`, `is_delete`, `create_time`, `update_time`, `right_id`, `display_name`, `name`, `unit`, `value`) VALUES (NULL, 0, '${dataTime}', '${dataTime}', ${right_id}, '权益剩余额度', 3, 1, '3')
+ ${insert_5} Execute Sql String INSERT INTO `dating_agency_mall`.`da_right_acquire_record`(`id`, `create_time`, `user_id`, `mi_id`, `right_id`, `right_type`, `acquire_type`) VALUES (NULL, '${dataTime}', ${userId}, ${miId}, ${right_id}, 501, 2) #权益领取记录表
+ Disconnect From Database
+ END
+ 聊天消耗婚介用户权益
+
+聊天消耗${dating}用户权益
+ #消耗聊天权益
+ FOR ${client_header} ${selfMiId} IN ZIP ${Cheader_list} ${miId_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${data} Set Variable {"roomId":"${roomId}","selfMiId":"${selfMiId}"}
+ ${reps} POST On Session dating dating-agency-cim/user/consume/chat-right ${data.encode('utf-8')}
+ ${message} Get From Dictionary ${reps.json()} message
+ Should Be Equal As Strings ${message} successful
+ END
+ 使用婚介常用语聊天
+
+使用${dating}常用语聊天
+ #使用常用语聊天
+ FOR ${client_header} ${selfmiId} IN ZIP ${Cheader_list} ${miId_list}
+ Create Session dating ${${dating}.dating域名} ${client_header}
+ ${reps} GET On Session dating dating-agency-cim/user/page/common-chat-template/by/customer
+ ${records} Get From Dictionary ${reps.json()['data']} records
+ ${CommonData} Evaluate random.choice(${records}) random #随机获取常用语
+ ${commonContent} Get From Dictionary ${CommonData} commonContent #常用语内容
+ ${data} Set Variable {"selfMiId":"${selfmiId}","content":"${commonContent}","roomId":"${roomId}"}
+ ${reps} POST On Session dating dating-agency-cim/user/send/content ${data.encode('utf-8')}
+ ${code} Get From Dictionary ${reps.json()} code #响应状态码
+ ${message} Get From Dictionary ${reps.json()} message #响应文本
+ Run Keyword If ${code}==200100 log ${message}
+ ... ELSE log 消息发送成功
+ END
diff --git a/1-Applet/7-Chat/__init__.robot b/1-Applet/7-Chat/__init__.robot
new file mode 100644
index 0000000..23f3f90
--- /dev/null
+++ b/1-Applet/7-Chat/__init__.robot
@@ -0,0 +1,3 @@
+*** Settings ***
+Documentation 1、嘉宾和嘉宾聊天
+... 2、嘉宾和红娘聊天
diff --git a/Phone.txt b/Phone.txt
index ab3da64..d87b2d1 100644
--- a/Phone.txt
+++ b/Phone.txt
@@ -120,3 +120,9 @@
13537209187,888888
18545198367,888888
18831249056,888888
+13523174605,888888
+15113770658,888888
+13529074317,888888
+15194265787,888888
+15637620489,888888
+15157871630,888888
diff --git a/output/log.html b/output/log.html
index ac475b8..e315a12 100644
--- a/output/log.html
+++ b/output/log.html
@@ -1806,25 +1806,25 @@ function stopPropagation(event) {
window.output = {};