tanghongbin il y a 4 ans
Parent
commit
31919dc0f7
2 fichiers modifiés avec 24 ajouts et 22 suppressions
  1. 17 17
      Controller/DetectController.py
  2. 7 5
      Controller/ShadowController.py

+ 17 - 17
Controller/DetectController.py

@@ -69,11 +69,11 @@ class NotificationView(View):
         else:
             utko = UidTokenObject(uidToken)
             uid = utko.UID
-        log = 'push----------{time}'.format(time=time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime()))
-        log += '\n'
-        log += '\tuid=' + uid
-        log += '\tchannel=' + channel
-        log += '\tevent_type=' + event_type
+        # log = 'push----------{time}'.format(time=time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime()))
+        # log += '\n'
+        # log += '\tuid=' + uid
+        # log += '\tchannel=' + channel
+        # log += '\tevent_type=' + event_type
 
         pkey = '{uid}_{channel}_ptl'.format(uid=uid, event_type=event_type, channel=channel)
         # ykey = 'MUJ887NLR8K8GBM9111A_redis_qs'.format(uid=uid)
@@ -94,8 +94,8 @@ class NotificationView(View):
             else:
                 res_data = {'code': 0, 'msg': 'Push it once a minute'}
 
-            log += '\tcode=200'
-            LogUtil.write_log(log=log)
+            # log += '\tcode=200'
+            # LogUtil.write_log(log=log)
             return JsonResponse(status=200, data=res_data)
 
         # 数据库读取数据
@@ -119,8 +119,8 @@ class NotificationView(View):
             redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
             if not redis_list:
                 res_data = {'code': 404, 'msg': 'error !'}
-                log += '\tcode=200'
-                LogUtil.write_log(log=log)
+                # log += '\tcode=200'
+                # LogUtil.write_log(log=log)
                 return JsonResponse(status=200, data=res_data)
 
             # 此时应该更新一下redis里面的dkey的有效时间
@@ -131,8 +131,8 @@ class NotificationView(View):
         if not redis_list:
             print("没有redi_list")
             res_data = {'code': 0, 'msg': 'no redi_list success!'}
-            log += '\tcode=200'
-            LogUtil.write_log(log=log)
+            # log += '\tcode=200'
+            # LogUtil.write_log(log=log)
             return JsonResponse(status=200, data=res_data)
 
         is_sys_msg = self.is_sys_msg(int(event_type))
@@ -275,8 +275,8 @@ class NotificationView(View):
                 del up['uid_set__nickname']
                 del up['uid_set__detect_interval']
                 del up['uid_set__detect_group']
-            log += '\tcode=200'
-            LogUtil.write_log(log=log)
+            # log += '\tcode=200'
+            # LogUtil.write_log(log=log)
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success 0 or 2' ,'re_list':redis_list})
 
         elif is_st == '1':
@@ -304,8 +304,8 @@ class NotificationView(View):
             else:
                 # 是正式服务器的时候
                 res_data = {'code': 0, 'img_push': url, 'msg': 'success'}
-            log += '\tcode=200'
-            LogUtil.write_log(log=log)
+            # log += '\tcode=200'
+            # LogUtil.write_log(log=log)
             return JsonResponse(status=200, data=res_data)
 
         elif is_st == '3':
@@ -340,8 +340,8 @@ class NotificationView(View):
             else:
                 # 是正式服务器的时候
                 res_data = {'code': 0, 'img_url_list': img_url_list, 'msg': 'success 3'}
-            log += '\tcode=200'
-            LogUtil.write_log(log=log)
+            # log += '\tcode=200'
+            # LogUtil.write_log(log=log)
             return JsonResponse(status=200, data=res_data)
 
 

+ 7 - 5
Controller/ShadowController.py

@@ -26,7 +26,7 @@ from django.http import JsonResponse
 from Object.UidTokenObject import UidTokenObject
 
 def generate_utk(request):
-    LogUtil.write_log(log='generate----------{time}'.format(time=time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime())))
+    LogUtil.write_log(log='generate.start----------{time}'.format(time=time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime())))
     request.encoding = 'utf-8'
     response = ResponseObject()
     if request.method == 'GET':
@@ -45,6 +45,8 @@ def generate_utk(request):
             # utko.generate(data={'uid': uid})
             etkObj = ETkObject(etk='')
             etk = etkObj.encrypt(uid)
+            LogUtil.write_log(
+                log='generate.end----------{time}'.format(time=time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime())))
             return response.json(0, {'etk': etk})
         else:
             return response.json(404)
@@ -65,10 +67,10 @@ def update_device_shadow(request):
     etk = request_dict.get('etk', None)
     eto = ETkObject(etk)
     uid = eto.uid
-    log = 'shadow----------{time}'.format(time=time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime()))
-    log += '\n'
-    log += '\tuid=' + uid
-    LogUtil.write_log(log=log)
+    # log = 'shadow----------{time}'.format(time=time.strftime('%Y-%m-%d-%H-%M-%S', time.localtime()))
+    # log += '\n'
+    # log += '\tuid=' + uid
+    # LogUtil.write_log(log=log)
     if uid:
         # 重置按钮
         is_reset = request_dict.get('is_reset', None)