From 300500237928ff0e01ca54e4d1e0448cc23afe42 Mon Sep 17 00:00:00 2001 From: bvbej Date: Sat, 7 Feb 2026 15:36:21 +0800 Subject: [PATCH] =?UTF-8?q?[=F0=9F=9A=80]=20mysql?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 81 +++--- go.sum | 155 ++++++----- pkg/database/mongo.go | 251 +++++++++++++++--- pkg/database/mysql.go | 582 ++++++++++++++++++++++++++++++------------ pkg/database/tool.go | 66 ++++- pkg/database/trace.go | 23 -- 6 files changed, 818 insertions(+), 340 deletions(-) delete mode 100644 pkg/database/trace.go diff --git a/go.mod b/go.mod index d00c134..0b139ff 100644 --- a/go.mod +++ b/go.mod @@ -1,26 +1,26 @@ module gitea.bvbej.com/bvbej/base-golang -go 1.25.5 +go 1.25.6 require ( github.com/apolloconfig/agollo/v4 v4.4.0 github.com/gin-contrib/pprof v1.5.3 github.com/gin-gonic/gin v1.11.0 - github.com/go-playground/validator/v10 v10.29.0 - github.com/golang-jwt/jwt/v5 v5.3.0 + github.com/go-playground/validator/v10 v10.30.1 + github.com/golang-jwt/jwt/v5 v5.3.1 github.com/google/uuid v1.6.0 github.com/gorilla/websocket v1.5.3 github.com/jinzhu/now v1.1.5 github.com/json-iterator/go v1.1.12 github.com/mojocn/base64Captcha v1.3.8 github.com/mritd/chinaid v1.0.4 - github.com/panjf2000/ants/v2 v2.11.3 + github.com/panjf2000/ants/v2 v2.11.5 github.com/prometheus/client_golang v1.23.2 - github.com/qiniu/go-sdk/v7 v7.25.5 - github.com/redis/go-redis/v9 v9.17.2 + github.com/qiniu/go-sdk/v7 v7.25.6 + github.com/redis/go-redis/v9 v9.17.3 github.com/robfig/cron/v3 v3.0.1 github.com/rs/cors v1.11.1 - github.com/rs/cors/wrapper/gin v0.0.0-20240830163046-1084d89a1692 + github.com/rs/cors/wrapper/gin v0.0.0-20260123235804-c9e5260a4ed4 github.com/speps/go-hashids v2.0.0+incompatible github.com/spf13/cast v1.10.0 github.com/spf13/viper v1.21.0 @@ -29,15 +29,15 @@ require ( github.com/tidwall/gjson v1.18.0 github.com/tus/tusd v1.13.0 github.com/xuri/excelize/v2 v2.10.0 - go.mongodb.org/mongo-driver v1.17.6 + go.mongodb.org/mongo-driver v1.17.9 go.uber.org/atomic v1.11.0 go.uber.org/multierr v1.11.0 go.uber.org/zap v1.27.1 - golang.org/x/crypto v0.46.0 - golang.org/x/net v0.48.0 + golang.org/x/crypto v0.47.0 + golang.org/x/net v0.49.0 golang.org/x/sync v0.19.0 golang.org/x/time v0.14.0 - google.golang.org/grpc v1.77.0 + google.golang.org/grpc v1.78.0 google.golang.org/protobuf v1.36.11 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df gopkg.in/natefinch/lumberjack.v2 v2.2.1 @@ -47,13 +47,12 @@ require ( require ( filippo.io/edwards25519 v1.1.0 // indirect - github.com/BurntSushi/toml v1.6.0 // indirect + github.com/BurntSushi/toml v1.3.2 // indirect github.com/alex-ant/gomath v0.0.0-20160516115720-89013a210a82 // indirect github.com/beorn7/perks v1.0.1 // indirect - github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f // indirect - github.com/bytedance/gopkg v0.1.3 // indirect - github.com/bytedance/sonic v1.14.2 // indirect - github.com/bytedance/sonic/loader v0.4.0 // indirect + github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 // indirect + github.com/bytedance/sonic v1.14.0 // 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/davecgh/go-spew v1.1.1 // indirect @@ -64,15 +63,15 @@ require ( github.com/gin-contrib/sse v1.1.0 // indirect github.com/go-playground/locales v0.14.1 // indirect github.com/go-playground/universal-translator v0.18.1 // indirect - github.com/go-sql-driver/mysql v1.9.3 // indirect + github.com/go-sql-driver/mysql v1.8.1 // indirect github.com/go-viper/mapstructure/v2 v2.4.0 // indirect github.com/goccy/go-json v0.10.5 // indirect - github.com/goccy/go-yaml v1.19.1 // indirect - github.com/gofrs/flock v0.13.0 // indirect + github.com/goccy/go-yaml v1.18.0 // indirect + github.com/gofrs/flock v0.8.1 // indirect github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect - github.com/golang/snappy v1.0.0 // indirect + github.com/golang/snappy v0.0.4 // indirect github.com/jinzhu/inflection v1.0.0 // indirect - github.com/klauspost/compress v1.18.2 // 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 @@ -83,39 +82,43 @@ require ( github.com/pelletier/go-toml/v2 v2.2.4 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_model v0.6.2 // indirect - github.com/prometheus/common v0.67.4 // indirect - github.com/prometheus/procfs v0.19.2 // indirect - github.com/quic-go/qpack v0.6.0 // indirect - github.com/quic-go/quic-go v0.57.1 // indirect + github.com/prometheus/common v0.66.1 // indirect + github.com/prometheus/procfs v0.16.1 // indirect + github.com/quic-go/qpack v0.5.1 // indirect + github.com/quic-go/quic-go v0.54.0 // indirect github.com/richardlehane/mscfb v1.0.4 // indirect github.com/richardlehane/msoleps v1.0.4 // indirect - github.com/sagikazarmark/locafero v0.12.0 // indirect + github.com/sagikazarmark/locafero v0.11.0 // indirect + github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect github.com/spf13/afero v1.15.0 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/subosito/gotenv v1.6.0 // indirect - github.com/tidwall/btree v1.8.1 // indirect + github.com/tidwall/btree v1.4.2 // indirect github.com/tidwall/grect v0.1.4 // indirect - github.com/tidwall/match v1.2.0 // indirect - github.com/tidwall/pretty v1.2.1 // indirect + github.com/tidwall/match v1.1.1 // indirect + github.com/tidwall/pretty v1.2.0 // indirect github.com/tidwall/rtred v0.1.2 // indirect github.com/tidwall/tinyqueue v0.1.1 // indirect - github.com/tiendc/go-deepcopy v1.7.2 // indirect + github.com/tiendc/go-deepcopy v1.7.1 // indirect github.com/twitchyliquid64/golang-asm v0.15.1 // indirect - github.com/ugorji/go/codec v1.3.1 // indirect + github.com/ugorji/go/codec v1.3.0 // indirect github.com/xdg-go/pbkdf2 v1.0.0 // indirect - github.com/xdg-go/scram v1.2.0 // indirect + github.com/xdg-go/scram v1.1.2 // indirect github.com/xdg-go/stringprep v1.0.4 // indirect github.com/xuri/efp v0.0.1 // indirect github.com/xuri/nfp v0.0.2-0.20250530014748-2ddeb826f9a9 // indirect github.com/youmark/pkcs8 v0.0.0-20240726163527-a2c0da244d78 // indirect - go.yaml.in/yaml/v2 v2.4.3 // indirect + go.uber.org/mock v0.5.0 // indirect + go.yaml.in/yaml/v2 v2.4.2 // indirect go.yaml.in/yaml/v3 v3.0.4 // indirect - golang.org/x/arch v0.23.0 // indirect - golang.org/x/image v0.34.0 // indirect - golang.org/x/sys v0.39.0 // indirect - golang.org/x/text v0.32.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 // indirect + golang.org/x/arch v0.20.0 // indirect + golang.org/x/image v0.25.0 // indirect + golang.org/x/mod v0.31.0 // indirect + golang.org/x/sys v0.40.0 // indirect + golang.org/x/text v0.33.0 // indirect + golang.org/x/tools v0.40.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - modernc.org/fileutil v1.3.40 // indirect + modernc.org/fileutil v1.0.0 // indirect ) diff --git a/go.sum b/go.sum index 5ed2a5d..3b4162f 100644 --- a/go.sum +++ b/go.sum @@ -766,9 +766,8 @@ github.com/Azure/go-autorest/autorest/mocks v0.4.1/go.mod h1:LTp+uSrOhSkaKrUy935 github.com/Azure/go-autorest/logger v0.2.1/go.mod h1:T9E3cAhj2VqvPOtCYAvby9aBXkZmbF5NWuPV8+WeEW8= github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.3.2 h1:o7IhLm0Msx3BaB+n3Ag7L8EVlByGnpq14C4YWiu/gL8= github.com/BurntSushi/toml v1.3.2/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= -github.com/BurntSushi/toml v1.6.0 h1:dRaEfpa2VI55EwlIW72hMRHdWouJeRF7TPYhI+AUQjk= -github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c/go.mod h1:X0CRv0ky0k6m906ixxpzmDRLvX58TFUKS2eePweuyxk= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= @@ -806,21 +805,18 @@ 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= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40 h1:y4B3+GPxKlrigF1ha5FFErxK+sr6sWxQovRMzwMhejo= github.com/bmizerany/pat v0.0.0-20170815010413-6226ea591a40/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= -github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f h1:gOO/tNZMjjvTKZWpY7YnXC72ULNLErRtp94LountVE8= -github.com/bmizerany/pat v0.0.0-20210406213842-e4b6760bdd6f/go.mod h1:8rLXio+WjiTceGBHIoTvn60HIbs7Hm7bcHjyrSqYB9c= github.com/boombuler/barcode v1.0.0/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c= github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA= github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0= -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.2 h1:k1twIoe97C1DtYUo+fZQy865IuHia4PR5RPiuGPPIIE= -github.com/bytedance/sonic v1.14.2/go.mod h1:T80iDELeHiHKSc0C9tubFygiuXoGzrkjKzX2quAx980= -github.com/bytedance/sonic/loader v0.4.0 h1:olZ7lEqcxtZygCK9EKYKADnpQoYkRQxaeY2NYzevs+o= -github.com/bytedance/sonic/loader v0.4.0/go.mod h1:AR4NYCk5DdzZizZ5djGqQ92eEhCCcdf5x77udYiSJRo= +github.com/bytedance/sonic v1.14.0 h1:/OfKt8HFw0kh2rj8N0F6C/qPGRESq0BbaNZgcNXXzQQ= +github.com/bytedance/sonic v1.14.0/go.mod h1:WoEbx8WTcFJfzCe0hbmyTGrfjt8PzNEBdxlNUO24NhA= +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/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91VeyqjLS6ao50K5bOcLKN6Q42XnYaRYw= @@ -936,26 +932,25 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl 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.7.0/go.mod h1:xm76BBt941f7yWdGnI2DVPFFg1UK3YY04qifoXU3lOk= -github.com/go-playground/validator/v10 v10.29.0 h1:lQlF5VNJWNlRbRZNeOIkWElR+1LL/OuHcc0Kp14w1xk= -github.com/go-playground/validator/v10 v10.29.0/go.mod h1:D6QxqeMlgIPuT02L66f2ccrZ7AGgHkzKmmTMZhk/Kc4= -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/go-playground/validator/v10 v10.30.1 h1:f3zDSN/zOma+w6+1Wswgd9fLkdwy06ntQJp0BBvFG0w= +github.com/go-playground/validator/v10 v10.30.1/go.mod h1:oSuBIQzuJxL//3MelwSLD5hc2Tu889bF0Idm9Dg26cM= +github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= +github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-viper/mapstructure/v2 v2.4.0 h1:EBsztssimR/CONLSZZ04E8qAkxNYq4Qp9LvH92wZUgs= github.com/go-viper/mapstructure/v2 v2.4.0/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM= github.com/goccy/go-json v0.9.11/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= 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.19.1 h1:3rG3+v8pkhRqoQ/88NYNMHYVGYztCOCIZ7UQhu7H+NE= -github.com/goccy/go-yaml v1.19.1/go.mod h1:XBurs7gK8ATbW4ZPGKgcbrY1Br56PdM69F7LkFRi1kA= +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/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= -github.com/gofrs/flock v0.13.0 h1:95JolYOvGMqeH31+FC7D2+uULf6mG61mEZ/A8dRYMzw= -github.com/gofrs/flock v0.13.0/go.mod h1:jxeyy9R1auM5S6JYDBhDt+E2TCo7DkratH4Pgi8P+Z0= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= -github.com/golang-jwt/jwt/v5 v5.3.0 h1:pv4AsKCKKZuqlgs5sUmn4x8UlGa0kEVt/puTpKx9vvo= -github.com/golang-jwt/jwt/v5 v5.3.0/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= +github.com/golang-jwt/jwt/v5 v5.3.1 h1:kYf81DTWFe7t+1VvL7eS+jKFVWaUnK9cB1qbwn63YCY= +github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -996,9 +991,8 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v1.0.0 h1:Oy607GVXHs7RtbggtPBnr2RmDArIsAefDwvrdWvRhGs= -github.com/golang/snappy v1.0.0/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/flatbuffers v2.0.8+incompatible/go.mod h1:1AeVuKshWv4vARoZatz6mlQ0JxURH0Kv5+zNeJKJCa8= @@ -1135,8 +1129,8 @@ github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/asmfmt v1.3.2/go.mod h1:AG8TuvYojzulgDAMCnYn50l/5QV3Bs/tp6j0HLHbNSE= github.com/klauspost/compress v1.15.9/go.mod h1:PhcZ0MbTNciWF3rruxRgKxI5NkcHHrHUDtV4Yw2GlzU= -github.com/klauspost/compress v1.18.2 h1:iiPHWW0YrcFgpBYhsA6D1+fqHssJscY/Tm/y2Uqnapk= -github.com/klauspost/compress v1.18.2/go.mod h1:R0h/fSBs8DE4ENlcrlib3PsXS61voFxhIs2DeRhCvJ4= +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.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= github.com/klauspost/cpuid/v2 v2.3.0 h1:S4CRMLnYUhGeDFDqkGriYKdfoFlDnMtqTiI/sFzhA9Y= github.com/klauspost/cpuid/v2 v2.3.0/go.mod h1:hqwkgyIinND0mEev00jJYCxPNVRVXFQeu1XKlok6oO0= @@ -1205,8 +1199,8 @@ github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRW github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/panjf2000/ants/v2 v2.11.3 h1:AfI0ngBoXJmYOpDh9m516vjqoUu2sLrIVgppI9TZVpg= -github.com/panjf2000/ants/v2 v2.11.3/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek= +github.com/panjf2000/ants/v2 v2.11.5 h1:a7LMnMEeux/ebqTux140tRiaqcFTV0q2bEHF03nl6Rg= +github.com/panjf2000/ants/v2 v2.11.5/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4= @@ -1246,8 +1240,8 @@ github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9 github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/common v0.37.0/go.mod h1:phzohg0JFMnBEFGxTDbfu3QyL5GI8gTQJFhYO5B3mfA= github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= -github.com/prometheus/common v0.67.4 h1:yR3NqWO1/UyO1w2PhUvXlGQs/PtFmoveVO0KZ4+Lvsc= -github.com/prometheus/common v0.67.4/go.mod h1:gP0fq6YjjNCLssJCQp0yk4M8W6ikLURwkdd/YKtTbyI= +github.com/prometheus/common v0.66.1 h1:h5E0h5/Y8niHc5DlaLlWLArTQI7tMrsfQjHV+d9ZoGs= +github.com/prometheus/common v0.66.1/go.mod h1:gcaUsgf3KfRSwHY4dIMXLPV0K/Wg1oZ8+SbZk/HH/dA= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= @@ -1255,18 +1249,18 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= -github.com/prometheus/procfs v0.19.2 h1:zUMhqEW66Ex7OXIiDkll3tl9a1ZdilUOd/F6ZXw4Vws= -github.com/prometheus/procfs v0.19.2/go.mod h1:M0aotyiemPhBCM0z5w87kL22CxfcH05ZpYlu+b4J7mw= +github.com/prometheus/procfs v0.16.1 h1:hZ15bTNuirocR6u0JZ6BAHHmwS1p8B4P6MRqxtzMyRg= +github.com/prometheus/procfs v0.16.1/go.mod h1:teAbpZRB1iIAJYREa1LsoWUXykVXA1KlTmWl8x/U+Is= github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk= -github.com/qiniu/go-sdk/v7 v7.25.5 h1:BZAZhrYC7vrw9NPnNbFi1K8xucoz29s7sEGWap77i2Q= -github.com/qiniu/go-sdk/v7 v7.25.5/go.mod h1:dmKtJ2ahhPWFVi9o1D5GemmWoh/ctuB9peqTowyTO8o= +github.com/qiniu/go-sdk/v7 v7.25.6 h1:89KQX16Bv2x7MxhwpzWGGvQBOPIlGpAcnPQyfS3tRok= +github.com/qiniu/go-sdk/v7 v7.25.6/go.mod h1:dmKtJ2ahhPWFVi9o1D5GemmWoh/ctuB9peqTowyTO8o= github.com/qiniu/x v1.10.5/go.mod h1:03Ni9tj+N2h2aKnAz+6N0Xfl8FwMEDRC2PAlxekASDs= -github.com/quic-go/qpack v0.6.0 h1:g7W+BMYynC1LbYLSqRt8PBg5Tgwxn214ZZR34VIOjz8= -github.com/quic-go/qpack v0.6.0/go.mod h1:lUpLKChi8njB4ty2bFLX2x4gzDqXwUpaO1DP9qMDZII= -github.com/quic-go/quic-go v0.57.1 h1:25KAAR9QR8KZrCZRThWMKVAwGoiHIrNbT72ULHTuI10= -github.com/quic-go/quic-go v0.57.1/go.mod h1:ly4QBAjHA2VhdnxhojRsCUOeJwKYg+taDlos92xb1+s= -github.com/redis/go-redis/v9 v9.17.2 h1:P2EGsA4qVIM3Pp+aPocCJ7DguDHhqrXNhVcEp4ViluI= -github.com/redis/go-redis/v9 v9.17.2/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= +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.0 h1:6s1YB9QotYI6Ospeiguknbp2Znb/jZYjZLRXn9kMQBg= +github.com/quic-go/quic-go v0.54.0/go.mod h1:e68ZEaCdyviluZmy44P6Iey98v/Wfz6HCjQEm+l8zTY= +github.com/redis/go-redis/v9 v9.17.3 h1:fN29NdNrE17KttK5Ndf20buqfDZwGNgoUr9qjl1DQx4= +github.com/redis/go-redis/v9 v9.17.3/go.mod h1:u410H11HMLoB+TP67dz8rL9s6QW2j76l0//kSOd3370= github.com/remyoudompheng/bigfft v0.0.0-20200410134404-eec4a21b6bb0/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= github.com/richardlehane/mscfb v1.0.4 h1:WULscsljNPConisD5hR0+OyZjwK46Pfyr6mPu5ZawpM= @@ -1285,13 +1279,13 @@ github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjR github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA= github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU= -github.com/rs/cors/wrapper/gin v0.0.0-20240830163046-1084d89a1692 h1:lwzJgPw5Y6pvC8mwbedX9HfdywUKcpNdcviftZsb1uY= -github.com/rs/cors/wrapper/gin v0.0.0-20240830163046-1084d89a1692/go.mod h1:742Ialb8SOs5yB2PqRDzFcyND3280PoaS5/wcKQUQKE= +github.com/rs/cors/wrapper/gin v0.0.0-20260123235804-c9e5260a4ed4 h1:o+wYsOfZvOhP3CLGQH5MGVaw9xWjkGIXYH9nJ7NA2FM= +github.com/rs/cors/wrapper/gin v0.0.0-20260123235804-c9e5260a4ed4/go.mod h1:UkcVz4d5PVHMbLZcN5lqy4KOGXiO9vVdxlITo+boMCE= github.com/ruudk/golang-pdf417 v0.0.0-20181029194003-1af4ab5afa58/go.mod h1:6lfFZQK844Gfx8o5WFuvpxWRwnSoipWe/p622j1v06w= github.com/ruudk/golang-pdf417 v0.0.0-20201230142125-a7e3863a1245/go.mod h1:pQAZKsJ8yyVxGRWYNEm9oFB8ieLgKFnamEyDmSA0BRk= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= -github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4= -github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI= +github.com/sagikazarmark/locafero v0.11.0 h1:1iurJgmM9G3PA/I+wWYIOw/5SyBtxapeHDcg+AAIFXc= +github.com/sagikazarmark/locafero v0.11.0/go.mod h1:nVIGvgyzw595SUSUE6tvCp3YYTeHs15MvlmU87WwIik= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= github.com/sethgrid/pester v1.2.0/go.mod h1:hEUINb4RqvDxtoCaU0BNT/HV4ig5kfgOasrf1xcvr0A= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1299,6 +1293,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 h1:+jumHNA0Wrelhe64i8F6HNlS8pkoyMv5sreGx2Ry5Rw= +github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8/go.mod h1:3n1Cwaq1E1/1lhQhtRK2ts/ZwZEhjcQeJQ1RuC6Q/8U= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/speps/go-hashids v2.0.0+incompatible h1:kSfxGfESueJKTx0mpER9Y/1XHl+FVQjtCqRyYcviFbw= github.com/speps/go-hashids v2.0.0+incompatible/go.mod h1:P7hqPzMdnZOfyIk+xrlG1QaSMw+gCBdHKsBDnhpaZvc= @@ -1321,7 +1317,6 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ github.com/stretchr/objx v0.1.1/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/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -1334,7 +1329,6 @@ github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= @@ -1344,8 +1338,8 @@ github.com/tevid/gohamcrest v1.1.1 h1:ou+xSqlIw1xfGTg1uq1nif/htZ2S3EzRqLm2BP+tYU github.com/tevid/gohamcrest v1.1.1/go.mod h1:3UvtWlqm8j5JbwYZh80D/PVBt0mJ1eJiYgZMibh0H/k= github.com/tidwall/assert v0.1.0 h1:aWcKyRBUAdLoVebxo95N7+YZVTFF/ASTr7BN4sLP6XI= github.com/tidwall/assert v0.1.0/go.mod h1:QLYtGyeqse53vuELQheYl9dngGCJQ+mTtlxcktb+Kj8= -github.com/tidwall/btree v1.8.1 h1:27ehoXvm5AG/g+1VxLS1SD3vRhp/H7LuEfwNvddEdmA= -github.com/tidwall/btree v1.8.1/go.mod h1:jBbTdUWhSZClZWoDg54VnvV7/54modSOzDN7VXftj1A= +github.com/tidwall/btree v1.4.2 h1:PpkaieETJMUxYNADsjgtNRcERX7mGc/GP2zp/r5FM3g= +github.com/tidwall/btree v1.4.2/go.mod h1:LGm8L/DZjPLmeWGjv5kFrY8dL4uVhMmzmmLYmsObdKE= github.com/tidwall/buntdb v1.3.2 h1:qd+IpdEGs0pZci37G4jF51+fSKlkuUTMXuHhXL1AkKg= github.com/tidwall/buntdb v1.3.2/go.mod h1:lZZrZUWzlyDJKlLQ6DKAy53LnG7m5kHyrEHvvcDmBpU= github.com/tidwall/gjson v1.12.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -1355,29 +1349,27 @@ github.com/tidwall/grect v0.1.4 h1:dA3oIgNgWdSspFzn1kS4S/RDpZFLrIxAZOdJKjYapOg= github.com/tidwall/grect v0.1.4/go.mod h1:9FBsaYRaR0Tcy4UwefBX/UDcDcDy9V5jUcxHzv2jd5Q= github.com/tidwall/lotsa v1.0.2 h1:dNVBH5MErdaQ/xd9s769R31/n2dXavsQ0Yf4TMEHHw8= github.com/tidwall/lotsa v1.0.2/go.mod h1:X6NiU+4yHA3fE3Puvpnn1XMDrFZrE9JO2/w+UMuqgR8= +github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= -github.com/tidwall/match v1.2.0 h1:0pt8FlkOwjN2fPt4bIl4BoNxb98gGHN2ObFEDkrfZnM= -github.com/tidwall/match v1.2.0/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= +github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4= -github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= github.com/tidwall/rtred v0.1.2 h1:exmoQtOLvDoO8ud++6LwVsAMTu0KPzLTUrMln8u1yu8= github.com/tidwall/rtred v0.1.2/go.mod h1:hd69WNXQ5RP9vHd7dqekAz+RIdtfBogmglkZSRxCHFQ= github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE= github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw= -github.com/tiendc/go-deepcopy v1.7.2 h1:Ut2yYR7W9tWjTQitganoIue4UGxZwCcJy3orjrrIj44= -github.com/tiendc/go-deepcopy v1.7.2/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ= +github.com/tiendc/go-deepcopy v1.7.1 h1:LnubftI6nYaaMOcaz0LphzwraqN8jiWTwm416sitff4= +github.com/tiendc/go-deepcopy v1.7.1/go.mod h1:4bKjNC2r7boYOkD2IOuZpYjmlDdzjbpTRyCx+goBCJQ= github.com/tus/tusd v1.13.0 h1:W7rtb1XPSpde/GPZAgdfUS3vus2Jt2KmckS6OUd3CU8= github.com/tus/tusd v1.13.0/go.mod h1:1tX4CDGlx8koHGFJdSaJ5ybUIm2NeVloJgZEPSKRcQA= 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.1 h1:waO7eEiFDwidsBN6agj1vJQ4AG7lh2yqXyOXqhgQuyY= -github.com/ugorji/go/codec v1.3.1/go.mod h1:pRBVtBSKl77K30Bv8R2P+cLSGaTtex6fsA2Wjqmfxj4= +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/vimeo/go-util v1.4.1/go.mod h1:r+yspV//C48HeMXV8nEvtUeNiIiGfVv3bbEHzOgudwE= github.com/xdg-go/pbkdf2 v1.0.0 h1:Su7DPu48wXMwC3bs7MCNG+z4FhcyEuz5dlvchbq0B0c= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= -github.com/xdg-go/scram v1.2.0 h1:bYKF2AEwG5rqd1BumT4gAnvwU/M9nBp2pTSxeZw7Wvs= -github.com/xdg-go/scram v1.2.0/go.mod h1:3dlrS0iBaWKYVt2ZfA4cj48umJZ+cAEbR6/SjLA88I8= +github.com/xdg-go/scram v1.1.2 h1:FHX5I5B4i4hKRVRBCFRxq1iQRej7WO3hhBuJf+UUySY= +github.com/xdg-go/scram v1.1.2/go.mod h1:RT/sEzTbU5y00aCK8UOx6R7YryM0iF1N2MOmC3kKLN4= github.com/xdg-go/stringprep v1.0.4 h1:XLI/Ng3O1Atzq0oBs3TWm+5ZVgkq2aqdlvP9JtoZ6c8= github.com/xdg-go/stringprep v1.0.4/go.mod h1:mPGuuIYwz7CmR2bT9j4GbQqutWS1zV24gijq1dTyGkM= github.com/xhit/go-str2duration v1.2.0/go.mod h1:3cPSlfZlUHVlneIVfePFWcJZsuwf+P1v2SRTV4cUmp4= @@ -1401,8 +1393,8 @@ github.com/zeebo/xxh3 v1.0.2/go.mod h1:5NWz9Sef7zIDm2JHfFlcQvNekmcEl9ekUZQQKCYaD go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= -go.mongodb.org/mongo-driver v1.17.6 h1:87JUG1wZfWsr6rIz3ZmpH90rL5tea7O3IHuSwHUpsss= -go.mongodb.org/mongo-driver v1.17.6/go.mod h1:Hy04i7O2kC4RS06ZrhPRqj/u4DTYkFDAAccj+rVKqgQ= +go.mongodb.org/mongo-driver v1.17.9 h1:IexDdCuuNJ3BHrELgBlyaH9p60JXAvdzWR128q+U5tU= +go.mongodb.org/mongo-driver v1.17.9/go.mod h1:LlOhpH5NUEfhxcAwG0UEkMqwYcc4JU18gtCdGudk/tQ= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= @@ -1432,8 +1424,8 @@ go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0 go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= 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/mock v0.5.2 h1:LbtPTcP8A5k9WPXj54PPPbjcI4Y6lhyOZXn+VS7wNko= -go.uber.org/mock v0.5.2/go.mod h1:wLlUxC2vVTPTaE3UD51E0BGOAElKrILxhVSDYQLld5o= +go.uber.org/mock v0.5.0 h1:KAMbZvZPyBPWgD14IrIQ38QCyjwpvVVV6K/bHl1IwQU= +go.uber.org/mock v0.5.0/go.mod h1:ge71pBPLYDk7QIi1LupWxdAykm7KIEFchiOqd6z7qMM= go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= @@ -1441,12 +1433,12 @@ go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.18.1/go.mod h1:xg/QME4nWcxGxrpdeYfq7UvYrLh66cuVKdrbD1XF/NI= go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc= go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -go.yaml.in/yaml/v2 v2.4.3 h1:6gvOSjQoTB3vt1l+CU+tSyi/HOjfOjRLJ4YwYZGwRO0= -go.yaml.in/yaml/v2 v2.4.3/go.mod h1:zSxWcmIDjOzPXpjlTTbAsKokqkDNAVtZO0WOMiT90s8= +go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI= +go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU= go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc= go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= -golang.org/x/arch v0.23.0 h1:lKF64A2jF6Zd8L0knGltUnegD62JMFBiCPBmQpToHhg= -golang.org/x/arch v0.23.0/go.mod h1:dNHoOeKiyja7GTvF9NJS1l3Z2yntpQNzgrjh1cU103A= +golang.org/x/arch v0.20.0 h1:dx1zTU0MAE98U+TQ8BLl7XsJbgze2WnNKF/8tGp/Q6c= +golang.org/x/arch v0.20.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= @@ -1469,8 +1461,8 @@ golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98y golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc= golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8= -golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU= -golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0= +golang.org/x/crypto v0.47.0 h1:V6e3FRj+n4dbpw86FJ8Fv7XVOql7TEwpHapKoMJ/GO8= +golang.org/x/crypto v0.47.0/go.mod h1:ff3Y9VzzKbwSSEzWqJsJVBnWmRwRSHt/6Op5n9bQc4A= golang.org/x/exp v0.0.0-20180321215751-8460e604b9de/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20180807140117-3d87b88a115f/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -1500,8 +1492,8 @@ golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeap golang.org/x/image v0.0.0-20211028202545-6944b10bf410/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.0.0-20220302094943-723b81ca9867/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/image v0.23.0/go.mod h1:wJJBTdLfCCf3tiHa1fNxpZmUI4mmoZvwMCPP0ddoNKY= -golang.org/x/image v0.34.0 h1:33gCkyw9hmwbZJeZkct8XyR11yH889EQt/QH4VmXMn8= -golang.org/x/image v0.34.0/go.mod h1:2RNFBZRB+vnwwFil8GkMdRvrJOFd1AzdZI6vOY+eJVU= +golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ= +golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -1535,6 +1527,8 @@ golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c= +golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI= +golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1606,8 +1600,8 @@ golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM= -golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU= -golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY= +golang.org/x/net v0.49.0 h1:eeHFmOGUTtaaPSGNmjBKpbng9MulQsJURQUAfUwY++o= +golang.org/x/net v0.49.0/go.mod h1:/ysNB2EvaqvesRkuLAyjI1ycPZlQHM3q01F02UY/MV8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1765,8 +1759,8 @@ golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk= -golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= +golang.org/x/sys v0.40.0 h1:DBZZqJ2Rkml6QMQsZywtnjnnGvHza6BTfYFWY9kjEWQ= +golang.org/x/sys v0.40.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks= golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -1807,8 +1801,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= -golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU= -golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY= +golang.org/x/text v0.33.0 h1:B3njUFyqtHDUI5jMn1YIr5B0IE2U0qck04r6d4KPAxE= +golang.org/x/text v0.33.0/go.mod h1:LuMebE6+rBincTi9+xWTY8TztLzKHc/9C1uBCG27+q8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1886,6 +1880,8 @@ golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58= golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk= +golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA= +golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc= 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= @@ -2138,8 +2134,8 @@ google.golang.org/genproto/googleapis/rpc v0.0.0-20230706204954-ccb25ca9f130/go. google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/genproto/googleapis/rpc v0.0.0-20230807174057-1744710a1577/go.mod h1:+Bk1OCOj40wS2hwAMA+aCW9ypzm63QTBBHp6lQ3p+9M= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2 h1:2I6GHUeJ/4shcDpoUlLs/2WPnhg7yJwvXtqcMJt9liA= -google.golang.org/genproto/googleapis/rpc v0.0.0-20251213004720-97cd9d5aeac2/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0= +google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda/go.mod h1:7i2o+ce6H/6BluujYR+kqX3GKH+dChPTQU19wjRPiGk= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= @@ -2185,8 +2181,8 @@ google.golang.org/grpc v1.55.0/go.mod h1:iYEXKGkEBhg1PjZQvoYEVPTDkHo1/bjTnfwTeGO google.golang.org/grpc v1.56.1/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= -google.golang.org/grpc v1.77.0 h1:wVVY6/8cGA6vvffn+wWK5ToddbgdU3d8MNENr4evgXM= -google.golang.org/grpc v1.77.0/go.mod h1:z0BY1iVj0q8E1uSQCjL9cppRj+gnZjzDnzV0dHhrNig= +google.golang.org/grpc v1.78.0 h1:K1XZG/yGDJnzMdd/uZHAkVqJE+xIDOcmdSFZkBUicNc= +google.golang.org/grpc v1.78.0/go.mod h1:I47qjTo4OKbMkjA/aOOwxDIiPSBofUtQUI5EfpWvW7U= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -2265,9 +2261,8 @@ modernc.org/ccgo/v3 v3.16.9/go.mod h1:zNMzC9A9xeNUepy6KuZBbugn3c0Mc9TeiJO4lgvkJD modernc.org/ccgo/v3 v3.16.13-0.20221017192402-261537637ce8/go.mod h1:fUB3Vn0nVPReA+7IG7yZDfjv1TMWjhQP8gCxrFAtL5g= modernc.org/ccgo/v3 v3.16.13/go.mod h1:2Quk+5YgpImhPjv2Qsob1DnZ/4som1lJTodubIcoUkY= modernc.org/ccorpus v1.11.6/go.mod h1:2gEUTrWqdpH2pXsmTM1ZkjeSrUWDpjMu2T6m29L/ErQ= +modernc.org/fileutil v1.0.0 h1:Z1AFLZwl6BO8A5NldQg/xTSjGLetp+1Ubvl4alfGx8w= modernc.org/fileutil v1.0.0/go.mod h1:JHsWpkrk/CnVV1H/eGlFf85BEpfkrp56ro8nojIq9Q8= -modernc.org/fileutil v1.3.40 h1:ZGMswMNc9JOCrcrakF1HrvmergNLAmxOPjizirpfqBA= -modernc.org/fileutil v1.3.40/go.mod h1:HxmghZSZVAz/LXcMNwZPA/DRrQZEVP9VX0V4LQGQFOc= modernc.org/httpfs v1.0.6/go.mod h1:7dosgurJGp0sPaRanU53W4xZYKh14wfzX420oZADeHM= modernc.org/libc v0.0.0-20220428101251-2d5f3daf273b/go.mod h1:p7Mg4+koNjc8jkqwcoFBJx7tXkpj00G77X7A72jXPXA= modernc.org/libc v1.16.0/go.mod h1:N4LD6DBE9cf+Dzf9buBlzVJndKr/iJHG97vGLHYnb5A= diff --git a/pkg/database/mongo.go b/pkg/database/mongo.go index 873d5ee..e1aefb9 100644 --- a/pkg/database/mongo.go +++ b/pkg/database/mongo.go @@ -3,75 +3,262 @@ package database import ( "context" "fmt" + "time" + "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/readpref" - "time" ) -var _ MongoDB = (*mongoDB)(nil) - +// MongoDB MongoDB接口 type MongoDB interface { - i() + // GetDB 获取数据库实例 GetDB() *mongo.Database - Close() error + + // GetClient 获取客户端实例 + GetClient() *mongo.Client + + // GetCollection 获取集合 + GetCollection(name string) *mongo.Collection + + // Ping 检查连接 + Ping(ctx context.Context) error + + // Close 关闭连接 + Close(ctx context.Context) error + + // WithContext 创建带超时的上下文 + WithContext(ctx context.Context) (context.Context, context.CancelFunc) } +// MongoDBConfig MongoDB配置 type MongoDBConfig struct { - Addr string `yaml:"addr"` - User string `yaml:"user"` - Pass string `yaml:"pass"` - Name string `yaml:"name"` - Timeout time.Duration `yaml:"timeout"` + // 地址，支持多个地址: "localhost:27017,localhost:27018" + Addr string `yaml:"addr" json:"addr"` + + // 用户名 + User string `yaml:"user" json:"user"` + + // 密码 + Pass string `yaml:"pass" json:"pass"` + + // 数据库名称 + Name string `yaml:"name" json:"name"` + + // 连接超时（秒） + Timeout time.Duration `yaml:"timeout" json:"timeout"` + + // 最大连接池大小 + MaxPoolSize uint64 `yaml:"max_pool_size" json:"max_pool_size"` + + // 最小连接池大小 + MinPoolSize uint64 `yaml:"min_pool_size" json:"min_pool_size"` + + // 最大连接空闲时间（秒） + MaxConnIdleTime time.Duration `yaml:"max_conn_idle_time" json:"max_conn_idle_time"` + + // 是否使用副本集 + ReplicaSet string `yaml:"replica_set" json:"replica_set"` + + // 是否使用TLS + UseTLS bool `yaml:"use_tls" json:"use_tls"` + + // 认证数据库 + AuthSource string `yaml:"auth_source" json:"auth_source"` } +// DefaultMongoDBConfig 默认配置 +func DefaultMongoDBConfig() *MongoDBConfig { + return &MongoDBConfig{ + Timeout: 10, // 10秒 + MaxPoolSize: 100, + MinPoolSize: 10, + MaxConnIdleTime: 60, // 60秒 + AuthSource: "admin", + } +} + +// mongoDB MongoDB实现 type mongoDB struct { client *mongo.Client db *mongo.Database + config *MongoDBConfig timeout time.Duration } -func (m *mongoDB) i() {} +// NewMongoDB 创建MongoDB实例 +func NewMongoDB(cfg *MongoDBConfig) (MongoDB, error) { + if cfg == nil { + return nil, fmt.Errorf("配置不能为空") + } + + // 验证必填参数 + if cfg.Addr == "" { + return nil, fmt.Errorf("地址不能为空") + } + if cfg.Name == "" { + return nil, fmt.Errorf("数据库名称不能为空") + } -func NewMongoDB(cfg MongoDBConfig) (MongoDB, error) { timeout := cfg.Timeout * time.Second - connectCtx, connectCancelFunc := context.WithTimeout(context.Background(), timeout) - defer connectCancelFunc() - var auth string - if len(cfg.User) > 0 && len(cfg.Pass) > 0 { - auth = fmt.Sprintf("%s:%s@", cfg.User, cfg.Pass) - } - client, err := mongo.Connect(connectCtx, options.Client().ApplyURI( - fmt.Sprintf("mongodb://%s%s", auth, cfg.Addr), - )) - if err != nil { - return nil, err + if timeout == 0 { + timeout = 10 * time.Second } - pingCtx, pingCancelFunc := context.WithTimeout(context.Background(), timeout) - defer pingCancelFunc() - err = client.Ping(pingCtx, readpref.Primary()) + // 构建连接选项 + clientOpts := options.Client() + + // 构建URI + uri := buildMongoURI(cfg) + clientOpts.ApplyURI(uri) + + // 设置连接池 + if cfg.MaxPoolSize > 0 { + clientOpts.SetMaxPoolSize(cfg.MaxPoolSize) + } + if cfg.MinPoolSize > 0 { + clientOpts.SetMinPoolSize(cfg.MinPoolSize) + } + if cfg.MaxConnIdleTime > 0 { + clientOpts.SetMaxConnIdleTime(cfg.MaxConnIdleTime * time.Second) + } + + // 设置超时 + clientOpts.SetConnectTimeout(timeout) + clientOpts.SetServerSelectionTimeout(timeout) + + // 连接MongoDB + ctx, cancel := context.WithTimeout(context.Background(), timeout) + defer cancel() + + client, err := mongo.Connect(ctx, clientOpts) if err != nil { - return nil, err + return nil, fmt.Errorf("连接MongoDB失败: %w", err) + } + + // Ping测试连接 + pingCtx, pingCancel := context.WithTimeout(context.Background(), timeout) + defer pingCancel() + + if err = client.Ping(pingCtx, readpref.Primary()); err != nil { + _ = client.Disconnect(context.Background()) + return nil, fmt.Errorf("Ping MongoDB失败: %w", err) } return &mongoDB{ client: client, db: client.Database(cfg.Name), + config: cfg, timeout: timeout, }, nil } +// GetDB 获取数据库实例 func (m *mongoDB) GetDB() *mongo.Database { return m.db } -func (m *mongoDB) Close() error { - disconnectCtx, disconnectCancelFunc := context.WithTimeout(context.Background(), m.timeout) - defer disconnectCancelFunc() - err := m.client.Disconnect(disconnectCtx) +// GetClient 获取客户端实例 +func (m *mongoDB) GetClient() *mongo.Client { + return m.client +} + +// GetCollection 获取集合 +func (m *mongoDB) GetCollection(name string) *mongo.Collection { + return m.db.Collection(name) +} + +// Ping 检查连接 +func (m *mongoDB) Ping(ctx context.Context) error { + pingCtx, cancel := m.WithContext(ctx) + defer cancel() + + return m.client.Ping(pingCtx, readpref.Primary()) +} + +// Close 关闭连接 +func (m *mongoDB) Close(ctx context.Context) error { + if ctx == nil { + ctx = context.Background() + } + + disconnectCtx, cancel := context.WithTimeout(ctx, m.timeout) + defer cancel() + + if err := m.client.Disconnect(disconnectCtx); err != nil { + return fmt.Errorf("断开MongoDB连接失败: %w", err) + } + + return nil +} + +// WithContext 创建带超时的上下文 +func (m *mongoDB) WithContext(ctx context.Context) (context.Context, context.CancelFunc) { + if ctx == nil { + ctx = context.Background() + } + return context.WithTimeout(ctx, m.timeout) +} + +// buildMongoURI 构建MongoDB URI +func buildMongoURI(cfg *MongoDBConfig) string { + var auth string + if cfg.User != "" && cfg.Pass != "" { + auth = fmt.Sprintf("%s:%s@", cfg.User, cfg.Pass) + } + + uri := fmt.Sprintf("mongodb://%s%s/%s", auth, cfg.Addr, cfg.Name) + + // 添加查询参数 + params := []string{} + + if cfg.AuthSource != "" { + params = append(params, fmt.Sprintf("authSource=%s", cfg.AuthSource)) + } + + if cfg.ReplicaSet != "" { + params = append(params, fmt.Sprintf("replicaSet=%s", cfg.ReplicaSet)) + } + + if cfg.UseTLS { + params = append(params, "tls=true") + } + + if len(params) > 0 { + uri += "?" + for i, param := range params { + if i > 0 { + uri += "&" + } + uri += param + } + } + + return uri +} + +// Helper functions + +// EnsureIndexes 确保索引存在 +func EnsureIndexes(ctx context.Context, collection *mongo.Collection, indexes []mongo.IndexModel) error { + if len(indexes) == 0 { + return nil + } + + _, err := collection.Indexes().CreateMany(ctx, indexes) if err != nil { - return err + return fmt.Errorf("创建索引失败: %w", err) + } + + return nil +} + +// DropIndexes 删除索引 +func DropIndexes(ctx context.Context, collection *mongo.Collection, indexNames []string) error { + for _, name := range indexNames { + if _, err := collection.Indexes().DropOne(ctx, name); err != nil { + return fmt.Errorf("删除索引 %s 失败: %w", name, err) + } } return nil } diff --git a/pkg/database/mysql.go b/pkg/database/mysql.go index 272e791..ba2046f 100644 --- a/pkg/database/mysql.go +++ b/pkg/database/mysql.go @@ -1,247 +1,499 @@ package database import ( + "context" + "database/sql" "errors" "fmt" "log" "os" + "sync" "time" - "gitea.bvbej.com/bvbej/base-golang/pkg/time_parse" - "gitea.bvbej.com/bvbej/base-golang/pkg/trace" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" "gorm.io/gorm/schema" - "gorm.io/gorm/utils" ) -const ( - callBackBeforeName = "core:before" - callBackAfterName = "core:after" - startTime = "_start_time" - traceCtxName = "_trace_ctx_name" -) - -var _ MysqlRepo = (*mysqlRepo)(nil) - +// MysqlRepo MySQL接口 type MysqlRepo interface { - i() - GetRead(options ...Option) *gorm.DB - GetWrite(options ...Option) *gorm.DB + // DB 获取数据库实例（自动选择读写） + DB(ctx context.Context, forceWrite ...bool) *gorm.DB + + // GetRead 获取读库 + GetRead() *gorm.DB + + // GetWrite 获取写库 + GetWrite() *gorm.DB + + // Transaction 执行事务 + Transaction(ctx context.Context, fc func(*gorm.DB) error) error + + // Close 关闭连接 Close() error + + // Ping 检查连接 + Ping(ctx context.Context) error + + // Stats 获取连接池统计信息 + Stats() (*DBStats, error) + + // HealthCheck 健康检查 + HealthCheck(ctx context.Context) error } +// DBStats 数据库统计信息 +type DBStats struct { + Read sql.DBStats `json:"read"` + Write sql.DBStats `json:"write"` +} + +// MySQLConfig MySQL配置 type MySQLConfig struct { - Read struct { - Addr string `yaml:"addr"` - User string `yaml:"user"` - Pass string `yaml:"pass"` - Name string `yaml:"name"` - } `yaml:"read"` - Write struct { - Addr string `yaml:"addr"` - User string `yaml:"user"` - Pass string `yaml:"pass"` - Name string `yaml:"name"` - } `yaml:"write"` - Base struct { - MaxOpenConn int `yaml:"maxOpenConn"` //最大连接数 - MaxIdleConn int `yaml:"maxIdleConn"` //最大空闲连接数 - ConnMaxLifeTime time.Duration `yaml:"connMaxLifeTime"` //最大连接超时(分钟) - } `yaml:"base"` + Read DBConnConfig `yaml:"read" json:"read"` + Write DBConnConfig `yaml:"write" json:"write"` + Base BaseConfig `yaml:"base" json:"base"` + Logger LoggerConfig `yaml:"logger" json:"logger"` } +// DBConnConfig 数据库连接配置 +type DBConnConfig struct { + Addr string `yaml:"addr" json:"addr"` + User string `yaml:"user" json:"user"` + Pass string `yaml:"pass" json:"pass"` + Name string `yaml:"name" json:"name"` + Charset string `yaml:"charset" json:"charset"` // 默认 utf8mb4 + Collation string `yaml:"collation" json:"collation"` // 默认 utf8mb4_unicode_ci + Loc string `yaml:"loc" json:"loc"` // 默认 Local + ParseTime bool `yaml:"parse_time" json:"parse_time"` // 默认 true + Timeout time.Duration `yaml:"timeout" json:"timeout"` // 连接超时（秒） + ReadTimeout time.Duration `yaml:"read_timeout" json:"read_timeout"` // 读超时（秒） + WriteTimeout time.Duration `yaml:"write_timeout" json:"write_timeout"` // 写超时（秒） +} + +// BaseConfig 基础配置 +type BaseConfig struct { + MaxOpenConn int `yaml:"max_open_conn" json:"max_open_conn"` + MaxIdleConn int `yaml:"max_idle_conn" json:"max_idle_conn"` + ConnMaxLifetime time.Duration `yaml:"conn_max_lifetime" json:"conn_max_lifetime"` // 秒 + ConnMaxIdleTime time.Duration `yaml:"conn_max_idle_time" json:"conn_max_idle_time"` // 秒 +} + +// LoggerConfig 日志配置 +type LoggerConfig struct { + SlowThreshold time.Duration `yaml:"slow_threshold" json:"slow_threshold"` + Colorful bool `yaml:"colorful" json:"colorful"` + IgnoreRecordNotFoundError bool `yaml:"ignore_record_not_found_error" json:"ignore_record_not_found_error"` + LogLevel string `yaml:"log_level" json:"log_level"` + LogOutput string `yaml:"log_output" json:"log_output"` // stdout, file + LogFile string `yaml:"log_file" json:"log_file"` // 日志文件路径 +} + +// DefaultMySQLConfig 默认配置 +func DefaultMySQLConfig() *MySQLConfig { + return &MySQLConfig{ + Base: BaseConfig{ + MaxOpenConn: 100, + MaxIdleConn: 10, + ConnMaxLifetime: 3600, // 1小时 + ConnMaxIdleTime: 600, // 10分钟 + }, + Logger: LoggerConfig{ + SlowThreshold: 200 * time.Millisecond, + Colorful: true, + IgnoreRecordNotFoundError: true, + LogLevel: "warn", + LogOutput: "stdout", + }, + } +} + +// mysqlRepo MySQL实现 type mysqlRepo struct { - read *gorm.DB - write *gorm.DB + read *gorm.DB + write *gorm.DB + config *MySQLConfig + mu sync.RWMutex + closed bool } -func NewMysql(cfg MySQLConfig) (MysqlRepo, error) { - dbr, err := dbConnect(cfg.Read.User, cfg.Read.Pass, cfg.Read.Addr, cfg.Read.Name, - cfg.Base.MaxOpenConn, cfg.Base.MaxIdleConn, cfg.Base.ConnMaxLifeTime) - if err != nil { +// NewMysql 创建MySQL实例 +func NewMysql(cfg *MySQLConfig) (MysqlRepo, error) { + if cfg == nil { + cfg = DefaultMySQLConfig() + } + + // 合并默认配置 + mergeDefaultConfig(cfg) + + // 验证配置 + if err := validateMySQLConfig(cfg); err != nil { return nil, err } - dbw, err := dbConnect(cfg.Write.User, cfg.Write.Pass, cfg.Write.Addr, cfg.Write.Name, - cfg.Base.MaxOpenConn, cfg.Base.MaxIdleConn, cfg.Base.ConnMaxLifeTime) + // 连接读库 + dbr, err := dbConnect("read", cfg.Read, cfg.Base, cfg.Logger) if err != nil { - return nil, err + return nil, fmt.Errorf("连接读库失败: %w", err) } - return &mysqlRepo{ - read: dbr, - write: dbw, + // 连接写库 + dbw, err := dbConnect("write", cfg.Write, cfg.Base, cfg.Logger) + if err != nil { + _ = closeDB(dbr) + return nil, fmt.Errorf("连接写库失败: %w", err) + } + + repo := &mysqlRepo{ + read: dbr, + write: dbw, + config: cfg, + closed: false, + } + + return repo, nil +} + +// DB 获取数据库实例（自动选择读写） +func (m *mysqlRepo) DB(ctx context.Context, forceWrite ...bool) *gorm.DB { + m.mu.RLock() + defer m.mu.RUnlock() + + useWrite := len(forceWrite) > 0 && forceWrite[0] + + var db *gorm.DB + if useWrite { + db = m.write + } else { + db = m.read + } + + if ctx != nil { + db = db.WithContext(ctx) + } + + return db +} + +// GetRead 获取读库 +func (m *mysqlRepo) GetRead() *gorm.DB { + m.mu.RLock() + defer m.mu.RUnlock() + return m.read +} + +// GetWrite 获取写库 +func (m *mysqlRepo) GetWrite() *gorm.DB { + m.mu.RLock() + defer m.mu.RUnlock() + return m.write +} + +// Transaction 执行事务 +func (m *mysqlRepo) Transaction(ctx context.Context, fc func(*gorm.DB) error) error { + m.mu.RLock() + if m.closed { + m.mu.RUnlock() + return fmt.Errorf("数据库连接已关闭") + } + db := m.write + m.mu.RUnlock() + + if ctx != nil { + db = db.WithContext(ctx) + } + + return db.Transaction(fc) +} + +// Close 关闭连接 +func (m *mysqlRepo) Close() error { + m.mu.Lock() + defer m.mu.Unlock() + + if m.closed { + return nil + } + + var errs []error + if err := closeDB(m.read); err != nil { + errs = append(errs, fmt.Errorf("关闭读库失败: %w", err)) + } + if err := closeDB(m.write); err != nil { + errs = append(errs, fmt.Errorf("关闭写库失败: %w", err)) + } + + m.closed = true + + if len(errs) > 0 { + return errors.Join(errs...) + } + return nil +} + +// Ping 检查连接 +func (m *mysqlRepo) Ping(ctx context.Context) error { + m.mu.RLock() + defer m.mu.RUnlock() + + if m.closed { + return fmt.Errorf("数据库连接已关闭") + } + + if ctx == nil { + ctx = context.Background() + } + + // Ping读库 + readDB, err := m.read.DB() + if err != nil { + return fmt.Errorf("获取读库失败: %w", err) + } + if err := readDB.PingContext(ctx); err != nil { + return fmt.Errorf("Ping读库失败: %w", err) + } + + // Ping写库 + writeDB, err := m.write.DB() + if err != nil { + return fmt.Errorf("获取写库失败: %w", err) + } + if err := writeDB.PingContext(ctx); err != nil { + return fmt.Errorf("Ping写库失败: %w", err) + } + + return nil +} + +// Stats 获取连接池统计信息 +func (m *mysqlRepo) Stats() (*DBStats, error) { + m.mu.RLock() + defer m.mu.RUnlock() + + if m.closed { + return nil, fmt.Errorf("数据库连接已关闭") + } + + readDB, err := m.read.DB() + if err != nil { + return nil, fmt.Errorf("获取读库失败: %w", err) + } + + writeDB, err := m.write.DB() + if err != nil { + return nil, fmt.Errorf("获取写库失败: %w", err) + } + + return &DBStats{ + Read: readDB.Stats(), + Write: writeDB.Stats(), }, nil } -func (d *mysqlRepo) i() {} - -func (d *mysqlRepo) GetRead(options ...Option) *gorm.DB { - opt := newOption() - for _, f := range options { - f(opt) +// HealthCheck 健康检查 +func (m *mysqlRepo) HealthCheck(ctx context.Context) error { + if err := m.Ping(ctx); err != nil { + return err } - db := d.read - if opt.Trace != nil { - db.InstanceSet(traceCtxName, opt.Trace) + stats, err := m.Stats() + if err != nil { + return err } - return db + // 检查连接池状态 + if stats.Read.OpenConnections >= m.config.Base.MaxOpenConn { + return fmt.Errorf("读库连接池已满") + } + if stats.Write.OpenConnections >= m.config.Base.MaxOpenConn { + return fmt.Errorf("写库连接池已满") + } + + return nil } -func (d *mysqlRepo) GetWrite(options ...Option) *gorm.DB { - opt := newOption() - for _, f := range options { - f(opt) +// mergeDefaultConfig 合并默认配置 +func mergeDefaultConfig(cfg *MySQLConfig) { + // 读库默认配置 + if cfg.Read.Charset == "" { + cfg.Read.Charset = "utf8mb4" } - - db := d.write - if opt.Trace != nil { - db.InstanceSet(traceCtxName, opt.Trace) + if cfg.Read.Collation == "" { + cfg.Read.Collation = "utf8mb4_unicode_ci" } + if cfg.Read.Loc == "" { + cfg.Read.Loc = "Local" + } + if cfg.Read.Timeout == 0 { + cfg.Read.Timeout = 10 // 10秒 + } + if cfg.Read.ReadTimeout == 0 { + cfg.Read.ReadTimeout = 30 // 30秒 + } + if cfg.Read.WriteTimeout == 0 { + cfg.Read.WriteTimeout = 30 // 30秒 + } + cfg.Read.ParseTime = true - return db + // 写库默认配置 + if cfg.Write.Charset == "" { + cfg.Write.Charset = "utf8mb4" + } + if cfg.Write.Collation == "" { + cfg.Write.Collation = "utf8mb4_unicode_ci" + } + if cfg.Write.Loc == "" { + cfg.Write.Loc = "Local" + } + if cfg.Write.Timeout == 0 { + cfg.Write.Timeout = 10 + } + if cfg.Write.ReadTimeout == 0 { + cfg.Write.ReadTimeout = 30 + } + if cfg.Write.WriteTimeout == 0 { + cfg.Write.WriteTimeout = 30 + } + cfg.Write.ParseTime = true } -func (d *mysqlRepo) Close() (err error) { - rdb, err1 := d.read.DB() - if err1 != nil { - err = errors.Join(err1) +// validateMySQLConfig 验证配置 +func validateMySQLConfig(cfg *MySQLConfig) error { + if cfg.Read.Addr == "" { + return fmt.Errorf("读库地址不能为空") } - err2 := rdb.Close() - if err2 != nil { - err = errors.Join(err2) + if cfg.Read.User == "" { + return fmt.Errorf("读库用户名不能为空") + } + if cfg.Read.Name == "" { + return fmt.Errorf("读库数据库名不能为空") } - wdb, err3 := d.write.DB() - if err3 != nil { - err = errors.Join(err3) + if cfg.Write.Addr == "" { + return fmt.Errorf("写库地址不能为空") } - err4 := wdb.Close() - if err4 != nil { - err = errors.Join(err4) + if cfg.Write.User == "" { + return fmt.Errorf("写库用户名不能为空") + } + if cfg.Write.Name == "" { + return fmt.Errorf("写库数据库名不能为空") } - return err + return nil } -func dbConnect(user, pass, addr, dbName string, maxOpenConn, maxIdleConn int, connMaxLifeTime time.Duration) (*gorm.DB, error) { - dsn := fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=utf8mb4&parseTime=%t&loc=%s", - user, - pass, - addr, - dbName, - true, - "Local") +// buildDSN 构建DSN +func buildDSN(conn DBConnConfig) string { + return fmt.Sprintf("%s:%s@tcp(%s)/%s?charset=%s&collation=%s&parseTime=%t&loc=%s&timeout=%ds&readTimeout=%ds&writeTimeout=%ds", + conn.User, + conn.Pass, + conn.Addr, + conn.Name, + conn.Charset, + conn.Collation, + conn.ParseTime, + conn.Loc, + int(conn.Timeout), + int(conn.ReadTimeout), + int(conn.WriteTimeout), + ) +} + +// dbConnect 连接数据库 +func dbConnect(name string, conn DBConnConfig, base BaseConfig, logCfg LoggerConfig) (*gorm.DB, error) { + // 构建DSN + dsn := buildDSN(conn) + + // 配置日志 + logLevel := parseLogLevel(logCfg.LogLevel) + logWriter := getLogWriter(logCfg) - // 日志配置 newLogger := logger.New( - log.New(os.Stdout, "\r\n", log.LstdFlags), + log.New(logWriter, "\r\n", log.LstdFlags), logger.Config{ - SlowThreshold: time.Second, // 慢SQL阈值 - Colorful: true, // 彩色打印 - IgnoreRecordNotFoundError: true, // 忽略记录未找到错误 - LogLevel: logger.Error, // 日志级别 + SlowThreshold: logCfg.SlowThreshold, + Colorful: logCfg.Colorful, + IgnoreRecordNotFoundError: logCfg.IgnoreRecordNotFoundError, + LogLevel: logLevel, }, ) + // 打开数据库连接 db, err := gorm.Open(mysql.Open(dsn), &gorm.Config{ NamingStrategy: schema.NamingStrategy{ SingularTable: true, }, - Logger: newLogger, + Logger: newLogger, + SkipDefaultTransaction: true, + PrepareStmt: true, + DisableForeignKeyConstraintWhenMigrating: true, }) if err != nil { - return nil, errors.Join(err, fmt.Errorf("[db connection failed] Database name: %s", dbName)) + return nil, fmt.Errorf("打开数据库连接失败 [%s]: %w", name, err) } - db.Set("gorm:table_options", "CHARSET=utf8mb4") - + // 获取底层sqlDB sqlDB, err := db.DB() if err != nil { - return nil, err + return nil, fmt.Errorf("获取sqlDB失败: %w", err) } - // 设置连接池 用于设置最大打开的连接数，默认值为0表示不限制.设置最大的连接数，可以避免并发太高导致连接mysql出现too many connections的错误。 - sqlDB.SetMaxOpenConns(maxOpenConn) - - // 设置最大连接数 用于设置闲置的连接数.设置闲置的连接数则当开启的一个连接使用完成后可以放在池里等候下一次使用。 - sqlDB.SetMaxIdleConns(maxIdleConn) - - // 设置最大连接超时 - sqlDB.SetConnMaxLifetime(time.Minute * connMaxLifeTime) - - // 使用插件 - err = db.Use(&TracePlugin{}) - if err != nil { - return nil, err + // 设置连接池参数 + if base.MaxOpenConn > 0 { + sqlDB.SetMaxOpenConns(base.MaxOpenConn) + } + if base.MaxIdleConn > 0 { + sqlDB.SetMaxIdleConns(base.MaxIdleConn) + } + if base.ConnMaxLifetime > 0 { + sqlDB.SetConnMaxLifetime(base.ConnMaxLifetime * time.Second) + } + if base.ConnMaxIdleTime > 0 { + sqlDB.SetConnMaxIdleTime(base.ConnMaxIdleTime * time.Second) } return db, nil } -/***************************************************************/ - -type TracePlugin struct{} - -func (op *TracePlugin) Name() string { - return "TracePlugin" +// closeDB 关闭数据库 +func closeDB(db *gorm.DB) error { + if db == nil { + return nil + } + sqlDB, err := db.DB() + if err != nil { + return err + } + return sqlDB.Close() } -func (op *TracePlugin) Initialize(db *gorm.DB) (err error) { - // 开始前 - _ = db.Callback().Create().Before("gorm:before_create").Register(callBackBeforeName, before) - _ = db.Callback().Query().Before("gorm:query").Register(callBackBeforeName, before) - _ = db.Callback().Delete().Before("gorm:before_delete").Register(callBackBeforeName, before) - _ = db.Callback().Update().Before("gorm:setup_reflect_value").Register(callBackBeforeName, before) - _ = db.Callback().Row().Before("gorm:row").Register(callBackBeforeName, before) - _ = db.Callback().Raw().Before("gorm:raw").Register(callBackBeforeName, before) - - // 结束后 - _ = db.Callback().Create().After("gorm:after_create").Register(callBackAfterName, after) - _ = db.Callback().Query().After("gorm:after_query").Register(callBackAfterName, after) - _ = db.Callback().Delete().After("gorm:after_delete").Register(callBackAfterName, after) - _ = db.Callback().Update().After("gorm:after_update").Register(callBackAfterName, after) - _ = db.Callback().Row().After("gorm:row").Register(callBackAfterName, after) - _ = db.Callback().Raw().After("gorm:raw").Register(callBackAfterName, after) - return +// parseLogLevel 解析日志级别 +func parseLogLevel(level string) logger.LogLevel { + switch level { + case "silent": + return logger.Silent + case "error": + return logger.Error + case "warn": + return logger.Warn + case "info": + return logger.Info + default: + return logger.Warn + } } -func before(db *gorm.DB) { - db.InstanceSet(startTime, time.Now()) -} - -func after(db *gorm.DB) { - _traceCtx, isExist := db.InstanceGet(traceCtxName) - if !isExist { - return - } - _trace, ok := _traceCtx.(trace.T) - if !ok { - return - } - - _ts, isExist := db.InstanceGet(startTime) - if !isExist { - return - } - - ts, ok := _ts.(time.Time) - if !ok { - return - } - - sql := db.Dialector.Explain(db.Statement.SQL.String(), db.Statement.Vars...) - - sqlInfo := new(trace.SQL) - sqlInfo.Timestamp = time_parse.CSTLayoutString() - sqlInfo.SQL = sql - sqlInfo.Stack = utils.FileWithLineNum() - sqlInfo.Rows = db.Statement.RowsAffected - sqlInfo.CostSeconds = time.Since(ts).Seconds() - _trace.AppendSQL(sqlInfo) +// getLogWriter 获取日志输出 +func getLogWriter(cfg LoggerConfig) *os.File { + if cfg.LogOutput == "file" && cfg.LogFile != "" { + file, err := os.OpenFile(cfg.LogFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666) + if err != nil { + log.Printf("打开日志文件失败: %v，使用标准输出", err) + return os.Stdout + } + return file + } + return os.Stdout } diff --git a/pkg/database/tool.go b/pkg/database/tool.go index dd0336b..e8585ca 100644 --- a/pkg/database/tool.go +++ b/pkg/database/tool.go @@ -1,12 +1,15 @@ package database import ( + "context" "database/sql" "database/sql/driver" "encoding/json" "fmt" - "gorm.io/gorm" "reflect" + "time" + + "gorm.io/gorm" ) type NullTime sql.NullTime @@ -50,6 +53,7 @@ type PaginateList struct { List any `json:"list"` } +// Paginate 分页查询 func Paginate(db *gorm.DB, model any, page, size int64) (*PaginateList, error) { ptr := reflect.ValueOf(model) if ptr.Kind() != reflect.Ptr { @@ -86,3 +90,63 @@ func Paginate(db *gorm.DB, model any, page, size int64) (*PaginateList, error) { List: model, }, nil } + +// BatchInsert 批量插入 +func BatchInsert(ctx context.Context, db *gorm.DB, records interface{}, batchSize int) error { + if batchSize <= 0 { + batchSize = 100 + } + + return db.WithContext(ctx).CreateInBatches(records, batchSize).Error +} + +// ExistsBy 检查记录是否存在 +func ExistsBy(ctx context.Context, db *gorm.DB, model interface{}, query interface{}, args ...interface{}) (bool, error) { + var count int64 + err := db.WithContext(ctx).Model(model).Where(query, args...).Count(&count).Error + if err != nil { + return false, err + } + return count > 0, nil +} + +// FindByIDs 根据ID列表查询 +func FindByIDs(ctx context.Context, db *gorm.DB, dest interface{}, ids []uint) error { + if len(ids) == 0 { + return nil + } + return db.WithContext(ctx).Where("id IN ?", ids).Find(dest).Error +} + +// SoftDeleteByIDs 批量软删除 +func SoftDeleteByIDs(ctx context.Context, db *gorm.DB, model interface{}, ids []uint) error { + if len(ids) == 0 { + return nil + } + return db.WithContext(ctx).Where("id IN ?", ids).Delete(model).Error +} + +// UpdateFields 更新指定字段 +func UpdateFields(ctx context.Context, db *gorm.DB, model interface{}, id uint, fields map[string]interface{}) error { + return db.WithContext(ctx).Model(model).Where("id = ?", id).Updates(fields).Error +} + +// Transaction 简化的事务助手 +func Transaction(ctx context.Context, db *gorm.DB, fn func(*gorm.DB) error) error { + return db.WithContext(ctx).Transaction(fn) +} + +// BaseModel 基础模型 +type BaseModel struct { + ID uint `gorm:"primarykey" json:"id"` + CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"` + UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"` + DeletedAt gorm.DeletedAt `gorm:"index" json:"deleted_at,omitempty"` +} + +// SimpleModel 简单模型（无软删除） +type SimpleModel struct { + ID uint `gorm:"primarykey" json:"id"` + CreatedAt time.Time `gorm:"autoCreateTime" json:"created_at"` + UpdatedAt time.Time `gorm:"autoUpdateTime" json:"updated_at"` +} diff --git a/pkg/database/trace.go b/pkg/database/trace.go deleted file mode 100644 index b56bfc5..0000000 --- a/pkg/database/trace.go +++ /dev/null @@ -1,23 +0,0 @@ -package database - -import "gitea.bvbej.com/bvbej/base-golang/pkg/trace" - -type Trace = trace.T - -type Option func(*option) - -func WithTrace(t Trace) Option { - return func(opt *option) { - if t != nil { - opt.Trace = t.(*trace.Trace) - } - } -} - -func newOption() *option { - return &option{} -} - -type option struct { - Trace *trace.Trace -}