发送推流指令区分国内外

controller/index.py

@@ -376,27 +376,31 @@ class oa2RtspStartView(TemplateView):
 
     #触发此方法，让摄像头推流到MSG流地址
     def runSendRtspMsg(self, UID, PWD, MSG):
+        region = UidRtspModel.objects.get(uid=UID).region
         # return True
         logger = logging.getLogger('django')
         logger.info('开始打印------------摄像头推流到MSG流地址的结果---------------')
-
         command = "./pushtool {UID} {PWD} {MSG} 1".format(UID=UID, PWD=PWD, MSG=MSG)
         print('command=>{command}'.format(command=command))
-        # command_url = "http://47.115.134.251/index.php?command={command}".format(command=command)
-        # logger.info("-----------command_url={command_url}".format(command_url=command_url))
-        # try:
-        #     logger.info("-----------------开始调用接口")
-        #     exec_res = requests.get(url=command_url, timeout=2)
-        #     res = exec_res.json()
-        #     logger.info('------------调用接口执行发送命令---------------')
-        #     logger.info(res)
-        #     if res['code'] == 200:
-        #         return True
-        # except Exception as e:
-        #     logger.info('------------except__e-------------')
-        #     logger.info(e)
-        # return False
 
+        if region == 'CN':
+            logger.info('------------国内发送推流指令---------------')
+            command_url = "http://47.115.134.251/index.php?command={command}".format(command=command)
+            logger.info("-----------command_url={command_url}".format(command_url=command_url))
+            try:
+                logger.info("-----------------开始调用接口")
+                exec_res = requests.get(url=command_url, timeout=2)
+                res = exec_res.json()
+                logger.info('------------调用接口执行发送命令---------------')
+                logger.info(res)
+                if res['code'] == 200:
+                    return True
+            except Exception as e:
+                logger.info('------------except__e-------------')
+                logger.info(e)
+            return False
+
+        logger.info('------------国外发送推流指令---------------')
         try:
             back = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE). \
                 communicate(timeout=2)