From f934472e507d7723dd2c9a45fd40d810bb058a7f Mon Sep 17 00:00:00 2001 From: yanweidong Date: Thu, 2 Oct 2025 18:06:23 +0800 Subject: [PATCH] fix logger,cache --- cache/redis/cache.go | 82 ++++++ cache/redis/redis.go | 2 + conf/types.go | 47 +++- database/elastic/elasticsearch.go | 6 +- go.mod | 90 ++++++- go.sum | 214 ++++++++++++++++ infra/logs.go | 2 +- logger/logger.go | 404 ++++++++++++++++++++++++++++++ utils/fmt.go | 34 +++ 9 files changed, 869 insertions(+), 12 deletions(-) create mode 100644 cache/redis/cache.go create mode 100644 logger/logger.go create mode 100644 utils/fmt.go diff --git a/cache/redis/cache.go b/cache/redis/cache.go new file mode 100644 index 0000000..dccf31a --- /dev/null +++ b/cache/redis/cache.go @@ -0,0 +1,82 @@ +package redis + +import ( + "encoding/json" + "fmt" + "time" + + "git.apinb.com/bsm-sdk/core/errcode" +) + +const ( + // 缓存键前缀 + CacheKeyPrefix = "bsm:" + + // 缓存过期时间 + DefaultTTL = 30 * time.Minute // 30分钟 +) + +// buildKey 构建缓存键 +func (c *RedisClient) buildKey(prefix string, params ...interface{}) string { + key := CacheKeyPrefix + prefix + for _, param := range params { + key += fmt.Sprintf(":%v", param) + } + return key +} + +// Get 获取缓存 +func (c *RedisClient) Get(key string, result interface{}) error { + if c.Client == nil { + return errcode.ErrRedis + } + + data, err := c.Client.Get(c.Ctx, key).Result() + if err != nil { + return errcode.NewError(500, err.Error()) + } + + return json.Unmarshal([]byte(data), result) +} + +// Set 设置缓存 +func (c *RedisClient) Set(key string, value interface{}, ttl time.Duration) error { + if c.Client == nil { + return errcode.ErrRedis + } + + data, err := json.Marshal(value) + if err != nil { + return errcode.NewError(500, err.Error()) + } + + return c.Client.Set(c.Ctx, key, data, ttl).Err() +} + +// Delete 删除缓存 +func (c *RedisClient) Delete(key string) error { + if c.Client == nil { + return errcode.ErrRedis + } + + return c.Client.Del(c.Ctx, key).Err() +} + +// ClearAllCache 清除所有缓存 +func (c *RedisClient) ClearAllCache() error { + if c.Client == nil { + return errcode.ErrRedis + } + + pattern := CacheKeyPrefix + "*" + keys, err := c.Client.Keys(c.Ctx, pattern).Result() + if err != nil { + return errcode.NewError(500, err.Error()) + } + + if len(keys) > 0 { + return c.Client.Del(c.Ctx, keys...).Err() + } + + return nil +} diff --git a/cache/redis/redis.go b/cache/redis/redis.go index f1a6f0c..5a55333 100644 --- a/cache/redis/redis.go +++ b/cache/redis/redis.go @@ -20,6 +20,7 @@ type RedisClient struct { DB int Client *cacheRedis.Client Ctx context.Context + memory map[string]any } func New(dsn string, hashRadix string) *RedisClient { @@ -54,6 +55,7 @@ func New(dsn string, hashRadix string) *RedisClient { DB: db, Client: client, Ctx: context.Background(), + memory: make(map[string]any), } } diff --git a/conf/types.go b/conf/types.go index 6b053f3..4cc8e40 100644 --- a/conf/types.go +++ b/conf/types.go @@ -1,13 +1,14 @@ package conf type Base struct { - Service string `yaml:"Service"` // 服务名称 - Port string `yaml:"Port"` // 服务监听端口,0为自动随机端口 - Cache string `yaml:"Cache"` // REDIS缓存 - SecretKey string `yaml:"SecretKey"` // 服务秘钥 - BindIP string `yaml:"BindIP"` // 绑定IP - Addr string `yaml:"Addr"` - OnMicroService bool `yaml:"OnMicroService"` + Service string `yaml:"Service"` // 服务名称 + Port string `yaml:"Port"` // 服务监听端口,0为自动随机端口 + Cache string `yaml:"Cache"` // REDIS缓存 + SecretKey string `yaml:"SecretKey"` // 服务秘钥 + BindIP string `yaml:"BindIP"` // 绑定IP + Addr string `yaml:"Addr"` + Log *LogConf `yaml:"Log"` // 日志配置 + OnMicroService bool `yaml:"OnMicroService"` } type DBConf struct { @@ -69,3 +70,35 @@ type TlsConf struct { CertFile string // 证书文件路径 KeyFile string // 密钥文件路径 } + +type WebSocketConf struct { + ReadBufferSize int `yaml:"ReadBufferSize"` + WriteBufferSize int `yaml:"WriteBufferSize"` + CheckOrigin bool `yaml:"CheckOrigin"` + PingPeriod string `yaml:"PingPeriod"` + PongWait string `yaml:"PongWait"` + WriteWait string `yaml:"WriteWait"` + MaxMessageSize int64 `yaml:"MaxMessageSize"` + HandshakeTimeout string `yaml:"HandshakeTimeout"` +} + +// LogLevel 日志级别 +type LogLevel int + +const ( + DEBUG LogLevel = iota + INFO + WARN + ERROR + FATAL +) + +type LogConf struct { + Name string `yaml:"Name"` + Level LogLevel `yaml:"Level"` + Dir string `yaml:"Dir"` + Endpoint string `yaml:"Endpoint"` + Console bool `yaml:"Console"` + File bool `yaml:"File"` + Remote bool `yaml:"Remote"` +} diff --git a/database/elastic/elasticsearch.go b/database/elastic/elasticsearch.go index 00c0296..dbbefa5 100644 --- a/database/elastic/elasticsearch.go +++ b/database/elastic/elasticsearch.go @@ -9,9 +9,9 @@ import ( "time" "git.apinb.com/bsm-sdk/core/vars" - "github.com/elastic/go-elasticsearch/v8" - "github.com/elastic/go-elasticsearch/v8/esapi" - "github.com/elastic/go-elasticsearch/v8/esutil" + "github.com/elastic/go-elasticsearch/v9" + "github.com/elastic/go-elasticsearch/v9/esapi" + "github.com/elastic/go-elasticsearch/v9/esutil" ) type ES struct { diff --git a/go.mod b/go.mod index fe911a9..83cc9ab 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,91 @@ module git.apinb.com/bsm-sdk/core -go 1.24 +go 1.24.6 + +require ( + github.com/allegro/bigcache/v3 v3.1.0 + github.com/elastic/go-elasticsearch/v9 v9.1.0 + github.com/gin-contrib/cors v1.7.6 + github.com/gin-gonic/gin v1.11.0 + github.com/google/uuid v1.6.0 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 + github.com/nats-io/nats.go v1.46.1 + github.com/oklog/ulid/v2 v2.1.1 + github.com/redis/go-redis/v9 v9.14.0 + github.com/shirou/gopsutil v3.21.11+incompatible + go.etcd.io/etcd/client/pkg/v3 v3.6.5 + go.etcd.io/etcd/client/v3 v3.6.5 + google.golang.org/grpc v1.75.1 + gopkg.in/yaml.v3 v3.0.1 + gorm.io/driver/mysql v1.6.0 + gorm.io/driver/postgres v1.6.0 + gorm.io/gorm v1.31.0 +) + +require ( + filippo.io/edwards25519 v1.1.0 // indirect + github.com/bytedance/gopkg v0.1.3 // indirect + github.com/bytedance/sonic v1.14.1 // indirect + github.com/bytedance/sonic/loader v0.3.0 // indirect + github.com/cespare/xxhash/v2 v2.3.0 // 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.6.0 // indirect + github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect + github.com/elastic/elastic-transport-go/v8 v8.7.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.10 // indirect + github.com/gin-contrib/sse v1.1.0 // indirect + github.com/go-logr/logr v1.4.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.27.0 // indirect + github.com/go-sql-driver/mysql v1.9.3 // indirect + github.com/goccy/go-json v0.10.5 // indirect + github.com/goccy/go-yaml v1.18.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.7.6 // indirect + github.com/jackc/puddle/v2 v2.2.2 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/compress v1.18.0 // indirect + github.com/klauspost/cpuid/v2 v2.3.0 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/nats-io/nkeys v0.4.11 // indirect + github.com/nats-io/nuid v1.0.1 // indirect + github.com/pelletier/go-toml/v2 v2.2.4 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.54.1 // indirect + github.com/tklauser/go-sysconf v0.3.15 // indirect + github.com/tklauser/numcpus v0.10.0 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.3.0 // indirect + github.com/yusufpapurcu/wmi v1.2.4 // indirect + go.etcd.io/etcd/api/v3 v3.6.5 // indirect + go.opentelemetry.io/auto/sdk v1.2.1 // indirect + go.opentelemetry.io/otel v1.38.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect + go.uber.org/mock v0.6.0 // indirect + go.uber.org/multierr v1.11.0 // indirect + go.uber.org/zap v1.27.0 // indirect + golang.org/x/arch v0.21.0 // indirect + golang.org/x/crypto v0.42.0 // indirect + golang.org/x/mod v0.28.0 // indirect + golang.org/x/net v0.44.0 // indirect + golang.org/x/sync v0.17.0 // indirect + golang.org/x/sys v0.36.0 // indirect + golang.org/x/text v0.29.0 // indirect + golang.org/x/tools v0.37.0 // indirect + google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 // indirect + google.golang.org/protobuf v1.36.10 // indirect +) diff --git a/go.sum b/go.sum index e69de29..dd99af6 100644 --- a/go.sum +++ b/go.sum @@ -0,0 +1,214 @@ +filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= +filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= +github.com/allegro/bigcache/v3 v3.1.0 h1:H2Vp8VOvxcrB91o86fUSVJFqeuz8kpyyB02eH3bSzwk= +github.com/allegro/bigcache/v3 v3.1.0/go.mod h1:aPyh7jEvrog9zAwx5N7+JUQX5dZTSGpxF1LAR4dr35I= +github.com/bytedance/gopkg v0.1.3 h1:TPBSwH8RsouGCBcMBktLt1AymVo2TVsBVCY4b6TnZ/M= +github.com/bytedance/gopkg v0.1.3/go.mod h1:576VvJ+eJgyCzdjS+c4+77QF3p7ubbtiKARP3TxducM= +github.com/bytedance/sonic v1.14.1 h1:FBMC0zVz5XUmE4z9wF4Jey0An5FueFvOsTKKKtwIl7w= +github.com/bytedance/sonic v1.14.1/go.mod h1:gi6uhQLMbTdeP0muCnrjHLeCUPyb70ujhnNlhOylAFc= +github.com/bytedance/sonic/loader v0.3.0 h1:dskwH8edlzNMctoruo8FPTJDF3vLtDT0sXZwvZJyqeA= +github.com/bytedance/sonic/loader v0.3.0/go.mod h1:N8A3vUdtUebEY2/VQC0MyhYeKUFosQU6FxH2JmUe6VI= +github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs= +github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cloudwego/base64x v0.1.6 h1:t11wG9AECkCDk5fMSoxmufanudBtJ+/HemLstXDLI2M= +github.com/cloudwego/base64x v0.1.6/go.mod h1:OFcloc187FXDaYHvrNIjxSe8ncn0OOM8gEHfghB2IPU= +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.6.0 h1:aGVa/v8B7hpb0TKl0MWoAavPDmHvobFe5R5zn0bCJWo= +github.com/coreos/go-systemd/v22 v22.6.0/go.mod h1:iG+pp635Fo7ZmV/j14KUcmEyWF+0X7Lua8rrTWzYgWU= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78= +github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc= +github.com/elastic/elastic-transport-go/v8 v8.7.0 h1:OgTneVuXP2uip4BA658Xi6Hfw+PeIOod2rY3GVMGoVE= +github.com/elastic/elastic-transport-go/v8 v8.7.0/go.mod h1:YLHer5cj0csTzNFXoNQ8qhtGY1GTvSqPnKWKaqQE3Hk= +github.com/elastic/go-elasticsearch/v9 v9.1.0 h1:+qmeMi+Zuyc/BzTWxHUouGJX5aF567IA2De7OoDgagE= +github.com/elastic/go-elasticsearch/v9 v9.1.0/go.mod h1:2PB5YQPpY5tWbF65MRqzEXA31PZOdXCkloQSOZtU14I= +github.com/gabriel-vasile/mimetype v1.4.10 h1:zyueNbySn/z8mJZHLt6IPw0KoZsiQNszIpU+bX4+ZK0= +github.com/gabriel-vasile/mimetype v1.4.10/go.mod h1:d+9Oxyo1wTzWdyVUPMmXFvp4F9tea18J8ufA774AB3s= +github.com/gin-contrib/cors v1.7.6 h1:3gQ8GMzs1Ylpf70y8bMw4fVpycXIeX1ZemuSQIsnQQY= +github.com/gin-contrib/cors v1.7.6/go.mod h1:Ulcl+xN4jel9t1Ry8vqph23a60FwH9xVLd+3ykmTjOk= +github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w= +github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM= +github.com/gin-gonic/gin v1.11.0 h1:OW/6PLjyusp2PPXtyxKHU0RbX6I/l28FTdDlae5ueWk= +github.com/gin-gonic/gin v1.11.0/go.mod h1:+iq/FyxlGzII0KHiBGjuNn4UNENUlKbGlNmc+W50Dls= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.27.0 h1:w8+XrWVMhGkxOaaowyKH35gFydVHOvC0/uWoy2Fzwn4= +github.com/go-playground/validator/v10 v10.27.0/go.mod h1:I5QpIEbmr8On7W0TktmJAumgzX4CA1XNl4ZmDuVHKKo= +github.com/go-sql-driver/mysql v1.9.3 h1:U/N249h2WzJ3Ukj8SowVFjdtZKfu9vlLZxjPXV1aweo= +github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU= +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/goccy/go-yaml v1.18.0 h1:8W7wMFS12Pcas7KU+VVkaiCng+kG8QiFeFwzFb+rwuw= +github.com/goccy/go-yaml v1.18.0/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 h1:8Tjv8EJ+pM1xP8mK6egEbD1OgnVTyacbefKhmbLhIhU= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2/go.mod h1:pkJQ2tZHJ0aFOVEEot6oZmaVEZcRme73eIFmhiVuRWs= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.7.6 h1:rWQc5FwZSPX58r1OQmkuaNicxdmExaEz5A2DO2hUuTk= +github.com/jackc/pgx/v5 v5.7.6/go.mod h1:aruU7o91Tc2q2cFp5h4uP3f6ztExVpyVv88Xl/8Vl8M= +github.com/jackc/puddle/v2 v2.2.2 h1:PR8nw+E/1w0GLuRFSmiioY6UooMp6KJv0/61nB7icHo= +github.com/jackc/puddle/v2 v2.2.2/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.18.0 h1:c/Cqfb0r+Yi+JtIEq73FWXVkRonBlf0CRNYc8Zttxdo= +github.com/klauspost/compress v1.18.0/go.mod h1:2Pp+KzxcywXVXMr50+X0Q/Lsb43OQHYWRCY2AiWywWQ= +github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= +github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/nats-io/nats.go v1.46.1 h1:bqQ2ZcxVd2lpYI97xYASeRTY3I5boe/IVmuUDPitHfo= +github.com/nats-io/nats.go v1.46.1/go.mod h1:iRWIPokVIFbVijxuMQq4y9ttaBTMe0SFdlZfMDd+33g= +github.com/nats-io/nkeys v0.4.11 h1:q44qGV008kYd9W1b1nEBkNzvnWxtRSQ7A8BoqRrcfa0= +github.com/nats-io/nkeys v0.4.11/go.mod h1:szDimtgmfOi9n25JpfIdGw12tZFYXqhGxjhVxsatHVE= +github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/oklog/ulid/v2 v2.1.1 h1:suPZ4ARWLOJLegGFiZZ1dFAkqzhMjL3J1TzI+5wHz8s= +github.com/oklog/ulid/v2 v2.1.1/go.mod h1:rcEKHmBBKfef9DhnvX7y1HZBYxjXb0cP5ExxNsTT1QQ= +github.com/pborman/getopt v0.0.0-20170112200414-7148bc3a4c30/go.mod h1:85jBQOZwpVEaDAr341tbn15RS4fCAsIst0qp7i8ex1o= +github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= +github.com/pelletier/go-toml/v2 v2.2.4/go.mod h1:2gIqNv+qfxSVS7cM2xJQKtLSTLUE9V8t9Stt+h56mCY= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/quic-go/qpack v0.5.1 h1:giqksBPnT/HDtZ6VhtFKgoLOWmlyo9Ei6u9PqzIMbhI= +github.com/quic-go/qpack v0.5.1/go.mod h1:+PC4XFrEskIVkcLzpEkbLqq1uCoxPhQuvK5rH1ZgaEg= +github.com/quic-go/quic-go v0.54.1 h1:4ZAWm0AhCb6+hE+l5Q1NAL0iRn/ZrMwqHRGQiFwj2eg= +github.com/quic-go/quic-go v0.54.1/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= +github.com/redis/go-redis/v9 v9.14.0 h1:u4tNCjXOyzfgeLN+vAZaW1xUooqWDqVEsZN0U01jfAE= +github.com/redis/go-redis/v9 v9.14.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw= +github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= +github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/tklauser/go-sysconf v0.3.15 h1:VE89k0criAymJ/Os65CSn1IXaol+1wrsFHEB8Ol49K4= +github.com/tklauser/go-sysconf v0.3.15/go.mod h1:Dmjwr6tYFIseJw7a3dRLJfsHAMXZ3nEnL/aZY+0IuI4= +github.com/tklauser/numcpus v0.10.0 h1:18njr6LDBk1zuna922MgdjQuJFjrdppsZG60sHGfjso= +github.com/tklauser/numcpus v0.10.0/go.mod h1:BiTKazU708GQTYF4mB+cmlpT2Is1gLk7XVuEeem8LsQ= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA= +github.com/ugorji/go/codec v1.3.0/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= +github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +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.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64= +go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= +go.uber.org/mock v0.6.0 h1:hyF9dfmbgIX5EfOdasqLsWD6xqpNZlXblLB/Dbnwv3Y= +go.uber.org/mock v0.6.0/go.mod h1:KiVJ4BqZJaMj4svdfmHM0AUx4NJYO8ZNpPnZn1Z+BBU= +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.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= +go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= +golang.org/x/arch v0.21.0 h1:iTC9o7+wP6cPWpDWkivCvQFGAHDQ59SrSxsLPcnkArw= +golang.org/x/arch v0.21.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.42.0 h1:chiH31gIWm57EkTXpwnqf8qeuMUi0yekh6mT2AvFlqI= +golang.org/x/crypto v0.42.0/go.mod h1:4+rDnOTJhQCx2q7/j6rAN5XDw8kPjeaXEUR2eL94ix8= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U= +golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.44.0 h1:evd8IRDyfNBMBTTY5XRF1vaZlD+EmWx6x8PkhR04H/I= +golang.org/x/net v0.44.0/go.mod h1:ECOoLqd5U3Lhyeyo/QDCEVQ4sNgYsqvCZ722XogGieY= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug= +golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.36.0 h1:KVRy2GtZBrk1cBYA7MKu5bEZFxQk4NIDV6RLVcC8o0k= +golang.org/x/sys v0.36.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.29.0 h1:1neNs90w9YzJ9BocxfsQNHKuAT4pkghyXc4nhZ6sJvk= +golang.org/x/text v0.29.0/go.mod h1:7MhJOA9CD2qZyOKYazxdYMF85OwPdEr9jTtBpO7ydH4= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE= +golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4 h1:8XJ4pajGwOlasW+L13MnEGA8W4115jJySQtVfS2/IBU= +google.golang.org/genproto/googleapis/api v0.0.0-20250929231259-57b25ae835d4/go.mod h1:NnuHhy+bxcg30o7FnVAZbXsPHUDQ9qKWAQKCD7VxFtk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4 h1:i8QOKZfYg6AbGVZzUAY3LrNWCKF8O6zFisU9Wl9RER4= +google.golang.org/genproto/googleapis/rpc v0.0.0-20250929231259-57b25ae835d4/go.mod h1:HSkG/KdJWusxU1F6CNrwNDjBMgisKxGnc5dAZfT0mjQ= +google.golang.org/grpc v1.75.1 h1:/ODCNEuf9VghjgO3rqLcfg8fiOP0nSluljWFlDxELLI= +google.golang.org/grpc v1.75.1/go.mod h1:JtPAzKiq4v1xcAB2hydNlWI2RnF85XXcV0mhKXr2ecQ= +google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE= +google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/mysql v1.6.0 h1:eNbLmNTpPpTOVZi8MMxCi2aaIm0ZpInbORNXDwyLGvg= +gorm.io/driver/mysql v1.6.0/go.mod h1:D/oCC2GWK3M/dqoLxnOlaNKmXz8WNTfcS9y5ovaSqKo= +gorm.io/driver/postgres v1.6.0 h1:2dxzU8xJ+ivvqTRph34QX+WrRaJlmfyPqXmoGVjMBa4= +gorm.io/driver/postgres v1.6.0/go.mod h1:vUw0mrGgrTK+uPHEhAdV4sfFELrByKVGnaVRkXDhtWo= +gorm.io/gorm v1.31.0 h1:0VlycGreVhK7RF/Bwt51Fk8v0xLiiiFdbGDPIZQ7mJY= +gorm.io/gorm v1.31.0/go.mod h1:XyQVbO2k6YkOis7C2437jSit3SsDK72s7n7rsSHd+Gs= diff --git a/infra/logs.go b/infra/logs.go index 4a70f1c..ac74cb7 100644 --- a/infra/logs.go +++ b/infra/logs.go @@ -29,7 +29,7 @@ var ( Type_Create string = "create" ) -func NewLogs(endpoint string, data []*LogItem) { +func PushLog(endpoint string, data []*LogItem) { jsonBytes, _ := json.Marshal(data) go utils.HttpPost(endpoint, nil, jsonBytes) diff --git a/logger/logger.go b/logger/logger.go new file mode 100644 index 0000000..c953373 --- /dev/null +++ b/logger/logger.go @@ -0,0 +1,404 @@ +package logger + +import ( + "encoding/json" + "fmt" + "io" + "log" + "os" + "path/filepath" + "strings" + "sync" + "time" + + "git.apinb.com/bsm-sdk/core/conf" + "git.apinb.com/bsm-sdk/core/utils" +) + +// Logger 日志器结构 +type Logger struct { + level conf.LogLevel + infoLogger *log.Logger + warnLogger *log.Logger + errorLogger *log.Logger + fatalLogger *log.Logger + debugLogger *log.Logger + + fileWriter io.Writer + consoleWriter io.Writer + + mu sync.RWMutex + name string + logDir string + currentDate string + onRemote bool + endpoint string +} + +var ( + globalLogger *Logger + once sync.Once +) + +// InitLogger 初始化全局日志器 +func InitLogger(cfg *conf.LogConf) error { + var err error + once.Do(func() { + globalLogger, err = NewLogger(cfg) + }) + return err +} + +// NewLogger 创建新的日志器 +func NewLogger(cfg *conf.LogConf) (*Logger, error) { + // 确保日志目录存在 + if err := os.MkdirAll(cfg.Dir, 0755); err != nil { + return nil, fmt.Errorf("创建日志目录失败: %v", err) + } + + // 控制台输出 + consoleWriter := os.Stdout + + // 文件输出 + fileWriter, err := createLogFile(cfg.Dir, cfg.Name) + if err != nil { + return nil, fmt.Errorf("创建日志文件失败: %v", err) + } + + // 创建多输出写入器 + multiWriter := io.MultiWriter(consoleWriter, fileWriter) + + logger := &Logger{ + level: conf.LogLevel(cfg.Level), + fileWriter: fileWriter, + consoleWriter: consoleWriter, + logDir: cfg.Dir, + name: strings.ToLower(cfg.Name), + currentDate: time.Now().Format("2006-01-02"), + onRemote: cfg.Remote, + endpoint: cfg.Endpoint, + } + + // 创建不同级别的日志器 + logger.infoLogger = log.New(multiWriter, "[INFO] ", log.LstdFlags) + logger.warnLogger = log.New(multiWriter, "[WARN] ", log.LstdFlags) + logger.errorLogger = log.New(multiWriter, "[ERROR] ", log.LstdFlags) + logger.fatalLogger = log.New(multiWriter, "[FATAL] ", log.LstdFlags) + logger.debugLogger = log.New(multiWriter, "[DEBUG] ", log.LstdFlags) + + return logger, nil +} + +// createLogFile 创建日志文件 +func createLogFile(logDir, name string) (io.Writer, error) { + filename := fmt.Sprintf("%s_%s.log", name, time.Now().Format("2006-01-02")) + filepath := filepath.Join(logDir, filename) + + file, err := os.OpenFile(filepath, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666) + if err != nil { + return nil, err + } + + return file, nil +} + +// checkAndRotateLog 检查并轮转日志文件 +func (l *Logger) checkAndRotateLog() error { + today := time.Now().Format("2006-01-02") + if l.currentDate != today { + l.mu.Lock() + defer l.mu.Unlock() + + if l.currentDate != today { + // 关闭旧文件 + if closer, ok := l.fileWriter.(io.Closer); ok { + closer.Close() + } + + // 创建新文件 + newFileWriter, err := createLogFile(l.logDir, l.name) + if err != nil { + return err + } + + l.fileWriter = newFileWriter + l.currentDate = today + + // 重新创建多输出写入器 + multiWriter := io.MultiWriter(l.consoleWriter, l.fileWriter) + + l.infoLogger = log.New(multiWriter, "[INFO] ", log.LstdFlags) + l.warnLogger = log.New(multiWriter, "[WARN] ", log.LstdFlags) + l.errorLogger = log.New(multiWriter, "[ERROR] ", log.LstdFlags) + l.fatalLogger = log.New(multiWriter, "[FATAL] ", log.LstdFlags) + l.debugLogger = log.New(multiWriter, "[DEBUG] ", log.LstdFlags) + } + } + return nil +} + +func (l *Logger) sendToRemote(level, name, out string) { + if l.endpoint == "" { + return + } + data := map[string]interface{}{ + "level": level, + "name": name, + "out": out, + } + jsonBytes, _ := json.Marshal(data) + utils.HttpPost(l.endpoint, nil, jsonBytes) +} + +// Debug 输出调试信息 +func (l *Logger) Debug(v ...interface{}) { + if l.level <= conf.DEBUG { + l.checkAndRotateLog() + out := fmt.Sprint(v...) + if l.onRemote { + go l.sendToRemote("DEBUG", l.name, out) + } + l.debugLogger.Output(2, out) + } +} + +// Debugf 格式化输出调试信息 +func (l *Logger) Debugf(format string, v ...interface{}) { + if l.level <= conf.DEBUG { + l.checkAndRotateLog() + out := fmt.Sprintf(format, v...) + if l.onRemote { + go l.sendToRemote("DEBUG", l.name, out) + } + l.debugLogger.Output(2, out) + } +} + +// Info 输出信息 +func (l *Logger) Info(v ...interface{}) { + if l.level <= conf.INFO { + l.checkAndRotateLog() + out := fmt.Sprint(v...) + if l.onRemote { + go l.sendToRemote("INFO", l.name, out) + } + l.infoLogger.Output(2, out) + } +} + +// Infof 格式化输出信息 +func (l *Logger) Infof(format string, v ...interface{}) { + if l.level <= conf.INFO { + l.checkAndRotateLog() + out := fmt.Sprintf(format, v...) + if l.onRemote { + go l.sendToRemote("INFO", l.name, out) + } + l.infoLogger.Output(2, out) + } +} + +// Warn 输出警告 +func (l *Logger) Warn(v ...interface{}) { + if l.level <= conf.WARN { + l.checkAndRotateLog() + out := fmt.Sprint(v...) + if l.onRemote { + go l.sendToRemote("WARN", l.name, out) + } + l.warnLogger.Output(2, out) + } +} + +// Warnf 格式化输出警告 +func (l *Logger) Warnf(format string, v ...interface{}) { + if l.level <= conf.WARN { + l.checkAndRotateLog() + out := fmt.Sprintf(format, v...) + if l.onRemote { + go l.sendToRemote("WARN", l.name, out) + } + l.warnLogger.Output(2, out) + } +} + +// Error 输出错误 +func (l *Logger) Error(v ...interface{}) { + if l.level <= conf.ERROR { + l.checkAndRotateLog() + out := fmt.Sprint(v...) + if l.onRemote { + go l.sendToRemote("ERROR", l.name, out) + } + l.errorLogger.Output(2, out) + } +} + +// Errorf 格式化输出错误 +func (l *Logger) Errorf(format string, v ...interface{}) { + if l.level <= conf.ERROR { + l.checkAndRotateLog() + out := fmt.Sprintf(format, v...) + if l.onRemote { + go l.sendToRemote("ERROR", l.name, out) + } + l.errorLogger.Output(2, out) + } +} + +// Fatal 输出致命错误并退出程序 +func (l *Logger) Fatal(v ...interface{}) { + l.checkAndRotateLog() + out := fmt.Sprint(v...) + if l.onRemote { + go l.sendToRemote("FATAL", l.name, out) + } + l.fatalLogger.Output(2, out) + os.Exit(1) +} + +// Fatalf 格式化输出致命错误并退出程序 +func (l *Logger) Fatalf(format string, v ...interface{}) { + l.checkAndRotateLog() + out := fmt.Sprintf(format, v...) + if l.onRemote { + go l.sendToRemote("FATAL", l.name, out) + } + l.fatalLogger.Output(2, out) + os.Exit(1) +} + +// Print 输出信息（兼容标准log包） +func (l *Logger) Print(v ...interface{}) { + l.Info(v...) +} + +// Printf 格式化输出信息（兼容标准log包） +func (l *Logger) Printf(format string, v ...interface{}) { + l.Infof(format, v...) +} + +// Println 输出信息并换行（兼容标准log包） +func (l *Logger) Println(v ...interface{}) { + l.Info(v...) +} + +// SetLevel 设置日志级别 +func (l *Logger) SetLevel(level conf.LogLevel) { + l.mu.Lock() + defer l.mu.Unlock() + l.level = level +} + +// GetLevel 获取日志级别 +func (l *Logger) GetLevel() conf.LogLevel { + l.mu.RLock() + defer l.mu.RUnlock() + return l.level +} + +// Close 关闭日志器 +func (l *Logger) Close() error { + if closer, ok := l.fileWriter.(io.Closer); ok { + return closer.Close() + } + return nil +} + +// 全局日志函数（兼容标准log包） + +// Debug 全局调试日志 +func Debug(v ...interface{}) { + if globalLogger != nil { + globalLogger.Debug(v...) + } +} + +// Debugf 全局调试日志 +func Debugf(format string, v ...interface{}) { + if globalLogger != nil { + globalLogger.Debugf(format, v...) + } +} + +// Info 全局信息日志 +func Info(v ...interface{}) { + if globalLogger != nil { + globalLogger.Info(v...) + } +} + +// Infof 全局信息日志 +func Infof(format string, v ...interface{}) { + if globalLogger != nil { + globalLogger.Infof(format, v...) + } +} + +// Warn 全局警告日志 +func Warn(v ...interface{}) { + if globalLogger != nil { + globalLogger.Warn(v...) + } +} + +// Warnf 全局警告日志 +func Warnf(format string, v ...interface{}) { + if globalLogger != nil { + globalLogger.Warnf(format, v...) + } +} + +// Error 全局错误日志 +func Error(v ...interface{}) { + if globalLogger != nil { + globalLogger.Error(v...) + } +} + +// Errorf 全局错误日志 +func Errorf(format string, v ...interface{}) { + if globalLogger != nil { + globalLogger.Errorf(format, v...) + } +} + +// Fatal 全局致命错误日志 +func Fatal(v ...interface{}) { + if globalLogger != nil { + globalLogger.Fatal(v...) + } +} + +// Fatalf 全局致命错误日志 +func Fatalf(format string, v ...interface{}) { + if globalLogger != nil { + globalLogger.Fatalf(format, v...) + } +} + +// Print 全局打印日志（兼容标准log包） +func Print(v ...interface{}) { + if globalLogger != nil { + globalLogger.Print(v...) + } +} + +// Printf 全局打印日志（兼容标准log包） +func Printf(format string, v ...interface{}) { + if globalLogger != nil { + globalLogger.Printf(format, v...) + } +} + +// Println 全局打印日志（兼容标准log包） +func Println(v ...interface{}) { + if globalLogger != nil { + globalLogger.Println(v...) + } +} + +// GetLogger 获取全局日志器实例 +func GetLogger() *Logger { + return globalLogger +} diff --git a/utils/fmt.go b/utils/fmt.go new file mode 100644 index 0000000..6988c26 --- /dev/null +++ b/utils/fmt.go @@ -0,0 +1,34 @@ +package utils + +import ( + "strconv" + "strings" +) + +func FloatRoundString(in float64, place int) string { + + return Float64ToString(FloatRound(in, place)) +} + +func FloatRound(in float64, place int) float64 { + // 限制 place 范围在合理区间 + if place < 0 { + place = 0 + } + + // 使用 strconv.FormatFloat 直接格式化，避免多次条件判断 + str := strconv.FormatFloat(in, 'f', place, 64) + num, _ := strconv.ParseFloat(str, 64) + return num +} + +func RateToFloat64(s string) float64 { + // 去掉百分号 + s = strings.TrimSuffix(s, "%") + // 转换为 float64 + f, err := strconv.ParseFloat(s, 64) + if err != nil { + return 0 + } + return f / 100 +}