소스 검색

获取用户信息返回夏令时标识

locky 1 년 전
부모
커밋
39addf23c4
2개의 변경된 파일8개의 추가작업 그리고 1개의 파일을 삭제
  1. 7 1
      Controller/UserManger.py
  2. 1 0
      Model/models.py

+ 7 - 1
Controller/UserManger.py

@@ -15,7 +15,7 @@ from Ansjer.config import BASE_DIR, ACCESS_KEY_ID, SECRET_ACCESS_KEY, REGION_NAM
     CONFIG_CN, CONFIG_TEST, LOGGER
 from Ansjer.config import SERVER_DOMAIN
 from Model.models import Role, Device_User, UserOauth2Model, UserExModel, CountryLanguageModel, LanguageModel, App_Info, \
-    IcloudUseDetails
+    IcloudUseDetails, CountryModel
 from Object.ContentSecurityObject import ContentSecurity
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
@@ -97,8 +97,10 @@ class showUserMoreView(TemplateView):
                     country_qs = CountryLanguageModel.objects.filter(country_id=region_country).values(
                         'country__region__api', 'country__region__zosi_api', 'country__region__loocam_api')
                     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名
@@ -122,6 +124,10 @@ class showUserMoreView(TemplateView):
                         values('country_name')
                     sqlDict['datas'][k]['fields']['region'] = region_qs[0]['country_name'] if region_qs.exists() else ''
 
+                    # 夏令时标识
+                    country_qs = CountryModel.objects.filter(id=region_country).values('DST')
+                    sqlDict['datas'][k]['fields']['DST_AREA'] = country_qs[0]['DST'] if country_qs.exists() else 0
+
             # 增加oauth2关联数据
             ua_qs = UserOauth2Model.objects.filter(userID_id=user_id).values_list('authType', flat=True)
             sqlDict['oauth2'] = list(ua_qs)

+ 1 - 0
Model/models.py

@@ -2516,6 +2516,7 @@ class CountryModel(models.Model):
     country_code = models.CharField(max_length=2, default='', verbose_name='国家iso2代码')
     country_name = models.CharField(max_length=20, default='', verbose_name='国家名')
     international_area_code = models.IntegerField(default=0, verbose_name='国际区号')
+    DST = models.SmallIntegerField(default=0, verbose_name='夏令时')
 
     class Meta:
         db_table = 'tb_country'