Merge remote-tracking branch 'remotes/origin/dev' into test

Controller/EquipmentManager.py

@@ -694,6 +694,10 @@ def deleteInterface(request):
                 up_qs = UidPushModel.objects.filter(uid_set__uid=uid)
                 if up_qs.count() > 1:
                     UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
+                    redisObj = RedisObject(db=6, SERVER_HOST='push.dvema.com')
+                    ykey = '{uid}_redis_qs'.format(uid=uid)
+                    if ykey:
+                        redisObj.del_data(key=ykey)
                 else:
                     up_qs.delete()
                 # b.分享获得用户假删除

Controller/EquipmentStatus.py

@@ -12,6 +12,7 @@
 @Contact: chanjunkai@163.com
 """
 import base64
+import threading
 import urllib.parse
 import time
 import oss2
@@ -22,6 +23,7 @@ from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
 from Model.models import Device_Info
 from Object.ETkObject import ETkObject
 from Object.ResponseObject import ResponseObject
+from Service.ModelService import ModelService
 from Service.CommonService import CommonService
 
 '''
@@ -113,6 +115,8 @@ def getTZ(request):
                 info = CommonService.getIpIpInfo(ip=ip, lang=lang,update=True)
             else:
                 info = CommonService.getIpIpInfo(ip=ip, lang=lang,update=False)
+            thread = threading.Thread(target=ModelService.add_ip_log, args=(ip, info))
+            thread.start()
             try:
                 tz = info['utc_offset']
                 # 增加GMT,且补:00

Service/ModelService.py

@@ -204,6 +204,15 @@ class ModelService:
         file.flush()
         file.close()
 
+    @staticmethod
+    def add_ip_log(ip, info):
+        file_path = '/'.join((BASE_DIR, 'static/get_timezone.log'))
+        file = open(file_path, 'a+')
+        file.write(ip + "; info:" + str(info) + "; time:" + time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
+        file.write('\n')
+        file.flush()
+        file.close()
+
 
 def notify_alexa_delete(userID, UID):
     url = 'https://www.zositech.xyz/deviceStatus/delete'