请求通过测试服务器请求MQTT下发指令

.gitignore

@@ -7,3 +7,4 @@
 /object/__pycache__
 /service/__pycache__
 /__pycache__/*.pyc
+/logs/info.log

azoauth/config.py

@@ -21,8 +21,9 @@ RESP_SERVER_DOMAIN_DATA = {
     'EN1':'3.142.65.168'
 }
 SERVER_PREFIX = 'http://www.dvema.com'
+SERVER_PREFIX_TEST = 'http://test.dvema.com'
 #Easydarwin
-PORT_PREFIX = '8554'
+# PORT_PREFIX = '8554'
 #PORT_PREFIX = '554'
 # PORT_PREFIX = '443'
 #RTSP_PREFIX = 'rtsps'

controller/index.py

@@ -249,8 +249,8 @@ class oa2RtspStartView(TemplateView):
         stream_name = ur_qs[0]['rtsp_url']
 
         RESP_SERVER_DOMAIN = RESP_SERVER_DOMAIN_DATA['EN']
-        MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:{PORT_PREFIX}/{stream_name}'. \
-                format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN, stream_name=stream_name, PORT_PREFIX=PORT_PREFIX,RTSP_PREFIX=RTSP_PREFIX)
+        MSG = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:8554/{stream_name}'. \
+                format(RTSP_PREFIX=RTSP_PREFIX, RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN, stream_name=stream_name)
 
         logger = logging.getLogger('django')
         logger.info('技能名称: {}'.format(app_name))
@@ -263,13 +263,22 @@ class oa2RtspStartView(TemplateView):
             else:
                 return JsonResponse({'msg': 'stop no', 'code': 0})
         # threading.Thread(target=runSendRtspMsg_thread, args=(UID, PWD, MSG)).start()
-        # send_flag = self.runReqRtspMsg(UID, PWD, MSG)
-        send_flag = self.runSendRtspMsg(UID, PWD, MSG)
-        logger.info('开始打印----------send_flag3.0-----------------')
-        logger.info(send_flag)
-        #拉流地址
+        logger.info('------开始向设备下发推流指令------uid:{},密码:{},指令:{}'.format(UID, PWD, MSG))
+        url = '{}/iot/requestPublishMessage'.format(SERVER_PREFIX_TEST)    # 测试服务器
+        requests_data = {'UID': UID, 'MSG': MSG}
+        r = requests.post(url, requests_data)
+        res = r.json()
+        logger.info('请求MQTT发布消息返回状态: ', res['result_code'])
+        if res['result_code'] == 0:
+            logger.info('请求MQTT下发指令成功')
+        elif res['result_code'] == 10043:
+            logger.info('使用tutk下发指令')
+            send_flag = self.runSendRtspMsg(UID, PWD, MSG)
+            logger.info('开始打印---------- send_flag3.0 :{} -----------------'.format(send_flag))
+
+        # 拉流地址
         rtsp_uri = '{RTSP_PREFIX}://{RESP_SERVER_DOMAIN}:443/{stream_name}'. \
-            format(RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN, stream_name=stream_name, RTSP_PREFIX=RTSP_PREFIX)
+                    format(RTSP_PREFIX=RTSP_PREFIX, RESP_SERVER_DOMAIN=RESP_SERVER_DOMAIN, stream_name=stream_name)
         stop_time = int(time.time()) + 2*60
         expirationTime = time.strftime('%Y-%m-%dT%H:%MZ',time.localtime(stop_time))