diff --git a/go.mod b/go.mod index bbee241..3db9e74 100644 --- a/go.mod +++ b/go.mod @@ -1,11 +1,11 @@ module github.com/webx-top/echo -go 1.21 +go 1.22 retract [v2.0.0+incompatible, v2.42.35+incompatible] require ( - github.com/admpub/boltstore v1.1.1 + github.com/admpub/boltstore v1.1.2 github.com/admpub/decimal v1.3.1 github.com/admpub/errors v0.8.2 github.com/admpub/events v1.3.6 @@ -30,7 +30,6 @@ require ( github.com/admpub/timeago v1.2.1 github.com/admpub/websocket v1.0.4 github.com/alicebob/miniredis v2.5.0+incompatible - github.com/boltdb/bolt v1.3.1 github.com/dustin/go-broadcast v0.0.0-20211018055107-71439988bd91 github.com/francoispqt/gojay v1.2.13 github.com/go-sql-driver/mysql v1.8.1 @@ -47,6 +46,7 @@ require ( github.com/webx-top/poolx v0.0.0-20210912044716-5cfa2d58e380 github.com/webx-top/tagfast v0.0.1 github.com/webx-top/validation v0.0.3 + go.etcd.io/bbolt v1.3.11 golang.org/x/crypto v0.27.0 golang.org/x/sync v0.8.0 golang.org/x/time v0.6.0 diff --git a/go.sum b/go.sum index 8c2229e..9ff80a2 100644 --- a/go.sum +++ b/go.sum @@ -12,8 +12,8 @@ git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGy github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53 h1:sR+/8Yb4slttB4vD+b9btVEnWgL3Q00OBTzVT8B9C0c= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= -github.com/admpub/boltstore v1.1.1 h1:XFCu9NZETuvzT2lCdh4DNHqgvarvKd2ZjU5mGpUUwZw= -github.com/admpub/boltstore v1.1.1/go.mod h1:ekSv9vnePbyr6EtSAGLfXzwX/7TpjE5TlL22FCHaMQY= +github.com/admpub/boltstore v1.1.2 h1:eg9H+M8rPu2gbK6C2Oe1TChsUvSHwZO9TebCynyvF54= +github.com/admpub/boltstore v1.1.2/go.mod h1:ekSv9vnePbyr6EtSAGLfXzwX/7TpjE5TlL22FCHaMQY= github.com/admpub/color v1.8.0/go.mod h1:QS3d/SkJwNQGG0vKWQhtwnwh36JeyqIywgUEqOpXSv8= github.com/admpub/color v1.8.1 h1:kgx9vC9+KvQ8L1RieP1TZa2qq3lMda+duRKcpZt9BU8= github.com/admpub/color v1.8.1/go.mod h1:3fk9BXRe+f3UjWSTgVjqUcI4Ei05fLaEPjVajrqMJhY= @@ -81,8 +81,6 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYU github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61 h1:Xz25cuW4REGC5W5UtpMU3QItMIImag615HiQcRbxqKQ= github.com/araddon/gou v0.0.0-20190110011759-c797efecbb61/go.mod h1:ikc1XA58M+Rx7SEbf0bLJCfBkwayZ8T5jBo5FXK8Uz8= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= -github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -312,6 +310,8 @@ github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da h1:NimzV1aGyq29m5ukMK0AMWEhFaL/lrEOaephfuoiARg= github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da/go.mod h1:E1AXubJBdNmFERAOucpDIxNzeGfLzg0mYh+UfMWdChA= +go.etcd.io/bbolt v1.3.11 h1:yGEzV1wPz2yVCLsD8ZAiGHhHVlczyC9d1rP43/VCRJ0= +go.etcd.io/bbolt v1.3.11/go.mod h1:dksAq7YMXoljX0xu6VF5DMZGbhYYoLUalEiSySYAS4I= go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA= go4.org v0.0.0-20180809161055-417644f6feb5/go.mod h1:MkTOUMDaeVYJUOUsaDXIhWPZYa1yOyC1qaOBpL57BhE= golang.org/x/build v0.0.0-20190111050920-041ab4dc3f9d/go.mod h1:OWs+y06UdEOHN4y+MfF/py+xQ/tYqIWW03b70/CG9Rw= diff --git a/middleware/session/engine/bolt/boltdb.go b/middleware/session/engine/bolt/boltdb.go index 8bf262b..79bf4bb 100644 --- a/middleware/session/engine/bolt/boltdb.go +++ b/middleware/session/engine/bolt/boltdb.go @@ -8,9 +8,9 @@ import ( "github.com/admpub/boltstore/reaper" "github.com/admpub/boltstore/store" "github.com/admpub/sessions" - "github.com/boltdb/bolt" "github.com/webx-top/echo" ss "github.com/webx-top/echo/middleware/session/engine" + bolt "go.etcd.io/bbolt" ) var (