From 8c8a957df1c5ad43e081bdf83240465575c9ceac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sun, 9 Feb 2025 22:06:07 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=89=8D=E7=AB=AF=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/data/website.go | 8 ++- pkg/types/website.go | 1 + web/src/utils/http/index.ts | 1 - web/src/views/cert/CertView.vue | 2 + web/src/views/cert/UploadCertModal.vue | 2 + web/src/views/container/ContainerView.vue | 76 +++++++++++------------ web/src/views/container/ImageView.vue | 58 ++++++++--------- web/src/views/container/IndexView.vue | 2 +- web/src/views/container/NetworkView.vue | 58 ++++++++--------- web/src/views/container/VolumeView.vue | 58 ++++++++--------- web/src/views/firewall/ForwardView.vue | 34 +++++----- web/src/views/firewall/IndexView.vue | 2 +- web/src/views/firewall/IpRuleView.vue | 34 +++++----- web/src/views/firewall/RuleView.vue | 34 +++++----- web/src/views/firewall/SettingView.vue | 30 +++++---- web/src/views/monitor/IndexView.vue | 8 +-- web/src/views/setting/SettingHttps.vue | 14 ++++- web/src/views/task/CronView.vue | 42 ++++++------- web/src/views/task/IndexView.vue | 2 +- web/src/views/website/EditView.vue | 29 +++++++-- web/src/views/website/IndexView.vue | 44 +++++-------- 21 files changed, 268 insertions(+), 271 deletions(-) diff --git a/internal/data/website.go b/internal/data/website.go index 8a84f383..b367f248 100644 --- a/internal/data/website.go +++ b/internal/data/website.go @@ -186,7 +186,13 @@ func (r *websiteRepo) Get(id uint) (*types.WebsiteSetting, error) { rewrite, _ := io.Read(filepath.Join(app.Root, "server/vhost/rewrite", website.Name+".conf")) setting.Rewrite = rewrite // 访问日志 - setting.Log = fmt.Sprintf("%s/wwwlogs/%s.log", app.Root, website.Name) + if setting.Log, err = p.GetAccessLog(); err != nil { + setting.Log = fmt.Sprintf("%s/wwwlogs/%s.log", app.Root, website.Name) + } + // 错误日志 + if setting.ErrorLog, err = p.GetErrorLog(); err != nil { + setting.ErrorLog = fmt.Sprintf("%s/wwwlogs/%s.error.log", app.Root, website.Name) + } return setting, err } diff --git a/pkg/types/website.go b/pkg/types/website.go index 0e505e6c..1b242467 100644 --- a/pkg/types/website.go +++ b/pkg/types/website.go @@ -32,4 +32,5 @@ type WebsiteSetting struct { Rewrite string `json:"rewrite"` Raw string `json:"raw"` Log string `json:"log"` + ErrorLog string `json:"error_log"` } diff --git a/web/src/utils/http/index.ts b/web/src/utils/http/index.ts index bff83cd0..c0c9edcc 100644 --- a/web/src/utils/http/index.ts +++ b/web/src/utils/http/index.ts @@ -27,7 +27,6 @@ export const http = createAlova({ const { meta } = method if (status !== 200) { const code = json?.code ?? status - console.log(json) const message = resolveResError( code, (typeof json?.message === 'string' && json.message.trim()) || statusText diff --git a/web/src/views/cert/CertView.vue b/web/src/views/cert/CertView.vue index 06768d68..2e4971cc 100644 --- a/web/src/views/cert/CertView.vue +++ b/web/src/views/cert/CertView.vue @@ -468,6 +468,7 @@ onUnmounted(() => { v-model:value="updateModel.cert" type="textarea" placeholder="输入 PEM 证书文件的内容" + :autosize="{ minRows: 10, maxRows: 15 }" /> @@ -475,6 +476,7 @@ onUnmounted(() => { v-model:value="updateModel.key" type="textarea" placeholder="输入 KEY 私钥文件的内容" + :autosize="{ minRows: 10, maxRows: 15 }" /> diff --git a/web/src/views/cert/UploadCertModal.vue b/web/src/views/cert/UploadCertModal.vue index 325dc41c..557072b5 100644 --- a/web/src/views/cert/UploadCertModal.vue +++ b/web/src/views/cert/UploadCertModal.vue @@ -38,6 +38,7 @@ const handleSubmit = () => { v-model:value="model.cert" type="textarea" placeholder="输入 PEM 证书文件的内容" + :autosize="{ minRows: 10, maxRows: 15 }" /> @@ -45,6 +46,7 @@ const handleSubmit = () => { v-model:value="model.key" type="textarea" placeholder="输入 KEY 私钥文件的内容" + :autosize="{ minRows: 10, maxRows: 15 }" /> diff --git a/web/src/views/container/ContainerView.vue b/web/src/views/container/ContainerView.vue index 73ca93bd..17d39987 100644 --- a/web/src/views/container/ContainerView.vue +++ b/web/src/views/container/ContainerView.vue @@ -429,46 +429,42 @@ onMounted(() => {