Merge pull request #1771 from jumpserver/dev

Dev

apps/jumpserver/settings.py

@@ -355,6 +355,10 @@ AUTHENTICATION_BACKENDS = [
 # Custom User Auth model
 AUTH_USER_MODEL = 'users.User'
 
+# File Upload Permissions
+FILE_UPLOAD_PERMISSIONS = 0o644
+FILE_UPLOAD_DIRECTORY_PERMISSIONS = 0o755
+
 # Auth LDAP settings
 AUTH_LDAP = CONFIG.AUTH_LDAP
 AUTH_LDAP_SERVER_URI = CONFIG.AUTH_LDAP_SERVER_URI

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: 2018-08-27 18:29+0800\n"
+"POT-Creation-Date: 2018-09-04 16:00+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"
@@ -36,7 +36,7 @@ msgstr "测试节点下资产是否可连接: {}"
 #: assets/forms/asset.py:27 assets/models/asset.py:82 assets/models/user.py:113
 #: assets/templates/assets/asset_detail.html:183
 #: assets/templates/assets/asset_detail.html:191
-#: assets/templates/assets/system_user_asset.html:95 perms/models.py:32
+#: assets/templates/assets/system_user_asset.html:94 perms/models.py:32
 msgid "Nodes"
 msgstr "节点管理"
 
@@ -116,7 +116,7 @@ msgstr "端口"
 #: perms/templates/perms/asset_permission_create_update.html:40
 #: perms/templates/perms/asset_permission_list.html:56
 #: perms/templates/perms/asset_permission_list.html:148
-#: terminal/backends/command/models.py:13 terminal/models.py:128
+#: terminal/backends/command/models.py:13 terminal/models.py:133
 #: terminal/templates/terminal/command_list.html:40
 #: terminal/templates/terminal/command_list.html:73
 #: terminal/templates/terminal/session_list.html:41
@@ -129,7 +129,7 @@ msgstr "资产"
 msgid "Password should not contain special characters"
 msgstr "不能包含特殊字符"
 
-#: assets/forms/domain.py:59 assets/forms/user.py:79 assets/forms/user.py:139
+#: assets/forms/domain.py:59 assets/forms/user.py:79 assets/forms/user.py:142
 #: assets/models/base.py:22 assets/models/cluster.py:18
 #: assets/models/domain.py:18 assets/models/group.py:20
 #: assets/models/label.py:18 assets/templates/assets/admin_user_detail.html:56
@@ -139,15 +139,15 @@ msgstr "不能包含特殊字符"
 #: assets/templates/assets/domain_list.html:25
 #: assets/templates/assets/label_list.html:14
 #: assets/templates/assets/system_user_detail.html:58
-#: assets/templates/assets/system_user_list.html:29 common/models.py:26
+#: assets/templates/assets/system_user_list.html:29 common/models.py:30
 #: common/templates/common/terminal_setting.html:72
 #: common/templates/common/terminal_setting.html:90 ops/models/adhoc.py:37
 #: ops/templates/ops/task_detail.html:59 ops/templates/ops/task_list.html:35
 #: orgs/models.py:12 perms/models.py:28
 #: perms/templates/perms/asset_permission_detail.html:62
 #: perms/templates/perms/asset_permission_list.html:53
-#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:17
-#: terminal/models.py:155 terminal/templates/terminal/terminal_detail.html:43
+#: perms/templates/perms/asset_permission_user.html:54 terminal/models.py:18
+#: terminal/models.py:160 terminal/templates/terminal/terminal_detail.html:43
 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
 #: users/models/user.py:51 users/templates/users/_select_user_modal.html:13
 #: users/templates/users/user_detail.html:63
@@ -162,7 +162,7 @@ msgstr "不能包含特殊字符"
 msgid "Name"
 msgstr "名称"
 
-#: assets/forms/domain.py:60 assets/forms/user.py:80 assets/forms/user.py:140
+#: assets/forms/domain.py:60 assets/forms/user.py:80 assets/forms/user.py:143
 #: assets/models/base.py:23 assets/templates/assets/admin_user_detail.html:60
 #: assets/templates/assets/admin_user_list.html:27
 #: assets/templates/assets/domain_gateway_list.html:60
@@ -183,7 +183,7 @@ msgstr "用户名"
 msgid "Password or private key passphrase"
 msgstr "密码或密钥密码"
 
-#: assets/forms/user.py:25 assets/models/base.py:24 common/forms.py:113
+#: assets/forms/user.py:25 assets/models/base.py:24 common/forms.py:104
 #: users/forms.py:17 users/forms.py:35 users/forms.py:47
 #: users/templates/users/login.html:65
 #: users/templates/users/reset_password.html:53
@@ -207,21 +207,21 @@ msgstr "ssh密钥不合法"
 msgid "Password and private key file must be input one"
 msgstr "密码和私钥, 必须输入一个"
 
-#: assets/forms/user.py:125
+#: assets/forms/user.py:128
 msgid "* Automatic login mode, must fill in the username."
 msgstr "自动登录模式，必须填写用户名"
 
-#: assets/forms/user.py:145
+#: assets/forms/user.py:148
 msgid "Auto push system user to asset"
 msgstr "自动推送系统用户到资产"
 
-#: assets/forms/user.py:146
+#: assets/forms/user.py:149
 msgid ""
 "High level will be using login asset as default, if user was granted more "
 "than 2 system user"
 msgstr "高优先级的系统用户将会作为默认登录用户"
 
-#: assets/forms/user.py:148
+#: assets/forms/user.py:151
 msgid ""
 "If you choose manual login mode, you do not need to fill in the username and "
 "password."
@@ -236,7 +236,7 @@ msgstr "如果选择手动登录模式，用户名和密码则不需要填写"
 #: assets/templates/assets/system_user_asset.html:50
 #: assets/templates/assets/user_asset_list.html:46
 #: assets/templates/assets/user_asset_list.html:162
-#: audits/templates/audits/login_log_list.html:52 common/forms.py:145
+#: audits/templates/audits/login_log_list.html:52 common/forms.py:133
 #: perms/templates/perms/asset_permission_asset.html:55
 #: users/templates/users/user_granted_asset.html:45
 #: users/templates/users/user_group_granted_asset.html:45
@@ -249,7 +249,7 @@ msgstr "IP"
 #: assets/templates/assets/asset_list.html:92
 #: assets/templates/assets/system_user_asset.html:49
 #: assets/templates/assets/user_asset_list.html:45
-#: assets/templates/assets/user_asset_list.html:161 common/forms.py:144
+#: assets/templates/assets/user_asset_list.html:161 common/forms.py:132
 #: perms/templates/perms/asset_permission_asset.html:54
 #: users/templates/users/user_granted_asset.html:44
 #: users/templates/users/user_group_granted_asset.html:44
@@ -385,10 +385,10 @@ msgstr "创建日期"
 #: assets/templates/assets/domain_list.html:28
 #: assets/templates/assets/system_user_detail.html:104
 #: assets/templates/assets/system_user_list.html:37
-#: assets/templates/assets/user_asset_list.html:170 common/models.py:30
+#: assets/templates/assets/user_asset_list.html:170 common/models.py:35
 #: ops/models/adhoc.py:43 orgs/models.py:17 perms/models.py:39
 #: perms/models.py:86 perms/templates/perms/asset_permission_detail.html:102
-#: terminal/models.py:27 terminal/templates/terminal/terminal_detail.html:63
+#: terminal/models.py:28 terminal/templates/terminal/terminal_detail.html:63
 #: users/models/group.py:15 users/models/user.py:84
 #: users/templates/users/user_detail.html:123
 #: users/templates/users/user_group_detail.html:67
@@ -492,14 +492,14 @@ msgstr "默认资产组"
 #: perms/templates/perms/asset_permission_create_update.html:36
 #: perms/templates/perms/asset_permission_list.html:54
 #: perms/templates/perms/asset_permission_list.html:142 templates/index.html:87
-#: terminal/backends/command/models.py:12 terminal/models.py:127
+#: terminal/backends/command/models.py:12 terminal/models.py:132
 #: terminal/templates/terminal/command_list.html:32
 #: terminal/templates/terminal/command_list.html:72
 #: terminal/templates/terminal/session_list.html:33
 #: terminal/templates/terminal/session_list.html:71 users/forms.py:312
 #: users/models/user.py:33 users/models/user.py:351
 #: users/templates/users/user_group_detail.html:78
-#: users/templates/users/user_group_list.html:13 users/views/user.py:378
+#: users/templates/users/user_group_list.html:13 users/views/user.py:385
 #: xpack/plugins/orgs/forms.py:26
 #: xpack/plugins/orgs/templates/orgs/org_detail.html:113
 #: xpack/plugins/orgs/templates/orgs/org_list.html:14
@@ -508,7 +508,7 @@ msgid "User"
 msgstr "用户"
 
 #: assets/models/label.py:19 assets/models/node.py:20
-#: assets/templates/assets/label_list.html:15 common/models.py:27
+#: assets/templates/assets/label_list.html:15 common/models.py:31
 msgid "Value"
 msgstr "值"
 
@@ -577,7 +577,7 @@ msgstr "登录模式"
 #: perms/templates/perms/asset_permission_detail.html:140
 #: perms/templates/perms/asset_permission_list.html:58
 #: perms/templates/perms/asset_permission_list.html:154 templates/_nav.html:25
-#: terminal/backends/command/models.py:14 terminal/models.py:129
+#: terminal/backends/command/models.py:14 terminal/models.py:134
 #: terminal/templates/terminal/command_list.html:48
 #: terminal/templates/terminal/command_list.html:74
 #: terminal/templates/terminal/session_list.html:49
@@ -615,19 +615,23 @@ msgstr "测试管理行号可连接性: {}"
 msgid "Test assets connectability"
 msgstr "测试资产可连接性"
 
-#: assets/tasks.py:301
+#: assets/tasks.py:302
 msgid "Test system user connectability: {}"
 msgstr "测试系统用户可连接性: {}"
 
-#: assets/tasks.py:316
+#: assets/tasks.py:309
+msgid "Test system user connectability: {} => {}"
+msgstr "测试系统用户可连接性: {} => {}"
+
+#: assets/tasks.py:326
 msgid "Test system user connectability period: {}"
 msgstr "定期测试系统用户可连接性: {}"
 
-#: assets/tasks.py:397 assets/tasks.py:412
+#: assets/tasks.py:407 assets/tasks.py:422
 msgid "Push system users to assets: {}"
 msgstr "推送系统用户到入资产: {}"
 
-#: assets/tasks.py:403
+#: assets/tasks.py:413
 msgid "Push system users to asset: {} => {}"
 msgstr "推送系统用户到入资产: {} => {}"
 
@@ -825,6 +829,7 @@ msgstr "测试可连接性"
 #: assets/templates/assets/admin_user_assets.html:75
 #: assets/templates/assets/asset_detail.html:171
 #: assets/templates/assets/system_user_asset.html:74
+#: assets/templates/assets/system_user_asset.html:160
 #: assets/templates/assets/system_user_detail.html:151
 msgid "Test"
 msgstr "测试"
@@ -895,7 +900,7 @@ msgstr "选择节点"
 #: assets/templates/assets/admin_user_detail.html:100
 #: assets/templates/assets/asset_detail.html:200
 #: assets/templates/assets/asset_list.html:633
-#: assets/templates/assets/system_user_asset.html:112
+#: assets/templates/assets/system_user_asset.html:111
 #: assets/templates/assets/system_user_detail.html:330
 #: assets/templates/assets/system_user_list.html:143 templates/_modal.html:22
 #: terminal/templates/terminal/session_detail.html:108
@@ -1251,24 +1256,15 @@ msgid "Push system user now"
 msgstr "立刻推送系统"
 
 #: assets/templates/assets/system_user_asset.html:83
-#: assets/templates/assets/system_user_asset.html:159
+#: assets/templates/assets/system_user_asset.html:158
 #: assets/templates/assets/system_user_detail.html:142
 msgid "Push"
 msgstr "推送"
 
-#: assets/templates/assets/system_user_asset.html:103
+#: assets/templates/assets/system_user_asset.html:102
 msgid "Add to node"
 msgstr "添加到节点"
 
-#: assets/templates/assets/system_user_asset.html:223
-msgid "Task has been send, Go to ops task list seen result"
-msgstr "任务已下发，查看ops任务列表"
-
-#: assets/templates/assets/system_user_asset.html:235
-#: assets/templates/assets/system_user_asset.html:273
-msgid "Task has been send, seen left assets status"
-msgstr "任务已下发，查看左侧资产状态"
-
 #: assets/templates/assets/system_user_detail.html:85
 msgid "Home"
 msgstr "家目录"
@@ -1425,7 +1421,7 @@ msgstr "系统用户集群资产"
 #: audits/templates/audits/ftp_log_list.html:73
 #: audits/templates/audits/operate_log_list.html:70
 #: audits/templates/audits/password_change_log_list.html:52
-#: terminal/models.py:131 terminal/templates/terminal/session_list.html:74
+#: terminal/models.py:136 terminal/templates/terminal/session_list.html:74
 #: terminal/templates/terminal/terminal_detail.html:47
 msgid "Remote addr"
 msgstr "远端地址"
@@ -1466,7 +1462,7 @@ msgstr "修改者"
 #: ops/templates/ops/adhoc_history.html:52
 #: ops/templates/ops/adhoc_history_detail.html:61
 #: ops/templates/ops/task_history.html:58 perms/models.py:35
-#: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:138
+#: perms/templates/perms/asset_permission_detail.html:86 terminal/models.py:143
 #: terminal/templates/terminal/session_list.html:78
 msgid "Date start"
 msgstr "开始日期"
@@ -1557,9 +1553,9 @@ msgstr "改密日志"
 
 #: audits/views.py:183 templates/_nav.html:10 users/views/group.py:28
 #: users/views/group.py:44 users/views/group.py:60 users/views/group.py:76
-#: users/views/group.py:92 users/views/login.py:327 users/views/user.py:67
-#: users/views/user.py:82 users/views/user.py:110 users/views/user.py:192
-#: users/views/user.py:347 users/views/user.py:397 users/views/user.py:432
+#: users/views/group.py:92 users/views/login.py:327 users/views/user.py:68
+#: users/views/user.py:83 users/views/user.py:111 users/views/user.py:193
+#: users/views/user.py:354 users/views/user.py:404 users/views/user.py:439
 msgid "Users"
 msgstr "用户管理"
 
@@ -1593,100 +1589,100 @@ msgstr "<b>%(name)s</b> 创建成功"
 msgid "<b>%(name)s</b> was updated successfully"
 msgstr "<b>%(name)s</b> 更新成功"
 
-#: common/fields.py:30
+#: common/fields.py:31
 msgid "Not a valid json"
 msgstr "不是合法json"
 
-#: common/fields.py:32
+#: common/fields.py:33
 msgid "Not a string type"
 msgstr "不是字符类型"
 
-#: common/fields.py:69
+#: common/fields.py:70
 msgid "Encrypt field using Secret Key"
 msgstr ""
 
-#: common/forms.py:70
+#: common/forms.py:61
 msgid "Current SITE URL"
 msgstr "当前站点URL"
 
-#: common/forms.py:74
+#: common/forms.py:65
 msgid "User Guide URL"
 msgstr "用户向导URL"
 
-#: common/forms.py:75
+#: common/forms.py:66
 msgid "User first login update profile done redirect to it"
 msgstr "用户第一次登录，修改profile后重定向到地址"
 
-#: common/forms.py:78
+#: common/forms.py:69
 msgid "Email Subject Prefix"
 msgstr "Email主题前缀"
 
-#: common/forms.py:85
+#: common/forms.py:76
 msgid "SMTP host"
 msgstr "SMTP主机"
 
-#: common/forms.py:87
+#: common/forms.py:78
 msgid "SMTP port"
 msgstr "SMTP端口"
 
-#: common/forms.py:89
+#: common/forms.py:80
 msgid "SMTP user"
 msgstr "SMTP账号"
 
-#: common/forms.py:92
+#: common/forms.py:83
 msgid "SMTP password"
 msgstr "SMTP密码"
 
-#: common/forms.py:93
+#: common/forms.py:84
 msgid "Some provider use token except password"
 msgstr "一些邮件提供商需要输入的是Token"
 
-#: common/forms.py:96 common/forms.py:137
+#: common/forms.py:87 common/forms.py:125
 msgid "Use SSL"
 msgstr "使用SSL"
 
-#: common/forms.py:97
+#: common/forms.py:88
 msgid "If SMTP port is 465, may be select"
 msgstr "如果SMTP端口是465，通常需要启用SSL"
 
-#: common/forms.py:100
+#: common/forms.py:91
 msgid "Use TLS"
 msgstr "使用TLS"
 
-#: common/forms.py:101
+#: common/forms.py:92
 msgid "If SMTP port is 587, may be select"
 msgstr "如果SMTP端口是587，通常需要启用TLS"
 
-#: common/forms.py:107
+#: common/forms.py:98
 msgid "LDAP server"
 msgstr "LDAP地址"
 
-#: common/forms.py:110
+#: common/forms.py:101
 msgid "Bind DN"
 msgstr "绑定DN"
 
-#: common/forms.py:117
+#: common/forms.py:108
 msgid "User OU"
 msgstr "用户OU"
 
-#: common/forms.py:118
+#: common/forms.py:109
 msgid "Use | split User OUs"
 msgstr "使用|分隔各OU"
 
-#: common/forms.py:121
+#: common/forms.py:112
 msgid "User search filter"
 msgstr "用户过滤器"
 
-#: common/forms.py:122
+#: common/forms.py:113
 #, python-format
 msgid "Choice may be (cn|uid|sAMAccountName)=%(user)s)"
 msgstr "可能的选项是(cn或uid或sAMAccountName=%(user)s)"
 
-#: common/forms.py:125
+#: common/forms.py:116
 msgid "User attr map"
 msgstr "LDAP属性映射"
 
-#: common/forms.py:132
+#: common/forms.py:118
 msgid ""
 "User attr map present how to map LDAP user attr to jumpserver, username,name,"
 "email is jumpserver attr"
@@ -1694,116 +1690,125 @@ msgstr ""
 "用户属性映射代表怎样将LDAP中用户属性映射到jumpserver用户上，username, name,"
 "email 是jumpserver的属性"
 
-#: common/forms.py:139
+#: common/forms.py:127
 msgid "Enable LDAP auth"
 msgstr "启用LDAP认证"
 
-#: common/forms.py:148
+#: common/forms.py:136
 msgid "List sort by"
 msgstr "资产列表排序"
 
-#: common/forms.py:151
+#: common/forms.py:139
 msgid "Heartbeat interval"
 msgstr "心跳间隔"
 
-#: common/forms.py:151 ops/models/adhoc.py:38
+#: common/forms.py:139 ops/models/adhoc.py:38
 msgid "Units: seconds"
 msgstr "单位: 秒"
 
-#: common/forms.py:154
+#: common/forms.py:142
 msgid "Password auth"
 msgstr "密码认证"
 
-#: common/forms.py:157
+#: common/forms.py:145
 msgid "Public key auth"
 msgstr "密钥认证"
 
-#: common/forms.py:160 common/templates/common/terminal_setting.html:68
-#: terminal/forms.py:30 terminal/models.py:21
+#: common/forms.py:148 common/templates/common/terminal_setting.html:68
+#: terminal/forms.py:30 terminal/models.py:22
 msgid "Command storage"
 msgstr "命令存储"
 
-#: common/forms.py:161
+#: common/forms.py:149
 msgid ""
 "Set terminal storage setting, `default` is the using as default,You can set "
 "other storage and some terminal using"
 msgstr "设置终端命令存储，default是默认用的存储方式"
 
-#: common/forms.py:166 common/templates/common/terminal_setting.html:86
-#: terminal/forms.py:35 terminal/models.py:22
+#: common/forms.py:154 common/templates/common/terminal_setting.html:86
+#: terminal/forms.py:35 terminal/models.py:23
 msgid "Replay storage"
 msgstr "录像存储"
 
-#: common/forms.py:167
+#: common/forms.py:155
 msgid ""
 "Set replay storage setting, `default` is the using as default,You can set "
 "other storage and some terminal using"
 msgstr "设置终端录像存储，default是默认用的存储方式"
 
-#: common/forms.py:177
+#: common/forms.py:165
 msgid "MFA Secondary certification"
 msgstr "MFA 二次认证"
 
-#: common/forms.py:179
+#: common/forms.py:167
 msgid ""
 "After opening, the user login must use MFA secondary authentication (valid "
 "for all users, including administrators)"
 msgstr "开启后，用户登录必须使用MFA二次认证（对所有用户有效，包括管理员）"
 
-#: common/forms.py:186
+#: common/forms.py:174
 msgid "Limit the number of login failures"
 msgstr "限制登录失败次数"
 
-#: common/forms.py:191
+#: common/forms.py:179
 msgid "No logon interval"
 msgstr "禁止登录时间间隔"
 
-#: common/forms.py:193
+#: common/forms.py:181
 msgid ""
 "Tip :(unit/minute) if the user has failed to log in for a limited number of "
 "times, no login is allowed during this time interval."
 msgstr ""
 "提示:（单位 / 分钟）当用户登录失败次数达到限制后，那么在此时间间隔内禁止登录."
 
-#: common/forms.py:199
+#: common/forms.py:187
+msgid "Connection max idle time"
+msgstr "SSH最大空闲时间"
+
+#: common/forms.py:189
+msgid ""
+"If idle time more than it, disconnect connection(only ssh now) Unit: minute"
+msgstr "如果超过该配置没有操作，连接会被断开"
+
+#: common/forms.py:195
 msgid "Password minimum length"
 msgstr "密码最小长度 "
 
-#: common/forms.py:206
+#: common/forms.py:202
 msgid "Must contain capital letters"
 msgstr "必须包含大写字母"
 
-#: common/forms.py:208
+#: common/forms.py:204
 msgid ""
 "After opening, the user password changes and resets must contain uppercase "
 "letters"
 msgstr "开启后，用户密码修改、重置必须包含大写字母"
 
-#: common/forms.py:214
+#: common/forms.py:210
 msgid "Must contain lowercase letters"
 msgstr "必须包含小写字母"
 
-#: common/forms.py:215
+#: common/forms.py:211
 msgid ""
 "After opening, the user password changes and resets must contain lowercase "
 "letters"
 msgstr "开启后，用户密码修改、重置必须包含小写字母"
 
-#: common/forms.py:221
+#: common/forms.py:217
 msgid "Must contain numeric characters"
 msgstr "必须包含数字字符"
 
-#: common/forms.py:222
+#: common/forms.py:218
 msgid ""
 "After opening, the user password changes and resets must contain numeric "
 "characters"
 msgstr "开启后，用户密码修改、重置必须包含数字字符"
 
-#: common/forms.py:228
+#: common/forms.py:224
 msgid "Must contain special characters"
 msgstr "必须包含特殊字符"
 
-#: common/forms.py:229
+#: common/forms.py:225
 msgid ""
 "After opening, the user password changes and resets must contain special "
 "characters"
@@ -1817,7 +1822,7 @@ msgstr ""
 msgid "discard time"
 msgstr ""
 
-#: common/models.py:29 users/models/authentication.py:51
+#: common/models.py:34 users/models/authentication.py:51
 #: users/templates/users/user_detail.html:96
 msgid "Enabled"
 msgstr "启用"
@@ -1915,73 +1920,73 @@ msgstr ""
 msgid "Callback"
 msgstr "回调"
 
-#: ops/models/adhoc.py:155 ops/templates/ops/adhoc_detail.html:114
+#: ops/models/adhoc.py:156 ops/templates/ops/adhoc_detail.html:114
 msgid "Tasks"
 msgstr "任务"
 
-#: ops/models/adhoc.py:156 ops/templates/ops/adhoc_detail.html:57
+#: ops/models/adhoc.py:157 ops/templates/ops/adhoc_detail.html:57
 #: ops/templates/ops/task_adhoc.html:60
 msgid "Pattern"
 msgstr ""
 
-#: ops/models/adhoc.py:157 ops/templates/ops/adhoc_detail.html:61
+#: ops/models/adhoc.py:158 ops/templates/ops/adhoc_detail.html:61
 msgid "Options"
 msgstr "选项"
 
-#: ops/models/adhoc.py:158 ops/templates/ops/adhoc_detail.html:53
+#: ops/models/adhoc.py:159 ops/templates/ops/adhoc_detail.html:53
 #: ops/templates/ops/task_adhoc.html:59 ops/templates/ops/task_list.html:38
 msgid "Hosts"
 msgstr "主机"
 
-#: ops/models/adhoc.py:159
+#: ops/models/adhoc.py:160
 msgid "Run as admin"
 msgstr "再次执行"
 
-#: ops/models/adhoc.py:160 ops/templates/ops/adhoc_detail.html:72
+#: ops/models/adhoc.py:161 ops/templates/ops/adhoc_detail.html:72
 #: ops/templates/ops/adhoc_detail.html:77 ops/templates/ops/task_adhoc.html:61
 msgid "Run as"
 msgstr "用户"
 
-#: ops/models/adhoc.py:161 ops/templates/ops/adhoc_detail.html:82
+#: ops/models/adhoc.py:162 ops/templates/ops/adhoc_detail.html:82
 #: ops/templates/ops/task_adhoc.html:62
 msgid "Become"
 msgstr "Become"
 
-#: ops/models/adhoc.py:162 users/templates/users/user_group_detail.html:59
+#: ops/models/adhoc.py:163 users/templates/users/user_group_detail.html:59
 #: xpack/plugins/orgs/templates/orgs/org_detail.html:56
 msgid "Create by"
 msgstr "创建者"
 
-#: ops/models/adhoc.py:326
+#: ops/models/adhoc.py:327
 msgid "Start time"
 msgstr "开始时间"
 
-#: ops/models/adhoc.py:327
+#: ops/models/adhoc.py:328
 msgid "End time"
 msgstr "完成时间"
 
-#: ops/models/adhoc.py:328 ops/templates/ops/adhoc_history.html:57
+#: ops/models/adhoc.py:329 ops/templates/ops/adhoc_history.html:57
 #: ops/templates/ops/task_history.html:63 ops/templates/ops/task_list.html:41
 msgid "Time"
 msgstr "时间"
 
-#: ops/models/adhoc.py:329 ops/templates/ops/adhoc_detail.html:106
+#: ops/models/adhoc.py:330 ops/templates/ops/adhoc_detail.html:106
 #: ops/templates/ops/adhoc_history.html:55
 #: ops/templates/ops/adhoc_history_detail.html:69
 #: ops/templates/ops/task_detail.html:83 ops/templates/ops/task_history.html:61
 msgid "Is finished"
 msgstr "是否完成"
 
-#: ops/models/adhoc.py:330 ops/templates/ops/adhoc_history.html:56
+#: ops/models/adhoc.py:331 ops/templates/ops/adhoc_history.html:56
 #: ops/templates/ops/task_history.html:62
 msgid "Is success"
 msgstr "是否成功"
 
-#: ops/models/adhoc.py:331
+#: ops/models/adhoc.py:332
 msgid "Adhoc raw result"
 msgstr "结果"
 
-#: ops/models/adhoc.py:332
+#: ops/models/adhoc.py:333
 msgid "Adhoc result summary"
 msgstr "汇总"
 
@@ -2305,7 +2310,7 @@ msgstr "商业支持"
 #: users/templates/users/user_profile.html:17
 #: users/templates/users/user_profile_update.html:37
 #: users/templates/users/user_profile_update.html:57
-#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:360
+#: users/templates/users/user_pubkey_update.html:37 users/views/user.py:367
 msgid "Profile"
 msgstr "个人信息"
 
@@ -2356,7 +2361,7 @@ msgstr ""
 "\"%(user_pubkey_update)s\"> 链接 </a> 更新\n"
 "        "
 
-#: templates/_nav.html:13 users/views/user.py:68
+#: templates/_nav.html:13 users/views/user.py:69
 msgid "User list"
 msgstr "用户列表"
 
@@ -2593,62 +2598,62 @@ msgstr ""
 "录像文件支持存储到服务器端硬盘、AWS S3、 阿里云 OSS 中，默认存储到服务器端硬"
 "盘, 更多查看文档"
 
-#: terminal/models.py:18
+#: terminal/models.py:19
 msgid "Remote Address"
 msgstr "远端地址"
 
-#: terminal/models.py:19
+#: terminal/models.py:20
 msgid "SSH Port"
 msgstr "SSH端口"
 
-#: terminal/models.py:20
+#: terminal/models.py:21
 msgid "HTTP Port"
 msgstr "HTTP端口"
 
-#: terminal/models.py:99
+#: terminal/models.py:104
 msgid "Session Online"
 msgstr "在线会话"
 
-#: terminal/models.py:100
+#: terminal/models.py:105
 msgid "CPU Usage"
 msgstr "CPU使用"
 
-#: terminal/models.py:101
+#: terminal/models.py:106
 msgid "Memory Used"
 msgstr "内存使用"
 
-#: terminal/models.py:102
+#: terminal/models.py:107
 msgid "Connections"
 msgstr "连接数"
 
-#: terminal/models.py:103
+#: terminal/models.py:108
 msgid "Threads"
 msgstr "线程数"
 
-#: terminal/models.py:104
+#: terminal/models.py:109
 msgid "Boot Time"
 msgstr "运行时间"
 
-#: terminal/models.py:133 terminal/templates/terminal/session_list.html:104
+#: terminal/models.py:138 terminal/templates/terminal/session_list.html:104
 msgid "Replay"
 msgstr "回放"
 
-#: terminal/models.py:134 terminal/templates/terminal/command_list.html:55
+#: terminal/models.py:139 terminal/templates/terminal/command_list.html:55
 #: terminal/templates/terminal/command_list.html:71
 #: terminal/templates/terminal/session_detail.html:48
 #: terminal/templates/terminal/session_list.html:77
 msgid "Command"
 msgstr "命令"
 
-#: terminal/models.py:137
+#: terminal/models.py:142
 msgid "Date last active"
 msgstr "最后活跃日期"
 
-#: terminal/models.py:139
+#: terminal/models.py:144
 msgid "Date end"
 msgstr "结束日期"
 
-#: terminal/models.py:156
+#: terminal/models.py:161
 msgid "Args"
 msgstr "参数"
 
@@ -3309,7 +3314,7 @@ msgid "Very strong"
 msgstr "很强"
 
 #: users/templates/users/user_create.html:4
-#: users/templates/users/user_list.html:16 users/views/user.py:82
+#: users/templates/users/user_list.html:16 users/views/user.py:83
 msgid "Create user"
 msgstr "创建用户"
 
@@ -3318,7 +3323,7 @@ msgid "Reset link will be generated and sent to the user. "
 msgstr "生成重置密码连接，通过邮件发送给用户"
 
 #: users/templates/users/user_detail.html:19
-#: users/templates/users/user_granted_asset.html:18 users/views/user.py:193
+#: users/templates/users/user_granted_asset.html:18 users/views/user.py:194
 msgid "User detail"
 msgstr "用户详情"
 
@@ -3411,10 +3416,8 @@ msgid "After unlocking the user, the user can log in normally."
 msgstr "解除用户登录限制后，此用户即可正常登录"
 
 #: users/templates/users/user_detail.html:485
-#, fuzzy
-#| msgid "Reset password success"
 msgid "Reset user MFA success"
-msgstr "重置密码成功"
+msgstr "重置用户MFA成功"
 
 #: users/templates/users/user_group_detail.html:22
 #: users/templates/users/user_group_granted_asset.html:18
@@ -3515,8 +3518,8 @@ msgstr "安装完成后点击下一步进入绑定页面（如已安装，直接
 msgid "Administrator Settings force MFA login"
 msgstr "管理员设置强制使用MFA登录"
 
-#: users/templates/users/user_profile.html:116 users/views/user.py:223
-#: users/views/user.py:277
+#: users/templates/users/user_profile.html:116 users/views/user.py:230
+#: users/views/user.py:284
 msgid "User groups"
 msgstr "用户组"
 
@@ -3566,7 +3569,7 @@ msgid ""
 "corresponding private key."
 msgstr "新的公钥已设置成功，请下载对应的私钥"
 
-#: users/templates/users/user_update.html:4 users/views/user.py:111
+#: users/templates/users/user_update.html:4 users/views/user.py:112
 msgid "Update user"
 msgstr "更新用户"
 
@@ -3724,7 +3727,7 @@ msgstr "用户组授权资产"
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: users/views/login.py:175 users/views/user.py:517 users/views/user.py:542
+#: users/views/login.py:175 users/views/user.py:524 users/views/user.py:549
 msgid "MFA code invalid, or ntp sync server time"
 msgstr "MFA验证码不正确，或者服务器端时间不对"
 
@@ -3765,7 +3768,7 @@ msgstr "Token错误或失效"
 msgid "Password not same"
 msgstr "密码不一致"
 
-#: users/views/login.py:289 users/views/user.py:126 users/views/user.py:415
+#: users/views/login.py:289 users/views/user.py:127 users/views/user.py:422
 msgid "* Your password does not meet the requirements"
 msgstr "* 您的密码不符合要求"
 
@@ -3773,51 +3776,51 @@ msgstr "* 您的密码不符合要求"
 msgid "First login"
 msgstr "首次登陆"
 
-#: users/views/user.py:143
+#: users/views/user.py:144
 msgid "Bulk update user success"
 msgstr "批量更新用户成功"
 
-#: users/views/user.py:173
+#: users/views/user.py:174
 msgid "Bulk update user"
 msgstr "批量更新用户"
 
-#: users/views/user.py:252
+#: users/views/user.py:259
 msgid "Invalid file."
 msgstr "文件不合法"
 
-#: users/views/user.py:348
+#: users/views/user.py:355
 msgid "User granted assets"
 msgstr "用户授权资产"
 
-#: users/views/user.py:379
+#: users/views/user.py:386
 msgid "Profile setting"
 msgstr "个人信息设置"
 
-#: users/views/user.py:398
+#: users/views/user.py:405
 msgid "Password update"
 msgstr "密码更新"
 
-#: users/views/user.py:433
+#: users/views/user.py:440
 msgid "Public key update"
 msgstr "密钥更新"
 
-#: users/views/user.py:474
+#: users/views/user.py:481
 msgid "Password invalid"
 msgstr "用户名或密码无效"
 
-#: users/views/user.py:572
+#: users/views/user.py:579
 msgid "MFA enable success"
 msgstr "MFA 绑定成功"
 
-#: users/views/user.py:573
+#: users/views/user.py:580
 msgid "MFA enable success, return login page"
 msgstr "MFA 绑定成功，返回到登录页面"
 
-#: users/views/user.py:575
+#: users/views/user.py:582
 msgid "MFA disable success"
 msgstr "MFA 解绑成功"
 
-#: users/views/user.py:576
+#: users/views/user.py:583
 msgid "MFA disable success, return login page"
 msgstr "MFA 解绑成功，返回登录页面"
 
@@ -3869,6 +3872,12 @@ msgstr "创建组织"
 msgid "Update org"
 msgstr "更新组织"
 
+#~ msgid "Task has been send, Go to ops task list seen result"
+#~ msgstr "任务已下发，查看ops任务列表"
+
+#~ msgid "Task has been send, seen left assets status"
+#~ msgstr "任务已下发，查看左侧资产状态"
+
 #~ msgid "OK"
 #~ msgstr "完成"