Skip to content

Commit 0e3a824

Browse files
authored
Merge pull request #402 from 0xJacky/feat/beta.24
Feat/beta.24
2 parents 189f623 + f52c84e commit 0e3a824

File tree

29 files changed

+276
-279
lines changed

29 files changed

+276
-279
lines changed

api/certificate/issue.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,8 @@ func IssueCert(c *gin.Context) {
9595
log := &cert.Logger{}
9696
log.SetCertModel(&certModel)
9797

98+
payload.CertID = certModel.ID
99+
98100
go cert.IssueCert(payload, logChan, errChan)
99101

100102
go handleIssueCertLogChan(ws, log, logChan)

app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "nginx-ui-app-next",
3-
"version": "2.0.0-beta.23",
3+
"version": "2.0.0-beta.24",
44
"type": "module",
55
"scripts": {
66
"dev": "vite",

app/src/language/en/app.po

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,19 +74,19 @@ msgstr "Add Location"
7474
msgid "Advance Mode"
7575
msgstr "Advance Mode"
7676

77-
#: src/views/preference/OpenAISettings.vue:39
77+
#: src/views/preference/OpenAISettings.vue:42
7878
msgid "API Base Url"
7979
msgstr ""
8080

8181
#: src/views/certificate/DNSChallenge.vue:82
8282
msgid "API Document"
8383
msgstr ""
8484

85-
#: src/views/preference/OpenAISettings.vue:51
85+
#: src/views/preference/OpenAISettings.vue:54
8686
msgid "API Proxy"
8787
msgstr ""
8888

89-
#: src/views/preference/OpenAISettings.vue:63
89+
#: src/views/preference/OpenAISettings.vue:66
9090
msgid "API Token"
9191
msgstr ""
9292

@@ -920,7 +920,7 @@ msgstr ""
920920
msgid "Leave blank for no change"
921921
msgstr "Leave blank for no change"
922922

923-
#: src/views/preference/OpenAISettings.vue:47
923+
#: src/views/preference/OpenAISettings.vue:50
924924
msgid "Leave blank for the default: https://api.openai.com/"
925925
msgstr ""
926926

@@ -1047,7 +1047,7 @@ msgstr "Memory and Storage"
10471047
msgid "Minutes"
10481048
msgstr ""
10491049

1050-
#: src/views/preference/OpenAISettings.vue:27
1050+
#: src/views/preference/OpenAISettings.vue:30
10511051
#, fuzzy
10521052
msgid "Model"
10531053
msgstr "Advance Mode"
@@ -1712,8 +1712,10 @@ msgstr ""
17121712
msgid "The input is not a SSL Certificate Key"
17131713
msgstr "Certificate Status"
17141714

1715-
#: src/views/preference/OpenAISettings.vue:30
1716-
msgid "The model name should only contain letters, numbers, dashes, and dots."
1715+
#: src/views/preference/OpenAISettings.vue:33
1716+
msgid ""
1717+
"The model name should only contain letters, unicode, numbers, hyphens, "
1718+
"dashes, and dots."
17171719
msgstr ""
17181720

17191721
#: src/views/certificate/CertificateEditor.vue:165
@@ -1726,7 +1728,9 @@ msgid "The path exists, but the file is not a private key"
17261728
msgstr ""
17271729

17281730
#: src/views/preference/BasicSettings.vue:120
1729-
msgid "The server name should only contain letters, numbers, dashes, and dots."
1731+
msgid ""
1732+
"The server name should only contain letters, unicode, numbers, hyphens, "
1733+
"dashes, and dots."
17301734
msgstr ""
17311735

17321736
#: src/views/domain/cert/components/AutoCertStepOne.vue:50
@@ -1743,8 +1747,8 @@ msgstr ""
17431747
msgid "The url is invalid"
17441748
msgstr ""
17451749

1746-
#: src/views/preference/OpenAISettings.vue:42
1747-
#: src/views/preference/OpenAISettings.vue:54
1750+
#: src/views/preference/OpenAISettings.vue:45
1751+
#: src/views/preference/OpenAISettings.vue:57
17481752
msgid "The url is invalid."
17491753
msgstr ""
17501754

@@ -1786,7 +1790,7 @@ msgid ""
17861790
"continue?"
17871791
msgstr ""
17881792

1789-
#: src/views/preference/OpenAISettings.vue:66
1793+
#: src/views/preference/OpenAISettings.vue:69
17901794
msgid "Token is not valid"
17911795
msgstr ""
17921796

app/src/language/es/app.po

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ msgstr "Adicional"
7676
msgid "Advance Mode"
7777
msgstr "Modo avanzado"
7878

79-
#: src/views/preference/OpenAISettings.vue:39
79+
#: src/views/preference/OpenAISettings.vue:42
8080
msgid "API Base Url"
8181
msgstr "URL Base de la API"
8282

@@ -85,11 +85,11 @@ msgstr "URL Base de la API"
8585
msgid "API Document"
8686
msgstr "Token de la API"
8787

88-
#: src/views/preference/OpenAISettings.vue:51
88+
#: src/views/preference/OpenAISettings.vue:54
8989
msgid "API Proxy"
9090
msgstr "Proxy de la API"
9191

92-
#: src/views/preference/OpenAISettings.vue:63
92+
#: src/views/preference/OpenAISettings.vue:66
9393
msgid "API Token"
9494
msgstr "Token de la API"
9595

@@ -883,7 +883,7 @@ msgstr "Comprobado por última vez el"
883883
msgid "Leave blank for no change"
884884
msgstr "Para no modificar dejar en blanco"
885885

886-
#: src/views/preference/OpenAISettings.vue:47
886+
#: src/views/preference/OpenAISettings.vue:50
887887
msgid "Leave blank for the default: https://api.openai.com/"
888888
msgstr "Dejar en blanco para el valor predeterminado: https://api.openai.com/"
889889

@@ -1002,7 +1002,7 @@ msgstr "Memoria y almacenamiento"
10021002
msgid "Minutes"
10031003
msgstr ""
10041004

1005-
#: src/views/preference/OpenAISettings.vue:27
1005+
#: src/views/preference/OpenAISettings.vue:30
10061006
#, fuzzy
10071007
msgid "Model"
10081008
msgstr "Modo de ejecución"
@@ -1649,8 +1649,10 @@ msgstr "La entrada no es un Certificado SSL"
16491649
msgid "The input is not a SSL Certificate Key"
16501650
msgstr "La entrada no es una clave de certificado SSL"
16511651

1652-
#: src/views/preference/OpenAISettings.vue:30
1653-
msgid "The model name should only contain letters, numbers, dashes, and dots."
1652+
#: src/views/preference/OpenAISettings.vue:33
1653+
msgid ""
1654+
"The model name should only contain letters, unicode, numbers, hyphens, "
1655+
"dashes, and dots."
16541656
msgstr ""
16551657

16561658
#: src/views/certificate/CertificateEditor.vue:165
@@ -1663,7 +1665,9 @@ msgid "The path exists, but the file is not a private key"
16631665
msgstr "La ruta existe, pero el archivo no es una clave privada"
16641666

16651667
#: src/views/preference/BasicSettings.vue:120
1666-
msgid "The server name should only contain letters, numbers, dashes, and dots."
1668+
msgid ""
1669+
"The server name should only contain letters, unicode, numbers, hyphens, "
1670+
"dashes, and dots."
16671671
msgstr ""
16681672

16691673
#: src/views/domain/cert/components/AutoCertStepOne.vue:50
@@ -1680,8 +1684,8 @@ msgstr ""
16801684
msgid "The url is invalid"
16811685
msgstr "La URL no es válida"
16821686

1683-
#: src/views/preference/OpenAISettings.vue:42
1684-
#: src/views/preference/OpenAISettings.vue:54
1687+
#: src/views/preference/OpenAISettings.vue:45
1688+
#: src/views/preference/OpenAISettings.vue:57
16851689
#, fuzzy
16861690
msgid "The url is invalid."
16871691
msgstr "La URL no es válida"
@@ -1728,7 +1732,7 @@ msgstr ""
17281732
"de la autoridad al backend, y debemos guardar este archivo y volver a cargar "
17291733
"Nginx. ¿Estás seguro de que quieres continuar?"
17301734

1731-
#: src/views/preference/OpenAISettings.vue:66
1735+
#: src/views/preference/OpenAISettings.vue:69
17321736
msgid "Token is not valid"
17331737
msgstr "El token no es válido"
17341738

app/src/language/fr_FR/app.po

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ msgstr "Supplémentaire"
7676
msgid "Advance Mode"
7777
msgstr "Mode avancé"
7878

79-
#: src/views/preference/OpenAISettings.vue:39
79+
#: src/views/preference/OpenAISettings.vue:42
8080
msgid "API Base Url"
8181
msgstr "URL de base de l'API"
8282

@@ -85,11 +85,11 @@ msgstr "URL de base de l'API"
8585
msgid "API Document"
8686
msgstr "Jeton d'API"
8787

88-
#: src/views/preference/OpenAISettings.vue:51
88+
#: src/views/preference/OpenAISettings.vue:54
8989
msgid "API Proxy"
9090
msgstr "Proxy d'API"
9191

92-
#: src/views/preference/OpenAISettings.vue:63
92+
#: src/views/preference/OpenAISettings.vue:66
9393
msgid "API Token"
9494
msgstr "Jeton d'API"
9595

@@ -917,7 +917,7 @@ msgstr "Dernière vérification le"
917917
msgid "Leave blank for no change"
918918
msgstr "Laisser vide pour aucun changement"
919919

920-
#: src/views/preference/OpenAISettings.vue:47
920+
#: src/views/preference/OpenAISettings.vue:50
921921
msgid "Leave blank for the default: https://api.openai.com/"
922922
msgstr "Laissez vide pour la valeur par défaut : https://api.openai.com/"
923923

@@ -1046,7 +1046,7 @@ msgstr "Mémoire et stockage"
10461046
msgid "Minutes"
10471047
msgstr ""
10481048

1049-
#: src/views/preference/OpenAISettings.vue:27
1049+
#: src/views/preference/OpenAISettings.vue:30
10501050
#, fuzzy
10511051
msgid "Model"
10521052
msgstr "Mode d'exécution"
@@ -1714,8 +1714,10 @@ msgstr ""
17141714
msgid "The input is not a SSL Certificate Key"
17151715
msgstr "Chemin de la clé du certificat SSL"
17161716

1717-
#: src/views/preference/OpenAISettings.vue:30
1718-
msgid "The model name should only contain letters, numbers, dashes, and dots."
1717+
#: src/views/preference/OpenAISettings.vue:33
1718+
msgid ""
1719+
"The model name should only contain letters, unicode, numbers, hyphens, "
1720+
"dashes, and dots."
17191721
msgstr ""
17201722

17211723
#: src/views/certificate/CertificateEditor.vue:165
@@ -1728,7 +1730,9 @@ msgid "The path exists, but the file is not a private key"
17281730
msgstr ""
17291731

17301732
#: src/views/preference/BasicSettings.vue:120
1731-
msgid "The server name should only contain letters, numbers, dashes, and dots."
1733+
msgid ""
1734+
"The server name should only contain letters, unicode, numbers, hyphens, "
1735+
"dashes, and dots."
17321736
msgstr ""
17331737

17341738
#: src/views/domain/cert/components/AutoCertStepOne.vue:50
@@ -1746,8 +1750,8 @@ msgstr ""
17461750
msgid "The url is invalid"
17471751
msgstr ""
17481752

1749-
#: src/views/preference/OpenAISettings.vue:42
1750-
#: src/views/preference/OpenAISettings.vue:54
1753+
#: src/views/preference/OpenAISettings.vue:45
1754+
#: src/views/preference/OpenAISettings.vue:57
17511755
msgid "The url is invalid."
17521756
msgstr ""
17531757

@@ -1796,7 +1800,7 @@ msgstr ""
17961800
"transmettre la demande de l'autorité au backend, et nous devons enregistrer "
17971801
"ce fichier et recharger le Nginx. Êtes-vous sûr de vouloir continuer?"
17981802

1799-
#: src/views/preference/OpenAISettings.vue:66
1803+
#: src/views/preference/OpenAISettings.vue:69
18001804
msgid "Token is not valid"
18011805
msgstr ""
18021806

app/src/language/ko_KR/app.po

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ msgstr "추가적인"
7575
msgid "Advance Mode"
7676
msgstr "고급 모드"
7777

78-
#: src/views/preference/OpenAISettings.vue:39
78+
#: src/views/preference/OpenAISettings.vue:42
7979
msgid "API Base Url"
8080
msgstr "API 기본 URL"
8181

@@ -84,11 +84,11 @@ msgstr "API 기본 URL"
8484
msgid "API Document"
8585
msgstr "API 토큰"
8686

87-
#: src/views/preference/OpenAISettings.vue:51
87+
#: src/views/preference/OpenAISettings.vue:54
8888
msgid "API Proxy"
8989
msgstr "API 프록시"
9090

91-
#: src/views/preference/OpenAISettings.vue:63
91+
#: src/views/preference/OpenAISettings.vue:66
9292
msgid "API Token"
9393
msgstr "API 토큰"
9494

@@ -890,7 +890,7 @@ msgstr "마지막 확인 시간"
890890
msgid "Leave blank for no change"
891891
msgstr "변경사항이 없으면 비워두세요"
892892

893-
#: src/views/preference/OpenAISettings.vue:47
893+
#: src/views/preference/OpenAISettings.vue:50
894894
msgid "Leave blank for the default: https://api.openai.com/"
895895
msgstr "기본값을 사용하려면 비워 두세요: https://api.openai.com/"
896896

@@ -1022,7 +1022,7 @@ msgstr "메모리 및 저장소"
10221022
msgid "Minutes"
10231023
msgstr "분"
10241024

1025-
#: src/views/preference/OpenAISettings.vue:27
1025+
#: src/views/preference/OpenAISettings.vue:30
10261026
#, fuzzy
10271027
msgid "Model"
10281028
msgstr "실행 모드"
@@ -1690,8 +1690,10 @@ msgstr "입력이 SSL 인증서가 아닙니다"
16901690
msgid "The input is not a SSL Certificate Key"
16911691
msgstr "Certificate Status"
16921692

1693-
#: src/views/preference/OpenAISettings.vue:30
1694-
msgid "The model name should only contain letters, numbers, dashes, and dots."
1693+
#: src/views/preference/OpenAISettings.vue:33
1694+
msgid ""
1695+
"The model name should only contain letters, unicode, numbers, hyphens, "
1696+
"dashes, and dots."
16951697
msgstr ""
16961698

16971699
#: src/views/certificate/CertificateEditor.vue:165
@@ -1704,7 +1706,9 @@ msgid "The path exists, but the file is not a private key"
17041706
msgstr "경로는 존재하지만 파일은 개인 키가 아닙니다"
17051707

17061708
#: src/views/preference/BasicSettings.vue:120
1707-
msgid "The server name should only contain letters, numbers, dashes, and dots."
1709+
msgid ""
1710+
"The server name should only contain letters, unicode, numbers, hyphens, "
1711+
"dashes, and dots."
17081712
msgstr ""
17091713

17101714
#: src/views/domain/cert/components/AutoCertStepOne.vue:50
@@ -1722,8 +1726,8 @@ msgstr ""
17221726
msgid "The url is invalid"
17231727
msgstr "유효한 URL이 아닙니다"
17241728

1725-
#: src/views/preference/OpenAISettings.vue:42
1726-
#: src/views/preference/OpenAISettings.vue:54
1729+
#: src/views/preference/OpenAISettings.vue:45
1730+
#: src/views/preference/OpenAISettings.vue:57
17271731
#, fuzzy
17281732
msgid "The url is invalid."
17291733
msgstr "유효한 URL이 아닙니다"
@@ -1769,7 +1773,7 @@ msgstr ""
17691773
"시할 수 있는 위치를 추가해야 하며,이 파일을 저장하고 Nginx를 다시로드해야 합"
17701774
"니다.계속하시겠습니까?"
17711775

1772-
#: src/views/preference/OpenAISettings.vue:66
1776+
#: src/views/preference/OpenAISettings.vue:69
17731777
msgid "Token is not valid"
17741778
msgstr "토큰이 유효하지 않습니다"
17751779

0 commit comments

Comments
 (0)