diff --git a/apps/jumpserver/conf.py b/apps/jumpserver/conf.py index b192cd993..4ade943ca 100644 --- a/apps/jumpserver/conf.py +++ b/apps/jumpserver/conf.py @@ -214,7 +214,7 @@ class Config(dict): 'REDIS_DB_WS': 6, 'GLOBAL_ORG_DISPLAY_NAME': '', - 'SITE_URL': 'http://localhost:8080', + 'SITE_URL': 'http://127.0.0.1', 'USER_GUIDE_URL': '', 'ANNOUNCEMENT_ENABLED': True, 'ANNOUNCEMENT': {}, diff --git a/apps/locale/ja/LC_MESSAGES/django.po b/apps/locale/ja/LC_MESSAGES/django.po index c677656d0..216b727b8 100644 --- a/apps/locale/ja/LC_MESSAGES/django.po +++ b/apps/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-02-28 17:54+0800\n" +"POT-Creation-Date: 2023-03-01 15:09+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -1269,7 +1269,7 @@ msgstr "アセットの自動化タスク" #: audits/serializers.py:49 ops/models/base.py:49 ops/models/job.py:183 #: terminal/models/applet/applet.py:157 terminal/models/applet/host.py:108 #: terminal/models/component/status.py:27 terminal/serializers/applet.py:18 -#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283 +#: terminal/serializers/applet_host.py:102 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 @@ -5468,7 +5468,7 @@ msgstr "無効なアプレット パッケージ、ファイル {} がありま msgid "Hosting" msgstr "ホスト マシン" -#: terminal/models/applet/host.py:19 terminal/serializers/applet_host.py:43 +#: terminal/models/applet/host.py:19 terminal/serializers/applet_host.py:52 msgid "Deploy options" msgstr "展開パラメーター" @@ -5718,35 +5718,54 @@ msgstr "セッションごと" msgid "Per Device" msgstr "デバイスごと" -#: terminal/serializers/applet_host.py:32 -msgid "API Server" -msgstr "API 仕える" - #: terminal/serializers/applet_host.py:33 -msgid "RDS Licensing" -msgstr "既存の RDS ライセンス" +msgid "Core API" +msgstr "コア サービス アドレス" #: terminal/serializers/applet_host.py:34 +msgid "" +" \n" +" Tip: The application release machine communicates with the Core " +"service. \n" +" If the release machine and the Core service are on the same network " +"segment, \n" +" it is recommended to fill in the intranet address, otherwise fill in " +"the current site URL \n" +"
\n" +" eg: https://172.16.10.110 or https://dev.jumpserver.com\n" +" " +msgstr "" +"ヒント: アプリケーション リリース マシンは、コア サービスと通信します。" +"リリース マシンとコア サービスが同じネットワーク セグメント上にある場合は、イントラネット アドレスを入力することをお勧めします。" +"それ以外の場合は、現在のサイト URL を入力します。" +"
" +"例: https://172.16.10.110 または https://dev.jumpserver.com" + +#: terminal/serializers/applet_host.py:42 +msgid "Existing RDS license" +msgstr "" + +#: terminal/serializers/applet_host.py:43 msgid "RDS License Server" msgstr "RDS ライセンス サーバー" -#: terminal/serializers/applet_host.py:35 +#: terminal/serializers/applet_host.py:44 msgid "RDS Licensing Mode" msgstr "RDS 認可モード" -#: terminal/serializers/applet_host.py:37 +#: terminal/serializers/applet_host.py:46 msgid "RDS Single Session Per User" msgstr "RDS シングル ユーザー シングル セッション" -#: terminal/serializers/applet_host.py:38 +#: terminal/serializers/applet_host.py:47 msgid "RDS Max Disconnection Time" msgstr "最大切断時間" -#: terminal/serializers/applet_host.py:39 +#: terminal/serializers/applet_host.py:48 msgid "RDS Remote App Logoff Time Limit" msgstr "RDS 远程应用注销时间限制" -#: terminal/serializers/applet_host.py:45 terminal/serializers/terminal.py:41 +#: terminal/serializers/applet_host.py:54 terminal/serializers/terminal.py:41 msgid "Load status" msgstr "ロードステータス" @@ -5780,7 +5799,9 @@ msgstr "" #: terminal/serializers/endpoint.py:35 msgid "Visit IP/Host, if empty, use the current request instead" -msgstr "IP/ホストにアクセスします。空の場合は、代わりに現在のリクエストのアドレスを使用します" +msgstr "" +"IP/ホストにアクセスします。空の場合は、代わりに現在のリクエストのアドレスを使" +"用します" #: terminal/serializers/endpoint.py:58 msgid "" @@ -7393,6 +7414,12 @@ msgstr "究極のエディション" msgid "Community edition" msgstr "コミュニティ版" +#~ msgid "API Server" +#~ msgstr "API 仕える" + +#~ msgid "RDS Licensing" +#~ msgstr "既存の RDS ライセンス" + #, fuzzy #~| msgid "Only admin users" #~ msgid "Unix admin user" diff --git a/apps/locale/zh/LC_MESSAGES/django.po b/apps/locale/zh/LC_MESSAGES/django.po index 17cdd51de..4b74690e5 100644 --- a/apps/locale/zh/LC_MESSAGES/django.po +++ b/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: 2023-02-28 17:54+0800\n" +"POT-Creation-Date: 2023-03-01 15:09+0800\n" "PO-Revision-Date: 2021-05-20 10:54+0800\n" "Last-Translator: ibuler \n" "Language-Team: JumpServer team\n" @@ -1261,7 +1261,7 @@ msgstr "资产自动化任务" #: audits/serializers.py:49 ops/models/base.py:49 ops/models/job.py:183 #: terminal/models/applet/applet.py:157 terminal/models/applet/host.py:108 #: terminal/models/component/status.py:27 terminal/serializers/applet.py:18 -#: terminal/serializers/applet_host.py:93 tickets/models/ticket/general.py:283 +#: terminal/serializers/applet_host.py:102 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 @@ -5396,7 +5396,7 @@ msgstr "Applet pkg 无效,缺少文件 {}" msgid "Hosting" msgstr "宿主机" -#: terminal/models/applet/host.py:19 terminal/serializers/applet_host.py:43 +#: terminal/models/applet/host.py:19 terminal/serializers/applet_host.py:52 msgid "Deploy options" msgstr "部署参数" @@ -5646,35 +5646,52 @@ msgstr "每用户" msgid "Per Device" msgstr "每设备" -#: terminal/serializers/applet_host.py:32 -msgid "API Server" -msgstr "API 服务" - #: terminal/serializers/applet_host.py:33 +msgid "Core API" +msgstr "Core 服务地址" + +#: terminal/serializers/applet_host.py:34 +msgid "" +" \n" +" Tips: The application release machine communicates with the Core " +"service. \n" +" If the release machine and the Core service are on the same network " +"segment, \n" +" it is recommended to fill in the intranet address, otherwise fill in " +"the current site URL \n" +"
\n" +" eg: https://172.16.10.110 or https://dev.jumpserver.com\n" +" " +msgstr "" +"提示:应用发布机和 Core 服务进行通信使用,如果发布机和 Core 服务在同一网段,建议填写内网地址,否则填写当前站点 URL" +"
" +"例如:https://172.16.10.110 or https://dev.jumpserver.com" + +#: terminal/serializers/applet_host.py:42 msgid "Existing RDS license" msgstr "已有 RDS 许可证" -#: terminal/serializers/applet_host.py:34 +#: terminal/serializers/applet_host.py:43 msgid "RDS License Server" msgstr "RDS 许可服务器" -#: terminal/serializers/applet_host.py:35 +#: terminal/serializers/applet_host.py:44 msgid "RDS Licensing Mode" msgstr "RDS 授权模式" -#: terminal/serializers/applet_host.py:37 +#: terminal/serializers/applet_host.py:46 msgid "RDS Single Session Per User" msgstr "RDS 单用户单会话" -#: terminal/serializers/applet_host.py:38 +#: terminal/serializers/applet_host.py:47 msgid "RDS Max Disconnection Time" msgstr "RDS 最大断开时间" -#: terminal/serializers/applet_host.py:39 +#: terminal/serializers/applet_host.py:48 msgid "RDS Remote App Logoff Time Limit" msgstr "RDS 远程应用注销时间限制" -#: terminal/serializers/applet_host.py:45 terminal/serializers/terminal.py:41 +#: terminal/serializers/applet_host.py:54 terminal/serializers/terminal.py:41 msgid "Load status" msgstr "负载状态" @@ -7298,6 +7315,9 @@ msgstr "旗舰版" msgid "Community edition" msgstr "社区版" +#~ msgid "API Server" +#~ msgstr "API 服务" + #~ msgid "Unix admin user" #~ msgstr "Unix 管理员" diff --git a/apps/terminal/serializers/applet_host.py b/apps/terminal/serializers/applet_host.py index 9bbbd78e4..583d4e1ca 100644 --- a/apps/terminal/serializers/applet_host.py +++ b/apps/terminal/serializers/applet_host.py @@ -29,7 +29,16 @@ class DeployOptionsSerializer(serializers.Serializer): (0, _("Enabled")), ) - CORE_HOST = serializers.CharField(default=settings.SITE_URL, label=_('API Server'), max_length=1024) + CORE_HOST = serializers.CharField( + default=settings.SITE_URL, label=_('Core API'), max_length=1024, + help_text=_(""" + Tips: The application release machine communicates with the Core service. + If the release machine and the Core service are on the same network segment, + it is recommended to fill in the intranet address, otherwise fill in the current site URL +
+ eg: https://172.16.10.110 or https://dev.jumpserver.com + """) + ) RDS_Licensing = serializers.BooleanField(default=False, label=_("Existing RDS license")) RDS_LicenseServer = serializers.CharField(default='127.0.0.1', label=_('RDS License Server'), max_length=1024) RDS_LicensingMode = serializers.ChoiceField(choices=LICENSE_MODE_CHOICES, default=2, label=_('RDS Licensing Mode'))