github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

perf: 优化 setting 读取，避免遗漏

pull/8225/head^2
ibuler 2022-05-12 11:27:32 +08:00 committed by Jiangjie.Bai
parent c692eed3c6
commit 4f37b2b920
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
apps/settings/api/public.py
View File

@ -41,14 +41,6 @@ class PublicSettingApi(OpenPublicSettingApi):
def get_object(self): def get_object(self):
values = super().get_object() values = super().get_object()
serializer = self.serializer_class()
field_names = list(serializer.fields.keys())
for name in field_names:
if hasattr(settings, name):
values[name] = getattr(settings, name)
values.update({ values.update({
"XPACK_LICENSE_IS_VALID": has_valid_xpack_license(), "XPACK_LICENSE_IS_VALID": has_valid_xpack_license(),
"XPACK_LICENSE_INFO": get_xpack_license_info(), "XPACK_LICENSE_INFO": get_xpack_license_info(),
@ -61,6 +53,15 @@ class PublicSettingApi(OpenPublicSettingApi):
'SECURITY_PASSWORD_SPECIAL_CHAR': settings.SECURITY_PASSWORD_SPECIAL_CHAR, 'SECURITY_PASSWORD_SPECIAL_CHAR': settings.SECURITY_PASSWORD_SPECIAL_CHAR,
}, },
}) })
serializer = self.serializer_class()
field_names = list(serializer.fields.keys())
for name in field_names:
if name in values:
continue
# 提前把异常爆出来
values[name] = getattr(settings, name)
return values return values