注册中心测试成功-增加健康检查

bootstraps/bootstrap.go

@@ -225,7 +225,7 @@ func (b *Bootstrapper) waitForShutdown(handler ShutdownHandler) {
 		go func(name string, ws *WebService) {
 			log.Printf("正在关闭服务: %s", name)
 			//退出注册中心
-			consul.Deregister(service.serviceName, service.Ip, service.Port)
+			consul.Deregister(service.serviceName, service.Ip, service.Port, b.Cfg.GetConsulConfig())
 
 			if err := ws.HttpServer.Shutdown(ctx); err != nil {
 				log.Printf("服务 %s 关闭失败: %v", name, err)
@@ -265,7 +265,7 @@ func (b *Bootstrapper) waitForServiceShutdown(service *WebService, handler Shutd
 	log.Printf("接收到终止信号，正在优雅关闭服务 %s...", service.serviceName)
 
 	//退出注册中心
-	consul.Deregister(service.serviceName, service.Ip, service.Port)
+	consul.Deregister(service.serviceName, service.Ip, service.Port, b.Cfg.GetConsulConfig())
 
 	// 创建关闭上下文，给30秒完成当前请求
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
@@ -297,7 +297,7 @@ func (b *Bootstrapper) GetConfig() config.IConfig {
 	return b.Cfg
 }
 
-// GetRouter 获取指定服务的路由器
+// GetWebService 获取指定服务的路由器
 func (b *Bootstrapper) GetRouter(yamlNode string) *http.ServeMux {
 	service := b.createService(yamlNode)
 	return service.Router
@@ -312,15 +312,15 @@ func (b *Bootstrapper) GetRouterDefault() *http.ServeMux {
 	return http.NewServeMux()
 }
 
-// Handle 注册路由处理器到指定服务
-func (b *Bootstrapper) Handle(serviceName, pattern string, handler http.Handler) bool {
-	if service, exists := b.services[serviceName]; exists {
-		service.Router.Handle(pattern, handler)
-		return true
-	}
-	log.Printf("错误: 服务 %s 不存在", serviceName)
-	return false
-}
+// // Handle 注册路由处理器到指定服务
+// func (b *Bootstrapper) Handle(serviceName, pattern string, handler http.Handler) bool {
+// 	if service, exists := b.services[serviceName]; exists {
+// 		service.Router.Handle(pattern, handler)
+// 		return true
+// 	}
+// 	log.Printf("错误: 服务 %s 不存在", serviceName)
+// 	return false
+// }
 
 // SetShutdownHandler 为服务设置关闭处理器
 func (b *Bootstrapper) SetShutdownHandler(serviceName string, handler ShutdownHandler) bool {
@@ -334,9 +334,9 @@ func (b *Bootstrapper) SetShutdownHandler(serviceName string, handler ShutdownHa
 // ========== WebService 的方法 ==========
 
 // GetServiceName 获取服务名称
-func (ws *WebService) GetServiceName() string {
-	return ws.serviceName
-}
+// func (ws *WebService) GetServiceName() string {
+// 	return ws.serviceName
+// }
 
 // // GetServiceConfig 获取服务配置
 // func (ws *WebService) GetServiceConfig() *subconfigs.ServiceConfig {
@@ -344,14 +344,14 @@ func (ws *WebService) GetServiceName() string {
 // }
 
 // GetRouter 获取服务的路由器
-func (ws *WebService) GetRouter() *http.ServeMux {
-	return ws.Router
-}
+// func (ws *WebService) GetRouter() *http.ServeMux {
+// 	return ws.Router
+// }
 
 // Handle 注册路由处理器
-func (ws *WebService) Handle(pattern string, handler http.Handler) {
-	ws.Router.Handle(pattern, handler)
-}
+// func (ws *WebService) Handle(pattern string, handler http.Handler) {
+// 	ws.Router.Handle(pattern, handler)
+// }
 
 // SetShutdownHandler 设置关闭处理器
 func (ws *WebService) SetShutdownHandler(handler ShutdownHandler) {

consul/register_consul.go

@@ -4,6 +4,7 @@ package consul
 import (
 	"fmt"
 	"log"
+	"time"
 
 	"git.x2erp.com/qdy/go-base/client"
 	"git.x2erp.com/qdy/go-base/config/subconfigs"
@@ -20,7 +21,11 @@ func Register(serviceName, configHostname string, port int, consulConfig *subcon
 	apiConfig := api.DefaultConfig()
 	if consulConfig.Address != "" {
 		apiConfig.Address = consulConfig.Address
+		log.Printf("使用Consul地址: %s", consulConfig.Address)
+	} else {
+		log.Printf("⚠️ 使用默认Consul地址: %s", apiConfig.Address)
 	}
+
 	if consulConfig.Token != "" {
 		apiConfig.Token = consulConfig.Token
 	}
@@ -34,15 +39,31 @@ func Register(serviceName, configHostname string, port int, consulConfig *subcon
 		return fmt.Errorf("创建Consul客户端失败: %v", err)
 	}
 
-	// 4. 注册服务
+	// 4. 测试连接
+	_, err = client.Agent().Self()
+	if err != nil {
+		return fmt.Errorf("无法连接到Consul服务器 %s: %v", apiConfig.Address, err)
+	}
+	log.Printf("✅ 成功连接到Consul服务器: %s", apiConfig.Address)
+
+	// 5. 注册服务（完整健康检查配置）
 	registration := &api.AgentServiceRegistration{
 		ID:      fmt.Sprintf("%s-%s-%d", serviceName, ip, port),
 		Name:    serviceName,
 		Address: ip,
 		Port:    port,
+		Tags:    []string{"http", "microservice"},
 		Check: &api.AgentServiceCheck{
-			HTTP:     fmt.Sprintf("http://%s:%d/health", ip, port),
-			Interval: "10s",
+			HTTP:                           fmt.Sprintf("http://%s:%d/health", ip, port),
+			Interval:                       "10s",
+			Timeout:                        "5s",      // 关键：设置超时
+			DeregisterCriticalServiceAfter: "1m",      // 关键：失败后注销时间
+			TLSSkipVerify:                  true,      // 跳过TLS验证
+			Status:                         "passing", // 初始状态
+		},
+		Meta: map[string]string{
+			"registered_at": time.Now().Format(time.RFC3339),
+			"port":          fmt.Sprintf("%d", port),
 		},
 	}
 
@@ -51,30 +72,82 @@ func Register(serviceName, configHostname string, port int, consulConfig *subcon
 		return fmt.Errorf("consul注册失败: %v", err)
 	}
 
+	// 打印详细注册信息
 	log.Printf("✅ 服务已注册到Consul服务器: %s", consulConfig.Address)
+	log.Printf("📋 注册详情:")
+	log.Printf("   服务名称: %s", serviceName)
+	log.Printf("   服务地址: %s:%d", ip, port)
+	log.Printf("   服务ID: %s", registration.ID)
+	log.Printf("   健康检查: %s", registration.Check.HTTP)
+	log.Printf("   检查间隔: %s", registration.Check.Interval)
+	log.Printf("   检查超时: %s", registration.Check.Timeout)
+	log.Printf("   失败注销: %s", registration.Check.DeregisterCriticalServiceAfter)
+
 	return nil
 }
 
+// CheckRegistration 检查服务是否已注册
+func CheckRegistration(serviceName, configHostname string, port int, consulConfig *subconfigs.ConsulConfig) error {
+	ip := client.GetServiceIP(configHostname)
+	serviceID := fmt.Sprintf("%s-%s-%d", serviceName, ip, port)
+
+	// 创建客户端
+	apiConfig := api.DefaultConfig()
+	if consulConfig.Address != "" {
+		apiConfig.Address = consulConfig.Address
+	}
+	client, err := api.NewClient(apiConfig)
+	if err != nil {
+		return fmt.Errorf("创建Consul客户端失败: %v", err)
+	}
+
+	// 检查服务
+	services, err := client.Agent().Services()
+	if err != nil {
+		return fmt.Errorf("获取服务列表失败: %v", err)
+	}
+
+	if svc, exists := services[serviceID]; exists {
+		log.Printf("✅ 服务已注册:")
+		log.Printf("   服务ID: %s", svc.ID)
+		log.Printf("   服务名: %s", svc.Service)
+		log.Printf("   地址: %s:%d", svc.Address, svc.Port)
+
+		// 检查健康状态
+		checks, err := client.Agent().Checks()
+		if err == nil {
+			for checkID, check := range checks {
+				if check.ServiceID == serviceID {
+					log.Printf("   健康检查[%s]: %s", checkID, check.Status)
+				}
+			}
+		}
+		return nil
+	}
+
+	return fmt.Errorf("服务未注册: %s", serviceID)
+}
+
 // Deregister 注销服务
-// Deregister 注销服务
-func Deregister(serviceName, ip string, port int) {
-	// 获取IP
-	//ip := netutil.GetServiceIP(configHostname)
+func Deregister(serviceName, ip string, port int, consulConfig *subconfigs.ConsulConfig) error {
 	serviceID := fmt.Sprintf("%s-%s-%d", serviceName, ip, port)
 
 	// 创建客户端
-	client, err := api.NewClient(api.DefaultConfig())
+	apiConfig := api.DefaultConfig()
+	if consulConfig != nil && consulConfig.Address != "" {
+		apiConfig.Address = consulConfig.Address
+	}
+	client, err := api.NewClient(apiConfig)
 	if err != nil {
-		log.Printf("创建consul客户端失败: %v", err)
-		return
+		return fmt.Errorf("创建consul客户端失败: %v", err)
 	}
 
 	// 注销服务
 	err = client.Agent().ServiceDeregister(serviceID)
 	if err != nil {
-		log.Printf("从consul注销服务失败 (ID: %s): %v", serviceID, err)
-		return
+		return fmt.Errorf("从consul注销服务失败 (ID: %s): %v", serviceID, err)
 	}
 
 	log.Printf("✅ 已从consul注销服务: %s", serviceID)
+	return nil
 }

webx/health_handle.go

@@ -0,0 +1,156 @@
+// webx/health_util.go
+package webx
+
+import (
+	"time"
+
+	"git.x2erp.com/qdy/go-base/config"
+	"git.x2erp.com/qdy/go-base/logger"
+)
+
+// HealthResponse 健康检查响应
+type HealthResponse struct {
+	Status    string                 `json:"status"`
+	Service   string                 `json:"service"`
+	Version   string                 `json:"version,omitempty"`
+	Env       string                 `json:"env,omitempty"`
+	Message   string                 `json:"message,omitempty"`
+	Timestamp string                 `json:"timestamp,omitempty"`
+	Data      map[string]interface{} `json:"data,omitempty"`
+}
+
+// RegisterDefaultHealthCheck 注册默认健康检查路由（带详细日志）
+func RegisterDefaultHealthCheck(ws *WebService, serviceName string) {
+	if serviceName == "" {
+		cfg, _ := config.GetConfig()
+		serviceName = cfg.GetAppName()
+		if serviceName == "" {
+			serviceName = "unknown-service"
+		}
+	}
+
+	logger.Debug("注册健康检查路由，服务名: %s", serviceName)
+
+	// 健康检查（带详细日志）
+	ws.GET("/health", func() (HealthResponse, error) {
+		logger.Debug("健康检查被调用: /health")
+
+		cfg, _ := config.GetConfig()
+		response := HealthResponse{
+			Status:    "ok",
+			Service:   serviceName,
+			Version:   cfg.GetAppVersion(),
+			Env:       cfg.GetAppEnv(),
+			Timestamp: time.Now().Format(time.RFC3339),
+		}
+
+		logger.Debug("健康检查响应: %+v", response)
+		return response, nil
+	}).Desc("健康检查").Register()
+
+	// 就绪检查
+	ws.GET("/health/ready", func() (HealthResponse, error) {
+		logger.Debug("就绪检查被调用: /health/ready")
+
+		return HealthResponse{
+			Status:    "ready",
+			Service:   serviceName,
+			Timestamp: time.Now().Format(time.RFC3339),
+		}, nil
+	}).Desc("就绪检查").Register()
+
+	// 存活检查
+	ws.GET("/health/live", func() (HealthResponse, error) {
+		logger.Debug("存活检查被调用: /health/live")
+
+		return HealthResponse{
+			Status:    "alive",
+			Service:   serviceName,
+			Timestamp: time.Now().Format(time.RFC3339),
+		}, nil
+	}).Desc("存活检查").Register()
+
+	// 服务信息
+	ws.GET("/health/info", func() (map[string]interface{}, error) {
+		logger.Debug("服务信息被调用: /health/info")
+
+		cfg, _ := config.GetConfig()
+		response := map[string]interface{}{
+			"service":     serviceName,
+			"version":     cfg.GetAppVersion(),
+			"environment": cfg.GetAppEnv(),
+			"timestamp":   time.Now().Format(time.RFC3339),
+			"endpoints": map[string]string{
+				"health": "/health",
+				"ready":  "/health/ready",
+				"live":   "/health/live",
+				"info":   "/health/info",
+			},
+			"config_info": map[string]string{
+				"app_name":    cfg.GetAppName(),
+				"app_version": cfg.GetAppVersion(),
+				"app_env":     cfg.GetAppEnv(),
+			},
+		}
+
+		logger.Debug("服务信息响应: %+v", response)
+		return response, nil
+	}).Desc("服务信息").Register()
+
+	logger.Debug("健康检查路由注册完成，路径: /health, /health/ready, /health/live, /health/info")
+}
+
+// RegisterConsulHealthCheck 注册Consul兼容的健康检查
+func RegisterConsulHealthCheck(ws *WebService) {
+	logger.Debug("注册Consul兼容健康检查路由")
+
+	// Consul需要的健康检查端点（返回text/plain）
+	ws.GET("/health", func() ([]byte, error) {
+		logger.Info("Consul健康检查被调用: /health")
+		logger.Info("返回 'OK' 给Consul")
+		return []byte("OK"), nil
+	}).Desc("Consul健康检查").Register()
+
+	// Consul详细状态检查
+	ws.GET("/health/consul", func() (map[string]interface{}, error) {
+		logger.Debug("Consul状态检查被调用: /health/consul")
+
+		cfg, _ := config.GetConfig()
+		response := map[string]interface{}{
+			"status":  "passing",
+			"service": cfg.GetAppName(),
+			"output":  "Service is healthy",
+			"checks": map[string]interface{}{
+				"service:health": map[string]string{
+					"status": "passing",
+				},
+			},
+		}
+
+		logger.Debug("Consul健康状态响应: %+v", response)
+		return response, nil
+	}).Desc("Consul健康状态").Register()
+}
+
+// RegisterAllHealthChecks 注册所有健康检查（推荐使用）
+func RegisterAllHealthChecks(ws *WebService, serviceName string) {
+	logger.Debug("开始注册所有健康检查路由...")
+
+	// 注册默认健康检查
+	RegisterDefaultHealthCheck(ws, serviceName)
+
+	// 注册Consul兼容检查
+	RegisterConsulHealthCheck(ws)
+
+	// 添加一个简单的ping端点（很多监控系统需要）
+	ws.GET("/ping", func() (map[string]interface{}, error) {
+		logger.Debug("Ping端点被调用: /ping")
+		return map[string]interface{}{
+			"ping":    "pong",
+			"time":    time.Now().Unix(),
+			"service": serviceName,
+		}, nil
+	}).Desc("简单Ping检查").Register()
+
+	logger.Debug("所有健康检查路由注册完成")
+}