|
@@ -1,4 +1,3 @@
|
|
-import datetime
|
|
|
|
import logging
|
|
import logging
|
|
import jwt
|
|
import jwt
|
|
import time
|
|
import time
|
|
@@ -6,7 +5,7 @@ import requests
|
|
|
|
|
|
from Object.RedisObject import RedisObject
|
|
from Object.RedisObject import RedisObject
|
|
from Ansjer.config import OAUTH_ACCESS_TOKEN_SECRET, OAUTH_REFRESH_TOKEN_SECRET, OAUTH_ACCESS_TOKEN_TIME, \
|
|
from Ansjer.config import OAUTH_ACCESS_TOKEN_SECRET, OAUTH_REFRESH_TOKEN_SECRET, OAUTH_ACCESS_TOKEN_TIME, \
|
|
- OAUTH_REFRESH_TOKEN_TIME, CONFIG_INFO, CONFIG_TEST, CONFIG_CN, DETECT_PUSH_DOMAINS, LOGGER
|
|
|
|
|
|
+ OAUTH_REFRESH_TOKEN_TIME, DETECT_PUSH_DOMAINS, LOGGER
|
|
|
|
|
|
logger = logging.getLogger('token')
|
|
logger = logging.getLogger('token')
|
|
|
|
|
|
@@ -140,12 +139,8 @@ class TokenObject:
|
|
if data is None:
|
|
if data is None:
|
|
data = {}
|
|
data = {}
|
|
try:
|
|
try:
|
|
- if CONFIG_INFO == CONFIG_TEST or CONFIG_INFO == CONFIG_CN:
|
|
|
|
- access_expire = int(datetime.timedelta(days=60).total_seconds())
|
|
|
|
- refresh_expire = int(datetime.timedelta(days=60).total_seconds())
|
|
|
|
- else:
|
|
|
|
- access_expire = int(OAUTH_ACCESS_TOKEN_TIME.total_seconds())
|
|
|
|
- refresh_expire = int(OAUTH_REFRESH_TOKEN_TIME.total_seconds())
|
|
|
|
|
|
+ access_expire = int(OAUTH_ACCESS_TOKEN_TIME.total_seconds())
|
|
|
|
+ refresh_expire = int(OAUTH_REFRESH_TOKEN_TIME.total_seconds())
|
|
now_stamp = int(time.time())
|
|
now_stamp = int(time.time())
|
|
access_data = data
|
|
access_data = data
|
|
refresh_data = data
|
|
refresh_data = data
|