diff --git a/core/app/api/v2/setting.go b/core/app/api/v2/setting.go index 90557b124..39f6419d7 100644 --- a/core/app/api/v2/setting.go +++ b/core/app/api/v2/setting.go @@ -3,7 +3,6 @@ package v2 import ( "encoding/base64" "errors" - "fmt" "net/http" "os" "path" @@ -13,6 +12,7 @@ import ( "github.com/1Panel-dev/1Panel/core/app/api/v2/helper" "github.com/1Panel-dev/1Panel/core/app/dto" "github.com/1Panel-dev/1Panel/core/app/repo" + "github.com/1Panel-dev/1Panel/core/buserr" "github.com/1Panel-dev/1Panel/core/constant" "github.com/1Panel-dev/1Panel/core/global" "github.com/1Panel-dev/1Panel/core/utils/mfa" @@ -94,7 +94,7 @@ func (b *BaseApi) UpdateSetting(c *gin.Context) { } if req.Key == "SecurityEntrance" { if !checkEntrancePattern(req.Value) { - helper.ErrorWithDetail(c, http.StatusBadRequest, "ErrInvalidParams", fmt.Errorf("the format of the security entrance %s is incorrect.", req.Value)) + helper.ErrorWithDetail(c, http.StatusBadRequest, "ErrInvalidParams", buserr.WithName("ErrEntranceFormat", req.Value)) return } } diff --git a/core/i18n/lang/en.yaml b/core/i18n/lang/en.yaml index 82be6e9f9..7bbb77ab4 100644 --- a/core/i18n/lang/en.yaml +++ b/core/i18n/lang/en.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "Request failed {{ .err }}" ErrHttpReqTimeOut: "Request timed out {{ .err }}" ErrCreateHttpClient: "Failed to create request {{ .err }}" ErrProxySetting: "Proxy server information unavailable {{ .err }}, please check and try again!" +ErrEntranceFormat: "Security entrance {{ .name }} is not currently supported. Please check and try again!" # common ErrDemoEnvironment: "Demo server, this operation is prohibited!" diff --git a/core/i18n/lang/es-ES.yaml b/core/i18n/lang/es-ES.yaml index f38034ce8..45e2c1120 100644 --- a/core/i18n/lang/es-ES.yaml +++ b/core/i18n/lang/es-ES.yaml @@ -27,6 +27,7 @@ ErrHttpReqFailed: "Solicitud fallida {{ .err }}" ErrHttpReqTimeOut: "La solicitud ha expirado {{ .err }}" ErrCreateHttpClient: "Error al crear la solicitud {{ .err }}" ErrProxySetting: "Información del servidor proxy no disponible {{ .err }}, ¡compruebe e inténtelo de nuevo!" +ErrEntranceFormat: "La entrada de seguridad {{ .name }} no está actualmente soportada. ¡Por favor verifique e inténtelo de nuevo!" # common ErrDemoEnvironment: "Servidor de demostración, ¡esta operación está prohibida!" diff --git a/core/i18n/lang/ja.yaml b/core/i18n/lang/ja.yaml index 8a38064a8..5caded983 100644 --- a/core/i18n/lang/ja.yaml +++ b/core/i18n/lang/ja.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "リクエスト失敗 {{ .err }}" ErrHttpReqTimeOut: "リクエストタイムアウト {{ .err }}" ErrCreateHttpClient: "リクエストの作成に失敗しました {{ .err }}" ErrProxySetting: "プロキシサーバー情報が利用できません {{ .err }}、確認して再試行してください!" +ErrEntranceFormat: "セキュリティエントランス {{ .name }} は現在サポートされていません。確認して再試行してください!" # common ErrDemoEnvironment: "デモサーバーではこの操作は許可されていません!" diff --git a/core/i18n/lang/ko.yaml b/core/i18n/lang/ko.yaml index 4d5a4b6b3..51ff2b357 100644 --- a/core/i18n/lang/ko.yaml +++ b/core/i18n/lang/ko.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "요청 실패 {{ .err }}" ErrHttpReqTimeOut: "요청 시간이 초과되었습니다 {{ .err }}" ErrCreateHttpClient: "요청 생성 실패 {{ .err }}" ErrProxySetting: "프록시 서버 정보를 사용할 수 없음 {{ .err }}, 확인 후 다시 시도하세요!" +ErrEntranceFormat: "보안 입구 {{ .name }}은(는) 현재 지원되지 않습니다. 확인 후 다시 시도해 주세요!" # common ErrDemoEnvironment: "데모 서버에서는 이 작업이 금지되어 있습니다!" diff --git a/core/i18n/lang/ms.yaml b/core/i18n/lang/ms.yaml index 88671ea58..e35af0c86 100644 --- a/core/i18n/lang/ms.yaml +++ b/core/i18n/lang/ms.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "Permintaan gagal {{ .err }}" ErrHttpReqTimeOut: "Permintaan telah tamat masa {{ .err }}" ErrCreateHttpClient: "Gagal mencipta permintaan {{ .err }}" ErrProxySetting: "Maklumat pelayan proksi tidak tersedia {{ .err }}, sila periksa dan cuba lagi!" +ErrEntranceFormat: "Pintu masuk keselamatan {{ .name }} tidak disokong buat masa ini. Sila periksa dan cuba lagi!" # common ErrDemoEnvironment: "Pelayan demo, operasi ini dilarang!" diff --git a/core/i18n/lang/pt-BR.yaml b/core/i18n/lang/pt-BR.yaml index 099768064..fe1b7b19c 100644 --- a/core/i18n/lang/pt-BR.yaml +++ b/core/i18n/lang/pt-BR.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "Falha na requisição {{ .err }}" ErrHttpReqTimeOut: "Tempo de requisição esgotado {{ .err }}" ErrCreateHttpClient: "Falha ao criar a requisição {{ .err }}" ErrProxySetting: "Informação do servidor proxy indisponível {{ .err }}, verifique e tente novamente!" +ErrEntranceFormat: "A entrada de segurança {{ .name }} não é suportada atualmente. Por favor verifique e tente novamente!" # common ErrDemoEnvironment: "Servidor de demonstração, essa operação é proibida!" diff --git a/core/i18n/lang/ru.yaml b/core/i18n/lang/ru.yaml index fa342f71c..9cd04a6cc 100644 --- a/core/i18n/lang/ru.yaml +++ b/core/i18n/lang/ru.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "Ошибка запроса {{ .err }}" ErrHttpReqTimeOut: "Время ожидания запроса истекло {{ .err }}" ErrCreateHttpClient: "Ошибка создания запроса {{ .err }}" ErrProxySetting: "Информация о прокси-сервере недоступна {{ .err }}, проверьте и повторите попытку!" +ErrEntranceFormat: "Защищенный вход {{ .name }} в настоящее время не поддерживается. Пожалуйста, проверьте и повторите попытку!" # common ErrDemoEnvironment: "Демонстрационный сервер, эта операция запрещена!" diff --git a/core/i18n/lang/tr.yaml b/core/i18n/lang/tr.yaml index e71b8e1b9..14514c036 100644 --- a/core/i18n/lang/tr.yaml +++ b/core/i18n/lang/tr.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "İstek başarısız {{ .err }}" ErrHttpReqTimeOut: "İstek zaman aşımına uğradı {{ .err }}" ErrCreateHttpClient: "İstek oluşturma başarısız {{ .err }}" ErrProxySetting: "Proxy sunucu bilgisi kullanılamıyor {{ .err }}, lütfen kontrol edip tekrar deneyin!" +ErrEntranceFormat: "{{ .name }} güvenlik girişi şu anda desteklenmiyor. Lütfen kontrol edip tekrar deneyin!" # common ErrDemoEnvironment: "Demo sunucu, bu işlem yasak!" diff --git a/core/i18n/lang/zh-Hant.yaml b/core/i18n/lang/zh-Hant.yaml index 964bed36c..e61e080c2 100644 --- a/core/i18n/lang/zh-Hant.yaml +++ b/core/i18n/lang/zh-Hant.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "請求失敗 {{ .err }}" ErrHttpReqTimeOut: "請求逾時 {{ .err }}" ErrCreateHttpClient: "建立請求失敗 {{ .err }}" ErrProxySetting: "代理伺服器資訊不可用 {{ .err }},請檢查後重試!" +ErrEntranceFormat: "暫不支援安全入口 {{ .name }} ,請檢查後重試!" #common ErrDemoEnvironment: "示範伺服器,禁止此操作!" diff --git a/core/i18n/lang/zh.yaml b/core/i18n/lang/zh.yaml index d80daf989..e2a47169c 100644 --- a/core/i18n/lang/zh.yaml +++ b/core/i18n/lang/zh.yaml @@ -22,6 +22,7 @@ ErrHttpReqFailed: "请求失败 {{ .err }}" ErrHttpReqTimeOut: "请求超时 {{ .err }}" ErrCreateHttpClient: "创建请求失败 {{ .err }}" ErrProxySetting: "代理服务器信息不可用 {{ .err }},请检查后重试!" +ErrEntranceFormat: "暂不支持安全入口 {{ .name }} ,请检查后重试!" #common ErrDemoEnvironment: "演示服务器,禁止此操作!"