Browse Source

用户表增加用户地区选择状态

peng 2 years ago
parent
commit
16b135c0e0
2 changed files with 5 additions and 4 deletions
  1. 1 0
      Model/models.py
  2. 4 4
      Object/TokenObject.py

+ 1 - 0
Model/models.py

@@ -183,6 +183,7 @@ class Device_User(AbstractBaseUser):
     is_local = models.BooleanField(blank=True, default=False, verbose_name=u'是否是本地登录用户')  # False:账号登录,1:本地登录
     is_local = models.BooleanField(blank=True, default=False, verbose_name=u'是否是本地登录用户')  # False:账号登录,1:本地登录
     subscribe_email = models.SmallIntegerField(default=0, verbose_name=u'是否订阅营销邮件')  # 0:未订阅,1:订阅,2:不订阅
     subscribe_email = models.SmallIntegerField(default=0, verbose_name=u'是否订阅营销邮件')  # 0:未订阅,1:订阅,2:不订阅
     region_country = models.IntegerField(blank=True, default=0, verbose_name='关联tb_country表id')
     region_country = models.IntegerField(blank=True, default=0, verbose_name='关联tb_country表id')
+    region_status = models.BooleanField(blank=True, default=True, verbose_name='地区选择状态')  # 0:未选, 1:已选
     objects = UserManager()
     objects = UserManager()
 
 
     USERNAME_FIELD = 'userID'  # 必须有一个唯一标识
     USERNAME_FIELD = 'userID'  # 必须有一个唯一标识

+ 4 - 4
Object/TokenObject.py

@@ -74,18 +74,18 @@ class TokenObject:
                 algorithm='HS256')
                 algorithm='HS256')
 
 
             res = {
             res = {
-                'access_token': access_token,
+                'access_token': access_token.decode('utf-8'),
                 'access_expire': access_expire,
                 'access_expire': access_expire,
                 'refresh_expire': refresh_expire,
                 'refresh_expire': refresh_expire,
-                'refresh_token': refresh_token,
+                'refresh_token': refresh_token.decode('utf-8'),
             }
             }
 
 
             if self.returntpye=='pc':
             if self.returntpye=='pc':
                 res = {
                 res = {
-                    'token': access_token,
+                    'token': access_token.decode('utf-8'),
                     'access_expire': access_expire,
                     'access_expire': access_expire,
                     'refresh_expire': refresh_expire,
                     'refresh_expire': refresh_expire,
-                    'refresh_token': refresh_token,
+                    'refresh_token': refresh_token.decode('utf-8'),
                 }
                 }
 
 
         except Exception as e:
         except Exception as e: