import os

Ansjer/config.py

@@ -121,10 +121,4 @@ FCM_CONFIG = {
     'com.ansjer.adcloud_a': 'AAAAb9YP3rk:APA91bFm06w8b9OKQ0gz0iaWFuRqRIkvgAz6z7Gp3dBU_X-LNGJQd1hc1QR2W7QzBglF8SHtERA45a2lbdLRa5qv7hxfd6W_sJLBK7dA8jklsOQBvy505oUzTwMKWy4TwH-exps9KrhO',
     'com.ansjer.accloud_a': 'AAAAb9YP3rk:APA91bFm06w8b9OKQ0gz0iaWFuRqRIkvgAz6z7Gp3dBU_X-LNGJQd1hc1QR2W7QzBglF8SHtERA45a2lbdLRa5qv7hxfd6W_sJLBK7dA8jklsOQBvy505oUzTwMKWy4TwH-exps9KrhO'
 }
-# type= 0
-APNS_CONFIG = {
-    'com.ansjer.loocamccloud': {
-        'pem_path': os.path.join(BASE_DIR, 'Ansjer/file/apns_pem/apns-dev-lcc.pem'),
-        'password': '111111'
-    }
-}
+# type= 0

Ansjer/config_formal.py

@@ -25,3 +25,10 @@ DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'user_brand'
 USER_BRAND_ALL = 'user_brand_all'
+
+APNS_CONFIG = {
+    'com.ansjer.loocamccloud': {
+        'pem_path': 'Ansjer/file/apns_pem/lcc.pem',
+        'password': '111111'
+    }
+}

Ansjer/config_local.py

@@ -26,3 +26,11 @@ DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'test_user_brand'
 USER_BRAND_ALL = 'test_user_brand_all'
+
+
+APNS_CONFIG = {
+    'com.ansjer.loocamccloud': {
+        'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
+        'password': '111111'
+    }
+}

Ansjer/config_test.py

@@ -29,3 +29,10 @@ DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
 # 数据库dyanamo品牌日志数据库
 USER_BRAND = 'test_user_brand'
 USER_BRAND_ALL = 'test_user_brand_all'
+
+APNS_CONFIG = {
+    'com.ansjer.loocamccloud': {
+        'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
+        'password': '111111'
+    }
+}

Ansjer/file/apns_pem/apns-dev.pem

@@ -1,71 +0,0 @@
-Bag Attributes
-    friendlyName: Apple Development IOS Push Services: com.ansjer.loocamccloud
-    localKeyID: 23 82 B2 0B 3D C6 B3 4A D4 D8 13 C3 4B B4 3F 45 A4 B9 C1 AE 
-subject=/UID=com.ansjer.loocamccloud/CN=Apple Development IOS Push Services: com.ansjer.loocamccloud/OU=JCHT67XT68/C=US
-issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
------BEGIN CERTIFICATE-----
-MIIFkzCCBHugAwIBAgIIKg69mG6JJd8wDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
-ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
-aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTkwOTAzMDEzNTEwWhcNMjAwOTAyMDEzNTEwWjCBkjEnMCUGCgmSJomT8ixk
-AQEMF2NvbS5hbnNqZXIubG9vY2FtY2Nsb3VkMUUwQwYDVQQDDDxBcHBsZSBEZXZl
-bG9wbWVudCBJT1MgUHVzaCBTZXJ2aWNlczogY29tLmFuc2plci5sb29jYW1jY2xv
-dWQxEzARBgNVBAsMCkpDSFQ2N1hUNjgxCzAJBgNVBAYTAlVTMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2+0/TMV1utd5WCe1exM3PDTdyCneRrva7mmF
-5XYjfCEjcTCAuWTKka4QFuOWNoDsbTuG+qeR+rQ25rRZ2gQYgHD1bJbIu5o9RCAp
-5PJ2cxslXlKbPjoMfgqtLGmjbV02F3gvAAEgvbA8CqLoNrfaHTHtPMAMvzbLhQm2
-oWSzAOsTcx3dHBB8kgl9qTDr5f5yLU5pJRJph+/FRnjA3DbDJcNFayO38qNq39GH
-TF2aTE/ueJyCx1j+ZJLzUc969SCH6i71Y4660S0sHBx+3oqlRgPzS97WX4L4Ab3b
-RFh9Qar8//uFBBTiCavIzNktLyeN/ciefwR7fXwGl6nX+vP5hwIDAQABo4IB5TCC
-AeEwCQYDVR0TBAIwADAfBgNVHSMEGDAWgBSIJxcJqbYYYIvs67r2R1nFUlSjtzCC
-AQ8GA1UdIASCAQYwggECMIH/BgkqhkiG92NkBQEwgfEwgcMGCCsGAQUFBwICMIG2
-DIGzUmVsaWFuY2Ugb24gdGhpcyBjZXJ0aWZpY2F0ZSBieSBhbnkgcGFydHkgYXNz
-dW1lcyBhY2NlcHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxpY2FibGUgc3RhbmRhcmQg
-dGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNlLCBjZXJ0aWZpY2F0ZSBwb2xpY3kg
-YW5kIGNlcnRpZmljYXRpb24gcHJhY3RpY2Ugc3RhdGVtZW50cy4wKQYIKwYBBQUH
-AgEWHWh0dHA6Ly93d3cuYXBwbGUuY29tL2FwcGxlY2EvMBMGA1UdJQQMMAoGCCsG
-AQUFBwMCME0GA1UdHwRGMEQwQqBAoD6GPGh0dHA6Ly9kZXZlbG9wZXIuYXBwbGUu
-Y29tL2NlcnRpZmljYXRpb25hdXRob3JpdHkvd3dkcmNhLmNybDAdBgNVHQ4EFgQU
-I4KyCz3Gs0rU2BPDS7Q/RaS5wa4wCwYDVR0PBAQDAgeAMBAGCiqGSIb3Y2QGAwEE
-AgUAMA0GCSqGSIb3DQEBBQUAA4IBAQAdZQ1i9o22sLj9oj4s1sFNaAnevpTw9fqx
-tkrzaXqbCFvYb+MRaXM2gbZq8QfDKdK3hCZ9M5bEZlYYV+RfmWjs5c/Ucfd8Sy7z
-MHU8EsebdZcefU98OAjN+NyECasmzc1RrfgucL3Cuw2ZSM5VYrnFxNHByOVcf2y+
-yw9bSFILPODDXvHC8Dxm3nckvQ3rj9+Dj3zyL5KCePuGxIUFQ6w4F2xvs2ma08TZ
-+lpWi6x2Wu56KRluTs5/GH4fla1jyHGl/nyjU1oKNYGK9ehk+HAjrG48UlbleDP3
-ADPLsNIF5CHTE1gK69u7HDf4YSD6KQNfdydJByB790/38WiMZMj8
------END CERTIFICATE-----
-Bag Attributes
-    friendlyName: mac mini01
-    localKeyID: 23 82 B2 0B 3D C6 B3 4A D4 D8 13 C3 4B B4 3F 45 A4 B9 C1 AE 
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQIQ1JAx/155pgCAggA
-MBQGCCqGSIb3DQMHBAgGojZ5vXv+UQSCBMhhIf+YV5TFtDsb4usVnHwDgh5rddhr
-FrtseoolggUMj4W2B/fS7Gy718frO39nEVgSTn9WHvdEIb/6Hl0IcunrK2m5SGos
-MSQuqFmfqu5hIHrD4v4w3FJRr/ZV0dHKkFaVod6t2kOVJa4P8spzEIX7P3trel7x
-7stusuwZk2P3xSUbXdtD81Bd9+Hftugt1l/TdqwjKwTsrpduYddEwP5fUYW7G12e
-5sxy/RpiDDZKgBCw6WQegY15oQXzrVq/SM6vG0NiOAHMwkSRiV+Eqck2nkJopuc3
-j/nqCOabiL71oEp7jg3Sy8g9xDvTF9ugbCp4pIcKx2ExCWdx+dlj2OaosyzmX//p
-sfSN3VLCn3Z0oiYWpXlFpsJabAn5E9n0I1HamCDGMEoyD+j9eCbF/2AjhDzpadI0
-MR6U5EIb33dCJ9hukeH+6dm44dX6Forg3D4STw21/WzrHRemTpYhVTHDnaJBFA0K
-Yaucm10zOpFjQaWYNmFIWiBPS2Yv0VYdBP44b/OJcUE6aibIpTicH3ALLkrPVNpe
-QzpJX1UCv+E7i9GHom4km1hl9mHSRMwyM9/OEp+uOGikqW+idUBXRDClKo0nvybz
-EbpzB7XXMKqomWE2rybCTnwvEEckgva17RoQVc2X2cdZhZdV0dG6zXV9phVDIs3Z
-AWdUeoa03+gVWdHoDU5R+O2mR5FThCllmELJQdf8TDUnTnwpnUTqzRDTVxjOogP+
-Yev7pvPLw2/t8uiuvrmqC66hKUyl1EGw9t3rr++o+N4bSbnIw8VNJWgTO+T1u6yN
-n+yJVP/kwEBRsQxAjnD9+IkTnQvi5J1qYTFUaemQoAzCijFGvvMZ+op3Kc8U8d7c
-VcDK/ZtvqehU95wsF7Xpunqa/oSx5bmFg4KD6X4nG8CF3PD4lcjbjj1/FyLXKsJB
-fMydusal9BlvEzxIbd9EmID4EWEV9nv5OrUE9GVJgn6Xrh2yQKhwC0GhlCze7Bon
-F9nEh9bS4TZhLCs+Vgl2Dauf5RVFpqBmnjfx3WmLW6n0Yp+AWPXrAeeQyzk+envD
-/Du9yJ9iBNu7xS+e0mESFSxTICh8rL/7tId6a72D2NWpJ9y/zcKWseieXJ7VLISY
-T84BHtQ8XLCTWPILmFk7awCVKzQ6tlnVLNoehvKi+7xM4nZ9JZ42mB7qYYhtigo4
-0b3NpnFD1zEf39hNuwOD7DCFinpi3QerbjP4ZpP59RODq6JDSPwxQWL5tnjYTeOA
-s14Jr3iLg5IWs+Ns+aTT/XbyfMpH1bXLGhoH2zBShA16HrUYa7iy6N5gt3X1UpZA
-KI8NtTUyf0eAKanAftTlvpNGn6qoa+WoaxHvKViiznK7ypnLMYlQrbtrbF7E3c5q
-uj0lngJjCtincjodzpvDrmWZUrY5aGpxxAUKLV4y8C29IWJpq3eQDkeRa1I9BzM7
-GVovjVLRUq+Tf723d0RRYCD+izDqoE9VoxEfDVYIM3vtDufDPWRbJcgBjHuZPQUC
-MbbtnaLx3gS9Tn0m4DMu0y4OLCXKCEQ+Pq2tqrVbZRKX3P0/nrUTqKmvF2r1nGbs
-ciVTtrjFOTyh2CPyn9QR7rITa6UHuzRW7kj90k9GzFyJciGx/zhCNVDTgoMkoYXD
-tVk=
------END ENCRYPTED PRIVATE KEY-----

Controller/DetectController.py

@@ -12,7 +12,7 @@
 @Contact: chanjunkai@163.com
 """
 import time
-
+import os
 import apns2
 import jpush as jpush
 import oss2
@@ -23,7 +23,7 @@ from django.views.generic.base import View
 from pyfcm import FCMNotification
 
 from Ansjer.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN, JPUSH_CONFIG, \
-    FCM_CONFIG, APNS_CONFIG
+    FCM_CONFIG, APNS_CONFIG, BASE_DIR
 from Model.models import Device_Info, VodHlsModel, Equipment_Info, UidSetModel, UidPushModel
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
@@ -445,8 +445,8 @@ class NotificationView(View):
         try:
             print('---')
 
-            cli = apns2.APNSClient(mode="dev", client_cert=APNS_CONFIG[appBundleId]['pem_path'])
-                                   # password=APNS_CONFIG[appBundleId]['password'])
+            cli = apns2.APNSClient(mode="dev", client_cert=os.path.join(BASE_DIR, 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", "channel": channel}
             # body = json.dumps(push_data)