|
@@ -80,6 +80,7 @@ class TokenObject:
|
|
|
def generate(self, old_refresh_token=None, data=None):
|
|
|
if data is None:
|
|
|
data = {}
|
|
|
+ now_time = int(time.time())
|
|
|
try:
|
|
|
if CONFIG_INFO == CONFIG_TEST or CONFIG_INFO == CONFIG_CN:
|
|
|
access_expire = int(datetime.timedelta(days=60).total_seconds())
|
|
@@ -128,11 +129,10 @@ class TokenObject:
|
|
|
result = requests.post(push_url, data={'push_token': data['tokenVal'], 'user_id': data['userID'],
|
|
|
'app_bundle_id': app_bundle_id})
|
|
|
LOGGER.info('{}登出推送结果:{}'.format(data['userID'], result.json()))
|
|
|
- now_time = int(time.time())
|
|
|
if old_refresh_token:
|
|
|
token_qs = TokenRecord.objects.filter(refresh_token=old_refresh_token, user_id=data['userID'])
|
|
|
if token_qs.exists():
|
|
|
- token_qs.update(refresh_token=refresh_token, access_token=access_token, update_time=now_time)
|
|
|
+ token_qs.update(refresh_token=refresh_token, access_token=access_token, updated_time=now_time)
|
|
|
else:
|
|
|
TokenRecord.objects.create(access_token=access_token, refresh_token=refresh_token, data=data,
|
|
|
created_time=now_time, updated_time=now_time, user_id=data['userID'])
|
|
@@ -141,7 +141,9 @@ class TokenObject:
|
|
|
created_time=now_time, updated_time=now_time, user_id=data['userID'])
|
|
|
except Exception as e:
|
|
|
self.code = 309
|
|
|
- self.update_token(repr(e))
|
|
|
+ if old_refresh_token:
|
|
|
+ TokenRecord.objects.filter(refresh_token=old_refresh_token, user_id=data['userID']).update(
|
|
|
+ code=self.code, error_info=e, update_time=now_time)
|
|
|
print(repr(e))
|
|
|
else:
|
|
|
self.code = 0
|