From e18809f9b7cbcdbd1b5824e2bde7dfcc2b2bc7fc Mon Sep 17 00:00:00 2001 From: Chang lue Tsen Date: Sun, 30 Nov 2025 10:28:11 -0500 Subject: [PATCH] feat(report): update registration response structure and enhance error logging --- internal/report/report.go | 8 ++++++-- internal/report/tool.go | 5 ++++- internal/report/types.go | 6 ------ internal/server.go | 3 ++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/internal/report/report.go b/internal/report/report.go index 8b7faa9..1ba618a 100644 --- a/internal/report/report.go +++ b/internal/report/report.go @@ -6,6 +6,10 @@ const ( // RegisterResponse 模块注册响应参数 type RegisterResponse struct { - Success bool `json:"success"` // 注册是否成功 - Message string `json:"message"` // 返回信息 + Code int `json:"code"` // 响应代码 + Message string `json:"message"` // 响应信息 + Data struct { + Success bool `json:"success"` // 注册是否成功 + Message string `json:"message"` // 返回信息 + } `json:"data"` // 响应数据 } diff --git a/internal/report/tool.go b/internal/report/tool.go index cd57f1e..fe8a68c 100644 --- a/internal/report/tool.go +++ b/internal/report/tool.go @@ -59,6 +59,7 @@ func RegisterModule(port int) error { // 从环境变量中读取网关模块端口 gatewayPort, err := GatewayPort() if err != nil { + logger.Errorf("Failed to determine GATEWAY_PORT: %v", err) return err } @@ -82,6 +83,7 @@ func RegisterModule(port int) error { }).SetResult(&response).Post(RegisterAPI) if err != nil { + logger.Errorf("Failed to register service: %v", err) return err } @@ -89,7 +91,8 @@ func RegisterModule(port int) error { return errors.New("failed to register module: " + result.Status()) } - if !response.Success { + if !response.Data.Success { + logger.Infof("Result: %v", result.String()) return errors.New("failed to register module: " + response.Message) } logger.Infof("Module registered successfully: %s", response.Message) diff --git a/internal/report/types.go b/internal/report/types.go index 6abf9b2..d9cd643 100644 --- a/internal/report/types.go +++ b/internal/report/types.go @@ -1,11 +1,5 @@ package report -// RegisterServiceResponse 模块注册请求参数 -type RegisterServiceResponse struct { - Success bool `json:"success"` // 注册是否成功 - Message string `json:"message"` // 返回信息 -} - type RegisterServiceRequest struct { Secret string `json:"secret"` // 通讯密钥 ProxyPath string `json:"proxy_path"` // 代理路径 diff --git a/internal/server.go b/internal/server.go index 47969be..78d6422 100644 --- a/internal/server.go +++ b/internal/server.go @@ -6,6 +6,7 @@ import ( "errors" "fmt" "net/http" + "os" "time" "github.com/perfect-panel/server/internal/report" @@ -86,7 +87,7 @@ func (m *Service) Start() { err = report.RegisterModule(port) if err != nil { logger.Errorf("register module error: %s", err.Error()) - panic(err) + os.Exit(1) } logger.Infof("module registered on port %d", port) }