diff --git a/Utils/websocket_handler.py b/Utils/websocket_handler.py index 7b2652d7695ca2b6e5d08acb9920e53740a41271..9c844e55b5049fff6901a0ec94a713bcc03bfe84 100644 --- a/Utils/websocket_handler.py +++ b/Utils/websocket_handler.py @@ -95,24 +95,14 @@ async def ws_action(ws,case): async def ws_send_handler(case,ws): data = case['data'] # 消息数据 - msgType = 'newstext' if data['type'] in ['text', 'emoji']: content = r'{"contentList":"%s","attachmentList":[]}' % data['content'] - elif data['type'] == 'image': - content = "{\"contentList\":\"

\",\"attachmentList\":[]}"%livechatData.imgSrc - elif data['type'] == 'file': - content = r'{"contentList":"","attachmentList":[{"src":"%s","blobSrc":"%s","name":"新建 文本文档.txt","size":0,"type":"text/plain"}]}'%(livechatData.fileSrc,livechatData.fileSrc) - elif data['type'] == 'article': - content = r'{"contentList":"
article title

article_detail

View all →
","attachmentList":[]}' %data['content'] - elif data['type'] == 'rate': - content = r'[&*{"reviewContent":"%s","thumbsReviews":{"good":"","bad":"FeedbackURL"},"startReviews":{"one_start":"FeedbackURL","two_start":"FeedbackURL","three_start":"FeedbackURL","four_start":"","five_start":"www.baidu.com"},"reviewTitle":"%s","reviewChoose":"thumbs","askSendReview":"true","autoSendReview":"false","primaryColor":"#2C23E5"}]'%(livechatData.rateContent,livechatData.rateTitle) + else: + content = getattr(livechatData,data['type']) + if data['type'] != 'rate': + msgType = 'newstext' + else: msgType = 'rate' - elif data['type'] == 'link': - content = "{\"contentList\":\"%s\",\"attachmentList\":[]}"%(livechatData.linkHref,livechatData.linkTitle) - elif data['type'] == 'product': - content = "{\"contentList\":\"
Selling Plans Ski Wax
\",\"attachmentList\":[]}" - elif data['type'] == 'coupon': - content = r'{"contentList":"优惠券","attachmentList":[]}' fromId = data['fromId'] if data.get('fromId') else getattr(Global, 'customerId') siteId = data['siteId'] if data.get('siteId') else getattr(Global, 'shopId') uid = data['uid'] if data.get('uid') else getattr(Global, 'userId')