|
|
@@ -33,8 +33,7 @@ def user_login(request):
|
|
|
if sub_time < expiration_date:
|
|
|
# 更新此user此设备的token
|
|
|
# token由设备uid、用户名、当前时间hash得来
|
|
|
- device.token = hash(
|
|
|
- device.device_uid + device.user.username + datetime.datetime.now().strftime("%Y%m%d%H%M%S"))
|
|
|
+ device.gen_token()
|
|
|
device.save()
|
|
|
# 登录
|
|
|
user = device.user
|
|
|
@@ -59,9 +58,7 @@ def user_login(request):
|
|
|
# 此时,客户端带来了过期的旧token,现在需要更新旧的token
|
|
|
try:
|
|
|
device = Devices.objects.filter(token__exact=data['token']).get()
|
|
|
- device.token = hash(
|
|
|
- device.device_uid + device.user.username + datetime.datetime.now().strftime(
|
|
|
- "%Y%m%d%H%M%S"))
|
|
|
+ device.gen_token()
|
|
|
device.save()
|
|
|
except Devices.DoesNotExist:
|
|
|
# 新建一个该user的设备
|
|
|
@@ -89,8 +86,7 @@ def create_new_device(user):
|
|
|
device = Devices()
|
|
|
device.user = user
|
|
|
device.device_uid = generate_random_str(100)
|
|
|
- device.token = hash(
|
|
|
- device.device_uid + device.user.username + datetime.datetime.now().strftime("%Y%m%d%H%M%S"))
|
|
|
+ device.gen_token()
|
|
|
device.save()
|
|
|
return device
|
|
|
|