github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

feat: 添加默认工单授权时间 (#8649) 

Co-authored-by: feng626 <1304903146@qq.com>
pull/8651/head
fit2bot 2022-07-22 15:23:16 +08:00 committed by GitHub
parent 9d17f27fb3
commit d07a230ba6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 86 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/jumpserver/conf.py
View File

@ -405,6 +405,7 @@ class Config(dict):
'CONNECTION_TOKEN_ENABLED': False, 'CONNECTION_TOKEN_ENABLED': False,
'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False, 'PERM_SINGLE_ASSET_TO_UNGROUP_NODE': False,
'TICKET_AUTHORIZE_DEFAULT_TIME': 7,
'WINDOWS_SSH_DEFAULT_SHELL': 'cmd', 'WINDOWS_SSH_DEFAULT_SHELL': 'cmd',
'PERIOD_TASK_ENABLED': True, 'PERIOD_TASK_ENABLED': True,

1
apps/jumpserver/settings/custom.py
View File

@ -85,6 +85,7 @@ TERMINAL_TELNET_REGEX = CONFIG.TERMINAL_TELNET_REGEX
BACKEND_ASSET_USER_AUTH_VAULT = False BACKEND_ASSET_USER_AUTH_VAULT = False
PERM_SINGLE_ASSET_TO_UNGROUP_NODE = CONFIG.PERM_SINGLE_ASSET_TO_UNGROUP_NODE PERM_SINGLE_ASSET_TO_UNGROUP_NODE = CONFIG.PERM_SINGLE_ASSET_TO_UNGROUP_NODE
TICKET_AUTHORIZE_DEFAULT_TIME = CONFIG.TICKET_AUTHORIZE_DEFAULT_TIME
PERM_EXPIRED_CHECK_PERIODIC = CONFIG.PERM_EXPIRED_CHECK_PERIODIC PERM_EXPIRED_CHECK_PERIODIC = CONFIG.PERM_EXPIRED_CHECK_PERIODIC
WINDOWS_SSH_DEFAULT_SHELL = CONFIG.WINDOWS_SSH_DEFAULT_SHELL WINDOWS_SSH_DEFAULT_SHELL = CONFIG.WINDOWS_SSH_DEFAULT_SHELL
FLOWER_URL = CONFIG.FLOWER_URL FLOWER_URL = CONFIG.FLOWER_URL

4
apps/locale/ja/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:0f2fdd3a7bd34a26d068fc6ce521d0ea9983c477b13536ba3f51700a554d4ae3 oid sha256:92c63243fd3c83321311ffa44fbd91d619969ce18221b629de6e14db90b3a0e8
size 128706 size 128842

70
apps/locale/ja/LC_MESSAGES/django.po
View File

@ -8,7 +8,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-20 13:51+0800\n" "POT-Creation-Date: 2022-07-22 14:49+0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -27,7 +27,7 @@ msgstr "Acls"
#: assets/models/base.py:175 assets/models/cluster.py:18 #: assets/models/base.py:175 assets/models/cluster.py:18
#: assets/models/cmd_filter.py:27 assets/models/domain.py:23 #: assets/models/cmd_filter.py:27 assets/models/domain.py:23
#: assets/models/group.py:20 assets/models/label.py:18 ops/mixin.py:24 #: assets/models/group.py:20 assets/models/label.py:18 ops/mixin.py:24
#: orgs/models.py:65 perms/models/base.py:83 rbac/models/role.py:29 #: orgs/models.py:70 perms/models/base.py:83 rbac/models/role.py:29
#: settings/models.py:29 settings/serializers/sms.py:6 #: settings/models.py:29 settings/serializers/sms.py:6
#: terminal/models/endpoint.py:10 terminal/models/endpoint.py:86 #: terminal/models/endpoint.py:10 terminal/models/endpoint.py:86
#: terminal/models/storage.py:26 terminal/models/task.py:16 #: terminal/models/storage.py:26 terminal/models/task.py:16
@ -59,7 +59,7 @@ msgstr "アクティブ"
#: assets/models/cluster.py:29 assets/models/cmd_filter.py:48 #: assets/models/cluster.py:29 assets/models/cmd_filter.py:48
#: assets/models/cmd_filter.py:96 assets/models/domain.py:24 #: assets/models/cmd_filter.py:96 assets/models/domain.py:24
#: assets/models/domain.py:65 assets/models/group.py:23 #: assets/models/domain.py:65 assets/models/group.py:23
#: assets/models/label.py:23 ops/models/adhoc.py:38 orgs/models.py:68 #: assets/models/label.py:23 ops/models/adhoc.py:38 orgs/models.py:73
#: perms/models/base.py:93 rbac/models/role.py:37 settings/models.py:34 #: perms/models/base.py:93 rbac/models/role.py:37 settings/models.py:34
#: terminal/models/endpoint.py:23 terminal/models/endpoint.py:96 #: terminal/models/endpoint.py:23 terminal/models/endpoint.py:96
#: terminal/models/storage.py:29 terminal/models/terminal.py:114 #: terminal/models/storage.py:29 terminal/models/terminal.py:114
@ -88,7 +88,7 @@ msgstr "ログイン確認"
#: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:20 #: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:20
#: assets/models/cmd_filter.py:30 assets/models/label.py:15 audits/models.py:37 #: assets/models/cmd_filter.py:30 assets/models/label.py:15 audits/models.py:37
#: audits/models.py:62 audits/models.py:87 audits/serializers.py:100 #: audits/models.py:62 audits/models.py:87 audits/serializers.py:100
#: authentication/models.py:54 authentication/models.py:78 orgs/models.py:215 #: authentication/models.py:54 authentication/models.py:78 orgs/models.py:220
#: perms/models/base.py:84 rbac/builtin.py:120 rbac/models/rolebinding.py:41 #: perms/models/base.py:84 rbac/builtin.py:120 rbac/models/rolebinding.py:41
#: terminal/backends/command/models.py:20 #: terminal/backends/command/models.py:20
#: terminal/backends/command/serializers.py:13 terminal/models/session.py:44 #: terminal/backends/command/serializers.py:13 terminal/models/session.py:44
@ -363,7 +363,7 @@ msgstr "タイプ表示"
#: assets/serializers/account.py:18 assets/serializers/cmd_filter.py:28 #: assets/serializers/account.py:18 assets/serializers/cmd_filter.py:28
#: assets/serializers/cmd_filter.py:48 common/db/models.py:114 #: assets/serializers/cmd_filter.py:48 common/db/models.py:114
#: common/mixins/models.py:50 ops/models/adhoc.py:39 ops/models/command.py:30 #: common/mixins/models.py:50 ops/models/adhoc.py:39 ops/models/command.py:30
#: orgs/models.py:67 orgs/models.py:218 perms/models/base.py:92 #: orgs/models.py:72 orgs/models.py:223 perms/models/base.py:92
#: users/models/group.py:18 users/models/user.py:922 #: users/models/group.py:18 users/models/user.py:922
#: xpack/plugins/cloud/models.py:125 #: xpack/plugins/cloud/models.py:125
msgid "Date created" msgid "Date created"
@ -373,7 +373,7 @@ msgstr "作成された日付"
#: assets/models/gathered_user.py:20 assets/serializers/account.py:21 #: assets/models/gathered_user.py:20 assets/serializers/account.py:21
#: assets/serializers/cmd_filter.py:29 assets/serializers/cmd_filter.py:49 #: assets/serializers/cmd_filter.py:29 assets/serializers/cmd_filter.py:49
#: common/db/models.py:115 common/mixins/models.py:51 ops/models/adhoc.py:40 #: common/db/models.py:115 common/mixins/models.py:51 ops/models/adhoc.py:40
#: orgs/models.py:219 #: orgs/models.py:224
msgid "Date updated" msgid "Date updated"
msgstr "更新日" msgstr "更新日"
@ -627,8 +627,8 @@ msgstr "ラベル"
#: assets/models/asset.py:229 assets/models/base.py:183 #: assets/models/asset.py:229 assets/models/base.py:183
#: assets/models/cluster.py:28 assets/models/cmd_filter.py:52 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:52
#: assets/models/cmd_filter.py:99 assets/models/group.py:21 #: assets/models/cmd_filter.py:99 assets/models/group.py:21
#: common/db/models.py:112 common/mixins/models.py:49 orgs/models.py:66 #: common/db/models.py:112 common/mixins/models.py:49 orgs/models.py:71
#: orgs/models.py:220 perms/models/base.py:91 users/models/user.py:706 #: orgs/models.py:225 perms/models/base.py:91 users/models/user.py:706
#: users/serializers/group.py:33 #: users/serializers/group.py:33
#: xpack/plugins/change_auth_plan/models/base.py:48 #: xpack/plugins/change_auth_plan/models/base.py:48
#: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30 #: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30
@ -907,11 +907,11 @@ msgstr "家を無視する"
msgid "Command filter rule" msgid "Command filter rule"
msgstr "コマンドフィルタルール" msgstr "コマンドフィルタルール"
#: assets/models/cmd_filter.py:144 #: assets/models/cmd_filter.py:147
msgid "The generated regular expression is incorrect: {}" msgid "The generated regular expression is incorrect: {}"
msgstr "生成された正規表現が正しくありません: {}" msgstr "生成された正規表現が正しくありません: {}"
#: assets/models/cmd_filter.py:170 tickets/const.py:13 #: assets/models/cmd_filter.py:173 tickets/const.py:13
msgid "Command confirm" msgid "Command confirm"
msgstr "コマンドの確認" msgstr "コマンドの確認"
@ -2226,7 +2226,7 @@ msgstr "有効性"
msgid "Expired time" msgid "Expired time"
msgstr "期限切れ時間" msgstr "期限切れ時間"
#: authentication/serializers/connection_token.py:74 #: authentication/serializers/connection_token.py:73
msgid "Asset or application required" msgid "Asset or application required"
msgstr "アセットまたはアプリが必要" msgstr "アセットまたはアプリが必要"
@ -3028,26 +3028,26 @@ msgstr "組織のリソース ({}) は削除できません"
msgid "App organizations" msgid "App organizations"
msgstr "アプリ組織" msgstr "アプリ組織"
#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:80 #: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:85
#: orgs/models.py:212 rbac/const.py:7 rbac/models/rolebinding.py:48 #: orgs/models.py:217 rbac/const.py:7 rbac/models/rolebinding.py:48
#: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:62 #: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:62
#: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:71 #: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:71
msgid "Organization" msgid "Organization"
msgstr "組織" msgstr "組織"
#: orgs/models.py:74 #: orgs/models.py:79
msgid "GLOBAL" msgid "GLOBAL"
msgstr "グローバル組織" msgstr "グローバル組織"
#: orgs/models.py:82 #: orgs/models.py:87
msgid "Can view root org" msgid "Can view root org"
msgstr "グローバル組織を表示できます" msgstr "グローバル組織を表示できます"
#: orgs/models.py:83 #: orgs/models.py:88
msgid "Can view all joined org" msgid "Can view all joined org"
msgstr "参加しているすべての組織を表示できます" msgstr "参加しているすべての組織を表示できます"
#: orgs/models.py:217 rbac/models/role.py:46 rbac/models/rolebinding.py:44 #: orgs/models.py:222 rbac/models/role.py:46 rbac/models/rolebinding.py:44
#: users/models/user.py:671 #: users/models/user.py:671
msgid "Role" msgid "Role"
msgstr "ロール" msgstr "ロール"
@ -3136,27 +3136,27 @@ msgstr "クリップボードコピーペースト"
msgid "From ticket" msgid "From ticket"
msgstr "チケットから" msgstr "チケットから"
#: perms/notifications.py:18 #: perms/notifications.py:15
msgid "You permed assets is about to expire" msgid "You permed assets is about to expire"
msgstr "パーマ資産の有効期限が近づいています" msgstr "パーマ資産の有効期限が近づいています"
#: perms/notifications.py:23 #: perms/notifications.py:20
msgid "permed assets" msgid "permed assets"
msgstr "パーマ資産" msgstr "パーマ資産"
#: perms/notifications.py:62 #: perms/notifications.py:59
msgid "Asset permissions is about to expire" msgid "Asset permissions is about to expire"
msgstr "資産権限の有効期限が近づいています" msgstr "資産権限の有効期限が近づいています"
#: perms/notifications.py:67 #: perms/notifications.py:64
msgid "asset permissions of organization {}" msgid "asset permissions of organization {}"
msgstr "組織 {} の資産権限" msgstr "組織 {} の資産権限"
#: perms/notifications.py:94 #: perms/notifications.py:91
msgid "Your permed applications is about to expire" msgid "Your permed applications is about to expire"
msgstr "パーマアプリケーションの有効期限が近づいています" msgstr "パーマアプリケーションの有効期限が近づいています"
#: perms/notifications.py:98 #: perms/notifications.py:95
msgid "permed applications" msgid "permed applications"
msgstr "Permedアプリケーション" msgstr "Permedアプリケーション"
@ -3825,20 +3825,20 @@ msgstr "テンプレートコード"
msgid "Test phone" msgid "Test phone"
msgstr "テスト電話" msgstr "テスト電話"
#: settings/serializers/auth/sso.py:12 #: settings/serializers/auth/sso.py:11
msgid "Enable SSO auth" msgid "Enable SSO auth"
msgstr "SSO Token認証の有効化" msgstr "SSO Token認証の有効化"
#: settings/serializers/auth/sso.py:13 #: settings/serializers/auth/sso.py:12
msgid "Other service can using SSO token login to JumpServer without password" msgid "Other service can using SSO token login to JumpServer without password"
msgstr "" msgstr ""
"他のサービスはパスワードなしでJumpServerへのSSOトークンログインを使用できます" "他のサービスはパスワードなしでJumpServerへのSSOトークンログインを使用できます"
#: settings/serializers/auth/sso.py:16 #: settings/serializers/auth/sso.py:15
msgid "SSO auth key TTL" msgid "SSO auth key TTL"
msgstr "Token有効期間" msgstr "Token有効期間"
#: settings/serializers/auth/sso.py:16 #: settings/serializers/auth/sso.py:15
msgid "Unit: second" msgid "Unit: second"
msgstr "単位: 秒" msgstr "単位: 秒"
@ -3904,7 +3904,7 @@ msgstr "ログインログは日数を保持します"
#: settings/serializers/cleaning.py:10 settings/serializers/cleaning.py:14 #: settings/serializers/cleaning.py:10 settings/serializers/cleaning.py:14
#: settings/serializers/cleaning.py:18 settings/serializers/cleaning.py:22 #: settings/serializers/cleaning.py:18 settings/serializers/cleaning.py:22
#: settings/serializers/cleaning.py:26 #: settings/serializers/cleaning.py:26 settings/serializers/other.py:35
msgid "Unit: day" msgid "Unit: day"
msgstr "単位: 日" msgstr "単位: 日"
@ -4077,19 +4077,23 @@ msgstr ""
"ノードが表示されないようにしますが、そのノードが許可されていないという質問に" "ノードが表示されないようにしますが、そのノードが許可されていないという質問に"
"質問" "質問"
#: settings/serializers/other.py:34 #: settings/serializers/other.py:35
msgid "Ticket authorize default time"
msgstr "デフォルト製造オーダ承認時間"
#: settings/serializers/other.py:39
msgid "Help Docs URL" msgid "Help Docs URL"
msgstr "ドキュメントリンク" msgstr "ドキュメントリンク"
#: settings/serializers/other.py:35 #: settings/serializers/other.py:40
msgid "default: http://docs.jumpserver.org" msgid "default: http://docs.jumpserver.org"
msgstr "デフォルト: http://docs.jumpserver.org" msgstr "デフォルト: http://docs.jumpserver.org"
#: settings/serializers/other.py:39 #: settings/serializers/other.py:44
msgid "Help Support URL" msgid "Help Support URL"
msgstr "サポートリンク" msgstr "サポートリンク"
#: settings/serializers/other.py:40 #: settings/serializers/other.py:45
msgid "default: http://www.jumpserver.org/support/" msgid "default: http://www.jumpserver.org/support/"
msgstr "デフォルト: http://www.jumpserver.org/support/" msgstr "デフォルト: http://www.jumpserver.org/support/"
@ -4838,7 +4842,7 @@ msgstr "一括作成非サポート"
msgid "Storage is invalid" msgid "Storage is invalid"
msgstr "ストレージが無効です" msgstr "ストレージが無効です"
#: terminal/models/command.py:53 #: terminal/models/command.py:66
msgid "Command record" msgid "Command record"
msgstr "コマンドレコード" msgstr "コマンドレコード"

4
apps/locale/zh/LC_MESSAGES/django.mo
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:9c2b13f7242beec8786179e03de895bd3e9d8d6392b74c2398409c1bfa33d9f8 oid sha256:c4c49c98910aa6e85894d1ba57217932e4e960de325785003749f32000d62657
size 106088 size 106197

70
apps/locale/zh/LC_MESSAGES/django.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: JumpServer 0.3.3\n" "Project-Id-Version: JumpServer 0.3.3\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-07-20 13:51+0800\n" "POT-Creation-Date: 2022-07-22 14:49+0800\n"
"PO-Revision-Date: 2021-05-20 10:54+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n"
"Last-Translator: ibuler <ibuler@qq.com>\n" "Last-Translator: ibuler <ibuler@qq.com>\n"
"Language-Team: JumpServer team<ibuler@qq.com>\n" "Language-Team: JumpServer team<ibuler@qq.com>\n"
@ -26,7 +26,7 @@ msgstr "访问控制"
#: assets/models/base.py:175 assets/models/cluster.py:18 #: assets/models/base.py:175 assets/models/cluster.py:18
#: assets/models/cmd_filter.py:27 assets/models/domain.py:23 #: assets/models/cmd_filter.py:27 assets/models/domain.py:23
#: assets/models/group.py:20 assets/models/label.py:18 ops/mixin.py:24 #: assets/models/group.py:20 assets/models/label.py:18 ops/mixin.py:24
#: orgs/models.py:65 perms/models/base.py:83 rbac/models/role.py:29 #: orgs/models.py:70 perms/models/base.py:83 rbac/models/role.py:29
#: settings/models.py:29 settings/serializers/sms.py:6 #: settings/models.py:29 settings/serializers/sms.py:6
#: terminal/models/endpoint.py:10 terminal/models/endpoint.py:86 #: terminal/models/endpoint.py:10 terminal/models/endpoint.py:86
#: terminal/models/storage.py:26 terminal/models/task.py:16 #: terminal/models/storage.py:26 terminal/models/task.py:16
@ -58,7 +58,7 @@ msgstr "激活中"
#: assets/models/cluster.py:29 assets/models/cmd_filter.py:48 #: assets/models/cluster.py:29 assets/models/cmd_filter.py:48
#: assets/models/cmd_filter.py:96 assets/models/domain.py:24 #: assets/models/cmd_filter.py:96 assets/models/domain.py:24
#: assets/models/domain.py:65 assets/models/group.py:23 #: assets/models/domain.py:65 assets/models/group.py:23
#: assets/models/label.py:23 ops/models/adhoc.py:38 orgs/models.py:68 #: assets/models/label.py:23 ops/models/adhoc.py:38 orgs/models.py:73
#: perms/models/base.py:93 rbac/models/role.py:37 settings/models.py:34 #: perms/models/base.py:93 rbac/models/role.py:37 settings/models.py:34
#: terminal/models/endpoint.py:23 terminal/models/endpoint.py:96 #: terminal/models/endpoint.py:23 terminal/models/endpoint.py:96
#: terminal/models/storage.py:29 terminal/models/terminal.py:114 #: terminal/models/storage.py:29 terminal/models/terminal.py:114
@ -87,7 +87,7 @@ msgstr "登录复核"
#: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:20 #: acls/models/login_acl.py:24 acls/models/login_asset_acl.py:20
#: assets/models/cmd_filter.py:30 assets/models/label.py:15 audits/models.py:37 #: assets/models/cmd_filter.py:30 assets/models/label.py:15 audits/models.py:37
#: audits/models.py:62 audits/models.py:87 audits/serializers.py:100 #: audits/models.py:62 audits/models.py:87 audits/serializers.py:100
#: authentication/models.py:54 authentication/models.py:78 orgs/models.py:215 #: authentication/models.py:54 authentication/models.py:78 orgs/models.py:220
#: perms/models/base.py:84 rbac/builtin.py:120 rbac/models/rolebinding.py:41 #: perms/models/base.py:84 rbac/builtin.py:120 rbac/models/rolebinding.py:41
#: terminal/backends/command/models.py:20 #: terminal/backends/command/models.py:20
#: terminal/backends/command/serializers.py:13 terminal/models/session.py:44 #: terminal/backends/command/serializers.py:13 terminal/models/session.py:44
@ -358,7 +358,7 @@ msgstr "类型名称"
#: assets/serializers/account.py:18 assets/serializers/cmd_filter.py:28 #: assets/serializers/account.py:18 assets/serializers/cmd_filter.py:28
#: assets/serializers/cmd_filter.py:48 common/db/models.py:114 #: assets/serializers/cmd_filter.py:48 common/db/models.py:114
#: common/mixins/models.py:50 ops/models/adhoc.py:39 ops/models/command.py:30 #: common/mixins/models.py:50 ops/models/adhoc.py:39 ops/models/command.py:30
#: orgs/models.py:67 orgs/models.py:218 perms/models/base.py:92 #: orgs/models.py:72 orgs/models.py:223 perms/models/base.py:92
#: users/models/group.py:18 users/models/user.py:922 #: users/models/group.py:18 users/models/user.py:922
#: xpack/plugins/cloud/models.py:125 #: xpack/plugins/cloud/models.py:125
msgid "Date created" msgid "Date created"
@ -368,7 +368,7 @@ msgstr "创建日期"
#: assets/models/gathered_user.py:20 assets/serializers/account.py:21 #: assets/models/gathered_user.py:20 assets/serializers/account.py:21
#: assets/serializers/cmd_filter.py:29 assets/serializers/cmd_filter.py:49 #: assets/serializers/cmd_filter.py:29 assets/serializers/cmd_filter.py:49
#: common/db/models.py:115 common/mixins/models.py:51 ops/models/adhoc.py:40 #: common/db/models.py:115 common/mixins/models.py:51 ops/models/adhoc.py:40
#: orgs/models.py:219 #: orgs/models.py:224
msgid "Date updated" msgid "Date updated"
msgstr "更新日期" msgstr "更新日期"
@ -622,8 +622,8 @@ msgstr "标签管理"
#: assets/models/asset.py:229 assets/models/base.py:183 #: assets/models/asset.py:229 assets/models/base.py:183
#: assets/models/cluster.py:28 assets/models/cmd_filter.py:52 #: assets/models/cluster.py:28 assets/models/cmd_filter.py:52
#: assets/models/cmd_filter.py:99 assets/models/group.py:21 #: assets/models/cmd_filter.py:99 assets/models/group.py:21
#: common/db/models.py:112 common/mixins/models.py:49 orgs/models.py:66 #: common/db/models.py:112 common/mixins/models.py:49 orgs/models.py:71
#: orgs/models.py:220 perms/models/base.py:91 users/models/user.py:706 #: orgs/models.py:225 perms/models/base.py:91 users/models/user.py:706
#: users/serializers/group.py:33 #: users/serializers/group.py:33
#: xpack/plugins/change_auth_plan/models/base.py:48 #: xpack/plugins/change_auth_plan/models/base.py:48
#: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30 #: xpack/plugins/cloud/models.py:122 xpack/plugins/gathered_user/models.py:30
@ -902,11 +902,11 @@ msgstr "忽略大小写"
msgid "Command filter rule" msgid "Command filter rule"
msgstr "命令过滤规则" msgstr "命令过滤规则"
#: assets/models/cmd_filter.py:144 #: assets/models/cmd_filter.py:147
msgid "The generated regular expression is incorrect: {}" msgid "The generated regular expression is incorrect: {}"
msgstr "生成的正则表达式有误" msgstr "生成的正则表达式有误"
#: assets/models/cmd_filter.py:170 tickets/const.py:13 #: assets/models/cmd_filter.py:173 tickets/const.py:13
msgid "Command confirm" msgid "Command confirm"
msgstr "命令复核" msgstr "命令复核"
@ -2201,7 +2201,7 @@ msgstr "有效"
msgid "Expired time" msgid "Expired time"
msgstr "过期时间" msgstr "过期时间"
#: authentication/serializers/connection_token.py:74 #: authentication/serializers/connection_token.py:73
msgid "Asset or application required" msgid "Asset or application required"
msgstr "资产或应用必填" msgstr "资产或应用必填"
@ -2988,26 +2988,26 @@ msgstr "组织存在资源 ({}) 不能被删除"
msgid "App organizations" msgid "App organizations"
msgstr "组织管理" msgstr "组织管理"
#: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:80 #: orgs/mixins/models.py:57 orgs/mixins/serializers.py:25 orgs/models.py:85
#: orgs/models.py:212 rbac/const.py:7 rbac/models/rolebinding.py:48 #: orgs/models.py:217 rbac/const.py:7 rbac/models/rolebinding.py:48
#: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:62 #: rbac/serializers/rolebinding.py:40 settings/serializers/auth/ldap.py:62
#: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:71 #: tickets/models/ticket/general.py:300 tickets/serializers/ticket/ticket.py:71
msgid "Organization" msgid "Organization"
msgstr "组织" msgstr "组织"
#: orgs/models.py:74 #: orgs/models.py:79
msgid "GLOBAL" msgid "GLOBAL"
msgstr "全局组织" msgstr "全局组织"
#: orgs/models.py:82 #: orgs/models.py:87
msgid "Can view root org" msgid "Can view root org"
msgstr "可以查看全局组织" msgstr "可以查看全局组织"
#: orgs/models.py:83 #: orgs/models.py:88
msgid "Can view all joined org" msgid "Can view all joined org"
msgstr "可以查看所有加入的组织" msgstr "可以查看所有加入的组织"
#: orgs/models.py:217 rbac/models/role.py:46 rbac/models/rolebinding.py:44 #: orgs/models.py:222 rbac/models/role.py:46 rbac/models/rolebinding.py:44
#: users/models/user.py:671 #: users/models/user.py:671
msgid "Role" msgid "Role"
msgstr "角色" msgstr "角色"
@ -3096,27 +3096,27 @@ msgstr "剪贴板复制粘贴"
msgid "From ticket" msgid "From ticket"
msgstr "来自工单" msgstr "来自工单"
#: perms/notifications.py:18 #: perms/notifications.py:15
msgid "You permed assets is about to expire" msgid "You permed assets is about to expire"
msgstr "你授权的资产即将到期" msgstr "你授权的资产即将到期"
#: perms/notifications.py:23 #: perms/notifications.py:20
msgid "permed assets" msgid "permed assets"
msgstr "授权的资产" msgstr "授权的资产"
#: perms/notifications.py:62 #: perms/notifications.py:59
msgid "Asset permissions is about to expire" msgid "Asset permissions is about to expire"
msgstr "资产授权规则将要过期" msgstr "资产授权规则将要过期"
#: perms/notifications.py:67 #: perms/notifications.py:64
msgid "asset permissions of organization {}" msgid "asset permissions of organization {}"
msgstr "组织 ({}) 的资产授权" msgstr "组织 ({}) 的资产授权"
#: perms/notifications.py:94 #: perms/notifications.py:91
msgid "Your permed applications is about to expire" msgid "Your permed applications is about to expire"
msgstr "你授权的应用即将过期" msgstr "你授权的应用即将过期"
#: perms/notifications.py:98 #: perms/notifications.py:95
msgid "permed applications" msgid "permed applications"
msgstr "授权的应用" msgstr "授权的应用"
@ -3782,19 +3782,19 @@ msgstr "模板"
msgid "Test phone" msgid "Test phone"
msgstr "测试手机号" msgstr "测试手机号"
#: settings/serializers/auth/sso.py:12 #: settings/serializers/auth/sso.py:11
msgid "Enable SSO auth" msgid "Enable SSO auth"
msgstr "启用 SSO Token 认证" msgstr "启用 SSO Token 认证"
#: settings/serializers/auth/sso.py:13 #: settings/serializers/auth/sso.py:12
msgid "Other service can using SSO token login to JumpServer without password" msgid "Other service can using SSO token login to JumpServer without password"
msgstr "其它系统可以使用 SSO Token 对接 JumpServer, 免去登录的过程" msgstr "其它系统可以使用 SSO Token 对接 JumpServer, 免去登录的过程"
#: settings/serializers/auth/sso.py:16 #: settings/serializers/auth/sso.py:15
msgid "SSO auth key TTL" msgid "SSO auth key TTL"
msgstr "Token 有效期" msgstr "Token 有效期"
#: settings/serializers/auth/sso.py:16 #: settings/serializers/auth/sso.py:15
msgid "Unit: second" msgid "Unit: second"
msgstr "单位: 秒" msgstr "单位: 秒"
@ -3860,7 +3860,7 @@ msgstr "登录日志"
#: settings/serializers/cleaning.py:10 settings/serializers/cleaning.py:14 #: settings/serializers/cleaning.py:10 settings/serializers/cleaning.py:14
#: settings/serializers/cleaning.py:18 settings/serializers/cleaning.py:22 #: settings/serializers/cleaning.py:18 settings/serializers/cleaning.py:22
#: settings/serializers/cleaning.py:26 #: settings/serializers/cleaning.py:26 settings/serializers/other.py:35
msgid "Unit: day" msgid "Unit: day"
msgstr "单位: 天" msgstr "单位: 天"
@ -4025,19 +4025,23 @@ msgstr ""
"放置单独授权的资产到未分组节点, 避免能看到资产所在节点，但该节点未被授权的问" "放置单独授权的资产到未分组节点, 避免能看到资产所在节点，但该节点未被授权的问"
"题" "题"
#: settings/serializers/other.py:34 #: settings/serializers/other.py:35
msgid "Ticket authorize default time"
msgstr "默认工单授权时间"
#: settings/serializers/other.py:39
msgid "Help Docs URL" msgid "Help Docs URL"
msgstr "文档链接" msgstr "文档链接"
#: settings/serializers/other.py:35 #: settings/serializers/other.py:40
msgid "default: http://docs.jumpserver.org" msgid "default: http://docs.jumpserver.org"
msgstr "默认: http://dev.jumpserver.org:8080" msgstr "默认: http://dev.jumpserver.org:8080"
#: settings/serializers/other.py:39 #: settings/serializers/other.py:44
msgid "Help Support URL" msgid "Help Support URL"
msgstr "支持链接" msgstr "支持链接"
#: settings/serializers/other.py:40 #: settings/serializers/other.py:45
msgid "default: http://www.jumpserver.org/support/" msgid "default: http://www.jumpserver.org/support/"
msgstr "默认: http://www.jumpserver.org/support/" msgstr "默认: http://www.jumpserver.org/support/"
@ -4762,7 +4766,7 @@ msgstr "不支持批量创建"
msgid "Storage is invalid" msgid "Storage is invalid"
msgstr "存储无效" msgstr "存储无效"
#: terminal/models/command.py:53 #: terminal/models/command.py:66
msgid "Command record" msgid "Command record"
msgstr "命令记录" msgstr "命令记录"

5
apps/settings/serializers/other.py
View File

@ -30,6 +30,11 @@ class OtherSettingSerializer(serializers.Serializer):
help_text=_("Perm single to ungroup node") help_text=_("Perm single to ungroup node")
) )
TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField(
min_value=7, max_value=9999, required=False,
label=_("Ticket authorize default time"), help_text=_("Unit: day")
)
HELP_DOCUMENT_URL = serializers.URLField( HELP_DOCUMENT_URL = serializers.URLField(
required=False, allow_blank=True, allow_null=True, label=_("Help Docs URL"), required=False, allow_blank=True, allow_null=True, label=_("Help Docs URL"),
help_text=_('default: http://docs.jumpserver.org') help_text=_('default: http://docs.jumpserver.org')

1
apps/settings/serializers/public.py
View File

@ -14,6 +14,7 @@ class PublicSettingSerializer(serializers.Serializer):
class PrivateSettingSerializer(PublicSettingSerializer): class PrivateSettingSerializer(PublicSettingSerializer):
WINDOWS_SKIP_ALL_MANUAL_PASSWORD = serializers.BooleanField() WINDOWS_SKIP_ALL_MANUAL_PASSWORD = serializers.BooleanField()
OLD_PASSWORD_HISTORY_LIMIT_COUNT = serializers.IntegerField() OLD_PASSWORD_HISTORY_LIMIT_COUNT = serializers.IntegerField()
TICKET_AUTHORIZE_DEFAULT_TIME = serializers.IntegerField()
SECURITY_MAX_IDLE_TIME = serializers.IntegerField() SECURITY_MAX_IDLE_TIME = serializers.IntegerField()
SECURITY_VIEW_AUTH_NEED_MFA = serializers.BooleanField() SECURITY_VIEW_AUTH_NEED_MFA = serializers.BooleanField()
SECURITY_MFA_VERIFY_TTL = serializers.IntegerField() SECURITY_MFA_VERIFY_TTL = serializers.IntegerField()