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

Ansjer/config.py

@@ -349,25 +349,25 @@ FCM_CONFIG = {
 }
 APNS_CONFIG = {
     'com.ansjer.loocamccloud': {
-        'pem_path': 'Ansjer/file/apns_pem/lcc-dev.pem',
+        'pem_path': 'AnsjerPush/file/apns_pem/lcc-dev.pem',
     },
     'com.ansjer.zosidcloud': {
-        'pem_path': 'Ansjer/file/apns_pem/zosidcloud-dev.pem',
+        'pem_path': 'AnsjerPush/file/apns_pem/zosidcloud-dev.pem',
     },
     'com.ansjer.customizedb': {
-        'pem_path': 'Ansjer/file/apns_pem/customizedb-dev.pem',
+        'pem_path': 'AnsjerPush/file/apns_pem/customizedb-dev.pem',
     },
     'com.ansjer.customizeda': {
-        'pem_path': 'Ansjer/file/apns_pem/customizeda-dev.pem',
+        'pem_path': 'AnsjerPush/file/apns_pem/customizeda-dev.pem',
     },
     'com.ansjer.zccloud': {
-        'pem_path': 'Ansjer/file/apns_pem/zccloud-dev.pem',
+        'pem_path': 'AnsjerPush/file/apns_pem/zccloud-dev.pem',
     },
     'com.ansjer.accloud': {
-        'pem_path': 'Ansjer/file/apns_pem/accloud-dev.pem',
+        'pem_path': 'AnsjerPush/file/apns_pem/accloud-dev.pem',
     },
     'com.ansjer.customizedc':{
-        'pem_path': 'Ansjer/file/apns_pem/customizedc.pem',
+        'pem_path': 'AnsjerPush/file/apns_pem/customizedc.pem',
     }
 }
 APNS_MODE = 'dev'

Controller/SerialNumberController.py

@@ -44,12 +44,14 @@ class SerialNumberView(View):
             return self.do_attach_uid(request_dict, response, request)
         elif operation == 'detachUID':
             return self.do_detach_uid(request_dict, response)
+        elif operation == 'create':
+            return self.do_create(request_dict, response)
         else:
             if token.code != 0:
                 return response.json(token.code)
 
-            if operation == 'create':
-                return self.do_create(request_dict, response)
+            # if operation == 'create':
+            #     return self.do_create(request_dict, response)
             elif operation == 'list':
                 return self.do_list(token.userID, request_dict, response)
             elif operation == 'update':