[Update] 基本完成登录逻辑

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-10-31 16:57+0800\n"
+"POT-Creation-Date: 2019-11-05 15: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"
@@ -96,7 +96,7 @@ 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/models.py:419
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:46
 #: 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
@@ -145,14 +145,14 @@ msgstr "资产"
 #: terminal/models.py:260 terminal/templates/terminal/terminal_detail.html:43
 #: terminal/templates/terminal/terminal_list.html:29 users/models/group.py:14
 #: users/models/user.py:382 users/templates/users/_select_user_modal.html:13
-#: users/templates/users/user_detail.html:63
+#: users/templates/users/user_detail.html:64
 #: users/templates/users/user_group_detail.html:55
 #: users/templates/users/user_group_list.html:35
 #: users/templates/users/user_list.html:35
 #: 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
@@ -198,8 +198,8 @@ msgstr "参数"
 #: perms/templates/perms/asset_permission_detail.html:98
 #: perms/templates/perms/remote_app_permission_detail.html:90
 #: users/models/user.py:423 users/serializers/group.py:32
-#: users/templates/users/user_detail.html:111
-#: xpack/plugins/change_auth_plan/models.py:108
+#: users/templates/users/user_detail.html:112
+#: 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
@@ -261,11 +261,11 @@ msgstr "创建日期"
 #: perms/templates/perms/remote_app_permission_detail.html:94
 #: settings/models.py:34 terminal/models.py:33
 #: terminal/templates/terminal/terminal_detail.html:63 users/models/group.py:15
-#: users/models/user.py:415 users/templates/users/user_detail.html:129
+#: users/models/user.py:415 users/templates/users/user_detail.html:130
 #: 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
@@ -313,7 +313,7 @@ msgstr "远程应用"
 #: terminal/templates/terminal/terminal_update.html:45
 #: users/templates/users/_user.html:50
 #: users/templates/users/user_bulk_update.html:23
-#: users/templates/users/user_detail.html:178
+#: users/templates/users/user_detail.html:179
 #: users/templates/users/user_group_create_update.html:31
 #: users/templates/users/user_password_update.html:75
 #: users/templates/users/user_profile.html:209
@@ -420,7 +420,7 @@ msgstr "详情"
 #: perms/templates/perms/remote_app_permission_list.html:64
 #: terminal/templates/terminal/terminal_detail.html:16
 #: terminal/templates/terminal/terminal_list.html:73
-#: users/templates/users/user_detail.html:25
+#: users/templates/users/user_detail.html:26
 #: users/templates/users/user_group_detail.html:28
 #: users/templates/users/user_group_list.html:20
 #: users/templates/users/user_group_list.html:71
@@ -467,7 +467,7 @@ msgstr "更新"
 #: settings/templates/settings/terminal_setting.html:93
 #: settings/templates/settings/terminal_setting.html:115
 #: terminal/templates/terminal/terminal_list.html:75
-#: users/templates/users/user_detail.html:30
+#: users/templates/users/user_detail.html:31
 #: users/templates/users/user_group_detail.html:32
 #: users/templates/users/user_group_list.html:73
 #: users/templates/users/user_list.html:111
@@ -606,7 +606,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"
@@ -700,21 +700,21 @@ msgstr "SSH网关，支持代理SSH,RDP和VNC"
 #: assets/templates/assets/admin_user_list.html:45
 #: 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:48 audits/models.py:82
 #: audits/templates/audits/login_log_list.html:57 authentication/forms.py:13
-#: authentication/templates/authentication/login.html:65
-#: authentication/templates/authentication/xpack_login.html:92
+#: authentication/templates/authentication/login.html:60
+#: authentication/templates/authentication/xpack_login.html:87
 #: ops/models/adhoc.py:189 perms/templates/perms/asset_permission_list.html:70
 #: perms/templates/perms/asset_permission_user.html:55
 #: perms/templates/perms/remote_app_permission_user.html:54
 #: settings/templates/settings/_ldap_list_users_modal.html:30 users/forms.py:13
 #: users/models/user.py:380 users/templates/users/_select_user_modal.html:14
-#: users/templates/users/user_detail.html:67
+#: users/templates/users/user_detail.html:68
 #: 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
@@ -732,8 +732,8 @@ msgstr "密码或密钥密码"
 #: assets/templates/assets/_asset_user_auth_update_modal.html:21
 #: assets/templates/assets/_asset_user_auth_view_modal.html:27
 #: authentication/forms.py:15
-#: authentication/templates/authentication/login.html:68
-#: authentication/templates/authentication/xpack_login.html:95
+#: authentication/templates/authentication/login.html:63
+#: authentication/templates/authentication/xpack_login.html:90
 #: settings/forms.py:114 users/forms.py:15 users/forms.py:27
 #: users/templates/users/reset_password.html:53
 #: users/templates/users/user_password_authentication.html:18
@@ -741,8 +741,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 "密码"
 
@@ -938,13 +938,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公钥"
 
@@ -965,7 +965,7 @@ msgid "Contact"
 msgstr "联系人"
 
 #: assets/models/cluster.py:22 users/models/user.py:401
-#: users/templates/users/user_detail.html:76
+#: users/templates/users/user_detail.html:77
 msgid "Phone"
 msgstr "手机"
 
@@ -1121,7 +1121,7 @@ msgstr "默认资产组"
 #: terminal/templates/terminal/command_list.html:65
 #: terminal/templates/terminal/session_list.html:27
 #: terminal/templates/terminal/session_list.html:71 users/forms.py:319
-#: users/models/user.py:136 users/models/user.py:152 users/models/user.py:509
+#: users/models/user.py:132 users/models/user.py:148 users/models/user.py:509
 #: users/serializers/group.py:21
 #: users/templates/users/user_group_detail.html:78
 #: users/templates/users/user_group_list.html:36 users/views/user.py:250
@@ -1187,7 +1187,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 "资产管理"
 
@@ -1236,17 +1236,17 @@ msgstr "系统用户"
 msgid "%(value)s is not an even number"
 msgstr "%(value)s is not an even number"
 
-#: assets/models/utils.py:43 assets/tasks/const.py:84
+#: assets/models/utils.py:43 assets/tasks/const.py:87
 msgid "Unreachable"
 msgstr "不可达"
 
-#: assets/models/utils.py:44 assets/tasks/const.py:85
+#: assets/models/utils.py:44 assets/tasks/const.py:88
 #: assets/templates/assets/asset_list.html:99
 msgid "Reachable"
 msgstr "可连接"
 
-#: assets/models/utils.py:45 assets/tasks/const.py:86
-#: authentication/utils.py:16 xpack/plugins/license/models.py:78
+#: assets/models/utils.py:45 assets/tasks/const.py:89 audits/utils.py:29
+#: xpack/plugins/license/models.py:78
 msgid "Unknown"
 msgstr "未知"
 
@@ -1332,7 +1332,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 任务"
 
@@ -1470,8 +1470,8 @@ msgstr "请输入密码"
 
 #: assets/templates/assets/_asset_user_auth_update_modal.html:68
 #: assets/templates/assets/asset_detail.html:302
-#: users/templates/users/user_detail.html:364
-#: users/templates/users/user_detail.html:391
+#: users/templates/users/user_detail.html:366
+#: users/templates/users/user_detail.html:393
 #: xpack/plugins/interface/views.py:35
 msgid "Update successfully!"
 msgstr "更新成功"
@@ -1481,7 +1481,7 @@ msgid "Asset user auth"
 msgstr "资产用户信息"
 
 #: assets/templates/assets/_asset_user_auth_view_modal.html:54
-#: authentication/templates/authentication/login_wait_confirm.html:117
+#: authentication/templates/authentication/login_wait_confirm.html:114
 msgid "Copy success"
 msgstr "复制成功"
 
@@ -1669,10 +1669,10 @@ msgstr "选择节点"
 #: settings/templates/settings/terminal_setting.html:168
 #: templates/_modal.html:23 terminal/templates/terminal/session_detail.html:112
 #: users/templates/users/user_detail.html:271
-#: users/templates/users/user_detail.html:445
-#: users/templates/users/user_detail.html:471
-#: users/templates/users/user_detail.html:494
-#: users/templates/users/user_detail.html:539
+#: users/templates/users/user_detail.html:447
+#: users/templates/users/user_detail.html:473
+#: users/templates/users/user_detail.html:496
+#: users/templates/users/user_detail.html:541
 #: users/templates/users/user_group_create_update.html:32
 #: users/templates/users/user_group_list.html:120
 #: users/templates/users/user_list.html:256
@@ -1750,7 +1750,7 @@ msgstr "资产用户"
 #: assets/templates/assets/asset_asset_user_list.html:47
 #: assets/templates/assets/asset_detail.html:142
 #: terminal/templates/terminal/session_detail.html:85
-#: users/templates/users/user_detail.html:140
+#: users/templates/users/user_detail.html:141
 #: users/templates/users/user_profile.html:150
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_detail.html:128
 #: xpack/plugins/cloud/templates/cloud/sync_instance_task_detail.html:132
@@ -1777,7 +1777,7 @@ msgid "Disk"
 msgstr "硬盘"
 
 #: assets/templates/assets/asset_detail.html:126
-#: users/templates/users/user_detail.html:115
+#: users/templates/users/user_detail.html:116
 #: users/templates/users/user_profile.html:106
 msgid "Date joined"
 msgstr "创建日期"
@@ -1791,7 +1791,7 @@ msgstr "创建日期"
 #: perms/templates/perms/remote_app_permission_detail.html:112
 #: terminal/templates/terminal/terminal_list.html:34
 #: users/templates/users/_select_user_modal.html:18
-#: users/templates/users/user_detail.html:146
+#: users/templates/users/user_detail.html:147
 #: users/templates/users/user_profile.html:63
 msgid "Active"
 msgstr "激活中"
@@ -1872,9 +1872,9 @@ msgstr "显示所有子节点资产"
 
 #: assets/templates/assets/asset_list.html:417
 #: assets/templates/assets/system_user_list.html:129
-#: users/templates/users/user_detail.html:439
-#: users/templates/users/user_detail.html:465
-#: users/templates/users/user_detail.html:533
+#: users/templates/users/user_detail.html:441
+#: users/templates/users/user_detail.html:467
+#: users/templates/users/user_detail.html:535
 #: users/templates/users/user_group_list.html:114
 #: users/templates/users/user_list.html:250
 #: xpack/plugins/interface/templates/interface/interface.html:97
@@ -1888,9 +1888,9 @@ msgstr "删除选择资产"
 #: assets/templates/assets/asset_list.html:421
 #: assets/templates/assets/system_user_list.html:133
 #: settings/templates/settings/terminal_setting.html:166
-#: users/templates/users/user_detail.html:443
-#: users/templates/users/user_detail.html:469
-#: users/templates/users/user_detail.html:537
+#: users/templates/users/user_detail.html:445
+#: users/templates/users/user_detail.html:471
+#: users/templates/users/user_detail.html:539
 #: users/templates/users/user_group_list.html:118
 #: users/templates/users/user_list.html:254
 #: xpack/plugins/interface/templates/interface/interface.html:101
@@ -2214,11 +2214,11 @@ msgstr "操作"
 msgid "Filename"
 msgstr "文件名"
 
-#: audits/models.py:24 audits/models.py:77
+#: audits/models.py:24 audits/models.py:78
 #: audits/templates/audits/ftp_log_list.html:79
 #: ops/templates/ops/command_execution_list.html:68
 #: ops/templates/ops/task_list.html:15
-#: users/templates/users/user_detail.html:515
+#: users/templates/users/user_detail.html:517
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_execution_subtask_list.html:14
 #: xpack/plugins/cloud/api.py:61
 msgid "Success"
@@ -2243,12 +2243,12 @@ msgstr "资源"
 msgid "Change by"
 msgstr "修改者"
 
-#: audits/models.py:71 users/templates/users/user_detail.html:98
+#: audits/models.py:71 users/templates/users/user_detail.html:99
 msgid "Disabled"
 msgstr "禁用"
 
 #: audits/models.py:72 settings/models.py:33
-#: users/templates/users/user_detail.html:96
+#: users/templates/users/user_detail.html:97
 msgid "Enabled"
 msgstr "启用"
 
@@ -2256,43 +2256,43 @@ msgstr "启用"
 msgid "-"
 msgstr ""
 
-#: audits/models.py:78 xpack/plugins/cloud/models.py:264
+#: audits/models.py:79 xpack/plugins/cloud/models.py:264
 #: xpack/plugins/cloud/models.py:287
 msgid "Failed"
 msgstr "失败"
 
-#: audits/models.py:82
+#: audits/models.py:83
 msgid "Login type"
 msgstr "登录方式"
 
-#: audits/models.py:83
+#: audits/models.py:84
 msgid "Login ip"
 msgstr "登录IP"
 
-#: audits/models.py:84
+#: audits/models.py:85
 msgid "Login city"
 msgstr "登录城市"
 
-#: audits/models.py:85
+#: audits/models.py:86
 msgid "User agent"
 msgstr "Agent"
 
-#: audits/models.py:86 audits/templates/audits/login_log_list.html:62
+#: audits/models.py:87 audits/templates/audits/login_log_list.html:62
 #: authentication/templates/authentication/_mfa_confirm_modal.html:14
 #: users/forms.py:174 users/models/user.py:404
 #: users/templates/users/first_login.html:45
 msgid "MFA"
 msgstr "MFA"
 
-#: audits/models.py:87 audits/templates/audits/login_log_list.html:63
-#: xpack/plugins/change_auth_plan/models.py:416
+#: audits/models.py:88 audits/templates/audits/login_log_list.html:63
+#: 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
 msgid "Reason"
 msgstr "原因"
 
-#: audits/models.py:88 audits/templates/audits/login_log_list.html:64
+#: audits/models.py:89 audits/templates/audits/login_log_list.html:64
 #: orders/templates/orders/login_confirm_order_detail.html:35
 #: orders/templates/orders/login_confirm_order_list.html:17
 #: orders/templates/orders/login_confirm_order_list.html:91
@@ -2302,7 +2302,7 @@ msgstr "原因"
 msgid "Status"
 msgstr "状态"
 
-#: audits/models.py:89
+#: audits/models.py:90
 msgid "Date login"
 msgstr "登录日期"
 
@@ -2314,8 +2314,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:143
@@ -2391,9 +2391,7 @@ msgstr "登录日志"
 msgid "Command execution log"
 msgstr "命令执行"
 
-#: authentication/api/auth.py:58 authentication/api/token.py:45
-#: authentication/templates/authentication/login.html:52
-#: authentication/templates/authentication/xpack_login.html:77
+#: authentication/api/auth.py:58
 msgid "Log in frequently and try again later"
 msgstr "登录频繁, 稍后重试"
 
@@ -2409,18 +2407,6 @@ msgstr "请先进行用户名和密码验证"
 msgid "MFA certification failed"
 msgstr "MFA认证失败"
 
-#: authentication/api/auth.py:222
-msgid "No order found or order expired"
-msgstr "没有找到工单，或者已过期"
-
-#: authentication/api/auth.py:228
-msgid "Order was rejected by {}"
-msgstr "工单被拒绝 {}"
-
-#: authentication/api/token.py:81
-msgid "MFA required"
-msgstr ""
-
 #: authentication/backends/api.py:53
 msgid "Invalid signature header. No credentials provided."
 msgstr ""
@@ -2472,49 +2458,75 @@ msgstr ""
 msgid "Invalid token or cache refreshed."
 msgstr ""
 
-#: authentication/const.py:6
+#: authentication/errors.py:20
 msgid "Username/password check failed"
 msgstr "用户名/密码 校验失败"
 
-#: authentication/const.py:7
+#: authentication/errors.py:21
 msgid "MFA authentication failed"
 msgstr "MFA 认证失败"
 
-#: authentication/const.py:8
+#: authentication/errors.py:22
 msgid "Username does not exist"
 msgstr "用户名不存在"
 
-#: authentication/const.py:9
+#: authentication/errors.py:23
 msgid "Password expired"
-msgstr "密码过期"
+msgstr "密码已过期"
 
-#: authentication/const.py:10
+#: authentication/errors.py:24
 msgid "Disabled or expired"
 msgstr "禁用或失效"
 
-#: authentication/forms.py:21
-msgid ""
-"The username or password you entered is incorrect, please enter it again."
-msgstr "您输入的用户名或密码不正确，请重新输入。"
-
-#: authentication/forms.py:24
+#: authentication/errors.py:25
 msgid "This account is inactive."
-msgstr "此账户无效"
+msgstr "此账户已禁用"
 
-#: authentication/forms.py:26
+#: authentication/errors.py:28
+msgid "No session found, check your cookie"
+msgstr "会话已变更，刷新页面"
+
+#: authentication/errors.py:30
 #, python-brace-format
 msgid ""
+"The username or password you entered is incorrect, please enter it again. "
 "You can also try {times_try} times (The account will be temporarily locked "
 "for {block_time} minutes)"
-msgstr "您还可以尝试 {times_try} 次（账号将被临时锁定 {block_time} 分钟）"
+msgstr ""
+"您输入的用户名或密码不正确，请重新输入。 您还可以尝试 {times_try} 次（账号将"
+"被临时 锁定 {block_time} 分钟）"
 
-#: authentication/forms.py:30
+#: authentication/errors.py:36
 msgid ""
 "The account has been locked (please contact admin to unlock it or try again "
 "after {} minutes)"
 msgstr "账号已被锁定（请联系管理员解锁 或 {}分钟后重试）"
 
-#: authentication/forms.py:66 users/forms.py:21
+#: authentication/errors.py:39 users/views/user.py:393 users/views/user.py:418
+msgid "MFA code invalid, or ntp sync server time"
+msgstr "MFA验证码不正确，或者服务器端时间不对"
+
+#: authentication/errors.py:41
+msgid "MFA required"
+msgstr ""
+
+#: authentication/errors.py:42
+msgid "Login confirm required"
+msgstr "需要登录复核"
+
+#: authentication/errors.py:43
+msgid "Wait login confirm order for accept"
+msgstr "等待登录复核处理"
+
+#: authentication/errors.py:44
+msgid "Login confirm order was rejected"
+msgstr "登录已被拒绝"
+
+#: authentication/errors.py:45
+msgid "Order not found"
+msgstr "没有发现工单"
+
+#: authentication/forms.py:32 users/forms.py:21
 msgid "MFA code"
 msgstr "MFA 验证码"
 
@@ -2522,18 +2534,10 @@ msgstr "MFA 验证码"
 msgid "Private Token"
 msgstr "ssh密钥"
 
-#: authentication/models.py:43
-msgid "login_confirm_setting"
-msgstr "登录复核设置"
-
 #: authentication/models.py:44 users/templates/users/user_detail.html:265
 msgid "Reviewers"
 msgstr "审批人"
 
-#: authentication/models.py:44
-msgid "review_login_confirm_settings"
-msgstr ""
-
 #: authentication/models.py:53
 msgid "User login confirm: {}"
 msgstr "用户登录复核: {}"
@@ -2572,14 +2576,14 @@ msgid "Show"
 msgstr "显示"
 
 #: authentication/templates/authentication/_access_key_modal.html:66
-#: users/models/user.py:339 users/templates/users/user_profile.html:94
+#: users/models/user.py:335 users/templates/users/user_profile.html:94
 #: users/templates/users/user_profile.html:163
 #: users/templates/users/user_profile.html:166
 msgid "Disable"
 msgstr "禁用"
 
 #: authentication/templates/authentication/_access_key_modal.html:67
-#: users/models/user.py:340 users/templates/users/user_profile.html:92
+#: users/models/user.py:336 users/templates/users/user_profile.html:92
 #: users/templates/users/user_profile.html:170
 msgid "Enable"
 msgstr "启用"
@@ -2640,39 +2644,34 @@ msgid "Changes the world, starting with a little bit."
 msgstr "改变世界，从一点点开始。"
 
 #: authentication/templates/authentication/login.html:46
-#: authentication/templates/authentication/login.html:73
-#: authentication/templates/authentication/xpack_login.html:101
+#: authentication/templates/authentication/login.html:68
+#: authentication/templates/authentication/xpack_login.html:96
 #: templates/_header_bar.html:83
 msgid "Login"
 msgstr "登录"
 
-#: authentication/templates/authentication/login.html:54
-#: authentication/templates/authentication/xpack_login.html:80
-msgid "The user password has expired"
-msgstr "用户密码已过期"
-
-#: authentication/templates/authentication/login.html:57
-#: authentication/templates/authentication/xpack_login.html:83
+#: authentication/templates/authentication/login.html:52
+#: authentication/templates/authentication/xpack_login.html:78
 msgid "Captcha invalid"
 msgstr "验证码错误"
 
-#: authentication/templates/authentication/login.html:84
-#: authentication/templates/authentication/xpack_login.html:105
+#: authentication/templates/authentication/login.html:79
+#: authentication/templates/authentication/xpack_login.html:100
 #: users/templates/users/forgot_password.html:10
 #: users/templates/users/forgot_password.html:25
 msgid "Forgot password"
 msgstr "忘记密码"
 
-#: authentication/templates/authentication/login.html:91
+#: authentication/templates/authentication/login.html:86
 msgid "More login options"
 msgstr "更多登录方式"
 
-#: authentication/templates/authentication/login.html:95
+#: authentication/templates/authentication/login.html:90
 msgid "Keycloak"
 msgstr ""
 
 #: authentication/templates/authentication/login_otp.html:46
-#: users/templates/users/user_detail.html:91
+#: users/templates/users/user_detail.html:92
 #: users/templates/users/user_profile.html:87
 msgid "MFA certification"
 msgstr "MFA认证"
@@ -2721,16 +2720,11 @@ msgstr "返回"
 msgid "Welcome back, please enter username and password to login"
 msgstr "欢迎回来，请输入用户名和密码登录"
 
-#: authentication/views/login.py:82
+#: authentication/views/login.py:80
 msgid "Please enable cookies and try again."
 msgstr "设置你的浏览器支持cookie"
 
-#: authentication/views/login.py:156 users/views/user.py:393
-#: users/views/user.py:418
-msgid "MFA code invalid, or ntp sync server time"
-msgstr "MFA验证码不正确，或者服务器端时间不对"
-
-#: authentication/views/login.py:226
+#: authentication/views/login.py:192
 msgid ""
 "Wait for <b>{}</b> confirm, You also can copy link to her/him <br/>\n"
 "                  Don't close this page"
@@ -2738,15 +2732,15 @@ msgstr ""
 "等待 <b>{}</b> 确认, 你也可以复制链接发给他/她 <br/>\n"
 "                  不要关闭本页面"
 
-#: authentication/views/login.py:231
+#: authentication/views/login.py:197
 msgid "No order found"
 msgstr "没有发现工单"
 
-#: authentication/views/login.py:254
+#: authentication/views/login.py:220
 msgid "Logout success"
 msgstr "退出登录成功"
 
-#: authentication/views/login.py:255
+#: authentication/views/login.py:221
 msgid "Logout success, return login page"
 msgstr "退出登录成功，返回到登录页面"
 
@@ -2930,8 +2924,8 @@ msgstr "完成时间"
 
 #: ops/models/adhoc.py:357 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:146
@@ -3305,11 +3299,11 @@ msgstr ""
 "        </div>\n"
 "    "
 
-#: orders/utils.py:52
+#: orders/utils.py:48
 msgid "Order has been reply"
 msgstr "工单已被回复"
 
-#: orders/utils.py:53
+#: orders/utils.py:49
 #, python-brace-format
 msgid ""
 "\n"
@@ -3418,7 +3412,7 @@ msgstr "资产授权"
 #: perms/models/base.py:53
 #: perms/templates/perms/asset_permission_detail.html:90
 #: perms/templates/perms/remote_app_permission_detail.html:82
-#: users/models/user.py:420 users/templates/users/user_detail.html:107
+#: users/models/user.py:420 users/templates/users/user_detail.html:108
 #: users/templates/users/user_profile.html:120
 msgid "Date expired"
 msgstr "失效日期"
@@ -3982,7 +3976,7 @@ msgid "Please submit the LDAP configuration before import"
 msgstr "请先提交LDAP配置再进行导入"
 
 #: settings/templates/settings/_ldap_list_users_modal.html:32
-#: users/models/user.py:384 users/templates/users/user_detail.html:71
+#: users/models/user.py:384 users/templates/users/user_detail.html:72
 #: users/templates/users/user_profile.html:59
 msgid "Email"
 msgstr "邮件"
@@ -4775,7 +4769,7 @@ msgstr "不能再该页面重置MFA, 请去个人信息页面重置"
 
 #: users/forms.py:32 users/models/user.py:392
 #: users/templates/users/_select_user_modal.html:15
-#: users/templates/users/user_detail.html:87
+#: users/templates/users/user_detail.html:88
 #: users/templates/users/user_list.html:37
 #: users/templates/users/user_profile.html:55
 msgid "Role"
@@ -4818,7 +4812,7 @@ msgstr "生成重置密码链接，通过邮件发送给用户"
 msgid "Set password"
 msgstr "设置密码"
 
-#: users/forms.py:132 xpack/plugins/change_auth_plan/models.py:88
+#: users/forms.py:132 xpack/plugins/change_auth_plan/models.py:89
 #: xpack/plugins/change_auth_plan/templates/change_auth_plan/plan_create_update.html:51
 #: 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
@@ -4892,28 +4886,28 @@ msgstr "选择用户"
 msgid "User auth from {}, go there change password"
 msgstr "用户认证源来自 {}, 请去相应系统修改密码"
 
-#: users/models/user.py:135 users/models/user.py:517
+#: users/models/user.py:131 users/models/user.py:517
 msgid "Administrator"
 msgstr "管理员"
 
-#: users/models/user.py:137
+#: users/models/user.py:133
 msgid "Application"
 msgstr "应用程序"
 
-#: users/models/user.py:138 xpack/plugins/orgs/forms.py:30
+#: users/models/user.py:134 xpack/plugins/orgs/forms.py:30
 #: xpack/plugins/orgs/templates/orgs/org_list.html:14
 msgid "Auditor"
 msgstr "审计员"
 
-#: users/models/user.py:148
+#: users/models/user.py:144
 msgid "Org admin"
 msgstr "组织管理员"
 
-#: users/models/user.py:150
+#: users/models/user.py:146
 msgid "Org auditor"
 msgstr "组织审计员"
 
-#: users/models/user.py:341 users/templates/users/user_profile.html:90
+#: users/models/user.py:337 users/templates/users/user_profile.html:90
 msgid "Force enable"
 msgstr "强制启用"
 
@@ -4921,11 +4915,11 @@ msgstr "强制启用"
 msgid "Avatar"
 msgstr "头像"
 
-#: users/models/user.py:398 users/templates/users/user_detail.html:82
+#: users/models/user.py:398 users/templates/users/user_detail.html:83
 msgid "Wechat"
 msgstr "微信"
 
-#: users/models/user.py:427 users/templates/users/user_detail.html:103
+#: users/models/user.py:427 users/templates/users/user_detail.html:104
 #: users/templates/users/user_list.html:39
 #: users/templates/users/user_profile.html:102
 msgid "Source"
@@ -5107,7 +5101,7 @@ msgid "Always young, always with tears in my eyes. Stay foolish Stay hungry"
 msgstr "永远年轻，永远热泪盈眶 stay foolish stay hungry"
 
 #: users/templates/users/reset_password.html:46
-#: users/templates/users/user_detail.html:430 users/utils.py:83
+#: users/templates/users/user_detail.html:432 users/utils.py:83
 msgid "Reset password"
 msgstr "重置密码"
 
@@ -5176,102 +5170,102 @@ msgstr "很强"
 msgid "Create user"
 msgstr "创建用户"
 
-#: users/templates/users/user_detail.html:19
+#: users/templates/users/user_detail.html:20
 #: users/templates/users/user_granted_asset.html:18 users/views/user.py:190
 msgid "User detail"
 msgstr "用户详情"
 
-#: users/templates/users/user_detail.html:22
+#: users/templates/users/user_detail.html:23
 #: users/templates/users/user_granted_asset.html:21
 #: users/templates/users/user_group_detail.html:25
 #: users/templates/users/user_group_granted_asset.html:21
 msgid "Asset granted"
 msgstr "授权的资产"
 
-#: users/templates/users/user_detail.html:94
+#: users/templates/users/user_detail.html:95
 msgid "Force enabled"
 msgstr "强制启用"
 
-#: users/templates/users/user_detail.html:119
+#: users/templates/users/user_detail.html:120
 #: users/templates/users/user_profile.html:110
 msgid "Last login"
 msgstr "最后登录"
 
-#: users/templates/users/user_detail.html:124
+#: users/templates/users/user_detail.html:125
 #: users/templates/users/user_profile.html:115
 msgid "Last password updated"
 msgstr "最后更新密码"
 
-#: users/templates/users/user_detail.html:160
+#: users/templates/users/user_detail.html:161
 msgid "Force enabled MFA"
 msgstr "强制启用MFA"
 
-#: users/templates/users/user_detail.html:175
+#: users/templates/users/user_detail.html:176
 msgid "Reset MFA"
 msgstr "重置MFA"
 
-#: users/templates/users/user_detail.html:184
+#: users/templates/users/user_detail.html:185
 msgid "Send reset password mail"
 msgstr "发送重置密码邮件"
 
-#: users/templates/users/user_detail.html:187
-#: users/templates/users/user_detail.html:197
+#: users/templates/users/user_detail.html:188
+#: users/templates/users/user_detail.html:198
 msgid "Send"
 msgstr "发送"
 
-#: users/templates/users/user_detail.html:194
+#: users/templates/users/user_detail.html:195
 msgid "Send reset ssh key mail"
 msgstr "发送重置密钥邮件"
 
-#: users/templates/users/user_detail.html:203
-#: users/templates/users/user_detail.html:518
+#: users/templates/users/user_detail.html:204
+#: users/templates/users/user_detail.html:520
 msgid "Unblock user"
 msgstr "解除登录限制"
 
-#: users/templates/users/user_detail.html:206
+#: users/templates/users/user_detail.html:207
 msgid "Unblock"
 msgstr "解除"
 
-#: users/templates/users/user_detail.html:373
+#: users/templates/users/user_detail.html:375
 msgid "Goto profile page enable MFA"
 msgstr "请去个人信息页面启用自己的MFA"
 
-#: users/templates/users/user_detail.html:429
+#: users/templates/users/user_detail.html:431
 msgid "An e-mail has been sent to the user`s mailbox."
 msgstr "已发送邮件到用户邮箱"
 
-#: users/templates/users/user_detail.html:440
+#: users/templates/users/user_detail.html:442
 msgid "This will reset the user password and send a reset mail"
 msgstr "将失效用户当前密码，并发送重设密码邮件到用户邮箱"
 
-#: users/templates/users/user_detail.html:455
+#: users/templates/users/user_detail.html:457
 msgid ""
 "The reset-ssh-public-key E-mail has been sent successfully. Please inform "
 "the user to update his new ssh public key."
 msgstr "重设密钥邮件将会发送到用户邮箱"
 
-#: users/templates/users/user_detail.html:456
+#: users/templates/users/user_detail.html:458
 msgid "Reset SSH public key"
 msgstr "重置SSH密钥"
 
-#: users/templates/users/user_detail.html:466
+#: users/templates/users/user_detail.html:468
 msgid "This will reset the user public key and send a reset mail"
 msgstr "将会失效用户当前密钥，并发送重置邮件到用户邮箱"
 
-#: users/templates/users/user_detail.html:484
+#: users/templates/users/user_detail.html:486
 msgid "Successfully updated the SSH public key."
 msgstr "更新ssh密钥成功"
 
-#: users/templates/users/user_detail.html:485
-#: users/templates/users/user_detail.html:489
+#: users/templates/users/user_detail.html:487
+#: users/templates/users/user_detail.html:491
 msgid "User SSH public key update"
 msgstr "ssh密钥"
 
-#: users/templates/users/user_detail.html:534
+#: users/templates/users/user_detail.html:536
 msgid "After unlocking the user, the user can log in normally."
 msgstr "解除用户登录限制后，此用户即可正常登录"
 
-#: users/templates/users/user_detail.html:548
+#: users/templates/users/user_detail.html:550
 msgid "Reset user MFA success"
 msgstr "重置用户MFA成功"
 
@@ -5754,8 +5748,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
@@ -5766,20 +5760,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
@@ -5788,8 +5782,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
@@ -5798,37 +5792,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 "连接超时"
 
@@ -6438,6 +6432,27 @@ msgstr "密码匣子"
 msgid "vault create"
 msgstr "创建"
 
+#~ msgid ""
+#~ "The username or password you entered is incorrect, please enter it again."
+#~ msgstr "您输入的用户名或密码不正确，请重新输入。"
+
+#~ msgid ""
+#~ "You can also try {times_try} times (The account will be temporarily "
+#~ "locked for {block_time} minutes)"
+#~ msgstr "您还可以尝试 {times_try} 次（账号将被临时锁定 {block_time} 分钟）"
+
+#~ msgid "No order found or order expired"
+#~ msgstr "没有找到工单，或者已过期"
+
+#~ msgid "Order was rejected by {}"
+#~ msgstr "工单被拒绝 {}"
+
+#~ msgid "login_confirm_setting"
+#~ msgstr "登录复核设置"
+
+#~ msgid "The user password has expired"
+#~ msgstr "用户密码已过期"
+
 #~ msgid "Recipient"
 #~ msgstr "收件人"