perf: 优化批量危险命令告警

apps/locale/zh/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: JumpServer 0.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-06-16 14:26+0800\n"
+"POT-Creation-Date: 2021-06-16 17:47+0800\n"
 "PO-Revision-Date: 2021-05-20 10:54+0800\n"
 "Last-Translator: ibuler <ibuler@qq.com>\n"
 "Language-Team: JumpServer team<ibuler@qq.com>\n"
@@ -119,7 +119,7 @@ msgstr "系统用户"
 
 #: acls/models/login_asset_acl.py:22
 #: applications/serializers/attrs/application_category/remote_app.py:33
-#: assets/models/asset.py:355 assets/models/authbook.py:26
+#: assets/models/asset.py:355 assets/models/authbook.py:27
 #: assets/models/gathered_user.py:14 assets/serializers/admin_user.py:34
 #: assets/serializers/asset_user.py:48 assets/serializers/asset_user.py:91
 #: assets/serializers/system_user.py:202 audits/models.py:38
@@ -184,7 +184,7 @@ msgstr "格式为逗号分隔的字符串, * 表示匹配所有. "
 #: users/templates/users/_select_user_modal.html:14
 #: xpack/plugins/change_auth_plan/models.py:47
 #: xpack/plugins/change_auth_plan/models.py:278
-#: xpack/plugins/cloud/serializers.py:65
+#: xpack/plugins/cloud/serializers.py:51
 msgid "Username"
 msgstr "用户名"
 
@@ -233,7 +233,7 @@ msgstr "所有复核人都不属于组织 `{}`"
 #: applications/const.py:9
 #: applications/serializers/attrs/application_category/db.py:14
 #: applications/serializers/attrs/application_type/mysql_workbench.py:26
-#: assets/backends/db.py:278
+#: assets/backends/db.py:279
 msgid "Database"
 msgstr "数据库"
 
@@ -304,7 +304,7 @@ msgid "Cluster"
 msgstr "集群"
 
 #: applications/serializers/attrs/application_category/db.py:11
-#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:63
+#: ops/models/adhoc.py:146 xpack/plugins/cloud/serializers.py:49
 msgid "Host"
 msgstr "主机"
 
@@ -314,7 +314,7 @@ msgstr "主机"
 #: applications/serializers/attrs/application_type/oracle.py:11
 #: applications/serializers/attrs/application_type/pgsql.py:11
 #: assets/models/asset.py:188 assets/models/domain.py:53
-#: xpack/plugins/cloud/serializers.py:64
+#: xpack/plugins/cloud/serializers.py:50
 msgid "Port"
 msgstr "端口"
 
@@ -344,7 +344,7 @@ msgstr "目标URL"
 #: xpack/plugins/change_auth_plan/models.py:68
 #: xpack/plugins/change_auth_plan/models.py:190
 #: xpack/plugins/change_auth_plan/models.py:285
-#: xpack/plugins/cloud/serializers.py:67
+#: xpack/plugins/cloud/serializers.py:53
 msgid "Password"
 msgstr "密码"
 
@@ -376,7 +376,7 @@ msgstr "不能删除根节点 ({})"
 msgid "Deletion failed and the node contains assets"
 msgstr "删除失败，节点包含资产"
 
-#: assets/backends/db.py:109 assets/models/user.py:304 audits/models.py:39
+#: assets/backends/db.py:110 assets/models/user.py:304 audits/models.py:39
 #: perms/models/application_permission.py:31
 #: perms/models/asset_permission.py:101 templates/_nav.html:45
 #: terminal/backends/command/models.py:20
@@ -390,21 +390,21 @@ msgstr "删除失败，节点包含资产"
 msgid "System user"
 msgstr "系统用户"
 
-#: assets/backends/db.py:180
+#: assets/backends/db.py:181
 msgid "System user(Dynamic)"
 msgstr "系统用户(动态)"
 
-#: assets/backends/db.py:232 assets/models/asset.py:196
+#: assets/backends/db.py:233 assets/models/asset.py:196
 #: assets/models/cluster.py:19 assets/models/user.py:67 templates/_nav.html:44
-#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:160
+#: xpack/plugins/cloud/models.py:92 xpack/plugins/cloud/serializers.py:146
 msgid "Admin user"
 msgstr "管理用户"
 
-#: assets/backends/db.py:253
+#: assets/backends/db.py:254
 msgid "Could not remove asset admin user"
 msgstr "不能移除资产的管理用户账号"
 
-#: assets/backends/db.py:317
+#: assets/backends/db.py:318
 msgid "Latest version could not be delete"
 msgstr "最新版本的不能被删除"
 
@@ -538,19 +538,19 @@ msgstr "创建者"
 msgid "Date created"
 msgstr "创建日期"
 
-#: assets/models/authbook.py:17
+#: assets/models/authbook.py:18
 msgid "Bulk delete deny"
 msgstr "拒绝批量删除"
 
-#: assets/models/authbook.py:27
+#: assets/models/authbook.py:28
 msgid "Latest version"
 msgstr "最新版本"
 
-#: assets/models/authbook.py:28
+#: assets/models/authbook.py:29
 msgid "Version"
 msgstr "版本"
 
-#: assets/models/authbook.py:37
+#: assets/models/authbook.py:38
 msgid "AuthBook"
 msgstr ""
 
@@ -715,7 +715,7 @@ msgstr "ssh私钥"
 #: users/templates/users/user_asset_permission.html:41
 #: users/templates/users/user_asset_permission.html:73
 #: users/templates/users/user_asset_permission.html:158
-#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:161
+#: xpack/plugins/cloud/models.py:89 xpack/plugins/cloud/serializers.py:147
 msgid "Node"
 msgstr "节点"
 
@@ -3329,7 +3329,6 @@ msgstr "批量危险命令告警"
 #, python-format
 msgid ""
 "\n"
-"                            <br>\n"
 "                            Assets: %(assets)s\n"
 "                            <br>\n"
 "                            User: %(user)s\n"
@@ -3345,7 +3344,6 @@ msgid ""
 "                            "
 msgstr ""
 "\n"
-"        <br>\n"
 "        资产: %(assets)s\n"
 "        <br>\n"
 "        用户: %(user)s\n"
@@ -3358,10 +3356,10 @@ msgstr ""
 "        ----------------- 命令 ---------------- <br>\n"
 "        "
 
-#: terminal/notifications.py:134
+#: terminal/notifications.py:133
 #, python-format
 msgid "Insecure Web Command Execution Alert: [%(name)s]"
-msgstr "Web页面-> 命令执行 告警: [%(name)s]"
+msgstr "批量危险命令告警: [%(name)s]"
 
 #: terminal/serializers/session.py:33
 msgid "User ID"
@@ -4059,7 +4057,7 @@ msgid "Security token validation"
 msgstr "安全令牌验证"
 
 #: users/templates/users/_base_otp.html:14 xpack/plugins/cloud/models.py:78
-#: xpack/plugins/cloud/serializers.py:159
+#: xpack/plugins/cloud/serializers.py:145
 msgid "Account"
 msgstr "账户"
 
@@ -4800,7 +4798,7 @@ msgstr "云服务商"
 msgid "Cloud account"
 msgstr "云账号"
 
-#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:140
+#: xpack/plugins/cloud/models.py:81 xpack/plugins/cloud/serializers.py:126
 msgid "Regions"
 msgstr "地域"
 
@@ -4808,7 +4806,7 @@ msgstr "地域"
 msgid "Hostname strategy"
 msgstr "主机名策略"
 
-#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:163
+#: xpack/plugins/cloud/models.py:95 xpack/plugins/cloud/serializers.py:149
 msgid "Always update"
 msgstr "总是更新"
 
@@ -5000,24 +4998,20 @@ msgstr ""
 msgid "Subscription ID"
 msgstr ""
 
-#: xpack/plugins/cloud/serializers.py:49
-msgid "This field is required"
-msgstr "这个字段是必填项"
-
-#: xpack/plugins/cloud/serializers.py:138
+#: xpack/plugins/cloud/serializers.py:124
 msgid "History count"
 msgstr "执行次数"
 
-#: xpack/plugins/cloud/serializers.py:139
+#: xpack/plugins/cloud/serializers.py:125
 msgid "Instance count"
 msgstr "实例个数"
 
-#: xpack/plugins/cloud/serializers.py:162
+#: xpack/plugins/cloud/serializers.py:148
 #: xpack/plugins/gathered_user/serializers.py:20
 msgid "Periodic display"
 msgstr "定时执行"
 
-#: xpack/plugins/cloud/utils.py:65
+#: xpack/plugins/cloud/utils.py:64
 msgid "Account unavailable"
 msgstr "账户无效"
 
@@ -5105,5 +5099,8 @@ msgstr "旗舰版"
 msgid "Community edition"
 msgstr "社区版"
 
+#~ msgid "This field is required"
+#~ msgstr "这个字段是必填项"
+
 #~ msgid "Terminal command alert"
 #~ msgstr "终端命令告警"

apps/terminal/notifications.py

@@ -119,7 +119,6 @@ class CommandExecutionAlert(CommandAlertMixin, SystemMessage):
 
         assets = ', '.join([str(asset) for asset in command['assets']])
         message = _("""
-                            <br>
                             Assets: %(assets)s
                             <br>
                             User: %(user)s