Parcourir la source

修改通过alexa app连接状态

locky il y a 1 an
Parent
commit
b7120fc1bb
2 fichiers modifiés avec 11 ajouts et 2 suppressions
  1. 9 1
      Controller/alexa/AlexaController.py
  2. 2 1
      Model/models.py

+ 9 - 1
Controller/alexa/AlexaController.py

@@ -163,6 +163,14 @@ class AppToAppView(View):
                         alexa_oauth_qs.update(link_status=0)
                         alexa_oauth_qs.update(link_status=0)
                     else:
                     else:
                         res_data = eval(r.content)
                         res_data = eval(r.content)
+                # 连接状态为2,token失效,已连接
+                elif link_status == 2:
+                    res_data = {
+                        'accountLink': {
+                            'status': 'LINKED'
+                        },
+                        'status': 'ENABLED'
+                    }
             return response.json(0, res_data)
             return response.json(0, res_data)
         except Exception as e:
         except Exception as e:
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
             return response.json(500, 'error_line:{}, error_msg:{}'.format(e.__traceback__.tb_lineno, repr(e)))
@@ -257,7 +265,7 @@ class AppToAppView(View):
                     # 获取令牌
                     # 获取令牌
                     refresh_token = res['res']['refresh_token']
                     refresh_token = res['res']['refresh_token']
                     redirect_uri += '&token={}&token_type=Bearer&expiration_time=3600'.format(refresh_token)
                     redirect_uri += '&token={}&token_type=Bearer&expiration_time=3600'.format(refresh_token)
-                AlexaOauth.objects.filter(user_id=user_id).update(link_status=1)
+                AlexaOauth.objects.filter(user_id=user_id).update(link_status=2)
             else:
             else:
                 AlexaOauth.objects.filter(user_id=user_id).update(link_status=0)
                 AlexaOauth.objects.filter(user_id=user_id).update(link_status=0)
                 redirect_uri += '&error=access_denied&error_description=The%20user%20denied%20the%20request.%20'
                 redirect_uri += '&error=access_denied&error_description=The%20user%20denied%20the%20request.%20'

+ 2 - 1
Model/models.py

@@ -4266,7 +4266,8 @@ class OpenScreenCampaign(models.Model):
 class AlexaOauth(models.Model):
 class AlexaOauth(models.Model):
     id = models.AutoField(primary_key=True, verbose_name='主键')
     id = models.AutoField(primary_key=True, verbose_name='主键')
     user_id = models.CharField(default='', max_length=32, verbose_name='用户id')
     user_id = models.CharField(default='', max_length=32, verbose_name='用户id')
-    link_status = models.PositiveSmallIntegerField(default=0, verbose_name='连接状态')  # 0: 未连接,1: 已连接
+    # 0: 未连接,1: 从app连接, 2: 从alexa app连接
+    link_status = models.PositiveSmallIntegerField(default=0, verbose_name='连接状态')
     alexa_api_endpoint = models.CharField(default='', max_length=32, verbose_name='alexa_api节点')
     alexa_api_endpoint = models.CharField(default='', max_length=32, verbose_name='alexa_api节点')
     amazon_access_token = models.TextField(default='', verbose_name='亚马逊访问令牌')
     amazon_access_token = models.TextField(default='', verbose_name='亚马逊访问令牌')
     amazon_refresh_token = models.TextField(default='', verbose_name='亚马逊刷新令牌')
     amazon_refresh_token = models.TextField(default='', verbose_name='亚马逊刷新令牌')