|
@@ -12,7 +12,7 @@ from django.views.generic import TemplateView, View
|
|
|
|
|
|
from Ansjer.config import BASE_DIR, ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAME, AVATAR_BUCKET
|
|
|
from Ansjer.config import SERVER_DOMAIN
|
|
|
-from Model.models import Role, Device_User, UserOauth2Model, UserExModel, CountryLanguageModel, LanguageModel
|
|
|
+from Model.models import Role, Device_User, UserOauth2Model, UserExModel, CountryLanguageModel, LanguageModel, App_Info
|
|
|
from Object.RedisObject import RedisObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
|
from Object.TokenObject import TokenObject
|
|
@@ -37,6 +37,7 @@ class showUserMoreView(TemplateView):
|
|
|
response = ResponseObject()
|
|
|
token = request_dict.get('token', None)
|
|
|
lang = request_dict.get('lang', 'en')
|
|
|
+ app_bundle_id = request_dict.get('app_bundle_id', None)
|
|
|
|
|
|
tko = TokenObject(token)
|
|
|
response.lang = tko.lang
|
|
@@ -46,14 +47,15 @@ class showUserMoreView(TemplateView):
|
|
|
if not user_id:
|
|
|
return response.json(104)
|
|
|
|
|
|
- return self.show_user_more(user_id, lang, response)
|
|
|
+ return self.show_user_more(user_id, lang, app_bundle_id, response)
|
|
|
|
|
|
@staticmethod
|
|
|
- def show_user_more(user_id, lang, response):
|
|
|
+ def show_user_more(user_id, lang, app_bundle_id, response):
|
|
|
"""
|
|
|
获取用户完整信息
|
|
|
@param user_id: 用户id
|
|
|
@param lang: 语言
|
|
|
+ @param app_bundle_id: app包id
|
|
|
@param response: 响应
|
|
|
@return: response
|
|
|
"""
|
|
@@ -90,6 +92,16 @@ class showUserMoreView(TemplateView):
|
|
|
sqlDict["datas"][k]['fields']['api'] = country_qs[0]['country__region__api']
|
|
|
if region_country == 1: # 中国返回美洲域名
|
|
|
sqlDict["datas"][k]['fields']['api'] = 'https://www.dvema.com/'
|
|
|
+ # 根据app_bundle_id返回对应域名
|
|
|
+ if app_bundle_id:
|
|
|
+ # 查询app名
|
|
|
+ app_inf_qs = App_Info.objects.filter(appBundleId=app_bundle_id).values('appName')
|
|
|
+ if app_inf_qs.exists():
|
|
|
+ app_name = app_inf_qs[0]['appName']
|
|
|
+ if 'Zosi' in app_name:
|
|
|
+ sqlDict['datas'][k]['fields']['api'] = country_qs[0]['country__region__zosi_api']
|
|
|
+ elif 'Loocam' in app_name:
|
|
|
+ sqlDict['datas'][k]['fields']['api'] = country_qs[0]['country__region__loocam_api']
|
|
|
|
|
|
# region数据
|
|
|
region_country = sqlDict['datas'][k]['fields']['region_country']
|