NOFI PRO

Ansjer/config_formal.py

@@ -31,4 +31,5 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/lcc.pem',
         'password': '111111'
     }
-}
+}
+APNS_MODE = 'prod'

Ansjer/config_local.py

@@ -34,3 +34,4 @@ APNS_CONFIG = {
         'password': '111111'
     }
 }
+APNS_MODE = 'dev'

Ansjer/config_test.py

@@ -35,4 +35,5 @@ APNS_CONFIG = {
         'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
         'password': '111111'
     }
-}
+}
+APNS_MODE = 'dev'

Ansjer/file/apns_pem/lcc-dev.pem

@@ -1,64 +1,68 @@
 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
+    friendlyName: Apple Push Services: com.ansjer.loocamccloud
+    localKeyID: 81 BA F8 2E C5 58 9A A4 86 A9 47 F6 EF B7 16 48 1C 7A 1E E9
+subject=/UID=com.ansjer.loocamccloud/CN=Apple Push Services: com.ansjer.loocamccloud/OU=JCHT67XT68/O=Loocam Technology LLC/C=US
 issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
 -----BEGIN CERTIFICATE-----
-MIIFkzCCBHugAwIBAgIIa1J7qhN5lfcwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
+MIIGOjCCBSKgAwIBAgIIEh/B+Kd1dVowDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
 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
+HhcNMTkxMDE1MDk0OTQ4WhcNMjAxMTEzMDk0OTQ4WjCBojEnMCUGCgmSJomT8ixk
+AQEMF2NvbS5hbnNqZXIubG9vY2FtY2Nsb3VkMTUwMwYDVQQDDCxBcHBsZSBQdXNo
+IFNlcnZpY2VzOiBjb20uYW5zamVyLmxvb2NhbWNjbG91ZDETMBEGA1UECwwKSkNI
+VDY3WFQ2ODEeMBwGA1UECgwVTG9vY2FtIFRlY2hub2xvZ3kgTExDMQswCQYDVQQG
+EwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIfC7vgq2k1bNRW
+4/Ix+W5CYWLzlbZJ3WS+A4X8GEZVkpcuQhADCs/fxMk/KMzl3XvX8YiNQoItKGzK
+Gd0wEtwdjmQvsXwjZG47v7OGE0qj9beQRMYo0gq6SOK7J7r7/8QW9ggmZJXfTqu2
+kQimrpTLeEQdKERbZLxV4i5oOTaAwyzHChNDmvcg2LCjkYaHuOMKtuQHOcMd8RQ4
+DybXkCyPbItIRxuAksMSem2TBHyHoO6Agx3epPgU+9nTbze7eU0OpAiAl7lFqc3i
+80llb8N23q4WUK+1u/5KEVlZjXHvdmOYldVpUK2GUgc4gcBbZoda3DIQ/F8nddTI
+gczwXRMCAwEAAaOCAnwwggJ4MAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUiCcX
+Cam2GGCL7Ou69kdZxVJUo7cwggEcBgNVHSAEggETMIIBDzCCAQsGCSqGSIb3Y2QF
+ATCB/TCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmlj
+YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4g
+YXBwbGljYWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2Us
+IGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGljZSBz
+dGF0ZW1lbnRzLjA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hcHBsZS5jb20vY2Vy
+dGlmaWNhdGVhdXRob3JpdHkwEwYDVR0lBAwwCgYIKwYBBQUHAwIwMAYDVR0fBCkw
+JzAloCOgIYYfaHR0cDovL2NybC5hcHBsZS5jb20vd3dkcmNhLmNybDAdBgNVHQ4E
+FgQUgbr4LsVYmqSGqUf277cWSBx6HukwDgYDVR0PAQH/BAQDAgeAMBAGCiqGSIb3
+Y2QGAwEEAgUAMBAGCiqGSIb3Y2QGAwIEAgUAMIGMBgoqhkiG92NkBgMGBH4wfAwX
+Y29tLmFuc2plci5sb29jYW1jY2xvdWQwBQwDYXBwDBxjb20uYW5zamVyLmxvb2Nh
+bWNjbG91ZC52b2lwMAYMBHZvaXAMJGNvbS5hbnNqZXIubG9vY2FtY2Nsb3VkLmNv
+bXBsaWNhdGlvbjAODAxjb21wbGljYXRpb24wDQYJKoZIhvcNAQELBQADggEBABr9
+dM8BvrJVSwYRGw39JU7kiGV+dOhcJ59XwOdo2xO05dv1iQJeVDRSpni9yfeHX/pu
+rycGgEm40IQxqTNs851KUqBiLjEwRjkX6MZQMbWnTZY8xiLFKm7lhY6mFUsxfkXH
+/dygY9uZkNCzYfzs8JbWRU8p2uNwF3ZRvZiXITncNWImkdtneSHgF3IQtq/6flc5
+aA89zIH8P7V5/Rvye7JFuM98AXNUHO8XznwgGru6kZCpi4e+83AAXhD9JQmHv/wN
+iHCDWHq1TFS8KgbxfvgGkB2r5vlGkWSo2E3xnxGZu6tiRYgNyNqNsJoMeAtH/352
+xQQMuMMfCP/eKBojC+8=
 -----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-----
+MIIEpAIBAAKCAQEAwh8Lu+CraTVs1Fbj8jH5bkJhYvOVtkndZL4DhfwYRlWSly5C
+EAMKz9/EyT8ozOXde9fxiI1Cgi0obMoZ3TAS3B2OZC+xfCNkbju/s4YTSqP1t5BE
+xijSCrpI4rsnuvv/xBb2CCZkld9Oq7aRCKaulMt4RB0oRFtkvFXiLmg5NoDDLMcK
+E0Oa9yDYsKORhoe44wq25Ac5wx3xFDgPJteQLI9si0hHG4CSwxJ6bZMEfIeg7oCD
+Hd6k+BT72dNvN7t5TQ6kCICXuUWpzeLzSWVvw3berhZQr7W7/koRWVmNce92Y5iV
+1WlQrYZSBziBwFtmh1rcMhD8Xyd11MiBzPBdEwIDAQABAoIBAAi22BIBDfDVIyON
+GwJ+V9IpTLHieXALdNLW7NWQ8Y4GvWPoAbMyT8PxKaZXHX/FOeIbWY5luPybBluL
+3wlc5RvYf9HjijYmaJXCPOLUO/13ysoIwe2bW4J7xlXXTPtJ4LtuxHCtOIq50ZBH
+y871nJS1ZZq5LFuVNrp1qIeoyhi2LuMdkzjpA5MujOhr9vEgI2P2wBazgL2XZ/i/
+2FTJBWp13wSCj6usohni+Ppm77+/Ax9kj0K2vXTjy/fRDIcmkAHdfzifd3oGHtIs
+zc5m1i5GnKXhUB87GrCSvZ1gqJII2ZgXCroprp1TzrWOtH0mzDtzuqYsT8aUpAuG
+Fbnj0sECgYEA+78DbnEAWfzjQXjUytgE2FVSWINsl0zUyr0mIh85r0QY+eQc3LX6
+RDPQq1qndhwXPGY5Nv+hGncAIP0o6eldT1D6LuAcyTzff025aTMLxAswtj1qSfNL
+vVEA+V8Q45TqKIC+CfzJysx5xk53S3DFesCxGfHk5ozmg8ILQSblUlECgYEAxWbD
+OwEW1Wi9UmQcGfKjM7tN22EpY4qid0BJsib/qqfI++42BAuytFKZyyAnaOaNCEKx
+ktaKGZcTCjtstathMiB+3sjJbqOXV+WntrVb4eu35N+IhhRd/ltdyXqx9PwMeMpC
+i73JZZhw9Wn4M7aAC/M37vw3Ztecx5hiTKixXCMCgYAFb3dcgBYY20vw0vINOyLH
+pPf1L0k97wu9IN5c6D2vmhHL+2/gGBHCPTgpKvjopOyfgjmEBXrt/lnDXJPwkPhR
+yRbNwkr80VKmBgCV0+NSJUe095h+5kDhYolZ2QKdV07C9xyjTJDyzv1mGbWbrGCn
+KNfqDn35uFsVxy/FBVj4MQKBgQCkwCyGzVTqTh1ca1MM0PYm0decFg5+FpGb55ra
+RjQxkRFsOhb47255k0rqPe7GXU0trMQZolbmHrF0Y75KLTvUo0xf0cJURdKlOHXu
+RpTmDF6RdYKzLMJ57HVtF6r4pXgfQ+egS4iP81era4MMXe+miZqQKg5vFdqyttqr
+0ksccwKBgQC0jmQ6/KCE2hvNcNIKJzXDZ+4C5LGn6f6hSe5G2yzyt0KVUuUd1gk9
+/IbwSYbNR5SO8KmHoL3yjhBnv+eVE5VFTgy5Gc+J+ON9pPjvYqpwMjlqBCzhUWZN
+gm9kUGZQPYOvuweViXECMZntcVNxG2bKodaMFHKda3xD2fTSeB6OCg==
+-----END RSA PRIVATE KEY-----

Ansjer/test/kbt.py

@@ -3,10 +3,10 @@ import apns2
 token_val = 'c9c695befbd15dc0af6f0c43d4d8e0c4e0c711da9fea8b16c93c392cf0213b11'
 # token_val = '00952704d5e0295faa021ba6537b669556149439110ce2ac07bbe195f9e7067f'
 # 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-dis.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)
+# pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/apns-dis.pem"
+pem_path = "D:/13.56.215.252/git/AnsjerFormal/Ansjer/file/apns_pem/lcc-dev.pem"
+# cli = apns2.APNSClient(mode="prod", client_cert=pem_path)
+cli = apns2.APNSClient(mode="dev", client_cert=pem_path)
 alert = apns2.PayloadAlert(body="测试新包!", title="title!")
 payload = apns2.Payload(alert=alert)
 n = apns2.Notification(payload=payload, priority=apns2.PRIORITY_LOW)

Controller/DetectController.py

@@ -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, BASE_DIR
+    FCM_CONFIG, APNS_CONFIG, BASE_DIR, APNS_MODE
 from Model.models import Device_Info, VodHlsModel, Equipment_Info, UidSetModel, UidPushModel
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject