testdve

Ansjer/test/testOssPut.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: AnsjerFormal
-@software: PyCharm
-@DATE: 2019/6/22 17:45
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: testOssPut.py
-@Contact: chanjunkai@163.com
-"""
-import requests
-
-url = 'http://statres.oss-cn-hongkong.aliyuncs.com/log%2F1561196710.log?OSSAccessKeyId=LTAIyMkGfEdogyL9&Expires=1561203910&Signature=9Rmp60bVgciREuyc8LZBwwVAI3E%3D'
-
-res = requests.put(url, data='1234981734913270947.txt')
-print(res)

Ansjer/test/util/jpush.py

@@ -11,3 +11,30 @@
 @file: jpush.py
 @Contact: chanjunkai@163.com
 """
+import apns2
+import time
+
+now_time = int(time.time())
+
+# cli = apns2.APNSClient(mode="dev", client_cert="/your/path.pem")
+# alert = apns2.PayloadAlert(body="body!", title="title!")
+# payload = apns2.Payload(alert=alert)
+# n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
+# response = cli.push(n=n, device_token="your_token")
+# assert response.status_code == 200, response.reason
+# assert response.apns_id
+import json
+
+token_val = 'ce10ecef7e78775b4100377e851e38b1687cb8df64b2a13ef32857df035a202a'
+# cli = apns2.APNSClient(mode="prod", client_cert=pem_path)
+pem_path = 'D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dev-test.pem'
+cli = apns2.APNSClient(mode="dev", client_cert=pem_path, password='111111')
+push_data = {"alert": "Motion ", "event_time": now_time, "event_type": '51', "msg": "",
+             "received_at": now_time, "sound": "sound.aif", "uid": "XFDJUHUIOKJHYTGSFFDR"}
+alert = apns2.PayloadAlert(body=json.dumps(push_data), title="title!")
+payload = apns2.Payload(alert=alert)
+
+n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
+res = cli.push(n=n, device_token=token_val, topic='com.ansjer.loocamccloud')
+from var_dump import var_dump
+var_dump(res)

Controller/DetectController.py

@@ -396,23 +396,26 @@ class NotificationView(View):
         return response.json(0)
 
     def do_apns(self, request_dict, uaql, response, uid):
+        event_type = request_dict.get('event_type', None)
         token_val = uaql['token_val']
         n_time = request_dict.get('n_time')
         appBundleId = uaql['appBundleId']
         apns_config = {
-            'appbundleId': {'pem_path': 'xxxx', 'topic': 'topic', 'password': 'password'}
+            'com.ansjer.loocamccloud': {
+                'pem_path': os.path.join(BASE_DIR, 'Ansjer/file/apns_pem/apns-loocamccloud.pem'),
+                'password': '123'
+            }
         }
         try:
-            # daytime = time.strftime("%Y%m%d%H%M", time.localtime(1547256103))
-            # print(daytime)
-            pem_path = os.path.join(BASE_DIR, apns_config[appBundleId]['topic'])
-            # pem_path = os.path.join(BASE_DIR, 'Ansjer/file/apns-dev.pem')
-            cli = apns2.APNSClient(mode="dev", client_cert=pem_path, password='111111')
+            cli = apns2.APNSClient(mode="dev", client_cert=apns_config[appBundleId]['pem_path'],
+                                   password=apns_config[appBundleId]['password'])
+            push_data = {"alert": "Motion ", "event_time": n_time, "event_type": event_type, "msg": "",
+                         "received_at": n_time, "sound": "sound.aif", "uid": uid, "zpush": "1"}
             body = json.dumps({'uid': uid, 'n_time': n_time})
-            alert = apns2.PayloadAlert(body="body!", title="title!")
+            alert = apns2.PayloadAlert(body=body, title="title!")
             payload = apns2.Payload(alert=alert)
             n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
-            res = cli.push(n=n, device_token=token_val, topic=apns_config[appBundleId]['pem_path'])
+            res = cli.push(n=n, device_token=token_val, topic=appBundleId)
             # assert res.status_code == 200, res.reason
             # assert res.apns_id 
             if res.status_code == 200:

Controller/Test.py

@@ -34,7 +34,7 @@ class Test(View):
 
         
         request_dict = request.GET
-        # return self.do_apns(request_dict)
+        return self.do_apns(request_dict)
         # return self.do_get_putOss_url(request.GET)
         # from django.http import JsonResponse
         # return JsonResponse(status=200,data={
@@ -73,21 +73,30 @@ class Test(View):
 
     def do_apns(self,request_dict):
         token_val = request_dict.get('token_val',None)
-        pem_path = os.path.join(BASE_DIR,'Ansjer/file/apns_pem/apns-dev.pem')
+        pem_path = 'D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dev-test.pem'
         print(pem_path)
         response = ResponseObject()
         try:
             import apns2
             now_time = int(time.time())
 
-            cli = apns2.APNSClient(mode="prod", client_cert=pem_path)
+            # cli = apns2.APNSClient(mode="dev", client_cert="/your/path.pem")
+            # alert = apns2.PayloadAlert(body="body!", title="title!")
+            # payload = apns2.Payload(alert=alert)
+            # n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
+            # response = cli.push(n=n, device_token="your_token")
+            # assert response.status_code == 200, response.reason
+            # assert response.apns_id
+
+            # cli = apns2.APNSClient(mode="prod", client_cert=pem_path)
+            cli = apns2.APNSClient(mode="dev", client_cert=pem_path,password='111111')
             push_data = {"alert": "Motion ", "event_time": now_time, "event_type": '51', "msg": "",
                          "received_at": now_time, "sound": "sound.aif", "uid": "XFDJUHUIOKJHYTGSFFDR"}
             alert = apns2.PayloadAlert(body=json.dumps(push_data), title="title!")
             payload = apns2.Payload(alert=alert)
 
             n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
-            res = cli.push(n=n, device_token=token_val,topic='com.ansjer.zccloud')
+            res = cli.push(n=n, device_token=token_val,topic='com.ansjer.loocamccloud')
             if res.status_code == 200:
                 return response.json(0)
             else:

requirements.txt

@@ -25,4 +25,5 @@ pyipip
 boto
 django-ratelimit
 paypalrestsdk
-pymongo
+pymongo
+apns2-client