From 94497f226fd888b715fc3c5d66a1e56bb5258bdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 15 May 2025 19:21:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E7=BD=91=E7=AB=99?= =?UTF-8?q?=E8=AF=81=E4=B9=A6=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/http/request/website.go | 2 +- internal/route/http.go | 2 +- internal/service/website.go | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/internal/http/request/website.go b/internal/http/request/website.go index 99caad0c..07c6033b 100644 --- a/internal/http/request/website.go +++ b/internal/http/request/website.go @@ -57,7 +57,7 @@ type WebsiteUpdateStatus struct { } type WebsiteUpdateCert struct { - Name uint `json:"name" validate:"required|exists:websites,name"` + Name string `json:"name" validate:"required|exists:websites,name"` Cert string `json:"cert" validate:"required"` Key string `json:"key" validate:"required"` } diff --git a/internal/route/http.go b/internal/route/http.go index b18fbcbd..befcb087 100644 --- a/internal/route/http.go +++ b/internal/route/http.go @@ -159,6 +159,7 @@ func (route *Http) Register(r *chi.Mux) { r.Get("/rewrites", route.website.GetRewrites) r.Get("/default_config", route.website.GetDefaultConfig) r.Post("/default_config", route.website.UpdateDefaultConfig) + r.Post("/cert", route.website.UpdateCert) r.Get("/", route.website.List) r.Post("/", route.website.Create) r.Get("/{id}", route.website.Get) @@ -168,7 +169,6 @@ func (route *Http) Register(r *chi.Mux) { r.Post("/{id}/update_remark", route.website.UpdateRemark) r.Post("/{id}/reset_config", route.website.ResetConfig) r.Post("/{id}/status", route.website.UpdateStatus) - r.Post("/{id}/cert", route.website.UpdateCert) r.Post("/{id}/obtain_cert", route.website.ObtainCert) }) diff --git a/internal/service/website.go b/internal/service/website.go index 2f2daa37..0401f01f 100644 --- a/internal/service/website.go +++ b/internal/service/website.go @@ -67,6 +67,22 @@ func (s *WebsiteService) UpdateDefaultConfig(w http.ResponseWriter, r *http.Requ Success(w, nil) } +// UpdateCert 用于自动化工具更新证书 +func (s *WebsiteService) UpdateCert(w http.ResponseWriter, r *http.Request) { + req, err := Bind[request.WebsiteUpdateCert](r) + if err != nil { + Error(w, http.StatusUnprocessableEntity, "%v", err) + return + } + + if err = s.websiteRepo.UpdateCert(req); err != nil { + Error(w, http.StatusInternalServerError, "%v", err) + return + } + + Success(w, nil) +} + func (s *WebsiteService) List(w http.ResponseWriter, r *http.Request) { req, err := Bind[request.Paginate](r) if err != nil { @@ -212,22 +228,6 @@ func (s *WebsiteService) UpdateStatus(w http.ResponseWriter, r *http.Request) { Success(w, nil) } -// UpdateCert 用于自动化工具更新证书 -func (s *WebsiteService) UpdateCert(w http.ResponseWriter, r *http.Request) { - req, err := Bind[request.WebsiteUpdateCert](r) - if err != nil { - Error(w, http.StatusUnprocessableEntity, "%v", err) - return - } - - if err = s.websiteRepo.UpdateCert(req); err != nil { - Error(w, http.StatusInternalServerError, "%v", err) - return - } - - Success(w, nil) -} - func (s *WebsiteService) ObtainCert(w http.ResponseWriter, r *http.Request) { req, err := Bind[request.ID](r) if err != nil {