diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index a31a85ec0..f7c555504 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -527,7 +527,6 @@ class Config(dict): 'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False, 'TICKET_AUTHORIZE_DEFAULT_TIME': 7, 'TICKET_AUTHORIZE_DEFAULT_TIME_UNIT': 'day', - 'WINDOWS_SSH_DEFAULT_SHELL': 'cmd', 'PERIOD_TASK_ENABLED': True, # 导航栏 帮助 diff --git a/apps/jumpserver/settings/custom.py b/apps/jumpserver/settings/custom.py index fa6bc398f..62ba143ac 100644 --- a/apps/jumpserver/settings/custom.py +++ b/apps/jumpserver/settings/custom.py @@ -92,7 +92,6 @@ PERM_SINGLE_ASSET_TO_UNGROUP_NODE = CONFIG.PERM_SINGLE_ASSET_TO_UNGROUP_NODE TICKET_AUTHORIZE_DEFAULT_TIME = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME TICKET_AUTHORIZE_DEFAULT_TIME_UNIT = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME_UNIT PERM_EXPIRED_CHECK_PERIODIC = CONFIG.PERM_EXPIRED_CHECK_PERIODIC -WINDOWS_SSH_DEFAULT_SHELL = CONFIG.WINDOWS_SSH_DEFAULT_SHELL FLOWER_URL = CONFIG.FLOWER_URL # Enable internal period task diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 476a01b37..7a733d281 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/apps/locale/zh/LC_MESSAGES/django.po @@ -4454,7 +4454,7 @@ msgstr "云同步记录" #: settings/serializers/cleaning.py:31 msgid "Session keep duration" -msgstr "资产会话日志" +msgstr "会话日志" #: settings/serializers/cleaning.py:32 msgid "" diff --git a/apps/settings/serializers/other.py b/apps/settings/serializers/other.py index c3d2f6b50..42df32496 100644 --- a/apps/settings/serializers/other.py +++ b/apps/settings/serializers/other.py @@ -18,15 +18,6 @@ class OtherSettingSerializer(serializers.Serializer): label=_("OTP valid window") ) - WINDOWS_SSH_DEFAULT_SHELL = serializers.ChoiceField( - choices=[ - ('cmd', _("CMD")), - ('powershell', _("PowerShell")) - ], - label=_('Shell (Windows)'), - help_text=_('The shell type used when Windows assets perform ansible tasks') - ) - PERM_SINGLE_ASSET_TO_UNGROUP_NODE = serializers.BooleanField( required=False, label=_("Perm ungroup node"), help_text=_("Perm single to ungroup node")