config bug

Ansjer/config.py

@@ -64,57 +64,12 @@ OSS_ROLE_ARN = 'acs:ram::1901342792446414:role/stsoss'
 
 # 不同环境配置
 if SERVER_TYPE == 'Ansjer.local_settings':
-    NGINX_RTMP_STAT = 'http://192.168.136.45:8077/stat'
-    SERVER_DOMAIN = 'http://192.168.136.45:8077/'
-    SERVER_DOMAIN_SSL = 'http://192.168.136.45:8077/'
-    SERVER_HOST = '192.168.136.45'
-    DOMAIN_HOST = '192.168.136.45'
-    RTMP_PUSH_URL = 'rtmp://192.168.136.45:1935/hls'
-    PAYPAL_CRD = {
-        "mode": "sandbox",  # sandbox or live
-        "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-        "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
-    }
-    DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
-    # 数据库dyanamo品牌日志数据库
-    USER_BRAND = 'test_user_brand'
-    USER_BRAND_ALL = 'test_user_brand_all'
-
+    from Ansjer.config_local import *
 elif SERVER_TYPE == 'Ansjer.test_settings':
-    NGINX_RTMP_STAT = 'http://test.dvema.com/stat'
-    SERVER_DOMAIN = 'http://test.dvema.com/'
-    SERVER_DOMAIN_SSL = 'https://test.dvema.com/'
-
-    DOMAIN_HOST = 'test.dvema.com'
-    SERVER_HOST = 'localhost'
-    PAYPAL_CRD = {
-        "mode": "live",  # sandbox or live
-        "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
-        "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
-        # "mode": "sandbox",  # sandbox or live
-        # "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
-        # "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
-    }
-    DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
-    # 数据库dyanamo品牌日志数据库
-    USER_BRAND = 'test_user_brand'
-    USER_BRAND_ALL = 'test_user_brand_all'
-
+    from Ansjer.config_test import *
 elif SERVER_TYPE == 'Ansjer.formal_settings':
-    NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
-    SERVER_DOMAIN = 'http://www.dvema.com/'
-    SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
-    DOMAIN_HOST = 'www.dvema.com'
-    SERVER_HOST = 'localhost'
-    PAYPAL_CRD = {
-        "mode": "live",  # sandbox or live
-        "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
-        "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
-    }
-    DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
-    # 数据库dyanamo品牌日志数据库
-    USER_BRAND = 'user_brand'
-    USER_BRAND_ALL = 'user_brand_all'
+    from Ansjer.config_formal import *
+print(PAYPAL_CRD)
 # type =2
 JPUSH_CONFIG = {
     'com.ansjer.accloud_ab': {
@@ -169,7 +124,7 @@ FCM_CONFIG = {
 # type= 0
 APNS_CONFIG = {
     'com.ansjer.loocamccloud': {
-        'pem_path': os.path.join(BASE_DIR, 'Ansjer/file/apns_pem/apns-dev-gg.pem'),
+        'pem_path': os.path.join(BASE_DIR, 'Ansjer/file/apns_pem/apns-dev-lcc.pem'),
         'password': '111111'
     }
 }

Ansjer/config_formal.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python3  
+# -*- coding: utf-8 -*-  
+"""
+@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
+@AUTHOR: ASJRD018
+@NAME: AnsjerFormal
+@software: PyCharm
+@DATE: 2019/10/16 9:45
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+@file: config_formal.py
+@Contact: chanjunkai@163.com
+"""
+NGINX_RTMP_STAT = 'http://www.dvema.com/stat'
+SERVER_DOMAIN = 'http://www.dvema.com/'
+SERVER_DOMAIN_SSL = 'https://www.dvema.com/'
+DOMAIN_HOST = 'www.dvema.com'
+SERVER_HOST = 'localhost'
+PAYPAL_CRD = {
+    "mode": "live",  # sandbox or live
+    "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
+    "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
+}
+DETECT_PUSH_DOMAIN = 'http://push.dvema.com/'
+# 数据库dyanamo品牌日志数据库
+USER_BRAND = 'user_brand'
+USER_BRAND_ALL = 'user_brand_all'

Ansjer/config_local.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python3  
+# -*- coding: utf-8 -*-  
+"""
+@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
+@AUTHOR: ASJRD018
+@NAME: AnsjerFormal
+@software: PyCharm
+@DATE: 2019/10/16 9:45
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+@file: config_local.py
+@Contact: chanjunkai@163.com
+"""
+NGINX_RTMP_STAT = 'http://192.168.136.45:8077/stat'
+SERVER_DOMAIN = 'http://192.168.136.45:8077/'
+SERVER_DOMAIN_SSL = 'http://192.168.136.45:8077/'
+SERVER_HOST = '192.168.136.45'
+DOMAIN_HOST = '192.168.136.45'
+RTMP_PUSH_URL = 'rtmp://192.168.136.45:1935/hls'
+PAYPAL_CRD = {
+    "mode": "sandbox",  # sandbox or live
+    "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
+    "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
+}
+DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
+# 数据库dyanamo品牌日志数据库
+USER_BRAND = 'test_user_brand'
+USER_BRAND_ALL = 'test_user_brand_all'

Ansjer/config_test.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3  
+# -*- coding: utf-8 -*-  
+"""
+@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
+@AUTHOR: ASJRD018
+@NAME: AnsjerFormal
+@software: PyCharm
+@DATE: 2019/10/16 9:45
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+@file: config_test.py
+@Contact: chanjunkai@163.com
+"""
+NGINX_RTMP_STAT = 'http://test.dvema.com/stat'
+SERVER_DOMAIN = 'http://test.dvema.com/'
+SERVER_DOMAIN_SSL = 'https://test.dvema.com/'
+
+DOMAIN_HOST = 'test.dvema.com'
+SERVER_HOST = 'localhost'
+PAYPAL_CRD = {
+    "mode": "live",  # sandbox or live
+    "client_id": "AdSRd6WBn-qLl9OiQHQuNYTDFSx0ZX0RUttqa58au8bPzoGYQUrt8bc6591RmH8_pEAIPijdvVYSVXyI",
+    "client_secret": "ENT-J08N3Fw0B0uAokg4RukljAwO9hFHPf8whE6-Dwd8oBWJO8AWMgpdTKpfB1pOy89t4bsFEzMWDowm"
+    # "mode": "sandbox",  # sandbox or live
+    # "client_id": "AeuhR7FHisO-lOd2OwtzyDu7PSLMmDZoDLgmzuEQ12WCtTu_8Z1AzcD4gG5SnymnuvJs-n5KBB8H9Z_G",
+    # "client_secret": "EGkMCB3RWTcUGJGDYahJ9mCO0AQzEn2AvFfx1GAFjfyyn7-8a0NObcZks89QorlFpvNWTsDXVa2INRNM"
+}
+DETECT_PUSH_DOMAIN = 'http://test.push.dvema.com/'
+# 数据库dyanamo品牌日志数据库
+USER_BRAND = 'test_user_brand'
+USER_BRAND_ALL = 'test_user_brand_all'

Ansjer/file/apns_pem/apns-dev-loc.pem

@@ -1,64 +0,0 @@
-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
-issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
------BEGIN CERTIFICATE-----
-MIIFkzCCBHugAwIBAgIIKg69mG6JJd8wDQYJKoZIhvcNAQEFBQAwgZYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
-ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
-aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTkwOTAzMDEzNTEwWhcNMjAwOTAyMDEzNTEwWjCBkjEnMCUGCgmSJomT8ixk
-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
-AgUAMA0GCSqGSIb3DQEBBQUAA4IBAQAdZQ1i9o22sLj9oj4s1sFNaAnevpTw9fqx
-tkrzaXqbCFvYb+MRaXM2gbZq8QfDKdK3hCZ9M5bEZlYYV+RfmWjs5c/Ucfd8Sy7z
-MHU8EsebdZcefU98OAjN+NyECasmzc1RrfgucL3Cuw2ZSM5VYrnFxNHByOVcf2y+
-yw9bSFILPODDXvHC8Dxm3nckvQ3rj9+Dj3zyL5KCePuGxIUFQ6w4F2xvs2ma08TZ
-+lpWi6x2Wu56KRluTs5/GH4fla1jyHGl/nyjU1oKNYGK9ehk+HAjrG48UlbleDP3
-ADPLsNIF5CHTE1gK69u7HDf4YSD6KQNfdydJByB790/38WiMZMj8
------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-----

Ansjer/file/apns_pem/apns-dev-t.pem

@@ -1,67 +0,0 @@
-Bag Attributes
-    friendlyName: Apple Push Services: com.ansjer.zccloud
-    localKeyID: 9D A9 1D 37 7D DA 96 D1 8C 2D 3E D1 C0 47 5E 73 1C EF 6A 20 
-subject=/UID=com.ansjer.zccloud/CN=Apple Push Services: com.ansjer.zccloud/OU=772N5HXAR2/O=ZOSI Technology Co. , Ltd/C=CN
-issuer=/C=US/O=Apple Inc./OU=Apple Worldwide Developer Relations/CN=Apple Worldwide Developer Relations Certification Authority
------BEGIN CERTIFICATE-----
-MIIGJDCCBQygAwIBAgIIPBvSaz/ByJ0wDQYJKoZIhvcNAQELBQAwgZYxCzAJBgNV
-BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
-ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
-aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
-HhcNMTkwNDA5MDExNzAwWhcNMjAwNTA4MDExNzAwWjCBnDEiMCAGCgmSJomT8ixk
-AQEMEmNvbS5hbnNqZXIuemNjbG91ZDEwMC4GA1UEAwwnQXBwbGUgUHVzaCBTZXJ2
-aWNlczogY29tLmFuc2plci56Y2Nsb3VkMRMwEQYDVQQLDAo3NzJONUhYQVIyMSIw
-IAYDVQQKDBlaT1NJIFRlY2hub2xvZ3kgQ28uICwgTHRkMQswCQYDVQQGEwJDTjCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAPCdYuZ6mESGlJx9VKZxUgSg
-aRwjYzanIcssyqZukWLG6ZaKkOneCV6O9FwcOXsTXds5wBHt43IhphFTpSLYqmU4
-ZlvV9hC9mliVLyvp1NEg4RpdDyg3dCfxk2uqlT7Gi73krgIrAXPewKuw11yxwJaQ
-oaclPB9PtFACFk84aHaJiqQcbczMSFC6ETzw/ubijwi370GsRhMitTrDesthNwwa
-avyjHI/IPebh8Whrp0UnqMGLk2+G4Ro27tJvcpjNCyjjqJIgXfJHvgLQtk99lvpy
-LlZnw9AkvfLC65ANCWRLFNhNrLt9dsfAvn7Xca3WkMhFD7oCFDC2R4Dux4qZZoUC
-AwEAAaOCAmwwggJoMAwGA1UdEwEB/wQCMAAwHwYDVR0jBBgwFoAUiCcXCam2GGCL
-7Ou69kdZxVJUo7cwggEcBgNVHSAEggETMIIBDzCCAQsGCSqGSIb3Y2QFATCB/TCB
-wwYIKwYBBQUHAgIwgbYMgbNSZWxpYW5jZSBvbiB0aGlzIGNlcnRpZmljYXRlIGJ5
-IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGlj
-YWJsZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRp
-ZmljYXRlIHBvbGljeSBhbmQgY2VydGlmaWNhdGlvbiBwcmFjdGljZSBzdGF0ZW1l
-bnRzLjA1BggrBgEFBQcCARYpaHR0cDovL3d3dy5hcHBsZS5jb20vY2VydGlmaWNh
-dGVhdXRob3JpdHkwEwYDVR0lBAwwCgYIKwYBBQUHAwIwMAYDVR0fBCkwJzAloCOg
-IYYfaHR0cDovL2NybC5hcHBsZS5jb20vd3dkcmNhLmNybDAdBgNVHQ4EFgQUnakd
-N33altGMLT7RwEdecxzvaiAwDgYDVR0PAQH/BAQDAgeAMBAGCiqGSIb3Y2QGAwEE
-AgUAMBAGCiqGSIb3Y2QGAwIEAgUAMH0GCiqGSIb3Y2QGAwYEbzBtDBJjb20uYW5z
-amVyLnpjY2xvdWQwBQwDYXBwDBdjb20uYW5zamVyLnpjY2xvdWQudm9pcDAGDAR2
-b2lwDB9jb20uYW5zamVyLnpjY2xvdWQuY29tcGxpY2F0aW9uMA4MDGNvbXBsaWNh
-dGlvbjANBgkqhkiG9w0BAQsFAAOCAQEAk+4mP5l3/78GHOv0hmojKBA6kDZOWjT7
-HNoe2uJxtdoiGDFtrZw1QuobiIhnVab1UXOy5Iu5QhmST7odn9ZJuCp+6K9wV7nK
-HcEdYJX/zZtkIodFynAf8Zy6Emar4BJ+g7fb6DBNJ/NN1Hl3/8BhB3QfvMjVj+wy
-d8ayqk48lVzZXwWHRc9yhWheLa2nSbtT2c8aosOGKmbXBH2JpB9XINg5srRKrggw
-rtawrv2q2kDuBRg0rzP52Q76Q4J3ko4fMnh4Wa78V5TJOm2IncOont6W8RzOCK0x
-dv8d9qMJj42CC2D6yBwQ9ClUmgxnno+nynTX+BZfYqA8JdvYrtp/Cg==
------END CERTIFICATE-----
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA8J1i5nqYRIaUnH1UpnFSBKBpHCNjNqchyyzKpm6RYsbploqQ
-6d4JXo70XBw5exNd2znAEe3jciGmEVOlItiqZThmW9X2EL2aWJUvK+nU0SDhGl0P
-KDd0J/GTa6qVPsaLveSuAisBc97Aq7DXXLHAlpChpyU8H0+0UAIWTzhodomKpBxt
-zMxIULoRPPD+5uKPCLfvQaxGEyK1OsN6y2E3DBpq/KMcj8g95uHxaGunRSeowYuT
-b4bhGjbu0m9ymM0LKOOokiBd8ke+AtC2T32W+nIuVmfD0CS98sLrkA0JZEsU2E2s
-u312x8C+ftdxrdaQyEUPugIUMLZHgO7HiplmhQIDAQABAoIBAQC9NRYDZV39bNLJ
-5+g75hp31ugwn0cyP+TcDwHgNEwRH5epsJbZwKcfe0x+bhdpR8ZjUJtPvgA/zGP5
-dgwCRdxgMiSTjMGtUltf0xg/8OVP+gnpIEp99nVZv6aMYJxxu9FBZuTKgaTnx788
-g5gmpQRroZnshOQtPxDsZWfDrfi/VEyjZYZJpOHQUR0NKjFlLVOmKZK7Byjhw+hH
-CyMbfeN2JwN/iqYxZAQQCTFaW1FBxPkMNLPwPGFOMHafMiUv4hj2Km5wpTyFYs7c
-yrpr4IjwVG2rBeRAsQf3lNIuL5jOqu9qh/qBvpkh+ecg1zbWosO6oPwgThhtTqrb
-BAqJ966BAoGBAPiLR+7C6g+HdaNIMysml9wnvRDtTRxM5CaCFxMcbZkiCc+kenyW
-ySxhPO4qRNNXUZHPg6KylyVWuxn52RR9CcSG/XQnN7odOdkc7gTe1fxdESVRwZnZ
-zxHSEdJ/BopcIU9tezWDQCMCyakRMqZHbUL/3q3wrVhoujTGg+HOZFNhAoGBAPfV
-NjBJvCxpQsYEuIJXieBRrnLy/Ab7fzqpYGBwCxLYE0BSeF1PAe60YKXlUxNE6RD+
-VO+V/BcDgs1An3JAYwGup2C3pfSYf7QHnKU3jbRP8uadseVRhs14snC5EmxXxML7
-GyozM7X0QCezNPU3mYBsq+nLi57oeLyWoJQRyUmlAoGAICfs+5AONkohRynNLPUG
-Sr59cJYzFsk/71d/YsKXz2se99Vg34OmrW47MtkXJHy0mffOIRuYAIWzGU5A7qyq
-udl5KzDzvcmQNW3PwaOO7eKgmEJ2mNAcQUL7eU9j6jy3No6ElUzQ3Ha83nnSIr80
-/KkcB0cPNlP+W1ufrnREeKECgYAKHpab2ibo2VN0qnSuPczPcAZjgzBvSI2lY40f
-4vNQzanbkoJ/rN4zVQItQ/PkcYfivb/SGJm2htosb1sTWzWvt+X1uQn5ttBgFX97
-74zFtA4DBKVi67VJZohCugvaiKrsGzy8uGKAJ30HIfYjnSWTbNyIK1uEHZHwgWYF
-JcTGUQKBgQCF0ppZeDT0c4u8mHUIjyfUxF9v/VejNGSQaLbTIUX2CBMMF/AObjwt
-n+nmifWLgFVuI7t+7PLZVEnY9H5jxKwI+uyuPRlTtDxLIz2vH59GY3Ey/aCwHMD4
-eRdenIp0Cg2ZUh+sW/XartIP0lYXEot7WAI/Z//m7wAyVUEucyVD0Q==
------END RSA PRIVATE KEY-----

Ansjer/file/apns_pem/apns-dis.pem

@@ -0,0 +1,68 @@
+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 
+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
+BAYTAlVTMRMwEQYDVQQKDApBcHBsZSBJbmMuMSwwKgYDVQQLDCNBcHBsZSBXb3Js
+ZHdpZGUgRGV2ZWxvcGVyIFJlbGF0aW9uczFEMEIGA1UEAww7QXBwbGUgV29ybGR3
+aWRlIERldmVsb3BlciBSZWxhdGlvbnMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkw
+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-----
+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

@@ -2,11 +2,12 @@ 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-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)
-alert = apns2.PayloadAlert(body="body!", title="title!")
+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)
 response = cli.push(n=n, device_token=token_val,topic='com.ansjer.loocamccloud')

Controller/DynamoDBLog.py

@@ -51,33 +51,23 @@ class DynamoDBLog(View):
         return self.validation(request.POST, request, operation)
 
     def validation(self, request_dict, request, operation):
-        print (operation)
-        if operation is None:
-            return response.json(444, 'error path')
         self.clientIP = CommonService.get_ip_address(request)
         response = ResponseObject()
         token = request_dict.get('token', None)
-        if token is not None:
-            tko = TokenObject(token)
-            response.lang = tko.lang
-            if tko.code == 0:
-                userID = tko.userID
-                if userID is not None:
-                    if operation == 'searchByAdmin':
-                        return self.search_info(request_dict, userID,response)
-                    elif operation == 'connector':
-                        return self.connector_info(request_dict, userID,response)
-                    elif operation == 'daySearch':
-                        return self.get_day_search(request_dict, userID,response)
-
-                    else:
-                        return response.json(444)
-                else:
-                    return response.json(309)
+        tko = TokenObject(token)
+        response.lang = tko.lang
+        if tko.code == 0:
+            userID = tko.userID
+            if operation == 'searchByAdmin':
+                return self.search_info(request_dict, userID, response)
+            elif operation == 'connector':
+                return self.connector_info(request_dict, userID, response)
+            elif operation == 'daySearch':
+                return self.get_day_search(request_dict, userID, response)
             else:
-                return response.json(tko.code)
+                return response.json(444)
         else:
-            return response.json(309)
+            return response.json(tko.code)
 
     # 查询搜索表（可以通过用户名，和接口名称，ip地址搜索等）
     def search_info(self, request_dict, userID,response):

Controller/SysMsg.py

@@ -143,12 +143,14 @@ class SysMsgView(View):
                     sm_qs = sm_qs.filter(userID_id__in=userID_list)
                 count = sm_qs.count()
                 sm_qs = sm_qs[(page - 1) * line:page * line]. \
-                    values('status', 'id', 'msg', 'addTime', 'updTime', 'userID__username','userID__userEmail','userID__phone')
+                    values('status', 'id', 'msg', 'addTime', 'updTime', 'userID__username', 'userID__userEmail',
+                           'userID__phone')
                 for k, v in enumerate(sm_qs):
-                    if  sm_qs[k]['userID__username']=='':
-                        sm_qs[k]['userID__username']=sm_qs[k]['userID__userEmail']
-                    elif sm_qs[k]['userID__username']=='' and sm_qs[k]['userID__userEmail']=='':
-                        sm_qs[k]['userID__username']=sm_qs[k]['userID__phone']
+
+                    if sm_qs[k]['userID__username'] == '':
+                        sm_qs[k]['userID__username'] = sm_qs[k]['userID__userEmail']
+                    if sm_qs[k]['userID__username'] == '':
+                        sm_qs[k]['userID__username'] = sm_qs[k]['userID__phone']
                     sm_qs[k].pop('userID__userEmail')
                     sm_qs[k].pop('userID__phone')
                 return response.json(0, {'datas': list(sm_qs), 'count': count})

Service/TemplateService.py

@@ -65,7 +65,8 @@ class TemplateService:
             'order/querylist',
             'detect/changeStatus',
             # 'notify/push',
-            'equipment/flowUpdate'
+            'equipment/flowUpdate',
+            'wechat/authsign',
         ]
         return apiList