From 37b766368f7a6b49843ef7da340814eeddd163ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=AF=BB=E6=AC=A2?= <lxh@cxh.cn>
Date: Mon, 7 Apr 2025 11:56:04 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96=E7=BD=91=E7=BB=9C?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=AD=90=E7=BD=91?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E4=BB=A5=E6=94=AF=E6=8C=81=E5=9B=BA=E5=AE=9A?=
 =?UTF-8?q?IP=E5=88=86=E9=85=8D=EF=BC=8C=E5=B9=B6=E6=9B=B4=E6=96=B0?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yaml            | 7 ++++++-
 internal/docker/container.go   | 6 +++---
 internal/view/robot/index.html | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

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 @@
         
         <!-- 操作区域 -->
         <div class="bg-gray-50 px-6 py-3 flex justify-between items-center">
-          <span class="text-xs text-gray-500">{{if eq .Status "online"}}运行中{{else}}已停止{{end}}</span>
+          <span class="text-xs text-gray-500">微信状态: {{if eq .Status "online"}}在线{{else}}离线{{end}}</span>
           <div class="flex space-x-2">
             <a href="/admin/robots/{{.ID}}" class="p-1.5 rounded-md text-gray-600 hover:bg-gray-100 hover:text-gray-900" title="查看详情">
               <i class="fas fa-eye"></i>