fix a today time bug

defaults_clientip.go

@@ -21,6 +21,7 @@ import (
 	"net/netip"
 
 	"github.com/xgfone/go-toolkit/netx"
+	"github.com/xgfone/go-toolkit/netx/netipx"
 )
 
 var (
@@ -61,7 +62,7 @@ func getClientIP(ctx context.Context, req any) (addr netip.Addr) {
 		addr = v.RemoteAddr()
 
 	case interface{ RemoteAddr() net.Addr }:
-		addr = netaddr2netipaddr(v.RemoteAddr())
+		addr, _ = netipx.AddrFromNetAddr(v.RemoteAddr())
 
 	case interface{ RemoteAddr() string }:
 		host, _ := netx.SplitHostPort(v.RemoteAddr())
@@ -74,32 +75,3 @@ func getClientIP(ctx context.Context, req any) (addr netip.Addr) {
 
 	return
 }
-
-func netaddr2netipaddr(netaddr net.Addr) (addr netip.Addr) {
-	switch v := netaddr.(type) {
-	case *net.TCPAddr:
-		addr = ip2addr(v.IP)
-
-	case *net.UDPAddr:
-		addr = ip2addr(v.IP)
-
-	default:
-		host, _ := netx.SplitHostPort(v.String())
-		addr, _ = netip.ParseAddr(host)
-	}
-	return
-}
-
-func ip2addr(ip net.IP) (addr netip.Addr) {
-	switch len(ip) {
-	case net.IPv4len:
-		addr = netip.AddrFrom4([4]byte(ip))
-	case net.IPv6len:
-		if ipv4 := ip.To4(); ipv4 != nil {
-			addr = netip.AddrFrom4([4]byte(ipv4))
-		} else {
-			addr = netip.AddrFrom16([16]byte(ip))
-		}
-	}
-	return
-}

defaults_time.go

@@ -39,7 +39,7 @@ func Unix(sec, nsec int64) time.Time {
 
 // Today returns the today time starting with 00:00:00.
 func Today() time.Time {
-	return timex.Today().In(TimeLocation.Get())
+	return timex.ToToday(Now())
 }
 
 func validateTimeNow(f func() time.Time) error {

defaults_time_test.go

@@ -0,0 +1,31 @@
+// Copyright 2024 xgfone
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package defaults
+
+import (
+	"fmt"
+	"testing"
+	"time"
+)
+
+func TestToday(t *testing.T) {
+	today := Today()
+	expect := fmt.Sprintf("%04d-%02d-%02d 00:00:00",
+		today.Year(), today.Month(), today.Day())
+
+	if s := Today().Format(time.DateTime); s != expect {
+		t.Errorf("expect '%s', but got '%s'", expect, s)
+	}
+}

go.mod

@@ -1,5 +1,5 @@
 module github.com/xgfone/go-defaults
 
-require github.com/xgfone/go-toolkit v0.1.1
+require github.com/xgfone/go-toolkit v0.3.0
 
 go 1.22

go.sum

@@ -1,2 +1,2 @@
-github.com/xgfone/go-toolkit v0.1.1 h1:eYBIgrIhfYHq6unbG0Yx0CM+aX/dvolPrJ5vbDk4bWM=
-github.com/xgfone/go-toolkit v0.1.1/go.mod h1:eOWnIK/acAJOoqEOtWnvuY0Pbn6cZ0DP/Oeoyn17QHw=
+github.com/xgfone/go-toolkit v0.3.0 h1:siEHAiK0pkAMkkQ/LnGrXHrCE7c1ncSyfe2s8u9qPUc=
+github.com/xgfone/go-toolkit v0.3.0/go.mod h1:eOWnIK/acAJOoqEOtWnvuY0Pbn6cZ0DP/Oeoyn17QHw=