From 3130d49276634727fed2a504936c71207aa07d14 Mon Sep 17 00:00:00 2001
From: AKW <2497744746@qq.com>
Date: Fri, 22 Dec 2023 14:15:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E8=B0=83=E7=8A=B6=E6=80=81=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/msg/pub.py   | 26 --------------------------
 apps/msg/sub.py   | 25 -------------------------
 apps/msg/utils.py |  4 ++++
 3 files changed, 4 insertions(+), 51 deletions(-)
 delete mode 100644 apps/msg/pub.py
 delete mode 100644 apps/msg/sub.py

diff --git a/apps/msg/pub.py b/apps/msg/pub.py
deleted file mode 100644
index d7c0d70..0000000
--- a/apps/msg/pub.py
+++ /dev/null
@@ -1,26 +0,0 @@
-import json
-
-from redis import StrictRedis
-
-rc = StrictRedis(host='localhost', port=6379, db=0)
-
-data = {
-    "create_time": 1671796836,
-    "update_time": 1671796836,
-    "remark": "test message",
-    "corp_id": 12345,
-    "vid": 123456789,
-    "msg_type": 1,
-    "to_vid": 987654321,
-    "to_room_id": 1122334455,
-    "send_time": "1671705497",
-    "content": "this is a test message",
-    "aeskey": "123456789abcdefg",
-    "origin_data": {
-        "foo": "bar"
-    }
-}
-
-for i in range(10):
-    value_new = json.dumps(data)
-    rc.publish("jqr:msg", value_new)
diff --git a/apps/msg/sub.py b/apps/msg/sub.py
deleted file mode 100644
index a197a92..0000000
--- a/apps/msg/sub.py
+++ /dev/null
@@ -1,25 +0,0 @@
-import time
-
-from redis import StrictRedis
-import json
-
-rc = StrictRedis(host='localhost', port=6379, db=0)
-ps = rc.pubsub()
-ps.subscribe('jqr:msg')
-
-msg_list = []
-
-batch_size = 2
-while True:
-    for item in ps.listen():
-        if item['type'] == 'message':
-            data = item.get('data')
-            print(data)
-            msg_list.append(data)
-            if len(msg_list) >= batch_size:
-                try:
-                    time.sleep(1)
-                    msg_list = msg_list[-batch_size:]
-                except Exception as e:
-                    print(e)
-            print(len(msg_list))
diff --git a/apps/msg/utils.py b/apps/msg/utils.py
index 5a9a7a3..e72c83f 100644
--- a/apps/msg/utils.py
+++ b/apps/msg/utils.py
@@ -1,4 +1,5 @@
 import json
+import logging
 
 from redis import Redis
 from django.conf import settings
@@ -7,6 +8,8 @@ from threading import Thread
 from apps.msg.models import TbMessage
 from yzk_wechat_event.settings.constant import Constant
 
+logger = logging.getLogger('apps')
+
 
 class JQRMSGPubSubUtils:
     rc = Redis(host=settings.REDIS_HOST, port=settings.REDIS_PORT, db=0)
@@ -19,6 +22,7 @@ class JQRMSGPubSubUtils:
 
 
 def listen():
+    logger.info('监听消息队列-----')
     from apps.jqr.serializers import TbMessageModelSerializer
     while True:
         data = JQRMSGPubSubUtils.rc.brpop(Constant.JQR_MSG_PUBSUB_CHANNEL, 5)