|
@@ -61,6 +61,7 @@ class DeviceShareView(View):
|
|
UID = request_dict.get('UID', None)
|
|
UID = request_dict.get('UID', None)
|
|
dvqs = Device_Info.objects.filter(UID=UID, userID_id=userID, isShare=False)
|
|
dvqs = Device_Info.objects.filter(UID=UID, userID_id=userID, isShare=False)
|
|
if dvqs.exists():
|
|
if dvqs.exists():
|
|
|
|
+ import time
|
|
data = {'sharer': userID, 'UID': UID}
|
|
data = {'sharer': userID, 'UID': UID}
|
|
share_token = jwt.encode(data, 'jwt.#^^&', algorithm='HS256')
|
|
share_token = jwt.encode(data, 'jwt.#^^&', algorithm='HS256')
|
|
share_url = '{SERVER_DOMAIN}deviceShare/confirm?shareToken={shareToken}' \
|
|
share_url = '{SERVER_DOMAIN}deviceShare/confirm?shareToken={shareToken}' \
|
|
@@ -80,11 +81,8 @@ class DeviceShareView(View):
|
|
dval = Device_Info.objects.filter(userID_id=userID, UID=UID)
|
|
dval = Device_Info.objects.filter(userID_id=userID, UID=UID)
|
|
if not dval.exists():
|
|
if not dval.exists():
|
|
try:
|
|
try:
|
|
- sharerUser = Device_User.objects.get(userID=userID)
|
|
|
|
|
|
+ sharerUser = Device_User.objects.get(userID=sharer)
|
|
sharerDvqs = Device_Info.objects.get(userID_id=sharer, UID=UID)
|
|
sharerDvqs = Device_Info.objects.get(userID_id=sharer, UID=UID)
|
|
- except Exception as e:
|
|
|
|
- return response.json(10, repr(e))
|
|
|
|
- else:
|
|
|
|
sharerDvqs.id = CommonService.getUserID(getUser=False)
|
|
sharerDvqs.id = CommonService.getUserID(getUser=False)
|
|
sharerDvqs.userID_id = userID
|
|
sharerDvqs.userID_id = userID
|
|
sharerDvqs.isShare = True
|
|
sharerDvqs.isShare = True
|
|
@@ -97,9 +95,13 @@ class DeviceShareView(View):
|
|
primaryMaster = sharerUser.phone
|
|
primaryMaster = sharerUser.phone
|
|
else:
|
|
else:
|
|
return response.json(178)
|
|
return response.json(178)
|
|
|
|
+ print(primaryMaster)
|
|
sharerDvqs.primaryMaster = primaryMaster
|
|
sharerDvqs.primaryMaster = primaryMaster
|
|
sharerDvqs.data_joined = None
|
|
sharerDvqs.data_joined = None
|
|
sharerDvqs.save()
|
|
sharerDvqs.save()
|
|
|
|
+ except Exception as e:
|
|
|
|
+ return response.json(10, repr(e))
|
|
|
|
+ else:
|
|
return response.json(0)
|
|
return response.json(0)
|
|
else:
|
|
else:
|
|
return response.json(174)
|
|
return response.json(174)
|
|
@@ -114,21 +116,18 @@ class DeviceShareView(View):
|
|
if UID is not None:
|
|
if UID is not None:
|
|
# 查询分享获得的用户
|
|
# 查询分享获得的用户
|
|
qs = Device_Info.objects.filter(UID=UID, isShare=True, primaryUserID=userID). \
|
|
qs = Device_Info.objects.filter(UID=UID, isShare=True, primaryUserID=userID). \
|
|
- values('userID__NickName',
|
|
|
|
- 'userID__username',
|
|
|
|
- 'userID__userEmail',
|
|
|
|
- 'userID__phone',
|
|
|
|
- 'id')
|
|
|
|
|
|
+ values('userID__NickName', 'userID__username', 'userID__userEmail', 'userID__phone', 'id')
|
|
data = []
|
|
data = []
|
|
|
|
+ # print(qs)
|
|
for q in qs:
|
|
for q in qs:
|
|
d = {'id': q['id']}
|
|
d = {'id': q['id']}
|
|
- if not q['userID_NickName']:
|
|
|
|
- d['user'] = q['userID_NickName']
|
|
|
|
- elif not q['userID__username']:
|
|
|
|
|
|
+ if q['userID__NickName']:
|
|
|
|
+ d['user'] = q['userID__NickName']
|
|
|
|
+ elif q['userID__username']:
|
|
d['user'] = q['userID__username']
|
|
d['user'] = q['userID__username']
|
|
- elif not q['userID__userEmail']:
|
|
|
|
|
|
+ elif q['userID__userEmail']:
|
|
d['user'] = q['userID__userEmail']
|
|
d['user'] = q['userID__userEmail']
|
|
- elif not q['userID__phone']:
|
|
|
|
|
|
+ elif q['userID__phone']:
|
|
d['user'] = q['userID__phone']
|
|
d['user'] = q['userID__phone']
|
|
data.append(d)
|
|
data.append(d)
|
|
return response.json(0, data)
|
|
return response.json(0, data)
|