dvqis

Ansjer/config.py

@@ -53,6 +53,12 @@ BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 # uid token key
 UID_TOKEN_KEY = 'c+565*j@%^'
 
+# oss param
+OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
+OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
+OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
+
+# 不同环境配置
 if SERVER_TYPE == 'Ansjer.local_settings':
     NGINX_RTMP_STAT = 'http://192.168.136.45:8077/stat'
     SERVER_DOMAIN = 'http://192.168.136.45:8077/'
@@ -65,6 +71,8 @@ if SERVER_TYPE == 'Ansjer.local_settings':
         "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
         "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
     }
+    DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
+
 elif SERVER_TYPE == 'Ansjer.test_settings':
     NGINX_RTMP_STAT = 'http://test.dvema.com/stat'
     SERVER_DOMAIN = 'http://test.dvema.com/'
@@ -80,6 +88,8 @@ elif SERVER_TYPE == 'Ansjer.test_settings':
         # "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
         # "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
     }
+    DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
+
 elif SERVER_TYPE == 'Ansjer.formal_settings':
     NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
     SERVER_DOMAIN = 'http://www.dvema.com/'
@@ -91,8 +101,6 @@ elif SERVER_TYPE == 'Ansjer.formal_settings':
         "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
         "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
     }
+    DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
+
 
-# oss param
-OSS_STS_ACCESS_KEY = 'LTAIyMkGfEdogyL9'
-OSS_STS_ACCESS_SECRET = '71uIjpsqVOmF7DAITRyRuc259jHOjO'
-OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'

Controller/DetectController.py

@@ -23,9 +23,7 @@ import requests
 from django.utils.decorators import method_decorator
 from django.views.decorators.csrf import csrf_exempt
 from django.views.generic.base import View
-from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET
-from Ansjer.config import BASE_DIR
-from Ansjer.config import SERVER_DOMAIN
+from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, SERVER_DOMAIN, BASE_DIR, DETECT_PUSH_DOMAIN
 from Model.models import Device_Info, VodHlsModel, Equipment_Info, UidSetModel, UidPushModel
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -170,8 +168,8 @@ class DetectControllerView(View):
                 utko = UidTokenObject()
                 # right
                 utko.generate(data={'uid': uid})
-                detectUrl = "{SERVER_DOMAIN}notify/push?uidToken={uidToken}". \
-                    format(uidToken=utko.token, SERVER_DOMAIN=SERVER_DOMAIN)
+                detectUrl = "{DETECT_PUSH_DOMAIN}notify/push?uidToken={uidToken}". \
+                    format(uidToken=utko.token, DETECT_PUSH_DOMAIN=DETECT_PUSH_DOMAIN)
                 return response.json(0, {'detectUrl': detectUrl})
             else:
                 uid_set_qs = UidSetModel.objects.filter(uid=uid)
@@ -203,8 +201,8 @@ class DetectControllerView(View):
                 UidPushModel.objects.create(**uid_push_create_dict)
                 utko = UidTokenObject()
                 utko.generate(data={'uid': uid})
-                detectUrl = "{SERVER_DOMAIN}notify/push?uidToken={uidToken}". \
-                    format(uidToken=utko.token, SERVER_DOMAIN=SERVER_DOMAIN)
+                detectUrl = "{DETECT_PUSH_DOMAIN}notify/push?uidToken={uidToken}". \
+                    format(uidToken=utko.token, DETECT_PUSH_DOMAIN=DETECT_PUSH_DOMAIN)
                 return response.json(0, {'detectUrl': detectUrl})
         else:
             return response.json(14)

Controller/EquipmentManager.py

@@ -570,6 +570,7 @@ def queryInterface(request):
     page = request_dict.get('page', None)
     line = request_dict.get('line', None)
     NickName = request_dict.get('NickName', None)
+    uid = request_dict.get('uid', None)
     page = int(page)
     line = int(line)
     tko = TokenObject(token)
@@ -578,7 +579,9 @@ def queryInterface(request):
         userID = tko.userID
         dvqs = Device_Info.objects.filter(userID_id=userID)
         if NickName:
-            dvqs.filter(NickName__icontains=NickName)
+            dvqs = dvqs.filter(NickName__icontains=NickName)
+        if uid:
+            dvqs = dvqs.filter(UID=uid)
         # count = dvqs.count()
         dvql = dvqs[(page - 1) * line:page * line].values('id', 'userID', 'NickName', 'UID', 'View_Account',
                                                           'View_Password', 'ChannelIndex', 'Type', 'isShare',

Controller/Test.py

@@ -95,6 +95,7 @@ class Test(View):
 
         message_body = '警告：Motion Channel:1 日期:{tt}'.format(
             tt=str(time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time()))))
+        print(message_body)
         if push_type:
             result = push_service.notify_single_device(registration_id=registration_id, message_title=message_title,
                                                        message_body=message_body, data_message=data)