diff --git a/agent/utils/ssl/acme.go b/agent/utils/ssl/acme.go index 816c8b300..9e0b05ea4 100644 --- a/agent/utils/ssl/acme.go +++ b/agent/utils/ssl/acme.go @@ -178,7 +178,7 @@ func NewConfigWithProxy(user registration.User, accountType, customCaURL string, caDirURL = customCaURL } if systemProxy != nil { - proxyURL = fmt.Sprintf("%s:%s", systemProxy.URL, systemProxy.Port) + proxyURL = fmt.Sprintf("%s://%s:%s", systemProxy.Type, systemProxy.URL, systemProxy.Port) proxyUser = systemProxy.User proxyPassword = systemProxy.Password } diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 366fc222c..4583993c0 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -1556,7 +1556,8 @@ const message = { proxyHelper2: 'System version upgrades and retrieving update information (Professional)', proxyHelper3: 'Verification and synchronization of system licenses', proxyHelper4: 'Docker network access will be done through a proxy server (Professional)', - proxyHelper5: 'Unified download and sync for system-type script libraries (Professional Edition feature)', + proxyHelper5: 'Unified download and sync for system-type script libraries (Professional)', + proxyHelper6: 'Apply for certificate (Professional)', proxyType: 'Proxy Type', proxyUrl: 'Proxy Address', proxyPort: 'Proxy Port', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index 266598296..97a80057a 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -1498,6 +1498,7 @@ const message = { proxyHelper4: 'Dockerネットワークはプロキシサーバーを通じてアクセスされます（プロフェッショナルエディションのみ）', proxyHelper5: 'システムタイプスクリプトライブラリの統一下載と同期（プロフェッショナル版機能）', + proxyHelper6: '証明書を申請する（プロ版機能）', proxyHelper3: 'システムライセンスの確認と同期', proxyType: 'プロキシタイプ', proxyUrl: 'プロキシアドレス', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index e9036d232..9db9b8721 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -1481,6 +1481,7 @@ const message = { proxyHelper4: 'Docker 네트워크가 프록시 서버를 통해 액세스됩니다 (전문 버전에서만 제공)', proxyHelper3: '시스템 라이선스 인증 및 동기화', proxyHelper5: '시스템 유형 스크립트 라이브러리의 통합 다운로드 및 동기화 (프로페셔널 에디션 기능)', + proxyHelper6: '인증서 신청 (프로 버전 기능)', proxyType: '프록시 유형', proxyUrl: '프록시 주소', proxyPort: '프록시 포트', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index e57f2f6a1..be8b21e14 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -1543,6 +1543,7 @@ const message = { proxyHelper4: 'Rangkaian Docker akan diakses melalui pelayan proksi (Edisi Profesional sahaja)', proxyHelper3: 'Pengesahan dan penyelarasan lesen sistem', proxyHelper5: 'Muat turun dan penyegerakan bersepadu untuk pustaka skrip jenis sistem (Ciri Edisi Profesional)', + proxyHelper6: 'Mohon sijil (Fungsi versi Pro)', proxyType: 'Jenis proksi', proxyUrl: 'Alamat proksi', proxyPort: 'Port proksi', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index 49111dfd8..1774d259d 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -1530,6 +1530,7 @@ const message = { proxyHelper3: 'Verificação e sincronização da licença do sistema', proxyHelper5: 'Download e sincronização unificados para bibliotecas de scripts do tipo sistema (Recurso da Edição Profissional)', + proxyHelper6: 'Solicitar certificado (Funcionalidade da versão Pro)', proxyType: 'Tipo de proxy', proxyUrl: 'Endereço do proxy', proxyPort: 'Porta do proxy', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index acd22a4a0..883a7f225 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -1528,6 +1528,7 @@ const message = { proxyHelper4: 'Сеть Docker будет доступна через прокси-сервер (только профессиональная версия)', proxyHelper3: 'Проверка и синхронизация системной лицензии', proxyHelper5: 'Единая загрузка и синхронизация системных скрипт-библиотек (функция Профессиональной версии)', + proxyHelper6: 'Подать заявку на сертификат (функция профессиональной версии)', proxyType: 'Тип прокси', proxyUrl: 'Адрес прокси', proxyPort: 'Порт прокси', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index d458c63bc..c9a59a883 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -1474,6 +1474,7 @@ const message = { proxyHelper3: '系統許可證的驗證和同步', proxyHelper4: 'Docker 的網絡訪問將通過代理伺服器進行（專業版功能）', proxyHelper5: '系統類型腳本庫的統一下載與同步（專業版功能）', + proxyHelper6: '申請證書（專業版功能）', proxyType: '代理類型', proxyUrl: '代理地址', proxyPort: '代理端口', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 7930e2e4b..2263d9ed0 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -1470,6 +1470,7 @@ const message = { proxyHelper3: '系统许可证的验证和同步', proxyHelper4: 'Docker 的网络访问将通过代理服务器进行（专业版功能）', proxyHelper5: '系统类型脚本库的统一下载与同步（专业版功能）', + proxyHelper6: '申请证书（专业版功能）', proxyType: '代理类型', proxyUrl: '代理地址', proxyPort: '代理端口', diff --git a/frontend/src/views/website/runtime/components/port-jump.vue b/frontend/src/views/website/runtime/components/port-jump.vue index 21fe994dd..1110203ea 100644 --- a/frontend/src/views/website/runtime/components/port-jump.vue +++ b/frontend/src/views/website/runtime/components/port-jump.vue @@ -1,7 +1,7 @@ - + @@ -53,6 +53,8 @@ import { reactive, ref } from 'vue'; import Create from './create/index.vue'; import { getAccountName, getKeyName } from '@/utils/util'; import { MsgSuccess } from '@/utils/message'; +import { GlobalStore } from '@/store'; +const globalStore = GlobalStore(); const open = ref(false); const loading = ref(false);