diff --git a/agent/app/service/backup_website.go b/agent/app/service/backup_website.go index c44f5fb75..58c4b119f 100644 --- a/agent/app/service/backup_website.go +++ b/agent/app/service/backup_website.go @@ -184,7 +184,7 @@ func handleWebsiteRecover(website *model.Website, recoverFile string, isRollback } taskName := i18n.GetMsgByKey("TaskRecover") + i18n.GetMsgByKey("websiteDir") t.Log(taskName) - if err = fileOp.TarGzExtractPro(fmt.Sprintf("%s/%s.web.tar.gz", tmpPath, website.Alias), GetSitePath(*website, SitesDir), secret); err != nil { + if err = fileOp.TarGzExtractPro(fmt.Sprintf("%s/%s.web.tar.gz", tmpPath, website.Alias), GetOpenrestyDir(SitesRootDir), secret); err != nil { t.LogFailedWithErr(taskName, err) return err } diff --git a/agent/app/service/cronjob_backup.go b/agent/app/service/cronjob_backup.go index 511609e90..4350eb3e9 100644 --- a/agent/app/service/cronjob_backup.go +++ b/agent/app/service/cronjob_backup.go @@ -342,11 +342,7 @@ func handleBackupLogs(targetDir, fileName string, secret string) error { return err } if len(websites) != 0 { - nginxInstall, err := getAppInstallByKey(constant.AppOpenresty) - if err != nil { - return err - } - webItem := path.Join(nginxInstall.GetPath(), "www/sites") + webItem := GetOpenrestyDir(SitesRootDir) for _, website := range websites { dirItem := path.Join(targetDir, "website", website.Alias) if _, err := os.Stat(dirItem); err != nil && os.IsNotExist(err) { diff --git a/agent/app/service/cronjob_helper.go b/agent/app/service/cronjob_helper.go index 82e0d33b6..6b3bb39a1 100644 --- a/agent/app/service/cronjob_helper.go +++ b/agent/app/service/cronjob_helper.go @@ -181,12 +181,8 @@ func (u *CronjobService) handleCutWebsiteLog(cronjob *model.Cronjob, startTime t msgs []string ) websites := loadWebsForJob(*cronjob) - nginx, err := getAppInstallByKey(constant.AppOpenresty) - if err != nil { - return msgs, "", nil - } - baseDir := pathUtils.Join(nginx.GetPath(), "www", "sites") fileOp := files.NewFileOp() + baseDir := GetOpenrestyDir(SitesRootDir) for _, website := range websites { websiteLogDir := pathUtils.Join(baseDir, website.Alias, "log") srcAccessLogPath := pathUtils.Join(websiteLogDir, "access.log") diff --git a/agent/app/service/website_utils.go b/agent/app/service/website_utils.go index bde63f2b9..570e55075 100644 --- a/agent/app/service/website_utils.go +++ b/agent/app/service/website_utils.go @@ -1161,7 +1161,6 @@ const ( SiteErrorLog = "error.log" WebsiteRootDir = "WebsiteRootDir" SiteDir = "SiteDir" - SitesDir = "SitesDir" SiteIndexDir = "SiteIndexDir" SiteProxyDir = "SiteProxyDir" SiteSSLDir = "SiteSSLDir" @@ -1186,8 +1185,6 @@ func GetSitePath(website model.Website, confType string) string { return path.Join(GteSiteDir(website.Alias), "log", "error.log") case SiteDir: return GteSiteDir(website.Alias) - case SitesDir: - return path.Join(GetWebSiteRootDir(), "sites") case SiteIndexDir: return path.Join(GteSiteDir(website.Alias), "index") case SiteCacheDir: diff --git a/agent/cmd/server/qqwry/qqwey.go b/agent/cmd/server/qqwry/qqwey.go deleted file mode 100644 index 94ee4abb8..000000000 --- a/agent/cmd/server/qqwry/qqwey.go +++ /dev/null @@ -1,6 +0,0 @@ -package qqwry - -import _ "embed" - -//go:embed qqwry.dat -var QQwryByte []byte diff --git a/agent/cmd/server/qqwry/qqwry.dat b/agent/cmd/server/qqwry/qqwry.dat deleted file mode 100644 index 0752ec831..000000000 Binary files a/agent/cmd/server/qqwry/qqwry.dat and /dev/null differ diff --git a/frontend/src/views/website/runtime/php/create/index.vue b/frontend/src/views/website/runtime/php/create/index.vue index ad8deeaaa..563248170 100644 --- a/frontend/src/views/website/runtime/php/create/index.vue +++ b/frontend/src/views/website/runtime/php/create/index.vue @@ -93,7 +93,7 @@ { if (!valid) { return; } + if (form.remark && form.remark.length > 128) { + MsgError(i18n.global.t('commons.rule.length128Err')); + return; + } loading.value = true; updateWebsite(form) .then(() => { diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue index ee7d26260..2730fd1ce 100644 --- a/frontend/src/views/website/website/index.vue +++ b/frontend/src/views/website/website/index.vue @@ -156,7 +156,7 @@