fix: 修复订阅列表查询逻辑并更新Dockerfile配置

修复订阅列表查询中服务器组为空时的处理逻辑，避免潜在错误
在getSubscribeListLogic.go中添加服务器数量统计功能
更新Dockerfile添加logs目录拷贝
清理ppanel.yaml配置文件中的合并冲突和冗余配置

internal/logic/admin/subscribe/getSubscribeListLogic.go

@@ -47,6 +47,13 @@ func (l *GetSubscribeListLogic) GetSubscribeList(req *types.GetSubscribeListRequ
 				l.Logger.Error("[GetSubscribeListLogic] JSON unmarshal failed: ", logger.Field("error", err.Error()), logger.Field("discount", item.Discount))
 			}
 		}
+		servers, err := l.svcCtx.ServerModel.FindServerListByGroupIds(l.ctx, sub.ServerGroup)
+		if err != nil {
+			l.Errorw("[QuerySubscribeListLogic] FindServerListByGroupIds error", logger.Field("error", err.Error()))
+			sub.ServerCount = 0
+		} else {
+			sub.ServerCount = int64(len(servers))
+		}
 		sub.Server = tool.StringToInt64Slice(item.Server)
 		sub.ServerGroup = tool.StringToInt64Slice(item.ServerGroup)
 		resultList = append(resultList, sub)

internal/logic/public/subscribe/querySubscribeListLogic.go

@@ -50,12 +50,17 @@ func (l *QuerySubscribeListLogic) QuerySubscribeList() (resp *types.QuerySubscri
 		}
 		list[i] = sub
 		// 通过服务组查询关联的节点数量
-		servers, err := l.svcCtx.ServerModel.FindServerListByGroupIds(l.ctx, sub.ServerGroup)
-		if err != nil {
-			l.Errorw("[QuerySubscribeListLogic] FindServerListByGroupIds error", logger.Field("error", err.Error()))
-			sub.ServerCount = 0
+		if item.ServerGroup != "" {
+			groupIds := tool.StringToInt64Slice(item.ServerGroup)
+			servers, err := l.svcCtx.ServerModel.FindServerListByGroupIds(l.ctx, groupIds)
+			if err != nil {
+				l.Errorw("[QuerySubscribeListLogic] FindServerListByGroupIds error", logger.Field("error", err.Error()))
+				sub.ServerCount = 0
+			} else {
+				sub.ServerCount = int64(len(servers))
+			}
 		} else {
-			sub.ServerCount = int64(len(servers))
+			sub.ServerCount = 0
 		}
 		list[i] = sub
 	}