github
/
1Panel
mirror of https://github.com/1Panel-dev/1Panel
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

feat: 容器列表端口展示优化 (#3263)

pull/3264/head
ssongliu 2023-12-11 14:06:06 +08:00 committed by GitHub
parent 3a6e526033
commit 88814e3d74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
backend/app/service/container.go
View File

@ -159,7 +159,7 @@ func (u *ContainerService) Page(req dto.PageContainer) (int64, interface{}, erro
IsFromApp = true IsFromApp = true
} }
ports := simplifyPort(item.Ports) ports := loadContainerPort(item.Ports)
backDatas[i] = dto.ContainerInfo{ backDatas[i] = dto.ContainerInfo{
ContainerID: item.ID, ContainerID: item.ID,
CreateTime: time.Unix(item.Created, 0).Format("2006-01-02 15:04:05"), CreateTime: time.Unix(item.Created, 0).Format("2006-01-02 15:04:05"),
@ -1012,6 +1012,22 @@ func loadVolumeBinds(binds []string) []dto.VolumeHelper {
return datas return datas
} }
func loadContainerPort(ports []types.Port) []string {
var (
ipv4Ports []types.Port
ipv6Ports []types.Port
)
for _, port := range ports {
if strings.Contains(port.IP, ":") {
ipv6Ports = append(ipv6Ports, port)
} else {
ipv4Ports = append(ipv4Ports, port)
}
}
list1 := simplifyPort(ipv4Ports)
list2 := simplifyPort(ipv6Ports)
return append(list1, list2...)
}
func simplifyPort(ports []types.Port) []string { func simplifyPort(ports []types.Port) []string {
var datas []string var datas []string
if len(ports) == 0 { if len(ports) == 0 {