|
@@ -259,27 +259,27 @@ class RegionView(View):
|
|
token = request_dict.get('token', None)
|
|
token = request_dict.get('token', None)
|
|
time_stamp = request_dict.get('time_stamp', None)
|
|
time_stamp = request_dict.get('time_stamp', None)
|
|
|
|
|
|
- if token and time_stamp and type:
|
|
|
|
- token = int(CommonService.decode_data(token))
|
|
|
|
- time_stamp = int(time_stamp)
|
|
|
|
|
|
+ if not all([token, time_stamp, type]):
|
|
|
|
+ return response.json(444)
|
|
|
|
|
|
- now_time = int(time.time())
|
|
|
|
- distance = now_time - time_stamp
|
|
|
|
|
|
+ token = int(CommonService.decode_data(token))
|
|
|
|
+ time_stamp = int(time_stamp)
|
|
|
|
|
|
- if token != time_stamp or distance > 60000 or distance < -60000: # 为了全球化时间控制在一天内
|
|
|
|
- return response.json(404)
|
|
|
|
|
|
+ now_time = int(time.time())
|
|
|
|
+ distance = now_time - time_stamp
|
|
|
|
|
|
- lang_qs = LanguageModel.objects.filter(lang=type)
|
|
|
|
|
|
+ if token != time_stamp or distance > 60000 or distance < -60000: # 为了全球化时间控制在一天内
|
|
|
|
+ return response.json(404)
|
|
|
|
|
|
- if not lang_qs.exists():
|
|
|
|
- lang_qs = LanguageModel.objects.filter(lang='en')
|
|
|
|
|
|
+ lang_qs = LanguageModel.objects.filter(lang=type)
|
|
|
|
|
|
- lang = lang_qs[0]
|
|
|
|
- country_qs = CountryLanguageModel.objects.filter(language_id=lang.id).values('country_name', 'country__number')
|
|
|
|
|
|
+ if not lang_qs.exists():
|
|
|
|
+ lang_qs = LanguageModel.objects.filter(lang='en')
|
|
|
|
|
|
- return response.json(0, list(country_qs))
|
|
|
|
- else:
|
|
|
|
- return response.json(444)
|
|
|
|
|
|
+ lang = lang_qs[0]
|
|
|
|
+ country_qs = CountryLanguageModel.objects.filter(language_id=lang.id).values('country_name', 'country__number',
|
|
|
|
+ 'country__region__api')
|
|
|
|
+ return response.json(0, list(country_qs))
|
|
|
|
|
|
def get_country_info(self, userID, request_dict, response):
|
|
def get_country_info(self, userID, request_dict, response):
|
|
# perm = ModelService.check_perm_uid_manage(userID, 0)
|
|
# perm = ModelService.check_perm_uid_manage(userID, 0)
|