diff --git a/go.mod b/go.mod index bce6e43773..19e5195de1 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ go 1.23 require ( github.com/bddjr/hlfhr v1.1.3 github.com/beevik/ntp v1.4.3 + github.com/creack/pty v1.1.23 github.com/expr-lang/expr v1.16.9 github.com/glebarez/sqlite v1.11.0 github.com/go-chi/chi/v5 v5.1.0 @@ -51,7 +52,6 @@ require ( require ( filippo.io/edwards25519 v1.1.0 // indirect - github.com/creack/pty v1.1.23 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/devhaozi/huaweicloud-sdk-go-v3 v0.0.0-20241018211007-bbebb6de5db7 // indirect github.com/dustin/go-humanize v1.0.1 // indirect diff --git a/internal/bootstrap/conf.go b/internal/bootstrap/conf.go index ba9df67c14..8f679222d9 100644 --- a/internal/bootstrap/conf.go +++ b/internal/bootstrap/conf.go @@ -26,7 +26,7 @@ func initConf() { func initGlobal() { app.Root = app.Conf.MustString("app.root") - app.Version = "2.3.15" + app.Version = "2.3.16" app.Locale = app.Conf.MustString("app.locale") // 初始化时区 diff --git a/internal/data/container.go b/internal/data/container.go index 6b59d14b3a..d2b0cd821d 100644 --- a/internal/data/container.go +++ b/internal/data/container.go @@ -79,6 +79,10 @@ func (r *containerRepo) ListAll() ([]types.Container, error) { }) } + slices.SortFunc(containers, func(a types.Container, b types.Container) int { + return strings.Compare(a.Name, b.Name) + }) + return containers, nil } diff --git a/internal/data/container_image.go b/internal/data/container_image.go index d35f2f3ffc..51f9252144 100644 --- a/internal/data/container_image.go +++ b/internal/data/container_image.go @@ -5,6 +5,7 @@ import ( "fmt" "net" "net/http" + "slices" "strings" "time" @@ -62,6 +63,10 @@ func (r *containerImageRepo) List() ([]types.ContainerImage, error) { }) } + slices.SortFunc(images, func(a types.ContainerImage, b types.ContainerImage) int { + return strings.Compare(a.ID, b.ID) + }) + return images, nil } diff --git a/internal/data/container_network.go b/internal/data/container_network.go index c1d41d0e38..79fcb94877 100644 --- a/internal/data/container_network.go +++ b/internal/data/container_network.go @@ -5,6 +5,7 @@ import ( "fmt" "net" "net/http" + "slices" "strings" "time" @@ -79,6 +80,10 @@ func (r *containerNetworkRepo) List() ([]types.ContainerNetwork, error) { }) } + slices.SortFunc(networks, func(a types.ContainerNetwork, b types.ContainerNetwork) int { + return strings.Compare(a.Name, b.Name) + }) + return networks, nil } diff --git a/internal/data/container_volume.go b/internal/data/container_volume.go index c09da9d909..15b84de2b0 100644 --- a/internal/data/container_volume.go +++ b/internal/data/container_volume.go @@ -5,6 +5,7 @@ import ( "fmt" "net" "net/http" + "slices" "strings" "time" @@ -64,6 +65,10 @@ func (r *containerVolumeRepo) List() ([]types.ContainerVolume, error) { }) } + slices.SortFunc(volumes, func(a types.ContainerVolume, b types.ContainerVolume) int { + return strings.Compare(a.Name, b.Name) + }) + return volumes, nil }