fix: fix somme issue with system proxy (#8603)

2025-10-09 15:06:37 +08:00 · 2025-05-12 15:59:59 +08:00 · 2025-05-12 15:59:59 +08:00 · bb5f04a9b0
commit bb5f04a9b0
parent 32b9b3f31f
12 changed files with 17 additions and 5 deletions
--- 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
 	}
--- 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',
--- 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: 'プロキシアドレス',
--- 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: '프록시 포트',
--- 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',
--- 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',
--- 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: 'Порт прокси',
--- 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: '代理端口',
--- 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: '代理端口',
--- a/frontend/src/views/website/runtime/components/port-jump.vue
+++ b/frontend/src/views/website/runtime/components/port-jump.vue
@ -1,7 +1,7 @@
 <template>
    <div v-if="row.port != ''">
        <span v-for="(port, index) in row.exposedPorts" :key="index">
-            <el-button icon="Position" plain size="small" @click="jump(port, 'http')">
+            <el-button icon="Position" plain size="small" @click="jump(port.hostPort, 'http')">
                {{ port.hostIP }}:{{ port.hostPort }}->{{ port.containerPort }}
            </el-button>
        </span>
--- a/frontend/src/views/website/ssl/acme-account/create/index.vue
+++ b/frontend/src/views/website/ssl/acme-account/create/index.vue
@ -6,7 +6,7 @@
                    <el-form-item :label="$t('website.email')" prop="email">
                        <el-input v-model.trim="account.email"></el-input>
                    </el-form-item>
-                    <el-form-item :label="$t('website.useProxy')" prop="useProxy">
+                    <el-form-item :label="$t('website.useProxy')" prop="useProxy" v-if="globalStore.isProductPro">
                        <el-switch v-model="account.useProxy"></el-switch>
                        <span class="input-help">
                            {{ $t('website.useProxyHelper') }}
@ -79,6 +79,8 @@ import { createAcmeAccount } from '@/api/modules/website';
 import i18n from '@/lang';
 import { MsgSuccess } from '@/utils/message';
 import { AcmeAccountTypes, KeyTypes } from '@/global/mimetype';
+import { GlobalStore } from '@/store';
+const globalStore = GlobalStore();

 const open = ref();
 const loading = ref(false);
--- a/frontend/src/views/website/ssl/acme-account/index.vue
+++ b/frontend/src/views/website/ssl/acme-account/index.vue
@ -25,7 +25,7 @@
                        {{ getKeyName(row.keyType) }}
                    </template>
                </el-table-column>
-                <el-table-column :label="$t('website.useProxy')" min-width="100px">
+                <el-table-column :label="$t('website.useProxy')" min-width="100px" v-if="globalStore.isProductPro">
                    <template #default="{ row }">
                        <el-switch v-model="row.useProxy" @change="update(row)"></el-switch>
                    </template>
@ -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);