a

controller/index.py

@@ -27,7 +27,6 @@ from object.RedisObject import RedisObject
 from azoauth.config import *
 
 
-
 class authView(TemplateView):
     def post(self, request, *args, **kwargs):
         request.encoding = 'utf-8'
@@ -79,7 +78,7 @@ class loginHandleView(TemplateView):
         # 返回code
         print(user)
         print(pwd)
-        auth_request_url = '{SERVER_PREFIX}/oalexa/auth'.\
+        auth_request_url = '{SERVER_PREFIX}/oalexa/auth'. \
             format(SERVER_PREFIX=SERVER_PREFIX)
         print(auth_request_url)
         # auth_request_url = 'http://192.168.136.40:8077/oalexa/auth'
@@ -214,7 +213,7 @@ class oa2RtspStartView(TemplateView):
         if user_qs.exists():
             print('select by mysql data')
             # userID = user_qs[0].userID
-            ur_qs = UidRtspModel.objects.filter(uid=id).values('uid', 'nick', 'rtsp_url', 'password','region')
+            ur_qs = UidRtspModel.objects.filter(uid=id).values('uid', 'nick', 'rtsp_url', 'password', 'region')
             # ur_qs = UidRtspModel.objects.filter(usermodel__userID=userID,uid=)
             UID = ur_qs[0]['uid']
             region = ur_qs[0]['region']
@@ -259,7 +258,7 @@ class oa2RtspStartView(TemplateView):
                 'protocols': ['RTSP'],
                 'authorizationTypes': ['NONE'],
                 'uri': rtsp_uri,
-                'msg':send_flag
+                'msg': send_flag
             }
             # time.sleep(1.5)
             redisObj.set_data(key=key, val=str(res_json), expire=60)
@@ -268,31 +267,32 @@ class oa2RtspStartView(TemplateView):
             return JsonResponse({'msg': 'wrong'})
 
     def runReqRtspMsg(self, UID, PWD, MSG):
-        request_url = 'http://localhost:5000/?UID={UID}&MSG={MSG}&CMD=1&PWD={PWD}'.\
-            format(UID=UID,PWD=PWD,MSG=MSG)
+        request_url = 'http://localhost:5000/?UID={UID}&MSG={MSG}&CMD=1&PWD={PWD}'. \
+            format(UID=UID, PWD=PWD, MSG=MSG)
         res = requests.get(url=request_url)
         print(res)
         return True
+
     def runSendRtspMsg(self, UID, PWD, MSG):
         # return True
         command = "./pushtool {UID} {PWD} {MSG} 1".format(UID=UID, PWD=PWD, MSG=MSG)
         print('command=>{command}'.format(command=command))
         try:
-            back = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).\
+            back = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE). \
                 communicate(timeout=10)
         except Exception as e:
             return repr(e)
         else:
             print("back0----", back[0].decode())  # 注意需要进行解码操作，默认输出的是字节
             print("back1----", back[1].decode())  # back是一个元祖，可以通过元祖取值的方式获取结果
-            return str(back[0].decode())+str(back[1].decode())
+            return str(back[0].decode()) + str(back[1].decode())
             return True
 
     def runSendStop(self, UID, PWD, MSG):
         command = "./pushtool {UID} {PWD} {MSG} 0".format(UID=UID, PWD=PWD, MSG=MSG)
         print('command=>{command}'.format(command=command))
         try:
-            back = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE).\
+            back = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE). \
                 communicate(timeout=10)
         except Exception as e:
             return False
@@ -338,16 +338,17 @@ class oa2DiscoveryDevice(TemplateView):
                 uid_rtsp_id_list = []
                 for uid_a in uid_arr:
                     uid = uid_a['uid']
+                    if uid_a['region'] == 'CN':
+                        region = 'CN'
+                    else:
+                        region = 'EN'
                     rtsp_url = rtko.encrypt(data=uid)
                     try:
                         uid_rtsp_qs = UidRtspModel.objects.get(uid=uid)
                     except UidRtspModel.DoesNotExist:
-                        uid_rtsp_qs = UidRtspModel.objects.create(uid=uid_a['uid'],
-                                                                  password=uid_a['password'],
-                                                                  nick=uid_a['nick'],
-                                                                  addTime=now_time,
-                                                                  updTime=now_time,
-                                                                  rtsp_url=rtsp_url,
+                        uid_rtsp_qs = UidRtspModel.objects.create(uid=uid_a['uid'], password=uid_a['password'],
+                                                                  nick=uid_a['nick'], addTime=now_time,
+                                                                  updTime=now_time, rtsp_url=rtsp_url,
                                                                   region=region)
                     else:
                         # if uid_rtsp_qs.password != uid_a['password']:

controller/test.py

@@ -1,22 +1,22 @@
-#!/usr/bin/env python3  
-# -*- coding: utf-8 -*-  
-"""
-@Copyright (C) ansjer cop Video Technology Co.,Ltd.All rights reserved.
-@AUTHOR: ASJRD018
-@NAME: azoauth
-@software: PyCharm
-@DATE: 2020/3/6 9:39
-@Version: python3.6
-@MODIFY DECORD:ansjer dev
-@file: test.py
-@Contact: chanjunkai@163.com
-"""
-# !/usr/bin/python3
+import requests
 
-#!/usr/bin/python
-import time
-
-
-print(time.ctime())
-time.sleep(5)
-print(time.ctime())
+# server_host = "https://www.zositech.xyz"
+#
+#
+# res = requests.get(server_host + '/oa2/discoverydevice?area=useast&region=en&access_token=Qd0HMlbALEDhZ1mg5Mw4MeGiYT4gi4FX')
+# print(res.json())
+#
+# import requests
+#
+server_host = "https://www.zositech.xyz"
+#
+post_data = {
+    'area': 'useast',
+    'region': 'en',
+    'access_token': 'Qd0HMlbALEDhZ1mg5Mw4MeGiYT4gi4FX'
+}
+res = requests.post(
+    url=server_host + '/oa2/discoverydevice',
+    data=post_data
+)
+print(res.json())

model/models.py

@@ -29,7 +29,7 @@ class UidRtspModel(models.Model):
     uid = models.CharField(max_length=20, verbose_name=u'设备UID', default='',unique=True)
     password = models.CharField(max_length=32, verbose_name=u'设备密码', default='')
     rtsp_url = models.CharField(max_length=128, verbose_name='rtsp流地址', default='')
-    region = models.CharField(max_length=8, verbose_name='区域', default='cn')
+    region = models.CharField(max_length=8, verbose_name='区域', default='CN')
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)