diff --git a/app/package.json b/app/package.json index eca88596..a69baa57 100644 --- a/app/package.json +++ b/app/package.json @@ -1,7 +1,7 @@ { "name": "nginx-ui-app-next", "type": "module", - "version": "2.0.0-rc.3", + "version": "2.0.0-rc.4", "packageManager": "pnpm@10.5.2+sha512.da9dc28cd3ff40d0592188235ab25d3202add8a207afbedc682220e4a0029ffbff4562102b9e6e46b4e3f9e8bd53e6d05de48544b0c57d4b0179e22c76d1199b", "scripts": { "dev": "vite --host", diff --git a/app/src/language/ar/app.po b/app/src/language/ar/app.po index 8ed111bd..474c8098 100644 --- a/app/src/language/ar/app.po +++ b/app/src/language/ar/app.po @@ -868,10 +868,6 @@ msgstr[5] "ملف API" msgid "Domain" msgstr "نطاق" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "تم إنشاء تكوين النطاق بنجاح" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "قائمة النطاقات فارغة، حاول إعادة فتح Auto Cert لـ %{config}" @@ -2367,10 +2363,6 @@ msgstr "معلومات الخادم" msgid "server_name not found in directives" msgstr "اسم_الخادم غير موجود في التوجيهات" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "عامل server_name مطلوب" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2428,6 +2420,11 @@ msgstr "توجيه واحد" msgid "Site Categories" msgstr "فئات الموقع" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "تم إنشاء تكوين النطاق بنجاح" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2686,6 +2683,11 @@ msgstr "" "يجب أن يحتوي اسم العقدة على حروف وأحرف يونيكود وأرقام وشرطات وعلامات وصل " "ونقاط فقط." +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "عامل server_name مطلوب" + #: src/views/certificate/CertificateEditor.vue:179 msgid "The path exists, but the file is not a certificate" msgstr "المسار موجود، لكن الملف ليس شهادة" diff --git a/app/src/language/de_DE/app.po b/app/src/language/de_DE/app.po index 1e8b4367..23b540ed 100644 --- a/app/src/language/de_DE/app.po +++ b/app/src/language/de_DE/app.po @@ -903,10 +903,6 @@ msgstr[1] "API-Dokument" msgid "Domain" msgstr "Domain" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "Domain-Konfiguration erfolgreich erstellt" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2501,10 +2497,6 @@ msgstr "Serverinformationen" msgid "server_name not found in directives" msgstr "server_name wurde in den Anweisungen nicht gefunden" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "server_name-Parameter ist erforderlich" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2562,6 +2554,11 @@ msgstr "Einzige Anweisung" msgid "Site Categories" msgstr "Seitenkategorien" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "Domain-Konfiguration erfolgreich erstellt" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2831,6 +2828,11 @@ msgstr "" "Der Knotenname sollte nur Buchstaben, Unicode, Zahlen, Bindestriche, " "Doppelpunkte und Punkte enthalten." +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "server_name-Parameter ist erforderlich" + #: src/views/certificate/CertificateEditor.vue:179 #, fuzzy msgid "The path exists, but the file is not a certificate" diff --git a/app/src/language/en/app.po b/app/src/language/en/app.po index b98d2a97..a642a55d 100644 --- a/app/src/language/en/app.po +++ b/app/src/language/en/app.po @@ -895,10 +895,6 @@ msgstr[1] "Comments" msgid "Domain" msgstr "" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "Domain Config Created Successfully" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2457,10 +2453,6 @@ msgstr "Server Info" msgid "server_name not found in directives" msgstr "server_name not found in directives" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "server_name parameter is required" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2516,6 +2508,11 @@ msgstr "Single Directive" msgid "Site Categories" msgstr "" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "Domain Config Created Successfully" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2785,6 +2782,11 @@ msgid "" "dashes, colons, and dots." msgstr "" +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "server_name parameter is required" + #: src/views/certificate/CertificateEditor.vue:179 #, fuzzy msgid "The path exists, but the file is not a certificate" diff --git a/app/src/language/es/app.po b/app/src/language/es/app.po index 310b7e3d..9439a421 100644 --- a/app/src/language/es/app.po +++ b/app/src/language/es/app.po @@ -865,10 +865,6 @@ msgstr[1] "Documento de la API" msgid "Domain" msgstr "Dominio" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "Configuración de dominio creada con éxito" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2405,10 +2401,6 @@ msgstr "Información del servidor" msgid "server_name not found in directives" msgstr "No se encuentra server_name en las directivas" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "Se requiere el parámetro server_name" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2466,6 +2458,11 @@ msgstr "Directiva de una sola línea" msgid "Site Categories" msgstr "Categorías del sitio" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "Configuración de dominio creada con éxito" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2727,6 +2724,11 @@ msgstr "" "El nombre del modelo solo debe contener letras, unicode, números, guiones, " "rayas y puntos." +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "Se requiere el parámetro server_name" + #: src/views/certificate/CertificateEditor.vue:179 msgid "The path exists, but the file is not a certificate" msgstr "La ruta existe, pero el archivo no es un certificado" diff --git a/app/src/language/fr_FR/app.po b/app/src/language/fr_FR/app.po index 9606dd7f..73ae26e8 100644 --- a/app/src/language/fr_FR/app.po +++ b/app/src/language/fr_FR/app.po @@ -905,10 +905,6 @@ msgstr[1] "Jeton d'API" msgid "Domain" msgstr "Domaine" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "La configuration du domaine a été créée avec succès" - #: src/views/certificate/CertificateEditor.vue:112 #, fuzzy msgid "Domains list is empty, try to reopen Auto Cert for %{config}" @@ -2485,10 +2481,6 @@ msgstr "Informations sur le serveur" msgid "server_name not found in directives" msgstr "server_name introuvable dans les directives" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "Le paramètre server_name est obligatoire" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2546,6 +2538,11 @@ msgstr "Directive unique" msgid "Site Categories" msgstr "" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "La configuration du domaine a été créée avec succès" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2813,6 +2810,11 @@ msgid "" "dashes, colons, and dots." msgstr "" +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "Le paramètre server_name est obligatoire" + #: src/views/certificate/CertificateEditor.vue:179 #, fuzzy msgid "The path exists, but the file is not a certificate" diff --git a/app/src/language/ko_KR/app.po b/app/src/language/ko_KR/app.po index 2d4ca311..3fd6cc0c 100644 --- a/app/src/language/ko_KR/app.po +++ b/app/src/language/ko_KR/app.po @@ -866,10 +866,6 @@ msgstr[1] "API 문서" msgid "Domain" msgstr "도메인" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "도메인 구성이 성공적으로 생성되었습니다" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2426,10 +2422,6 @@ msgstr "서버 정보" msgid "server_name not found in directives" msgstr "directives에서 server_name을 찾을 수 없습니다" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "server_name 매개변수가 필요합니다" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2485,6 +2477,11 @@ msgstr "단일 지시문" msgid "Site Categories" msgstr "" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "도메인 구성이 성공적으로 생성되었습니다" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2748,6 +2745,11 @@ msgid "" "dashes, colons, and dots." msgstr "" +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "server_name 매개변수가 필요합니다" + #: src/views/certificate/CertificateEditor.vue:179 #, fuzzy msgid "The path exists, but the file is not a certificate" diff --git a/app/src/language/messages.pot b/app/src/language/messages.pot index 0474e90a..5059b1dd 100644 --- a/app/src/language/messages.pot +++ b/app/src/language/messages.pot @@ -832,10 +832,6 @@ msgstr[1] "" msgid "Domain" msgstr "" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2275,10 +2271,6 @@ msgstr "" msgid "server_name not found in directives" msgstr "" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2328,6 +2320,10 @@ msgstr "" msgid "Site Categories" msgstr "" +#: src/views/site/SiteAdd.vue:147 +msgid "Site Config Created Successfully" +msgstr "" + #: src/constants/errors/site.ts:4 msgid "Site is enabled" msgstr "" @@ -2557,6 +2553,10 @@ msgstr "" msgid "The node name should only contain letters, unicode, numbers, hyphens, dashes, colons, and dots." msgstr "" +#: src/views/site/SiteAdd.vue:120 +msgid "The parameter of server_name is required" +msgstr "" + #: src/views/certificate/CertificateEditor.vue:179 msgid "The path exists, but the file is not a certificate" msgstr "" diff --git a/app/src/language/ru_RU/app.po b/app/src/language/ru_RU/app.po index e4d1d111..1cde4821 100644 --- a/app/src/language/ru_RU/app.po +++ b/app/src/language/ru_RU/app.po @@ -871,10 +871,6 @@ msgstr[1] "API Документ" msgid "Domain" msgstr "Домен" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "Конфигурация домена успешно создана" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2396,10 +2392,6 @@ msgstr "Информация о сервере" msgid "server_name not found in directives" msgstr "server_name не нашел в директивах" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "server_name параметр обязателен" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2457,6 +2449,11 @@ msgstr "Одиночная Директива" msgid "Site Categories" msgstr "" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "Конфигурация домена успешно создана" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2717,6 +2714,11 @@ msgstr "" "Имя модели должно содержать только буквы, юникод, цифры, дефисы, тире и " "точки." +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "server_name параметр обязателен" + #: src/views/certificate/CertificateEditor.vue:179 msgid "The path exists, but the file is not a certificate" msgstr "Путь существует, но файл не является сертификатом" diff --git a/app/src/language/tr_TR/app.po b/app/src/language/tr_TR/app.po index 6e215785..287264cc 100644 --- a/app/src/language/tr_TR/app.po +++ b/app/src/language/tr_TR/app.po @@ -871,10 +871,6 @@ msgstr[1] "API Dökümanı" msgid "Domain" msgstr "Alan Adı" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "Alan Adı Yapılandırması Başarıyla Oluşturuldu" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2551,11 +2547,6 @@ msgstr "Sunucu Bilgisi" msgid "server_name not found in directives" msgstr "server_name yönergelerde bulunamadı" -#: src/views/site/SiteAdd.vue:120 -#, fuzzy -msgid "server_name parameter is required" -msgstr "server_name parametresi gereklidir" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2620,6 +2611,11 @@ msgstr "Tek Direktif" msgid "Site Categories" msgstr "" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "Alan Adı Yapılandırması Başarıyla Oluşturuldu" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2908,6 +2904,11 @@ msgid "" msgstr "" "Model adı yalnızca harf, unicode, sayı, tire, çizgi ve nokta içermelidir." +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "server_name parametresi gereklidir" + #: src/views/certificate/CertificateEditor.vue:179 #, fuzzy msgid "The path exists, but the file is not a certificate" diff --git a/app/src/language/vi_VN/app.po b/app/src/language/vi_VN/app.po index 32e6c454..d9f7fddf 100644 --- a/app/src/language/vi_VN/app.po +++ b/app/src/language/vi_VN/app.po @@ -898,10 +898,6 @@ msgstr[1] "Bình luận" msgid "Domain" msgstr "" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "Tên miền đã được tạo" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "" @@ -2460,10 +2456,6 @@ msgstr "Thông tin máy chủ" msgid "server_name not found in directives" msgstr "không tìm thấy server_name trong directives" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "Tham số server_name là bắt buộc" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "" @@ -2520,6 +2512,11 @@ msgstr "Single Directive" msgid "Site Categories" msgstr "" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "Tên miền đã được tạo" + #: src/constants/errors/site.ts:4 #, fuzzy msgid "Site is enabled" @@ -2778,6 +2775,11 @@ msgid "" "dashes, colons, and dots." msgstr "" +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "Tham số server_name là bắt buộc" + #: src/views/certificate/CertificateEditor.vue:179 msgid "The path exists, but the file is not a certificate" msgstr "" diff --git a/app/src/language/zh_CN/app.po b/app/src/language/zh_CN/app.po index 9ffdf8c2..7bec330f 100644 --- a/app/src/language/zh_CN/app.po +++ b/app/src/language/zh_CN/app.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "POT-Creation-Date: \n" -"PO-Revision-Date: 2025-03-03 16:34+0800\n" +"PO-Revision-Date: 2025-03-03 17:51+0800\n" "Last-Translator: 0xJacky \n" "Language-Team: Chinese (Simplified Han script) \n" @@ -829,10 +829,6 @@ msgstr[0] "文档" msgid "Domain" msgstr "域名" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "域名配置文件创建成功" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "域名列表为空,请尝试为 %{config} 重新打开证书自动续期" @@ -2290,10 +2286,6 @@ msgstr "服务器信息" msgid "server_name not found in directives" msgstr "未在指令集合中找到 server_name" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "必须为 server_name 指令指明参数" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "Server Index 超出范围" @@ -2352,6 +2344,10 @@ msgstr "单行指令" msgid "Site Categories" msgstr "网站分类" +#: src/views/site/SiteAdd.vue:147 +msgid "Site Config Created Successfully" +msgstr "网站配置创建成功" + #: src/constants/errors/site.ts:4 msgid "Site is enabled" msgstr "网站已启用" @@ -2591,6 +2587,10 @@ msgid "" "dashes, colons, and dots." msgstr "节点名称只能包含字母、统一码、数字、连字符、破折号、冒号和点。" +#: src/views/site/SiteAdd.vue:120 +msgid "The parameter of server_name is required" +msgstr "必须为 server_name 指令指明参数" + #: src/views/certificate/CertificateEditor.vue:179 msgid "The path exists, but the file is not a certificate" msgstr "路径存在,但文件不是证书" diff --git a/app/src/language/zh_TW/app.po b/app/src/language/zh_TW/app.po index 9a5565d9..e24e7a81 100644 --- a/app/src/language/zh_TW/app.po +++ b/app/src/language/zh_TW/app.po @@ -848,10 +848,6 @@ msgstr[0] "档案" msgid "Domain" msgstr "網域" -#: src/views/site/SiteAdd.vue:147 -msgid "Domain Config Created Successfully" -msgstr "網域設定檔成功建立" - #: src/views/certificate/CertificateEditor.vue:112 msgid "Domains list is empty, try to reopen Auto Cert for %{config}" msgstr "網域列表為空,請嘗試重新開啟 %{config} 的自動憑證" @@ -2326,10 +2322,6 @@ msgstr "伺服器資訊" msgid "server_name not found in directives" msgstr "在指令中未找到 server_name" -#: src/views/site/SiteAdd.vue:120 -msgid "server_name parameter is required" -msgstr "必須提供 server_name 參數" - #: src/constants/errors/nginx_log.ts:3 msgid "ServerIdx out of range" msgstr "伺服器索引超出範圍" @@ -2388,6 +2380,11 @@ msgstr "單一指令" msgid "Site Categories" msgstr "網站類別" +#: src/views/site/SiteAdd.vue:147 +#, fuzzy +msgid "Site Config Created Successfully" +msgstr "網域設定檔成功建立" + #: src/constants/errors/site.ts:4 msgid "Site is enabled" msgstr "站點已啓用" @@ -2633,6 +2630,11 @@ msgid "" "dashes, colons, and dots." msgstr "節點名稱僅能包含字母、Unicode 字元、數字、連字號、破折號、冒號和句點。" +#: src/views/site/SiteAdd.vue:120 +#, fuzzy +msgid "The parameter of server_name is required" +msgstr "必須提供 server_name 參數" + #: src/views/certificate/CertificateEditor.vue:179 msgid "The path exists, but the file is not a certificate" msgstr "路徑存在,但檔案不是憑證" diff --git a/app/src/routes/index.ts b/app/src/routes/index.ts index 8d17bc4c..3ed2db4a 100644 --- a/app/src/routes/index.ts +++ b/app/src/routes/index.ts @@ -58,7 +58,7 @@ export const routes: RouteRecordRaw[] = [ }, { path: 'add', name: 'Add Site', - component: () => import('@/views/site/SiteAdd.vue'), + component: () => import('@/views/site/site_add/SiteAdd.vue'), meta: { name: () => $gettext('Add Site'), lastRouteName: 'Sites List', diff --git a/app/src/version.json b/app/src/version.json index 5f74fb72..4feb865b 100644 --- a/app/src/version.json +++ b/app/src/version.json @@ -1 +1 @@ -{"version":"2.0.0-rc.3","build_id":1,"total_build":385} \ No newline at end of file +{"version":"2.0.0-rc.4","build_id":1,"total_build":386} \ No newline at end of file diff --git a/app/src/views/site/SiteAdd.vue b/app/src/views/site/site_add/SiteAdd.vue similarity index 88% rename from app/src/views/site/SiteAdd.vue rename to app/src/views/site/site_add/SiteAdd.vue index d6ed9850..ecb0cc6b 100644 --- a/app/src/views/site/SiteAdd.vue +++ b/app/src/views/site/site_add/SiteAdd.vue @@ -50,15 +50,15 @@ async function save() { const router = useRouter() -function goto_modify() { +function gotoModify() { router.push(`/sites/${ngxConfig.name}`) } -function create_another() { +function createAnother() { router.go(0) } -const has_server_name = computed(() => { +const hasServerName = computed(() => { const servers = ngxConfig.servers for (const server of Object.values(servers)) { @@ -76,12 +76,12 @@ async function next() { currentStep.value++ } -const ngx_directives = computed(() => { +const ngxDirectives = computed(() => { return ngxConfig.servers[0].directives }) provide('save_config', save) -provide('ngx_directives', ngx_directives) +provide('ngx_directives', ngxDirectives) provide('ngx_config', ngxConfig) @@ -111,13 +111,13 @@ provide('ngx_config', ngxConfig) />

@@ -135,7 +135,7 @@ provide('ngx_config', ngxConfig) {{ $gettext('Next') }} @@ -144,16 +144,16 @@ provide('ngx_config', ngxConfig) diff --git a/internal/cert/tencent_cloud_dns_test.go b/internal/cert/tencent_cloud_dns_test.go index e8cd1252..d1afa298 100644 --- a/internal/cert/tencent_cloud_dns_test.go +++ b/internal/cert/tencent_cloud_dns_test.go @@ -30,7 +30,7 @@ func TestTencentCloudDNS(t *testing.T) { } myUser := model.AcmeUser{ - Email: settings.ServerSettings.Email, + Email: settings.CertSettings.Email, Key: model.PrivateKey{ X: privateKey.PublicKey.X, Y: privateKey.PublicKey.Y, @@ -39,12 +39,12 @@ func TestTencentCloudDNS(t *testing.T) { config := lego.NewConfig(&myUser) - if settings.ServerSettings.Demo { + if settings.NodeSettings.Demo { config.CADirURL = "https://acme-staging-v02.api.letsencrypt.org/directory" } - if settings.ServerSettings.CADir != "" { - config.CADirURL = settings.ServerSettings.CADir + if settings.CertSettings.CADir != "" { + config.CADirURL = settings.CertSettings.CADir if config.HTTPClient != nil { config.HTTPClient.Transport = &http.Transport{ Proxy: http.ProxyFromEnvironment, diff --git a/internal/nginx/ngx_conf_parse_test.go b/internal/nginx/ngx_conf_parse_test.go index 51100652..355fd2e4 100644 --- a/internal/nginx/ngx_conf_parse_test.go +++ b/internal/nginx/ngx_conf_parse_test.go @@ -2,10 +2,11 @@ package nginx import ( "fmt" - "github.com/tufanbarisyildirim/gonginx/config" - "github.com/tufanbarisyildirim/gonginx/parser" "strings" "testing" + + "github.com/tufanbarisyildirim/gonginx/config" + "github.com/tufanbarisyildirim/gonginx/parser" ) func TestNgxConfParse(t *testing.T) { @@ -44,7 +45,12 @@ func fn(block config.IBlock, deep int) { } } - fmt.Println(fmt.Sprintf("%s%s %s", strings.Repeat("\t", deep), v.GetName(), strings.Join(v.GetParameters(), " "))) + // 将 []config.Parameter 转换为 []string + params := make([]string, len(v.GetParameters())) + for i, p := range v.GetParameters() { + params[i] = p.String() + } + fmt.Printf("%s%s %s\n", strings.Repeat("\t", deep), v.GetName(), strings.Join(params, " ")) fn(v.GetBlock(), deep+1) } }