Merge pull request #7 from sunjunnan79/main

优化gin结构

Author: sunjunnan79

Makefile

@@ -0,0 +1,2 @@
+test:
+	go test -v ./...

example/logger/logger.go

@@ -26,13 +26,13 @@ func SearchUser(id int) error {
 }
 
 func main() {
-	l := zapx.NewDefaultZapLogger("./logs", logger.EnvTest)
+	l := zapx.NewDefaultZapLogger()
 	id := 1
 	A(id, l)
-	l.Info("查询出错id:", logger.Int("id", id))
+	l.Info("查询出错id:", logger.Field{"id": id})
 }
 
 func A(id int, l logger.Logger) {
 	err := SearchUser(id)
-	l.Error("查询数据库出错:", logger.Error(err))
+	l.Error("查询数据库出错:" + err.Error())
 }

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/stretchr/testify v1.11.0
 	github.com/uber/jaeger-client-go v2.30.0+incompatible
 	github.com/ulule/limiter/v3 v3.11.2
-	go.uber.org/zap v1.21.0
+	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.16.0
 	google.golang.org/grpc v1.74.2
 	google.golang.org/grpc/examples v0.0.0-20250830142414-29ba00196bb8
@@ -62,6 +62,8 @@ require (
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/clbanning/mxj/v2 v2.5.5 // indirect
 	github.com/cloudwego/base64x v0.1.6 // indirect
+	github.com/coreos/go-semver v0.3.1 // indirect
+	github.com/coreos/go-systemd/v22 v22.5.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/deckarep/golang-set v1.7.1 // indirect
 	github.com/eapache/go-resiliency v1.7.0 // indirect
@@ -77,11 +79,13 @@ require (
 	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
+	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/mock v1.6.0 // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
 	github.com/google/wire v0.7.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 // indirect
 	github.com/hashicorp/go-uuid v1.0.3 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
@@ -122,15 +126,19 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/uber/jaeger-lib v2.4.1+incompatible // indirect
 	github.com/ugorji/go/codec v1.3.0 // indirect
+	go.etcd.io/etcd/api/v3 v3.6.5 // indirect
+	go.etcd.io/etcd/client/pkg/v3 v3.6.5 // indirect
+	go.etcd.io/etcd/client/v3 v3.6.5 // indirect
 	go.uber.org/atomic v1.9.0 // indirect
 	go.uber.org/mock v0.6.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.20.0 // indirect
 	golang.org/x/crypto v0.41.0 // indirect
 	golang.org/x/net v0.43.0 // indirect
 	golang.org/x/sys v0.35.0 // indirect
 	golang.org/x/text v0.28.0 // indirect
 	golang.org/x/time v0.12.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b // indirect
 	google.golang.org/protobuf v1.36.8 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect

go.sum

@@ -108,6 +108,10 @@ github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQ
 github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr4=
+github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec=
+github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -192,6 +196,7 @@ github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIx
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/goji/httpauth v0.0.0-20160601135302-2da839ab0f4d/go.mod h1:nnjvkQ9ptGaCkuDUx6wNykzzlUixGxvkme+H/lnzb+A=
@@ -240,7 +245,10 @@ github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+
 github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
 github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
+github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
+github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go-uuid v1.0.3 h1:2gKiV6YVmrJ1i2CKKa9obLvRieoRGviZFL26PcT/Co8=
 github.com/hashicorp/go-uuid v1.0.3/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
@@ -417,6 +425,12 @@ github.com/yuin/goldmark v1.1.30/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+go.etcd.io/etcd/api/v3 v3.6.5 h1:pMMc42276sgR1j1raO/Qv3QI9Af/AuyQUW6CBAWuntA=
+go.etcd.io/etcd/api/v3 v3.6.5/go.mod h1:ob0/oWA/UQQlT1BmaEkWQzI0sJ1M0Et0mMpaABxguOQ=
+go.etcd.io/etcd/client/pkg/v3 v3.6.5 h1:Duz9fAzIZFhYWgRjp/FgNq2gO1jId9Yae/rLn3RrBP8=
+go.etcd.io/etcd/client/pkg/v3 v3.6.5/go.mod h1:8Wx3eGRPiy0qOFMZT/hfvdos+DjEaPxdIDiCDUv/FQk=
+go.etcd.io/etcd/client/v3 v3.6.5 h1:yRwZNFBx/35VKHTcLDeO7XVLbCBFbPi+XV4OC3QJf2U=
+go.etcd.io/etcd/client/v3 v3.6.5/go.mod h1:ZqwG/7TAFZ0BJ0jXRPoJjKQJtbFo/9NIY8uoFFKcCyo=
 go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
 go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
 go.opentelemetry.io/otel v1.37.0 h1:9zhNfelUvx0KBfu/gb+ZgeAfAgtWrfHJZcAqFC228wQ=
@@ -442,9 +456,13 @@ go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI=
 go.uber.org/zap v1.21.0 h1:WefMeulhovoZ2sYXz7st6K0sLj7bBhpiFaud4r4zST8=
 go.uber.org/zap v1.21.0/go.mod h1:wjWOCqI0f2ZZrJF/UufIOkiC8ii6tm1iqIsLo76RfJw=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/arch v0.18.0 h1:WN9poc33zL4AzGxqf8VtpKUnGvMi8O9lhNyBMF/85qc=
 golang.org/x/arch v0.18.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
 golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c=
@@ -626,6 +644,9 @@ google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24=
+google.golang.org/genproto v0.0.0-20250804133106-a7a43d27e69b h1:eZTgydvqZO44zyTZAvMaSyAxccZZdraiSAGvqOczVvk=
+google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b h1:ULiyYQ0FdsJhwwZUwbaXpZF5yUE3h+RA+gxvBu37ucc=
+google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:oDOGiMSXHL4sDTJvFvIB9nRQCGdLP1o/iVaqQK8zB+M=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b h1:zPKJod4w6F1+nRGDI9ubnXYhU9NSWoFAijkHkUXeTK8=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250804133106-a7a43d27e69b/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=

pkg/logger/logger.go

@@ -10,59 +10,4 @@ type Logger interface {
 	Sync() error
 }
 
-type Field struct {
-	Key string
-	Val any
-}
-
-func Any(key string, val any) Field {
-	return Field{
-		Key: key,
-		Val: val,
-	}
-}
-
-func Error(err error) Field {
-	return Field{
-		Key: "error",
-		Val: err,
-	}
-}
-
-func Int64(key string, val int64) Field {
-	return Field{
-		Key: key,
-		Val: val,
-	}
-}
-
-func Int(key string, val int) Field {
-	return Field{
-		Key: key,
-		Val: val,
-	}
-}
-
-func String(key string, val string) Field {
-	return Field{
-		Key: key,
-		Val: val,
-	}
-}
-
-func Int32(key string, val int32) Field {
-	return Field{
-		Key: key,
-		Val: val,
-	}
-}
-
-// ---------- 环境枚举 ----------
-type Env int8
-
-const (
-	EnvUnknown Env = iota
-	EnvDev         // 开发：彩色多行栈，仅控制台
-	EnvTest        // 测试：彩色多行栈到控制台 + JSON 到文件
-	EnvProd        // 生产：全 JSON 单行
-)
+type Field map[string]interface{}

pkg/logger/logx/logs_test.go

@@ -0,0 +1,68 @@
+package logx
+
+import (
+	"bytes"
+	"log"
+	"strings"
+	"testing"
+
+	"github.com/muxi-Infra/muxi-micro/pkg/logger"
+)
+
+func TestNewStdLogger(t *testing.T) {
+	l := NewStdLogger()
+	if l == nil {
+		t.Fatal("expected logger, got nil")
+	}
+	if l.logger == nil {
+		t.Fatal("expected underlying log.Logger initialized")
+	}
+}
+
+func TestOutputLevels(t *testing.T) {
+	l := NewStdLogger()
+
+	fields := logger.Field{"key": "value"}
+	l.Info("info msg", fields)
+	l.Debug("debug msg")
+	l.Warn("warn msg")
+	l.Error("error msg")
+
+}
+
+func TestWithFields(t *testing.T) {
+	l := NewStdLogger()
+
+	// 添加初始字段
+	l2 := l.With(logger.Field{"request_id": "1234"}).(*StdLogger)
+	if v, ok := l2.fields["request_id"]; !ok || v != "1234" {
+		t.Fatalf("expected field request_id=1234, got %v", l2.fields)
+	}
+
+	// 再添加新字段（测试合并）
+	l3 := l2.With(logger.Field{"user": "alice"}).(*StdLogger)
+	if v, ok := l3.fields["user"]; !ok || v != "alice" {
+		t.Fatalf("expected user=alice, got %v", l3.fields)
+	}
+}
+
+func TestOutputFieldMerging(t *testing.T) {
+	l := NewStdLogger()
+	buf := &bytes.Buffer{}
+	l.logger = log.New(buf, "", 0)
+
+	l.fields["base"] = "yes"
+	l.output("INFO", "test", logger.Field{"child": "ok"})
+
+	out := buf.String()
+	if !strings.Contains(out, "\"base\":\"yes\"") || !strings.Contains(out, "\"child\":\"ok\"") {
+		t.Fatalf("field merge failed: %s", out)
+	}
+}
+
+func TestSync(t *testing.T) {
+	l := NewStdLogger()
+	if err := l.Sync(); err != nil {
+		t.Fatalf("expected nil, got %v", err)
+	}
+}

pkg/logger/logx/logx.go

@@ -0,0 +1,126 @@
+package logx
+
+import (
+	"encoding/json"
+	"fmt"
+	"github.com/muxi-Infra/muxi-micro/pkg/logger"
+	"log"
+	"os"
+	"runtime"
+	"strings"
+	"sync"
+	"time"
+)
+
+type StdLogger struct {
+	logger *log.Logger
+	fields logger.Field
+	mu     sync.RWMutex
+}
+
+// NewStdLogger 创建一个基于标准库 log 的 Logger 实现，非常轻量，适合简单场景/日志的兜底场景使用
+func NewStdLogger() *StdLogger {
+	return &StdLogger{
+		logger: log.New(os.Stdout, "", 0),
+		fields: make(logger.Field),
+	}
+}
+
+func (l *StdLogger) Info(msg string, fields ...logger.Field) {
+	l.output("INFO", msg, fields...)
+}
+
+func (l *StdLogger) Debug(msg string, fields ...logger.Field) {
+	l.output("DEBUG", msg, fields...)
+}
+
+func (l *StdLogger) Warn(msg string, fields ...logger.Field) {
+	l.output("WARN", msg, fields...)
+}
+
+func (l *StdLogger) Error(msg string, fields ...logger.Field) {
+	l.output("ERROR", msg, fields...)
+}
+
+func (l *StdLogger) Fatal(msg string, fields ...logger.Field) {
+	l.output("FATAL", msg, fields...)
+	os.Exit(1)
+}
+
+// With 创建带上下文的 logger
+func (l *StdLogger) With(fields ...logger.Field) logger.Logger {
+	l.mu.RLock()
+	base := make(logger.Field, len(l.fields))
+	for k, v := range l.fields {
+		base[k] = v
+	}
+	l.mu.RUnlock()
+
+	for _, f := range fields {
+		for k, v := range f {
+			base[k] = v
+		}
+	}
+
+	return &StdLogger{
+		logger: l.logger,
+		fields: base,
+	}
+}
+
+// Sync 在标准库中没有缓冲区，这里直接返回 nil
+func (l *StdLogger) Sync() error {
+	return nil
+}
+
+func (l *StdLogger) output(level, msg string, fields ...logger.Field) {
+	l.mu.RLock()
+	defer l.mu.RUnlock()
+
+	// 合并全局与传入字段
+	merged := make(logger.Field)
+	for k, v := range l.fields {
+		merged[k] = v
+	}
+	for _, f := range fields {
+		for k, v := range f {
+			merged[k] = v
+		}
+	}
+
+	// 获取时间与调用信息
+	now := time.Now().Format("2006-01-02T15:04:05.000-0700")
+	_, file, line, ok := runtime.Caller(2)
+	caller := "unknown"
+	if ok {
+		short := file
+		if idx := strings.LastIndex(file, "/"); idx != -1 {
+			short = file[idx+1:]
+		}
+		caller = fmt.Sprintf("%s:%d", short, line)
+	}
+
+	// 构建 JSON map
+	logMap := map[string]interface{}{
+		"level":      level,
+		"@timestamp": now,
+		"caller":     caller,
+		"msg":        msg,
+	}
+
+	// 合并自定义字段
+	for k, v := range merged {
+		logMap[k] = v
+	}
+
+	// 序列化为 JSON
+	jsonBytes, err := json.Marshal(logMap)
+	if err != nil {
+		// 兜底输出
+		l.logger.Printf("[LOGGING_ERROR] level=%s msg=%s err=%v", level, msg, err)
+		return
+	}
+
+	// 输出单行 JSON 日志
+	l.logger.Println(string(jsonBytes))
+}