From e3a94e9a7250a5f9957eaee7f1ec1653d891b465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Tue, 4 Oct 2022 09:03:31 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=8E=A5=E5=8F=A3=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/ecm/tasks.py     | 1 -
 apps/third/dahua.py   | 5 +----
 apps/third/speaker.py | 5 +----
 apps/third/xunxi.py   | 5 +----
 4 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/apps/ecm/tasks.py b/apps/ecm/tasks.py
index 6de15f9f..5769ae72 100644
--- a/apps/ecm/tasks.py
+++ b/apps/ecm/tasks.py
@@ -18,7 +18,6 @@ import time
 from django.core.cache import cache
 
 
-@shared_task
 def update_count_people(i: Area):
     if i.third_info.get('xx_rail', None):
         railId = i.third_info['xx_rail']['id']
diff --git a/apps/third/dahua.py b/apps/third/dahua.py
index f82c5267..b1f8bd59 100644
--- a/apps/third/dahua.py
+++ b/apps/third/dahua.py
@@ -34,7 +34,6 @@ class DhClient:
             self.isGetingToken = False
             self.isRuning = True
             self.token = None
-            self.t = None  # 线程
             self.log = {}
             self.setup()
 
@@ -55,15 +54,13 @@ class DhClient:
             time.sleep(1200)
 
     def setup(self):
-        t = Thread(target=self._get_token_loop, args=(), daemon=True)
-        t.start()
+        Thread(target=DhClient._get_token_loop, args=(self, ), daemon=True).start()
 
     def __del__(self):
         """
         自定义销毁
         """
         self.isRuning = False
-        # self.t.join()
 
     def request(self, url: str, method: str, params=dict(), json=dict(), timeout=120,
                 file_path_rela=None, raise_exception=True):
diff --git a/apps/third/speaker.py b/apps/third/speaker.py
index 0183d60e..2fa77dc3 100644
--- a/apps/third/speaker.py
+++ b/apps/third/speaker.py
@@ -32,7 +32,6 @@ class SpClient:
         self.headers = {"Connection": "close"}
         self.isGetingToken = False
         self.isRuning = True
-        self.t = None  # 线程
         self.log = {}
         self.setup()
 
@@ -52,15 +51,13 @@ class SpClient:
             time.sleep(1200)
 
     def setup(self):
-        t = Thread(target=self._get_token_loop, args=(), daemon=True)
-        t.start()
+        Thread(target=SpClient._get_token_loop, args=(self, ), daemon=True).start()
 
     def __del__(self):
         """
         自定义销毁
         """
         self.isRuning = False
-        # self.t.join()
 
     def request(self, url: str, method: str, params=dict(), json=dict(), timeout=120,
                 file_path_rela=None, raise_exception=True):
diff --git a/apps/third/xunxi.py b/apps/third/xunxi.py
index 00dc71d6..4c76bc6f 100644
--- a/apps/third/xunxi.py
+++ b/apps/third/xunxi.py
@@ -30,7 +30,6 @@ class XxClient:
             self.isRuning = True
             self.token = ''
             self.log = {}
-            self.t = None
             self.setup()
 
     def _get_token_loop(self):
@@ -49,15 +48,13 @@ class XxClient:
         self.isGetingToken = False
 
     def setup(self):
-        self.t = Thread(target=self._get_token_loop, args=(), daemon=True)
-        self.t.start()
+        Thread(target=XxClient._get_token_loop, args=(self, ), daemon=True).start()
 
     def __del__(self):
         """
         自定义销毁
         """
         self.isRuning = False
-        # self.t.join()
 
     def request(self, url: str, method: str = 'post', params=dict(), json=dict(), timeout=20, raise_exception=True):
         if not settings.XX_ENABLED: