Detached

config/reader/json/json.go

@@ -4,11 +4,11 @@ import (
 	"errors"
 	"time"
 
+	"dario.cat/mergo"
 	"github.com/go-admin-team/go-admin-core/config/encoder"
 	"github.com/go-admin-team/go-admin-core/config/encoder/json"
 	"github.com/go-admin-team/go-admin-core/config/reader"
 	"github.com/go-admin-team/go-admin-core/config/source"
-	"github.com/imdario/mergo"
 )
 
 const readerTyp = "json"

config/source/env/env.go

@@ -6,8 +6,8 @@ import (
 	"strings"
 	"time"
 
+	"dario.cat/mergo"
 	"github.com/go-admin-team/go-admin-core/config/source"
-	"github.com/imdario/mergo"
 )
 
 var (
@@ -117,15 +117,16 @@ func (e *env) String() string {
 // Underscores are delimiters for nesting, and all keys are lowercased.
 //
 // Example:
-//      "DATABASE_SERVER_HOST=localhost" will convert to
 //
-//      {
-//          "database": {
-//              "server": {
-//                  "host": "localhost"
-//              }
-//          }
-//      }
+//	"DATABASE_SERVER_HOST=localhost" will convert to
+//
+//	{
+//	    "database": {
+//	        "server": {
+//	            "host": "localhost"
+//	        }
+//	    }
+//	}
 func NewSource(opts ...source.Option) source.Source {
 	options := source.NewOptions(opts...)
 

config/source/flag/flag.go

@@ -1,10 +1,10 @@
 package flag
 
 import (
+	"dario.cat/mergo"
 	"errors"
 	"flag"
 	"github.com/go-admin-team/go-admin-core/config/source"
-	"github.com/imdario/mergo"
 	"strings"
 	"time"
 )
@@ -89,13 +89,14 @@ func (fs *flagsrc) String() string {
 // Hyphens are delimiters for nesting, and all keys are lowercased.
 //
 // Example:
-//      dbhost := flag.String("database-host", "localhost", "the db host name")
 //
-//      {
-//          "database": {
-//              "host": "localhost"
-//          }
-//      }
+//	dbhost := flag.String("database-host", "localhost", "the db host name")
+//
+//	{
+//	    "database": {
+//	        "host": "localhost"
+//	    }
+//	}
 func NewSource(opts ...source.Option) source.Source {
 	return &flagsrc{opts: source.NewOptions(opts...)}
 }

debug/writer/file.go

@@ -14,6 +14,8 @@ import (
 // 用于文件名称格式
 const timeFormat = "2006-01-02"
 
+const MB = 1024 * 1024
+
 // FileWriter 文件写入结构体
 type FileWriter struct {
 	file         *os.File
@@ -78,16 +80,44 @@ func (p *FileWriter) write() {
 func (p *FileWriter) checkFile() {
 	info, _ := p.file.Stat()
 	if strings.Index(p.file.Name(), time.Now().Format(timeFormat)) < 0 ||
-		(p.opts.cap > 0 && uint(info.Size()) > p.opts.cap) {
+		(p.opts.cap > 0 && uint(info.Size()) > p.opts.cap*MB) {
 		//生成新文件
-		if uint(info.Size()) > p.opts.cap {
+		if uint(info.Size()) > p.opts.cap*MB {
 			p.num++
 		} else {
 			p.num = 0
 		}
 		filename := p.getFilename()
 		_ = p.file.Close()
 		p.file, _ = os.OpenFile(filename, os.O_WRONLY|os.O_APPEND|os.O_CREATE|os.O_SYNC, 0600)
+
+		dir := filepath.Dir(p.file.Name())
+		files, err := os.ReadDir(dir)
+		if err != nil {
+			fmt.Println("Error reading log directory:", err)
+			return
+		}
+
+		for _, file := range files {
+			if !file.IsDir() && strings.HasSuffix(file.Name(), p.opts.suffix) {
+				filePath := filepath.Join(dir, file.Name())
+				fileInfo, err := file.Info()
+				if err != nil {
+					fmt.Println("Error get Info file:", err)
+					break
+				}
+				fileModTime := fileInfo.ModTime()
+				daysSinceMod := uint(time.Since(fileModTime).Hours() / 24)
+				if daysSinceMod > p.opts.daysToKeep {
+					err := os.Remove(filePath)
+					if err != nil {
+						fmt.Println("Error deleting file:", err)
+					} else {
+						fmt.Println("Deleted file:", filePath)
+					}
+				}
+			}
+		}
 	}
 }
 

debug/writer/options.go

@@ -9,29 +9,31 @@ package writer
 
 // Options 可配置参数
 type Options struct {
-	path   string
-	suffix string //文件扩展名
-	cap    uint
+	path       string //文件路径
+	suffix     string //文件扩展名
+	daysToKeep uint   //保存天数
+	cap        uint   //文件大小
 }
 
 func setDefault() Options {
 	return Options{
-		path:   "/tmp/go-admin",
-		suffix: "log",
+		path:       "/tmp/go-admin",
+		suffix:     "log",
+		daysToKeep: 7,
 	}
 }
 
 // Option set options
 type Option func(*Options)
 
-// WithPath set path
+// WithPath 设置文件路径
 func WithPath(s string) Option {
 	return func(o *Options) {
 		o.path = s
 	}
 }
 
-// WithSuffix set suffix
+// WithSuffix 设置文件扩展名
 func WithSuffix(s string) Option {
 	return func(o *Options) {
 		o.suffix = s
@@ -44,3 +46,10 @@ func WithCap(n uint) Option {
 		o.cap = n
 	}
 }
+
+// WithDaysToKeep 设置文件保留天数
+func WithDaysToKeep(n uint) Option {
+	return func(o *Options) {
+		o.daysToKeep = n
+	}
+}

go.mod

@@ -1,84 +1,94 @@
 module github.com/go-admin-team/go-admin-core
 
-go 1.18
+go 1.21
 
 require (
-	github.com/BurntSushi/toml v0.3.1
-	github.com/bitly/go-simplejson v0.5.0
-	github.com/bsm/redislock v0.8.2
-	github.com/fsnotify/fsnotify v1.4.9
+	dario.cat/mergo v1.0.0
+	github.com/BurntSushi/toml v1.3.2
+	github.com/bitly/go-simplejson v0.5.1
+	github.com/bsm/redislock v0.9.4
+	github.com/fsnotify/fsnotify v1.7.0
 	github.com/ghodss/yaml v1.0.0
-	github.com/gin-gonic/gin v1.7.7
+	github.com/gin-gonic/gin v1.9.1
 	github.com/go-admin-team/redisqueue/v2 v2.0.0
-	github.com/go-redis/redis/v9 v9.0.0-rc.1
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
-	github.com/google/uuid v1.3.0
-	github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
+	github.com/google/uuid v1.5.0
+	github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
 	github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-	github.com/imdario/mergo v0.3.9
-	github.com/json-iterator/go v1.1.11
-	github.com/nsqio/go-nsq v1.0.8
+	github.com/json-iterator/go v1.1.12
+	github.com/nsqio/go-nsq v1.1.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.11.0
+	github.com/prometheus/client_golang v1.17.0
+	github.com/redis/go-redis/v9 v9.3.1
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	github.com/smartystreets/goconvey v1.6.4
-	github.com/spf13/cast v1.3.1
-	github.com/xuri/excelize/v2 v2.6.1
-	golang.org/x/crypto v0.0.0-20220817201139-bc19a97f63c8
-	google.golang.org/grpc v1.29.1
-	google.golang.org/protobuf v1.28.0
-	gorm.io/driver/mysql v1.4.4
-	gorm.io/gorm v1.24.2
-	gorm.io/plugin/dbresolver v1.3.0
+	github.com/smartystreets/goconvey v1.8.1
+	github.com/spf13/cast v1.5.1
+	github.com/xuri/excelize/v2 v2.8.0
+	golang.org/x/crypto v0.14.0
+	google.golang.org/grpc v1.59.0
+	google.golang.org/protobuf v1.31.0
+	gorm.io/driver/mysql v1.5.2
+	gorm.io/gorm v1.25.5
+	gorm.io/plugin/dbresolver v1.4.7
 )
 
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/bytedance/sonic v1.10.2 // indirect
+	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+	github.com/chenzhuoyu/iasm v0.9.0 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/fatih/color v1.7.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.2 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/git-chglog/git-chglog v0.0.0-20190611050339-63a4e637021f // indirect
-	github.com/go-playground/locales v0.13.0 // indirect
-	github.com/go-playground/universal-translator v0.17.0 // indirect
-	github.com/go-playground/validator/v10 v10.4.1 // indirect
-	github.com/go-sql-driver/mysql v1.6.0 // indirect
-	github.com/golang/protobuf v1.5.2 // 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.14.0 // indirect
+	github.com/go-sql-driver/mysql v1.7.0 // indirect
+	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.1 // indirect
-	github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 // indirect
+	github.com/gopherjs/gopherjs v1.17.2 // indirect
+	github.com/imdario/mergo v0.3.7 // indirect
 	github.com/jinzhu/inflection v1.0.0 // indirect
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/jtolds/gls v4.20.0+incompatible // indirect
 	github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect
-	github.com/leodido/go-urn v1.2.0 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.4 // indirect
+	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/mattn/go-colorable v0.1.7 // indirect
-	github.com/mattn/go-isatty v0.0.12 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/mattn/goveralls v0.0.2 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
 	github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.1 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
 	github.com/opentracing/opentracing-go v1.1.0 // indirect
-	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.26.0 // indirect
-	github.com/prometheus/procfs v0.6.0 // indirect
+	github.com/pelletier/go-toml/v2 v2.0.8 // indirect
+	github.com/prometheus/client_model v0.4.1-0.20230718164431-9a2bf3000d16 // indirect
+	github.com/prometheus/common v0.44.0 // indirect
+	github.com/prometheus/procfs v0.11.1 // indirect
 	github.com/richardlehane/mscfb v1.0.4 // indirect
 	github.com/richardlehane/msoleps v1.0.3 // indirect
-	github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d // indirect
+	github.com/smarty/assertions v1.15.0 // indirect
 	github.com/tsuyoshiwada/go-gitcmd v0.0.0-20180205145712-5f1f5f9475df // indirect
-	github.com/ugorji/go/codec v1.1.7 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.11 // indirect
 	github.com/urfave/cli v1.20.0 // indirect
-	github.com/xuri/efp v0.0.0-20220603152613-6918739fd470 // indirect
-	github.com/xuri/nfp v0.0.0-20220409054826-5e722a1d9e22 // indirect
-	golang.org/x/image v0.0.0-20220413100746-70e8d0d3baa9 // indirect
-	golang.org/x/net v0.0.0-20220812174116-3211cb980234 // indirect
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.12 // indirect
-	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
+	github.com/xuri/efp v0.0.0-20230802181842-ad255f2331ca // indirect
+	github.com/xuri/nfp v0.0.0-20230819163627-dc951e3ffe1a // indirect
+	golang.org/x/arch v0.3.0 // indirect
+	golang.org/x/image v0.11.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	golang.org/x/text v0.13.0 // indirect
+	golang.org/x/tools v0.7.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
 	gopkg.in/AlecAivazis/survey.v1 v1.8.5 // indirect
 	gopkg.in/kyokomi/emoji.v1 v1.5.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

logger/default.go

@@ -97,7 +97,7 @@ func (l *defaultLogger) logf(level Level, format string, v ...interface{}) {
 	fields := copyFields(l.opts.Fields)
 	l.RUnlock()
 
-	fields["level"] = level.String()
+	//fields["level"] = level.String()
 
 	if _, file, line, ok := runtime.Caller(l.opts.CallerSkipCount); ok && level.String() == "error" {
 		fields["file"] = fmt.Sprintf("%s:%d", logCallerfilePath(file), line)
@@ -134,16 +134,16 @@ func (l *defaultLogger) logf(level Level, format string, v ...interface{}) {
 	if l.opts.Name != "" {
 		name = "[" + l.opts.Name + "]"
 	}
-	t := rec.Timestamp.Format("2006-01-02 15:04:05.000Z0700")
-	//fmt.Printf("%s\n", t)
-	//fmt.Printf("%s\n", name)
-	//fmt.Printf("%s\n", metadata)
-	//fmt.Printf("%v\n", rec.Message)
+	timeFormat := "2006-01-02 15:04:05"
+	if l.opts.TimeFormat != "" {
+		timeFormat = l.opts.TimeFormat
+	}
+	t := rec.Timestamp.Format(timeFormat)
 	logStr := ""
 	if name == "" {
-		logStr = fmt.Sprintf("%s %s %v\n", t, metadata, rec.Message)
+		logStr = fmt.Sprintf("%s %s %s %v\n", t, level.String(), metadata, rec.Message)
 	} else {
-		logStr = fmt.Sprintf("%s %s %s %v\n", name, t, metadata, rec.Message)
+		logStr = fmt.Sprintf("%s %s %s %s %v\n", name, t, level.String(), metadata, rec.Message)
 	}
 	_, err := l.opts.Out.Write([]byte(logStr))
 	if err != nil {

logger/options.go

@@ -20,6 +20,8 @@ type Options struct {
 	Context context.Context
 	// Name logger name
 	Name string
+	// Timestamp.Format
+	TimeFormat string
 }
 
 // WithFields set default fields for the logger
@@ -29,6 +31,12 @@ func WithFields(fields map[string]interface{}) Option {
 	}
 }
 
+func RemoveFieldByKey(key string) Option {
+	return func(args *Options) {
+		delete(args.Fields, key)
+	}
+}
+
 // WithLevel set default level for the logger
 func WithLevel(level Level) Option {
 	return func(args *Options) {
@@ -57,6 +65,13 @@ func WithName(name string) Option {
 	}
 }
 
+// WithTimeFormat set time format for logger eg. 2006-01-02 15:04:05.000Z0700
+func WithTimeFormat(TimeFormat string) Option {
+	return func(args *Options) {
+		args.TimeFormat = TimeFormat
+	}
+}
+
 func SetOption(k, v interface{}) Option {
 	return func(o *Options) {
 		if o.Context == nil {