diff --git a/backend/app/service/ai.go b/backend/app/service/ai.go index 5d6cf123b..6e8052ae2 100644 --- a/backend/app/service/ai.go +++ b/backend/app/service/ai.go @@ -245,6 +245,15 @@ func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error { return err } } + if req.SSLID > 0 { + ssl, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(req.SSLID)) + if err != nil { + return err + } + if ssl.Pem == "" { + return buserr.New("ErrSSL") + } + } createWebsiteReq := request.WebsiteCreate{ PrimaryDomain: req.Domain, Alias: strings.ToLower(req.Domain), @@ -320,6 +329,15 @@ func (u *AIToolService) UpdateBindDomain(req dto.OllamaBindDomain) error { return err } } + if req.SSLID > 0 { + ssl, err := websiteSSLRepo.GetFirst(commonRepo.WithByID(req.SSLID)) + if err != nil { + return err + } + if ssl.Pem == "" { + return buserr.New("ErrSSL") + } + } websiteService := NewIWebsiteService() website, err := websiteRepo.GetFirst(commonRepo.WithByID(req.WebsiteID)) if err != nil { diff --git a/backend/i18n/lang/en.yaml b/backend/i18n/lang/en.yaml index 06f8d7fbc..bde74da55 100644 --- a/backend/i18n/lang/en.yaml +++ b/backend/i18n/lang/en.yaml @@ -287,6 +287,7 @@ SystemMode: "mode: " #ai-tool ErrOpenrestyInstall: 'Please install Openresty first' +ErrSSL: "Certificate content is empty, please check the certificate!" #mobile app ErrVerifyToken: 'Token verification error, please reset and scan again.' diff --git a/backend/i18n/lang/fa.yaml b/backend/i18n/lang/fa.yaml deleted file mode 100644 index 4073cec63..000000000 --- a/backend/i18n/lang/fa.yaml +++ /dev/null @@ -1,63 +0,0 @@ -#cmd -AppVersion: "Lotfan noskhe-ye barname ra vared konid" -AppCommands: "Dasturat-e marbut be barname" -AppInit: "Barname ra shoru' konid" -AppKeyVal: "Kelid-e barname (faghat az zabane englisi poshtibani mikonad)" -AppCreateFileErr: "Khalgh-e file {{ .name }} namovaffagh bud {{ .err }}" -AppCreateDirErr: "Khalgh-e folder {{ .name }} namovaffagh bud {{ .err }}" -AppMissKey: "Kelid-e barname mojood nist, az -k estefade konid" -AppMissVersion: "Noskhe-ye barname mojood nist, az -v estefade konid" -AppVersionExist: "Noskhe ghablan mojood ast!" -AppCreateSuccessful: "Khalgh ba movaffaghiat anjam shod!" -AppWriteErr: "Neveshtan file {{ .name }} namovaffagh bud {{ .err }}" -SudoHelper: "Lotfan in eskript ra be onvane karbare root ya ba mojavez sudo ejra konid" -ListenIPCommands: "IP goosh dadan ra taghir dahid" -ListenIPv4: "Goosh dadan bar IPv4" -ListenIPv6: "Goosh dadan bar IPv6" -ListenChangeSuccessful: "Taghir movaffagh! Hala bar {{ .value }} goosh midahad" -ResetCommands: "E'ade setadad etela'at-e system" -ResetMFA: "Fa'al-sazi do marhale'i 1Panel ra laghv konid" -ResetHttps: "Voroud HTTPS baraye 1Panel ra laghv konid" -ResetEntrance: "Voroud amin 1Panel ra laghv konid" -ResetIPs: "Mahdudiyat IP-haye mojaz 1Panel ra laghv konid" -ResetDomain: "Sazgari domain 1Panel ra laghv konid" -RestoreCommands: "Bargasht be khadamate 1Panel va data" -RestoreNoSuchFile: "Hich file mojood baraye bargasht nist" -RestoreStep1: "(1/5) Shoru' bargasht be khadamate 1Panel va data az directory {{ .name }} ..." -RestoreStep2: "(2/5) Bargasht be binary 1Panel ba movaffaghiat anjam shod" -RestoreStep3: "(3/5) Bargasht be script 1Panel ba movaffaghiat anjam shod" -RestoreStep4: "(4/5) Bargasht be khadamat 1Panel ba movaffaghiat anjam shod" -RestoreStep5: "(5/5) Bargasht be data 1Panel ba movaffaghiat anjam shod" -RestoreSuccessful: "Bargasht ba movaffaghiat anjam shod! Khadamat dar hale restart ast, lotfan montazer bashid..." -UpdateCommands: "Be'rooz resani etela'at-e panel" -UpdateUser: "Be'rooz resani karbare panel" -UpdatePassword: "Be'rooz resani ramz-e panel" -UpdatePort: "Be'rooz resani port-e panel" -UpdateUserNull: "Khatta: karbare panel khalist!" -UpdateUserBlank: "Khatta: karbare panel shamel faseleh ast!" -UpdateUserFormat: "Khatta: format-e karbare panel na dorost ast! Faghat az englisi, chine'i, adad va _, ba tool-e 3-30 poshtibani mikonad" -UpdateUserErr: "Khatta: be'rooz resani karbare panel namovaffagh bud, {{ .err }}" -UpdateSuccessful: "Be'rooz resani ba movaffaghiat anjam shod!" -UpdateUserResult: "Karbare panel: {{ .name }}" -UpdatePasswordRead: "Khatta: khatayi dar khandan etela'at-e ramz-e panel, {{ .err }}" -UpdatePasswordNull: "Khatta: ramz-e panel khalist!" -UpdateUPasswordBlank: "Khatta: ramz-e panel shamel faseleh ast!" -UpdatePasswordFormat: "Khatta: ramz-e panel faghat az harf, adad, karakter-haye vizhe !@#$%*_,.? ba tool-e 8-30 poshtibani mikonad!" -UpdatePasswordLen: "Khatta: lotfan ramzi bishtar az 6 karakter vared konid!" -UpdatePasswordRe: "Teyid-e ramz:" -UpdatePasswordErr: "Khatta: be'rooz resani ramz-e panel namovaffagh bud, {{ .err }}" -UpdatePasswordSame: "Khatta: do ramz ba ham yeksan nistand, lotfan barrasi konid va dobare talash konid!" -UpdatePasswordResult: "Ramz-e panel: {{ .name }}" -UpdatePortFormat: "Khatta: shomareye port bayad bein 1 ta 65535 bashad!" -UpdatePortUsed: "Khatta: shomareye port ghablan estefade shode ast, lotfan barrasi konid va dobare talash konid!" -UpdatePortErr: "Khatta: be'rooz resani port-e panel namovaffagh bud, {{ .err }}" -UpdatePortResult: "Port-e panel: {{ .name }}" -UpdatePortFirewallAdd: "Ezafe kardane ghanoun-e port firewall namovaffagh bud, {{ .err }}, lotfan port {{ .name }} ra be dast az qavaneen firewall ezafe konid." -UpdatePortFirewallDel: "Khatta: hazf-e port firewall namovaffagh bud, {{ .err }}" -UpdatePortFirewallReload: "Reload firewall namovaffagh bud, {{ .err }}, lotfan firewall ra be dast reload konid." -UserInfo: "Daryaft etela'at-e panel" -UserInfoAddr: "Address-e panel: " -UserInfoPassHelp: "Nokte: baraye taghiri ramz, mitavanid dastur zir ra anjam dahid: " -DBConnErr: "Khatta: etesal be database namovaffagh bud, {{ .err }}" -SystemVersion: "noskhe: " -SystemMode: "halat: " diff --git a/backend/i18n/lang/ja.yaml b/backend/i18n/lang/ja.yaml index c0fc96a50..6ca47890d 100644 --- a/backend/i18n/lang/ja.yaml +++ b/backend/i18n/lang/ja.yaml @@ -284,6 +284,8 @@ SystemMode: "モード: " #ai-tool ErrOpenrestyInstall: 'まず Openresty をインストールしてください' +ErrSSL: "証明書の内容が空です。証明書を確認してください!" + #mobile app ErrVerifyToken: 'トークンの検証エラーです。リセット後、再度QRコードをスキャンしてください。' diff --git a/backend/i18n/lang/ko.yaml b/backend/i18n/lang/ko.yaml index 3122f4b17..f65cbdf3a 100644 --- a/backend/i18n/lang/ko.yaml +++ b/backend/i18n/lang/ko.yaml @@ -287,6 +287,8 @@ SystemMode: "모드: " #ai-tool ErrOpenrestyInstall: '먼저 Openresty를 설치하세요' +ErrSSL: "인증서 내용이 비어 있습니다. 인증서를 확인하세요!" + #mobile app ErrVerifyToken: '토큰 검증 오류가 발생했습니다. 재설정 후 다시 스캔해 주세요.' diff --git a/backend/i18n/lang/ms.yml b/backend/i18n/lang/ms.yml index 6da80d626..d6d9a0272 100644 --- a/backend/i18n/lang/ms.yml +++ b/backend/i18n/lang/ms.yml @@ -286,6 +286,8 @@ SystemMode: "Mod: " #ai-tool ErrOpenrestyInstall: 'Sila pasang Openresty terlebih dahulu' +ErrSSL: "Kandungan sijil kosong, sila periksa sijil!" + #mobile app ErrVerifyToken: 'Ralat pengesahan token, sila tetapkan semula dan imbas semula.' diff --git a/backend/i18n/lang/pt-BR.yaml b/backend/i18n/lang/pt-BR.yaml index 8d1694a3b..f4e8890f5 100644 --- a/backend/i18n/lang/pt-BR.yaml +++ b/backend/i18n/lang/pt-BR.yaml @@ -284,6 +284,7 @@ SystemMode: "modo: " #ai-tool ErrOpenrestyInstall: 'Por favor, instale o Openresty primeiro' +ErrSSL: "O conteúdo do certificado está vazio, por favor, verifique o certificado!" #mobile app ErrVerifyToken: 'Erro de verificação do token, por favor, reinicie e escaneie novamente.' diff --git a/backend/i18n/lang/ru.yaml b/backend/i18n/lang/ru.yaml index d7fd3de68..986ca78ce 100644 --- a/backend/i18n/lang/ru.yaml +++ b/backend/i18n/lang/ru.yaml @@ -286,7 +286,8 @@ SystemVersion: "версия: " SystemMode: "режим: " #ai-tool -"ErrOpenrestyInstall": "Пожалуйста, установите Openresty сначала" +ErrOpenrestyInstall: "Пожалуйста, установите Openresty сначала" +ErrSSL: "Содержимое сертификата пустое, пожалуйста, проверьте сертификат!" #mobile app ErrVerifyToken: 'шибка проверки токена, пожалуйста, сбросьте и отсканируйте снова.' diff --git a/backend/i18n/lang/zh-Hant.yaml b/backend/i18n/lang/zh-Hant.yaml index 7c5118a31..4f164b052 100644 --- a/backend/i18n/lang/zh-Hant.yaml +++ b/backend/i18n/lang/zh-Hant.yaml @@ -286,7 +286,8 @@ SystemVersion: "版本: " SystemMode: "模式: " #ai-tool -"ErrOpenrestyInstall": "請先安裝 Openresty" +ErrOpenrestyInstall: "請先安裝 Openresty" +ErrSSL: "證書內容為空,請檢查證書!" #mobile app ErrVerifyToken: '令牌驗證錯誤,請重置後再次掃碼' diff --git a/backend/i18n/lang/zh.yaml b/backend/i18n/lang/zh.yaml index c2d88a3da..d5b2e7bac 100644 --- a/backend/i18n/lang/zh.yaml +++ b/backend/i18n/lang/zh.yaml @@ -287,6 +287,7 @@ SystemMode: "模式: " #ai-tool ErrOpenrestyInstall: '请先安装 Openresty' +ErrSSL: "证书内容为空,请检查证书!" #mobile app ErrVerifyToken: '令牌验证错误,请重置后再次扫码' diff --git a/cmd/server/conf/app.yaml b/cmd/server/conf/app.yaml index 5b2a4b9e4..141df22ac 100644 --- a/cmd/server/conf/app.yaml +++ b/cmd/server/conf/app.yaml @@ -5,8 +5,7 @@ system: repo_url: https://resource.1panel.pro app_repo: https://apps.1panel.pro is_demo: false - is_intl: true - port: 9999 + port: 8888 username: admin password: admin123