fix: 修复任务再次执行报500问题 (#9584)

Co-authored-by: Aaron3S <chenyang@fit2cloud.com>
pull/9586/head
fit2bot 2023-02-16 15:52:21 +08:00 committed by GitHub
parent e84411588a
commit ef33bc211d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 206 additions and 176 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8c78d1db90dbda0b4ab307a4107894b742690cae5f532de12477b9cb10cda372
size 135124
oid sha256:4190f4708c72e943e4dbe743c035270b7cfe0bf231383f09cb7b926459c9d74c
size 135279

View File

@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-02-15 18:07+0800\n"
"POT-Creation-Date: 2023-02-16 15:25+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -26,7 +26,7 @@ msgstr "パラメータ 'action' は [{}] でなければなりません。"
#: accounts/serializers/automations/change_secret.py:33
#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28
#: authentication/confirm/password.py:9 authentication/forms.py:32
#: authentication/templates/authentication/login.html:288
#: authentication/templates/authentication/login.html:274
#: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47
#: users/forms/profile.py:22 users/serializers/user.py:99
#: users/templates/users/_msg_user_created.html:13
@ -171,7 +171,7 @@ msgstr "作成のみ"
#: perms/models/asset_permission.py:64 perms/serializers/permission.py:27
#: terminal/backends/command/models.py:21 terminal/models/session/session.py:31
#: terminal/notifications.py:95 terminal/serializers/command.py:16
#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:212
#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:220
msgid "Asset"
msgstr "資産"
@ -194,7 +194,7 @@ msgstr "ソース"
#: accounts/serializers/automations/change_secret.py:108
#: accounts/serializers/automations/change_secret.py:128
#: acls/models/base.py:102 acls/serializers/base.py:57
#: assets/serializers/asset/common.py:120 assets/serializers/gateway.py:28
#: assets/serializers/asset/common.py:123 assets/serializers/gateway.py:28
#: audits/models.py:37 ops/models/base.py:18
#: perms/models/asset_permission.py:70 perms/serializers/permission.py:32
#: terminal/backends/command/models.py:22 terminal/models/session/session.py:33
@ -271,7 +271,7 @@ msgid "Trigger mode"
msgstr "トリガーモード"
#: accounts/models/automations/backup_account.py:91 audits/models.py:158
#: terminal/models/session/sharing.py:107 xpack/plugins/cloud/models.py:168
#: terminal/models/session/sharing.py:107 xpack/plugins/cloud/models.py:176
msgid "Reason"
msgstr "理由"
@ -425,12 +425,13 @@ msgstr "アカウントの確認"
#: assets/models/cmd_filter.py:21 assets/models/domain.py:18
#: assets/models/group.py:20 assets/models/label.py:18
#: assets/models/platform.py:20 assets/models/platform.py:74
#: assets/serializers/asset/common.py:63 assets/serializers/asset/common.py:137
#: assets/serializers/asset/common.py:66 assets/serializers/asset/common.py:140
#: assets/serializers/platform.py:131
#: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:21
#: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57
#: ops/models/job.py:26 ops/models/playbook.py:22 ops/serializers/job.py:19
#: orgs/models.py:69 perms/models/asset_permission.py:56 rbac/models/role.py:29
#: ops/serializers/playbook.py:19 orgs/models.py:69
#: perms/models/asset_permission.py:56 rbac/models/role.py:29
#: settings/models.py:33 settings/serializers/sms.py:6
#: terminal/models/applet/applet.py:26 terminal/models/component/endpoint.py:12
#: terminal/models/component/endpoint.py:90
@ -511,23 +512,23 @@ msgstr ""
"情報にアクセスしてください-> ファイル暗号化パスワードを設定してください"
#: accounts/serializers/account/account.py:65
#: assets/serializers/asset/common.py:61 settings/serializers/auth/sms.py:75
#: assets/serializers/asset/common.py:64 settings/serializers/auth/sms.py:75
msgid "Template"
msgstr "テンプレート"
#: accounts/serializers/account/account.py:68
#: assets/serializers/asset/common.py:58
#: assets/serializers/asset/common.py:61
msgid "Push now"
msgstr "今すぐプッシュ"
#: accounts/serializers/account/account.py:70
#: accounts/serializers/account/base.py:64
#: accounts/serializers/account/base.py:62
msgid "Has secret"
msgstr "エスクローされたパスワード"
#: accounts/serializers/account/account.py:75 applications/models.py:11
#: assets/models/label.py:21 assets/models/platform.py:75
#: assets/serializers/asset/common.py:116 assets/serializers/cagegory.py:8
#: assets/serializers/asset/common.py:119 assets/serializers/cagegory.py:8
#: assets/serializers/platform.py:93 assets/serializers/platform.py:132
#: perms/serializers/user_permission.py:25 settings/models.py:35
#: tickets/models/ticket/apply_application.py:13
@ -539,7 +540,7 @@ msgstr "カテゴリ"
#: acls/serializers/command_acl.py:18 applications/models.py:14
#: assets/models/_user.py:50 assets/models/automations/base.py:20
#: assets/models/cmd_filter.py:74 assets/models/platform.py:76
#: assets/serializers/asset/common.py:117 assets/serializers/platform.py:92
#: assets/serializers/asset/common.py:120 assets/serializers/platform.py:92
#: audits/serializers.py:49
#: authentication/serializers/connect_token_secret.py:116 ops/models/job.py:34
#: perms/serializers/user_permission.py:26 terminal/models/applet/applet.py:30
@ -582,8 +583,8 @@ msgstr "キー/パスワード"
msgid "Key password"
msgstr "キーパスワード"
#: accounts/serializers/account/base.py:81
#: assets/serializers/asset/common.py:280
#: accounts/serializers/account/base.py:79
#: assets/serializers/asset/common.py:287
msgid "Spec info"
msgstr "特別情報"
@ -993,7 +994,7 @@ msgid "Device"
msgstr "インターネット機器"
#: assets/const/category.py:13 assets/models/asset/database.py:9
#: assets/models/asset/database.py:24 assets/serializers/asset/common.py:104
#: assets/models/asset/database.py:24 assets/serializers/asset/common.py:107
msgid "Database"
msgstr "データベース"
@ -1042,7 +1043,7 @@ msgid "Basic"
msgstr "基本"
#: assets/const/web.py:61 assets/models/asset/web.py:13
#: assets/serializers/asset/common.py:112 assets/serializers/platform.py:39
#: assets/serializers/asset/common.py:115 assets/serializers/platform.py:39
msgid "Script"
msgstr "脚本"
@ -1064,7 +1065,7 @@ msgstr "SSHパブリックキー"
#: terminal/models/component/endpoint.py:100
#: terminal/models/session/session.py:46 tickets/models/comment.py:32
#: tickets/models/ticket/general.py:297 users/models/user.py:756
#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:111
#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:119
msgid "Comment"
msgstr "コメント"
@ -1158,14 +1159,14 @@ msgstr "システムユーザー"
msgid "Can match system user"
msgstr "システムユーザーに一致できます"
#: assets/models/asset/common.py:108 assets/serializers/asset/common.py:138
#: assets/models/asset/common.py:108 assets/serializers/asset/common.py:141
msgid "Address"
msgstr "アドレス"
#: assets/models/asset/common.py:109 assets/models/platform.py:111
#: authentication/serializers/connect_token_secret.py:108
#: perms/serializers/user_permission.py:23
#: xpack/plugins/cloud/serializers/account_attrs.py:182
#: xpack/plugins/cloud/serializers/account_attrs.py:179
msgid "Platform"
msgstr "プラットフォーム"
@ -1211,7 +1212,7 @@ msgstr "アセットをノードに移動する"
msgid "Remove asset from node"
msgstr "ノードからアセットを削除"
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:105
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:108
#: settings/serializers/email.py:37
msgid "Use SSL"
msgstr "SSLの使用"
@ -1228,7 +1229,7 @@ msgstr "クライアント証明書"
msgid "Client key"
msgstr "クライアントキー"
#: assets/models/asset/database.py:14 assets/serializers/asset/common.py:106
#: assets/models/asset/database.py:14 assets/serializers/asset/common.py:109
msgid "Allow invalid cert"
msgstr "証明書チェックを無視"
@ -1236,23 +1237,23 @@ msgstr "証明書チェックを無視"
msgid "Autofill"
msgstr "自動充填"
#: assets/models/asset/web.py:10 assets/serializers/asset/common.py:109
#: assets/models/asset/web.py:10 assets/serializers/asset/common.py:112
#: assets/serializers/platform.py:31
msgid "Username selector"
msgstr "ユーザー名ピッカー"
#: assets/models/asset/web.py:11 assets/serializers/asset/common.py:110
#: assets/models/asset/web.py:11 assets/serializers/asset/common.py:113
#: assets/serializers/platform.py:34
msgid "Password selector"
msgstr "パスワードセレクター"
#: assets/models/asset/web.py:12 assets/serializers/asset/common.py:111
#: assets/models/asset/web.py:12 assets/serializers/asset/common.py:114
#: assets/serializers/platform.py:37
msgid "Submit selector"
msgstr "ボタンセレクターを確認する"
#: assets/models/automations/base.py:17 assets/models/cmd_filter.py:38
#: assets/serializers/asset/common.py:279 rbac/tree.py:36
#: assets/serializers/asset/common.py:286 rbac/tree.py:36
msgid "Accounts"
msgstr "アカウント"
@ -1270,8 +1271,8 @@ msgstr "アセットの自動化タスク"
#: terminal/models/component/status.py:27 terminal/serializers/applet.py:17
#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283
#: tickets/serializers/super_ticket.py:13
#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:164
#: xpack/plugins/cloud/models.py:216
#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:172
#: xpack/plugins/cloud/models.py:224
msgid "Status"
msgstr "ステータス"
@ -1354,7 +1355,7 @@ msgstr "システム"
msgid "Value"
msgstr "値"
#: assets/models/label.py:40 assets/serializers/asset/common.py:118
#: assets/models/label.py:40 assets/serializers/asset/common.py:121
#: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13
#: authentication/serializers/connect_token_secret.py:114
#: common/serializers/common.py:79 settings/serializers/sms.py:7
@ -1483,41 +1484,41 @@ msgstr "オートメーション"
msgid "%(value)s is not an even number"
msgstr "%(value)s は偶数ではありません"
#: assets/serializers/asset/common.py:108
#: assets/serializers/asset/common.py:111
msgid "Auto fill"
msgstr "自動充填"
#: assets/serializers/asset/common.py:119 assets/serializers/platform.py:95
#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:95
#: authentication/serializers/connect_token_secret.py:28
#: authentication/serializers/connect_token_secret.py:66
#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:99
#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:107
#: xpack/plugins/cloud/serializers/task.py:38
msgid "Protocols"
msgstr "プロトコル"
#: assets/serializers/asset/common.py:139
#: assets/serializers/asset/common.py:142
msgid "Node path"
msgstr "ノードパスです"
#: assets/serializers/asset/common.py:212
#: assets/serializers/asset/common.py:215
msgid "Platform not exist"
msgstr "プラットフォームが存在しません"
#: assets/serializers/asset/common.py:244
#: assets/serializers/asset/common.py:247
msgid "port out of range (1-65535)"
msgstr "ポート番号が範囲外です (1-65535)"
#: assets/serializers/asset/common.py:251
#: assets/serializers/asset/common.py:254
msgid "Protocol is required: {}"
msgstr "プロトコルが必要です: {}"
#: assets/serializers/asset/common.py:281
#: assets/serializers/asset/common.py:288
msgid "Auto info"
msgstr "自動情報"
#: assets/serializers/asset/database.py:24 common/serializers/fields.py:100
#: tickets/serializers/ticket/common.py:58
#: xpack/plugins/cloud/serializers/account_attrs.py:56
#: xpack/plugins/cloud/serializers/account_attrs.py:79
msgid "This field is required."
msgstr "このフィールドは必須です。"
@ -1759,8 +1760,8 @@ msgstr "作成"
msgid "Connect"
msgstr "接続"
#: audits/const.py:28 authentication/templates/authentication/login.html:254
#: authentication/templates/authentication/login.html:327
#: audits/const.py:28 authentication/templates/authentication/login.html:240
#: authentication/templates/authentication/login.html:313
#: templates/_header_bar.html:89
msgid "Login"
msgstr "ログイン"
@ -1905,7 +1906,7 @@ msgstr "ユーザーログインログ"
msgid "Reason display"
msgstr "理由表示"
#: audits/serializers.py:122
#: audits/serializers.py:123
#, fuzzy
#| msgid "User {} {} this resource."
msgid "User {} {} this resource"
@ -2010,7 +2011,7 @@ msgstr ""
"さい。"
#: authentication/api/password.py:59
#: authentication/templates/authentication/login.html:319
#: authentication/templates/authentication/login.html:305
#: users/templates/users/forgot_password.html:27
#: users/templates/users/forgot_password.html:28
#: users/templates/users/forgot_password_previewing.html:13
@ -2706,7 +2707,7 @@ msgstr ""
msgid "Cancel"
msgstr "キャンセル"
#: authentication/templates/authentication/login.html:334
#: authentication/templates/authentication/login.html:320
msgid "More login options"
msgstr "その他のログインオプション"
@ -3230,10 +3231,18 @@ msgstr "Ansible 無効"
msgid "Skip hosts below:"
msgstr "次のホストをスキップします: "
#: ops/api/celery.py:61 ops/api/celery.py:76
#: ops/api/celery.py:62 ops/api/celery.py:77
msgid "Waiting task start"
msgstr "タスク開始待ち"
#: ops/api/celery.py:138
msgid "Task {} not found"
msgstr "タスクは存在しません"
#: ops/api/celery.py:143
msgid "Task {} args or kwargs error"
msgstr "タスク実行パラメータエラー"
#: ops/apps.py:9 ops/notifications.py:16 rbac/tree.py:56
msgid "App ops"
msgstr "アプリ操作"
@ -3363,7 +3372,7 @@ msgid "Date last run"
msgstr "最終実行日"
#: ops/models/base.py:51 ops/models/job.py:112
#: xpack/plugins/cloud/models.py:162
#: xpack/plugins/cloud/models.py:170
msgid "Result"
msgstr "結果"
@ -4414,7 +4423,7 @@ msgid "SSO auth key TTL"
msgstr "Token有効期間"
#: settings/serializers/auth/sso.py:17
#: xpack/plugins/cloud/serializers/account_attrs.py:179
#: xpack/plugins/cloud/serializers/account_attrs.py:176
msgid "Unit: second"
msgstr "単位: 秒"
@ -5840,7 +5849,7 @@ msgstr "アクセスキー"
msgid "Access key secret"
msgstr "アクセスキーシークレット"
#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:209
#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:217
msgid "Region"
msgstr "リージョン"
@ -6983,47 +6992,55 @@ msgstr "リージョン"
msgid "Hostname strategy"
msgstr "ホスト名戦略"
#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:40
#: xpack/plugins/cloud/models.py:100
msgid "Unix admin user"
msgstr "Unix adminユーザー"
#: xpack/plugins/cloud/models.py:104
msgid "Windows admin user"
msgstr "Windows管理者"
#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:41
msgid "IP network segment group"
msgstr "IPネットワークセグメントグループ"
#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:45
#: xpack/plugins/cloud/models.py:113 xpack/plugins/cloud/serializers/task.py:46
msgid "Sync IP type"
msgstr "同期IPタイプ"
#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:62
#: xpack/plugins/cloud/models.py:116 xpack/plugins/cloud/serializers/task.py:64
msgid "Always update"
msgstr "常に更新"
#: xpack/plugins/cloud/models.py:114
#: xpack/plugins/cloud/models.py:122
msgid "Date last sync"
msgstr "最終同期日"
#: xpack/plugins/cloud/models.py:119 xpack/plugins/cloud/models.py:160
#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/models.py:168
msgid "Sync instance task"
msgstr "インスタンスの同期タスク"
#: xpack/plugins/cloud/models.py:171 xpack/plugins/cloud/models.py:219
#: xpack/plugins/cloud/models.py:179 xpack/plugins/cloud/models.py:227
msgid "Date sync"
msgstr "日付の同期"
#: xpack/plugins/cloud/models.py:175
#: xpack/plugins/cloud/models.py:183
msgid "Sync instance task execution"
msgstr "インスタンスタスクの同期実行"
#: xpack/plugins/cloud/models.py:199
#: xpack/plugins/cloud/models.py:207
msgid "Sync task"
msgstr "同期タスク"
#: xpack/plugins/cloud/models.py:203
#: xpack/plugins/cloud/models.py:211
msgid "Sync instance task history"
msgstr "インスタンスタスク履歴の同期"
#: xpack/plugins/cloud/models.py:206
#: xpack/plugins/cloud/models.py:214
msgid "Instance"
msgstr "インスタンス"
#: xpack/plugins/cloud/models.py:223
#: xpack/plugins/cloud/models.py:231
msgid "Sync instance detail"
msgstr "同期インスタンスの詳細"
@ -7237,52 +7254,52 @@ msgstr "テナントID"
msgid "Subscription ID"
msgstr "サブスクリプションID"
#: xpack/plugins/cloud/serializers/account_attrs.py:98
#: xpack/plugins/cloud/serializers/account_attrs.py:103
#: xpack/plugins/cloud/serializers/account_attrs.py:119
#: xpack/plugins/cloud/serializers/account_attrs.py:144
#: xpack/plugins/cloud/serializers/account_attrs.py:95
#: xpack/plugins/cloud/serializers/account_attrs.py:100
#: xpack/plugins/cloud/serializers/account_attrs.py:116
#: xpack/plugins/cloud/serializers/account_attrs.py:141
msgid "API Endpoint"
msgstr "APIエンドポイント"
#: xpack/plugins/cloud/serializers/account_attrs.py:109
#: xpack/plugins/cloud/serializers/account_attrs.py:106
msgid "Auth url"
msgstr "認証アドレス"
#: xpack/plugins/cloud/serializers/account_attrs.py:110
#: xpack/plugins/cloud/serializers/account_attrs.py:107
msgid "eg: http://openstack.example.com:5000/v3"
msgstr "例えば: http://openstack.example.com:5000/v3"
#: xpack/plugins/cloud/serializers/account_attrs.py:113
#: xpack/plugins/cloud/serializers/account_attrs.py:110
msgid "User domain"
msgstr "ユーザードメイン"
#: xpack/plugins/cloud/serializers/account_attrs.py:120
#: xpack/plugins/cloud/serializers/account_attrs.py:117
msgid "Cert File"
msgstr "証明書ファイル"
#: xpack/plugins/cloud/serializers/account_attrs.py:121
#: xpack/plugins/cloud/serializers/account_attrs.py:118
msgid "Key File"
msgstr "キーファイル"
#: xpack/plugins/cloud/serializers/account_attrs.py:137
#: xpack/plugins/cloud/serializers/account_attrs.py:134
msgid "Service account key"
msgstr "サービスアカウントキー"
#: xpack/plugins/cloud/serializers/account_attrs.py:138
#: xpack/plugins/cloud/serializers/account_attrs.py:135
msgid "The file is in JSON format"
msgstr "ファイルはJSON形式です。"
#: xpack/plugins/cloud/serializers/account_attrs.py:151
#: xpack/plugins/cloud/serializers/account_attrs.py:148
msgid "IP address invalid `{}`, {}"
msgstr "IPアドレスが無効: '{}', {}"
#: xpack/plugins/cloud/serializers/account_attrs.py:157
#: xpack/plugins/cloud/serializers/account_attrs.py:154
msgid ""
"Format for comma-delimited string,Such as: 192.168.1.0/24, "
"10.0.0.0-10.0.0.255"
msgstr "形式はコンマ区切りの文字列です192.168.1.0/24,10.0.0.0-10.0.0.255"
#: xpack/plugins/cloud/serializers/account_attrs.py:161
#: xpack/plugins/cloud/serializers/account_attrs.py:158
msgid ""
"The port is used to detect the validity of the IP address. When the "
"synchronization task is executed, only the valid IP address will be "
@ -7292,19 +7309,19 @@ msgstr ""
"実行されると、有効な IP アドレスのみが同期されます。 <br>ポートが0の場合、す"
"べてのIPアドレスが有効です。"
#: xpack/plugins/cloud/serializers/account_attrs.py:169
#: xpack/plugins/cloud/serializers/account_attrs.py:166
msgid "Hostname prefix"
msgstr "ホスト名プレフィックス"
#: xpack/plugins/cloud/serializers/account_attrs.py:172
#: xpack/plugins/cloud/serializers/account_attrs.py:169
msgid "IP segment"
msgstr "IP セグメント"
#: xpack/plugins/cloud/serializers/account_attrs.py:176
#: xpack/plugins/cloud/serializers/account_attrs.py:173
msgid "Test port"
msgstr "テストポート"
#: xpack/plugins/cloud/serializers/account_attrs.py:179
#: xpack/plugins/cloud/serializers/account_attrs.py:176
msgid "Test timeout"
msgstr "テストタイムアウト"
@ -7330,6 +7347,10 @@ msgstr "実行回数"
msgid "Instance count"
msgstr "インスタンス数"
#: xpack/plugins/cloud/serializers/task.py:63
msgid "Linux admin user"
msgstr "Linux管理者"
#: xpack/plugins/cloud/utils.py:69
msgid "Account unavailable"
msgstr "利用できないアカウント"
@ -7404,15 +7425,6 @@ msgstr "コミュニティ版"
#~ msgid "Terminal ID"
#~ msgstr "ターミナル ID"
#~ msgid "Unix admin user"
#~ msgstr "Unix adminユーザー"
#~ msgid "Windows admin user"
#~ msgstr "Windows管理者"
#~ msgid "Linux admin user"
#~ msgstr "Linux管理者"
#~ msgid "{} used account[{}], login method[{}] login the asset."
#~ msgstr ""
#~ "{} トムはアカウント[{}]、ログイン方法[{}]を使ってこの資産を登録しました"

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e4ca4ccc9f6714134fcad6bf9bd0b191f4fed409902e0d610ddc68ca1a6f8da8
size 111543
oid sha256:c33582a24048531069df755d224c8d2f27bc9246603b93131aa667e5e1f5e492
size 111766

View File

@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-02-15 18:07+0800\n"
"POT-Creation-Date: 2023-02-16 15:25+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"
@ -25,7 +25,7 @@ msgstr "参数 'action' 必须是 [{}]"
#: accounts/serializers/automations/change_secret.py:33
#: assets/models/_user.py:24 audits/signal_handlers/login_log.py:28
#: authentication/confirm/password.py:9 authentication/forms.py:32
#: authentication/templates/authentication/login.html:288
#: authentication/templates/authentication/login.html:274
#: settings/serializers/auth/ldap.py:25 settings/serializers/auth/ldap.py:47
#: users/forms/profile.py:22 users/serializers/user.py:99
#: users/templates/users/_msg_user_created.html:13
@ -170,7 +170,7 @@ msgstr "仅创建"
#: perms/models/asset_permission.py:64 perms/serializers/permission.py:27
#: terminal/backends/command/models.py:21 terminal/models/session/session.py:31
#: terminal/notifications.py:95 terminal/serializers/command.py:16
#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:212
#: tickets/models/ticket/apply_asset.py:16 xpack/plugins/cloud/models.py:220
msgid "Asset"
msgstr "资产"
@ -193,7 +193,7 @@ msgstr "来源"
#: accounts/serializers/automations/change_secret.py:108
#: accounts/serializers/automations/change_secret.py:128
#: acls/models/base.py:102 acls/serializers/base.py:57
#: assets/serializers/asset/common.py:120 assets/serializers/gateway.py:28
#: assets/serializers/asset/common.py:123 assets/serializers/gateway.py:28
#: audits/models.py:37 ops/models/base.py:18
#: perms/models/asset_permission.py:70 perms/serializers/permission.py:32
#: terminal/backends/command/models.py:22 terminal/models/session/session.py:33
@ -270,7 +270,7 @@ msgid "Trigger mode"
msgstr "触发模式"
#: accounts/models/automations/backup_account.py:91 audits/models.py:158
#: terminal/models/session/sharing.py:107 xpack/plugins/cloud/models.py:168
#: terminal/models/session/sharing.py:107 xpack/plugins/cloud/models.py:176
msgid "Reason"
msgstr "原因"
@ -424,12 +424,13 @@ msgstr "账号验证"
#: assets/models/cmd_filter.py:21 assets/models/domain.py:18
#: assets/models/group.py:20 assets/models/label.py:18
#: assets/models/platform.py:20 assets/models/platform.py:74
#: assets/serializers/asset/common.py:63 assets/serializers/asset/common.py:137
#: assets/serializers/asset/common.py:66 assets/serializers/asset/common.py:140
#: assets/serializers/platform.py:131
#: authentication/serializers/connect_token_secret.py:103 ops/mixin.py:21
#: ops/models/adhoc.py:21 ops/models/celery.py:15 ops/models/celery.py:57
#: ops/models/job.py:26 ops/models/playbook.py:22 ops/serializers/job.py:19
#: orgs/models.py:69 perms/models/asset_permission.py:56 rbac/models/role.py:29
#: ops/serializers/playbook.py:19 orgs/models.py:69
#: perms/models/asset_permission.py:56 rbac/models/role.py:29
#: settings/models.py:33 settings/serializers/sms.py:6
#: terminal/models/applet/applet.py:26 terminal/models/component/endpoint.py:12
#: terminal/models/component/endpoint.py:90
@ -507,23 +508,23 @@ msgstr ""
"密密码"
#: accounts/serializers/account/account.py:65
#: assets/serializers/asset/common.py:61 settings/serializers/auth/sms.py:75
#: assets/serializers/asset/common.py:64 settings/serializers/auth/sms.py:75
msgid "Template"
msgstr "模板"
#: accounts/serializers/account/account.py:68
#: assets/serializers/asset/common.py:58
#: assets/serializers/asset/common.py:61
msgid "Push now"
msgstr "立即推送"
#: accounts/serializers/account/account.py:70
#: accounts/serializers/account/base.py:64
#: accounts/serializers/account/base.py:62
msgid "Has secret"
msgstr "已托管密码"
#: accounts/serializers/account/account.py:75 applications/models.py:11
#: assets/models/label.py:21 assets/models/platform.py:75
#: assets/serializers/asset/common.py:116 assets/serializers/cagegory.py:8
#: assets/serializers/asset/common.py:119 assets/serializers/cagegory.py:8
#: assets/serializers/platform.py:93 assets/serializers/platform.py:132
#: perms/serializers/user_permission.py:25 settings/models.py:35
#: tickets/models/ticket/apply_application.py:13
@ -535,7 +536,7 @@ msgstr "类别"
#: acls/serializers/command_acl.py:18 applications/models.py:14
#: assets/models/_user.py:50 assets/models/automations/base.py:20
#: assets/models/cmd_filter.py:74 assets/models/platform.py:76
#: assets/serializers/asset/common.py:117 assets/serializers/platform.py:92
#: assets/serializers/asset/common.py:120 assets/serializers/platform.py:92
#: audits/serializers.py:49
#: authentication/serializers/connect_token_secret.py:116 ops/models/job.py:34
#: perms/serializers/user_permission.py:26 terminal/models/applet/applet.py:30
@ -578,8 +579,8 @@ msgstr "密钥/密码"
msgid "Key password"
msgstr "密钥密码"
#: accounts/serializers/account/base.py:81
#: assets/serializers/asset/common.py:280
#: accounts/serializers/account/base.py:79
#: assets/serializers/asset/common.py:287
msgid "Spec info"
msgstr "特殊信息"
@ -983,7 +984,7 @@ msgid "Device"
msgstr "网络设备"
#: assets/const/category.py:13 assets/models/asset/database.py:9
#: assets/models/asset/database.py:24 assets/serializers/asset/common.py:104
#: assets/models/asset/database.py:24 assets/serializers/asset/common.py:107
msgid "Database"
msgstr "数据库"
@ -1032,7 +1033,7 @@ msgid "Basic"
msgstr "基本"
#: assets/const/web.py:61 assets/models/asset/web.py:13
#: assets/serializers/asset/common.py:112 assets/serializers/platform.py:39
#: assets/serializers/asset/common.py:115 assets/serializers/platform.py:39
msgid "Script"
msgstr "脚本"
@ -1054,7 +1055,7 @@ msgstr "SSH公钥"
#: terminal/models/component/endpoint.py:100
#: terminal/models/session/session.py:46 tickets/models/comment.py:32
#: tickets/models/ticket/general.py:297 users/models/user.py:756
#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:111
#: xpack/plugins/cloud/models.py:35 xpack/plugins/cloud/models.py:119
msgid "Comment"
msgstr "备注"
@ -1148,14 +1149,14 @@ msgstr "系统用户"
msgid "Can match system user"
msgstr "可以匹配系统用户"
#: assets/models/asset/common.py:108 assets/serializers/asset/common.py:138
#: assets/models/asset/common.py:108 assets/serializers/asset/common.py:141
msgid "Address"
msgstr "地址"
#: assets/models/asset/common.py:109 assets/models/platform.py:111
#: authentication/serializers/connect_token_secret.py:108
#: perms/serializers/user_permission.py:23
#: xpack/plugins/cloud/serializers/account_attrs.py:182
#: xpack/plugins/cloud/serializers/account_attrs.py:179
msgid "Platform"
msgstr "系统平台"
@ -1201,7 +1202,7 @@ msgstr "移动资产到节点"
msgid "Remove asset from node"
msgstr "从节点移除资产"
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:105
#: assets/models/asset/database.py:10 assets/serializers/asset/common.py:108
#: settings/serializers/email.py:37
msgid "Use SSL"
msgstr "使用 SSL"
@ -1218,7 +1219,7 @@ msgstr "客户端证书"
msgid "Client key"
msgstr "客户端密钥"
#: assets/models/asset/database.py:14 assets/serializers/asset/common.py:106
#: assets/models/asset/database.py:14 assets/serializers/asset/common.py:109
msgid "Allow invalid cert"
msgstr "忽略证书校验"
@ -1226,23 +1227,23 @@ msgstr "忽略证书校验"
msgid "Autofill"
msgstr "自动代填"
#: assets/models/asset/web.py:10 assets/serializers/asset/common.py:109
#: assets/models/asset/web.py:10 assets/serializers/asset/common.py:112
#: assets/serializers/platform.py:31
msgid "Username selector"
msgstr "用户名选择器"
#: assets/models/asset/web.py:11 assets/serializers/asset/common.py:110
#: assets/models/asset/web.py:11 assets/serializers/asset/common.py:113
#: assets/serializers/platform.py:34
msgid "Password selector"
msgstr "密码选择器"
#: assets/models/asset/web.py:12 assets/serializers/asset/common.py:111
#: assets/models/asset/web.py:12 assets/serializers/asset/common.py:114
#: assets/serializers/platform.py:37
msgid "Submit selector"
msgstr "确认按钮选择器"
#: assets/models/automations/base.py:17 assets/models/cmd_filter.py:38
#: assets/serializers/asset/common.py:279 rbac/tree.py:36
#: assets/serializers/asset/common.py:286 rbac/tree.py:36
msgid "Accounts"
msgstr "账号管理"
@ -1260,8 +1261,8 @@ msgstr "资产自动化任务"
#: terminal/models/component/status.py:27 terminal/serializers/applet.py:17
#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283
#: tickets/serializers/super_ticket.py:13
#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:164
#: xpack/plugins/cloud/models.py:216
#: tickets/serializers/ticket/ticket.py:20 xpack/plugins/cloud/models.py:172
#: xpack/plugins/cloud/models.py:224
msgid "Status"
msgstr "状态"
@ -1344,7 +1345,7 @@ msgstr "系统"
msgid "Value"
msgstr "值"
#: assets/models/label.py:40 assets/serializers/asset/common.py:118
#: assets/models/label.py:40 assets/serializers/asset/common.py:121
#: assets/serializers/cagegory.py:6 assets/serializers/cagegory.py:13
#: authentication/serializers/connect_token_secret.py:114
#: common/serializers/common.py:79 settings/serializers/sms.py:7
@ -1473,41 +1474,41 @@ msgstr "自动化"
msgid "%(value)s is not an even number"
msgstr "%(value)s is not an even number"
#: assets/serializers/asset/common.py:108
#: assets/serializers/asset/common.py:111
msgid "Auto fill"
msgstr "自动代填"
#: assets/serializers/asset/common.py:119 assets/serializers/platform.py:95
#: assets/serializers/asset/common.py:122 assets/serializers/platform.py:95
#: authentication/serializers/connect_token_secret.py:28
#: authentication/serializers/connect_token_secret.py:66
#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:99
#: perms/serializers/user_permission.py:24 xpack/plugins/cloud/models.py:107
#: xpack/plugins/cloud/serializers/task.py:38
msgid "Protocols"
msgstr "协议组"
#: assets/serializers/asset/common.py:139
#: assets/serializers/asset/common.py:142
msgid "Node path"
msgstr "节点路径"
#: assets/serializers/asset/common.py:212
#: assets/serializers/asset/common.py:215
msgid "Platform not exist"
msgstr "平台不存在"
#: assets/serializers/asset/common.py:244
#: assets/serializers/asset/common.py:247
msgid "port out of range (1-65535)"
msgstr "端口超出范围 (1-65535)"
#: assets/serializers/asset/common.py:251
#: assets/serializers/asset/common.py:254
msgid "Protocol is required: {}"
msgstr "协议是必填的: {}"
#: assets/serializers/asset/common.py:281
#: assets/serializers/asset/common.py:288
msgid "Auto info"
msgstr "自动化信息"
#: assets/serializers/asset/database.py:24 common/serializers/fields.py:100
#: tickets/serializers/ticket/common.py:58
#: xpack/plugins/cloud/serializers/account_attrs.py:56
#: xpack/plugins/cloud/serializers/account_attrs.py:79
msgid "This field is required."
msgstr "该字段是必填项。"
@ -1747,8 +1748,8 @@ msgstr "创建"
msgid "Connect"
msgstr "连接"
#: audits/const.py:28 authentication/templates/authentication/login.html:254
#: authentication/templates/authentication/login.html:327
#: audits/const.py:28 authentication/templates/authentication/login.html:240
#: authentication/templates/authentication/login.html:313
#: templates/_header_bar.html:89
msgid "Login"
msgstr "登录"
@ -1893,7 +1894,7 @@ msgstr "用户登录日志"
msgid "Reason display"
msgstr "原因描述"
#: audits/serializers.py:122
#: audits/serializers.py:123
msgid "User {} {} this resource"
msgstr "用户 {} {} 了当前资源"
@ -1992,7 +1993,7 @@ msgid ""
msgstr "用户来自 {} 请去相应系统修改密码"
#: authentication/api/password.py:59
#: authentication/templates/authentication/login.html:319
#: authentication/templates/authentication/login.html:305
#: users/templates/users/forgot_password.html:27
#: users/templates/users/forgot_password.html:28
#: users/templates/users/forgot_password_previewing.html:13
@ -2670,7 +2671,7 @@ msgstr "如果这次公钥更新不是由你发起的,那么你的账号可能
msgid "Cancel"
msgstr "取消"
#: authentication/templates/authentication/login.html:334
#: authentication/templates/authentication/login.html:320
msgid "More login options"
msgstr "其他方式登录"
@ -3188,10 +3189,18 @@ msgstr "Ansible 已禁用"
msgid "Skip hosts below:"
msgstr "跳过以下主机: "
#: ops/api/celery.py:61 ops/api/celery.py:76
#: ops/api/celery.py:62 ops/api/celery.py:77
msgid "Waiting task start"
msgstr "等待任务开始"
#: ops/api/celery.py:138
msgid "Task {} not found"
msgstr "任务 {} 不存在"
#: ops/api/celery.py:143
msgid "Task {} args or kwargs error"
msgstr "任务 {} 执行参数错误"
#: ops/apps.py:9 ops/notifications.py:16 rbac/tree.py:56
msgid "App ops"
msgstr "作业中心"
@ -3321,7 +3330,7 @@ msgid "Date last run"
msgstr "最后运行日期"
#: ops/models/base.py:51 ops/models/job.py:112
#: xpack/plugins/cloud/models.py:162
#: xpack/plugins/cloud/models.py:170
msgid "Result"
msgstr "结果"
@ -4368,7 +4377,7 @@ msgid "SSO auth key TTL"
msgstr "令牌有效期"
#: settings/serializers/auth/sso.py:17
#: xpack/plugins/cloud/serializers/account_attrs.py:179
#: xpack/plugins/cloud/serializers/account_attrs.py:176
msgid "Unit: second"
msgstr "单位: 秒"
@ -5758,7 +5767,7 @@ msgstr "Access key ID(AK)"
msgid "Access key secret"
msgstr "Access key secret(SK)"
#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:209
#: terminal/serializers/storage.py:65 xpack/plugins/cloud/models.py:217
msgid "Region"
msgstr "地域"
@ -6883,47 +6892,55 @@ msgstr "地域"
msgid "Hostname strategy"
msgstr "主机名策略"
#: xpack/plugins/cloud/models.py:102 xpack/plugins/cloud/serializers/task.py:40
#: xpack/plugins/cloud/models.py:100
msgid "Unix admin user"
msgstr "Unix 管理员"
#: xpack/plugins/cloud/models.py:104
msgid "Windows admin user"
msgstr "Windows 管理员"
#: xpack/plugins/cloud/models.py:110 xpack/plugins/cloud/serializers/task.py:41
msgid "IP network segment group"
msgstr "IP网段组"
#: xpack/plugins/cloud/models.py:105 xpack/plugins/cloud/serializers/task.py:45
#: xpack/plugins/cloud/models.py:113 xpack/plugins/cloud/serializers/task.py:46
msgid "Sync IP type"
msgstr "同步IP类型"
#: xpack/plugins/cloud/models.py:108 xpack/plugins/cloud/serializers/task.py:62
#: xpack/plugins/cloud/models.py:116 xpack/plugins/cloud/serializers/task.py:64
msgid "Always update"
msgstr "总是更新"
#: xpack/plugins/cloud/models.py:114
#: xpack/plugins/cloud/models.py:122
msgid "Date last sync"
msgstr "最后同步日期"
#: xpack/plugins/cloud/models.py:119 xpack/plugins/cloud/models.py:160
#: xpack/plugins/cloud/models.py:127 xpack/plugins/cloud/models.py:168
msgid "Sync instance task"
msgstr "同步实例任务"
#: xpack/plugins/cloud/models.py:171 xpack/plugins/cloud/models.py:219
#: xpack/plugins/cloud/models.py:179 xpack/plugins/cloud/models.py:227
msgid "Date sync"
msgstr "同步日期"
#: xpack/plugins/cloud/models.py:175
#: xpack/plugins/cloud/models.py:183
msgid "Sync instance task execution"
msgstr "同步实例任务执行"
#: xpack/plugins/cloud/models.py:199
#: xpack/plugins/cloud/models.py:207
msgid "Sync task"
msgstr "同步任务"
#: xpack/plugins/cloud/models.py:203
#: xpack/plugins/cloud/models.py:211
msgid "Sync instance task history"
msgstr "同步实例任务历史"
#: xpack/plugins/cloud/models.py:206
#: xpack/plugins/cloud/models.py:214
msgid "Instance"
msgstr "实例"
#: xpack/plugins/cloud/models.py:223
#: xpack/plugins/cloud/models.py:231
msgid "Sync instance detail"
msgstr "同步实例详情"
@ -7137,52 +7154,52 @@ msgstr "租户 ID"
msgid "Subscription ID"
msgstr "订阅 ID"
#: xpack/plugins/cloud/serializers/account_attrs.py:98
#: xpack/plugins/cloud/serializers/account_attrs.py:103
#: xpack/plugins/cloud/serializers/account_attrs.py:119
#: xpack/plugins/cloud/serializers/account_attrs.py:144
#: xpack/plugins/cloud/serializers/account_attrs.py:95
#: xpack/plugins/cloud/serializers/account_attrs.py:100
#: xpack/plugins/cloud/serializers/account_attrs.py:116
#: xpack/plugins/cloud/serializers/account_attrs.py:141
msgid "API Endpoint"
msgstr "API 端点"
#: xpack/plugins/cloud/serializers/account_attrs.py:109
#: xpack/plugins/cloud/serializers/account_attrs.py:106
msgid "Auth url"
msgstr "认证地址"
#: xpack/plugins/cloud/serializers/account_attrs.py:110
#: xpack/plugins/cloud/serializers/account_attrs.py:107
msgid "eg: http://openstack.example.com:5000/v3"
msgstr "如: http://openstack.example.com:5000/v3"
#: xpack/plugins/cloud/serializers/account_attrs.py:113
#: xpack/plugins/cloud/serializers/account_attrs.py:110
msgid "User domain"
msgstr "用户域"
#: xpack/plugins/cloud/serializers/account_attrs.py:120
#: xpack/plugins/cloud/serializers/account_attrs.py:117
msgid "Cert File"
msgstr "证书文件"
#: xpack/plugins/cloud/serializers/account_attrs.py:121
#: xpack/plugins/cloud/serializers/account_attrs.py:118
msgid "Key File"
msgstr "密钥文件"
#: xpack/plugins/cloud/serializers/account_attrs.py:137
#: xpack/plugins/cloud/serializers/account_attrs.py:134
msgid "Service account key"
msgstr "服务账号密钥"
#: xpack/plugins/cloud/serializers/account_attrs.py:138
#: xpack/plugins/cloud/serializers/account_attrs.py:135
msgid "The file is in JSON format"
msgstr "JSON 格式的文件"
#: xpack/plugins/cloud/serializers/account_attrs.py:151
#: xpack/plugins/cloud/serializers/account_attrs.py:148
msgid "IP address invalid `{}`, {}"
msgstr "IP 地址无效: `{}`, {}"
#: xpack/plugins/cloud/serializers/account_attrs.py:157
#: xpack/plugins/cloud/serializers/account_attrs.py:154
msgid ""
"Format for comma-delimited string,Such as: 192.168.1.0/24, "
"10.0.0.0-10.0.0.255"
msgstr "格式为逗号分隔的字符串192.168.1.0/24,10.0.0.0-10.0.0.255"
#: xpack/plugins/cloud/serializers/account_attrs.py:161
#: xpack/plugins/cloud/serializers/account_attrs.py:158
msgid ""
"The port is used to detect the validity of the IP address. When the "
"synchronization task is executed, only the valid IP address will be "
@ -7191,19 +7208,19 @@ msgstr ""
"端口用来检测 IP 地址的有效性,在同步任务执行时,只会同步有效的 IP 地址。 <br>"
"如果端口为 0则表示所有 IP 地址均有效。"
#: xpack/plugins/cloud/serializers/account_attrs.py:169
#: xpack/plugins/cloud/serializers/account_attrs.py:166
msgid "Hostname prefix"
msgstr "主机名前缀"
#: xpack/plugins/cloud/serializers/account_attrs.py:172
#: xpack/plugins/cloud/serializers/account_attrs.py:169
msgid "IP segment"
msgstr "IP 网段"
#: xpack/plugins/cloud/serializers/account_attrs.py:176
#: xpack/plugins/cloud/serializers/account_attrs.py:173
msgid "Test port"
msgstr "测试端口"
#: xpack/plugins/cloud/serializers/account_attrs.py:179
#: xpack/plugins/cloud/serializers/account_attrs.py:176
msgid "Test timeout"
msgstr "测试超时时间"
@ -7227,6 +7244,10 @@ msgstr "执行次数"
msgid "Instance count"
msgstr "实例个数"
#: xpack/plugins/cloud/serializers/task.py:63
msgid "Linux admin user"
msgstr "Linux 管理员"
#: xpack/plugins/cloud/utils.py:69
msgid "Account unavailable"
msgstr "账号无效"
@ -7301,15 +7322,6 @@ msgstr "社区版"
#~ msgid "Terminal ID"
#~ msgstr "终端 ID"
#~ msgid "Unix admin user"
#~ msgstr "Unix 管理员"
#~ msgid "Windows admin user"
#~ msgstr "Windows 管理员"
#~ msgid "Linux admin user"
#~ msgstr "Linux 管理员"
#~ msgid "{} used account[{}], login method[{}] login the asset."
#~ msgstr "{} 使用账户[{}], 登录方式[{}]登录了这个资产."

View File

@ -10,6 +10,7 @@ from django.utils.translation import ugettext as _
from django_celery_beat.models import PeriodicTask
from rest_framework.response import Response
from common.exceptions import JMSException
from common.permissions import IsValidUser
from common.api import LogTailApi, CommonApiMixin
from ops.celery import app
@ -134,6 +135,11 @@ class CeleryTaskExecutionViewSet(CommonApiMixin, viewsets.ModelViewSet):
execution = get_object_or_404(CeleryTaskExecution, id=form_id)
task = app.tasks.get(execution.name, None)
if not task:
return Response(status=status.HTTP_400_BAD_REQUEST)
t = task.delay(*execution.args, **execution.kwargs)
msg = _("Task {} not found").format(execution.name)
raise JMSException(code='task_not_found_error', detail=msg)
try:
t = task.delay(*execution.args, **execution.kwargs)
except TypeError:
msg = _("Task {} args or kwargs error").format(execution.name)
raise JMSException(code='task_args_error', detail=msg)
return Response(status=status.HTTP_201_CREATED, data={'task_id': t.id})

View File

@ -62,7 +62,7 @@ class JobViewSet(OrgBulkModelViewSet):
execution = job.create_execution()
execution.creator = self.request.user
execution.save()
task = run_ops_job_execution.delay(execution.id)
task = run_ops_job_execution.delay(str(execution.id))
set_task_to_serializer_data(serializer, task)
@ -81,7 +81,7 @@ class JobExecutionViewSet(OrgBulkModelViewSet):
instance.job_type = Types[instance.job.type].value
instance.creator = self.request.user
instance.save()
task = run_ops_job_execution.delay(instance.id)
task = run_ops_job_execution.delay(str(instance.id))
set_task_to_serializer_data(serializer, task)
def get_queryset(self):