|
|
@@ -117,8 +117,8 @@ def login_user_v3(request):
|
|
|
# raise ce.TipException(u"非法openid!")
|
|
|
|
|
|
print(phone,openid)
|
|
|
- if phone:
|
|
|
- user = cm.UserInfo.objects.filter(Q(phone=phone)).order_by("-id").first()
|
|
|
+ if phone or unionid:
|
|
|
+ user = cm.UserInfo.objects.filter(Q(phone=phone)|Q(unionid=unionid)).order_by("-id").first()
|
|
|
else:
|
|
|
user = cm.UserInfo.objects.filter(Q(openid=openid)).order_by("-id").first()
|
|
|
if not user:
|
|
|
@@ -133,6 +133,7 @@ def login_user_v3(request):
|
|
|
user.usercode = usercode
|
|
|
user.is_bind = 1
|
|
|
user.username = nickname
|
|
|
+ user.phone = phone
|
|
|
user.unionid = unionid
|
|
|
user.save()
|
|
|
|
|
|
@@ -165,3 +166,33 @@ def bind_user_phone(request):
|
|
|
cm.UserInfo.objects.filter(id=uid).update(phone=phone)
|
|
|
|
|
|
|
|
|
+def get_wxauth_info_v3(request):
|
|
|
+ """
|
|
|
+ """
|
|
|
+ qdata = request.json
|
|
|
+ openid = qdata.get("openid")
|
|
|
+ unionid = qdata.get("unionid")
|
|
|
+ phone = qdata.get("phone")
|
|
|
+ user = None
|
|
|
+ if openid:
|
|
|
+ user = cm.UserInfo.objects.filter(openid=openid).values().first()
|
|
|
+ if phone:
|
|
|
+ user = cm.UserInfo.objects.filter(phone=phone).values().first()
|
|
|
+ if unionid:
|
|
|
+ user = cm.UserInfo.objects.filter(unionid=unionid).values().first()
|
|
|
+ if not user:
|
|
|
+ return {}
|
|
|
+ cur_match_id = ccc.get_signup_match().id
|
|
|
+ gt_time = datetime.timedelta(days=-365)+datetime.datetime.now()
|
|
|
+ player = cm.Player.objects.filter(user_id=user["id"],match_status=1,ctime__gte=gt_time).order_by("-id").first()
|
|
|
+ if player:
|
|
|
+ user["role"] = player.role
|
|
|
+ else:
|
|
|
+ user["role"] = 0
|
|
|
+ if user["comment_status"]==0:
|
|
|
+ user["role"] = 0
|
|
|
+ tstr = "{}_{}{}".format(user["id"],time.time(),random.randint(100000,999999))
|
|
|
+ token = aescbc.encrypt(tstr)
|
|
|
+ user["token"] = token
|
|
|
+ return user
|
|
|
+
|