|
@@ -11,25 +11,33 @@
|
|
|
@file: UserController.py
|
|
|
@Contact: chanjunkai@163.com
|
|
|
"""
|
|
|
+import base64
|
|
|
import datetime
|
|
|
-import traceback
|
|
|
-import time
|
|
|
import logging
|
|
|
+import random
|
|
|
+import time
|
|
|
+import traceback
|
|
|
+from io import BytesIO
|
|
|
+
|
|
|
import jwt
|
|
|
+import requests
|
|
|
import simplejson
|
|
|
import simplejson as json
|
|
|
-import requests
|
|
|
+from PIL import Image, ImageDraw, ImageFont
|
|
|
from django.contrib.auth.hashers import make_password, check_password # 对密码加密模块
|
|
|
from django.db.models import Q
|
|
|
from django.http import HttpResponseRedirect
|
|
|
+from django.shortcuts import HttpResponse
|
|
|
from django.utils.decorators import method_decorator
|
|
|
from django.utils.timezone import utc
|
|
|
from django.views.decorators.csrf import csrf_exempt
|
|
|
from django.views.generic import TemplateView
|
|
|
+from django.views.generic import View
|
|
|
from jwt.algorithms import RSAAlgorithm
|
|
|
from ratelimit.decorators import ratelimit
|
|
|
|
|
|
from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN, APNS_CONFIG, JPUSH_CONFIG, FCM_CONFIG, TUTK_PUSH_DOMAIN
|
|
|
+from Ansjer.config import BASE_DIR
|
|
|
from Controller.CheckUserData import DataValid, date_handler, RandomStr
|
|
|
from Model.models import Device_User, Role, UidPushModel, UserOauth2Model, UserExModel, Device_Info, UidSetModel, \
|
|
|
UserAppFrequencyModel, CountryIPModel, CountryModel, UidChannelSetModel, Order_Model, UID_Bucket, Unused_Uid_Meal, \
|
|
@@ -39,17 +47,10 @@ from Object.AliSmsObject import AliSmsObject
|
|
|
from Object.RedisObject import RedisObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
|
+from Object.UVerifyObject import UVerifyObject
|
|
|
from Service.CommonService import CommonService
|
|
|
from Service.ModelService import ModelService
|
|
|
from Service.TemplateService import TemplateService
|
|
|
-from django.views.generic import View
|
|
|
-import base64
|
|
|
-import random
|
|
|
-from io import BytesIO
|
|
|
-from PIL import Image, ImageDraw, ImageFont
|
|
|
-from django.shortcuts import HttpResponse
|
|
|
-from Ansjer.config import BASE_DIR
|
|
|
-from Object.UVerifyObject import UVerifyObject
|
|
|
|
|
|
|
|
|
# 获取验证码
|
|
@@ -2207,6 +2208,13 @@ class InitInfoView(View):
|
|
|
return response.json(904)
|
|
|
else:
|
|
|
return response.json(444, 'push_type')
|
|
|
+ app_type = 1 if push_type == 0 else 2
|
|
|
+ gateway_push_qs = GatewayPush.objects.filter(user_id=userID, m_code=m_code)
|
|
|
+ if gateway_push_qs.exists():
|
|
|
+ gateway_push_qs.update(token_val=token_val, logout=False)
|
|
|
+ else:
|
|
|
+ GatewayPush.objects.create(user_id=userID, app_bundle_id=appBundleId, app_type=app_type,
|
|
|
+ push_type=push_type, token_val=token_val, m_code=m_code, lang=lang, tz=tz)
|
|
|
if m_code:
|
|
|
# 获取设备推送状态
|
|
|
update_dict = {
|