add feature for redis (#15)

zizdlp · Aug 20, 2024 · 6c8921b · 6c8921b
1 parent 3324ddf
commit 6c8921b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/zbook_backend/gapi/auth.go b/zbook_backend/gapi/auth.go
@@ -194,7 +194,7 @@ func (server *Server) GetDailyVisitorsForLastNDays(ndays int32) ([]*util.Visitor
 			// 将键解析为 IP 和 UserAgent
 			parts := strings.Split(key, ":")
 			// 获取 IP 地址部分
-			ipParts := strings.Split(parts[1], ",")[0]
+			ipParts, _, _ := util.ExtractLogDetails(key)
 			// 构建 VisitorData 结构体并添加到切片中
 			visitors = append(visitors, &util.VisitorData{
 				IP:    ipParts,

diff --git a/zbook_backend/statik/statik.go b/zbook_backend/statik/statik.go
diff --git a/zbook_backend/util/filter.go b/zbook_backend/util/filter.go
@@ -2,6 +2,7 @@ package util
 
 import (
 	"regexp"
+	"strings"
 )
 
 // FilterDiffFilesByExtensions 过滤指定后缀名的文件
@@ -26,3 +27,26 @@ func getFileExtension(fileName string) string {
 	}
 	return ""
 }
+
+func ExtractLogDetails(logKey string) (ip, userAgent, date string) {
+	// 移除前缀 "logvisitor:"
+	keyWithoutPrefix := strings.TrimPrefix(logKey, "logvisitor:")
+
+	// 查找最后一个冒号的位置，用来确定日期和 UserAgent 的分隔点
+	lastColonIndex := strings.LastIndex(keyWithoutPrefix, ":")
+
+	// 提取日期
+	date = keyWithoutPrefix[lastColonIndex+1:]
+
+	// 移除日期后缀部分，剩下的是 IP 和 UserAgent
+	keyWithoutDate := keyWithoutPrefix[:lastColonIndex]
+
+	// 再次查找最后一个冒号的位置，以分离 UserAgent 和 IP
+	lastColonIndex = strings.LastIndex(keyWithoutDate, ":")
+
+	// 提取 IP 和 UserAgent
+	ip = keyWithoutDate[:lastColonIndex]
+	userAgent = keyWithoutDate[lastColonIndex+1:]
+
+	return ip, userAgent, date
+}
diff --git a/zbook_backend/util/filter_test.go b/zbook_backend/util/filter_test.go
@@ -42,3 +42,21 @@ func TestFilterDiffFilesByExtensions(t *testing.T) {
 	filteredFiles := FilterDiffFilesByExtensions(files, allowedExtensions)
 	require.Equal(t, expectedFilteredFiles, filteredFiles, "Filtered files do not match expected output")
 }
+
+func TestExtractLogDetails(t *testing.T) {
+	// 测试数据
+	logKey := "logvisitor:::1:Mozilla/5.0:2024-08-20"
+
+	// 期望的结果
+	expectedIP := "::1"
+	expectedUserAgent := "Mozilla/5.0"
+	expectedDate := "2024-08-20"
+
+	// 调用函数
+	ip, userAgent, date := ExtractLogDetails(logKey)
+
+	// 使用 require 进行断言
+	require.Equal(t, expectedIP, ip, "IP 地址不正确")
+	require.Equal(t, expectedUserAgent, userAgent, "User Agent 不正确")
+	require.Equal(t, expectedDate, date, "日期不正确")
+}