|
@@ -26,7 +26,7 @@ from ratelimit.decorators import ratelimit
|
|
|
|
|
|
from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN
|
|
from Ansjer.config import AuthCode_Expire, SERVER_DOMAIN
|
|
from Controller.CheckUserData import DataValid, date_handler, RandomStr
|
|
from Controller.CheckUserData import DataValid, date_handler, RandomStr
|
|
-from Model.models import Device_User, Role, SysMsgModel, UidPushModel
|
|
|
|
|
|
+from Model.models import Device_User, Role, SysMsgModel, UidPushModel, UidSetModel
|
|
from Object.AWS.SesClassObject import SesClassObject
|
|
from Object.AWS.SesClassObject import SesClassObject
|
|
from Object.AliSmsObject import AliSmsObject
|
|
from Object.AliSmsObject import AliSmsObject
|
|
from Object.RedisObject import RedisObject
|
|
from Object.RedisObject import RedisObject
|
|
@@ -931,7 +931,7 @@ class v2forgetPwdCodeView(TemplateView):
|
|
else:
|
|
else:
|
|
return response.json(10, res["Message"])
|
|
return response.json(10, res["Message"])
|
|
|
|
|
|
- def do_v2_send_phone_code(self,country_code, phone, response):
|
|
|
|
|
|
+ def do_v2_send_phone_code(self, country_code, phone, response):
|
|
data_valid = DataValid()
|
|
data_valid = DataValid()
|
|
if data_valid.mobile_validate(phone) is not True:
|
|
if data_valid.mobile_validate(phone) is not True:
|
|
return response.json(100)
|
|
return response.json(100)
|
|
@@ -954,7 +954,7 @@ class v2forgetPwdCodeView(TemplateView):
|
|
temp_msg = 'SMS_151675019'
|
|
temp_msg = 'SMS_151675019'
|
|
else:
|
|
else:
|
|
temp_msg = 'SMS_172200051'
|
|
temp_msg = 'SMS_172200051'
|
|
- rec_phone = str(country_code)+str(phone)
|
|
|
|
|
|
+ rec_phone = str(country_code) + str(phone)
|
|
res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name='Ansjer',
|
|
res = aliSms.send_code_sms(phone=rec_phone, code=resetCode, sign_name='Ansjer',
|
|
temp_msg=temp_msg)
|
|
temp_msg=temp_msg)
|
|
if res["Code"] == "OK":
|
|
if res["Code"] == "OK":
|
|
@@ -1230,9 +1230,16 @@ class InitInfoView(View):
|
|
|
|
|
|
# 初始化设备token
|
|
# 初始化设备token
|
|
def init_uid(self, request_dict, userID, response):
|
|
def init_uid(self, request_dict, userID, response):
|
|
- # token_val = request_dict.get('token_val', None)
|
|
|
|
- # m_code = request_dict.get('m_code', None)
|
|
|
|
|
|
+ # 未读的系统消息
|
|
sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
|
|
sm_count = SysMsgModel.objects.filter(userID_id=userID, status=0).count()
|
|
|
|
+
|
|
|
|
+ token_val = request_dict.get('token_val', None)
|
|
|
|
+ m_code = request_dict.get('m_code', None)
|
|
|
|
+ push_type = request_dict.get('push_type', None)
|
|
|
|
+ appBundleId = request_dict.get('appBundleId', None)
|
|
|
|
+ if all([token_val, push_type, appBundleId]):
|
|
|
|
+ UidPushModel.objects.filter(userID_id=userID, m_code=m_code). \
|
|
|
|
+ update(token_val=token_val, push_type=push_type)
|
|
res = {
|
|
res = {
|
|
'usmsg': sm_count
|
|
'usmsg': sm_count
|
|
}
|
|
}
|