添加注册中心代码，注册到consul

bootstraps/bootstrap.go

@@ -10,8 +10,9 @@ import (
 	"syscall"
 	"time"
 
+	"git.x2erp.com/qdy/go-base/client"
 	"git.x2erp.com/qdy/go-base/config"
-	"git.x2erp.com/qdy/go-base/config/subconfigs"
+	"git.x2erp.com/qdy/go-base/consul"
 	"git.x2erp.com/qdy/go-base/logger"
 )
 
@@ -23,11 +24,12 @@ type ShutdownHandler interface {
 // WebService Web服务实例
 type WebService struct {
 	serviceName     string
-	serviceConfig   *subconfigs.ServiceConfig
 	HttpServer      *http.Server
 	Router          *http.ServeMux
 	quit            chan os.Signal
 	shutdownHandler ShutdownHandler
+	Port            int
+	Ip              string
 }
 
 // Bootstrapper 服务启动器
@@ -78,21 +80,24 @@ func (b *Bootstrapper) init() *Bootstrapper {
 }
 
 // CreateService 创建Web服务实例
-func (b *Bootstrapper) CreateService(serviceName string) *WebService {
-	serviceCfg := b.Cfg.GetServiceConfig(serviceName)
+func (b *Bootstrapper) createService(yamlNode string) *WebService {
+
+	serviceCfg := b.Cfg.GetServiceConfig(yamlNode)
 
 	// 检查是否已存在同名服务
-	if _, exists := b.services[serviceName]; exists {
-		logger.Debug("服务 %s 已存在，将返回现有实例", serviceName)
-		return b.services[serviceName]
+	if _, exists := b.services[yamlNode]; exists {
+		logger.Debug("服务 %s 已存在，将返回现有实例", yamlNode)
+		return b.services[yamlNode]
 	}
 
+	io := client.GetServiceIP("")
 	// 创建新的服务实例
 	ws := &WebService{
-		serviceName:   serviceName,
-		serviceConfig: serviceCfg,
-		Router:        http.NewServeMux(),
-		quit:          make(chan os.Signal, 1),
+		serviceName: serviceCfg.ServiceName,
+		Router:      http.NewServeMux(),
+		quit:        make(chan os.Signal, 1),
+		Port:        serviceCfg.Port,
+		Ip:          io,
 	}
 
 	// 创建HTTP服务器
@@ -105,7 +110,7 @@ func (b *Bootstrapper) CreateService(serviceName string) *WebService {
 	}
 
 	// 存储服务实例
-	b.services[serviceName] = ws
+	b.services[yamlNode] = ws
 
 	logger.Debug("已创建服务实例: %s (端口: %d)", serviceCfg.ServiceName, serviceCfg.Port)
 
@@ -118,14 +123,13 @@ func (b *Bootstrapper) GetAllServices() map[string]*WebService {
 }
 
 // StartService 启动指定服务
-func (b *Bootstrapper) StartService(serviceName string) *Bootstrapper {
+func (b *Bootstrapper) StartService(yamlNode string) *Bootstrapper {
 
-	service := b.CreateService(serviceName)
+	service := b.createService(yamlNode)
 
-	serviceCfg := service.serviceConfig
-	log.Printf("正在启动服务: %s ", serviceCfg.ServiceName)
+	log.Printf("正在启动服务: %s ", service.serviceName)
 	log.Printf("模式: 独立运行 (net/http)")
-	log.Printf("服务端口: :%d", serviceCfg.Port)
+	log.Printf("服务端口: :%d", service.Port)
 
 	return b
 }
@@ -144,6 +148,9 @@ func (b *Bootstrapper) Run(shutdownHandler ShutdownHandler) {
 	// 启动所有服务
 	for serviceName, service := range b.services {
 		go func(name string, ws *WebService) {
+
+			consul.Register(service.serviceName, service.Ip, service.Port, b.Cfg.GetConsulConfig())
+
 			log.Printf("启动服务 %s 在 %s", name, ws.HttpServer.Addr)
 			if err := ws.HttpServer.ListenAndServe(); err != nil && err != http.ErrServerClosed {
 				log.Fatalf("服务 %s 运行失败: %v", name, err)
@@ -156,10 +163,10 @@ func (b *Bootstrapper) Run(shutdownHandler ShutdownHandler) {
 }
 
 // RunSingle 运行单个服务
-func (b *Bootstrapper) RunSingle(serviceName string, shutdownHandler ShutdownHandler) {
-	service := b.CreateService(serviceName)
+func (b *Bootstrapper) RunSingle(yamlNode string, shutdownHandler ShutdownHandler) {
+	service := b.createService(yamlNode)
 
-	log.Printf("服务 %s 开始运行...", service.serviceConfig.ServiceName)
+	log.Printf("服务 %s 开始运行...", service.serviceName)
 
 	// 设置服务级别的信号监听
 	signal.Notify(service.quit, syscall.SIGINT, syscall.SIGTERM)
@@ -172,15 +179,17 @@ func (b *Bootstrapper) RunSingle(serviceName string, shutdownHandler ShutdownHan
 		}
 	}()
 
+	consul.Register(service.serviceName, service.Ip, service.Port, b.Cfg.GetConsulConfig())
+
 	// 等待中断信号
 	b.waitForServiceShutdown(service, shutdownHandler)
 }
 
 // RunTLS 运行HTTPS服务
 func (b *Bootstrapper) RunTLS(serviceName, certFile, keyFile string, shutdownHandler ShutdownHandler) {
-	service := b.CreateService(serviceName)
+	service := b.createService(serviceName)
 
-	log.Printf("服务 %s 开始运行(HTTPS)...", service.serviceConfig.ServiceName)
+	log.Printf("服务 %s 开始运行(HTTPS)...", service.serviceName)
 
 	// 设置服务级别的信号监听
 	signal.Notify(service.quit, syscall.SIGINT, syscall.SIGTERM)
@@ -215,6 +224,9 @@ func (b *Bootstrapper) waitForShutdown(handler ShutdownHandler) {
 	for serviceName, service := range b.services {
 		go func(name string, ws *WebService) {
 			log.Printf("正在关闭服务: %s", name)
+			//退出注册中心
+			consul.Deregister(service.serviceName, service.Ip, service.Port)
+
 			if err := ws.HttpServer.Shutdown(ctx); err != nil {
 				log.Printf("服务 %s 关闭失败: %v", name, err)
 			} else {
@@ -245,12 +257,16 @@ func (b *Bootstrapper) waitForShutdown(handler ShutdownHandler) {
 
 // waitForServiceShutdown 等待单个服务关闭
 func (b *Bootstrapper) waitForServiceShutdown(service *WebService, handler ShutdownHandler) {
+
 	log.Printf("按 Ctrl+C 停止服务 %s", service.serviceName)
 
 	// 等待信号
 	<-service.quit
 	log.Printf("接收到终止信号，正在优雅关闭服务 %s...", service.serviceName)
 
+	//退出注册中心
+	consul.Deregister(service.serviceName, service.Ip, service.Port)
+
 	// 创建关闭上下文，给30秒完成当前请求
 	ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
 	defer cancel()
@@ -282,8 +298,8 @@ func (b *Bootstrapper) GetConfig() config.IConfig {
 }
 
 // GetRouter 获取指定服务的路由器
-func (b *Bootstrapper) GetRouter(serviceName string) *http.ServeMux {
-	service := b.CreateService(serviceName)
+func (b *Bootstrapper) GetRouter(yamlNode string) *http.ServeMux {
+	service := b.createService(yamlNode)
 	return service.Router
 }
 
@@ -322,10 +338,10 @@ func (ws *WebService) GetServiceName() string {
 	return ws.serviceName
 }
 
-// GetServiceConfig 获取服务配置
-func (ws *WebService) GetServiceConfig() *subconfigs.ServiceConfig {
-	return ws.serviceConfig
-}
+// // GetServiceConfig 获取服务配置
+// func (ws *WebService) GetServiceConfig() *subconfigs.ServiceConfig {
+// 	return ws.serviceConfig
+// }
 
 // GetRouter 获取服务的路由器
 func (ws *WebService) GetRouter() *http.ServeMux {
@@ -344,7 +360,7 @@ func (ws *WebService) SetShutdownHandler(handler ShutdownHandler) {
 
 // Run 运行单个服务
 func (ws *WebService) Run(shutdownHandler ShutdownHandler) {
-	log.Printf("服务 %s 开始运行...", ws.serviceConfig.ServiceName)
+	log.Printf("服务 %s 开始运行...", ws.serviceName)
 
 	// 设置信号监听
 	signal.Notify(ws.quit, syscall.SIGINT, syscall.SIGTERM)

client/ip_resolver.go

@@ -0,0 +1,73 @@
+// ip_resolver.go
+package client
+
+import (
+	"net"
+	"os"
+	"strings"
+)
+
+// func main() {
+// 	// 1. 用户可以在yaml配置：hostname: "192.168.3.190" 或 "kendemacbook-air.local"
+// 	// 2. 如果不配置，自动获取
+// 	yamlHostname := "" // "kendemacbook-air.local" // 从yaml读取，可以设为空、IP或主机名
+
+// 	ip := GetIP(yamlHostname)
+// 	fmt.Printf("服务IP: %s\n", ip)
+// }
+
+// GetIP 获取IP地址  configHostname 主机名称或者ip地址
+func GetServiceIP(configHostname string) string {
+	// 1. 如果yaml配置了，直接用
+	if configHostname != "" {
+		return parseToIP(configHostname)
+	}
+
+	// 2. 获取主机名（这很少出错）
+	hostname, _ := os.Hostname()
+
+	// 3. 解析为IP
+	return parseToIP(hostname)
+}
+
+// parseToIP 解析为IP（可以是IP或主机名）
+func parseToIP(address string) string {
+	// 如果本来就是IP，直接返回
+	if ip := net.ParseIP(address); ip != nil {
+		return ip.String()
+	}
+
+	// 是主机名，加上.local后缀
+	if !strings.Contains(address, ".") {
+		address = address + ".local"
+	}
+
+	// 解析DNS
+	ips, err := net.LookupHost(address)
+	if err != nil || len(ips) == 0 {
+		return getSimpleIP()
+	}
+
+	// 取第一个非127.0.0.1的IPv4
+	for _, ip := range ips {
+		if ip == "127.0.0.1" || ip == "::1" {
+			continue
+		}
+		if parsedIP := net.ParseIP(ip); parsedIP != nil && parsedIP.To4() != nil {
+			return ip
+		}
+	}
+
+	// 没有合适的，返回第一个
+	return ips[0]
+}
+
+// getSimpleIP 最简单的获取本机IP方法
+func getSimpleIP() string {
+	conn, err := net.Dial("udp", "8.8.8.8:80")
+	if err != nil {
+		return "127.0.0.1"
+	}
+	defer conn.Close()
+	return conn.LocalAddr().(*net.UDPAddr).IP.String()
+}

client/service_client.go

@@ -0,0 +1,161 @@
+package client
+
+import (
+	"bytes"
+	"encoding/json"
+	"errors"
+	"io"
+	"net/http"
+	"strconv"
+	"sync"
+	"time"
+
+	"github.com/hashicorp/consul/api"
+)
+
+var (
+	balancer *ServiceBalancer
+	once     sync.Once
+)
+
+type ServiceBalancer struct {
+	mu         sync.RWMutex
+	services   map[string][]string
+	indexes    map[string]int
+	consulAddr string
+}
+
+// Init 初始化客户端，传入Consul地址
+func Init(consulAddr string) {
+	once.Do(func() {
+		balancer = &ServiceBalancer{
+			services:   make(map[string][]string),
+			indexes:    make(map[string]int),
+			consulAddr: consulAddr,
+		}
+		go balancer.watchConsul()
+	})
+}
+
+func (s *ServiceBalancer) watchConsul() {
+	config := api.DefaultConfig()
+	config.Address = s.consulAddr
+	client, _ := api.NewClient(config)
+
+	for {
+		s.mu.Lock()
+		services, _, _ := client.Health().Service("", "", true, nil)
+
+		// 清空旧数据
+		s.services = make(map[string][]string)
+
+		for _, entry := range services {
+			service := entry.Service.Service
+			addr := entry.Service.Address + ":" + strconv.Itoa(entry.Service.Port)
+
+			// 使用map去重
+			if s.services[service] == nil {
+				s.services[service] = []string{}
+			}
+
+			// 检查是否已存在
+			exists := false
+			for _, existingAddr := range s.services[service] {
+				if existingAddr == addr {
+					exists = true
+					break
+				}
+			}
+			if !exists {
+				s.services[service] = append(s.services[service], addr)
+			}
+		}
+		s.mu.Unlock()
+
+		time.Sleep(10 * time.Second)
+	}
+}
+
+func (s *ServiceBalancer) GetServiceAddr(service string) string {
+	s.mu.RLock()
+	defer s.mu.RUnlock()
+
+	addrs := s.services[service]
+	if len(addrs) == 0 {
+		return ""
+	}
+
+	idx := s.indexes[service]
+	addr := addrs[idx]
+	s.indexes[service] = (idx + 1) % len(addrs)
+
+	return addr
+}
+
+func Get(service, path string, result interface{}) error {
+	if balancer == nil {
+		return errors.New("client not initialized, call client.Init() first")
+	}
+
+	baseURL := balancer.GetServiceAddr(service)
+	if baseURL == "" {
+		return errors.New("service unavailable")
+	}
+
+	resp, err := http.Get("http://" + baseURL + path)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return errors.New("HTTP error: " + resp.Status)
+	}
+
+	body, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	return json.Unmarshal(body, result)
+}
+
+func Post(service, path string, body, result interface{}) error {
+	if balancer == nil {
+		return errors.New("client not initialized, call client.Init() first")
+	}
+
+	baseURL := balancer.GetServiceAddr(service)
+	if baseURL == "" {
+		return errors.New("service unavailable")
+	}
+
+	jsonBytes, err := json.Marshal(body)
+	if err != nil {
+		return err
+	}
+
+	resp, err := http.Post(
+		"http://"+baseURL+path,
+		"application/json",
+		bytes.NewBuffer(jsonBytes),
+	)
+	if err != nil {
+		return err
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return errors.New("HTTP error: " + resp.Status)
+	}
+
+	respBody, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	if result != nil {
+		return json.Unmarshal(respBody, result)
+	}
+	return nil
+}

config/config.go

@@ -20,9 +20,11 @@ type IConfig interface {
 	GetServiceConfig(name string) *subconfigs.ServiceConfig //获取微服务配置
 
 	// 其他配置（保持不变）
-	GetRedis() *subconfigs.RedisConfig
-	GetDoris() *subconfigs.DorisConfig
-	GetRabbitMQ() *subconfigs.RabbitMQConfig
+	GetRedisConfig() *subconfigs.RedisConfig
+	GetDorisConfig() *subconfigs.DorisConfig
+	GetRabbitMQConfig() *subconfigs.RabbitMQConfig
+
+	GetConsulConfig() *subconfigs.ConsulConfig
 
 	GetHTTP() *subconfigs.HTTPConfig
 	GetMicro() *subconfigs.MicroConfig
@@ -101,21 +103,28 @@ func (c *Config) IsDatabaseConfiguredByName(name string) bool {
 
 // ========== 其他配置方法（保持不变） ==========
 
-func (c *Config) GetRedis() *subconfigs.RedisConfig {
+func (c *Config) GetRedisConfig() *subconfigs.RedisConfig {
 	if config := subconfigs.GetRegisteredConfig("redis"); config != nil {
 		return config.(*subconfigs.RedisConfig)
 	}
 	return nil
 }
 
-func (c *Config) GetDoris() *subconfigs.DorisConfig {
+func (c *Config) GetConsulConfig() *subconfigs.ConsulConfig {
+	if config := subconfigs.GetRegisteredConfig("consul"); config != nil {
+		return config.(*subconfigs.ConsulConfig)
+	}
+	return nil
+}
+
+func (c *Config) GetDorisConfig() *subconfigs.DorisConfig {
 	if config := subconfigs.GetRegisteredConfig("doris"); config != nil {
 		return config.(*subconfigs.DorisConfig)
 	}
 	return nil
 }
 
-func (c *Config) GetRabbitMQ() *subconfigs.RabbitMQConfig {
+func (c *Config) GetRabbitMQConfig() *subconfigs.RabbitMQConfig {
 	if config := subconfigs.GetRegisteredConfig("rabbitmq"); config != nil {
 		return config.(*subconfigs.RabbitMQConfig)
 	}
@@ -180,12 +189,12 @@ func (c *Config) GetInitError() error {
 
 // 实现 IConfig 接口的其他方法
 func (c *Config) IsDorisConfigured() bool {
-	doris := c.GetDoris()
+	doris := c.GetDorisConfig()
 	return doris != nil && doris.IsConfigured()
 }
 
 func (c *Config) IsRedisConfigured() bool {
-	redis := c.GetRedis()
+	redis := c.GetRedisConfig()
 	return redis != nil && redis.IsConfigured()
 }
 
@@ -258,7 +267,15 @@ func GetRedis() *subconfigs.RedisConfig {
 	if cfgInstance == nil {
 		return &subconfigs.RedisConfig{}
 	}
-	return cfgInstance.GetRedis()
+	return cfgInstance.GetRedisConfig()
+}
+
+// GetRedis 包级便捷函数 - 获取Redis配置
+func GetConsul() *subconfigs.ConsulConfig {
+	if cfgInstance == nil {
+		return &subconfigs.ConsulConfig{}
+	}
+	return cfgInstance.GetConsulConfig()
 }
 
 // GetHTTP 包级便捷函数 - 获取HTTP配置

config/subconfigs/consul_config.go

@@ -0,0 +1,40 @@
+package subconfigs
+
+import "fmt"
+
+// Config Consul客户端配置
+type ConsulConfig struct {
+	BaseConfig
+	Address string `yaml:"address"` // Consul服务器地址，如："localhost:8500"
+	Token   string `yaml:"token"`   // ACL token（可选）
+	Scheme  string `yaml:"scheme"`  // "http" 或 "https"
+}
+
+func NewConsulConfig() *ConsulConfig {
+	return &ConsulConfig{}
+}
+
+func (c *ConsulConfig) SetDefaults() {
+	c.Address = "localhost:8500"
+	c.Scheme = "http"
+}
+
+func (c *ConsulConfig) Load(data map[string]interface{}) error {
+	return c.LoadFromYAML(data, c)
+}
+
+func (c *ConsulConfig) Validate() error {
+	if c.Address == "" {
+		return fmt.Errorf("consul address must be configured")
+	}
+	return nil
+}
+
+func (c *ConsulConfig) IsConfigured() bool {
+	return c.Address != ""
+}
+
+// 自动注册
+func init() {
+	Register("consul", &ConsulConfig{})
+}

consul/register_consul.go

@@ -0,0 +1,80 @@
+// consul/register.go
+package consul
+
+import (
+	"fmt"
+	"log"
+
+	"git.x2erp.com/qdy/go-base/client"
+	"git.x2erp.com/qdy/go-base/config/subconfigs"
+	"github.com/hashicorp/consul/api"
+)
+
+// Register 注册服务到Consul
+func Register(serviceName, configHostname string, port int, consulConfig *subconfigs.ConsulConfig) error {
+	// 1. 获取IP
+	ip := client.GetServiceIP(configHostname)
+	log.Printf("注册服务 %s -> %s:%d 到 %s", serviceName, ip, port, consulConfig.Address)
+
+	// 2. 创建Consul客户端配置
+	apiConfig := api.DefaultConfig()
+	if consulConfig.Address != "" {
+		apiConfig.Address = consulConfig.Address
+	}
+	if consulConfig.Token != "" {
+		apiConfig.Token = consulConfig.Token
+	}
+	if consulConfig.Scheme != "" {
+		apiConfig.Scheme = consulConfig.Scheme
+	}
+
+	// 3. 创建客户端
+	client, err := api.NewClient(apiConfig)
+	if err != nil {
+		return fmt.Errorf("创建Consul客户端失败: %v", err)
+	}
+
+	// 4. 注册服务
+	registration := &api.AgentServiceRegistration{
+		ID:      fmt.Sprintf("%s-%s-%d", serviceName, ip, port),
+		Name:    serviceName,
+		Address: ip,
+		Port:    port,
+		Check: &api.AgentServiceCheck{
+			HTTP:     fmt.Sprintf("http://%s:%d/health", ip, port),
+			Interval: "10s",
+		},
+	}
+
+	err = client.Agent().ServiceRegister(registration)
+	if err != nil {
+		return fmt.Errorf("consul注册失败: %v", err)
+	}
+
+	log.Printf("✅ 服务已注册到Consul服务器: %s", consulConfig.Address)
+	return nil
+}
+
+// Deregister 注销服务
+// Deregister 注销服务
+func Deregister(serviceName, ip string, port int) {
+	// 获取IP
+	//ip := netutil.GetServiceIP(configHostname)
+	serviceID := fmt.Sprintf("%s-%s-%d", serviceName, ip, port)
+
+	// 创建客户端
+	client, err := api.NewClient(api.DefaultConfig())
+	if err != nil {
+		log.Printf("创建consul客户端失败: %v", err)
+		return
+	}
+
+	// 注销服务
+	err = client.Agent().ServiceDeregister(serviceID)
+	if err != nil {
+		log.Printf("从consul注销服务失败 (ID: %s): %v", serviceID, err)
+		return
+	}
+
+	log.Printf("✅ 已从consul注销服务: %s", serviceID)
+}