1

AnsjerPush/file/apns_pem/zccloud.pem

@@ -1,71 +1,67 @@
 Bag Attributes
-    friendlyName: Apple Development IOS Push Services: com.ansjer.zccloud
+    friendlyName: Apple 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
+subject=/UID=com.ansjer.zccloud/CN=Apple Push Services: com.ansjer.zccloud/OU=772N5HXAR2/O=ZOSI Technology Co. , Ltd/C=US
 issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
 -----BEGIN CERTIFICATE-----
-MIIFiTCCBHGgAwIBAgIIdGAeNPi1q4YwDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
+MIIGJDCCBQygAwIBAgIIPgEkIypNo/cwDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
 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=
+HhcNMjAwNDI0MDYxMzU0WhcNMjEwNTI0MDYxMzU0WjCBnDEiMCAGCgmSJomT8ixk
+AQEMEmNvbS5hbnNqZXIuemNjbG91ZDEwMC4GA1UEAwwnQXBwbGUgUHVzaCBTZXJ2
+aWNlczogY29tLmFuc2plci56Y2Nsb3VkMRMwEQYDVQQLDAo3NzJONUhYQVIyMSIw
+IAYDVQQKDBlaT1NJIFRlY2hub2xvZ3kgQ28uICwgTHRkMQswCQYDVQQGEwJVUzCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANBdZew9tST0c7cmoDoVslTu
+KmG/bxErZ8SfKvLNA8vKn+4Y6JW7E/vFs5X/e9sRypKgS9nHjHMyHfFv0so+lIrU
+4+v0P4rBs3OHQfsL+fXth2wbq/c1YhWx/HqJUrpNQ1BgJO/Ce1qjqyKP/1y2sski
+0E6DC6+d7mkejNcsBXj0IYdbpiqgB/2GZQKb1YlP/LRpk2WwPWdBQDy99qEFycMq
+8SB7DndSQB4NNhT2v9NY1bDivjgPmaiZ/68T6sOidSLeDBWsQVEav4broJi8Y/kX
+bRerCXGnDvXs7P2Bp7V/KqRuATFuVSr6a/leHXIwKYOl6qjBWBzIDg7PW6zQ6csC
+AwEAAaOCAmwwggJoMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUiCcXCam2GGCL
+7Ou69kdZxVJUo7cwggEcBgNVHSAEggETMIIBDzCCAQsGCSqGSIb3Y2QFATCB/TCB
+wwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5
+IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGlj
+YWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRp
+ZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1l
+bnRzLjA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hcHBsZS5jb20vY2VydGlmaWNh
+dGVhdXRob3JpdHkwEwYDVR0lBAwwCgYIKwYBBQUHAwIwMAYDVR0fBCkwJzAloCOg
+IYYfaHR0cDovL2NybC5hcHBsZS5jb20vd3dkcmNhLmNybDAdBgNVHQ4EFgQUJVRh
+2mp8zS1qHkVklnpLKIkVc9QwDgYDVR0PAQH/BAQDAgeAMBAGCiqGSIb3Y2QGAwEE
+AgUAMBAGCiqGSIb3Y2QGAwIEAgUAMH0GCiqGSIb3Y2QGAwYEbzBtDBJjb20uYW5z
+amVyLnpjY2xvdWQwBQwDYXBwDBdjb20uYW5zamVyLnpjY2xvdWQudm9pcDAGDAR2
+b2lwDB9jb20uYW5zamVyLnpjY2xvdWQuY29tcGxpY2F0aW9uMA4MDGNvbXBsaWNh
+dGlvbjANBgkqhkiG9w0BAQsFAAOCAQEAhbsEWfOwoRPz9wgTlWycYrqKbF/QblbA
+yB7rCsR+d1EM9JbpHl7SuS0GMHUbFr7XR5INiDG+a2IKcLlfLyasKvcycuUs/sW0
+NoCI1726d7F0TEtKN3tUx+rAMi4+dQeg40NfmB1Cg1HkpewT7v5LzuRv6+/sx3bH
+ZSfrKe5ervaYlww79mrTzcR3xzt6aXnHa7zVgi6DaCg6jA4Q/IC3XbTlJK/sk0aG
+taA1utdChItuuy2dLyQjnzqzvMAOLSjD0fDVImFAJ3eMqR5gT3jwNn/GLbws+2F7
+AYN72N8HuPWgfy+PteJWbD07Mf3ODjpRbw9tlltuCJ6nhbRkFI6fCA==
 -----END CERTIFICATE-----
-Bag Attributes
-    friendlyName: mac mini01
-    localKeyID: 25 54 61 DA 6A 7C CD 2D 6A 1E 45 64 96 7A 4B 28 89 15 73 D4 
-Key Attributes: <No Attributes>
------BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFDjBABgkqhkiG9w0BBQ0wMzAbBgkqhkiG9w0BBQwwDgQI9EaYMySv7X0CAggA
-MBQGCCqGSIb3DQMHBAiBkMBY4FdMrQSCBMi5+hh3qv6ZIvpf3reEB2VwyPYdSBS4
-ajTY3xd+J3hkzg61uYKAjH2fZgQQZ1nwmn4yomKSc3NNffMMQ6LnEGsYIqdCjiet
-Rf8qhABmTtvHSkgzlHq8l7obBm2Z1yCrxQIGalPUu+lpb//SsEfsUYuX+PusIJUa
-uV5pY08Gfpw+DeL3j27e1plzFNLPXk85E0GOvMqtGCZJjiRTpszoP+/e3wXBdDQ8
-BtHq+iO+GcaCQX9xcfyx7bIm/GE99A87J+S0pM+dY+ReEAypRP2uvq65YPCCRjwh
-wAWgrfPriPacD+UI4VM+hDwiRzBp0mW0Qj89uNde7t4jWupVtPTc5d6wNa+JYpGE
-RxSG9YOSpTrWHX8Uw0VQICJL1oZYY2V+G7s4NEimT9mvPj8XmfyxiBeY62PvkBK/
-uB9v2fRR+4BFpfs42HxVakHgabZnQpFkkbUBVtFGHeDY8E3wxXbEY7eKiElX6atI
-OBwRIND9cK6CE4DB6QfeBlqLozBHBL9B7BJh599FxMUiwxk46OwlMdZBXye2aVmB
-b0iSOvTUwIA7qSy2t8A6wOEBLfI2DSmfWMCf5vA1BFSdl+MllKWaL3rkmtJBUJ0k
-4WyYq9uG2zE+unIwjNkXIZ9urRpTkmmaankbdSJspjhvqAYjxehYBY8BJ60pCbKs
-SbMeszQpQuEdRqfKnDbEdNt0fbHie1Agk46qWEXpyFW8R5KbACwQgp5YCkYyrxkJ
-dZnzpCWI7gjTP/JcZXd7NavTv8HW75kmbsX4+3P+QGrjeHN+ij800RhZ6wVudiWe
-EWXe2i7IWqEY5t9gJasrcVkQ3g1iph1pfD89CxOo8otOZ3RKAj8TiF0o6R1PdrDO
-eGXKtNqRHuXkdhZAZ58kX9w9WY2YnDVh622gfesKQuYnIaSDM0fB2KxX7nl6MUa1
-Qx0nytMT/3hJrg6cJ214ocqzVZvRqcYW+M08mqeHpH44ns1+7lMBiC026zUicVpU
-ijYXaW4623BjdUZxHtGV3+Rhd1jzmD179zlzqKvfk8GAV83UXMDyiAc+WtxyyjVZ
-6slk8xavkaZzlQP2Nw9LBpcK0q00sItgEDmH5fCn4uEUHvMbNT1YTxpXtlmGjTj1
-Xk7UZt8heNejtRt232d+VmQy4/Ha84O1TogOFAiNlTo1WEvhsf5RGysCX4G/niA9
-KlpIPZMBZcxZmcNL/vtw1riI9rlQnmCAHuRvpGwXlr/2v8sAISLsYeZHrRoOlgZX
-LdQIgw/XtkXscqdf8reqX9D/zi2eiEDb/BIFfNKyiiw9P17GRC7q7GtV7a0/fSy4
-qOl5Pj6AEOMZMllMTzrm9ZNevoqYAkKvISCCyAb/rL/OqlH6nIPpNVRjqDvKZSQL
-IGuKSg7Gn9jb3ZzUaesy2TeCfugyuwe5sJRUu5v1Syu5WsxySlJVblrbUOSWce9H
-EbJzpUWuIWvEr0p000CwBysaC1j7dpo+QX1iS3EI642miwadx+1dh/dUAYwgTSbi
-RZGkkUgft4oe4DO6p70Gpp23xoaKlMEyox1/lGgTA+HhBLvkE/SyRmMYw8QcHGzc
-7m4SDPxJAyWks6q0OiY8KPQMQesWaeEMp9PUQCjz0RswXCIK6bhjh0SV6igRDYp4
-F80=
------END ENCRYPTED PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEogIBAAKCAQEA0F1l7D21JPRztyagOhWyVO4qYb9vEStnxJ8q8s0Dy8qf7hjo
+lbsT+8Wzlf972xHKkqBL2ceMczId8W/Syj6UitTj6/Q/isGzc4dB+wv59e2HbBur
+9zViFbH8eolSuk1DUGAk78J7WqOrIo//XLayySLQToMLr53uaR6M1ywFePQhh1um
+KqAH/YZlApvViU/8tGmTZbA9Z0FAPL32oQXJwyrxIHsOd1JAHg02FPa/01jVsOK+
+OA+ZqJn/rxPqw6J1It4MFaxBURq/huugmLxj+RdtF6sJcacO9ezs/YGntX8qpG4B
+MW5VKvpr+V4dcjApg6XqqMFYHMgODs9brNDpywIDAQABAoIBAF4aMFPXMp40AKaw
+vSA+eEG/JkjrCiA4+C5mrCDn0lURd9UyTqiAyu+kRAz0S12O1WwPFPKQGrBT7A4E
+MLDCPpfMufrwXlouTPtaFMRqjkMxOT3r6WhGJbwinCJDLqeRCVudcFEQBmHTFREQ
+84VNxcTtAiLTME3qB6hV8cmjyfzrg9HgVd/g0/7UmMBlyHeEj8yAbGuTmzndvtYS
+9ADVri+rVo4dVSYo0tlGNmSbz2j+F680ghu8EVqpV1LOOmo54UIWeCqeSY7KskKI
+kLyGZmchUF0AqZnY2/jTJ9DO/opaTFkp6PFwVH4enamWAHFDqKzpj5C8cFnnO55+
+SkdD0LECgYEA9VzVyyyNumOC3I4BHtZ9iGIp7mwrt7lPFDMdtA7MhClI4HCILWcs
+cVahCyphb9u0mpGxZfu2iz6IbiVAsoZL1IiS98xNxn1oarbmqmtHBfu0V0YfprgU
+C26PWO9/5DCwhTD22ZJlKkvy+Yf6NMWgoCkZ7nHbtMsQRgxiQQqoyccCgYEA2WXx
+Fz29tvgy5lw552rD3EIxlxET9EF+Vd3qJCCyVcN0lMzoSBRwHPwJCHNgtSOeV/bn
+KFEfLvslFNCu+AYVpDfm5tEbL+67Xop9XYJZeVe9SKfuy3IGGh+Qo0uDYwQrJwVt
+e+etqL+NuDkjeMs/Toiyc+8/KlkbodWJloL3f90CgYBva+4GasAdsUze3XmyyFKP
+WYyTIfokX3mCwceuWb4UEi9vBItCmwS6n01YpbFDu7DjNGAr4Me/qfEIm9AqggPz
+iuW6s8Np7M87Dr3nC/pfxDLcIxMCgbtQia99Ap3AQUAX6+ldWjaoo36+RDqiNlDA
+CoolFv1ft4s3VC5WPQHzRwKBgCo2DgLaPRzqwk9SNvgFFfSNcb2IVlyF3vbjONQ8
++QOICPnfc3aTaVVnZoWaiXuCZ/tieG2umqRvpTqObnrAC7GwHQhSL7o123G26DKg
+3aie7aTO3qHoCOFHobjjL6apJ4vTFPgK+wAZ+XV8urN4m1kvV58FJDmfxaq9oJJ1
+6YKNAoGAWULDkYaRAklSkM9lGV/OWcBgH/rYZycqwRKaLRdluKoWzYqnpcF5Vj8l
+ENI854Luqo7NpoHfAhyB3TH7CFocTL6BXMO0Naf5q7nmQMqQmcHuPBhyaVCiMXBy
+4aKyiWNMt4Rn54VDbgyYklCZkg3o0kV70yAdWm5blnxnbVpOe+g=
+-----END RSA PRIVATE KEY-----

Controller/DetectController.py

@@ -120,7 +120,7 @@ class NotificationView(View):
             if have_dkey:
                 detect_med_type = 1
             else:
-                detect_med_type = 2
+                detect_med_type = 2  # 为2的话，既推送，又存库
                 # detect_group=0允许全部推送的时候
                 if detect_group == '0':
                     redisObj.set_data(key=dkey, val=1, expire=detect_interval)
@@ -217,7 +217,9 @@ class NotificationView(View):
 
         if is_st == '0' or is_st == '2':
             print("is_st=0or2")
-            return JsonResponse(status=200, data={'code': 0, 'msg': 'success 0 or 2','do_apns_code': do_apns_code,'do_fcm_code': do_fcm_code,'do_jpush_code': do_jpush_code,'re_list':redis_list})
+            for up in redis_list:
+                up.append({'do_apns_code': do_apns_code,'do_fcm_code': do_fcm_code,'do_jpush_code': do_jpush_code})
+            return JsonResponse(status=200, data={'code': 0, 'msg': 'success 0 or 2','re_list':redis_list})
 
         elif is_st == '1':
             print("is_st=1")
@@ -225,8 +227,9 @@ class NotificationView(View):
             obj = '{uid}/{channel}/{filename}.jpeg'.format(uid=uid, channel=channel, filename=n_time)
             # 设置此签名URL在60秒内有效。
             url = bucket.sign_url('PUT', obj, 7200)
-            res_data = {'code': 0, 'img_push': url, 'msg': 'success 1','do_apns_code': do_apns_code,
-                        'do_fcm_code': do_fcm_code,'do_jpush_code': do_jpush_code,'re_list':redis_list}
+            for up in redis_list:
+                up.append({'do_apns_code': do_apns_code, 'do_fcm_code': do_fcm_code, 'do_jpush_code': do_jpush_code})
+            res_data = {'code': 0, 'img_push': url, 'msg': 'success 1','re_list':redis_list}
             return JsonResponse(status=200, data=res_data)
 
         elif is_st == '3':
@@ -240,8 +243,9 @@ class NotificationView(View):
                 # 设置此签名URL在60秒内有效。
                 url = bucket.sign_url('PUT', obj, 7200)
                 img_url_list.append(url)
-            res_data = {'code': 0, 'img_url_list': img_url_list, 'msg': 'success 3', 'do_apns_code': do_apns_code,
-                        'do_fcm_code': do_fcm_code,'do_jpush_code': do_jpush_code,'re_list':redis_list}
+            for up in redis_list:
+                up.append({'do_apns_code': do_apns_code, 'do_fcm_code': do_fcm_code, 'do_jpush_code': do_jpush_code})
+            res_data = {'code': 0, 'img_url_list': img_url_list, 'msg': 'success 3','re_list':redis_list}
             return JsonResponse(status=200, data=res_data)