Selaa lähdekoodia

修改一下路径

pengzhibo168 5 vuotta sitten
vanhempi
commit
83aadfd619
2 muutettua tiedostoa jossa 26 lisäystä ja 2 poistoa
  1. 23 0
      AnsjerPush/config.py
  2. 3 2
      Controller/DetectController.py

+ 23 - 0
AnsjerPush/config.py

@@ -122,6 +122,29 @@ FCM_CONFIG = {
 }
 SERVER_TYPE = os.environ.get('DJANGO_SETTINGS_MODULE')
 
+APNS_CONFIG = {
+    'com.ansjer.loocamccloud': {
+        'pem_path': 'AnsjerPush/file/apns_pem/lcc-dev.pem',
+    },
+    'com.ansjer.zosidcloud': {
+        'pem_path': 'AnsjerPush/file/apns_pem/zosidcloud-dev.pem',
+    },
+    'com.ansjer.customizedb': {
+        'pem_path': 'AnsjerPush/file/apns_pem/customizedb-dev.pem',
+    },
+    'com.ansjer.customizeda': {
+        'pem_path': 'AnsjerPush/file/apns_pem/customizeda-dev.pem',
+    },
+    'com.ansjer.zccloud': {
+        'pem_path': 'AnsjerPush/file/apns_pem/zccloud-dev.pem',
+    },
+    'com.ansjer.accloud': {
+        'pem_path': 'AnsjerPush/file/apns_pem/accloud-dev.pem',
+    }
+}
+APNS_MODE = 'dev'
+REDIS_ADDRESS = '192.168.136.45'
+
 if SERVER_TYPE == 'AnsjerPush.local_settings':
     from AnsjerPush.local_config import *
 elif SERVER_TYPE == 'AnsjerPush.test_settings':

+ 3 - 2
Controller/DetectController.py

@@ -21,7 +21,8 @@ from django.http import JsonResponse
 from django.views.generic.base import View
 from pyfcm import FCMNotification
 
-from AnsjerPush.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN, JPUSH_CONFIG, FCM_CONFIG, APNS_CONFIG, BASE_DIR, APNS_MODE
+from AnsjerPush.config import OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET, DETECT_PUSH_DOMAIN, JPUSH_CONFIG, FCM_CONFIG, \
+    APNS_CONFIG, BASE_DIR, APNS_MODE
 from Model.models import Equipment_Info, UidPushModel, SysMsgModel
 from Object.ETkObject import ETkObject
 from Object.RedisObject import RedisObject
@@ -169,7 +170,7 @@ class NotificationView(View):
                     self.do_fcm(**kwag_args)
                 elif push_type == 2:  # android jpush
                     self.do_jpush(**kwag_args)
-            return JsonResponse(status=200, data={'code': 0, '状态:': push_type})
+            # return JsonResponse(status=200, data={'code': 0, '状态:': push_type})
             # 以下是存库
             userID_id = up["userID_id"]
             int_is_st = int(is_st)