diff --git a/agent/app/dto/app.go b/agent/app/dto/app.go index 388158210..ece950c96 100644 --- a/agent/app/dto/app.go +++ b/agent/app/dto/app.go @@ -84,8 +84,8 @@ type AppProperty struct { Name string `json:"name"` Type string `json:"type"` Tags []string `json:"tags"` - ShortDescZh string `json:"shortDescZh"` - ShortDescEn string `json:"shortDescEn"` + ShortDescZh string `json:"shortDescZh" yaml:"shortDescZh"` + ShortDescEn string `json:"shortDescEn" yaml:"shortDescEn"` Description Locale `json:"description"` Key string `json:"key"` Required []string `json:"Required"` diff --git a/agent/app/repo/group.go b/agent/app/repo/group.go index 1a85e1f46..294826b47 100644 --- a/agent/app/repo/group.go +++ b/agent/app/repo/group.go @@ -3,6 +3,7 @@ package repo import ( "github.com/1Panel-dev/1Panel/agent/app/model" "github.com/1Panel-dev/1Panel/agent/global" + "gorm.io/gorm" ) type GroupRepo struct{} @@ -13,12 +14,19 @@ type IGroupRepo interface { Create(group *model.Group) error Update(id uint, vars map[string]interface{}) error Delete(opts ...DBOption) error + WithByDefault(isDefault bool) DBOption } func NewIGroupRepo() IGroupRepo { return &GroupRepo{} } +func (g *GroupRepo) WithByDefault(isDefault bool) DBOption { + return func(g *gorm.DB) *gorm.DB { + return g.Where("is_default = ?", isDefault) + } +} + func (g *GroupRepo) Get(opts ...DBOption) (model.Group, error) { var group model.Group db := global.DB diff --git a/agent/app/service/ai.go b/agent/app/service/ai.go index de7d22b8f..d267202b7 100644 --- a/agent/app/service/ai.go +++ b/agent/app/service/ai.go @@ -266,6 +266,8 @@ func (u *AIToolService) BindDomain(req dto.OllamaBindDomain) error { createWebsiteReq.WebsiteSSLID = req.SSLID createWebsiteReq.EnableSSL = true } + res, _ := NewIGroupService().GetDefault() + createWebsiteReq.WebsiteGroupID = res.ID websiteService := NewIWebsiteService() if err = websiteService.CreateWebsite(createWebsiteReq); err != nil { return err @@ -334,9 +336,9 @@ func (u *AIToolService) UpdateBindDomain(req dto.OllamaBindDomain) error { sslReq := request.WebsiteHTTPSOp{ WebsiteID: website.ID, Enable: true, - Type: "existed", + Type: constant.SSLExisted, WebsiteSSLID: req.SSLID, - HttpConfig: "HTTPSOnly", + HttpConfig: constant.HTTPToHTTPS, } if _, err = websiteService.OpWebsiteHTTPS(context.Background(), sslReq); err != nil { return err @@ -371,7 +373,7 @@ func loadModelSize(name string, containerName string) (string, error) { if err != nil { return "", err } - lines := strings.Split(string(stdout), "\n") + lines := strings.Split(stdout, "\n") for _, line := range lines { parts := strings.Fields(line) if len(parts) < 5 { @@ -379,5 +381,5 @@ func loadModelSize(name string, containerName string) (string, error) { } return parts[2] + " " + parts[3], nil } - return "", fmt.Errorf("no such model %s in ollama list, std: %s", name, string(stdout)) + return "", fmt.Errorf("no such model %s in ollama list, std: %s", name, stdout) } diff --git a/agent/app/service/group.go b/agent/app/service/group.go index 95422c449..c72fecec9 100644 --- a/agent/app/service/group.go +++ b/agent/app/service/group.go @@ -15,6 +15,7 @@ type IGroupService interface { Create(req dto.GroupCreate) error Update(req dto.GroupUpdate) error Delete(id uint) error + GetDefault() (model.Group, error) } func NewIGroupService() IGroupService { @@ -85,3 +86,7 @@ func (u *GroupService) Update(req dto.GroupUpdate) error { upMap["is_default"] = req.IsDefault return groupRepo.Update(req.ID, upMap) } + +func (u *GroupService) GetDefault() (model.Group, error) { + return groupRepo.Get(groupRepo.WithByDefault(true)) +} diff --git a/agent/app/service/website.go b/agent/app/service/website.go index a928b4f3c..8b6d93f85 100644 --- a/agent/app/service/website.go +++ b/agent/app/service/website.go @@ -1019,6 +1019,10 @@ func (w WebsiteService) OpWebsiteHTTPS(ctx context.Context, req request.WebsiteH dto.NginxParam{ Name: "http2", }, + dto.NginxParam{ + Name: "add_header", + Params: []string{"Strict-Transport-Security"}, + }, ) if err = deleteNginxConfig(constant.NginxScopeServer, nginxParams, &website); err != nil { return nil, err diff --git a/agent/app/service/website_ssl.go b/agent/app/service/website_ssl.go index ba7a47ce8..4e0b32587 100644 --- a/agent/app/service/website_ssl.go +++ b/agent/app/service/website_ssl.go @@ -448,7 +448,7 @@ func (w WebsiteSSLService) Delete(ids []uint) error { if err != nil { return err } - if websiteSSL.Type != constant.Manual && websiteSSL.Type != constant.SelfSigned { + if websiteSSL.Provider != constant.Manual && websiteSSL.Provider != constant.SelfSigned { acmeAccount, err := websiteAcmeRepo.GetFirst(repo.WithByID(websiteSSL.AcmeAccountID)) if err != nil { return err diff --git a/agent/app/service/website_utils.go b/agent/app/service/website_utils.go index 570e55075..7159c7e68 100644 --- a/agent/app/service/website_utils.go +++ b/agent/app/service/website_utils.go @@ -680,9 +680,15 @@ func applySSL(website *model.Website, websiteSSL model.WebsiteSSL, req request.W } if param.Name == "ssl_protocols" { nginxParams[i].Params = req.SSLProtocol + if len(req.SSLProtocol) == 0 { + nginxParams[i].Params = []string{"TLSv1.3", "TLSv1.2", "TLSv1.1", "TLSv1"} + } } if param.Name == "ssl_ciphers" { nginxParams[i].Params = []string{req.Algorithm} + if len(req.Algorithm) == 0 { + nginxParams[i].Params = []string{"ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA256:!aNULL:!eNULL:!EXPORT:!DSS:!DES:!RC4:!3DES:!MD5:!PSK:!KRB5:!SRP:!CAMELLIA:!SEED"} + } } } if req.Hsts { diff --git a/frontend/src/global/form-rules.ts b/frontend/src/global/form-rules.ts index 26068ab8f..316c90f1b 100644 --- a/frontend/src/global/form-rules.ts +++ b/frontend/src/global/form-rules.ts @@ -596,6 +596,25 @@ const checkPhone = (rule: any, value: any, callback: any) => { } }; +export function checkMaxLength(maxLength: number): FormItemRule { + return { + required: false, + trigger: 'blur', + type: 'string', + validator: (rule: any, value: any, callback: any) => { + if (value === '' || typeof value === 'undefined' || value == null) { + callback(); + } else { + if (value.length > maxLength) { + callback(new Error(i18n.global.t('commons.rule.maxLength', [maxLength]))); + } else { + callback(); + } + } + }, + }; +} + interface CommonRule { requiredInput: FormItemRule; requiredSelect: FormItemRule; diff --git a/frontend/src/lang/modules/en.ts b/frontend/src/lang/modules/en.ts index 20053abaf..5b5b9e258 100644 --- a/frontend/src/lang/modules/en.ts +++ b/frontend/src/lang/modules/en.ts @@ -249,6 +249,7 @@ const message = { 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', + maxLength: 'Length cannot exceed {0} 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 cf15ca720..ff95ec7f5 100644 --- a/frontend/src/lang/modules/ja.ts +++ b/frontend/src/lang/modules/ja.ts @@ -240,6 +240,7 @@ const message = { phone: '電話番号の形式は正しくありません', authBasicPassword: '英字、数字、一般的な特殊文字をサポート、長さ1-72', length128Err: '長さは128文字を超えることはできません', + maxLength: '長さは {0} 文字を超えることはできません', }, res: { paramError: 'リクエストが失敗しました。後でもう一度やり直してください！', diff --git a/frontend/src/lang/modules/ko.ts b/frontend/src/lang/modules/ko.ts index f60721d82..9fb3e5605 100644 --- a/frontend/src/lang/modules/ko.ts +++ b/frontend/src/lang/modules/ko.ts @@ -242,6 +242,7 @@ const message = { phone: '전화번호 형식이 올바르지 않습니다', authBasicPassword: '알파벳, 숫자 및 일반 특수 문자 지원, 길이 1-72', length128Err: '길이는 128자를 초과할 수 없습니다', + maxLength: '길이는 {0}자를 초과할 수 없습니다', }, res: { paramError: '요청이 실패했습니다. 나중에 다시 시도하세요!', diff --git a/frontend/src/lang/modules/ms.ts b/frontend/src/lang/modules/ms.ts index 7dd4c67ba..c747a39f9 100644 --- a/frontend/src/lang/modules/ms.ts +++ b/frontend/src/lang/modules/ms.ts @@ -248,6 +248,7 @@ const message = { phone: 'Format nombor telefon tidak betul.', authBasicPassword: 'Menyokong huruf, nombor, dan aksara khas biasa, panjang 1-72', length128Err: 'Panjang tidak boleh melebihi 128 aksara', + maxLength: 'Panjang tidak boleh melebihi {0} 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 71d36707a..c15e20f51 100644 --- a/frontend/src/lang/modules/pt-br.ts +++ b/frontend/src/lang/modules/pt-br.ts @@ -246,6 +246,7 @@ const message = { 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', + maxLength: 'O comprimento não pode exceder {0} 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 763730904..276cf3fc6 100644 --- a/frontend/src/lang/modules/ru.ts +++ b/frontend/src/lang/modules/ru.ts @@ -243,6 +243,7 @@ const message = { phone: 'Неверный формат номера телефона', authBasicPassword: 'Поддерживает буквы, цифры и общие специальные символы, длина 1-72', length128Err: 'Длина не может превышать 128 символов', + maxLength: 'Длина не может превышать {0} символов', }, res: { paramError: 'Запрос не удался, попробуйте позже!', diff --git a/frontend/src/lang/modules/zh-Hant.ts b/frontend/src/lang/modules/zh-Hant.ts index 9802d3b3c..4dd241826 100644 --- a/frontend/src/lang/modules/zh-Hant.ts +++ b/frontend/src/lang/modules/zh-Hant.ts @@ -242,6 +242,7 @@ const message = { phone: '手機號碼格式不正確', authBasicPassword: '支持字母、數字以及常見特殊字符，長度1-72', length128Err: '長度不能超過128位', + maxLength: '長度不能超過 {0} 位', }, res: { paramError: '請求失敗,請稍後重試!', diff --git a/frontend/src/lang/modules/zh.ts b/frontend/src/lang/modules/zh.ts index 0ff3465e9..d435e4bc7 100644 --- a/frontend/src/lang/modules/zh.ts +++ b/frontend/src/lang/modules/zh.ts @@ -240,6 +240,7 @@ const message = { phone: '手机号码格式不正确', authBasicPassword: '支持字母、数字以及常见特殊字符，长度1-72', length128Err: '长度不能超过128位', + maxLength: '长度不能超过 {0} 位', }, res: { paramError: '请求失败,请稍后重试!', diff --git a/frontend/src/views/ai/model/add/index.vue b/frontend/src/views/ai/model/add/index.vue index c8e541cc2..c774b58f2 100644 --- a/frontend/src/views/ai/model/add/index.vue +++ b/frontend/src/views/ai/model/add/index.vue @@ -1,31 +1,27 @@