fix: logging middleware context

Author: 0xJacky

api/audit/middleware.go

@@ -0,0 +1,18 @@
+package audit
+
+import (
+	"github.com/0xJacky/Nginx-UI/model"
+	"github.com/gin-gonic/gin"
+	"github.com/spf13/cast"
+	"github.com/uozi-tech/cosy/logger"
+)
+
+func LoggingMiddleware() gin.HandlerFunc {
+	return logger.AuditMiddleware(func(c *gin.Context, logMap map[string]string) {
+		var userId uint64
+		if user, ok := c.Get("user"); ok {
+			userId = user.(*model.User).ID
+		}
+		logMap["user_id"] = cast.ToString(userId)
+	})
+}

api/certificate/certificate.go

@@ -14,6 +14,7 @@ import (
 	"github.com/go-acme/lego/v4/certcrypto"
 	"github.com/spf13/cast"
 	"github.com/uozi-tech/cosy"
+	"github.com/uozi-tech/cosy/logger"
 )
 
 type APICertificate struct {
@@ -57,6 +58,8 @@ func Transformer(certModel *model.Cert) (certificate *APICertificate) {
 }
 
 func GetCertList(c *gin.Context) {
+	s := logger.NewSessionLogger(c)
+	s.Info("GetCertList")
 	cosy.Core[model.Cert](c).SetFussy("name", "domain").
 		SetTransformer(func(m *model.Cert) any {
 			info, _ := cert.GetCertInfo(m.SSLCertificatePath)

app/package.json

@@ -18,7 +18,7 @@
     "@fingerprintjs/fingerprintjs": "^4.6.2",
     "@formkit/auto-animate": "^0.8.4",
     "@simplewebauthn/browser": "^13.1.2",
-    "@uozi-admin/curd": "^4.15.5",
+    "@uozi-admin/curd": "^4.15.8",
     "@uozi-admin/request": "^2.8.4",
     "@vue/reactivity": "^3.5.21",
     "@vue/shared": "^3.5.21",
@@ -30,7 +30,7 @@
     "@xterm/addon-fit": "^0.10.0",
     "@xterm/xterm": "^5.5.0",
     "ant-design-vue": "^4.2.6",
-    "apexcharts": "^5.3.4",
+    "apexcharts": "^5.3.5",
     "axios": "^1.11.0",
     "dayjs": "^1.11.18",
     "echarts": "^6.0.0",
@@ -48,7 +48,7 @@
     "splitpanes": "^4.0.4",
     "sse.js": "^2.7.0",
     "universal-cookie": "^8.0.1",
-    "unocss": "^66.5.0",
+    "unocss": "^66.5.1",
     "uuid": "^11.1.0",
     "vite-plugin-build-id": "0.5.0",
     "vue": "^3.5.21",
@@ -62,7 +62,7 @@
     "vuedraggable": "^4.1.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^5.2.2",
+    "@antfu/eslint-config": "^5.3.0",
     "@iconify-json/fa": "1.2.2",
     "@iconify-json/tabler": "^1.2.22",
     "@iconify/tools": "^4.1.2",
@@ -87,7 +87,7 @@
     "unplugin-auto-import": "^20.1.0",
     "unplugin-vue-components": "^29.0.0",
     "unplugin-vue-define-options": "^1.5.5",
-    "vite": "^7.1.4",
+    "vite": "^7.1.5",
     "vite-plugin-inspect": "^11.3.3",
     "vite-svg-loader": "^5.1.0",
     "vue-tsc": "^3.0.6"

app/pnpm-lock.yaml

@@ -0,0 +1,3 @@
+onlyBuiltDependencies:
+  - core-js
+  - vue-demi

app/pnpm-workspace.yaml

@@ -108,53 +108,96 @@ func generateBackendLicenses() ([]License, error) {
 
 	log.Println("INFO: Collecting backend Go modules...")
 
-	// Get only direct and indirect dependencies, exclude workspace modules
-	cmd := exec.Command("go", "mod", "graph")
-	output, err := cmd.Output()
+	// Read go.mod file directly
+	goModPath := "go.mod"
+	data, err := os.ReadFile(goModPath)
 	if err != nil {
-		return nil, fmt.Errorf("failed to run go mod graph: %v", err)
+		return nil, fmt.Errorf("failed to read go.mod: %v", err)
 	}
 
-	// Parse module graph to get unique dependencies
+	// Parse go.mod content to extract dependencies
 	depMap := make(map[string]string) // path -> version
-	lines := strings.Split(string(output), "\n")
+	lines := strings.Split(string(data), "\n")
+	inRequireBlock := false
+	inReplaceBlock := false
+	
+	replaceMap := make(map[string]string) // original -> replacement
 
 	for _, line := range lines {
 		line = strings.TrimSpace(line)
-		if line == "" {
+		
+		// Handle require block
+		if strings.HasPrefix(line, "require (") {
+			inRequireBlock = true
 			continue
 		}
-
-		parts := strings.Fields(line)
-		if len(parts) != 2 {
+		if strings.HasPrefix(line, "replace (") {
+			inReplaceBlock = true
 			continue
 		}
-
-		// Extract dependency info from "module@version dependency@version"
-		dep := parts[1]
-		if dep == "" || !strings.Contains(dep, "@") {
+		if line == ")" {
+			inRequireBlock = false
+			inReplaceBlock = false
 			continue
 		}
 
-		atIndex := strings.LastIndex(dep, "@")
-		if atIndex == -1 {
+		// Parse replace directives
+		if inReplaceBlock || strings.HasPrefix(line, "replace ") {
+			if strings.Contains(line, "=>") {
+				parts := strings.Split(line, "=>")
+				if len(parts) == 2 {
+					original := strings.TrimSpace(parts[0])
+					replacement := strings.TrimSpace(parts[1])
+					
+					// Remove "replace " prefix if present
+					original = strings.TrimPrefix(original, "replace ")
+					
+					// Extract module path (before version if present)
+					if strings.Contains(original, " ") {
+						original = strings.Fields(original)[0]
+					}
+					if strings.Contains(replacement, " ") {
+						replacement = strings.Fields(replacement)[0]
+					}
+					
+					replaceMap[original] = replacement
+				}
+			}
 			continue
 		}
 
-		path := dep[:atIndex]
-		version := dep[atIndex+1:]
-
-		// Skip our own module and workspace modules
-		if path == "" ||
-			strings.HasPrefix(path, "github.com/0xJacky/Nginx-UI") ||
-			strings.Contains(path, "git.uozi.org") ||
-			strings.Contains(path, "apple-store-helper") {
-			continue
-		}
+		// Parse dependencies in require block or single require line
+		if inRequireBlock || strings.HasPrefix(line, "require ") {
+			// Remove "require " prefix if present
+			line = strings.TrimPrefix(line, "require ")
+			
+			// Remove comments
+			if idx := strings.Index(line, "//"); idx != -1 {
+				line = line[:idx]
+			}
+			line = strings.TrimSpace(line)
+			
+			if line == "" {
+				continue
+			}
 
-		// Only keep the first version we see (go mod graph shows all versions)
-		if _, exists := depMap[path]; !exists {
-			depMap[path] = version
+			// Parse "module version" format
+			parts := strings.Fields(line)
+			if len(parts) >= 2 {
+				path := parts[0]
+				version := parts[1]
+				
+				if path == "" {
+					continue
+				}
+				
+				// Apply replacements if they exist
+				if replacement, exists := replaceMap[path]; exists {
+					path = replacement
+				}
+				
+				depMap[path] = version
+			}
 		}
 	}