lang před 4 roky
rodič
revize
6dcd0233a9
2 změnil soubory, kde provedl 24 přidání a 4 odebrání
  1. 2 2
      controller/deviceStatus.py
  2. 22 2
      controller/index.py

+ 2 - 2
controller/deviceStatus.py

@@ -88,7 +88,7 @@ class deviceStatus(TemplateView):
     def discover(self,request_dict, response):
         userID = 158943604783713800138000
         # token = 'cGSOD01pi2BICtGd1SVdjegwrVKV1Kmn'
-        token = 'cGSOD01pi2BICtGd1SVdjegwrVKV1Kmn1'
+        token = 'cGSOD01pi2BICtGd1SVdjegwrVKV1Kmn'
         alexAuth = AlexaAuthModel.objects.filter(token=token)
         if alexAuth.exists():
             res = alexAuth.values()
@@ -105,7 +105,7 @@ class deviceStatus(TemplateView):
                 token = token,
                 expiresTime = expiresTime,
             )
-            return JsonResponse({'code':200,'msg':res[0]['access_token']})
+        return JsonResponse({'code':200,'msg':'xxx'})
 
 
     def addOrUpdate(self,request_dict, response):

+ 22 - 2
controller/index.py

@@ -23,7 +23,7 @@ from urllib.parse import urlencode
 import subprocess
 import uuid
 # from gevent.pool import Pool
-from model.models import UserModel,UidRtspModel
+from model.models import UserModel,UidRtspModel,AlexaAuthModel
 from object.tkObject import tkObject
 from service.CommonService import CommonService
 from object.RedisObject import RedisObject
@@ -411,7 +411,6 @@ class oa2DiscoveryDevice(TemplateView):
         access_token = request_dict.get("access_token", None)
         region = request_dict.get("region", 'cn')
         logger = logging.getLogger('django')
-
         try:
             user_qs = UserModel.objects.get(access_token=access_token)
         except Exception as e:
@@ -419,6 +418,27 @@ class oa2DiscoveryDevice(TemplateView):
         else:
             response = ResObject()
             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)
             requests_data = {'sid': 'admin', 'sst': 'admin', 'alexa_user_id': userID}
             res = requests.post(url=auth_request_url, data=requests_data)