Browse Source

apns修改证书

chenjunkai 5 years ago
parent
commit
7bf5fc907b
4 changed files with 70 additions and 5 deletions
  1. 1 1
      Ansjer/config.py
  2. 64 0
      Ansjer/file/apns_pem/apns-dev-gg.pem
  3. 3 2
      Ansjer/test/kbt.py
  4. 2 2
      Controller/DetectController.py

+ 1 - 1
Ansjer/config.py

@@ -169,7 +169,7 @@ FCM_CONFIG = {
 # type= 0
 APNS_CONFIG = {
     'com.ansjer.loocamccloud': {
-        'pem_path': os.path.join(BASE_DIR, 'Ansjer/file/apns_pem/apns-dev.pem'),
+        'pem_path': os.path.join(BASE_DIR, 'Ansjer/file/apns_pem/apns-dev-gg.pem'),
         'password': '111111'
     }
 }

+ 64 - 0
Ansjer/file/apns_pem/apns-dev-gg.pem

@@ -0,0 +1,64 @@
+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-----
+MIIFkzCCBHugAwIBAgIIa1J7qhN5lfcwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
+BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
+ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
+aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+HhcNMTkxMDE1MDkxMjIxWhcNMjAxMDE0MDkxMjIxWjCBkjEnMCUGCgmSJomT8ixk
+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
+AgUAMA0GCSqGSIb3DQEBBQUAA4IBAQCxenrHjLd0Qq1Tk9h+k1nLjxxzmGxgBt4m
+aXF9wnARayrnx9B+SWQ6+42b7r5QzQ0deHEAFU8DdUTAcXfq606AUL3MpLNZ0YCK
+442T/V4Ru4WV0Lf52PEvIxo5gyhpQKfFhi+SnCyeluv60LeGqBD1+QYxMjSGfrnl
+lgnjaXRPkzPZbYHkVBcS9aibQrqsCZwvYh61foKZfoKEI9s6ZmWB/N/2k+9IbXMt
+O5jWF3pdR0Uk7qU3wpxtHdZgY21uBJh0iutonu8dvVsoRCefdR4/qWPd4IUGIGYD
+Njs9snyWdX31O4FPT0/KVvFm4k+pD7BhAEoNSVvtYhOuyGxABWp3
+-----END CERTIFICATE-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEowIBAAKCAQEA2+0/TMV1utd5WCe1exM3PDTdyCneRrva7mmF5XYjfCEjcTCA
+uWTKka4QFuOWNoDsbTuG+qeR+rQ25rRZ2gQYgHD1bJbIu5o9RCAp5PJ2cxslXlKb
+PjoMfgqtLGmjbV02F3gvAAEgvbA8CqLoNrfaHTHtPMAMvzbLhQm2oWSzAOsTcx3d
+HBB8kgl9qTDr5f5yLU5pJRJph+/FRnjA3DbDJcNFayO38qNq39GHTF2aTE/ueJyC
+x1j+ZJLzUc969SCH6i71Y4660S0sHBx+3oqlRgPzS97WX4L4Ab3bRFh9Qar8//uF
+BBTiCavIzNktLyeN/ciefwR7fXwGl6nX+vP5hwIDAQABAoIBACua1IwiMn+DLXn/
+FYp7et4jFT4Unw+jO3s9zOB8FfkMkPxmQ39+rnNH8cS4BxZzZW0a+l5ETztH9AK2
+C4KggUMmImMPWmln4XHadrQAJuAXp8cV1dX2qHdtInzFzTNn4cuxdpAnqRgzExSA
+zE3dEg/r0D/VTDG1aZDNJjrFvoAVvcGckbP6hBlEuu8mNlYmjLIwf3CZaNDE8vL+
+UPylyuniruxLxk0WePG7WpRHc5jzdBcrYfJBoDSoI8WYmfISIn5am6w7sAPzGBSB
+GsrRB9/8if3SS0Up30scSyHjy/v6SHmGjCa9cielx/XX7fh29vp/347HzaOuFY0V
+3BvGsMECgYEA8J+/iHks33vc9a2JkOZjZW6lQHRMroc17UX7ceyEqN2mxzYcHeee
+/kryoAPB4Jmpm6IXI6Q2ZVUNqCzK8joxuuF+oW7BbBFn2L7J/Jxd41p5jy8HW472
+X9LiRIbaL15h3mOKfCy9ylN0haq7KLSSKHWGnotLzfkBjmM27UvYYJECgYEA6frs
+J6CjiwtcevuDT+E1acy0PQpHYJHj+Iy9D/21L0orDlzaKJXbhf4H6mdXhYVGwFN6
+Rwej8rxfu/XEMseKRfOWKfnHgrBr118wtw9PLpKt2qESZ6Lb3ShxeOifAtR3A9Iq
+tPd2H9i75ljZlBgjD4bIev59rvxOyXhF0QAkxJcCgYAY2HXfcpumi9SZ7YxJ0PAs
+dgtMJ3YPg1iXImW/MqvT/+cLpNOsZtEs8rIwwZKQTW2M62S2Qmt3dRvO5Kkj78xY
+vpXjt1rzfKybXb/ffInZQutQVIvO8WkRJeZFKyN2RqmWW/LdtYT3Ujyy3Jksr9Bz
+qwb2ce2m2/JEMIxoXi9+cQKBgFja6YPDBVhwYBZ0HVHgfKBJFMl5ddG+lYx2JfZE
+quHikKdLq61t+4fPCMKDrEEQc+XlzbHbvO8ZimGe23tNO72E26nlKVcAGHQZui5K
+qg9NtKgqMwsYVdaO3UjFTl2MwgW5cm5262z8qZ64byhGYkorLUdIDgK93k20Vw8f
+ttbRAoGBALlVcYpvc8cSMAhYuZrVaD/lajQsllEz5xSFSJdWjZi3ospD/FUfnNDN
+zH2dY9QzCIao7TE0Fzi38zozEUaZhE9IJoG/rXnwFp4XsARf+/xZpd78yaZmZdDY
+lpwslFKZ+TEgKUfdo7LABqYCcVWc687MprAniOcHOXJtENoXvc8r
+-----END RSA PRIVATE KEY-----

+ 3 - 2
Ansjer/test/kbt.py

@@ -1,9 +1,8 @@
-
 import apns2
 
 token_val = 'c9c695befbd15dc0af6f0c43d4d8e0c4e0c711da9fea8b16c93c392cf0213b11'
 # token_val = '00952704d5e0295faa021ba6537b669556149439110ce2ac07bbe195f9e7067f'
-pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dev-loc.pem"
+pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dev-gg.pem"
 # pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dev-t.pem"
 # cli = apns2.APNSClient(mode="prod", client_cert=pem_path)
 cli = apns2.APNSClient(mode="dev", client_cert=pem_path)
@@ -13,6 +12,8 @@ n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)
 response = cli.push(n=n, device_token=token_val,topic='com.ansjer.loocamccloud')
 # response = cli.push(n=n, device_token=token_val, topic='com.ansjer.zccloud')
 print(response.status_code)
+print(response.reason)
+print(None)
 assert response.status_code == 200, response.reason
 assert response.apns_id
 

+ 2 - 2
Controller/DetectController.py

@@ -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=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)