mirror of https://github.com/jumpserver/jumpserver
[Update] 修改settings conf配置
parent
75fb37d247
commit
9b5b48dd1a
|
@ -273,6 +273,19 @@ class Config(dict):
|
|||
if default_value is None:
|
||||
return v
|
||||
tp = type(default_value)
|
||||
# 对bool特殊处理
|
||||
if tp is bool and isinstance(v, str):
|
||||
if v in ("true", "True", "1"):
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
if tp in [list, dict] and isinstance(v, str):
|
||||
try:
|
||||
v = json.loads(v)
|
||||
return v
|
||||
except json.JSONDecodeError:
|
||||
return v
|
||||
|
||||
try:
|
||||
v = tp(v)
|
||||
except Exception:
|
||||
|
@ -289,14 +302,10 @@ class Config(dict):
|
|||
except KeyError:
|
||||
value = None
|
||||
if value is not None:
|
||||
return self.convert_type(item, value)
|
||||
return value
|
||||
# 其次从环境变量来
|
||||
value = os.environ.get(item, None)
|
||||
if value is not None:
|
||||
if value.lower() == 'false':
|
||||
value = False
|
||||
elif value.lower() == 'true':
|
||||
value = True
|
||||
return self.convert_type(item, value)
|
||||
return self.defaults.get(item)
|
||||
|
||||
|
@ -362,6 +371,7 @@ defaults = {
|
|||
'HTTP_LISTEN_PORT': 8080,
|
||||
'LOGIN_LOG_KEEP_DAYS': 90,
|
||||
'ASSETS_PERM_CACHE_TIME': 3600,
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -371,6 +371,8 @@ REST_FRAMEWORK = {
|
|||
'DEFAULT_PARSER_CLASSES': (
|
||||
'rest_framework.parsers.JSONParser',
|
||||
'rest_framework.parsers.FormParser',
|
||||
'rest_framework.parsers.MultiPartParser',
|
||||
'rest_framework.parsers.FileUploadParser',
|
||||
'common.parsers.JMSCSVParser'
|
||||
),
|
||||
'DEFAULT_AUTHENTICATION_CLASSES': (
|
||||
|
|
Loading…
Reference in New Issue