feat: 添加在线设备统计功能并优化订阅相关逻辑
- 在DeviceManager中添加GetOnlineDeviceCount方法用于获取在线设备数 - 在统计接口中增加在线设备数返回 - 优化订阅查询逻辑,增加服务组关联节点数量计算 - 添加AnyTLS协议支持及相关URI生成功能 - 重构邀请佣金计算逻辑,支持首购/年付/非首购不同比例 - 修复用户基本信息更新中IsAdmin和Enable字段类型不匹配问题 - 更新数据库迁移脚本和配置文件中邀请相关配置项
This commit is contained in:
@@ -118,10 +118,47 @@ func (l *SubscribeLogic) getServers(userSub *user.Subscribe) ([]*server.Server,
|
||||
serverIds := tool.StringToInt64Slice(subDetails.Server)
|
||||
groupIds := tool.StringToInt64Slice(subDetails.ServerGroup)
|
||||
|
||||
// 🔍 订阅ID 2的详细调试
|
||||
if userSub.SubscribeId == 2 {
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] === 开始调试订阅ID 2 ===")
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] Subscribe详情: %+v", subDetails)
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] Server字段: %s", subDetails.Server)
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] ServerGroup字段: %s", subDetails.ServerGroup)
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] 解析后的serverIds: %v", serverIds)
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] 解析后的groupIds: %v", groupIds)
|
||||
}
|
||||
|
||||
l.Debugf("[Generate Subscribe]serverIds: %v, groupIds: %v", serverIds, groupIds)
|
||||
|
||||
// 查询所有服务器用于调试
|
||||
allServers, _ := l.svc.ServerModel.FindAllServer(l.ctx.Request.Context())
|
||||
if userSub.SubscribeId == 2 {
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] 数据库中所有服务器:")
|
||||
for _, srv := range allServers {
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] ID:%d Name:%s Protocol:%s Enable:%v GroupID:%d",
|
||||
srv.Id, srv.Name, srv.Protocol, *srv.Enable, srv.GroupId)
|
||||
}
|
||||
}
|
||||
|
||||
servers, err := l.svc.ServerModel.FindServerDetailByGroupIdsAndIds(l.ctx.Request.Context(), groupIds, serverIds)
|
||||
|
||||
if userSub.SubscribeId == 2 {
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] 查询结果服务器数量: %d", len(servers))
|
||||
for i, srv := range servers {
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] 结果服务器 %d: ID=%d Name=%s Protocol=%s Enable=%v",
|
||||
i+1, srv.Id, srv.Name, srv.Protocol, *srv.Enable)
|
||||
}
|
||||
|
||||
// 检查AnyTLS服务器
|
||||
anytlsServers := []*server.Server{}
|
||||
for _, srv := range servers {
|
||||
if srv.Protocol == "anytls" {
|
||||
anytlsServers = append(anytlsServers, srv)
|
||||
}
|
||||
}
|
||||
l.Infof("🔍 [DEBUG Subscribe 2] AnyTLS服务器数量: %d", len(anytlsServers))
|
||||
}
|
||||
|
||||
l.Debugf("[Query Subscribe]found servers: %v", len(servers))
|
||||
|
||||
if err != nil {
|
||||
|
||||
Reference in New Issue
Block a user