diff --git a/docker-compose.yaml b/docker-compose.yaml index d5143a9..e5fad3a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -77,4 +77,9 @@ volumes: networks: wechat-network: - driver: bridge \ No newline at end of file + name: wechat-network + driver: bridge + ipam: + driver: default + config: + - subnet: 172.20.0.0/16 # 定义子网,允许固定IP分配 diff --git a/internal/docker/container.go b/internal/docker/container.go index d308a94..8aaf6a3 100644 --- a/internal/docker/container.go +++ b/internal/docker/container.go @@ -158,15 +158,15 @@ func getNextAvailableIPInNetwork(ctx context.Context, cli *client.Client, networ return "", fmt.Errorf("无法检查网络: %w", err) } - // 确认网络类型是否为用户自定义网络,并获取子网信息 - if networkResource.IPAM.Config == nil || len(networkResource.IPAM.Config) == 0 { + // 确认网络是否有配置子网 + if len(networkResource.IPAM.Config) == 0 { return "", fmt.Errorf("网络没有IPAM配置") } // 获取网络子网 subnet := networkResource.IPAM.Config[0].Subnet if subnet == "" { - return "", fmt.Errorf("网络子网未定义") + return "", fmt.Errorf("网络子网未定义,不能分配固定IP") } // 解析子网 diff --git a/internal/view/robot/index.html b/internal/view/robot/index.html index 94a06a8..649c03e 100644 --- a/internal/view/robot/index.html +++ b/internal/view/robot/index.html @@ -110,7 +110,7 @@
- {{if eq .Status "online"}}运行中{{else}}已停止{{end}} + 微信状态: {{if eq .Status "online"}}在线{{else}}离线{{end}}