From e3e5d3e55046ce0c8a45b49c27b3d75acb8c47ad Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Thu, 24 Sep 2026 18:14:38 +0800 Subject: [PATCH 1/2] =?UTF-8?q?fix=F0=9F=90=9B:=20format=20the=20dept-list?= =?UTF-8?q?=20error=20instead=20of=20printing=20its=20verb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit log.Error is the unformatted entry point, so "find dept list error, %s" went out with the %s intact and the error text glued to it: find dept list error, %sconnection refused Errorf is what the line meant. go vet reports this once go-admin-core's logger is recognised as a print-style wrapper, which it is from v2.10.0. --- app/admin/service/sys_dept.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/admin/service/sys_dept.go b/app/admin/service/sys_dept.go index 3fb89eaf..fc5263d3 100644 --- a/app/admin/service/sys_dept.go +++ b/app/admin/service/sys_dept.go @@ -258,7 +258,7 @@ func (e *SysDept) SetDeptLabel() (m []dto.DeptLabel, err error) { list := make([]models.SysDept, 0) err = e.Orm.Find(&list).Error if err != nil { - log.Error("find dept list error, %s", err.Error()) + log.Errorf("find dept list error, %s", err.Error()) return } m = make([]dto.DeptLabel, 0) From 60db31e0e83b3ee3e313e79d129f7d0c3aa53ba6 Mon Sep 17 00:00:00 2001 From: zhangwenjian Date: Thu, 24 Sep 2026 18:14:51 +0800 Subject: [PATCH 2/2] =?UTF-8?q?chore=E2=AC=86=EF=B8=8F:=20go-admin-core=20?= =?UTF-8?q?v2.8.0=20->=20v2.10.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Picks up two releases at once: - v2.9.0: app.Register normalizes Manifest.Requires the way it already normalized Code, so the dependency list stored in sys_app.requires is spelled the same way as the app codes beside it; and a version component beginning with '+' is reported as a signed component rather than as a build-metadata suffix. - v2.10.0: builds with Go 1.27, which this repository already declares, and fixes a %S verb in the listener's shutdown log. All three modules move together: example/app-order requires core directly and test/e2e-apporder does indirectly. No other requirement changes. --- example/app-order/go.mod | 2 +- example/app-order/go.sum | 4 ++-- go.mod | 2 +- go.sum | 4 ++-- test/e2e-apporder/go.mod | 2 +- test/e2e-apporder/go.sum | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/example/app-order/go.mod b/example/app-order/go.mod index 4c5c07b7..f91a095f 100644 --- a/example/app-order/go.mod +++ b/example/app-order/go.mod @@ -5,7 +5,7 @@ go 1.27.1 require ( github.com/gin-gonic/gin v1.12.0 github.com/glebarez/sqlite v1.11.0 - github.com/go-admin-team/go-admin-core/v2 v2.8.0 + github.com/go-admin-team/go-admin-core/v2 v2.10.0 gorm.io/gorm v1.31.2 ) diff --git a/example/app-order/go.sum b/example/app-order/go.sum index 0489c274..3a366855 100644 --- a/example/app-order/go.sum +++ b/example/app-order/go.sum @@ -58,8 +58,8 @@ github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc= github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= -github.com/go-admin-team/go-admin-core/v2 v2.8.0 h1:ZTw5Z/UT1/7OltbGPEaEVerRk4z3koB6O8nDbb84tPM= -github.com/go-admin-team/go-admin-core/v2 v2.8.0/go.mod h1:LG/XvEfOplbuadKrPTPm0Nu5pN06aQUNZZC3ao4B4gs= +github.com/go-admin-team/go-admin-core/v2 v2.10.0 h1:MM1wl9s2iW3M4GFsT8SyaUWaj2Q8m1NSuundXc6DWzI= +github.com/go-admin-team/go-admin-core/v2 v2.10.0/go.mod h1:Q0FfO+8pfPNkPqk9fcRpe2sSOHfir82cjZO8Nol/8SI= github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s= github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= diff --git a/go.mod b/go.mod index c67afb3e..07597d3f 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/casbin/casbin/v3 v3.8.1 github.com/gin-gonic/gin v1.12.0 github.com/glebarez/sqlite v1.11.0 - github.com/go-admin-team/go-admin-core/v2 v2.8.0 + github.com/go-admin-team/go-admin-core/v2 v2.10.0 github.com/google/uuid v1.6.0 github.com/huaweicloud/huaweicloud-sdk-go-obs v3.26.6+incompatible github.com/mssola/user_agent v0.6.0 diff --git a/go.sum b/go.sum index bacd6323..a5d866c5 100644 --- a/go.sum +++ b/go.sum @@ -145,8 +145,8 @@ github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc= github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= -github.com/go-admin-team/go-admin-core/v2 v2.8.0 h1:ZTw5Z/UT1/7OltbGPEaEVerRk4z3koB6O8nDbb84tPM= -github.com/go-admin-team/go-admin-core/v2 v2.8.0/go.mod h1:LG/XvEfOplbuadKrPTPm0Nu5pN06aQUNZZC3ao4B4gs= +github.com/go-admin-team/go-admin-core/v2 v2.10.0 h1:MM1wl9s2iW3M4GFsT8SyaUWaj2Q8m1NSuundXc6DWzI= +github.com/go-admin-team/go-admin-core/v2 v2.10.0/go.mod h1:Q0FfO+8pfPNkPqk9fcRpe2sSOHfir82cjZO8Nol/8SI= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o= diff --git a/test/e2e-apporder/go.mod b/test/e2e-apporder/go.mod index a1c66819..270626c9 100644 --- a/test/e2e-apporder/go.mod +++ b/test/e2e-apporder/go.mod @@ -40,7 +40,7 @@ require ( github.com/gin-contrib/sse v1.1.1 // indirect github.com/gin-gonic/gin v1.12.0 // indirect github.com/glebarez/sqlite v1.11.0 // indirect - github.com/go-admin-team/go-admin-core/v2 v2.8.0 // indirect + github.com/go-admin-team/go-admin-core/v2 v2.10.0 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-openapi/jsonpointer v1.0.0 // indirect github.com/go-openapi/jsonreference v1.0.0 // indirect diff --git a/test/e2e-apporder/go.sum b/test/e2e-apporder/go.sum index bacd6323..a5d866c5 100644 --- a/test/e2e-apporder/go.sum +++ b/test/e2e-apporder/go.sum @@ -145,8 +145,8 @@ github.com/glebarez/go-sqlite v1.22.0 h1:uAcMJhaA6r3LHMTFgP0SifzgXg46yJkgxqyuyec github.com/glebarez/go-sqlite v1.22.0/go.mod h1:PlBIdHe0+aUEFn+r2/uthrWq4FxbzugL0L8Li6yQJbc= github.com/glebarez/sqlite v1.11.0 h1:wSG0irqzP6VurnMEpFGer5Li19RpIRi2qvQz++w0GMw= github.com/glebarez/sqlite v1.11.0/go.mod h1:h8/o8j5wiAsqSPoWELDUdJXhjAhsVliSn7bWZjOhrgQ= -github.com/go-admin-team/go-admin-core/v2 v2.8.0 h1:ZTw5Z/UT1/7OltbGPEaEVerRk4z3koB6O8nDbb84tPM= -github.com/go-admin-team/go-admin-core/v2 v2.8.0/go.mod h1:LG/XvEfOplbuadKrPTPm0Nu5pN06aQUNZZC3ao4B4gs= +github.com/go-admin-team/go-admin-core/v2 v2.10.0 h1:MM1wl9s2iW3M4GFsT8SyaUWaj2Q8m1NSuundXc6DWzI= +github.com/go-admin-team/go-admin-core/v2 v2.10.0/go.mod h1:Q0FfO+8pfPNkPqk9fcRpe2sSOHfir82cjZO8Nol/8SI= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.10.0/go.mod h1:xUsJbQ/Fp4kEt7AFgCuvyX4a71u8h9jB8tj/ORgOZ7o=