diff --git a/VERSION b/VERSION
index 943f9cb..53adb84 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.7.1
+1.8.2
diff --git a/config.yaml b/config.yaml
index 875d5aa..508eae0 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,7 +1,7 @@
base:
name: FileCodeBox
description: 开箱即用的文件快传系统
- keywords: ""
+ keywords: FileCodeBox, 文件快递柜, 口令传送箱, 匿名口令分享文本, 文件
port: 12345
host: 0.0.0.0
datapath: /Users/zhangyi/zy/FileCodeBox/data
@@ -44,8 +44,6 @@ mcp:
enablemcpserver: 0
mcpport: ""
mcphost: ""
-notifytitle: ""
-notifycontent: ""
ui:
themes_select: themes/2025
background: ""
@@ -54,15 +52,9 @@ ui:
User-agent: *
Disallow: /
show_admin_addr: 0
- opacity: 0
-themes_select: themes/2025
-robots_text: |-
- User-agent: *
- Disallow: /
-page_explain: 请勿上传或分享违法内容。根据《中华人民共和国网络安全法》、《中华人民共和国刑法》、《中华人民共和国治安管理处罚法》等相关规定。 传播或存储违法、违规内容，会受到相关处罚，严重者将承担刑事责任。本站坚决配合相关部门，确保网络内容的安全，和谐，打造绿色网络环境。
-show_admin_addr: 0
-opacity: 0
-background: ""
+ opacity: 1
+notify_title: ""
+notify_content: ""
sys_start: ""
upload_minute: 0
upload_count: 0
diff --git a/docs/swagger-enhanced.yaml b/docs/swagger-enhanced.yaml
index f555c50..d4d8c13 100644
--- a/docs/swagger-enhanced.yaml
+++ b/docs/swagger-enhanced.yaml
@@ -2,7 +2,7 @@ swagger: "2.0"
info:
title: "FileCodeBox API"
description: "FileCodeBox 是一个用于文件分享和代码片段管理的 Web 应用程序"
- version: "1.7.1"
+ version: "1.8.2"
termsOfService: "http://swagger.io/terms/"
contact:
name: "API Support"
@@ -69,7 +69,7 @@ paths:
example: "2025-09-11T10:00:00Z"
version:
type: "string"
- example: "1.7.1"
+ example: "1.8.2"
uptime:
type: "string"
example: "2h30m15s"
diff --git a/docs/swagger.json b/docs/swagger.json
index 8e31f36..0a5f130 100644
--- a/docs/swagger.json
+++ b/docs/swagger.json
@@ -13,7 +13,7 @@
"name": "MIT",
"url": "https://github.com/zy84338719/filecodebox/blob/main/LICENSE"
},
- "version": "1.7.1"
+ "version": "1.8.2"
},
"host": "localhost:12345",
"basePath": "/",
@@ -553,7 +553,7 @@
},
"version": {
"type": "string",
- "example": "1.7.1"
+ "example": "1.8.2"
}
}
},
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 40e3092..76a5289 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -12,7 +12,7 @@ definitions:
example: 2h30m15s
type: string
version:
- example: 1.7.1
+ example: 1.8.2
type: string
type: object
handlers.SystemConfig:
@@ -57,7 +57,7 @@ info:
url: https://github.com/zy84338719/filecodebox/blob/main/LICENSE
termsOfService: http://swagger.io/terms/
title: FileCodeBox API
- version: "1.7.1"
+ version: "1.8.2"
paths:
/api/config:
get:
diff --git a/internal/config/manager.go b/internal/config/manager.go
index d749d2b..79b043a 100644
--- a/internal/config/manager.go
+++ b/internal/config/manager.go
@@ -3,7 +3,6 @@ package config
import (
"errors"
"os"
- "strconv"
"strings"
"gopkg.in/yaml.v3"
@@ -56,15 +55,17 @@ func NewConfigManager() *ConfigManager {
func InitManager() *ConfigManager {
cm := NewConfigManager()
- // 尝试加载 YAML 配置文件
+ var sources []ConfigSource
+
if configPath := os.Getenv("CONFIG_PATH"); configPath != "" {
- _ = cm.LoadFromYAML(configPath)
+ sources = append(sources, YAMLFileSource{Path: configPath})
} else if _, err := os.Stat("./config.yaml"); err == nil {
- _ = cm.LoadFromYAML("./config.yaml")
+ sources = append(sources, YAMLFileSource{Path: "./config.yaml"})
}
- // 应用环境变量覆盖
- cm.applyEnvironmentOverrides()
+ sources = append(sources, NewDefaultEnvSource())
+
+ _ = cm.ApplySources(sources...)
return cm
}
@@ -135,24 +136,24 @@ func (cm *ConfigManager) mergeSimpleFields(fileCfg *ConfigManager) {
}
}
-// LoadFromYAML 从 YAML 文件加载配置
-func (cm *ConfigManager) LoadFromYAML(path string) error {
- b, err := os.ReadFile(path)
- if err != nil {
- return err
- }
-
- var fileCfg ConfigManager
- if err := yaml.Unmarshal(b, &fileCfg); err != nil {
- return err
+// ApplySources processes a group of configuration sources and collects errors.
+func (cm *ConfigManager) ApplySources(sources ...ConfigSource) error {
+ var errs []error
+ for _, source := range sources {
+ if source == nil {
+ continue
+ }
+ if err := source.Apply(cm); err != nil {
+ errs = append(errs, err)
+ }
}
- // 按模块合并配置
- cm.mergeConfigModules(&fileCfg)
- cm.mergeUserConfig(fileCfg.User)
- cm.mergeSimpleFields(&fileCfg)
+ return errors.Join(errs...)
+}
- return nil
+// LoadFromYAML 从 YAML 文件加载配置
+func (cm *ConfigManager) LoadFromYAML(path string) error {
+ return cm.ApplySources(YAMLFileSource{Path: path})
}
// ReloadConfig 重新加载配置（仅支持环境变量，保持端口不变）
@@ -190,30 +191,8 @@ func (cm *ConfigManager) PersistYAML() error {
// applyEnvironmentOverrides 应用环境变量覆盖配置
func (cm *ConfigManager) applyEnvironmentOverrides() {
- // 基础配置环境变量
- if port := os.Getenv("PORT"); port != "" {
- if n, err := strconv.Atoi(port); err == nil {
- cm.Base.Port = n
- }
- }
- if dataPath := os.Getenv("DATA_PATH"); dataPath != "" {
- cm.Base.DataPath = dataPath
- }
-
- // MCP 配置环境变量
- if enableMCP := os.Getenv("ENABLE_MCP_SERVER"); enableMCP != "" {
- if enableMCP == "true" || enableMCP == "1" {
- cm.MCP.EnableMCPServer = 1
- } else {
- cm.MCP.EnableMCPServer = 0
- }
- }
- if mcpPort := os.Getenv("MCP_PORT"); mcpPort != "" {
- cm.MCP.MCPPort = mcpPort
- }
- if mcpHost := os.Getenv("MCP_HOST"); mcpHost != "" {
- cm.MCP.MCPHost = mcpHost
- }
+ // 收集错误以便在调用者中统一处理，保持现有签名
+ _ = NewDefaultEnvSource().Apply(cm)
}
// Save 保存配置（已废弃，请使用 config.yaml 和环境变量）
diff --git a/internal/config/manager_test.go b/internal/config/manager_test.go
index 9be60a8..5109ffc 100644
--- a/internal/config/manager_test.go
+++ b/internal/config/manager_test.go
@@ -66,3 +66,18 @@ func TestEnvOverride(t *testing.T) {
t.Fatalf("expected PORT env to override to 9090, got %d", cm.Base.Port)
}
}
+
+func TestApplySourcesAggregatesErrors(t *testing.T) {
+ cm := NewConfigManager()
+ src := NewDefaultEnvSource()
+ src.lookup = func(key string) string {
+ if key == "ENABLE_MCP_SERVER" {
+ return "definitely-not-bool"
+ }
+ return ""
+ }
+
+ if err := cm.ApplySources(src); err == nil {
+ t.Fatalf("expected aggregated error when environment value invalid")
+ }
+}
diff --git a/internal/config/source.go b/internal/config/source.go
new file mode 100644
index 0000000..4d8465b
--- /dev/null
+++ b/internal/config/source.go
@@ -0,0 +1,143 @@
+package config
+
+import (
+ "errors"
+ "fmt"
+ "os"
+ "strconv"
+ "strings"
+
+ "gopkg.in/yaml.v3"
+)
+
+// ConfigSource represents a configuration input that can mutate the manager state.
+type ConfigSource interface {
+ Apply(*ConfigManager) error
+}
+
+// ConfigSourceFunc allows plain functions to be used as ConfigSource.
+type ConfigSourceFunc func(*ConfigManager) error
+
+// Apply executes the underlying function.
+func (f ConfigSourceFunc) Apply(cm *ConfigManager) error { return f(cm) }
+
+// YAMLFileSource loads configuration values from a YAML file.
+type YAMLFileSource struct {
+ Path string
+}
+
+// Apply reads and merges YAML content into the manager.
+func (s YAMLFileSource) Apply(cm *ConfigManager) error {
+ if strings.TrimSpace(s.Path) == "" {
+ return errors.New("config: YAML path is empty")
+ }
+
+ data, err := os.ReadFile(s.Path)
+ if err != nil {
+ return err
+ }
+
+ var fileCfg ConfigManager
+ if err := yaml.Unmarshal(data, &fileCfg); err != nil {
+ return fmt.Errorf("config: unmarshal %s: %w", s.Path, err)
+ }
+
+ cm.mergeConfigModules(&fileCfg)
+ cm.mergeUserConfig(fileCfg.User)
+ cm.mergeSimpleFields(&fileCfg)
+ return nil
+}
+
+type envOverride struct {
+ key string
+ apply func(string, *ConfigManager) error
+}
+
+// EnvSource mutates configuration using environment variables.
+type EnvSource struct {
+ overrides []envOverride
+ lookup func(string) string
+}
+
+// NewDefaultEnvSource returns the built-in environment overrides.
+func NewDefaultEnvSource() EnvSource {
+ return EnvSource{
+ overrides: []envOverride{
+ {key: "PORT", apply: applyPortOverride},
+ {key: "DATA_PATH", apply: applyDataPathOverride},
+ {key: "ENABLE_MCP_SERVER", apply: applyMCPEnabledOverride},
+ {key: "MCP_PORT", apply: applyMCPPortOverride},
+ {key: "MCP_HOST", apply: applyMCPHostOverride},
+ },
+ }
+}
+
+// Apply applies every configured override.
+func (s EnvSource) Apply(cm *ConfigManager) error {
+ lookup := s.lookup
+ if lookup == nil {
+ lookup = os.Getenv
+ }
+
+ var errs []error
+ for _, override := range s.overrides {
+ if value := lookup(override.key); value != "" {
+ if err := override.apply(value, cm); err != nil {
+ errs = append(errs, fmt.Errorf("%s: %w", override.key, err))
+ }
+ }
+ }
+
+ return errors.Join(errs...)
+}
+
+func applyPortOverride(val string, cm *ConfigManager) error {
+ port, err := strconv.Atoi(val)
+ if err != nil {
+ return fmt.Errorf("invalid port %q", val)
+ }
+ cm.Base.Port = port
+ return nil
+}
+
+func applyDataPathOverride(val string, cm *ConfigManager) error {
+ if strings.TrimSpace(val) == "" {
+ return errors.New("data path cannot be blank")
+ }
+ cm.Base.DataPath = val
+ return nil
+}
+
+func applyMCPEnabledOverride(val string, cm *ConfigManager) error {
+ enabled, err := parseBool(val)
+ if err != nil {
+ return err
+ }
+ if enabled {
+ cm.MCP.EnableMCPServer = 1
+ } else {
+ cm.MCP.EnableMCPServer = 0
+ }
+ return nil
+}
+
+func applyMCPPortOverride(val string, cm *ConfigManager) error {
+ cm.MCP.MCPPort = val
+ return nil
+}
+
+func applyMCPHostOverride(val string, cm *ConfigManager) error {
+ cm.MCP.MCPHost = val
+ return nil
+}
+
+func parseBool(val string) (bool, error) {
+ switch strings.ToLower(strings.TrimSpace(val)) {
+ case "1", "true", "t", "yes", "y":
+ return true, nil
+ case "0", "false", "f", "no", "n":
+ return false, nil
+ default:
+ return false, fmt.Errorf("invalid boolean value %q", val)
+ }
+}
diff --git a/internal/handlers/admin.go b/internal/handlers/admin.go
index 19e01bf..21ecb21 100644
--- a/internal/handlers/admin.go
+++ b/internal/handlers/admin.go
@@ -137,6 +137,9 @@ func (h *AdminHandler) GetConfig(c *gin.Context) {
SysStart: &cfg.SysStart,
},
}
+
+ resp.NotifyTitle = &cfg.NotifyTitle
+ resp.NotifyContent = &cfg.NotifyContent
common.SuccessResponse(c, resp)
}
diff --git a/internal/handlers/api.go b/internal/handlers/api.go
index d1c57ae..c504726 100644
--- a/internal/handlers/api.go
+++ b/internal/handlers/api.go
@@ -29,7 +29,7 @@ func NewAPIHandler(manager *config.ConfigManager) *APIHandler {
type HealthResponse struct {
Status string `json:"status" example:"ok"`
Timestamp string `json:"timestamp" example:"2025-09-11T10:00:00Z"`
- Version string `json:"version" example:"1.7.1"`
+ Version string `json:"version" example:"1.8.2"`
Uptime string `json:"uptime" example:"2h30m15s"`
}
diff --git a/internal/models/service/system.go b/internal/models/service/system.go
index 4fcb9bc..c9155ba 100644
--- a/internal/models/service/system.go
+++ b/internal/models/service/system.go
@@ -19,7 +19,7 @@ var (
GitBranch = "unknown"
// Version 应用版本号
- Version = "1.7.1"
+ Version = "1.8.2"
)
// BuildInfo 构建信息结构体
diff --git a/internal/models/web/admin.go b/internal/models/web/admin.go
index 4cab9b6..76a7f7d 100644
--- a/internal/models/web/admin.go
+++ b/internal/models/web/admin.go
@@ -160,6 +160,10 @@ type AdminConfigRequest struct {
// 系统运行时特有字段（不属于配置模块的字段）
SysStart *string `json:"sys_start,omitempty"`
+
+ // 顶层通知字段保留与历史配置结构兼容
+ NotifyTitle *string `json:"notify_title,omitempty"`
+ NotifyContent *string `json:"notify_content,omitempty"`
}
// CountResponse 通用计数响应
diff --git a/internal/routes/admin.go b/internal/routes/admin.go
index 724c54a..9bf90ee 100644
--- a/internal/routes/admin.go
+++ b/internal/routes/admin.go
@@ -1,9 +1,6 @@
package routes
import (
- "os"
- "path/filepath"
-
"github.com/zy84338719/filecodebox/internal/config"
"github.com/zy84338719/filecodebox/internal/handlers"
"github.com/zy84338719/filecodebox/internal/middleware"
@@ -56,116 +53,36 @@ func SetupAdminRoutes(
// 将管理后台静态资源与前端入口注册为公开路由，允许未认证用户加载登录页面和相关静态资源
// 注意：API 路由仍然放在受保护的 authGroup 中
- themeDir := "./" + cfg.UI.ThemesSelect
-
- // css
- adminGroup.GET("/css/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "admin", "css", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
+ serveFile := func(parts ...string) func(*gin.Context) {
+ return func(c *gin.Context) {
+ rel := c.Param("filepath")
+ joined := append(parts, rel)
+ path, err := static.ResolveThemeFile(cfg, joined...)
+ if err != nil {
+ c.Status(404)
+ return
+ }
+ c.File(path)
}
- c.File(p)
- })
+ }
- // HEAD for css
- adminGroup.HEAD("/css/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "admin", "css", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
+ // css
+ adminGroup.GET("/css/*filepath", serveFile("admin", "css"))
+ adminGroup.HEAD("/css/*filepath", serveFile("admin", "css"))
// js
- adminGroup.GET("/js/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "admin", "js", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
-
- // HEAD for js
- adminGroup.HEAD("/js/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "admin", "js", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
+ adminGroup.GET("/js/*filepath", serveFile("admin", "js"))
+ adminGroup.HEAD("/js/*filepath", serveFile("admin", "js"))
// templates
- adminGroup.GET("/templates/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "admin", "templates", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
-
- // HEAD for templates
- adminGroup.HEAD("/templates/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "admin", "templates", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
+ adminGroup.GET("/templates/*filepath", serveFile("admin", "templates"))
+ adminGroup.HEAD("/templates/*filepath", serveFile("admin", "templates"))
// assets and components
- adminGroup.GET("/assets/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "assets", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
-
- // HEAD for assets
- adminGroup.HEAD("/assets/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "assets", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
-
- adminGroup.GET("/components/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "components", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
-
- // HEAD for components
- adminGroup.HEAD("/components/*filepath", func(c *gin.Context) {
- fp := c.Param("filepath")
- p := filepath.Join(themeDir, "components", fp)
- if _, err := os.Stat(p); err != nil {
- c.Status(404)
- return
- }
- c.File(p)
- })
+ adminGroup.GET("/assets/*filepath", serveFile("assets"))
+ adminGroup.HEAD("/assets/*filepath", serveFile("assets"))
+ adminGroup.GET("/components/*filepath", serveFile("components"))
+ adminGroup.HEAD("/components/*filepath", serveFile("components"))
// 管理前端入口公开：允许未认证用户加载登录页面
adminGroup.GET("/", func(c *gin.Context) {
diff --git a/internal/services/admin/config.go b/internal/services/admin/config.go
index e4ccc80..a424c98 100644
--- a/internal/services/admin/config.go
+++ b/internal/services/admin/config.go
@@ -2,6 +2,7 @@ package admin
import (
"fmt"
+ "strings"
"github.com/zy84338719/filecodebox/internal/config"
"github.com/zy84338719/filecodebox/internal/models/web"
@@ -22,6 +23,12 @@ func (s *Service) UpdateConfig(configData map[string]interface{}) error {
// UpdateConfigFromRequest 从结构化请求更新配置
func (s *Service) UpdateConfigFromRequest(configRequest *web.AdminConfigRequest) error {
// 直接更新配置管理器的各个模块，不使用 map 转换
+ ensureUI := func() *config.UIConfig {
+ if s.manager.UI == nil {
+ s.manager.UI = &config.UIConfig{}
+ }
+ return s.manager.UI
+ }
// 处理基础配置
if configRequest.Base != nil {
@@ -152,24 +159,20 @@ func (s *Service) UpdateConfigFromRequest(configRequest *web.AdminConfigRequest)
// 处理 UI 配置
if configRequest.UI != nil {
uiConfig := configRequest.UI
- if uiConfig.ThemesSelect != "" {
- s.manager.UI.ThemesSelect = uiConfig.ThemesSelect
- }
- if uiConfig.Background != "" {
- s.manager.UI.Background = uiConfig.Background
- }
- if uiConfig.PageExplain != "" {
- s.manager.UI.PageExplain = uiConfig.PageExplain
- }
- if uiConfig.RobotsText != "" {
- s.manager.UI.RobotsText = uiConfig.RobotsText
- }
- if uiConfig.ShowAdminAddr != 0 {
- s.manager.UI.ShowAdminAddr = uiConfig.ShowAdminAddr
- }
- if uiConfig.Opacity != 0 {
- s.manager.UI.Opacity = uiConfig.Opacity
+ ui := ensureUI()
+ if strings.TrimSpace(uiConfig.ThemesSelect) != "" {
+ ui.ThemesSelect = uiConfig.ThemesSelect
}
+ ui.PageExplain = uiConfig.PageExplain
+ ui.Opacity = uiConfig.Opacity
+ }
+
+ // 顶层通知字段
+ if configRequest.NotifyTitle != nil {
+ s.manager.NotifyTitle = *configRequest.NotifyTitle
+ }
+ if configRequest.NotifyContent != nil {
+ s.manager.NotifyContent = *configRequest.NotifyContent
}
// 处理系统运行时字段
@@ -177,8 +180,10 @@ func (s *Service) UpdateConfigFromRequest(configRequest *web.AdminConfigRequest)
s.manager.SysStart = *configRequest.SysStart
}
- // 保存配置到数据库和文件
- return s.manager.Save()
+ if err := s.manager.PersistYAML(); err != nil {
+ return fmt.Errorf("persist config: %w", err)
+ }
+ return nil
}
// GetFullConfig 获取完整配置 - 返回配置管理器结构体
diff --git a/internal/static/assets.go b/internal/static/assets.go
index 32e53aa..0d78119 100644
--- a/internal/static/assets.go
+++ b/internal/static/assets.go
@@ -2,6 +2,7 @@ package static
import (
"fmt"
+ "html"
"net/http"
"os"
"path/filepath"
@@ -11,14 +12,102 @@ import (
"github.com/zy84338719/filecodebox/internal/config"
)
+const defaultThemeDir = "themes/2025"
+
+func themeCandidates(cfg *config.ConfigManager) []string {
+ var candidates []string
+ seen := make(map[string]struct{})
+ add := func(path string) {
+ path = strings.TrimSpace(path)
+ if path == "" {
+ return
+ }
+ if _, ok := seen[path]; ok {
+ return
+ }
+ seen[path] = struct{}{}
+ candidates = append(candidates, path)
+ }
+
+ if cfg != nil && cfg.UI != nil {
+ add(cfg.UI.ThemesSelect)
+ }
+ add(defaultThemeDir)
+ return candidates
+}
+
+func themeDirExists(dir string) bool {
+ info, err := os.Stat(dir)
+ return err == nil && info.IsDir()
+}
+
+func firstExistingThemeDir(cfg *config.ConfigManager) string {
+ for _, candidate := range themeCandidates(cfg) {
+ if filepath.IsAbs(candidate) {
+ if themeDirExists(candidate) {
+ return candidate
+ }
+ continue
+ }
+ if themeDirExists(candidate) {
+ return candidate
+ }
+ }
+ return defaultThemeDir
+}
+
+func resolveThemeFilePath(cfg *config.ConfigManager, parts ...string) (string, error) {
+ var firstErr error
+ for _, candidate := range themeCandidates(cfg) {
+ pathParts := append([]string{candidate}, parts...)
+ path := filepath.Join(pathParts...)
+ info, err := os.Stat(path)
+ if err == nil {
+ if !info.IsDir() {
+ return path, nil
+ }
+ continue
+ }
+ if firstErr == nil {
+ firstErr = err
+ }
+ }
+ if firstErr == nil {
+ firstErr = os.ErrNotExist
+ }
+ return "", firstErr
+}
+
+func loadThemeFile(cfg *config.ConfigManager, parts ...string) ([]byte, error) {
+ path, err := resolveThemeFilePath(cfg, parts...)
+ if err != nil {
+ return nil, err
+ }
+ return os.ReadFile(path)
+}
+
+// ResolveThemeFile returns the concrete filesystem path for a theme file, applying fallbacks.
+func ResolveThemeFile(cfg *config.ConfigManager, parts ...string) (string, error) {
+ return resolveThemeFilePath(cfg, parts...)
+}
+
+// ThemePath returns the resolved theme directory joined with optional relative parts.
+func ThemePath(cfg *config.ConfigManager, parts ...string) string {
+ root := firstExistingThemeDir(cfg)
+ if len(parts) == 0 {
+ return root
+ }
+ pathParts := append([]string{root}, parts...)
+ return filepath.Join(pathParts...)
+}
+
// RegisterStaticRoutes registers public-facing static routes (assets, css, js, components)
func RegisterStaticRoutes(router *gin.Engine, cfg *config.ConfigManager) {
- themeDir := fmt.Sprintf("./%s", cfg.UI.ThemesSelect)
-
- router.Static("/assets", fmt.Sprintf("%s/assets", themeDir))
- router.Static("/css", fmt.Sprintf("%s/css", themeDir))
- router.Static("/js", fmt.Sprintf("%s/js", themeDir))
- router.Static("/components", fmt.Sprintf("%s/components", themeDir))
+ themeDir := firstExistingThemeDir(cfg)
+ router.Static("/assets", filepath.Join(themeDir, "assets"))
+ router.Static("/css", filepath.Join(themeDir, "css"))
+ router.Static("/js", filepath.Join(themeDir, "js"))
+ router.Static("/components", filepath.Join(themeDir, "components"))
}
// Note: admin static routes are intentionally not registered here.
@@ -29,11 +118,12 @@ func RegisterStaticRoutes(router *gin.Engine, cfg *config.ConfigManager) {
// ServeIndex serves the main index page with basic template replacements.
func ServeIndex(c *gin.Context, cfg *config.ConfigManager) {
- indexPath := filepath.Join(".", cfg.UI.ThemesSelect, "index.html")
-
- content, err := os.ReadFile(indexPath)
+ content, err := loadThemeFile(cfg, "index.html")
if err != nil {
- c.String(http.StatusNotFound, "Index file not found")
+ html := fallbackIndexHTML(cfg)
+ c.Header("Cache-Control", "no-cache")
+ c.Header("Content-Type", "text/html; charset=utf-8")
+ c.String(http.StatusOK, html)
return
}
@@ -58,11 +148,12 @@ func ServeIndex(c *gin.Context, cfg *config.ConfigManager) {
// ServeSetup serves the setup page with template replacements.
func ServeSetup(c *gin.Context, cfg *config.ConfigManager) {
- setupPath := filepath.Join(".", cfg.UI.ThemesSelect, "setup.html")
-
- content, err := os.ReadFile(setupPath)
+ content, err := loadThemeFile(cfg, "setup.html")
if err != nil {
- c.String(http.StatusNotFound, "Setup page not found")
+ html := fallbackSetupHTML(cfg)
+ c.Header("Cache-Control", "no-cache")
+ c.Header("Content-Type", "text/html; charset=utf-8")
+ c.String(http.StatusOK, html)
return
}
@@ -81,11 +172,12 @@ func ServeSetup(c *gin.Context, cfg *config.ConfigManager) {
// ServeAdminPage serves the admin index page
func ServeAdminPage(c *gin.Context, cfg *config.ConfigManager) {
- adminPath := filepath.Join(".", cfg.UI.ThemesSelect, "admin", "index.html")
-
- content, err := os.ReadFile(adminPath)
+ content, err := loadThemeFile(cfg, "admin", "index.html")
if err != nil {
- c.String(http.StatusNotFound, "Admin page not found")
+ html := fallbackAdminHTML(cfg)
+ c.Header("Cache-Control", "no-cache")
+ c.Header("Content-Type", "text/html; charset=utf-8")
+ c.String(http.StatusOK, html)
return
}
@@ -96,9 +188,7 @@ func ServeAdminPage(c *gin.Context, cfg *config.ConfigManager) {
// ServeUserPage serves user-facing static pages (login/register/dashboard/etc.)
func ServeUserPage(c *gin.Context, cfg *config.ConfigManager, pageName string) {
- userPagePath := filepath.Join(".", cfg.UI.ThemesSelect, pageName)
-
- content, err := os.ReadFile(userPagePath)
+ content, err := loadThemeFile(cfg, pageName)
if err != nil {
c.String(http.StatusNotFound, "User page not found: "+pageName)
return
@@ -115,3 +205,118 @@ func ServeUserPage(c *gin.Context, cfg *config.ConfigManager, pageName string) {
c.Header("Content-Type", "text/html; charset=utf-8")
c.String(http.StatusOK, html)
}
+
+func fallbackBaseName(cfg *config.ConfigManager) string {
+ if cfg != nil && cfg.Base != nil {
+ if name := strings.TrimSpace(cfg.Base.Name); name != "" {
+ return name
+ }
+ }
+ return "FileCodeBox"
+}
+
+func fallbackBaseDescription(cfg *config.ConfigManager) string {
+ if cfg != nil && cfg.Base != nil {
+ if desc := strings.TrimSpace(cfg.Base.Description); desc != "" {
+ return desc
+ }
+ }
+ return "A lightweight file sharing service"
+}
+
+func fallbackPageExplain(cfg *config.ConfigManager) string {
+ if cfg != nil && cfg.UI != nil {
+ if explain := strings.TrimSpace(cfg.UI.PageExplain); explain != "" {
+ return explain
+ }
+ }
+ return "Service is running, but the selected theme assets were not found."
+}
+
+func fallbackIndexHTML(cfg *config.ConfigManager) string {
+ name := html.EscapeString(fallbackBaseName(cfg))
+ desc := html.EscapeString(fallbackBaseDescription(cfg))
+ explain := html.EscapeString(fallbackPageExplain(cfg))
+
+ return fmt.Sprintf(`
+
+
+
+
+%s
+
+
+
+
+
%s
+
%s
+
%s
+
The configured theme directory is missing; static assets will load once it is restored.
+
+
%s 初始化
+
%s
+
主题资源尚未就绪，请先完成配置文件中的 ui.themes_select 目录部署。
+
+- 确认主题目录已随构建产物一并分发
+- 或在配置中切换到有效的主题路径
+- 之后重新刷新本页面即可完成初始化流程
+
+
+
Admin theme missing
+
Static assets for the admin console are unavailable. Restore the configured theme directory to load the full interface.
+