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

Controller/AdminManage.py

@@ -178,7 +178,7 @@ class AdminManage(TemplateView):
         own_perm = ModelService.check_perm(userID, 30)
         if own_perm:
             count = int(Device_User.objects.count())
-            redisObj = RedisObject(db=3)
+            redisObj = RedisObject()
             onlines = int(redisObj.get_size())
             print(onlines)
             return response.json(0, {"onlinenum": onlines, "no_onlinenum": count - onlines})

Controller/DetectController.py

@@ -314,7 +314,7 @@ class DetectControllerView(View):
 
     def do_delete_redis(self, uid, detect_interval=0):
         keyPattern = '{uid}*'.format(uid=uid)
-        redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
+        redisObj = RedisObject()
         keys = redisObj.get_keys(keyPattern)
         if keys:
             for key in keys:
@@ -335,8 +335,6 @@ class DetectControllerView(View):
         if dvqs.exists():
             uid_set_qs = UidSetModel.objects. \
                 filter(uid=uid, uidpushmodel__userID_id=userID)
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_' + userID)
             if uid_set_qs.exists():
                 uid_set_qs.update(detect_interval=int(interval))
             else:

Controller/DetectControllerV2.py

@@ -255,7 +255,7 @@ class DetectControllerViewV2(View):
 
     def do_delete_redis(self, uid, detect_interval=0):
         keyPattern = '{uid}*'.format(uid=uid)
-        redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
+        redisObj = RedisObject()
         keys = redisObj.get_keys(keyPattern)
         if keys:
             for key in keys:
@@ -435,8 +435,6 @@ class DetectControllerViewV2(View):
         if dvqs.exists():
             uid_set_qs = UidSetModel.objects. \
                 filter(uid=uid, uidpushmodel__userID_id=userID)
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_' + userID)
             if uid_set_qs.exists():
                 uid_set_qs.update(detect_interval=int(interval))
             else:
@@ -491,7 +489,7 @@ class PushNotificationView(View):
         eto = ETkObject(etk)
         uid = eto.uid
         if len(uid) == 20:
-            redisObj = RedisObject(db=6)
+            redisObj = RedisObject()
             # pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)
             pkey = '{uid}_ptl'.format(uid=uid)
             ykey = '{uid}_redis_qs'.format(uid=uid)

Controller/DeviceManage.py

@@ -102,8 +102,6 @@ class DeviceManage(View):
 
     def delete(self, request_dict, userID, response):
         own_perm = ModelService.check_perm(userID=userID, permID=10)
-        # redisObj = RedisObject(db=8)
-        # redisObj.del_data(key='uid_qs_' + userID)
         if own_perm is True:
             id = request_dict.get('id', None)
             if id:

Controller/DeviceShare.py

@@ -185,8 +185,6 @@ class DeviceShareView(View):
                     sharerDvqs.data_joined = None
                     sharerDvqs.save()
                     UserDeviceShareView.qrcode_share_channel_permission_save(userID, UID)
-                    # redisObj = RedisObject(db=8)
-                    # redisObj.del_data(key='uid_qs_' + userID)
                 except Exception as e:
                     return response.json(10, repr(e))
                 else:
@@ -247,8 +245,6 @@ class DeviceShareView(View):
         id = request_dict.get('id', None)
         if id:
             try:
-                # redisObj = RedisObject(db=8)
-                # redisObj.del_data(key='uid_qs_' + userID)
                 Device_Info.objects.filter(id=id, primaryUserID=userID).delete()
             except Exception as e:
                 return response.json(10, repr(e))

Controller/EquipmentManager.py

@@ -92,8 +92,6 @@ def addNewUserEquipmentInterface(request):
         if dValid:
             return response.json(174)
         else:
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_' + userID)
             UID = deviceData.get('UID', '')
             re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
             if re_uid.match(UID):
@@ -162,9 +160,6 @@ def delUserEquipmentInterface(request):
     # 主用户删除设备全部删除
     try:
         dv_qs = Device_Info.objects.filter(userID_id=userID, id=id)
-        # redisObj = RedisObject(db=8)
-        # redisObj.del_data(key='uid_qs_' + userID)
-
         if dv_qs.exists():
             uid = dv_qs[0].UID
             asy = threading.Thread(target=ModelService.add_log,
@@ -659,8 +654,6 @@ def admin_addInterface(request):
         else:
             UID = deviceData.get('UID', '')
             re_uid = re.compile(r'^[A-Za-z0-9]{20}$')
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_' + userID)
             if re_uid.match(UID):
                 userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
                                          **deviceData)
@@ -740,9 +733,6 @@ def admin_modifyInterface(request):
         return response.json(404)
 
     deviceData = json.loads(deviceContent)
-    print(deviceData['UID'])
-    # redisObj = RedisObject(db=8)
-    # redisObj.del_data(key='uid_qs_' + userID)
     dValid = Device_Info.objects.filter(userID_id=userID, UID=deviceData['UID'])
     if dValid.exists():
         dValid_dict = CommonService.qs_to_dict(dValid)
@@ -834,7 +824,7 @@ def deleteInterface(request):
                 DetectControllerView().do_delete_redis(uid)
                 if up_qs.count() > 1:
                     UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
-                    redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
+                    redisObj = RedisObject()
                     ykey = '{uid}_redis_qs'.format(uid=uid)
                     if ykey:
                         redisObj.del_data(key=ykey)
@@ -935,7 +925,7 @@ def batchDeleteInterface(request):
                 DetectControllerView().do_delete_redis(uid)
                 if up_qs.count() > 1:
                     UidPushModel.objects.filter(uid_set__uid=uid, userID_id=userID).delete()
-                    redisObj = RedisObject(db=6, SERVER_HOST=PUSH_REDIS_ADDRESS)
+                    redisObj = RedisObject()
                     ykey = '{uid}_redis_qs'.format(uid=uid)
                     if ykey:
                         redisObj.del_data(key=ykey)
@@ -1238,8 +1228,6 @@ def update_uid_set(request):
         userID = tko.userID
         nowTime = int(time.time())
         dvqs = Device_Info.objects.filter(userID_id=userID)
-        # redisObj = RedisObject(db=8)
-        # redisObj.del_data(key='uid_qs_' + userID)
         if dvqs.exists():
             us_qs = UidSetModel.objects.filter(uid=uid)
             if us_qs.exists():

Controller/EquipmentStatus.py

@@ -113,7 +113,7 @@ def getTZ(request):
         uid = c.decode('utf-8')
         if len(uid) == 20:
             print(uid)
-            redisObject = RedisObject(db=7)
+            redisObject = RedisObject()
             data = redisObject.get_data(key=ip)
             if data:
                 info = json.loads(data)

Controller/FileController.py

@@ -95,18 +95,11 @@ class UploadUIDFileView(View):
         mac = MacModel.objects.filter().values('id', 'value', 'is_active')[0]
         if not mac['is_active']:
             return response.json(175)
-        # redisObject = RedisObject(db=3)
         key = ''
         tmpMac = mac['value']
         savePoint = None
         for item in keys:
             key = item.strip()
-            # value = redisObject.get_data(key)
-            # if value is False:
-            #     # redisObject.set_data(key, '1', 600)
-            # else:
-            #     duplicate.append(key)
-            #     continue
             bulk.append(UIDModel(
                 uid=item.strip(),
                 uid_extra='',

Controller/PctestController.py

@@ -527,11 +527,6 @@ class TokenObject1:
             self.lang = res.get('lang', None)
             self.job = res.get('job', None)
             self.user = res.get('user', '')
-            # 刷新登录时间
-            # if self.userID:
-            #     print(self.user)
-            #     redisObj = RedisObject(db=3)
-            #     redisObj.set_data(key=self.userID, val=self.user, expire=300)
 
         except jwt.ExpiredSignatureError as e:
             print('过期')

Controller/UIDPreview.py

@@ -79,8 +79,6 @@ class UIDPreview(View):
             bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
 
             dvqs = Device_Info.objects.filter(UID=uid, userID_id=userID)
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_'+userID)
             upqs = UID_Preview.objects.filter(uid=uid, channel=channel)
             if dvqs.exists():
                 if upqs.exists():
@@ -147,8 +145,6 @@ class UIDPreview(View):
         own_perm = ModelService.check_perm(userID, 20)
         if own_perm is True:
             id = request_dict.get('id')
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_' + userID)
             UID_Preview.objects.filter(id=id).delete()
             return response.json(0)
         else:

Controller/UidSetController.py

@@ -132,8 +132,6 @@ class UidSetView(View):
         if own_perm is True:
             uid = request_dict.getlist('uid', None)
             id_list = request_dict.get('id_list', None)
-            # redisObj = RedisObject(db=8)
-            # redisObj.del_data(key='uid_qs_' + userID)
             # 删除回滚
             with transaction.atomic():  # 上下文格式，可以在python代码的任何位置使用
                 val = 1

Controller/shareUserPermission.py

@@ -103,7 +103,7 @@ class searchUserView(View):
                 device_user_count = qs.count()
                 device_user_res = qs[(page - 1) * line:page * line]
                 sqlDict = CommonService.qs_to_dict(device_user_res)
-                redisObj = RedisObject(db=3)
+                redisObj = RedisObject()
                 for k, v in enumerate(sqlDict["datas"]):
                     for val in device_user_res:
                         if v['pk'] == val.userID: