增加配置文件

config/config.go

@@ -0,0 +1,177 @@
+package config
+
+import (
+	"fmt"
+	"os"
+	"path/filepath"
+	"sync"
+
+	"gopkg.in/yaml.v2"
+)
+
+// Config 应用配置
+type Config struct {
+	Database DBConfig `yaml:"database"`
+	Auth     Auth     `yaml:"auth"`
+	Service  Service  `yaml:"service"`
+}
+
+// DBConfig 数据库配置
+type DBConfig struct {
+	Type            string `yaml:"type"`
+	Host            string `yaml:"host"`
+	Port            int    `yaml:"port"`
+	Username        string `yaml:"username"`
+	Password        string `yaml:"password"`
+	Database        string `yaml:"database"`
+	MaxOpenConns    int    `yaml:"max_open_conns"`
+	MaxIdleConns    int    `yaml:"max_idle_conns"`
+	ConnMaxLifetime int    `yaml:"conn_max_lifetime"` // 单位：秒
+}
+
+// Auth 认证配置
+type Auth struct {
+	Token string `yaml:"token"`
+}
+
+// Service 微服务配置
+type Service struct {
+	ReadTimeout  int `yaml:"read_timeout"`
+	WriteTimeout int `yaml:"write_timeout"`
+	IdleTimeout  int `yaml:"idle_timeout"`
+}
+
+// 导出接口，防止外部修改
+type IConfig interface {
+	GetDatabase() DBConfig
+	GetAuth() Auth
+	GetService() Service
+	IsDatabaseConfigured() bool
+}
+
+// 实现接口的具体类型
+type configWrapper struct {
+	config *Config
+}
+
+func (cw *configWrapper) GetDatabase() DBConfig {
+	return cw.config.Database
+}
+
+func (cw *configWrapper) GetAuth() Auth {
+	return cw.config.Auth
+}
+
+func (cw *configWrapper) GetService() Service {
+	return cw.config.Service
+}
+
+func (cw *configWrapper) IsDatabaseConfigured() bool {
+	return cw.config.Database.Type != "" &&
+		cw.config.Database.Host != "" &&
+		cw.config.Database.Port > 0 &&
+		cw.config.Database.Username != "" &&
+		cw.config.Database.Database != ""
+}
+
+func (cw *configWrapper) IsAuthConfigured() bool {
+	return cw.config.Auth.Token != ""
+}
+
+func (cw *configWrapper) IsServiceConfigured() bool {
+	return cw.config.Service.ReadTimeout > 0 &&
+		cw.config.Service.WriteTimeout > 0 &&
+		cw.config.Service.IdleTimeout > 0
+
+}
+
+var (
+	instance IConfig
+	once     sync.Once
+	initErr  error
+)
+
+// GetConfig 获取配置单例实例
+func GetConfig() IConfig {
+	once.Do(func() {
+		config, err := loadConfig()
+		if err != nil {
+			initErr = err
+			// 创建一个空的配置实例，避免nil指针
+			instance = &configWrapper{config: &Config{}}
+			return
+		}
+		instance = &configWrapper{config: config}
+	})
+	return instance
+}
+
+// GetInitError 获取初始化错误（如果有）
+func GetInitError() error {
+	return initErr
+}
+
+// loadConfig 加载配置文件
+func loadConfig() (*Config, error) {
+	configFile, err := findConfigFile()
+	if err != nil {
+		return nil, err
+	}
+
+	fmt.Printf("✅ Using config file: %s\n", configFile)
+
+	// 读取配置文件
+	data, err := os.ReadFile(configFile)
+	if err != nil {
+		return nil, fmt.Errorf("failed to read config file %s: %v", configFile, err)
+	}
+
+	var config Config
+	err = yaml.Unmarshal(data, &config)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse config file: %v", err)
+	}
+
+	return &config, nil
+}
+
+// findConfigFile 查找配置文件
+func findConfigFile() (string, error) {
+	// 1. 首先尝试可执行文件同目录
+	exePath, err := os.Executable()
+	if err == nil {
+		exeDir := filepath.Dir(exePath)
+		configFile := filepath.Join(exeDir, "db.yaml")
+		if _, err := os.Stat(configFile); err == nil {
+			return configFile, nil
+		}
+	}
+
+	// 2. 尝试环境变量指定的路径
+	envConfigPath := os.Getenv("DB_CONFIG_PATH")
+	if envConfigPath != "" {
+		if _, err := os.Stat(envConfigPath); err == nil {
+			return envConfigPath, nil
+		}
+		return "", fmt.Errorf("DB_CONFIG_PATH file not found: %s", envConfigPath)
+	}
+
+	// 3. 如果都没有找到，返回错误
+	exeDir := "unknown"
+	if exePath, err := os.Executable(); err == nil {
+		exeDir = filepath.Dir(exePath)
+	}
+
+	return "", fmt.Errorf(`No configuration file found!
+
+Tried locations:
+1. Executable directory: %s/db.yaml
+2. Environment variable: DB_CONFIG_PATH
+
+Solutions:
+- Place db.yaml in the same directory as the executable
+- Or set DB_CONFIG_PATH environment variable to config file path
+
+Example:
+  export DB_CONFIG_PATH=/path/to/your/db.yaml`, exeDir)
+}

gct.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+
+# 脚本用法：./git-commit-and-tag.sh "你的提交描述" "版本号"
+
+# 检查参数数量
+if [ $# -ne 2 ]; then
+    echo "错误: 脚本需要2个参数。"
+    echo "用法: $0 \"提交描述\" \"版本号\""
+    echo "示例: $0 \"修复了登录问题\" \"v1.2.3\""
+    exit 1
+fi
+
+# 分配参数
+COMMIT_MESSAGE="$1"
+VERSION_TAG="$2"
+
+# 检查当前目录是否为Git仓库
+if ! git rev-parse --git-dir > /dev/null 2>&1; then
+    echo "错误: 当前目录不是一个Git仓库。"
+    exit 1
+fi
+
+# 检查是否有未暂存的更改
+if [ -z "$(git status --porcelain)" ]; then
+    echo "提示: 没有检测到任何更改需要提交。"
+    exit 0
+fi
+
+echo "开始提交并打版本标签..."
+echo "提交描述: $COMMIT_MESSAGE"
+echo "版本标签: $VERSION_TAG"
+
+# 添加所有更改到暂存区[citation:4][citation:6]
+git add .
+
+# 进行提交[citation:4][citation:10]
+git commit -m "$COMMIT_MESSAGE"
+if [ $? -ne 0 ]; then
+    echo "错误: 提交失败。"
+    exit 1
+fi
+
+# 创建轻量标签或附注标签（这里创建轻量标签）[citation:4]
+git tag "$VERSION_TAG"
+if [ $? -ne 0 ]; then
+    echo "错误: 创建标签失败。"
+    exit 1
+fi
+
+# 推送到远程仓库并推送标签[citation:4]
+echo "正在推送到远程仓库..."
+git push
+git push origin "$VERSION_TAG"
+
+echo "✅ 完成！提交已推送，版本标签 $VERSION_TAG 已创建并推送。"

go.mod

@@ -1,3 +1,5 @@
 module git.x2erp.com/qdy/go-base
 
 go 1.25.4
+
+require gopkg.in/yaml.v2 v2.4.0

go.sum

@@ -0,0 +1,4 @@
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=

test.go

@@ -0,0 +1,34 @@
+package main
+
+import (
+	"fmt"
+
+	"git.x2erp.com/qdy/go-base/config"
+)
+
+func main() {
+	// 获取配置实例
+	cfg := config.GetConfig()
+
+	// 检查初始化是否有错误
+	if err := config.GetInitError(); err != nil {
+		fmt.Printf("配置加载失败: %v\n", err)
+		return
+	}
+
+	// 使用配置
+	if cfg.IsDatabaseConfigured() {
+		dbConfig := cfg.GetDatabase()
+		fmt.Printf("Host: %s\n", dbConfig.Host)
+		fmt.Printf("Port: %d\n", dbConfig.Port)
+		fmt.Printf("Database: %s\n", dbConfig.Database)
+	}
+
+	authConfig := cfg.GetAuth()
+	fmt.Printf("token: %s\n", authConfig.Token)
+
+	serviceConfig := cfg.GetService()
+	fmt.Printf("ReadTimeout: %d秒\n", serviceConfig.ReadTimeout)
+	fmt.Printf("WriteTimeout: %d秒\n", serviceConfig.WriteTimeout)
+	fmt.Printf("IdleTimeout: %d秒\n", serviceConfig.IdleTimeout)
+}