fix: panic on nil pointer dereference in notification sending and fix date parsing formats

This commit is contained in:
Bot
2026-07-01 23:36:21 +08:00
parent cabbfff858
commit c778472571
2 changed files with 83 additions and 39 deletions
+74 -39
View File
@@ -233,48 +233,83 @@ func (ns *NotificationServerBundle) replaceParamsInString(str string, message st
"#SERVER.EXPIRE_DATE#", mod(expiresStr), "#SERVER.EXPIRE_DATE#", mod(expiresStr),
"#SERVER.BILLING_AMOUNT#", mod(amountStr), "#SERVER.BILLING_AMOUNT#", mod(amountStr),
"#SERVER.BILLING_CYCLE#", mod(cycleStr), "#SERVER.BILLING_CYCLE#", mod(cycleStr),
// Converted metrics
"#SERVER.CPU#", mod(ns.formatUsage(false, ns.Server.State.CPU)),
"#SERVER.MEM#", mod(ns.formatUsage(true, float64(ns.Server.State.MemUsed)/float64(ns.Server.Host.MemTotal))),
"#SERVER.SWAP#", mod(ns.formatUsage(true, float64(ns.Server.State.SwapUsed)/float64(ns.Server.Host.SwapTotal))),
"#SERVER.DISK#", mod(ns.formatUsage(true, float64(ns.Server.State.DiskUsed)/float64(ns.Server.Host.DiskTotal))),
"#SERVER.SPEEDIN#", mod(fmt.Sprintf("%s/s", ns.formatSize(ns.Server.State.NetInSpeed))),
"#SERVER.SPEEDOUT#", mod(fmt.Sprintf("%s/s", ns.formatSize(ns.Server.State.NetOutSpeed))),
"#SERVER.TRANSFERIN#", mod(ns.formatSize(ns.Server.State.NetInTransfer)),
"#SERVER.TRANSFEROUT#", mod(ns.formatSize(ns.Server.State.NetOutTransfer)),
// Raw metrics
"#SERVER.CPUUSED#", mod(fmt.Sprintf("%f", ns.Server.State.CPU)),
"#SERVER.MEMUSED#", mod(fmt.Sprintf("%d", ns.Server.State.MemUsed)),
"#SERVER.SWAPUSED#", mod(fmt.Sprintf("%d", ns.Server.State.SwapUsed)),
"#SERVER.DISKUSED#", mod(fmt.Sprintf("%d", ns.Server.State.DiskUsed)),
"#SERVER.MEMTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.MemTotal)),
"#SERVER.SWAPTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.SwapTotal)),
"#SERVER.DISKTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.DiskTotal)),
"#SERVER.NETINSPEED#", mod(fmt.Sprintf("%d", ns.Server.State.NetInSpeed)),
"#SERVER.NETOUTSPEED#", mod(fmt.Sprintf("%d", ns.Server.State.NetOutSpeed)),
"#SERVER.NETINTRANSFER#", mod(fmt.Sprintf("%d", ns.Server.State.NetInTransfer)),
"#SERVER.NETOUTTRANSFER#", mod(fmt.Sprintf("%d", ns.Server.State.NetOutTransfer)),
"#SERVER.LOAD1#", mod(fmt.Sprintf("%f", ns.Server.State.Load1)),
"#SERVER.LOAD5#", mod(fmt.Sprintf("%f", ns.Server.State.Load5)),
"#SERVER.LOAD15#", mod(fmt.Sprintf("%f", ns.Server.State.Load15)),
"#SERVER.TCPCONNCOUNT#", mod(fmt.Sprintf("%d", ns.Server.State.TcpConnCount)),
"#SERVER.UDPCONNCOUNT#", mod(fmt.Sprintf("%d", ns.Server.State.UdpConnCount)),
) )
var ipv4, ipv6, validIP string if ns.Server.State != nil && ns.Server.Host != nil {
ip := ns.Server.GeoIP.IP replacements = append(replacements,
if ip.IPv4Addr != "" && ip.IPv6Addr != "" { // Converted metrics
ipv4 = ip.IPv4Addr "#SERVER.CPU#", mod(ns.formatUsage(false, ns.Server.State.CPU)),
ipv6 = ip.IPv6Addr "#SERVER.MEM#", mod(ns.formatUsage(true, float64(ns.Server.State.MemUsed)/float64(ns.Server.Host.MemTotal))),
validIP = ipv4 "#SERVER.SWAP#", mod(ns.formatUsage(true, float64(ns.Server.State.SwapUsed)/float64(ns.Server.Host.SwapTotal))),
} else if ip.IPv4Addr != "" { "#SERVER.DISK#", mod(ns.formatUsage(true, float64(ns.Server.State.DiskUsed)/float64(ns.Server.Host.DiskTotal))),
ipv4 = ip.IPv4Addr "#SERVER.SPEEDIN#", mod(fmt.Sprintf("%s/s", ns.formatSize(ns.Server.State.NetInSpeed))),
validIP = ipv4 "#SERVER.SPEEDOUT#", mod(fmt.Sprintf("%s/s", ns.formatSize(ns.Server.State.NetOutSpeed))),
"#SERVER.TRANSFERIN#", mod(ns.formatSize(ns.Server.State.NetInTransfer)),
"#SERVER.TRANSFEROUT#", mod(ns.formatSize(ns.Server.State.NetOutTransfer)),
// Raw metrics
"#SERVER.CPUUSED#", mod(fmt.Sprintf("%f", ns.Server.State.CPU)),
"#SERVER.MEMUSED#", mod(fmt.Sprintf("%d", ns.Server.State.MemUsed)),
"#SERVER.SWAPUSED#", mod(fmt.Sprintf("%d", ns.Server.State.SwapUsed)),
"#SERVER.DISKUSED#", mod(fmt.Sprintf("%d", ns.Server.State.DiskUsed)),
"#SERVER.NETINSPEED#", mod(fmt.Sprintf("%d", ns.Server.State.NetInSpeed)),
"#SERVER.NETOUTSPEED#", mod(fmt.Sprintf("%d", ns.Server.State.NetOutSpeed)),
"#SERVER.TRANSFERINRAW#", mod(fmt.Sprintf("%d", ns.Server.State.NetInTransfer)),
"#SERVER.TRANSFEROUTRAW#", mod(fmt.Sprintf("%d", ns.Server.State.NetOutTransfer)),
"#SERVER.UPTIME#", mod(fmt.Sprintf("%d", ns.Server.State.Uptime)),
"#SERVER.MEMTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.MemTotal)),
"#SERVER.SWAPTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.SwapTotal)),
"#SERVER.DISKTOTAL#", mod(fmt.Sprintf("%d", ns.Server.Host.DiskTotal)),
"#SERVER.LOAD1#", mod(fmt.Sprintf("%f", ns.Server.State.Load1)),
"#SERVER.LOAD5#", mod(fmt.Sprintf("%f", ns.Server.State.Load5)),
"#SERVER.LOAD15#", mod(fmt.Sprintf("%f", ns.Server.State.Load15)),
"#SERVER.TCPCONNCOUNT#", mod(fmt.Sprintf("%d", ns.Server.State.TcpConnCount)),
"#SERVER.UDPCONNCOUNT#", mod(fmt.Sprintf("%d", ns.Server.State.UdpConnCount)),
)
} else { } else {
ipv6 = ip.IPv6Addr replacements = append(replacements,
validIP = ipv6 "#SERVER.CPU#", mod("N/A"),
"#SERVER.MEM#", mod("N/A"),
"#SERVER.SWAP#", mod("N/A"),
"#SERVER.DISK#", mod("N/A"),
"#SERVER.SPEEDIN#", mod("N/A"),
"#SERVER.SPEEDOUT#", mod("N/A"),
"#SERVER.TRANSFERIN#", mod("N/A"),
"#SERVER.TRANSFEROUT#", mod("N/A"),
"#SERVER.CPUUSED#", mod("0"),
"#SERVER.MEMUSED#", mod("0"),
"#SERVER.SWAPUSED#", mod("0"),
"#SERVER.DISKUSED#", mod("0"),
"#SERVER.NETINSPEED#", mod("0"),
"#SERVER.NETOUTSPEED#", mod("0"),
"#SERVER.TRANSFERINRAW#", mod("0"),
"#SERVER.TRANSFEROUTRAW#", mod("0"),
"#SERVER.UPTIME#", mod("0"),
"#SERVER.MEMTOTAL#", mod("0"),
"#SERVER.SWAPTOTAL#", mod("0"),
"#SERVER.DISKTOTAL#", mod("0"),
"#SERVER.LOAD1#", mod("0"),
"#SERVER.LOAD5#", mod("0"),
"#SERVER.LOAD15#", mod("0"),
"#SERVER.TCPCONNCOUNT#", mod("0"),
"#SERVER.UDPCONNCOUNT#", mod("0"),
)
}
var ipv4, ipv6, validIP string
if ns.Server.GeoIP != nil {
ip := ns.Server.GeoIP.IP
if ip.IPv4Addr != "" && ip.IPv6Addr != "" {
ipv4 = ip.IPv4Addr
ipv6 = ip.IPv6Addr
validIP = ipv4
} else if ip.IPv4Addr != "" {
ipv4 = ip.IPv4Addr
validIP = ipv4
} else {
ipv6 = ip.IPv6Addr
validIP = ipv6
}
} }
replacements = append(replacements, replacements = append(replacements,
+9
View File
@@ -405,6 +405,8 @@ func CronJobForDomainStatus() {
var err error var err error
if len(endDateStr) == 10 { // YYYY-MM-DD if len(endDateStr) == 10 { // YYYY-MM-DD
endDate, err = time.Parse("2006-01-02", endDateStr) endDate, err = time.Parse("2006-01-02", endDateStr)
} else if len(endDateStr) == 19 && endDateStr[10] == ' ' { // YYYY-MM-DD HH:MM:SS
endDate, err = time.Parse("2006-01-02 15:04:05", endDateStr)
} else { } else {
endDate, err = time.Parse(time.RFC3339, endDateStr) endDate, err = time.Parse(time.RFC3339, endDateStr)
} }
@@ -487,12 +489,19 @@ func CronJobForServerStatus() {
continue continue
} }
// 忽略前端默认生成的空日期
if strings.HasPrefix(pn.BillingDataMod.EndDate, "0000-00-00") {
continue
}
// 处理类似 2026-10-10 甚至其他不带时区的格式 // 处理类似 2026-10-10 甚至其他不带时区的格式
endDateStr := pn.BillingDataMod.EndDate endDateStr := pn.BillingDataMod.EndDate
var endDate time.Time var endDate time.Time
var err error var err error
if len(endDateStr) == 10 { // YYYY-MM-DD if len(endDateStr) == 10 { // YYYY-MM-DD
endDate, err = time.Parse("2006-01-02", endDateStr) endDate, err = time.Parse("2006-01-02", endDateStr)
} else if len(endDateStr) == 19 && endDateStr[10] == ' ' { // YYYY-MM-DD HH:MM:SS
endDate, err = time.Parse("2006-01-02 15:04:05", endDateStr)
} else { } else {
endDate, err = time.Parse(time.RFC3339, endDateStr) endDate, err = time.Parse(time.RFC3339, endDateStr)
} }