diff --git a/README.MD b/README.MD index 9bbdbabfe..c8de78790 100644 --- a/README.MD +++ b/README.MD @@ -38,7 +38,7 @@ A powerful framework for faster, easier, and more efficient project development. 💖 [Thanks to all the contributors who made GoFrame possible](https://github.com/gogf/gf/graphs/contributors) 💖 -goframe contributors +goframe contributors # License diff --git a/cmd/gf/go.mod b/cmd/gf/go.mod index 0c8a8c677..934cc9f1c 100644 --- a/cmd/gf/go.mod +++ b/cmd/gf/go.mod @@ -3,13 +3,13 @@ module github.com/gogf/gf/cmd/gf/v2 go 1.23.0 require ( - github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.0 - github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.0 - github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.0 - github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.0 - github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.0 - github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.0 - github.com/gogf/gf/v2 v2.9.0 + github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.5 + github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.5 + github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.5 + github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.5 + github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.5 + github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.5 + github.com/gogf/gf/v2 v2.9.5 github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f github.com/olekukonko/tablewriter v1.1.0 github.com/schollz/progressbar/v3 v3.15.0 @@ -19,15 +19,15 @@ require ( require ( aead.dev/minisign v0.2.0 // indirect - github.com/BurntSushi/toml v1.4.0 // indirect + github.com/BurntSushi/toml v1.5.0 // indirect github.com/ClickHouse/clickhouse-go/v2 v2.0.15 // indirect github.com/clbanning/mxj/v2 v2.7.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect github.com/emirpasic/gods v1.18.1 // indirect github.com/fatih/color v1.18.0 // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.9.0 // indirect github.com/glebarez/go-sqlite v1.21.2 // indirect - github.com/go-logr/logr v1.4.2 // indirect + github.com/go-logr/logr v1.4.3 // indirect github.com/go-logr/stdr v1.2.2 // indirect github.com/go-sql-driver/mysql v1.7.1 // indirect github.com/golang-sql/civil v0.0.0-20220223132316-b832511892a9 // indirect @@ -36,7 +36,7 @@ require ( github.com/gorilla/websocket v1.5.3 // indirect github.com/grokify/html-strip-tags-go v0.1.0 // indirect github.com/lib/pq v1.10.9 // indirect - github.com/magiconair/properties v1.8.9 // indirect + github.com/magiconair/properties v1.8.10 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/mattn/go-runewidth v0.0.16 // indirect @@ -50,16 +50,17 @@ require ( github.com/rivo/uniseg v0.4.7 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/sijms/go-ora/v2 v2.7.10 // indirect - go.opentelemetry.io/otel v1.32.0 // indirect - go.opentelemetry.io/otel/metric v1.32.0 // indirect - go.opentelemetry.io/otel/sdk v1.32.0 // indirect - go.opentelemetry.io/otel/trace v1.32.0 // indirect - golang.org/x/crypto v0.30.0 // indirect - golang.org/x/net v0.32.0 // indirect - golang.org/x/sync v0.10.0 // indirect - golang.org/x/sys v0.28.0 // indirect - golang.org/x/term v0.27.0 // indirect - golang.org/x/text v0.21.0 // indirect + go.opentelemetry.io/auto/sdk v1.1.0 // indirect + go.opentelemetry.io/otel v1.38.0 // indirect + go.opentelemetry.io/otel/metric v1.38.0 // indirect + go.opentelemetry.io/otel/sdk v1.38.0 // indirect + go.opentelemetry.io/otel/trace v1.38.0 // indirect + golang.org/x/crypto v0.38.0 // indirect + golang.org/x/net v0.40.0 // indirect + golang.org/x/sync v0.14.0 // indirect + golang.org/x/sys v0.35.0 // indirect + golang.org/x/term v0.32.0 // indirect + golang.org/x/text v0.25.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect modernc.org/libc v1.22.5 // indirect modernc.org/mathutil v1.5.0 // indirect diff --git a/cmd/gf/go.sum b/cmd/gf/go.sum index b0f4494ba..84c9ae7c1 100644 --- a/cmd/gf/go.sum +++ b/cmd/gf/go.sum @@ -12,8 +12,8 @@ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0 h1:D3occ github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.0.0/go.mod h1:bTSOgj05NGRuHHhQwAdPnYr9TOdNmKlZTgGLL6nyAdI= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1 h1:DzHpqpoJVaCgOUdVHxE8QB52S6NiVdDQvGlny1qvPqA= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.1/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= -github.com/BurntSushi/toml v1.4.0 h1:kuoIxZQy2WRRk1pttg9asf+WVv6tWQuBNVmK8+nqPr0= -github.com/BurntSushi/toml v1.4.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= +github.com/BurntSushi/toml v1.5.0 h1:W5quZX/G/csjUnuI8SUYlsHs9M38FC7znL0lIO+DvMg= +github.com/BurntSushi/toml v1.5.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho= github.com/ClickHouse/clickhouse-go v1.5.4/go.mod h1:EaI/sW7Azgz9UATzd5ZdZHRUhHgv5+JMS9NSr2smCJI= github.com/ClickHouse/clickhouse-go/v2 v2.0.15 h1:lLAZliqrZEygkxosLaW1qHyeTb4Ho7fVCZ0WKCpLocU= github.com/ClickHouse/clickhouse-go/v2 v2.0.15/go.mod h1:Z21o82zD8FFqefOQDg93c0XITlxGbTsWQuRm588Azkk= @@ -31,14 +31,14 @@ github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ= github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= -github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= -github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k= +github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/glebarez/go-sqlite v1.21.2 h1:3a6LFC4sKahUunAmynQKLZceZCOzUthkRkEAl9gAXWo= github.com/glebarez/go-sqlite v1.21.2/go.mod h1:sfxdZyhQjTM2Wry3gVYWaW072Ri1WMdWJi0k6+3382k= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= -github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= -github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI= +github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM= @@ -46,20 +46,6 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI= github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI= -github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.0 h1:ml8lrFbSumZQjzQJGTQ2uvk1LY7NJ/FrKox/ITpYc3w= -github.com/gogf/gf/contrib/drivers/clickhouse/v2 v2.9.0/go.mod h1:Eb5iTy2QypvexojIeb3LdP5VAN8sqNcV0nmHGGt19lk= -github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.0 h1:JTR3ApDH4mduk3XmcXqRSadUdch8dW5HE+ToFv2A89o= -github.com/gogf/gf/contrib/drivers/mssql/v2 v2.9.0/go.mod h1:0iLTveNmvtP16yJqIeiVPUkIl7S6U8iV3Fn4CUJsZuw= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.0 h1:1f7EeD0lfPHoXfaJDSL7cxRcSRelbsAKgF3MGXY+Uyo= -github.com/gogf/gf/contrib/drivers/mysql/v2 v2.9.0/go.mod h1:tToO1PjGkLIR+9DbJ0wrKicYma0H/EUHXOpwel6Dw+0= -github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.0 h1:w15kMOWlHxFY+6GNcW3Ow9AfC45lHYTH4XCv3IO4e24= -github.com/gogf/gf/contrib/drivers/oracle/v2 v2.9.0/go.mod h1:g9eCVfgwRih3MHUHMzOgyfs/lN//4X+Nw+Q+sKkv7PQ= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.0 h1:F/XfLI3TsgFU22AqJ2Df+ZUlF7lzkPo7oB5Cmx6VqOQ= -github.com/gogf/gf/contrib/drivers/pgsql/v2 v2.9.0/go.mod h1:p0c5ZhIITNrqgOz7+dhlk4eDCIC3Tt0ocUVhRjpUw+I= -github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.0 h1:8dg4KHNBJ8OmIfRCGnN5zrP13iENThh4i71IwIa2VP8= -github.com/gogf/gf/contrib/drivers/sqlite/v2 v2.9.0/go.mod h1:hr3GNf9+LJs9TbjEGb7vEGOg2YWfrJBLrXgOcerKRlU= -github.com/gogf/gf/v2 v2.9.0 h1:semN5Q5qGjDQEv4620VzxcJzJlSD07gmyJ9Sy9zfbHk= -github.com/gogf/gf/v2 v2.9.0/go.mod h1:sWGQw+pLILtuHmbOxoe0D+0DdaXxbleT57axOLH2vKI= github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f h1:7xfXR/BhG3JDqO1s45n65Oyx9t4E/UqDOXep6jXdLCM= github.com/gogf/selfupdate v0.0.0-20231215043001-5c48c528462f/go.mod h1:HnYoio6S7VaFJdryKcD/r9HgX+4QzYfr00XiXUo/xz0= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -72,8 +58,8 @@ github.com/golang-sql/sqlexp v0.1.0/go.mod h1:J4ad9Vo8ZCWQ2GMrC4UCQy1JpCbwU9m3EO github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= -github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= -github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8= +github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26 h1:Xim43kblpZXfIBQsbuBVKCudVG457BR2GZFIz3uw3hQ= github.com/google/pprof v0.0.0-20221118152302-e6195bd50e26/go.mod h1:dDKJzRmX4S37WGHujM7tX//fmj1uioxKzKxz3lo4HJo= github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -98,8 +84,8 @@ github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+ github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.10.9 h1:YXG7RB+JIjhP29X+OtkiDnYaXQwpS4JEWq7dtCCRUEw= github.com/lib/pq v1.10.9/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= -github.com/magiconair/properties v1.8.9 h1:nWcCbLq1N2v/cpNsy5WvQ37Fb+YElfq20WJ/a8RkpQM= -github.com/magiconair/properties v1.8.9/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= +github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE= +github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= @@ -151,29 +137,35 @@ github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UV github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -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/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= +github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA= +go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A= go.opentelemetry.io/otel v1.7.0/go.mod h1:5BdUoMIz5WEs0vt0CUEMtSSaTSHBBVwrhnz7+nrD5xk= -go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U= -go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg= -go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M= -go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8= -go.opentelemetry.io/otel/sdk v1.32.0 h1:RNxepc9vK59A8XsgZQouW8ue8Gkb4jpWtJm9ge5lEG4= -go.opentelemetry.io/otel/sdk v1.32.0/go.mod h1:LqgegDBjKMmb2GC6/PrTnteJG39I8/vJCAP9LlJXEjU= +go.opentelemetry.io/otel v1.38.0 h1:RkfdswUDRimDg0m2Az18RKOsnI8UDzppJAtj01/Ymk8= +go.opentelemetry.io/otel v1.38.0/go.mod h1:zcmtmQ1+YmQM9wrNsTGV/q/uyusom3P8RxwExxkZhjM= +go.opentelemetry.io/otel/metric v1.38.0 h1:Kl6lzIYGAh5M159u9NgiRkmoMKjvbsKtYRwgfrA6WpA= +go.opentelemetry.io/otel/metric v1.38.0/go.mod h1:kB5n/QoRM8YwmUahxvI3bO34eVtQf2i4utNVLr9gEmI= +go.opentelemetry.io/otel/sdk v1.38.0 h1:l48sr5YbNf2hpCUj/FoGhW9yDkl+Ma+LrVl8qaM5b+E= +go.opentelemetry.io/otel/sdk v1.38.0/go.mod h1:ghmNdGlVemJI3+ZB5iDEuk4bWA3GkTpW+DOoZMYBVVg= +go.opentelemetry.io/otel/sdk/metric v1.38.0 h1:aSH66iL0aZqo//xXzQLYozmWrXxyFkBJ6qT5wthqPoM= +go.opentelemetry.io/otel/sdk/metric v1.38.0/go.mod h1:dg9PBnW9XdQ1Hd6ZnRz689CbtrUp0wMMs9iPcgT9EZA= go.opentelemetry.io/otel/trace v1.7.0/go.mod h1:fzLSB9nqR2eXzxPXb2JW9IKE+ScyXA48yyE4TNvoHqU= -go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM= -go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8= +go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE= +go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs= +go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= +go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210220033148-5ea612d1eb83/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= -golang.org/x/crypto v0.30.0 h1:RwoQn3GkWiMkzlX562cLB7OxWvjH1L8xutO2WoJcRoY= -golang.org/x/crypto v0.30.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8= +golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w= @@ -182,13 +174,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.32.0 h1:ZqPmj8Kzc+Y6e0+skZsuACbx+wzMgo5MQsJh9Qd6aYI= -golang.org/x/net v0.32.0/go.mod h1:CwU0IoeOlnQQWJ6ioyFrfRuomB8GKF6KbYXZVyeXNfs= +golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY= +golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ= -golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ= +golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -201,16 +193,16 @@ golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= -golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI= +golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.24.0/go.mod h1:lOBK/LVxemqiMij05LGJ0tzNr8xlmwBRJ81PX6wVLH8= -golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q= -golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM= +golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg= +golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= -golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4= +golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= diff --git a/container/gqueue/gqueue.go b/container/gqueue/gqueue.go index 65443a5da..d94551369 100644 --- a/container/gqueue/gqueue.go +++ b/container/gqueue/gqueue.go @@ -113,6 +113,7 @@ func (q *Queue) Len() (length int64) { } // Size is alias of Len. +// // Deprecated: use Len instead. func (q *Queue) Size() int64 { return q.Len() diff --git a/container/gvar/gvar_map.go b/container/gvar/gvar_map.go index 3e4d538f6..0321275ed 100644 --- a/container/gvar/gvar_map.go +++ b/container/gvar/gvar_map.go @@ -40,18 +40,21 @@ func (v *Var) MapStrVar(option ...MapOption) map[string]*Var { } // MapDeep converts and returns `v` as map[string]any recursively. +// // Deprecated: used Map instead. func (v *Var) MapDeep(tags ...string) map[string]any { return gconv.MapDeep(v.Val(), tags...) } // MapStrStrDeep converts and returns `v` as map[string]string recursively. +// // Deprecated: used MapStrStr instead. func (v *Var) MapStrStrDeep(tags ...string) map[string]string { return gconv.MapStrStrDeep(v.Val(), tags...) } // MapStrVarDeep converts and returns `v` as map[string]*Var recursively. +// // Deprecated: used MapStrVar instead. func (v *Var) MapStrVarDeep(tags ...string) map[string]*Var { m := v.MapDeep(tags...) @@ -72,6 +75,7 @@ func (v *Var) Maps(option ...MapOption) []map[string]any { } // MapsDeep converts `value` to []map[string]any recursively. +// // Deprecated: used Maps instead. func (v *Var) MapsDeep(tags ...string) []map[string]any { return gconv.MapsDeep(v.Val(), tags...) diff --git a/contrib/config/apollo/go.mod b/contrib/config/apollo/go.mod index 086978c02..b37096db2 100644 --- a/contrib/config/apollo/go.mod +++ b/contrib/config/apollo/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/apolloconfig/agollo/v4 v4.3.1 - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 ) require ( diff --git a/contrib/config/consul/go.mod b/contrib/config/consul/go.mod index da70fca53..fcecd3819 100644 --- a/contrib/config/consul/go.mod +++ b/contrib/config/consul/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/consul/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/hashicorp/consul/api v1.24.0 github.com/hashicorp/go-cleanhttp v0.5.2 ) diff --git a/contrib/config/kubecm/go.mod b/contrib/config/kubecm/go.mod index e92d0d64a..9908d30d9 100644 --- a/contrib/config/kubecm/go.mod +++ b/contrib/config/kubecm/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/kubecm/v2 go 1.24.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 k8s.io/api v0.33.4 k8s.io/apimachinery v0.33.4 k8s.io/client-go v0.33.4 diff --git a/contrib/config/nacos/go.mod b/contrib/config/nacos/go.mod index 55b192e3f..03ed1e1fc 100644 --- a/contrib/config/nacos/go.mod +++ b/contrib/config/nacos/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/nacos/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/nacos-group/nacos-sdk-go/v2 v2.3.3 ) diff --git a/contrib/config/polaris/go.mod b/contrib/config/polaris/go.mod index 9490a8ce7..4d19a2f5e 100644 --- a/contrib/config/polaris/go.mod +++ b/contrib/config/polaris/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/config/polaris/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/polarismesh/polaris-go v1.6.1 ) diff --git a/contrib/drivers/clickhouse/go.mod b/contrib/drivers/clickhouse/go.mod index deb643ff7..b9813145a 100644 --- a/contrib/drivers/clickhouse/go.mod +++ b/contrib/drivers/clickhouse/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/ClickHouse/clickhouse-go/v2 v2.0.15 - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/google/uuid v1.6.0 github.com/shopspring/decimal v1.3.1 ) diff --git a/contrib/drivers/dm/go.mod b/contrib/drivers/dm/go.mod index bb1778c26..a6f0b5ce1 100644 --- a/contrib/drivers/dm/go.mod +++ b/contrib/drivers/dm/go.mod @@ -6,7 +6,7 @@ replace github.com/gogf/gf/v2 => ../../../ require ( gitee.com/chunanyong/dm v1.8.12 - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 ) require ( diff --git a/contrib/drivers/mssql/go.mod b/contrib/drivers/mssql/go.mod index dd2693499..420fdadce 100644 --- a/contrib/drivers/mssql/go.mod +++ b/contrib/drivers/mssql/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/mssql/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/microsoft/go-mssqldb v1.7.1 ) diff --git a/contrib/drivers/mysql/go.mod b/contrib/drivers/mysql/go.mod index 336e19b6b..fe29ce59b 100644 --- a/contrib/drivers/mysql/go.mod +++ b/contrib/drivers/mysql/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/go-sql-driver/mysql v1.7.1 - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 ) require ( diff --git a/contrib/drivers/oracle/go.mod b/contrib/drivers/oracle/go.mod index 7b1eb6638..529e6efc8 100644 --- a/contrib/drivers/oracle/go.mod +++ b/contrib/drivers/oracle/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/oracle/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/sijms/go-ora/v2 v2.7.10 ) diff --git a/contrib/drivers/pgsql/go.mod b/contrib/drivers/pgsql/go.mod index 413a913ea..8389caf92 100644 --- a/contrib/drivers/pgsql/go.mod +++ b/contrib/drivers/pgsql/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/pgsql/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/lib/pq v1.10.9 ) diff --git a/contrib/drivers/sqlite/go.mod b/contrib/drivers/sqlite/go.mod index 91dbbc827..0b62c344e 100644 --- a/contrib/drivers/sqlite/go.mod +++ b/contrib/drivers/sqlite/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/glebarez/go-sqlite v1.21.2 - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 ) require ( diff --git a/contrib/drivers/sqlitecgo/go.mod b/contrib/drivers/sqlitecgo/go.mod index 3c9a641a0..140467a0d 100644 --- a/contrib/drivers/sqlitecgo/go.mod +++ b/contrib/drivers/sqlitecgo/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/drivers/sqlitecgo/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/mattn/go-sqlite3 v1.14.17 ) diff --git a/contrib/metric/otelmetric/go.mod b/contrib/metric/otelmetric/go.mod index 70742aac7..8e8059e4c 100644 --- a/contrib/metric/otelmetric/go.mod +++ b/contrib/metric/otelmetric/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/metric/otelmetric/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/prometheus/client_golang v1.23.2 go.opentelemetry.io/contrib/instrumentation/runtime v0.63.0 go.opentelemetry.io/otel v1.38.0 diff --git a/contrib/nosql/redis/go.mod b/contrib/nosql/redis/go.mod index c3bef325c..31b15fef8 100644 --- a/contrib/nosql/redis/go.mod +++ b/contrib/nosql/redis/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/nosql/redis/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/redis/go-redis/v9 v9.12.1 go.opentelemetry.io/otel v1.38.0 go.opentelemetry.io/otel/trace v1.38.0 diff --git a/contrib/registry/consul/go.mod b/contrib/registry/consul/go.mod index e69c36b4e..6db28d2b4 100644 --- a/contrib/registry/consul/go.mod +++ b/contrib/registry/consul/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/consul/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/hashicorp/consul/api v1.26.1 ) diff --git a/contrib/registry/etcd/go.mod b/contrib/registry/etcd/go.mod index 6d9c8b517..66a585f73 100644 --- a/contrib/registry/etcd/go.mod +++ b/contrib/registry/etcd/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/etcd/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 go.etcd.io/etcd/client/v3 v3.5.17 google.golang.org/grpc v1.59.0 ) diff --git a/contrib/registry/file/go.mod b/contrib/registry/file/go.mod index f2d35bf6f..7b8cc0662 100644 --- a/contrib/registry/file/go.mod +++ b/contrib/registry/file/go.mod @@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/registry/file/v2 go 1.23.0 -require github.com/gogf/gf/v2 v2.9.4 +require github.com/gogf/gf/v2 v2.9.5 require ( github.com/BurntSushi/toml v1.5.0 // indirect diff --git a/contrib/registry/nacos/go.mod b/contrib/registry/nacos/go.mod index 0fb52746a..432716acf 100644 --- a/contrib/registry/nacos/go.mod +++ b/contrib/registry/nacos/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/nacos/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/nacos-group/nacos-sdk-go/v2 v2.3.3 ) diff --git a/contrib/registry/polaris/go.mod b/contrib/registry/polaris/go.mod index 2f854c2a5..e3a8714ee 100644 --- a/contrib/registry/polaris/go.mod +++ b/contrib/registry/polaris/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/registry/polaris/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 github.com/polarismesh/polaris-go v1.6.1 ) diff --git a/contrib/registry/zookeeper/go.mod b/contrib/registry/zookeeper/go.mod index 2610ebe32..fea1bcd7c 100644 --- a/contrib/registry/zookeeper/go.mod +++ b/contrib/registry/zookeeper/go.mod @@ -4,7 +4,7 @@ go 1.23.0 require ( github.com/go-zookeeper/zk v1.0.3 - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 golang.org/x/sync v0.16.0 ) diff --git a/contrib/rpc/grpcx/go.mod b/contrib/rpc/grpcx/go.mod index f804e3f77..626370ce0 100644 --- a/contrib/rpc/grpcx/go.mod +++ b/contrib/rpc/grpcx/go.mod @@ -3,8 +3,8 @@ module github.com/gogf/gf/contrib/rpc/grpcx/v2 go 1.23.0 require ( - github.com/gogf/gf/contrib/registry/file/v2 v2.9.4 - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/contrib/registry/file/v2 v2.9.5 + github.com/gogf/gf/v2 v2.9.5 go.opentelemetry.io/otel v1.38.0 go.opentelemetry.io/otel/trace v1.38.0 google.golang.org/grpc v1.64.1 diff --git a/contrib/sdk/httpclient/go.mod b/contrib/sdk/httpclient/go.mod index c457378a1..cb72173e1 100644 --- a/contrib/sdk/httpclient/go.mod +++ b/contrib/sdk/httpclient/go.mod @@ -2,7 +2,7 @@ module github.com/gogf/gf/contrib/sdk/httpclient/v2 go 1.23.0 -require github.com/gogf/gf/v2 v2.9.4 +require github.com/gogf/gf/v2 v2.9.5 require ( github.com/BurntSushi/toml v1.5.0 // indirect diff --git a/contrib/trace/otlpgrpc/go.mod b/contrib/trace/otlpgrpc/go.mod index 08a0965a1..e84bef7cc 100644 --- a/contrib/trace/otlpgrpc/go.mod +++ b/contrib/trace/otlpgrpc/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlpgrpc/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 go.opentelemetry.io/otel v1.38.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 diff --git a/contrib/trace/otlphttp/go.mod b/contrib/trace/otlphttp/go.mod index 97bb4f518..f06198df2 100644 --- a/contrib/trace/otlphttp/go.mod +++ b/contrib/trace/otlphttp/go.mod @@ -3,7 +3,7 @@ module github.com/gogf/gf/contrib/trace/otlphttp/v2 go 1.23.0 require ( - github.com/gogf/gf/v2 v2.9.4 + github.com/gogf/gf/v2 v2.9.5 go.opentelemetry.io/otel v1.38.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0 diff --git a/encoding/gjson/gjson_api_new_load.go b/encoding/gjson/gjson_api_new_load.go index 761584b8b..c89c72658 100644 --- a/encoding/gjson/gjson_api_new_load.go +++ b/encoding/gjson/gjson_api_new_load.go @@ -76,13 +76,23 @@ func NewWithOptions(data any, options Options) *Json { pointedData = gconv.Interfaces(data) case reflect.Map: - pointedData = gconv.MapDeep(data, options.Tags) + pointedData = gconv.Map(data, gconv.MapOption{ + Deep: true, + OmitEmpty: false, + Tags: []string{options.Tags}, + ContinueOnError: true, + }) case reflect.Struct: if v, ok := data.(iVal); ok { return NewWithOptions(v.Val(), options) } - pointedData = gconv.MapDeep(data, options.Tags) + pointedData = gconv.Map(data, gconv.MapOption{ + Deep: true, + OmitEmpty: false, + Tags: []string{options.Tags}, + ContinueOnError: true, + }) default: pointedData = data diff --git a/encoding/gjson/gjson_api_new_load_path.go b/encoding/gjson/gjson_api_new_load_path.go index 7cdab5d86..45aaa97cb 100644 --- a/encoding/gjson/gjson_api_new_load_path.go +++ b/encoding/gjson/gjson_api_new_load_path.go @@ -9,6 +9,7 @@ package gjson import "github.com/gogf/gf/v2/os/gfile" // Load loads content from specified file `path`, and creates a Json object from its content. +// // Deprecated: use LoadPath instead. func Load(path string, safe ...bool) (*Json, error) { var isSafe bool diff --git a/encoding/gyaml/gyaml.go b/encoding/gyaml/gyaml.go index 720ca569c..b5316714f 100644 --- a/encoding/gyaml/gyaml.go +++ b/encoding/gyaml/gyaml.go @@ -57,7 +57,12 @@ func Decode(content []byte) (map[string]any, error) { err = gerror.Wrap(err, `yaml.Unmarshal failed`) return nil, err } - return gconv.MapDeep(result), nil + return gconv.Map(result, + gconv.MapOption{ + Deep: true, + OmitEmpty: false, + ContinueOnError: true, + }), nil } // DecodeTo parses `content` into `result`. diff --git a/errors/gerror/gerror_api_option.go b/errors/gerror/gerror_api_option.go index 4ac7f1d93..2da7de8b6 100644 --- a/errors/gerror/gerror_api_option.go +++ b/errors/gerror/gerror_api_option.go @@ -31,6 +31,7 @@ func NewWithOption(option Option) error { } // NewOption creates and returns a custom error with Option. +// // Deprecated: use NewWithOption instead. func NewOption(option Option) error { return NewWithOption(option) diff --git a/errors/gerror/gerror_api_stack.go b/errors/gerror/gerror_api_stack.go index 5caa51172..36b7c37be 100644 --- a/errors/gerror/gerror_api_stack.go +++ b/errors/gerror/gerror_api_stack.go @@ -117,6 +117,7 @@ func As(err error, target any) bool { // HasError performs as Is. // This function is designed and implemented early before errors.Is of go stdlib. +// // Deprecated: use Is instead. func HasError(err, target error) bool { return errors.Is(err, target) diff --git a/internal/errors/errors.go b/internal/errors/errors.go index b1f83aa5e..eaadd2351 100644 --- a/internal/errors/errors.go +++ b/internal/errors/errors.go @@ -16,6 +16,7 @@ type StackMode string const ( // commandEnvKeyForBrief is the command environment name for switch key for brief error stack. + // // Deprecated: use commandEnvKeyForStackMode instead. commandEnvKeyForBrief = "gf.gerror.brief" diff --git a/net/ghttp/ghttp_response_view.go b/net/ghttp/ghttp_response_view.go index ff780f123..35346f76c 100644 --- a/net/ghttp/ghttp_response_view.go +++ b/net/ghttp/ghttp_response_view.go @@ -85,7 +85,12 @@ func (r *Response) buildInVars(params ...map[string]any) map[string]any { gutil.MapMerge(m, params[0]) } // Retrieve custom template variables from request object. - sessionMap := gconv.MapDeep(r.Request.Session.MustData()) + sessionMap := gconv.Map(r.Request.Session.MustData(), + gconv.MapOption{ + Deep: true, + OmitEmpty: false, + ContinueOnError: true, + }) gutil.MapMerge(m, map[string]any{ "Form": r.Request.GetFormMap(), "Query": r.Request.GetQueryMap(), diff --git a/net/gipv4/gipv4_convert.go b/net/gipv4/gipv4_convert.go index 30d2e9392..df39a2f56 100644 --- a/net/gipv4/gipv4_convert.go +++ b/net/gipv4/gipv4_convert.go @@ -47,12 +47,14 @@ func LongToIpLittleEndian(long uint32) string { } // Ip2long converts ip address to an uint32 integer. +// // Deprecated: Use IpToLongBigEndian instead. func Ip2long(ip string) uint32 { return IpToLongBigEndian(ip) } // Long2ip converts an uint32 integer ip address to its string type address. +// // Deprecated: Use LongToIpBigEndian instead. func Long2ip(long uint32) string { return LongToIpBigEndian(long) diff --git a/net/gudp/gudp_func.go b/net/gudp/gudp_func.go index 32e4e8a05..b289dd7bb 100644 --- a/net/gudp/gudp_func.go +++ b/net/gudp/gudp_func.go @@ -72,6 +72,7 @@ func SendRecv(address string, data []byte, receive int, retry ...Retry) ([]byte, } // MustGetFreePort performs as GetFreePort, but it panics if any error occurs. +// // Deprecated: the port might be used soon after they were returned, please use `:0` as the listening // address which asks system to assign a free port instead. func MustGetFreePort() (port int) { @@ -83,6 +84,7 @@ func MustGetFreePort() (port int) { } // GetFreePort retrieves and returns a port that is free. +// // Deprecated: the port might be used soon after they were returned, please use `:0` as the listening // address which asks system to assign a free port instead. func GetFreePort() (port int, err error) { @@ -112,6 +114,7 @@ func GetFreePort() (port int, err error) { } // GetFreePorts retrieves and returns specified number of ports that are free. +// // Deprecated: the ports might be used soon after they were returned, please use `:0` as the listening // address which asks system to assign a free port instead. func GetFreePorts(count int) (ports []int, err error) { diff --git a/os/gctx/gctx.go b/os/gctx/gctx.go index 2a7e71113..1316c5452 100644 --- a/os/gctx/gctx.go +++ b/os/gctx/gctx.go @@ -52,6 +52,7 @@ func New() context.Context { } // WithCtx creates and returns a context containing context id upon given parent context `ctx`. +// // Deprecated: use WithSpan instead. func WithCtx(ctx context.Context) context.Context { if CtxId(ctx) != "" { diff --git a/os/gmutex/gmutex.go b/os/gmutex/gmutex.go index 956ccdc8b..1d49f07fc 100644 --- a/os/gmutex/gmutex.go +++ b/os/gmutex/gmutex.go @@ -10,6 +10,7 @@ package gmutex // New creates and returns a new mutex. +// // Deprecated: use Mutex or RWMutex instead. func New() *RWMutex { return &RWMutex{} diff --git a/os/gview/gview_parse.go b/os/gview/gview_parse.go index 02d2888b0..93d151376 100644 --- a/os/gview/gview_parse.go +++ b/os/gview/gview_parse.go @@ -102,6 +102,7 @@ func (view *View) ParseContent(ctx context.Context, content string, params ...Pa } // Option for template parsing. +// // Deprecated: use Options instead. type Option = Options @@ -114,6 +115,7 @@ type Options struct { } // ParseOption implements template parsing using Option. +// // Deprecated: use ParseWithOptions instead. func (view *View) ParseOption(ctx context.Context, option Option) (result string, err error) { return view.ParseWithOptions(ctx, option) diff --git a/util/gconv/gconv.go b/util/gconv/gconv.go index 58f8c63eb..cc5adc497 100644 --- a/util/gconv/gconv.go +++ b/util/gconv/gconv.go @@ -154,6 +154,7 @@ func NewConverter() Converter { } // RegisterConverter registers custom converter. +// // Deprecated: use RegisterTypeConverterFunc instead for clear func RegisterConverter(fn any) (err error) { return RegisterTypeConverterFunc(fn) diff --git a/util/gconv/gconv_map.go b/util/gconv/gconv_map.go index 04733e8b3..caa4cced0 100644 --- a/util/gconv/gconv_map.go +++ b/util/gconv/gconv_map.go @@ -20,6 +20,7 @@ func Map(value any, option ...MapOption) map[string]any { // MapDeep does Map function recursively, which means if the attribute of `value` // is also a struct/*struct, calls Map function on this attribute converting it to // a map[string]any type variable. +// // Deprecated: used Map instead. func MapDeep(value any, tags ...string) map[string]any { result, _ := defaultConverter.Map(value, MapOption{ @@ -40,6 +41,7 @@ func MapStrStr(value any, option ...MapOption) map[string]string { // MapStrStrDeep converts `value` to map[string]string recursively. // Note that there might be data copy for this map type converting. +// // Deprecated: used MapStrStr instead. func MapStrStrDeep(value any, tags ...string) map[string]string { if r, ok := value.(map[string]string); ok { diff --git a/util/gconv/gconv_maps.go b/util/gconv/gconv_maps.go index a3d7b6a8c..f622b2ae4 100644 --- a/util/gconv/gconv_maps.go +++ b/util/gconv/gconv_maps.go @@ -17,6 +17,7 @@ func SliceMap(anyInput any, option ...MapOption) []map[string]any { } // SliceMapDeep is alias of MapsDeep. +// // Deprecated: used SliceMap instead. func SliceMapDeep(anyInput any) []map[string]any { return MapsDeep(anyInput) @@ -43,6 +44,7 @@ func Maps(value any, option ...MapOption) []map[string]any { // MapsDeep converts `value` to []map[string]any recursively. // // TODO completely implement the recursive converting for all types. +// // Deprecated: used Maps instead. func MapsDeep(value any, tags ...string) []map[string]any { if value == nil { diff --git a/version.go b/version.go index d9626fb7c..fbcf4ce79 100644 --- a/version.go +++ b/version.go @@ -2,5 +2,5 @@ package gf const ( // VERSION is the current GoFrame version. - VERSION = "v2.9.4" + VERSION = "v2.9.5" )