Merge branch 'dev' of http://192.168.136.45:3000/SERVER/AnsjerServer into dev

Ansjer/file/apns_pem/accloud.pem

@@ -1,67 +1,67 @@
 Bag Attributes
-    friendlyName: Apple Push Services: com.ansjer.zccloud
-    localKeyID: 53 D0 A7 6B CF E9 9C 46 ED 44 01 01 01 14 02 52 A6 45 AB C5 
-subject=/UID=com.ansjer.zccloud/CN=Apple Push Services: com.ansjer.zccloud/OU=772N5HXAR2/O=ZOSI Technology Co. , Ltd/C=US
+    friendlyName: Apple Push Services: com.ansjer.accloud
+    localKeyID: E3 53 7E BA 9F B2 77 65 73 86 2B CE 2D C5 D8 67 F0 5C 86 A7 
+subject=/UID=com.ansjer.accloud/CN=Apple Push Services: com.ansjer.accloud/OU=66PK439G56/O=side zhang/C=US
 issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
 -----BEGIN CERTIFICATE-----
-MIIGJDCCBQygAwIBAgIIMRa6pIbT1IgwDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
+MIIGFTCCBP2gAwIBAgIID1vukJ183x8wDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
 ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
 aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTkxMTA4MDc0NDU4WhcNMjAxMjA3MDc0NDU4WjCBnDEiMCAGCgmSJomT8ixk
-AQEMEmNvbS5hbnNqZXIuemNjbG91ZDEwMC4GA1UEAwwnQXBwbGUgUHVzaCBTZXJ2
-aWNlczogY29tLmFuc2plci56Y2Nsb3VkMRMwEQYDVQQLDAo3NzJONUhYQVIyMSIw
-IAYDVQQKDBlaT1NJIFRlY2hub2xvZ3kgQ28uICwgTHRkMQswCQYDVQQGEwJVUzCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANOI0TfZ1x5kwSw7/Sdr+oNx
-gPeJxZq7Khib9IvQ5ZW0hqEXgnm9dyDjpAc2FDjL/FzMUtCviJmxQrISW3dzcwtk
-KzY//vlQ58ZhlNVGm6COjzeJKnP2kdmXipzt9kwPK6tfNxhrNFqUXMH889soFL49
-W0AykK/hrUKD++0cIwXed4lRAxXJORePI27ErhRT8+B5yTjLnZOa+4kwwS2RstGi
-oKHTjpVKDZwYuaM072P4QK+fetFv9dl049sM+1oJ7Z0sT5wvWV0l2TLGTkoma+GR
-+JCU5GGAmtLyvrcoNlKLw8JGqSBstZbp1dQFA7BAIuyEt+Jxjkzgu4s+2FROvnUC
-AwEAAaOCAmwwggJoMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUiCcXCam2GGCL
-7Ou69kdZxVJUo7cwggEcBgNVHSAEggETMIIBDzCCAQsGCSqGSIb3Y2QFATCB/TCB
-wwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5
-IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGlj
-YWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRp
-ZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1l
-bnRzLjA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hcHBsZS5jb20vY2VydGlmaWNh
-dGVhdXRob3JpdHkwEwYDVR0lBAwwCgYIKwYBBQUHAwIwMAYDVR0fBCkwJzAloCOg
-IYYfaHR0cDovL2NybC5hcHBsZS5jb20vd3dkcmNhLmNybDAdBgNVHQ4EFgQUU9Cn
-a8/pnEbtRAEBARQCUqZFq8UwDgYDVR0PAQH/BAQDAgeAMBAGCiqGSIb3Y2QGAwEE
-AgUAMBAGCiqGSIb3Y2QGAwIEAgUAMH0GCiqGSIb3Y2QGAwYEbzBtDBJjb20uYW5z
-amVyLnpjY2xvdWQwBQwDYXBwDBdjb20uYW5zamVyLnpjY2xvdWQudm9pcDAGDAR2
-b2lwDB9jb20uYW5zamVyLnpjY2xvdWQuY29tcGxpY2F0aW9uMA4MDGNvbXBsaWNh
-dGlvbjANBgkqhkiG9w0BAQsFAAOCAQEAAabdumNJ8xYd/CrhLA2ozqh7GgNW0Os+
-BmGyfxstqlK/jasZ9vIIN8/oVc2Qe4j+2KrN93x1Fhie+1sQN3PcqADwL8NfKyeU
-X8wnomkyAkfogYYxIU0V8eFr+IZoNYFTAWJYK2F8mQKRmUbVzqaSCg+rYk68i/uu
-cQqNB+alxOf92l6sWrOvMm9B4vYcgDyJfN9pNSkTJgtKn2hD9njSGe8+GJX+OqbN
-ys7h2WRBFD2YhQbu8guJTTnHh2g0CtyM2xFyrSCaiSh5BUiYvPLEWfcNkt13nts1
-DQBf16tsmcTP3tkNYroqwF1+IIUNVPX+ndLEor6p6r74xBAO1qlIFQ==
+HhcNMTkxMjE2MTA1NjE3WhcNMjEwMTE0MTA1NjE3WjCBjTEiMCAGCgmSJomT8ixk
+AQEMEmNvbS5hbnNqZXIuYWNjbG91ZDEwMC4GA1UEAwwnQXBwbGUgUHVzaCBTZXJ2
+aWNlczogY29tLmFuc2plci5hY2Nsb3VkMRMwEQYDVQQLDAo2NlBLNDM5RzU2MRMw
+EQYDVQQKDApzaWRlIHpoYW5nMQswCQYDVQQGEwJVUzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALpyuDFbu2Ct2aB2V9ZQGFyjW4H1gm1Xnt3CcVyOHnug
+OeCAAg+xjxhEjEhJXuyiTHWLfuF4OiLRis7jV4QngvdObijgZ7cihiZJIjQnDWIz
+K23uRlSVjSGdZ2WBuXo9cj8q4NsF1gbvdH1ctKMi5gYYF4V+lD8BfVfXbJPTDkpn
+QRK4K1SMwuqi/UWwjXfrMUWhrM068vdMMajLPODMl5+W+SiluIhPheA5aDNUxzb1
+DCwdTxgrzMCi5qZ9nXpzHDi66MJmgkjUtICmkbmrVIs/HozJ49oE001e0mg4rm0e
+ewLGVk2Svqp2V86qmmCRHq7UgS2k6oWmV6CrBrxCfJMCAwEAAaOCAmwwggJoMAwG
+A1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUiCcXCam2GGCL7Ou69kdZxVJUo7cwggEc
+BgNVHSAEggETMIIBDzCCAQsGCSqGSIb3Y2QFATCB/TCBwwYIKwYBBQUHAgIwgbYM
+gbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5IGFueSBwYXJ0eSBhc3N1
+bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJsZSBzdGFuZGFyZCB0
+ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRlIHBvbGljeSBh
+bmQgY2VydGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1lbnRzLjA1BggrBgEFBQcC
+ARYpaHR0cDovL3d3dy5hcHBsZS5jb20vY2VydGlmaWNhdGVhdXRob3JpdHkwEwYD
+VR0lBAwwCgYIKwYBBQUHAwIwMAYDVR0fBCkwJzAloCOgIYYfaHR0cDovL2NybC5h
+cHBsZS5jb20vd3dkcmNhLmNybDAdBgNVHQ4EFgQU41N+up+yd2VzhivOLcXYZ/Bc
+hqcwDgYDVR0PAQH/BAQDAgeAMBAGCiqGSIb3Y2QGAwEEAgUAMBAGCiqGSIb3Y2QG
+AwIEAgUAMH0GCiqGSIb3Y2QGAwYEbzBtDBJjb20uYW5zamVyLmFjY2xvdWQwBQwD
+YXBwDBdjb20uYW5zamVyLmFjY2xvdWQudm9pcDAGDAR2b2lwDB9jb20uYW5zamVy
+LmFjY2xvdWQuY29tcGxpY2F0aW9uMA4MDGNvbXBsaWNhdGlvbjANBgkqhkiG9w0B
+AQsFAAOCAQEAaHzk8ER8puY4+9LANtvZ2jIQRmTfri70DdtLue0uSeKIzizBOFI4
+0aFeBh7NVloqYyztPDUBZCmtWSy7OzudEJu5D7+NqTO8HaxW13Cu9YN8gEZplER5
+CzC22e+X7xPPN8y9p3rMfzWtRRHCE3FEKgZaa2X1C4ZtMoVIJzWgPOQb96/HeUNd
+S/LFjzVk1811YD7pPbpQDlNsgPeFH1DZ0lumxVzP+8yPsDKw4gDCIGsuoA08hkV4
+p3eIJBoaAAvc6tfclQfkZdfvS5MXWdoxcoLofJ7C23eMU+keTrAy1oRZd7XZbIk7
+FiuhNfx0XrIVcXsMt0sCySBr2w4aNKdmhA==
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

Ansjer/urls.py

@@ -158,6 +158,7 @@ urlpatterns = [
     # 删除云存视频
     path('cv/del', CloudVod.deleteVodHls),
     url(r'^equipment/judge', EquipmentManager.judgeInterface),
+    
     # ap模式，新增设备表
     url(r'^uiduser/add', UidUser.addInterface),
     url(r'^uiduser/query', UidUser.queryInterface),