From 8e31361eafb0c70e315b1b6a59a166a2431cbde5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 8 Jan 2026 23:29:53 +0800 Subject: [PATCH] fix: lint --- internal/apps/frp/app.go | 21 --------------------- internal/apps/frp/types.go | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 21 deletions(-) create mode 100644 internal/apps/frp/types.go diff --git a/internal/apps/frp/app.go b/internal/apps/frp/app.go index 9dcc636e..e17b69b3 100644 --- a/internal/apps/frp/app.go +++ b/internal/apps/frp/app.go @@ -3,7 +3,6 @@ package frp import ( "fmt" "net/http" - "regexp" "github.com/go-chi/chi/v5" @@ -13,15 +12,6 @@ import ( "github.com/acepanel/panel/pkg/systemctl" ) -// 预编译正则表达式 -var ( - userCaptureRegex = regexp.MustCompile(`(?m)^User=(.*)$`) - groupCaptureRegex = regexp.MustCompile(`(?m)^Group=(.*)$`) - userRegex = regexp.MustCompile(`(?m)^User=.*$`) - groupRegex = regexp.MustCompile(`(?m)^Group=.*$`) - serviceRegex = regexp.MustCompile(`(?m)^\[Service\]$`) -) - type App struct{} func NewApp() *App { @@ -71,13 +61,6 @@ func (s *App) UpdateConfig(w http.ResponseWriter, r *http.Request) { service.Success(w, nil) } -// UserInfo 运行用户信息 -type UserInfo struct { - User string `json:"user"` - Group string `json:"group"` -} - -// GetUser 获取服务的运行用户 func (s *App) GetUser(w http.ResponseWriter, r *http.Request) { req, err := service.Bind[Name](r) if err != nil { @@ -108,7 +91,6 @@ func (s *App) GetUser(w http.ResponseWriter, r *http.Request) { service.Success(w, userInfo) } -// UpdateUser 更新服务的运行用户 func (s *App) UpdateUser(w http.ResponseWriter, r *http.Request) { req, err := service.Bind[UpdateUser](r) if err != nil { @@ -149,13 +131,10 @@ func (s *App) UpdateUser(w http.ResponseWriter, r *http.Request) { return } - // 重载 systemd 配置 if err = systemctl.DaemonReload(); err != nil { service.Error(w, http.StatusInternalServerError, "%v", err) return } - - // 重启服务以应用更改 if err = systemctl.Restart(req.Name); err != nil { service.Error(w, http.StatusInternalServerError, "%v", err) return diff --git a/internal/apps/frp/types.go b/internal/apps/frp/types.go new file mode 100644 index 00000000..e1d38801 --- /dev/null +++ b/internal/apps/frp/types.go @@ -0,0 +1,16 @@ +package frp + +import "regexp" + +var ( + userCaptureRegex = regexp.MustCompile(`(?m)^User=(.*)$`) + groupCaptureRegex = regexp.MustCompile(`(?m)^Group=(.*)$`) + userRegex = regexp.MustCompile(`(?m)^User=.*$`) + groupRegex = regexp.MustCompile(`(?m)^Group=.*$`) + serviceRegex = regexp.MustCompile(`(?m)^\[Service\]$`) +) + +type UserInfo struct { + User string `json:"user"` + Group string `json:"group"` +}