diff --git a/agent/app/dto/request/website.go b/agent/app/dto/request/website.go index fd89d8ca7..4ca6d3ac2 100644 --- a/agent/app/dto/request/website.go +++ b/agent/app/dto/request/website.go @@ -7,7 +7,7 @@ import ( type WebsiteSearch struct { dto.PageInfo Name string `json:"name"` - OrderBy string `json:"orderBy" validate:"required,oneof=primary_domain type status createdAt expire_date"` + OrderBy string `json:"orderBy" validate:"required,oneof=primary_domain type status createdAt expire_date created_at"` Order string `json:"order" validate:"required,oneof=null ascending descending"` WebsiteGroupID uint `json:"websiteGroupId"` } diff --git a/agent/app/repo/website.go b/agent/app/repo/website.go index 3009beeba..e2258c03f 100644 --- a/agent/app/repo/website.go +++ b/agent/app/repo/website.go @@ -2,7 +2,6 @@ package repo import ( "context" - "github.com/1Panel-dev/1Panel/agent/app/model" "github.com/1Panel-dev/1Panel/agent/global" "gorm.io/gorm" diff --git a/agent/app/service/website_ssl.go b/agent/app/service/website_ssl.go index 8d95c6d18..2089735cf 100644 --- a/agent/app/service/website_ssl.go +++ b/agent/app/service/website_ssl.go @@ -138,7 +138,7 @@ func (w WebsiteSSLService) Create(create request.WebsiteSSLCreate) (request.Webs if create.PushDir { fileOP := files.NewFileOp() if !fileOP.Stat(create.Dir) { - _ = fileOP.CreateDir(create.Dir, constant.DirPerm) + return res, buserr.New("ErrLinkPathNotFound") } websiteSSL.Dir = create.Dir } @@ -490,7 +490,7 @@ func (w WebsiteSSLService) Update(update request.WebsiteSSLUpdate) error { updateParams["shell"] = "" } - if websiteSSL.Provider != constant.SelfSigned { + if websiteSSL.Provider != constant.SelfSigned && websiteSSL.Provider != constant.Manual { acmeAccount, err := websiteAcmeRepo.GetFirst(repo.WithByID(update.AcmeAccountID)) if err != nil { return err diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 5c6689797..de4587842 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -247,6 +247,8 @@ const message = { phpExtension: 'Only supports , _ lowercase English and numbers', paramHttp: 'Must start with http:// or https://', phone: 'The format of the phone number is incorrect', + authBasicPassword: 'Supports letters, numbers, and common special characters, length 1-72', + length128Err: 'Length cannot exceed 128 characters', }, res: { paramError: 'The request failed, please try again later!', diff --git a/frontend/src/lang/modules/ja.ts b/frontend/src/lang/modules/ja.ts index c3e9483bd..724bbe7a0 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -240,6 +240,8 @@ const message = { phpExtension: '_小文字の英語と数字のみをサポートします', paramHttp: 'http://またはhttps://で始める必要があります', phone: '電話番号の形式は正しくありません', + authBasicPassword: '英字、数字、一般的な特殊文字をサポート、長さ1-72', + length128Err: '長さは128文字を超えることはできません', }, res: { paramError: 'リクエストが失敗しました。後でもう一度やり直してください！', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index 6f57f80c0..b5a2c95e6 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -241,6 +241,8 @@ const message = { phpExtension: '소문자 영어와 숫자, "_"만 지원합니다', paramHttp: 'http:// 또는 https:// 로 시작해야 합니다', phone: '전화번호 형식이 올바르지 않습니다', + authBasicPassword: '알파벳, 숫자 및 일반 특수 문자 지원, 길이 1-72', + length128Err: '길이는 128자를 초과할 수 없습니다', }, res: { paramError: '요청이 실패했습니다. 나중에 다시 시도하세요!', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index 17ed8ac5b..2be941c6f 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -247,6 +247,8 @@ const message = { phpExtension: 'Hanya menyokong huruf kecil, _, dan nombor', paramHttp: 'Mesti bermula dengan http:// atau https://', phone: 'Format nombor telefon tidak betul.', + authBasicPassword: 'Menyokong huruf, nombor, dan aksara khas biasa, panjang 1-72', + length128Err: 'Panjang tidak boleh melebihi 128 aksara', }, res: { paramError: 'Permintaan gagal, sila cuba lagi nanti!', diff --git a/frontend/src/lang/modules/pt-br.ts b/frontend/src/lang/modules/pt-br.ts index a899e19d8..4bf0c5a3c 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -245,6 +245,8 @@ const message = { phpExtension: 'Suporta apenas _, letras minúsculas e números', paramHttp: 'Deve começar com http:// ou https://', phone: 'O formato do número de telefone está incorreto', + authBasicPassword: 'Suporta letras, números e caracteres especiais comuns, comprimento 1-72', + length128Err: 'O comprimento não pode exceder 128 caracteres', }, res: { paramError: 'A solicitação falhou, por favor, tente novamente mais tarde!', diff --git a/frontend/src/lang/modules/ru.ts b/frontend/src/lang/modules/ru.ts index cab5776f6..95de001b4 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -241,6 +241,8 @@ const message = { phpExtension: 'Поддерживаются только запятые, подчеркивания, строчные английские буквы и цифры', paramHttp: 'Должно начинаться с http:// или https://', phone: 'Неверный формат номера телефона', + authBasicPassword: 'Поддерживает буквы, цифры и общие специальные символы, длина 1-72', + length128Err: 'Длина не может превышать 128 символов', }, res: { paramError: 'Запрос не удался, попробуйте позже!', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index a5f3f8a4e..5eb0feeee 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -240,6 +240,8 @@ const message = { phpExtension: '僅支持 , _ 小寫英文和數字', paramHttp: '必須以 http:// 或 https:// 開頭', phone: '手機號碼格式不正確', + authBasicPassword: '支持字母、數字以及常見特殊字符，長度1-72', + length128Err: '長度不能超過128位', }, res: { paramError: '請求失敗,請稍後重試!', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 5fdb37b70..fe86fdc4f 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -239,6 +239,7 @@ const message = { paramHttp: '必须以 http:// 或 https:// 开头', phone: '手机号码格式不正确', authBasicPassword: '支持字母、数字以及常见特殊字符，长度1-72', + length128Err: '长度不能超过128位', }, res: { paramError: '请求失败,请稍后重试!', diff --git a/frontend/src/views/website/ssl/index.vue b/frontend/src/views/website/ssl/index.vue index 2a2d6a991..0bc5514be 100644 --- a/frontend/src/views/website/ssl/index.vue +++ b/frontend/src/views/website/ssl/index.vue @@ -108,7 +108,7 @@