diff --git a/go.mod b/go.mod index 187529a..512fe4e 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.24.0 require ( github.com/apolloconfig/agollo/v4 v4.4.0 - github.com/ayflying/excel2json v1.1.8 + github.com/ayflying/excel2json v1.1.9 github.com/elastic/go-elasticsearch/v8 v8.18.0 github.com/go-pay/crypto v0.0.1 github.com/go-pay/gopay v1.5.109 diff --git a/go.sum b/go.sum index 12f0fb7..a6a3f74 100644 --- a/go.sum +++ b/go.sum @@ -50,9 +50,8 @@ github.com/apolloconfig/agollo/v4 v4.4.0/go.mod h1:6WjI68IzqMk/Y6ghMtrj5AX6Uewo2 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/ayflying/excel2json v1.1.7 h1:gp4Ls6hNXd1EuT2MEiDQ6yPLaSKIFWkGyaNajMTc59c= -github.com/ayflying/excel2json v1.1.7/go.mod h1:GjXYP2cDzeTgQxssQ3ba8QRa9JsScAeJMwCrZ7QTlQo= -github.com/ayflying/excel2json v1.1.8/go.mod h1:GjXYP2cDzeTgQxssQ3ba8QRa9JsScAeJMwCrZ7QTlQo= +github.com/ayflying/excel2json v1.1.9 h1:AKaUFc/FNQXV/53/VSgp3J+2d4PMWhVpTDRj/yx3VOs= +github.com/ayflying/excel2json v1.1.9/go.mod h1:GjXYP2cDzeTgQxssQ3ba8QRa9JsScAeJMwCrZ7QTlQo= github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= diff --git a/pkg/aycache/drive/file.go b/pkg/aycache/drive/file.go index 874c456..4f62d88 100644 --- a/pkg/aycache/drive/file.go +++ b/pkg/aycache/drive/file.go @@ -6,6 +6,7 @@ import ( "github.com/gogf/gf/v2/crypto/gmd5" "github.com/gogf/gf/v2/encoding/gjson" "github.com/gogf/gf/v2/os/gcache" + "github.com/gogf/gf/v2/os/gctx" "github.com/gogf/gf/v2/os/gfile" "github.com/gogf/gf/v2/os/gtime" "github.com/gogf/gf/v2/util/gconv" @@ -80,7 +81,7 @@ func (a *AdapterFile) DelIndex(FileName interface{}) { arr := strings.Split(text, "|") if arr[0] == FileName { //save = true - err = gfile.ReplaceFile(text, "", fileIndex) + err = gfile.ReplaceFile(text+"\n", "", fileIndex) return } @@ -248,7 +249,23 @@ func (a *AdapterFile) Close(ctx context.Context) error { func NewAdapterFile(filePath string) gcache.Adapter { fileIndex = path.Join(filePath, fileIndex) - return &AdapterFile{ + + //清空过期文件目录 + delKeys := make([]interface{}, 0) + gfile.ReadLines(fileIndex, func(text string) error { + arr := strings.Split(text, "|") + if gtime.Now().Unix() > gconv.Int64(arr[1]) { + delKeys = append(delKeys, arr[0]) + } + return nil + }) + + obj := &AdapterFile{ FilePath: filePath, } + if len(delKeys) > 0 { + obj.Remove(gctx.New(), delKeys...) + } + + return obj }