Browse Source

修改证书

zhangdongming 3 years ago
parent
commit
adebe6086f
2 changed files with 68 additions and 61 deletions
  1. 65 59
      AnsjerPush/file/apns_pem/zccloud-dev.pem
  2. 3 2
      Service/GatewayService.py

+ 65 - 59
AnsjerPush/file/apns_pem/zccloud-dev.pem

@@ -1,64 +1,70 @@
 Bag Attributes
-    friendlyName: Apple Development IOS Push Services: com.ansjer.zccloud
-    localKeyID: 25 54 61 DA 6A 7C CD 2D 6A 1E 45 64 96 7A 4B 28 89 15 73 D4 
-subject=/UID=com.ansjer.zccloud/CN=Apple Development IOS Push Services: com.ansjer.zccloud/OU=772N5HXAR2/C=US
-issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
+    friendlyName: Apple Push Services: com.ansjer.zccloud
+    localKeyID: 46 0D 32 CE 3D 25 AE C7 34 B1 96 85 D9 7B 0A 61 F5 6B DC 6C
+subject=/UID=com.ansjer.zccloud/CN=Apple Push Services: com.ansjer.zccloud/OU=772N5HXAR2/O=ZOSI Technology Co. , Ltd/C=CN
+issuer=/CN=Apple Worldwide Developer Relations Certification Authority/OU=G4/O=Apple Inc./C=US
 -----BEGIN CERTIFICATE-----
-MIIFiTCCBHGgAwIBAgIIdGAeNPi1q4YwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
-ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
-aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMjAwNDI0MDYwODU4WhcNMjEwNDI0MDYwODU4WjCBiDEiMCAGCgmSJomT8ixk
-AQEMEmNvbS5hbnNqZXIuemNjbG91ZDFAMD4GA1UEAww3QXBwbGUgRGV2ZWxvcG1l
-bnQgSU9TIFB1c2ggU2VydmljZXM6IGNvbS5hbnNqZXIuemNjbG91ZDETMBEGA1UE
-CwwKNzcyTjVIWEFSMjELMAkGA1UEBhMCVVMwggEiMA0GCSqGSIb3DQEBAQUAA4IB
-DwAwggEKAoIBAQDQXWXsPbUk9HO3JqA6FbJU7iphv28RK2fEnyryzQPLyp/uGOiV
-uxP7xbOV/3vbEcqSoEvZx4xzMh3xb9LKPpSK1OPr9D+KwbNzh0H7C/n17YdsG6v3
-NWIVsfx6iVK6TUNQYCTvwntao6sij/9ctrLJItBOgwuvne5pHozXLAV49CGHW6Yq
-oAf9hmUCm9WJT/y0aZNlsD1nQUA8vfahBcnDKvEgew53UkAeDTYU9r/TWNWw4r44
-D5momf+vE+rDonUi3gwVrEFRGr+G66CYvGP5F20Xqwlxpw717Oz9gae1fyqkbgEx
-blUq+mv5Xh1yMCmDpeqowVgcyA4Oz1us0OnLAgMBAAGjggHlMIIB4TAJBgNVHRME
-AjAAMB8GA1UdIwQYMBaAFIgnFwmpthhgi+zruvZHWcVSVKO3MIIBDwYDVR0gBIIB
-BjCCAQIwgf8GCSqGSIb3Y2QFATCB8TCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5j
-ZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2Vw
-dGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQg
-Y29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlm
-aWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1lbnRzLjApBggrBgEFBQcCARYdaHR0cDov
-L3d3dy5hcHBsZS5jb20vYXBwbGVjYS8wEwYDVR0lBAwwCgYIKwYBBQUHAwIwTQYD
-VR0fBEYwRDBCoECgPoY8aHR0cDovL2RldmVsb3Blci5hcHBsZS5jb20vY2VydGlm
-aWNhdGlvbmF1dGhvcml0eS93d2RyY2EuY3JsMB0GA1UdDgQWBBQlVGHaanzNLWoe
-RWSWeksoiRVz1DALBgNVHQ8EBAMCB4AwEAYKKoZIhvdjZAYDAQQCBQAwDQYJKoZI
-hvcNAQEFBQADggEBAMTfpZRXJpz8/1wkWYT2zSxGJcdmtB6oEUmVzjlYod5rDuTl
-yFSJPl/Sy41/anW88UgC231AF3h78q54vdFuQ7rd8ORF3nEDGzib4+7d4QCcguFP
-2Lz27r2goLQhKRIY/isjAUrLFHwcX9hjG9TuhMO+e8a6Vu5gXpXU6/QA1HTqO3ei
-kvfw/MoaAOQuRNofFPNCVO+nOndK61oTHovDcMfU1LG6siJGkVn3VhPAQOd7VbOQ
-eXqd1+LWkBMrJbsdJElKKKl0mQpXHUf4yW2k8Eg2AdZkMOSQKm8IaLXGHzrqg+fk
-sPUfBL2JEaGpAlD56fZYLPRMEdIV4SG8m6BOw4M=
+MIIGrjCCBZagAwIBAgIQJqlGJrU3X1ZS/8i74UTjsTANBgkqhkiG9w0BAQsFADB1
+MUQwQgYDVQQDDDtBcHBsZSBXb3JsZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9ucyBD
+ZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTELMAkGA1UECwwCRzQxEzARBgNVBAoMCkFw
+cGxlIEluYy4xCzAJBgNVBAYTAlVTMB4XDTIyMDcwNTAzMDcyN1oXDTIzMDgwNDAz
+MDcyNlowgZwxIjAgBgoJkiaJk/IsZAEBDBJjb20uYW5zamVyLnpjY2xvdWQxMDAu
+BgNVBAMMJ0FwcGxlIFB1c2ggU2VydmljZXM6IGNvbS5hbnNqZXIuemNjbG91ZDET
+MBEGA1UECwwKNzcyTjVIWEFSMjEiMCAGA1UECgwZWk9TSSBUZWNobm9sb2d5IENv
+LiAsIEx0ZDELMAkGA1UEBhMCQ04wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQC5FQVQWe77m/475MLlmQk/Iqdi2voJT655QyDjPEE+lmlWPe1hXpCJyWZL
+HvuABU09ioP3JZYTePi3Sv81bcrvxzxPACfDWutc2wihZbRZW7utgxf3YA1QTiHU
+hXygZ4k5sEVOo0Irex4JBpzTo2yQQmc6+D7XMOueGBP/bLnAjZg2A5fvIxFtGDxP
+ItUR/fMrlR5BnOB7wSTkrEdg4gsGbrmR7VunwzQKWlL5jEyG8A8PR4GGdZNlRxK7
+IXLLW21jGQf8KAIop6zweE0V3KfacBFzI070Awv37ONQx0bLiGMG9NL/Nigtr2m1
+v0WonJnyyqEAreeOFqZfYRU2n+DLAgMBAAGjggMQMIIDDDAMBgNVHRMBAf8EAjAA
+MB8GA1UdIwQYMBaAFFvZ+h3nmhoLo5l2IlCGPpHIW3eoMHAGCCsGAQUFBwEBBGQw
+YjAtBggrBgEFBQcwAoYhaHR0cDovL2NlcnRzLmFwcGxlLmNvbS93d2RyZzQuZGVy
+MDEGCCsGAQUFBzABhiVodHRwOi8vb2NzcC5hcHBsZS5jb20vb2NzcDAzLXd3ZHJn
+NDAxMIIBHQYDVR0gBIIBFDCCARAwggEMBgkqhkiG92NkBQEwgf4wgcMGCCsGAQUF
+BwICMIG2DIGzUmVsaWFuY2Ugb24gdGhpcyBjZXJ0aWZpY2F0ZSBieSBhbnkgcGFy
+dHkgYXNzdW1lcyBhY2NlcHRhbmNlIG9mIHRoZSB0aGVuIGFwcGxpY2FibGUgc3Rh
+bmRhcmQgdGVybXMgYW5kIGNvbmRpdGlvbnMgb2YgdXNlLCBjZXJ0aWZpY2F0ZSBw
+b2xpY3kgYW5kIGNlcnRpZmljYXRpb24gcHJhY3RpY2Ugc3RhdGVtZW50cy4wNgYI
+KwYBBQUHAgEWKmh0dHBzOi8vd3d3LmFwcGxlLmNvbS9jZXJ0aWZpY2F0ZWF1dGhv
+cml0eTATBgNVHSUEDDAKBggrBgEFBQcDAjAyBgNVHR8EKzApMCegJaAjhiFodHRw
+Oi8vY3JsLmFwcGxlLmNvbS93d2RyZzQtNy5jcmwwHQYDVR0OBBYEFEYNMs49Ja7H
+NLGWhdl7CmH1a9xsMA4GA1UdDwEB/wQEAwIHgDCBqwYKKoZIhvdjZAYDBgSBnDCB
+mQwSY29tLmFuc2plci56Y2Nsb3VkMAcMBXRvcGljDBdjb20uYW5zamVyLnpjY2xv
+dWQudm9pcDAGDAR2b2lwDB9jb20uYW5zamVyLnpjY2xvdWQuY29tcGxpY2F0aW9u
+MA4MDGNvbXBsaWNhdGlvbgwbY29tLmFuc2plci56Y2Nsb3VkLnZvaXAtcHR0MAsM
+CS52b2lwLXB0dDAQBgoqhkiG92NkBgMBBAIFADAQBgoqhkiG92NkBgMCBAIFADAN
+BgkqhkiG9w0BAQsFAAOCAQEAT2huc5Z3Fi88fkh6IhOL7wtpu4Hg1hlz/kuYb3NP
+T8shIcMbIrtEnGsIBeZ8MAgaG1wWSx4MeVSDYKfBty5k2/3yYNRHWnzwF7wmMKHi
+yaVI1y6+xhiU7Nv6t/7UImJfn21E2eCTURmsDpiKu4fpmOAfPS9lR7UWozRouppW
+BmWLWzUQmDp+VRvSEGyqSsZGL6VQJFep0VoEmzSrLbkIWVI4hkZ5dBeWx89d8GfX
+/zmvWqFfRwzU3x8JRCZqwgGF3IDl0+Yhk2lOekC2JqjN917MgkBJx2VUTzqjVfhY
+1IWkdcOlIs0h5EqGjuOOE02bd7OmF/3rf8e04gZj4piENw==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

+ 3 - 2
Service/GatewayService.py

@@ -42,8 +42,9 @@ class GatewayPushService:
         try:
             logger = logging.getLogger('info')
             logger.info('--->进来苹果推送')
-            cli = apns2.APNSClient(mode=APNS_MODE,
-                                   client_cert=os.path.join(BASE_DIR, APNS_CONFIG[app_bundle_id]['pem_path']))
+            pem_path = os.path.join(BASE_DIR, APNS_CONFIG[app_bundle_id]['pem_path'])
+            cli = apns2.APNSClient(mode=APNS_MODE, client_cert=pem_path)
+            logger.info('--->证书路径{}'.format(pem_path))
             alert = apns2.PayloadAlert(title=msg_title, body=msg_text)
             push_data = {'alert': 'Motion', 'msg': '', 'sound': '', 'zpush': '1',
                          'received_at': n_time, 'event_time': n_time, 'event_type': event_type, 'nickname': nickname