|
|
@@ -313,15 +313,15 @@ class RegionView(View):
|
|
|
|
|
|
# 根据app名返回相应域名
|
|
|
app_name = app_inf_qs[0]['appName']
|
|
|
- country_qs = CountryLanguageModel.objects.filter(language_id=lang.id).annotate(
|
|
|
- country_id=F('country__id'), push_api=F('country__region__push_api'))
|
|
|
+ country_qs = CountryLanguageModel.objects.filter(language_id=lang.id).\
|
|
|
+ annotate(push_api=F('country__region__push_api'))
|
|
|
if 'Zosi' in app_name:
|
|
|
country_qs = country_qs.annotate(api=F('country__region__zosi_api'))
|
|
|
elif 'Loocam' in app_name:
|
|
|
country_qs = country_qs.annotate(api=F('country__region__loocam_api'))
|
|
|
else:
|
|
|
country_qs = country_qs.annotate(api=F('country__region__api'))
|
|
|
- country_qs = country_qs.values('country_name', 'country_id', 'api', 'push_api')
|
|
|
+ country_qs = country_qs.values('country_id', 'country_name', 'api', 'push_api')
|
|
|
return response.json(0, list(country_qs))
|
|
|
except Exception as e:
|
|
|
return response.json(500, repr(e))
|
