|
@@ -23,7 +23,7 @@ from urllib.parse import urlencode
|
|
import subprocess
|
|
import subprocess
|
|
import uuid
|
|
import uuid
|
|
# from gevent.pool import Pool
|
|
# from gevent.pool import Pool
|
|
-from model.models import UserModel,UidRtspModel
|
|
|
|
|
|
+from model.models import UserModel,UidRtspModel,AlexaAuthModel
|
|
from object.tkObject import tkObject
|
|
from object.tkObject import tkObject
|
|
from service.CommonService import CommonService
|
|
from service.CommonService import CommonService
|
|
from object.RedisObject import RedisObject
|
|
from object.RedisObject import RedisObject
|
|
@@ -411,7 +411,6 @@ class oa2DiscoveryDevice(TemplateView):
|
|
access_token = request_dict.get("access_token", None)
|
|
access_token = request_dict.get("access_token", None)
|
|
region = request_dict.get("region", 'cn')
|
|
region = request_dict.get("region", 'cn')
|
|
logger = logging.getLogger('django')
|
|
logger = logging.getLogger('django')
|
|
-
|
|
|
|
try:
|
|
try:
|
|
user_qs = UserModel.objects.get(access_token=access_token)
|
|
user_qs = UserModel.objects.get(access_token=access_token)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
@@ -419,6 +418,27 @@ class oa2DiscoveryDevice(TemplateView):
|
|
else:
|
|
else:
|
|
response = ResObject()
|
|
response = ResObject()
|
|
userID = user_qs.userID
|
|
userID = user_qs.userID
|
|
|
|
+
|
|
|
|
+ #更新事件网关接口
|
|
|
|
+ alexAuth = AlexaAuthModel.objects.filter(token=access_token)
|
|
|
|
+ if alexAuth.exists():
|
|
|
|
+ auth_res = alexAuth.values()
|
|
|
|
+ event_access_token = auth_res[0]['access_token']
|
|
|
|
+ event_refresh_token = auth_res[0]['refresh_token']
|
|
|
|
+ event_token = auth_res[0]['token']
|
|
|
|
+ expiresTime = auth_res[0]['expiresTime']
|
|
|
|
+ AlexaAuthModel.objects.filter(userID = userID).delete()
|
|
|
|
+ alexAuth.delete()
|
|
|
|
+ logger.info('update_event_access_token')
|
|
|
|
+ logger.info(event_token)
|
|
|
|
+ AlexaAuthModel.objects.create(
|
|
|
|
+ userID = userID,
|
|
|
|
+ access_token = event_access_token,
|
|
|
|
+ refresh_token = event_refresh_token,
|
|
|
|
+ token = event_token,
|
|
|
|
+ expiresTime = expiresTime,
|
|
|
|
+ )
|
|
|
|
+
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/discoveryuid'.format(SERVER_PREFIX=SERVER_PREFIX)
|
|
auth_request_url = '{SERVER_PREFIX}/oalexa/discoveryuid'.format(SERVER_PREFIX=SERVER_PREFIX)
|
|
requests_data = {'sid': 'admin', 'sst': 'admin', 'alexa_user_id': userID}
|
|
requests_data = {'sid': 'admin', 'sst': 'admin', 'alexa_user_id': userID}
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|
|
res = requests.post(url=auth_request_url, data=requests_data)
|