diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index 42ad3d618..2ce822f0f 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -267,7 +267,7 @@ class Config(dict): 'AUTH_CUSTOM_SSO': False, 'AUTH_CUSTOM_SSO_FILE_MD5': '', - 'AUTH_CUSTOM_SSO_QUERY_PARAMS': ['token'], + 'AUTH_CUSTOM_SSO_QUERY_PARAMS': 'token', # 临时密码 'AUTH_TEMP_TOKEN': False, @@ -770,7 +770,7 @@ class Config(dict): 'TRUSTED_IP_SIGN_KEY': '', 'REMOTE_APP_STORE_URL': 'https://apps.fit2cloud.com/jumpserver', - 'LANGUAGES_SUPPORTED': [], + 'LANGUAGES_SUPPORTED': '', } old_config_map = { diff --git a/apps/jumpserver/settings/auth.py b/apps/jumpserver/settings/auth.py index 1fa94fec0..cb8cff8e3 100644 --- a/apps/jumpserver/settings/auth.py +++ b/apps/jumpserver/settings/auth.py @@ -373,4 +373,4 @@ if AUTH_CUSTOM_SSO and AUTH_CUSTOM_SSO_FILE_MD5: if md5 != get_file_md5(AUTH_CUSTOM_SSO_FILE_PATH): # 如果启用了自定义 SSO 认证,但文件 MD5 不匹配,则不启用自定义 SSO 认证 AUTH_CUSTOM_SSO = False -AUTH_CUSTOM_SSO_QUERY_PARAMS = CONFIG.AUTH_CUSTOM_SSO_QUERY_PARAMS \ No newline at end of file +AUTH_CUSTOM_SSO_QUERY_PARAMS = [q.strip() for q in CONFIG.AUTH_CUSTOM_SSO_QUERY_PARAMS.split(',')] \ No newline at end of file diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py index 2041ace64..0ba2f2c42 100644 --- a/apps/jumpserver/settings/custom.py +++ b/apps/jumpserver/settings/custom.py @@ -299,4 +299,4 @@ SMALL_LOGO_MODE = CONFIG.SMALL_LOGO_MODE REMOTE_APP_STORE_URL = CONFIG.REMOTE_APP_STORE_URL -LANGUAGES_SUPPORTED = CONFIG.LANGUAGES_SUPPORTED \ No newline at end of file +LANGUAGES_SUPPORTED = [code.strip() for code in CONFIG.LANGUAGES_SUPPORTED.split(',')] \ No newline at end of file