AlexaAuthModel表增加skill_name字段,认证登录保存skill_name信息;修改ALEXA_EVENT_API配置

azoauth/config.py

@@ -29,8 +29,8 @@ SERVER_PREFIX_TEST = 'http://test.zositechc.cn'
 #RTSP_PREFIX = 'rtsps'
 RTSP_PREFIX = 'rtsp'
 ALEXA_EVENT_API = {
-    #美洲
-    'NA': 'https://api.amazonalexa.com/v3/events',
-    #欧洲
+    # 美洲
+    'US': 'https://api.amazonalexa.com/v3/events',
+    # 欧洲
     'EU': 'https://api.eu.amazonalexa.com/v3/events'
 }

controller/deviceStatus.py

@@ -51,9 +51,9 @@ class deviceStatus(TemplateView):
     def validation(self, request_dict, request, operation):
         response = ResponseObject()
         if operation is None:
-            return JsonResponse({'code':404,'msg':'not found'})
+            return JsonResponse({'code': 404, 'msg': 'not found'})
         if operation == 'saveAccessToken':
-            return self.saveAccessToken(request_dict, response)
+            return self.saveAccessToken(request_dict)
         if operation == 'getAccessToken':
             return self.getAccessToken(request_dict, response)
         if operation == 'addOrUpdate':
@@ -64,11 +64,14 @@ class deviceStatus(TemplateView):
             return self.delete(request_dict)
         if operation == 'stopPush':
             return self.notifiesDeviceStopPush(request_dict, response)
-    def saveAccessToken(self,request_dict, response):
-        access_token = request_dict.get("access_token", '')
-        refresh_token = request_dict.get("refresh_token", '')
+
+    def saveAccessToken(self, request_dict):
         token = request_dict.get("token", '')
         alexa_region = request_dict.get("region", '')
+        skill_name = request_dict.get("skill_name", '')
+        access_token = request_dict.get("access_token", '')
+        refresh_token = request_dict.get("refresh_token", '')
+
         logger = logging.getLogger('django')
         logger.info('login-------------begin---token')
         logger.info(access_token)
@@ -77,24 +80,26 @@ class deviceStatus(TemplateView):
         nowTime = int(time.time())
         if not alexAuth.exists():
             AlexaAuthModel.objects.create(
-                access_token = access_token,
-                refresh_token = refresh_token,
-                token = token,
-                expiresTime = nowTime + 3200,
+                token=token,
                 addTime=nowTime,
                 updTime=nowTime,
+                skill_name=skill_name,
                 alexa_region=alexa_region,
+                access_token=access_token,
+                refresh_token=refresh_token,
+                expiresTime=nowTime + 3200,
             )
         else:
             alexAuth.update(
-                access_token = access_token,
-                refresh_token = refresh_token,
-                expiresTime = nowTime + 3200,
-                token = token,
+                token=token,
                 updTime=nowTime,
+                skill_name=skill_name,
                 alexa_region=alexa_region,
+                access_token=access_token,
+                refresh_token=refresh_token,
+                expiresTime=nowTime + 3200,
             )
-        return JsonResponse({'code':200,'msg':'success'})
+        return JsonResponse({'code': 200, 'msg': 'success'})
 
     def getAccessToken(self,request_dict, response):
         logger = logging.getLogger('django')

model/models.py

@@ -44,7 +44,8 @@ class UidRtspModel(models.Model):
 
 class AlexaAuthModel(models.Model):
     id = models.AutoField(primary_key=True)
-    userID = models.CharField(blank=True, max_length=32,verbose_name=u'用户ID',default='', unique=False)
+    skill_name = models.CharField(max_length=32, default='', verbose_name=u'skill名称')
+    userID = models.CharField(blank=True, max_length=32,verbose_name=u'用户ID', default='', unique=False)
     access_token = models.CharField(max_length=150, unique=False, default='', verbose_name='访问令牌')
     refresh_token = models.CharField(max_length=150, unique=False, default='', verbose_name='刷新令牌')
     token = models.CharField(max_length=150, unique=False, default='', verbose_name='区分用户token')