更换国内发送通知

controller/index.py

@@ -351,38 +351,38 @@ class oa2RtspStartView(TemplateView):
         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
-
+        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:
-            back = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE). \
-                communicate(timeout=2)
+            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('开始打印------------reprrrrrrrrrr--------except-------')
-            logger.info(repr(e))
-            return repr(e)
-        else:
-            print("back0----", back[0].decode())  # 注意需要进行解码操作，默认输出的是字节
-            print("back1----", back[1].decode())  # back是一个元祖，可以通过元祖取值的方式获取结果
-
-            logger.info(UID)
-            logger.info(back[0].decode())
-            logger.info(back[1].decode())
+            logger.info('------------except__e-------------')
+            logger.info(e)
+        return False
 
-            return str(back[0].decode()) + str(back[1].decode())
+        # try:
+        #     back = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE). \
+        #         communicate(timeout=2)
+        # except Exception as e:
+        #     logger.info('开始打印------------reprrrrrrrrrr--------except-------')
+        #     logger.info(repr(e))
+        #     return repr(e)
+        # else:
+        #     print("back0----", back[0].decode())  # 注意需要进行解码操作，默认输出的是字节
+        #     print("back1----", back[1].decode())  # back是一个元祖，可以通过元祖取值的方式获取结果
+        #
+        #     logger.info(UID)
+        #     logger.info(back[0].decode())
+        #     logger.info(back[1].decode())
+        #
+        #     return str(back[0].decode()) + str(back[1].decode())
             # return True
 
     def runSendStop(self, UID, PWD, MSG):