locky 4 dienas atpakaļ
vecāks
revīzija
cc19de8e38
3 mainītis faili ar 7 papildinājumiem un 38 dzēšanām
  1. 0 1
      Controller/DetectController.py
  2. 0 30
      Controller/Test.py
  3. 7 7
      requirements.txt

+ 0 - 1
Controller/DetectController.py

@@ -15,7 +15,6 @@ import logging
 import os
 import time
 
-import apns2
 import jpush as jpush
 import oss2
 from django.http import JsonResponse

+ 0 - 30
Controller/Test.py

@@ -22,7 +22,6 @@ from Ansjer.config import BASE_DIR
 import json
 from alipay import AliPay
 import time
-import apns2
 from django.http import JsonResponse
 
 
@@ -37,8 +36,6 @@ class Test(View):
             return self.jgPush(request)
         elif test_push_type == 'fcm':
             return self.do_fcm_push(request)
-        elif test_push_type == 'apns':
-            return self.do_apns(request.GET)
         elif test_push_type == 's3sts':
             return self.do_get_s3_sts()
         return self.do_gcm_push(request)
@@ -173,33 +170,6 @@ class Test(View):
         response = ResponseObject()
         return response.json(0, result)
 
-    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-dev2.pem')
-        # pem_path = os.path.join(BASE_DIR, 'Ansjer/file/apns_pem/apns-loocamccloud.pem')
-        print(pem_path)
-        response = ResponseObject()
-        try:
-            n_time = int(time.time())
-
-            cli = apns2.APNSClient(mode="dev", client_cert=pem_path,
-                                   password='111111')
-            push_data = {"alert": "Motion ", "event_time": n_time, "event_type": 51, "msg": "",
-                         "received_at": n_time, "sound": "sound.aif", "uid": 'XFDJUHUIOKJHYTGSFFDR', "zpush": "1", "channel": 1}
-            alert = apns2.PayloadAlert(body='通道:1 uid:XFDJUHUIOKJHYTGSFFDR', title='ansjer')
-            payload = apns2.Payload(alert=alert, custom=push_data)
-            n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
-            res = cli.push(n=n, device_token=token_val, topic='com.ansjer.loocamccloud')
-            # assert res.status_code == 200, res.reason
-            # assert res.apns_id
-            if res.status_code == 200:
-                return response.json(0)
-            else:
-                return response.json(404, res.reason)
-
-        except Exception as e:
-            return response.json(10, repr(e))
-
     def do_get_putOss_url(self, request_dict):
         import oss2
         obj_name = request_dict.get('obj_name', '')

+ 7 - 7
requirements.txt

@@ -1,9 +1,8 @@
-python-alipay-sdk==3.1.2
+python-alipay-sdk
 aliyun-python-sdk-core==2.13.36
 aliyun-python-sdk-dysmsapi==2.1.2
 aliyun-python-sdk-kms==2.16.0
 aliyun-python-sdk-sts==3.1.0
-apns2==0.7.2
 asgiref==3.5.2
 asttokens==2.1.0
 async-timeout==4.0.2
@@ -16,7 +15,7 @@ cffi==1.15.1
 charset-normalizer==2.1.1
 colorama==0.4.6
 crcmod==1.7
-cryptography==38.0.3
+cryptography==42.0.8
 decorator==5.1.1
 Deprecated==1.2.13
 Django==3.2.16
@@ -28,7 +27,6 @@ et-xmlfile==1.1.0
 executing==1.2.0
 h2==2.6.2
 hpack==3.0.0
-hyper==0.7.0
 hyperframe==3.2.0
 idna==3.4
 ipdb==0.13.9
@@ -36,7 +34,6 @@ ipython==8.6.0
 jedi==0.18.1
 jmespath==0.10.0
 jpush==3.3.9
-jwt==1.3.1
 matplotlib-inline==0.1.6
 mysqlclient==2.1.1
 numpy==1.23.4
@@ -59,7 +56,7 @@ Pygments==2.13.0
 pyipip==0.1.1
 PyJWT==2.6.0
 pymongo==4.3.3
-pyOpenSSL==22.0.0
+pyOpenSSL==24.1.0
 pyparsing==3.0.9
 python-dateutil==2.8.2
 pytz==2022.6
@@ -88,4 +85,7 @@ django-celery-beat==2.6.0
 oci~=2.125.2
 app-store-server-library==1.3.0
 esdk-obs-python==3.24.6
-qrcode~=8.2
+qrcode~=8.2
+ujson
+applepay==0.3.0
+websocket-client==0.56.0