From 1a3b8a6751e6d269a1d49d17ef5b016cd304bb92 Mon Sep 17 00:00:00 2001 From: AKW <2497744746@qq.com> Date: Mon, 25 Dec 2023 14:35:54 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=9B=9E=E8=B0=83=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jqr/pubsub.py | 10 +++++----- apps/jqr/tasks.py | 3 ++- apps/jqr/ws.py | 27 +++++++++++++++++++++++++++ apps/msg/pubsub.py | 6 +++--- 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 apps/jqr/ws.py diff --git a/apps/jqr/pubsub.py b/apps/jqr/pubsub.py index 767cc40..e0773b9 100644 --- a/apps/jqr/pubsub.py +++ b/apps/jqr/pubsub.py @@ -59,8 +59,8 @@ class JQRQrcodeCallbackPubSub: handler(qrcodeid, userid, externaluserid, corpinfo) -# if not settings.DEBUG: -t = Thread(target=JQREventCallbackPubSub.event_callback_listener) -t.start() -t2 = Thread(target=JQRQrcodeCallbackPubSub.qrcode_callback_listener) -t2.start() +if not settings.DEBUG: + t = Thread(target=JQREventCallbackPubSub.event_callback_listener) + t.start() + t2 = Thread(target=JQRQrcodeCallbackPubSub.qrcode_callback_listener) + t2.start() diff --git a/apps/jqr/tasks.py b/apps/jqr/tasks.py index 6cff52e..f396ef6 100644 --- a/apps/jqr/tasks.py +++ b/apps/jqr/tasks.py @@ -6,6 +6,7 @@ from django.db.models import Count, Sum, When, Case, Value from apps.jqr.choices import JqrWechatbizuserinfoDeleteTypeChoices, JqrAddTypeChoices from apps.jqr.pubsub import JQRQrcodeCallbackPubSub +from apps.jqr.ws import WS from apps.qc.choices import QcWechatbizeventAddcontactIsDeleteChoices, QcQrcodesEditLogOperateTypeChoices, \ QcQrcodesEditLogTypeChoices from apps.qc.models import QcWechatbizeventAddcontact, QcQrcodes, QcWechatbizuserinfo, QcQrcodesEditLog, QcCorpinfo @@ -76,7 +77,7 @@ def save_add_contact_by_channel(data, corpinfo, *args, **kwargs): }) # 修复客户关系 edit_add_contact(data, corpinfo, *args, **kwargs) - # TODO 请求API 发送消息 + WS.transfer_external_userid_to_vid(f'{corpid}_{userid}', externaluserid) @shared_task(name='edit_add_contact', queue='contact') diff --git a/apps/jqr/ws.py b/apps/jqr/ws.py new file mode 100644 index 0000000..0b3afa3 --- /dev/null +++ b/apps/jqr/ws.py @@ -0,0 +1,27 @@ +import requests + + +class WS: + BASE_URL = f'http://ws.xbtool.cn' + + @classmethod + def transfer_external_userid_to_vid(cls, client_id, external_user_ids): + payload = { + "clientId": client_id, + "externalUserIds": external_user_ids + } + url = f'{cls.BASE_URL}/api/hook/websocket/transferexternaluseridtovid' + response = requests.post(url, json=payload) + + @classmethod + def transfer_groupid_to_roomid(cls, client_id, group_ids): + payload = { + "clientId": client_id, + "groupIds": group_ids + } + url = f'{cls.BASE_URL}/api/hook/websocket/transferexternaluseridtovid' + response = requests.post(url, json=payload) + + @classmethod + def send_wx_work_msg(cls): + url = f'{cls.BASE_URL}/api/hook/websocket/sendwxworkmsg' diff --git a/apps/msg/pubsub.py b/apps/msg/pubsub.py index 9173cc3..3692328 100644 --- a/apps/msg/pubsub.py +++ b/apps/msg/pubsub.py @@ -43,6 +43,6 @@ class JQRMSGPubSub: cls.msg_list.clear() -# if not settings.DEBUG: -t = Thread(target=JQRMSGPubSub.listen) -t.start() +if not settings.DEBUG: + t = Thread(target=JQRMSGPubSub.listen) + t.start()