[Update] public config 添加超时时间

apps/locale/zh/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Jumpserver 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-11-14 11:36+0800\n"
+"POT-Creation-Date: 2019-11-14 19:29+0800\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: Jumpserver team<ibuler@qq.com>\n"
@@ -73,17 +73,17 @@ msgstr "运行参数"
 
 #: applications/forms/remote_app.py:100 applications/models/remote_app.py:23
 #: applications/templates/applications/remote_app_detail.html:57
-#: applications/templates/applications/remote_app_list.html:22
+#: applications/templates/applications/remote_app_list.html:20
 #: applications/templates/applications/user_remote_app_list.html:18
 #: assets/forms/domain.py:15 assets/forms/label.py:13
 #: assets/models/asset.py:295 assets/models/authbook.py:24
 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:32
 #: assets/serializers/asset_user.py:82 assets/serializers/system_user.py:37
-#: assets/templates/assets/admin_user_list.html:46
+#: assets/templates/assets/admin_user_list.html:44
 #: assets/templates/assets/domain_detail.html:60
-#: assets/templates/assets/domain_list.html:26
+#: assets/templates/assets/domain_list.html:22
 #: assets/templates/assets/label_list.html:16
-#: assets/templates/assets/system_user_list.html:51 audits/models.py:20
+#: assets/templates/assets/system_user_list.html:49 audits/models.py:20
 #: audits/templates/audits/ftp_log_list.html:44
 #: audits/templates/audits/ftp_log_list.html:74
 #: perms/forms/asset_permission.py:84 perms/models/asset_permission.py:80
@@ -96,8 +96,8 @@ msgstr "运行参数"
 #: terminal/templates/terminal/session_list.html:28
 #: terminal/templates/terminal/session_list.html:72
 #: xpack/plugins/change_auth_plan/forms.py:73
-#: xpack/plugins/change_auth_plan/models.py:412
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:46
+#: xpack/plugins/change_auth_plan/models.py:419
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:44
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:54
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:13
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:14
@@ -110,22 +110,22 @@ msgstr "资产"
 
 #: applications/models/remote_app.py:21
 #: applications/templates/applications/remote_app_detail.html:53
-#: applications/templates/applications/remote_app_list.html:20
+#: applications/templates/applications/remote_app_list.html:18
 #: applications/templates/applications/user_remote_app_list.html:16
 #: assets/forms/asset.py:21 assets/forms/domain.py:77 assets/forms/user.py:75
 #: assets/forms/user.py:95 assets/models/base.py:28 assets/models/cluster.py:18
 #: assets/models/cmd_filter.py:21 assets/models/domain.py:20
 #: assets/models/group.py:20 assets/models/label.py:18
 #: assets/templates/assets/admin_user_detail.html:56
-#: assets/templates/assets/admin_user_list.html:44
+#: assets/templates/assets/admin_user_list.html:42
 #: assets/templates/assets/cmd_filter_detail.html:61
-#: assets/templates/assets/cmd_filter_list.html:24
+#: assets/templates/assets/cmd_filter_list.html:22
 #: assets/templates/assets/domain_detail.html:56
 #: assets/templates/assets/domain_gateway_list.html:67
-#: assets/templates/assets/domain_list.html:25
+#: assets/templates/assets/domain_list.html:21
 #: assets/templates/assets/label_list.html:14
 #: assets/templates/assets/system_user_detail.html:58
-#: assets/templates/assets/system_user_list.html:47 ops/models/adhoc.py:37
+#: assets/templates/assets/system_user_list.html:45 ops/models/adhoc.py:37
 #: ops/templates/ops/task_detail.html:60 ops/templates/ops/task_list.html:11
 #: orgs/models.py:12 perms/models/base.py:48
 #: perms/templates/perms/asset_permission_detail.html:62
@@ -152,7 +152,7 @@ msgstr "资产"
 #: users/templates/users/user_profile.html:51
 #: users/templates/users/user_pubkey_update.html:57
 #: xpack/plugins/change_auth_plan/forms.py:56
-#: xpack/plugins/change_auth_plan/models.py:63
+#: xpack/plugins/change_auth_plan/models.py:64
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:61
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:12
 #: xpack/plugins/cloud/models.py:59 xpack/plugins/cloud/models.py:144
@@ -169,7 +169,7 @@ msgstr "名称"
 
 #: applications/models/remote_app.py:28
 #: applications/templates/applications/remote_app_detail.html:61
-#: applications/templates/applications/remote_app_list.html:21
+#: applications/templates/applications/remote_app_list.html:19
 #: applications/templates/applications/user_remote_app_list.html:17
 msgid "App type"
 msgstr "应用类型"
@@ -199,7 +199,7 @@ msgstr "参数"
 #: perms/templates/perms/remote_app_permission_detail.html:90
 #: users/models/user.py:451 users/serializers/group.py:32
 #: users/templates/users/user_detail.html:112
-#: xpack/plugins/change_auth_plan/models.py:108
+#: xpack/plugins/change_auth_plan/models.py:109
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:113
 #: xpack/plugins/cloud/models.py:80 xpack/plugins/cloud/models.py:179
 #: xpack/plugins/gathered_user/models.py:46
@@ -237,23 +237,23 @@ msgstr "创建日期"
 # msgstr "创建日期"
 #: applications/models/remote_app.py:45
 #: applications/templates/applications/remote_app_detail.html:77
-#: applications/templates/applications/remote_app_list.html:23
+#: applications/templates/applications/remote_app_list.html:21
 #: applications/templates/applications/user_remote_app_list.html:19
 #: assets/models/asset.py:176 assets/models/base.py:33
 #: assets/models/cluster.py:29 assets/models/cmd_filter.py:23
 #: assets/models/cmd_filter.py:56 assets/models/domain.py:21
 #: assets/models/domain.py:53 assets/models/group.py:23
 #: assets/models/label.py:23 assets/templates/assets/admin_user_detail.html:72
-#: assets/templates/assets/admin_user_list.html:50
+#: assets/templates/assets/admin_user_list.html:48
 #: assets/templates/assets/asset_detail.html:130
 #: assets/templates/assets/cmd_filter_detail.html:65
-#: assets/templates/assets/cmd_filter_list.html:27
+#: assets/templates/assets/cmd_filter_list.html:25
 #: assets/templates/assets/cmd_filter_rule_list.html:62
 #: assets/templates/assets/domain_detail.html:76
 #: assets/templates/assets/domain_gateway_list.html:72
-#: assets/templates/assets/domain_list.html:28
+#: assets/templates/assets/domain_list.html:24
 #: assets/templates/assets/system_user_detail.html:104
-#: assets/templates/assets/system_user_list.html:55 ops/models/adhoc.py:43
+#: assets/templates/assets/system_user_list.html:53 ops/models/adhoc.py:43
 #: orgs/models.py:18 perms/models/base.py:56
 #: perms/templates/perms/asset_permission_detail.html:102
 #: perms/templates/perms/remote_app_permission_detail.html:94
@@ -264,7 +264,7 @@ msgstr "创建日期"
 #: users/templates/users/user_group_detail.html:67
 #: users/templates/users/user_group_list.html:37
 #: users/templates/users/user_profile.html:138
-#: xpack/plugins/change_auth_plan/models.py:104
+#: xpack/plugins/change_auth_plan/models.py:105
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:117
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:19
 #: xpack/plugins/cloud/models.py:77 xpack/plugins/cloud/models.py:173
@@ -319,7 +319,7 @@ msgstr "远程应用"
 #: users/templates/users/user_profile_update.html:67
 #: users/templates/users/user_pubkey_update.html:74
 #: users/templates/users/user_pubkey_update.html:80
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:71
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:69
 #: xpack/plugins/cloud/templates/cloud/account_create_update.html:33
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:53
 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:44
@@ -362,7 +362,7 @@ msgstr "重置"
 #: users/templates/users/user_password_update.html:76
 #: users/templates/users/user_profile_update.html:68
 #: users/templates/users/user_pubkey_update.html:81
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:72
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:70
 #: xpack/plugins/interface/templates/interface/interface.html:74
 #: xpack/plugins/vault/templates/vault/vault_create.html:46
 msgid "Submit"
@@ -395,25 +395,25 @@ msgid "Detail"
 msgstr "详情"
 
 #: applications/templates/applications/remote_app_detail.html:21
-#: applications/templates/applications/remote_app_list.html:54
+#: applications/templates/applications/remote_app_list.html:52
 #: assets/templates/assets/_asset_user_list.html:75
 #: assets/templates/assets/admin_user_detail.html:24
-#: assets/templates/assets/admin_user_list.html:26
-#: assets/templates/assets/admin_user_list.html:74
+#: assets/templates/assets/admin_user_list.html:24
+#: assets/templates/assets/admin_user_list.html:72
 #: assets/templates/assets/asset_detail.html:26
 #: assets/templates/assets/asset_list.html:78
 #: assets/templates/assets/asset_list.html:167
 #: assets/templates/assets/cmd_filter_detail.html:29
-#: assets/templates/assets/cmd_filter_list.html:58
+#: assets/templates/assets/cmd_filter_list.html:56
 #: assets/templates/assets/cmd_filter_rule_list.html:86
 #: assets/templates/assets/domain_detail.html:24
 #: assets/templates/assets/domain_detail.html:103
 #: assets/templates/assets/domain_gateway_list.html:97
-#: assets/templates/assets/domain_list.html:54
+#: assets/templates/assets/domain_list.html:50
 #: assets/templates/assets/label_list.html:39
 #: assets/templates/assets/system_user_detail.html:26
-#: assets/templates/assets/system_user_list.html:29
-#: assets/templates/assets/system_user_list.html:81 audits/models.py:34
+#: assets/templates/assets/system_user_list.html:27
+#: assets/templates/assets/system_user_list.html:79 audits/models.py:34
 #: perms/templates/perms/asset_permission_detail.html:30
 #: perms/templates/perms/asset_permission_list.html:178
 #: perms/templates/perms/remote_app_permission_detail.html:30
@@ -443,21 +443,21 @@ msgid "Update"
 msgstr "更新"
 
 #: applications/templates/applications/remote_app_detail.html:25
-#: applications/templates/applications/remote_app_list.html:55
+#: applications/templates/applications/remote_app_list.html:53
 #: assets/templates/assets/admin_user_detail.html:28
-#: assets/templates/assets/admin_user_list.html:75
+#: assets/templates/assets/admin_user_list.html:73
 #: assets/templates/assets/asset_detail.html:30
 #: assets/templates/assets/asset_list.html:168
 #: assets/templates/assets/cmd_filter_detail.html:33
-#: assets/templates/assets/cmd_filter_list.html:59
+#: assets/templates/assets/cmd_filter_list.html:57
 #: assets/templates/assets/cmd_filter_rule_list.html:87
 #: assets/templates/assets/domain_detail.html:28
 #: assets/templates/assets/domain_detail.html:104
 #: assets/templates/assets/domain_gateway_list.html:98
-#: assets/templates/assets/domain_list.html:55
+#: assets/templates/assets/domain_list.html:51
 #: assets/templates/assets/label_list.html:40
 #: assets/templates/assets/system_user_detail.html:30
-#: assets/templates/assets/system_user_list.html:82 audits/models.py:35
+#: assets/templates/assets/system_user_list.html:80 audits/models.py:35
 #: authentication/templates/authentication/_access_key_modal.html:65
 #: ops/templates/ops/task_list.html:69
 #: perms/templates/perms/asset_permission_detail.html:34
@@ -484,7 +484,7 @@ msgstr "更新"
 msgid "Delete"
 msgstr "删除"
 
-#: applications/templates/applications/remote_app_list.html:5
+#: applications/templates/applications/remote_app_list.html:4
 msgid ""
 "Before using this feature, make sure that the application loader has been "
 "uploaded to the application server and successfully published as a RemoteApp "
@@ -493,27 +493,27 @@ msgstr ""
 "使用此功能前，请确保已将应用加载器上传到应用服务器并成功发布为一个 RemoteApp "
 "应用"
 
-#: applications/templates/applications/remote_app_list.html:6
+#: applications/templates/applications/remote_app_list.html:5
 msgid "Download application loader"
 msgstr "下载应用加载器"
 
-#: applications/templates/applications/remote_app_list.html:12
+#: applications/templates/applications/remote_app_list.html:10
 #: applications/views/remote_app.py:48
 msgid "Create RemoteApp"
 msgstr "创建远程应用"
 
-#: applications/templates/applications/remote_app_list.html:24
+#: applications/templates/applications/remote_app_list.html:22
 #: applications/templates/applications/user_remote_app_list.html:20
 #: assets/models/cmd_filter.py:55
 #: assets/templates/assets/_asset_user_list.html:25
-#: assets/templates/assets/admin_user_list.html:51
+#: assets/templates/assets/admin_user_list.html:49
 #: assets/templates/assets/asset_list.html:100
-#: assets/templates/assets/cmd_filter_list.html:28
+#: assets/templates/assets/cmd_filter_list.html:26
 #: assets/templates/assets/cmd_filter_rule_list.html:63
 #: assets/templates/assets/domain_gateway_list.html:73
-#: assets/templates/assets/domain_list.html:29
+#: assets/templates/assets/domain_list.html:25
 #: assets/templates/assets/label_list.html:17
-#: assets/templates/assets/system_user_list.html:56 audits/models.py:39
+#: assets/templates/assets/system_user_list.html:54 audits/models.py:39
 #: audits/templates/audits/operate_log_list.html:47
 #: audits/templates/audits/operate_log_list.html:73
 #: authentication/templates/authentication/_access_key_modal.html:34
@@ -607,7 +607,7 @@ msgstr "端口"
 #: assets/templates/assets/asset_detail.html:196
 #: assets/templates/assets/system_user_assets.html:83
 #: perms/models/asset_permission.py:81
-#: xpack/plugins/change_auth_plan/models.py:74
+#: xpack/plugins/change_auth_plan/models.py:75
 #: xpack/plugins/gathered_user/models.py:31
 #: xpack/plugins/gathered_user/templates/gathered_user/task_list.html:17
 msgid "Nodes"
@@ -698,10 +698,10 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC"
 #: assets/templates/assets/_asset_user_auth_view_modal.html:21
 #: assets/templates/assets/_asset_user_list.html:21
 #: assets/templates/assets/admin_user_detail.html:60
-#: assets/templates/assets/admin_user_list.html:45
+#: assets/templates/assets/admin_user_list.html:43
 #: assets/templates/assets/domain_gateway_list.html:71
 #: assets/templates/assets/system_user_detail.html:62
-#: assets/templates/assets/system_user_list.html:48 audits/models.py:81
+#: assets/templates/assets/system_user_list.html:46 audits/models.py:81
 #: audits/templates/audits/login_log_list.html:57 authentication/forms.py:13
 #: authentication/templates/authentication/login.html:58
 #: authentication/templates/authentication/xpack_login.html:93
@@ -714,8 +714,8 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC"
 #: users/templates/users/user_list.html:36
 #: users/templates/users/user_profile.html:47
 #: xpack/plugins/change_auth_plan/forms.py:58
-#: xpack/plugins/change_auth_plan/models.py:65
-#: xpack/plugins/change_auth_plan/models.py:408
+#: xpack/plugins/change_auth_plan/models.py:66
+#: xpack/plugins/change_auth_plan/models.py:415
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:65
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:53
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:12
@@ -742,8 +742,8 @@ msgstr "密码或密钥密码"
 #: users/templates/users/user_profile_update.html:41
 #: users/templates/users/user_pubkey_update.html:41
 #: users/templates/users/user_update.html:20
-#: xpack/plugins/change_auth_plan/models.py:95
-#: xpack/plugins/change_auth_plan/models.py:263
+#: xpack/plugins/change_auth_plan/models.py:96
+#: xpack/plugins/change_auth_plan/models.py:264
 msgid "Password"
 msgstr "密码"
 
@@ -826,7 +826,7 @@ msgstr "主机名"
 #: assets/models/user.py:113 assets/templates/assets/asset_detail.html:70
 #: assets/templates/assets/domain_gateway_list.html:70
 #: assets/templates/assets/system_user_detail.html:70
-#: assets/templates/assets/system_user_list.html:49
+#: assets/templates/assets/system_user_list.html:47
 #: terminal/templates/terminal/session_list.html:31
 #: terminal/templates/terminal/session_list.html:75
 msgid "Protocol"
@@ -937,13 +937,13 @@ msgstr "版本"
 msgid "AuthBook"
 msgstr ""
 
-#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:99
-#: xpack/plugins/change_auth_plan/models.py:270
+#: assets/models/base.py:31 xpack/plugins/change_auth_plan/models.py:100
+#: xpack/plugins/change_auth_plan/models.py:271
 msgid "SSH private key"
 msgstr "ssh密钥"
 
-#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:102
-#: xpack/plugins/change_auth_plan/models.py:266
+#: assets/models/base.py:32 xpack/plugins/change_auth_plan/models.py:103
+#: xpack/plugins/change_auth_plan/models.py:267
 msgid "SSH public key"
 msgstr "ssh公钥"
 
@@ -1076,7 +1076,7 @@ msgstr "命令过滤规则"
 #: assets/models/domain.py:61 assets/templates/assets/domain_detail.html:21
 #: assets/templates/assets/domain_detail.html:64
 #: assets/templates/assets/domain_gateway_list.html:26
-#: assets/templates/assets/domain_list.html:27
+#: assets/templates/assets/domain_list.html:23
 msgid "Gateway"
 msgstr "网关"
 
@@ -1198,7 +1198,7 @@ msgstr "手动登录"
 #: assets/views/label.py:27 assets/views/label.py:45 assets/views/label.py:73
 #: assets/views/system_user.py:29 assets/views/system_user.py:46
 #: assets/views/system_user.py:63 assets/views/system_user.py:79
-#: templates/_nav.html:39 xpack/plugins/change_auth_plan/models.py:70
+#: templates/_nav.html:39 xpack/plugins/change_auth_plan/models.py:71
 msgid "Assets"
 msgstr "资产管理"
 
@@ -1217,7 +1217,7 @@ msgid "Shell"
 msgstr "Shell"
 
 #: assets/models/user.py:117 assets/templates/assets/system_user_detail.html:66
-#: assets/templates/assets/system_user_list.html:50
+#: assets/templates/assets/system_user_list.html:48
 msgid "Login mode"
 msgstr "登录模式"
 
@@ -1343,7 +1343,7 @@ msgstr "测试资产可连接性: {}"
 
 #: assets/tasks/asset_user_connectivity.py:27
 #: assets/tasks/push_system_user.py:130
-#: xpack/plugins/change_auth_plan/models.py:521
+#: xpack/plugins/change_auth_plan/models.py:528
 msgid "The asset {} system platform {} does not support run Ansible tasks"
 msgstr "资产 {} 系统平台 {} 不支持运行 Ansible 任务"
 
@@ -1436,7 +1436,7 @@ msgstr "选择资产"
 
 #: assets/templates/assets/_asset_group_bulk_update_modal.html:21
 #: assets/templates/assets/cmd_filter_detail.html:89
-#: assets/templates/assets/cmd_filter_list.html:26
+#: assets/templates/assets/cmd_filter_list.html:24
 msgid "System users"
 msgstr "系统用户"
 
@@ -1590,7 +1590,7 @@ msgstr "重命名成功"
 #: assets/templates/assets/gateway_create_update.html:37
 #: perms/templates/perms/asset_permission_create_update.html:38
 #: perms/templates/perms/remote_app_permission_create_update.html:39
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:43
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:41
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:27
 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:27
 msgid "Basic"
@@ -1613,7 +1613,7 @@ msgstr "自动生成密钥"
 #: perms/templates/perms/asset_permission_create_update.html:53
 #: perms/templates/perms/remote_app_permission_create_update.html:53
 #: terminal/templates/terminal/terminal_update.html:40
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:67
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:65
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_create_update.html:48
 #: xpack/plugins/gathered_user/templates/gathered_user/task_create_update.html:39
 msgid "Other"
@@ -1673,11 +1673,11 @@ msgstr "选择节点"
 
 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:202
-#: assets/templates/assets/asset_list.html:423
+#: assets/templates/assets/asset_list.html:427
 #: assets/templates/assets/cmd_filter_detail.html:106
 #: assets/templates/assets/system_user_assets.html:97
 #: assets/templates/assets/system_user_detail.html:182
-#: assets/templates/assets/system_user_list.html:135
+#: assets/templates/assets/system_user_list.html:133
 #: authentication/templates/authentication/_mfa_confirm_modal.html:20
 #: settings/templates/settings/terminal_setting.html:168
 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112
@@ -1697,22 +1697,22 @@ msgstr "选择节点"
 msgid "Confirm"
 msgstr "确认"
 
-#: assets/templates/assets/admin_user_list.html:5
+#: assets/templates/assets/admin_user_list.html:4
 msgid ""
 "Admin users are asset (charged server) on the root, or have NOPASSWD: ALL "
 "sudo permissions users, "
 msgstr ""
 "管理用户是资产（被控服务器）上的 root，或拥有 NOPASSWD: ALL sudo 权限的用户，"
 
-#: assets/templates/assets/admin_user_list.html:6
+#: assets/templates/assets/admin_user_list.html:5
 msgid ""
 "Jumpserver users of the system using the user to `push system user`,  `get "
 "assets hardware information`, etc. "
 msgstr "Jumpserver 使用该用户来 `推送系统用户`、`获取资产硬件信息` 等。"
 
-#: assets/templates/assets/admin_user_list.html:16
+#: assets/templates/assets/admin_user_list.html:14
 #: assets/templates/assets/asset_list.html:68
-#: assets/templates/assets/system_user_list.html:19
+#: assets/templates/assets/system_user_list.html:17
 #: audits/templates/audits/login_log_list.html:91
 #: users/templates/users/user_group_list.html:10
 #: users/templates/users/user_list.html:10
@@ -1721,9 +1721,9 @@ msgstr "Jumpserver 使用该用户来 `推送系统用户`、`获取资产硬件
 msgid "Export"
 msgstr "导出"
 
-#: assets/templates/assets/admin_user_list.html:21
+#: assets/templates/assets/admin_user_list.html:19
 #: assets/templates/assets/asset_list.html:73
-#: assets/templates/assets/system_user_list.html:24
+#: assets/templates/assets/system_user_list.html:22
 #: settings/templates/settings/_ldap_list_users_modal.html:172
 #: users/templates/users/user_group_list.html:15
 #: users/templates/users/user_list.html:15
@@ -1732,17 +1732,17 @@ msgstr "导出"
 msgid "Import"
 msgstr "导入"
 
-#: assets/templates/assets/admin_user_list.html:36
+#: assets/templates/assets/admin_user_list.html:34
 #: assets/views/admin_user.py:50
 msgid "Create admin user"
 msgstr "创建管理用户"
 
-#: assets/templates/assets/admin_user_list.html:125
-#: assets/templates/assets/admin_user_list.html:156
+#: assets/templates/assets/admin_user_list.html:123
+#: assets/templates/assets/admin_user_list.html:154
 #: assets/templates/assets/asset_list.html:304
 #: assets/templates/assets/asset_list.html:341
-#: assets/templates/assets/system_user_list.html:188
-#: assets/templates/assets/system_user_list.html:219
+#: assets/templates/assets/system_user_list.html:186
+#: assets/templates/assets/system_user_list.html:217
 #: users/templates/users/user_group_list.html:164
 #: users/templates/users/user_group_list.html:195
 #: users/templates/users/user_list.html:165
@@ -1818,7 +1818,7 @@ msgstr "更新硬件信息"
 msgid "Refresh"
 msgstr "刷新"
 
-#: assets/templates/assets/asset_list.html:8
+#: assets/templates/assets/asset_list.html:9
 msgid ""
 "The left side is the asset tree, right click to create, delete, and change "
 "the tree node, authorization asset is also organized as a node, and the "
@@ -1883,8 +1883,8 @@ msgstr "仅显示当前节点资产"
 msgid "Displays all child node assets"
 msgstr "显示所有子节点资产"
 
-#: assets/templates/assets/asset_list.html:417
-#: assets/templates/assets/system_user_list.html:129
+#: assets/templates/assets/asset_list.html:421
+#: assets/templates/assets/system_user_list.html:127
 #: users/templates/users/user_detail.html:441
 #: users/templates/users/user_detail.html:467
 #: users/templates/users/user_detail.html:535
@@ -1894,12 +1894,12 @@ msgstr "显示所有子节点资产"
 msgid "Are you sure?"
 msgstr "你确认吗?"
 
-#: assets/templates/assets/asset_list.html:418
+#: assets/templates/assets/asset_list.html:422
 msgid "This will delete the selected assets !!!"
 msgstr "删除选择资产"
 
-#: assets/templates/assets/asset_list.html:421
-#: assets/templates/assets/system_user_list.html:133
+#: assets/templates/assets/asset_list.html:425
+#: assets/templates/assets/system_user_list.html:131
 #: settings/templates/settings/terminal_setting.html:166
 #: users/templates/users/user_detail.html:445
 #: users/templates/users/user_detail.html:471
@@ -1910,16 +1910,16 @@ msgstr "删除选择资产"
 msgid "Cancel"
 msgstr "取消"
 
-#: assets/templates/assets/asset_list.html:432
+#: assets/templates/assets/asset_list.html:436
 msgid "Asset Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/asset_list.html:433
-#: assets/templates/assets/asset_list.html:441
+#: assets/templates/assets/asset_list.html:437
+#: assets/templates/assets/asset_list.html:445
 msgid "Asset Delete"
 msgstr "删除"
 
-#: assets/templates/assets/asset_list.html:440
+#: assets/templates/assets/asset_list.html:444
 msgid "Asset Deleting failed."
 msgstr "删除失败"
 
@@ -1928,7 +1928,7 @@ msgid "Configuration"
 msgstr "配置"
 
 #: assets/templates/assets/cmd_filter_detail.html:25
-#: assets/templates/assets/cmd_filter_list.html:25
+#: assets/templates/assets/cmd_filter_list.html:23
 #: assets/templates/assets/cmd_filter_rule_list.html:23
 msgid "Rules"
 msgstr "规则"
@@ -1937,33 +1937,33 @@ msgstr "规则"
 msgid "Binding to system user"
 msgstr "绑定到系统用户"
 
-#: assets/templates/assets/cmd_filter_list.html:6
+#: assets/templates/assets/cmd_filter_list.html:5
 msgid ""
 "System user bound some command filter, each command filter has some rules,"
 msgstr "系统用户可以绑定一些命令过滤器，一个过滤器可以定义一些规则"
 
-#: assets/templates/assets/cmd_filter_list.html:7
+#: assets/templates/assets/cmd_filter_list.html:6
 msgid "When user login asset with this system user, then run a command,"
 msgstr "当用户使用这个系统用户登录资产，然后执行一个命令"
 
-#: assets/templates/assets/cmd_filter_list.html:8
+#: assets/templates/assets/cmd_filter_list.html:7
 msgid "The command will be filter by rules, higher priority rule run first,"
 msgstr "这个命令需要被绑定过滤器的所有规则匹配，高优先级先被匹配，"
 
-#: assets/templates/assets/cmd_filter_list.html:9
+#: assets/templates/assets/cmd_filter_list.html:8
 msgid ""
 "When a rule matched, if rule action is allow, then allow command execute,"
 msgstr "当一个规则匹配到了，如果规则的动作是允许，这个命令会被放行，"
 
-#: assets/templates/assets/cmd_filter_list.html:10
+#: assets/templates/assets/cmd_filter_list.html:9
 msgid "else if action is deny, then command with be deny,"
 msgstr "如果规则的动作是禁止，命令将会被禁止执行，"
 
-#: assets/templates/assets/cmd_filter_list.html:11
+#: assets/templates/assets/cmd_filter_list.html:10
 msgid "else match next rule, if none matched, allowed"
 msgstr "否则就匹配下一个规则，如果最后没有匹配到规则，则允许执行"
 
-#: assets/templates/assets/cmd_filter_list.html:16
+#: assets/templates/assets/cmd_filter_list.html:14
 #: assets/views/cmd_filter.py:49
 msgid "Create command filter"
 msgstr "创建命令过滤器"
@@ -2015,7 +2015,7 @@ msgstr "可连接"
 msgid "The connection fails"
 msgstr "连接失败"
 
-#: assets/templates/assets/domain_list.html:9
+#: assets/templates/assets/domain_list.html:6
 msgid ""
 "The domain function is added to address the fact that some environments "
 "(such as the hybrid cloud) cannot be connected directly by jumping on the "
@@ -2024,11 +2024,11 @@ msgstr ""
 "网域功能是为了解决部分环境（如：混合云）无法直接连接而新增的功能，原理是通过"
 "网关服务器进行跳转登录。"
 
-#: assets/templates/assets/domain_list.html:11
+#: assets/templates/assets/domain_list.html:8
 msgid "JMS => Domain gateway => Target assets"
 msgstr "JMS => 网域网关 => 目标资产"
 
-#: assets/templates/assets/domain_list.html:17 assets/views/domain.py:48
+#: assets/templates/assets/domain_list.html:13 assets/views/domain.py:48
 msgid "Create domain"
 msgstr "创建网域"
 
@@ -2066,7 +2066,7 @@ msgstr "Uid"
 msgid "Binding command filters"
 msgstr "绑定命令过滤器"
 
-#: assets/templates/assets/system_user_list.html:6
+#: assets/templates/assets/system_user_list.html:5
 msgid ""
 "System user is Jumpserver jump login assets used by the users, can be "
 "understood as the user login assets, such as web, sa, the dba (` ssh "
@@ -2077,7 +2077,7 @@ msgstr ""
 "web，sa，dba（`ssh web@some-host`），而不是使用某个用户的用户名跳转登录服务器"
 "（`ssh xiaoming@some-host`）；"
 
-#: assets/templates/assets/system_user_list.html:7
+#: assets/templates/assets/system_user_list.html:6
 msgid ""
 "In simple terms, users log into Jumpserver using their own username, and "
 "Jumpserver uses system users to log into assets. "
@@ -2085,7 +2085,7 @@ msgstr ""
 "简单来说是用户使用自己的用户名登录 Jumpserver，Jumpserver 使用系统用户登录资"
 "产。"
 
-#: assets/templates/assets/system_user_list.html:8
+#: assets/templates/assets/system_user_list.html:7
 msgid ""
 "When system users are created, if you choose auto push Jumpserver to use "
 "Ansible push system users into the asset, if the asset (Switch) does not "
@@ -2094,25 +2094,25 @@ msgstr ""
 "系统用户创建时，如果选择了自动推送，Jumpserver 会使用 Ansible 自动推送系统用"
 "户到资产中，如果资产（交换机）不支持 Ansible，请手动填写账号密码。"
 
-#: assets/templates/assets/system_user_list.html:39
+#: assets/templates/assets/system_user_list.html:37
 #: assets/views/system_user.py:47
 msgid "Create system user"
 msgstr "创建系统用户"
 
-#: assets/templates/assets/system_user_list.html:130
+#: assets/templates/assets/system_user_list.html:128
 msgid "This will delete the selected System Users !!!"
 msgstr "删除选择系统用户"
 
-#: assets/templates/assets/system_user_list.html:139
+#: assets/templates/assets/system_user_list.html:137
 msgid "System Users Deleted."
 msgstr "已被删除"
 
-#: assets/templates/assets/system_user_list.html:140
-#: assets/templates/assets/system_user_list.html:145
+#: assets/templates/assets/system_user_list.html:138
+#: assets/templates/assets/system_user_list.html:143
 msgid "System Users Delete"
 msgstr "删除系统用户"
 
-#: assets/templates/assets/system_user_list.html:144
+#: assets/templates/assets/system_user_list.html:142
 msgid "System Users Deleting failed."
 msgstr "系统用户删除失败"
 
@@ -2298,7 +2298,7 @@ msgid "MFA"
 msgstr "MFA"
 
 #: audits/models.py:87 audits/templates/audits/login_log_list.html:63
-#: xpack/plugins/change_auth_plan/models.py:416
+#: xpack/plugins/change_auth_plan/models.py:423
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:15
 #: xpack/plugins/cloud/models.py:278
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:69
@@ -2327,8 +2327,8 @@ msgstr "登录日期"
 #: perms/templates/perms/asset_permission_detail.html:86
 #: perms/templates/perms/remote_app_permission_detail.html:78
 #: terminal/models.py:167 terminal/templates/terminal/session_list.html:34
-#: xpack/plugins/change_auth_plan/models.py:249
-#: xpack/plugins/change_auth_plan/models.py:419
+#: xpack/plugins/change_auth_plan/models.py:250
+#: xpack/plugins/change_auth_plan/models.py:426
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:59
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:17
 #: xpack/plugins/gathered_user/models.py:140
@@ -2347,7 +2347,7 @@ msgstr "选择用户"
 #: audits/templates/audits/password_change_log_list.html:48
 #: ops/templates/ops/command_execution_list.html:46
 #: ops/templates/ops/command_execution_list.html:51
-#: templates/_base_list.html:41
+#: templates/_base_list.html:41 templates/_user_profile.html:23
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_history.html:52
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_instance.html:48
 msgid "Search"
@@ -2916,8 +2916,8 @@ msgstr "完成时间"
 
 #: ops/models/adhoc.py:362 ops/templates/ops/adhoc_history.html:57
 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:17
-#: xpack/plugins/change_auth_plan/models.py:252
-#: xpack/plugins/change_auth_plan/models.py:422
+#: xpack/plugins/change_auth_plan/models.py:253
+#: xpack/plugins/change_auth_plan/models.py:429
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:58
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:16
 #: xpack/plugins/gathered_user/models.py:143
@@ -3483,25 +3483,25 @@ msgstr ""
 msgid "Match {} s users"
 msgstr "匹配 {} 个用户"
 
-#: settings/api.py:224
+#: settings/api.py:226
 msgid "Get ldap users is None"
 msgstr "获取 LDAP 用户为 None"
 
-#: settings/api.py:231
+#: settings/api.py:233
 msgid "Imported {} users successfully"
 msgstr "导入 {} 个用户成功"
 
-#: settings/api.py:262 settings/api.py:298
+#: settings/api.py:264 settings/api.py:300
 msgid ""
 "Error: Account invalid (Please make sure the information such as Access key "
 "or Secret key is correct)"
 msgstr "错误：账户无效 （请确保 Access key 或 Secret key 等信息正确）"
 
-#: settings/api.py:268 settings/api.py:304
+#: settings/api.py:270 settings/api.py:306
 msgid "Create succeed"
 msgstr "创建成功"
 
-#: settings/api.py:286 settings/api.py:324
+#: settings/api.py:288 settings/api.py:326
 #: settings/templates/settings/terminal_setting.html:154
 msgid "Delete succeed"
 msgstr "删除成功"
@@ -3709,12 +3709,11 @@ msgstr ""
 
 #: settings/forms.py:220
 msgid "Connection max idle time"
-msgstr "SSH最大空闲时间"
+msgstr "连接最大空闲时间"
 
 #: settings/forms.py:222
-msgid ""
-"If idle time more than it, disconnect connection(only ssh now) Unit: minute"
-msgstr "提示：（单位：分）如果超过该配置没有操作，连接会被断开（仅ssh）"
+msgid "If idle time more than it, disconnect connection Unit: minute"
+msgstr "提示：如果超过该配置没有操作，连接会被断开 （单位：分）"
 
 #: settings/forms.py:228
 msgid "Password expiration time"
@@ -4842,8 +4841,8 @@ msgstr "生成重置密码链接，通过邮件发送给用户"
 msgid "Set password"
 msgstr "设置密码"
 
-#: users/forms.py:152 xpack/plugins/change_auth_plan/models.py:88
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51
+#: users/forms.py:152 xpack/plugins/change_auth_plan/models.py:89
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:49
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:69
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_list.html:57
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:16
@@ -5733,7 +5732,7 @@ msgid "Password length"
 msgstr "密码长度"
 
 #: xpack/plugins/change_auth_plan/forms.py:75
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:60
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:58
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:81
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_list.html:17
 #: xpack/plugins/cloud/forms.py:33 xpack/plugins/cloud/forms.py:87
@@ -5772,8 +5771,8 @@ msgstr ""
 "具</a>） <br>注意： 如果同时设置了定期执行和周期执行，优先使用定期执行"
 
 #: xpack/plugins/change_auth_plan/meta.py:9
-#: xpack/plugins/change_auth_plan/models.py:116
-#: xpack/plugins/change_auth_plan/models.py:256
+#: xpack/plugins/change_auth_plan/models.py:117
+#: xpack/plugins/change_auth_plan/models.py:257
 #: xpack/plugins/change_auth_plan/views.py:33
 #: xpack/plugins/change_auth_plan/views.py:50
 #: xpack/plugins/change_auth_plan/views.py:74
@@ -5784,20 +5783,20 @@ msgstr ""
 msgid "Change auth plan"
 msgstr "改密计划"
 
-#: xpack/plugins/change_auth_plan/models.py:57
+#: xpack/plugins/change_auth_plan/models.py:58
 msgid "Custom password"
 msgstr "自定义密码"
 
-#: xpack/plugins/change_auth_plan/models.py:58
+#: xpack/plugins/change_auth_plan/models.py:59
 msgid "All assets use the same random password"
 msgstr "所有资产使用相同的随机密码"
 
-#: xpack/plugins/change_auth_plan/models.py:59
+#: xpack/plugins/change_auth_plan/models.py:60
 msgid "All assets use different random password"
 msgstr "所有资产使用不同的随机密码"
 
-#: xpack/plugins/change_auth_plan/models.py:78
-#: xpack/plugins/change_auth_plan/models.py:147
+#: xpack/plugins/change_auth_plan/models.py:79
+#: xpack/plugins/change_auth_plan/models.py:148
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:100
 #: xpack/plugins/cloud/models.py:165 xpack/plugins/cloud/models.py:219
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:91
@@ -5806,8 +5805,8 @@ msgstr "所有资产使用不同的随机密码"
 msgid "Cycle perform"
 msgstr "周期执行"
 
-#: xpack/plugins/change_auth_plan/models.py:83
-#: xpack/plugins/change_auth_plan/models.py:145
+#: xpack/plugins/change_auth_plan/models.py:84
+#: xpack/plugins/change_auth_plan/models.py:146
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:92
 #: xpack/plugins/cloud/models.py:170 xpack/plugins/cloud/models.py:217
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:83
@@ -5816,37 +5815,37 @@ msgstr "周期执行"
 msgid "Regularly perform"
 msgstr "定期执行"
 
-#: xpack/plugins/change_auth_plan/models.py:92
+#: xpack/plugins/change_auth_plan/models.py:93
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:74
 msgid "Password rules"
 msgstr "密码规则"
 
-#: xpack/plugins/change_auth_plan/models.py:212
+#: xpack/plugins/change_auth_plan/models.py:213
 msgid "* For security, do not change {} user's password"
 msgstr "* 为了安全，禁止更改 {} 用户的密码"
 
-#: xpack/plugins/change_auth_plan/models.py:216
+#: xpack/plugins/change_auth_plan/models.py:217
 msgid "Assets is empty, please add the asset"
 msgstr "资产为空，请添加资产"
 
-#: xpack/plugins/change_auth_plan/models.py:260
+#: xpack/plugins/change_auth_plan/models.py:261
 msgid "Change auth plan snapshot"
 msgstr "改密计划快照"
 
-#: xpack/plugins/change_auth_plan/models.py:275
-#: xpack/plugins/change_auth_plan/models.py:426
+#: xpack/plugins/change_auth_plan/models.py:276
+#: xpack/plugins/change_auth_plan/models.py:433
 msgid "Change auth plan execution"
 msgstr "改密计划执行"
 
-#: xpack/plugins/change_auth_plan/models.py:435
+#: xpack/plugins/change_auth_plan/models.py:442
 msgid "Change auth plan execution subtask"
 msgstr "改密计划执行子任务"
 
-#: xpack/plugins/change_auth_plan/models.py:453
+#: xpack/plugins/change_auth_plan/models.py:460
 msgid "Authentication failed"
 msgstr "认证失败"
 
-#: xpack/plugins/change_auth_plan/models.py:455
+#: xpack/plugins/change_auth_plan/models.py:462
 msgid "Connection timeout"
 msgstr "连接超时"
 
@@ -5886,7 +5885,7 @@ msgstr "添加资产"
 msgid "Add node to this plan"
 msgstr "添加节点"
 
-#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:12
+#: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:11
 msgid ""
 "When the user password on the asset is changed, the action is performed "
 "using the admin user associated with the asset"

apps/settings/api.py

@@ -334,7 +334,8 @@ class PublicSettingApi(generics.RetrieveAPIView):
         c = settings.CONFIG
         instance = {
             "data": {
-                "WINDOWS_SKIP_ALL_MANUAL_PASSWORD": c.WINDOWS_SKIP_ALL_MANUAL_PASSWORD
+                "WINDOWS_SKIP_ALL_MANUAL_PASSWORD": c.WINDOWS_SKIP_ALL_MANUAL_PASSWORD,
+                "SECURITY_MAX_IDLE_TIME": c.SECURITY_MAX_IDLE_TIME,
             }
         }
         return instance

apps/settings/forms.py

@@ -219,7 +219,7 @@ class SecuritySettingForm(BaseForm):
         min_value=1, max_value=99999, required=False,
         label=_("Connection max idle time"),
         help_text=_(
-            'If idle time more than it, disconnect connection(only ssh now) '
+            'If idle time more than it, disconnect connection '
             'Unit: minute'
         ),
     )