|
@@ -386,7 +386,7 @@ class oa2RtspStartView(TemplateView):
|
|
|
url = "http://52.83.252.41:7880/alexa/command?command={command}".format(command=command)
|
|
url = "http://52.83.252.41:7880/alexa/command?command={command}".format(command=command)
|
|
|
# 请求国内服务器调用pushtool
|
|
# 请求国内服务器调用pushtool
|
|
|
try:
|
|
try:
|
|
|
- requests.get(url=url, timeout=2)
|
|
|
|
|
|
|
+ requests.get(url=url, timeout=10)
|
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
logger.info('请求国内服务器调用pushtool异常: {}'.format(repr(e)))
|
|
logger.info('请求国内服务器调用pushtool异常: {}'.format(repr(e)))
|
|
|
else:
|
|
else:
|
|
@@ -765,7 +765,7 @@ class powerController(TemplateView):
|
|
|
logger = logging.getLogger('django')
|
|
logger = logging.getLogger('django')
|
|
|
logger.info('{} 控制插座 {}'.format(skill_name, serial_number))
|
|
logger.info('{} 控制插座 {}'.format(skill_name, serial_number))
|
|
|
# 请求MQTT发布消息
|
|
# 请求MQTT发布消息
|
|
|
- url = '{}/api/loocam/open/socket/alexa-socket-switch'.format(SERVER_PREFIX) # 测试服务器
|
|
|
|
|
|
|
+ url = '{}/api/loocam/open/socket/alexa-socket-switch'.format(SERVER_PREFIX) # 国外服务器
|
|
|
requests_data = {'serial_number': serial_number, 'power_controller': power_controller} # TurnOn, TurnOff
|
|
requests_data = {'serial_number': serial_number, 'power_controller': power_controller} # TurnOn, TurnOff
|
|
|
r = requests.post(url, requests_data)
|
|
r = requests.post(url, requests_data)
|
|
|
if r.status_code != 200:
|
|
if r.status_code != 200:
|
peng