Pārlūkot izejas kodu

更换lcc的证书

tanghongbin 4 gadi atpakaļ
vecāks
revīzija
b3b330d71b
2 mainītis faili ar 86 papildinājumiem un 48 dzēšanām
  1. 43 43
      AnsjerPush/file/apns_pem/lcc.pem
  2. 43 5
      AnsjerPush/test.py

+ 43 - 43
AnsjerPush/file/apns_pem/lcc.pem

@@ -1,24 +1,24 @@
 Bag Attributes
     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 
+    localKeyID: 76 F5 5D 9E 6C 0C 35 08 C6 4D 8D 3C A8 E6 2C 28 0E C0 EA E8 
 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-----
-MIIGOjCCBSKgAwIBAgIIEh/B+Kd1dVowDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
+MIIGOjCCBSKgAwIBAgIIOp4hhKLzQmUwDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
 BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
 ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
 aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTkxMDE1MDk0OTQ4WhcNMjAxMTEzMDk0OTQ4WjCBojEnMCUGCgmSJomT8ixk
+HhcNMjAxMjA5MDI0MjE2WhcNMjIwMTA4MDI0MjE2WjCBojEnMCUGCgmSJomT8ixk
 AQEMF2NvbS5hbnNqZXIubG9vY2FtY2Nsb3VkMTUwMwYDVQQDDCxBcHBsZSBQdXNo
 IFNlcnZpY2VzOiBjb20uYW5zamVyLmxvb2NhbWNjbG91ZDETMBEGA1UECwwKSkNI
 VDY3WFQ2ODEeMBwGA1UECgwVTG9vY2FtIFRlY2hub2xvZ3kgTExDMQswCQYDVQQG
-EwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMIfC7vgq2k1bNRW
-4/Ix+W5CYWLzlbZJ3WS+A4X8GEZVkpcuQhADCs/fxMk/KMzl3XvX8YiNQoItKGzK
-Gd0wEtwdjmQvsXwjZG47v7OGE0qj9beQRMYo0gq6SOK7J7r7/8QW9ggmZJXfTqu2
-kQimrpTLeEQdKERbZLxV4i5oOTaAwyzHChNDmvcg2LCjkYaHuOMKtuQHOcMd8RQ4
-DybXkCyPbItIRxuAksMSem2TBHyHoO6Agx3epPgU+9nTbze7eU0OpAiAl7lFqc3i
-80llb8N23q4WUK+1u/5KEVlZjXHvdmOYldVpUK2GUgc4gcBbZoda3DIQ/F8nddTI
-gczwXRMCAwEAAaOCAnwwggJ4MAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUiCcX
+EwJVUzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALUn67aPyCs1MaED
+uNITbo5zB+u3x+xlsUgmtg/GRDuYEMhTt6vzLlegX+PMOnz6K28K90iByEYfwo6k
+cgW3GdxxG9pgjGBwe+EUMh/Khx9P51p7AmsjH7PvNKTQlqJVp+0qZC1n6kmp7an+
+ZCxLNEFso9U3/pl6iwRmS1iyl3WPE9B3A3mnLAi1amV6W9bQfa8m7jjtWW4GWSMQ
++yvcf+AE+LcwDe76z9kFzV/RfaQiF0m8+A6lA9djoLHz97ANtSfmS3aUxwChkg1N
+fPZHLREEb4hOpWdvjSUQNlLSZHjqn82zEnKH+ZyKuNI4ouWdL+Wzz0Hp2FVIKXqL
+UQv5BkMCAwEAAaOCAnwwggJ4MAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUiCcX
 Cam2GGCL7Ou69kdZxVJUo7cwggEcBgNVHSAEggETMIIBDzCCAQsGCSqGSIb3Y2QF
 ATCB/TCBwwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmlj
 YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4g
@@ -27,42 +27,42 @@ IGNlcnRpZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGljZSBz
 dGF0ZW1lbnRzLjA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hcHBsZS5jb20vY2Vy
 dGlmaWNhdGVhdXRob3JpdHkwEwYDVR0lBAwwCgYIKwYBBQUHAwIwMAYDVR0fBCkw
 JzAloCOgIYYfaHR0cDovL2NybC5hcHBsZS5jb20vd3dkcmNhLmNybDAdBgNVHQ4E
-FgQUgbr4LsVYmqSGqUf277cWSBx6HukwDgYDVR0PAQH/BAQDAgeAMBAGCiqGSIb3
+FgQUdvVdnmwMNQjGTY08qOYsKA7A6ugwDgYDVR0PAQH/BAQDAgeAMBAGCiqGSIb3
 Y2QGAwEEAgUAMBAGCiqGSIb3Y2QGAwIEAgUAMIGMBgoqhkiG92NkBgMGBH4wfAwX
 Y29tLmFuc2plci5sb29jYW1jY2xvdWQwBQwDYXBwDBxjb20uYW5zamVyLmxvb2Nh
 bWNjbG91ZC52b2lwMAYMBHZvaXAMJGNvbS5hbnNqZXIubG9vY2FtY2Nsb3VkLmNv
-bXBsaWNhdGlvbjAODAxjb21wbGljYXRpb24wDQYJKoZIhvcNAQELBQADggEBABr9
-dM8BvrJVSwYRGw39JU7kiGV+dOhcJ59XwOdo2xO05dv1iQJeVDRSpni9yfeHX/pu
-rycGgEm40IQxqTNs851KUqBiLjEwRjkX6MZQMbWnTZY8xiLFKm7lhY6mFUsxfkXH
-/dygY9uZkNCzYfzs8JbWRU8p2uNwF3ZRvZiXITncNWImkdtneSHgF3IQtq/6flc5
-aA89zIH8P7V5/Rvye7JFuM98AXNUHO8XznwgGru6kZCpi4e+83AAXhD9JQmHv/wN
-iHCDWHq1TFS8KgbxfvgGkB2r5vlGkWSo2E3xnxGZu6tiRYgNyNqNsJoMeAtH/352
-xQQMuMMfCP/eKBojC+8=
+bXBsaWNhdGlvbjAODAxjb21wbGljYXRpb24wDQYJKoZIhvcNAQELBQADggEBACjM
+eZvOQRFP78dl4pT0o2ttgXwMjhFOFFX+GOgNAaen4SzCau6I2xUkfLx6eGg0ovdX
+husk6BKJkM8Zj8QeOEz2qr5mURwfjMhFjEETk0mUSmmHqZAxPNa4RjVp3XMWrRFI
+b6ok5/2GEYijlUTHjDArpUMgjlWFw9BHo6LeaZEzdTNNKWCDXQAAzLwAOdUFo3BG
+3es1sShkhC/CYsHax5+qvf8UmaX1EICvE3JW+3ptYYzPsDY6pE8/1f0T7TYf7by+
+PnNwyJTeqktWwrrB60nwDfQ9+S6eqAI6ZV9Vg5Hte5mLSpTQxJVOIAwKd26jFt4e
+RzhmGL052dQFoj/uQ4M=
 -----END CERTIFICATE-----
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

+ 43 - 5
AnsjerPush/test.py

@@ -1,4 +1,6 @@
+import datetime
 import time
+from datetime import timezone, timedelta, datetime
 
 import boto3
 
@@ -8,14 +10,50 @@ from AnsjerPush.config import AWS_SES_ACCESS_ID, AWS_SES_ACCESS_SECRET
 # response = client.get_dashboard(DashboardName='string')
 # print(response)
 
-localtime = time.localtime()
-current_month = localtime.tm_mon
+# localtime = time.localtime(1601482210)
+# current_month = localtime.tm_mon
+# print(current_month)
+#
+# time_struct = [localtime.tm_year, localtime.tm_mon, 1, 0, 0, 0, 0, 0, 0]
+# start_time = int(time.mktime(tuple(time_struct)))
+# print(start_time)
+#
+# time_struct[1] = current_month + 1
+# end_time = int(time.mktime(tuple(time_struct)))
+# print(end_time)
+
+# current_time = int(1601565010 - 8 * 3600)
+# print(current_time)
+# count = int(current_time / (24 * 3600))
+# current_time = count * 24 * 3600
+# print(current_time)
+
+# localtime = time.localtime(1601565010)
+# datetime.datetime()
+# current_day = localtime.tm_mday
+#
+# time_struct = [localtime.tm_year, localtime.tm_mon, current_day, 0, 0, 0, 0, 0, 0]
+# current_time = int(time.mktime(tuple(time_struct)))
+# print(current_time)
+
+
+# gmtime = time.gmtime(1601568621 + 28800)
+# current_day = gmtime.tm_mday
+# print(current_day)
+# print(gmtime.tm_hour)
+# time_struct = [gmtime.tm_year, gmtime.tm_mon, current_day, 0, 0, 0, 0, 0, 0]
+# current_time = int(time.mktime(tuple(time_struct)))
+# print(current_time - 28800)
+
+
+gmtime = time.gmtime(int(time.time()) + 28800)
+current_month = gmtime.tm_mon - 1
 print(current_month)
 
-time_struct = [localtime.tm_year, localtime.tm_mon, 1, 0, 0, 0, 0, 0, 0]
-start_time = int(time.mktime(tuple(time_struct)))
+time_struct = [gmtime.tm_year, current_month, 1, 0, 0, 0, 0, 0, gmtime.tm_isdst]
+start_time = int(time.mktime(tuple(time_struct))) - 28800
 print(start_time)
 
 time_struct[1] = current_month + 1
-end_time = int(time.mktime(tuple(time_struct)))
+end_time = int(time.mktime(tuple(time_struct))) - 28800
 print(end_time)