Merge branch 'pzb' of http://192.168.136.45:3000/SERVER/AnsjerServer into pzb

Controller/DetectController.py

@@ -154,13 +154,13 @@ class DetectControllerView(View):
         if not all([appBundleId, app_type, token_val, uid, m_code]):
             return response.json(444, 'appBundleId,app_type,token_val,uid,m_code')
         # 判断推送类型对应key是否存在
-        if push_type == 0:
+        if push_type == '0':
             if appBundleId not in APNS_CONFIG.keys():
                 return response.json(904)
-        elif push_type == 1:
+        elif push_type == '1':
             if appBundleId not in FCM_CONFIG.keys():
                 return response.json(904)
-        elif push_type == 2:
+        elif push_type == '2':
             if appBundleId not in JPUSH_CONFIG.keys():
                 return response.json(904)
         else:

Controller/DeviceShare.py

@@ -12,18 +12,18 @@
 @Contact: chanjunkai@163.com
 """
 
+import json
+import time
+
 from django.views.generic.base import View
 
+from Ansjer.config import SERVER_DOMAIN
 from Model.models import Device_Info, Device_User
+from Model.models import UID_Bucket
+from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
-from Ansjer.config import SERVER_DOMAIN
-import jwt
 from Service.CommonService import CommonService
-from Model.models import UID_Bucket
-from Object.RedisObject import RedisObject
-import time
-import json
 
 
 class DeviceShareView(View):
@@ -107,7 +107,7 @@ class DeviceShareView(View):
                 UID = data.get('UID', None)
                 sharerDvqs = Device_Info.objects.filter(userID_id=sharer, UID=UID, isShare=False). \
                     values('NickName', 'Type')
-                if sharerDvqs:
+                if sharerDvqs.exists():
                     sharerDuqs = Device_User.objects.filter(userID=sharer).values('username', 'userEmail', 'phone')
                     if sharerDuqs[0]['username']:
                         share_user = sharerDuqs[0]['username']

Service/CommonService.py

@@ -197,6 +197,8 @@ class CommonService:
     # 获取当前时间
     @staticmethod
     def get_now_time_str(n_time, tz):
-        n_time = n_time + 3600 * float(tz)
+        n_time = int(n_time)
+        if tz:
+            n_time = n_time + 3600 * float(tz)
         n_date = time.strftime('%Y-%m-%d %H:%M:%S', time.gmtime(int(n_time)))
         return n_date