修改ip函数解bug

Controller/DetectController.py

@@ -165,6 +165,8 @@ class DetectControllerView(View):
                 uid_set_qs.update(detect_status=status, updTime=nowTime)
                 UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set__uid=uid). \
                     update(**uid_push_update_dict)
+                if status == 0:
+                    return response.json(0, 'close')
                 utko = UidTokenObject()
                 # right
                 utko.generate(data={'uid': uid})
@@ -199,6 +201,8 @@ class DetectControllerView(View):
                 }
                 # 绑定设备推送
                 UidPushModel.objects.create(**uid_push_create_dict)
+                if status == 0:
+                    return response.json(0, 'close')
                 utko = UidTokenObject()
                 utko.generate(data={'uid': uid})
                 detectUrl = "{DETECT_PUSH_DOMAIN}notify/push?uidToken={uidToken}". \

Controller/EquipmentInfo.py

@@ -349,7 +349,10 @@ class DetectStatusView(View):
         else:
             return response.json(173)
 
-
+'''
+use information_schema;
+select concat(round(sum(data_length/1024/1024),2),'MB') as data from tables where table_schema='Ansjer81';
+'''
 # 按季度删除访问日志
 def deleteExpireEquipmentInfo(request):
     response = ResponseObject()

Controller/EquipmentManager.py

@@ -775,6 +775,9 @@ def update_device_shadow(request):
             if push_status:
                 update_dict['push_status'] = push_status
             us_qs.update(**update_dict)
+            # 如果推送状态开启，返回推送url
+            data = {}
+
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
         # 新增
         else:
@@ -801,6 +804,7 @@ def update_device_shadow(request):
             if push_status:
                 create_dict['push_status'] = push_status
             UidSetModel.objects.create(**create_dict)
+            # 如果推送状态开启，返回推送url
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})
     else:
         return JsonResponse(status=200, data={'code': 403, 'msg': 'error etk'})

Service/CommonService.py

@@ -65,6 +65,11 @@ class CommonService:
         :param request:
         :return:
         """
+        ip = request.META.get("X-Forwarded-For","")
+        if ip:
+            client_ip = ip.split(",")[0].strip() if ip else ""
+            if client_ip:
+                return client_ip
         ip = request.META.get("HTTP_X_FORWARDED_FOR", "")
         if not ip:
             ip = request.META.get('REMOTE_ADDR', "")