简单升级依赖

yyle88 · Feb 10, 2025 · 41330b0 · 41330b0
1 parent bfbeb67
commit 41330b0
Show file tree

Hide file tree

Showing 5 changed files with 34 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,36 +1,25 @@
-*.a
-*.so
+# If you prefer the allow list template instead of the deny list, see community template:
+# https://github.com/github/gitignore/blob/main/community/Golang/Go.AllowList.gitignore
+#
+# Binaries for programs and plugins
 *.exe
-*.pyc
-*.log
+*.exe~
 *.dll
-*.out
-*.key
-_test
+*.so
+*.dylib
+
+# Test binary, built with `go test -c`
 *.test
-*.cert
-*.exe~
+
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
+
+# Dependency directories (remove the comment below to include it)
+# vendor/
+
+# Go workspace file
 go.work
-.Trash-*
-.DS_Store
 go.work.sum
-main.out.bin
-*gitignore*secrets*
-*gitignore*outputs*
-ehthumbs.db
-Thumbs.db
-.gitkeep
-.vscode/
-*.dylib
-vendor/
-.idea/
-*.err
-*.swp
-_obj
-tmp/
-bin/
-tags
-*.DB
-*.db
-*.o
-*~
+
+# env file
+.env
diff --git a/check_func.go b/check_func.go
@@ -8,28 +8,28 @@ import (
 // Done 当err非空是就panic且打印调用栈信息
 func Done(err error) {
 	if err != nil {
-		zaplog.LOGS.P1.Panic("ERROR", zap.Error(err))
+		zaplog.LOGS.Skip1.Panic("ERROR", zap.Error(err))
 	}
 }
 
 // Must 当err非空是就panic且打印调用栈信息
 func Must(err error) {
 	if err != nil {
-		zaplog.LOGS.P1.Panic("ERROR", zap.Error(err))
+		zaplog.LOGS.Skip1.Panic("ERROR", zap.Error(err))
 	}
 }
 
 // Soft 当err非空是就打印warning日志且打印调用栈信息
 func Soft(err error) {
 	if err != nil {
-		zaplog.LOGS.P1.Warn("WARN", zap.Error(err))
+		zaplog.LOGS.Skip1.Warn("WARN", zap.Error(err))
 	}
 }
 
 // Fata 当出错时就是调用 log.Fatal 退出系统，当不出错时就不做任何事情
 // FaFaFaFaFa 哈哈哈哈哈
 func Fata(err error) {
 	if err != nil {
-		zaplog.LOGS.P1.Fatal("ERROR", zap.Error(err))
+		zaplog.LOGS.Skip1.Fatal("ERROR", zap.Error(err))
 	}
 }
diff --git a/check_vse.go b/check_vse.go
@@ -23,24 +23,24 @@ func VSE(val string, err error) *Vse {
 
 func (a *Vse) Equals(s string) {
 	if v := a.Done(); v != s {
-		zaplog.LOGS.P1.Panic("wrong", zap.String("v", v), zap.String("s", s))
+		zaplog.LOGS.Skip1.Panic("wrong", zap.String("v", v), zap.String("s", s))
 	}
 }
 
 func (a *Vse) HasPrefix(prefix string) {
 	if v := a.Done(); !strings.HasPrefix(v, prefix) {
-		zaplog.LOGS.P1.Panic("wrong", zap.String("v", v), zap.String("prefix", prefix))
+		zaplog.LOGS.Skip1.Panic("wrong", zap.String("v", v), zap.String("prefix", prefix))
 	}
 }
 
 func (a *Vse) HasSuffix(suffix string) {
 	if v := a.Done(); !strings.HasSuffix(v, suffix) {
-		zaplog.LOGS.P1.Panic("wrong", zap.String("v", v), zap.String("suffix", suffix))
+		zaplog.LOGS.Skip1.Panic("wrong", zap.String("v", v), zap.String("suffix", suffix))
 	}
 }
 
 func (a *Vse) Contains(sub string) {
 	if v := a.Done(); !strings.Contains(v, sub) {
-		zaplog.LOGS.P1.Panic("wrong", zap.String("v", v), zap.String("sub", sub))
+		zaplog.LOGS.Skip1.Panic("wrong", zap.String("v", v), zap.String("sub", sub))
 	}
 }
diff --git a/go.mod b/go.mod
@@ -5,14 +5,14 @@ go 1.22.6
 require (
 	github.com/pkg/errors v0.9.1
 	github.com/stretchr/testify v1.10.0
-	github.com/yyle88/zaplog v0.0.17
+	github.com/yyle88/zaplog v0.0.19
 	go.uber.org/zap v1.27.0
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
-	github.com/yyle88/mutexmap v1.0.9 // indirect
+	github.com/yyle88/mutexmap v1.0.10 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect

diff --git a/go.sum b/go.sum
@@ -12,10 +12,10 @@ github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU
 github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/yyle88/mutexmap v1.0.9 h1:g1nfNmsReU/AgcGkLgPEKrBeMThJJBrJuvU7i3DOVC0=
-github.com/yyle88/mutexmap v1.0.9/go.mod h1:QUYDuARLPlGj414kHewQ5tt8jkDxQXoai8H3C4Gg+yc=
-github.com/yyle88/zaplog v0.0.17 h1:2exjnXROfkNRvcKZDAFUM2KDpca1n2OKrEH73pTvrX0=
-github.com/yyle88/zaplog v0.0.17/go.mod h1:SJvxdHW7zWu1r+K66oBPBWljiGnDjCV8le3SzQnJpBw=
+github.com/yyle88/mutexmap v1.0.10 h1:PIsx9KTdK6h1yH5NzBrPl21RrZ/XsE4IbgulMlhJzZE=
+github.com/yyle88/mutexmap v1.0.10/go.mod h1:QUYDuARLPlGj414kHewQ5tt8jkDxQXoai8H3C4Gg+yc=
+github.com/yyle88/zaplog v0.0.19 h1:O4g7EO+uks7DkXbBXAje0LRvrBbkPuMD4gphuXw9jAo=
+github.com/yyle88/zaplog v0.0.19/go.mod h1:jN9/2IXYlpHOgoIyOTid1EPlUyGBWzFjr0dX9YKLkC0=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=