Merge pull request #164 from WJQSERVER-STUDIO/dev

4.3.2
2026-02-03 00:01:10 +08:00 · 2025-08-20 15:56:39 +08:00 · 2025-08-20 15:53:09 +08:00 · 2025-08-20 15:48:00 +08:00
3 changed files with 17 additions and 3 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,5 +1,9 @@
 # 更新日志

+4.3.2 - 2025-08-20
+---
+- FIX: 修正`cfg.Pages.StaticDir`为空时的处置
+
 4.3.1 - 2025-08-13
 ---
 - CHANGE: 更新至[Go 1.25](https://tip.golang.org/doc/go1.25)
--- a/2
+++ b/2
@ -1 +1 @@
-4.3.1
+4.3.2
--- a/main.go
+++ b/main.go
@ -234,8 +234,18 @@ func setupPages(cfg *config.Config, r *touka.Engine) {
 		}

 	case "external":
-		r.SetUnMatchFS(http.Dir(cfg.Pages.StaticDir))
-
+		if cfg.Pages.StaticDir == "" {
+			logger.Errorf("Pages Mode is 'external' but StaticDir is empty. Using embedded pages instead.")
+			err := setInternalRoute(cfg, r)
+			if err != nil {
+				logger.Errorf("Failed to load embedded pages: %s", err)
+				fmt.Printf("Failed to load embedded pages: %s", err)
+				os.Exit(1)
+			}
+		} else {
+			extPageFS := os.DirFS(cfg.Pages.StaticDir)
+			r.SetUnMatchFS(http.FS(extPageFS))
+		}
 	default:
 		// 处理无效的Pages Mode
 		logger.Warnf("Invalid Pages Mode: %s, using default embedded theme", cfg.Pages.Mode)
Author	SHA1	Message	Date
WJQSERVER	efb63927e9	Merge pull request #164 from WJQSERVER-STUDIO/dev Some checks failed Build / prepare (push) Has been cancelled Details Build / build (amd64, darwin) (push) Has been cancelled Details Build / build (amd64, freebsd) (push) Has been cancelled Details Build / build (amd64, linux) (push) Has been cancelled Details Build / build (arm64, darwin) (push) Has been cancelled Details Build / build (arm64, freebsd) (push) Has been cancelled Details Build / build (arm64, linux) (push) Has been cancelled Details Build / docker (push) Has been cancelled Details 4.3.2	2025-08-20 15:56:39 +08:00
wjqserver	a285777217	4.3.2	2025-08-20 15:53:09 +08:00
wjqserver	44cc5d5677	fix if cfg.Pages.StaticDir is "" issue	2025-08-20 15:48:00 +08:00
 @ -1 +1 @@
 .3.1
 .3.2