UserController.py文件（根据输入的lang返回对应的语言）UserManger.py文件（添加api字段）

Controller/UserController.py

@@ -41,7 +41,7 @@ from Ansjer.config import BASE_DIR, CONFIG_US, CONFIG_EUR, CONFIG_INFO, SERVER_D
 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, \
-    GatewayPush
+    GatewayPush, CountryLanguageModel, LanguageModel
 from Object.AWS.SesClassObject import SesClassObject
 from Object.AliSmsObject import AliSmsObject
 from Object.RedisObject import RedisObject
@@ -2046,6 +2046,7 @@ class v3LoginView(TemplateView):
 
         now_time = datetime.datetime.utcnow().replace(tzinfo=utc).astimezone(utc)
         region_country = users['region_country']
+        lang_id = LanguageModel.objects.filter(lang=lang).values('id')
         if not number or number == '0':
             user_qs.update(last_login=now_time, language=response.lang)
         else:
@@ -2056,7 +2057,7 @@ class v3LoginView(TemplateView):
             else:
                 res['status'] = 0
                 user_qs.update(last_login=now_time, language=response.lang, region_country=number)
-        region_qs = CountryModel.objects.filter(id=region_country).values('country_name')
+        region_qs = CountryLanguageModel.objects.filter(country_id=region_country, language_id=lang_id[0]['id']).values('country_name')
 
         res['rid'] = users['role__rid']
         res['roleName'] = users['role__roleName']

Controller/UserManger.py

@@ -16,7 +16,7 @@ from django.views.generic import TemplateView, View
 
 from Ansjer.config import BASE_DIR, SERVER_TYPE, 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
+from Model.models import Role, Device_User, UserOauth2Model, UserExModel, CountryLanguageModel
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
@@ -69,8 +69,16 @@ class showUserMoreView(TemplateView):
             if len(v['fields']['role']):
                 roleName = ModelService.getRole(rid=v['fields']['role'][0])
                 sqlDict["datas"][k]['fields']['rolename'] = roleName
+            region_country = sqlDict["datas"][k]['fields']['region_country']
+            if not region_country == 0:
+                country_qs = CountryLanguageModel.objects.filter(country_id=region_country).values(
+                    'country__region__push_api')
+                sqlDict["datas"][k]['fields']['api'] = country_qs[0]['country__region__push_api']
+            else:
+                sqlDict["datas"][k]['fields']['api'] = ''
+
         # 增加oauth2关联数据
-        ua_qs = UserOauth2Model.objects.filter(userID_id=userID).values_list('authType',flat=True)
+        ua_qs = UserOauth2Model.objects.filter(userID_id=userID).values_list('authType', flat=True)
         sqlDict["oauth2"] = list(ua_qs)
         return response.json(0, sqlDict)
 
@@ -207,7 +215,7 @@ class getAvatarView(TemplateView):
             except Exception as e:
                 print(e)
                 return response.json(500, repr(e))
-        
+
         fullPath = os.path.join(BASE_DIR, "static", filePath).replace('\\', '/')
         if os.path.isfile(fullPath):
             try: