chenjunkai 6 年 前
コミット
a44414eae4

+ 0 - 0
Ansjer/test/thumnber.py


+ 3 - 0
Ansjer/urls.py

@@ -129,6 +129,7 @@ urlpatterns = [
     url(r'^appVer/views$', AppInfo.AppVersionView.as_view()),
 
     url(r'^user/init$', UserController.InitInfoView.as_view()),
+    # 获取时区相关信息
     url(r'^getTZ$', EquipmentStatus.getTZ),
 
     # oss授权
@@ -141,6 +142,8 @@ urlpatterns = [
 
     url(r'^equipment/flowUpdate', EquipmentManager.update_uid_set),
 
+    # 分区分流
+    # url(r'^getTZ$', EquipmentStatus.getTZ),
     # 新的设备接口
     path('Test', Test.Test.as_view()),
     # 路由加参数参考

+ 4 - 5
Controller/DetectController.py

@@ -83,10 +83,10 @@ class DetectControllerView(View):
         uid = request_dict.get('uid', None)
         if uid:
             qs = qs.filter(devUid=uid)
-            dvqs = Device_Info.objects.filter(UID=uid).values('Type','NickName')
+            dvqs = Device_Info.objects.filter(UID=uid).values('Type', 'NickName')
             uid_type_dict = {uid: {'type': dvqs[0]['Type'], 'NickName': dvqs[0]['NickName']}}
         else:
-            dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type','NickName')
+            dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type', 'NickName')
             uid_type_dict = {}
             for dv in dvqs:
                 uid_type_dict[dv['UID']] = {'type': dv['Type'], 'NickName': dv['NickName']}
@@ -255,9 +255,8 @@ class NotificationView(View):
         uid_set_qs = UidSetModel.objects.filter(uid=uid, detect_status=1)
         if uid_set_qs.exists():
             uid_set_id = uid_set_qs[0].id
-            uid_push_qs = UidPushModel.objects.filter(uid_set__id=uid_set_id).values('token_val', 'app_type',
-                                                                                     'appBundleId', 'push_type',
-                                                                                     'userID_id', 'userID__NickName')
+            uid_push_qs = UidPushModel.objects.filter(uid_set__id=uid_set_id). \
+                values('token_val', 'app_type', 'appBundleId', 'push_type', 'userID_id', 'userID__NickName')
             if uid_set_qs.exists():
                 redisObj = RedisObject(db=6)
                 pkey = '{uid}_{channel}_ptl'.format(uid=uid, channel=channel)

+ 1 - 0
Controller/UserController.py

@@ -662,6 +662,7 @@ class v2authCodeView(TemplateView):
         aliSms = AliSmsObject()
         res = aliSms.send_code_sms(phone=phone, code=identifyingCode, sign_name='Ansjer',
                                    temp_msg='SMS_151600991')
+        print(res)
         if res["Code"] == "OK":
             if reds.set_data(key=phone + '_identifyingCode', val=identifyingCode, expire=60) is not True:
                 return response.json(10, '生成缓存系统错误')

+ 32 - 0
Service/ETkObject.py

@@ -0,0 +1,32 @@
+#!/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/6/1 17:25
+@Version: python3.6
+@MODIFY DECORD:ansjer dev
+@file: ETkObject.py
+@Contact: chanjunkai@163.com
+"""
+
+import base64
+import urllib.parse
+
+
+class ETkObject(object):
+    def __init__(self, etk):
+        self.uid = ''
+
+    def parseUid(self, etk):
+        c = base64.b64decode(etk)
+        c = c[2:-2]
+        c = urllib.parse.unquote(c.decode('utf-8'))
+        c = base64.b64decode(c)
+        uid = c.decode('utf-8')
+        if len(uid):
+            return uid
+        else:
+            return False