diff --git a/Makefile b/Makefile
index 2df5abd..8670bf1 100644
--- a/Makefile
+++ b/Makefile
@@ -24,9 +24,9 @@ GO_VERSION := $(shell go version | awk '{print $$3}')
# 构建标志
LDFLAGS := -ldflags "\
- -X 'github.com/zy84338719/filecodebox/internal/models.Version=$(VERSION)' \
- -X 'github.com/zy84338719/filecodebox/internal/models.GitCommit=$(COMMIT)' \
- -X 'github.com/zy84338719/filecodebox/internal/models.BuildTime=$(DATE)' \
+ -X 'github.com/zy84338719/filecodebox/internal/models/service.Version=$(VERSION)' \
+ -X 'github.com/zy84338719/filecodebox/internal/models/service.GitCommit=$(COMMIT)' \
+ -X 'github.com/zy84338719/filecodebox/internal/models/service.BuildTime=$(DATE)' \
-w -s"
# 默认目标
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..53adb84
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.8.2
diff --git a/config.yaml b/config.yaml
index aaf5860..508eae0 100644
--- a/config.yaml
+++ b/config.yaml
@@ -1,8 +1,8 @@
base:
name: FileCodeBox
description: 开箱即用的文件快传系统
- keywords: ""
- port: 12346
+ keywords: FileCodeBox, 文件快递柜, 口令传送箱, 匿名口令分享文本, 文件
+ port: 12345
host: 0.0.0.0
datapath: /Users/zhangyi/zy/FileCodeBox/data
production: false
@@ -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/RELEASE_NOTES/v1.8.2.md b/docs/RELEASE_NOTES/v1.8.2.md
new file mode 100644
index 0000000..f658122
--- /dev/null
+++ b/docs/RELEASE_NOTES/v1.8.2.md
@@ -0,0 +1,13 @@
+## v1.8.2 - 2025-09-22
+
+Release: v1.8.2
+
+Changes:
+
+- 更新版本标识与 API 文档到 `1.8.2`
+ - 修改文件：`VERSION`, `main.go`, `internal/models/service/system.go`, `internal/handlers/api.go`, `docs/swagger.yaml`, `docs/swagger.json`, `docs/swagger-enhanced.yaml`
+
+Notes:
+
+- 构建与单元测试已在本地通过（`go build ./...`, `go test ./...`）。
+- 依赖版本（`go.sum`）未更改。
diff --git a/docs/docs.go b/docs/docs.go
index b5c844c..4efe4cc 100644
--- a/docs/docs.go
+++ b/docs/docs.go
@@ -1,7 +1,10 @@
// Package docs Code generated by swaggo/swag. DO NOT EDIT
package docs
-import "github.com/swaggo/swag"
+import (
+ "github.com/swaggo/swag"
+ "github.com/zy84338719/filecodebox/internal/models/service"
+)
const docTemplate = `{
"schemes": {{ marshal .Schemes }},
@@ -618,7 +621,7 @@ const docTemplate = `{
// SwaggerInfo holds exported Swagger Info so clients can modify it
var SwaggerInfo = &swag.Spec{
- Version: "1.0",
+ Version: service.Version,
Host: "localhost:12345",
BasePath: "/",
Schemes: []string{},
diff --git a/docs/swagger-enhanced.yaml b/docs/swagger-enhanced.yaml
index df68ad2..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.0"
+ 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.0.0"
+ example: "1.8.2"
uptime:
type: "string"
example: "2h30m15s"
diff --git a/docs/swagger.json b/docs/swagger.json
index 31f1abd..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.0"
+ "version": "1.8.2"
},
"host": "localhost:12345",
"basePath": "/",
@@ -553,7 +553,7 @@
},
"version": {
"type": "string",
- "example": "1.0.0"
+ "example": "1.8.2"
}
}
},
@@ -608,4 +608,4 @@
"type": "basic"
}
}
-}
\ No newline at end of file
+}
diff --git a/docs/swagger.yaml b/docs/swagger.yaml
index 23f7f74..76a5289 100644
--- a/docs/swagger.yaml
+++ b/docs/swagger.yaml
@@ -12,7 +12,7 @@ definitions:
example: 2h30m15s
type: string
version:
- example: 1.0.0
+ 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.0"
+ version: "1.8.2"
paths:
/api/config:
get:
diff --git a/go.mod b/go.mod
index 7128acd..c1e9bc6 100644
--- a/go.mod
+++ b/go.mod
@@ -9,8 +9,8 @@ require (
github.com/aws/aws-sdk-go-v2/config v1.27.27
github.com/aws/aws-sdk-go-v2/credentials v1.17.27
github.com/aws/aws-sdk-go-v2/service/s3 v1.58.3
- github.com/gin-contrib/cors v1.4.0
- github.com/gin-gonic/gin v1.8.2
+ github.com/gin-contrib/cors v1.6.0
+ github.com/gin-gonic/gin v1.9.1
github.com/golang-jwt/jwt/v4 v4.5.2
github.com/mattn/go-sqlite3 v1.14.32
github.com/robfig/cron/v3 v3.0.1
@@ -47,6 +47,10 @@ require (
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.26.4 // indirect
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 // indirect
github.com/aws/smithy-go v1.20.3 // indirect
+ github.com/bytedance/sonic v1.11.2 // indirect
+ github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect
+ github.com/chenzhuoyu/iasm v0.9.1 // indirect
+ github.com/gabriel-vasile/mimetype v1.4.3 // indirect
github.com/gin-contrib/sse v1.1.0 // indirect
github.com/go-openapi/jsonpointer v0.22.0 // indirect
github.com/go-openapi/jsonreference v0.21.1 // indirect
@@ -65,17 +69,19 @@ require (
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
github.com/go-playground/locales v0.14.1 // indirect
github.com/go-playground/universal-translator v0.18.1 // indirect
- github.com/go-playground/validator/v10 v10.11.2 // indirect
+ github.com/go-playground/validator/v10 v10.19.0 // indirect
github.com/go-sql-driver/mysql v1.8.1 // indirect
github.com/goccy/go-json v0.10.5 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jackc/pgpassfile v1.0.0 // indirect
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect
- github.com/jackc/pgx/v5 v5.2.0 // indirect
+ github.com/jackc/pgx/v5 v5.5.4 // indirect
+ github.com/jackc/puddle/v2 v2.2.1 // indirect
github.com/jinzhu/inflection v1.0.0 // indirect
github.com/jinzhu/now v1.1.5 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
+ github.com/klauspost/cpuid/v2 v2.2.7 // indirect
github.com/leodido/go-urn v1.4.0 // indirect
github.com/mailru/easyjson v0.9.0 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
@@ -83,12 +89,14 @@ require (
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
github.com/spf13/pflag v1.0.6 // indirect
+ github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.3.0 // indirect
+ golang.org/x/arch v0.7.0 // indirect
golang.org/x/mod v0.12.0 // indirect
golang.org/x/net v0.23.0 // indirect
+ golang.org/x/sync v0.1.0 // indirect
golang.org/x/sys v0.35.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.7.0 // indirect
google.golang.org/protobuf v1.36.8 // indirect
- gopkg.in/yaml.v2 v2.4.0 // indirect
)
diff --git a/go.sum b/go.sum
index 5f27fc0..399a32c 100644
--- a/go.sum
+++ b/go.sum
@@ -42,23 +42,36 @@ github.com/aws/aws-sdk-go-v2/service/sts v1.30.3 h1:ZsDKRLXGWHk8WdtyYMoGNO7bTudr
github.com/aws/aws-sdk-go-v2/service/sts v1.30.3/go.mod h1:zwySh8fpFyXp9yOr/KVzxOl8SRqgf/IDw5aUt9UKFcQ=
github.com/aws/smithy-go v1.20.3 h1:ryHwveWzPV5BIof6fyDvor6V3iUL7nTfiTKXHiW05nE=
github.com/aws/smithy-go v1.20.3/go.mod h1:krry+ya/rV9RDcV/Q16kpu6ypI4K2czasz0NC3qS14E=
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
+github.com/bytedance/sonic v1.11.2 h1:ywfwo0a/3j9HR8wsYGWsIWl2mvRsI950HyoxiBERw5A=
+github.com/bytedance/sonic v1.11.2/go.mod h1:iZcSUejdk5aukTND/Eu/ivjQuEL0Cu9/rf50Hi0u/g4=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d h1:77cEq6EriyTZ0g/qfRdp61a3Uu/AWrgIq2s0ClJV1g0=
+github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d/go.mod h1:8EPpVsBuRksnlj1mLy4AWzRNQYxauNi62uWcE3to6eA=
+github.com/chenzhuoyu/iasm v0.9.0/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
+github.com/chenzhuoyu/iasm v0.9.1 h1:tUHQJXo3NhBqw6s33wkGn9SP3bvrWLdlVIJ3hQBL7P0=
+github.com/chenzhuoyu/iasm v0.9.1/go.mod h1:Xjy2NpN3h7aUqeqM+woSuuvxmIe6+DDsiNLIrkAmYog=
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
github.com/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g=
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
+github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/cors v1.4.0 h1:oJ6gwtUl3lqV0WEIwM/LxPF1QZ5qe2lGWdY2+bz7y0g=
-github.com/gin-contrib/cors v1.4.0/go.mod h1:bs9pNM0x/UsmHPBWT2xZz9ROh8xYjYkiURUfmBoMlcs=
+github.com/gin-contrib/cors v1.6.0 h1:0Z7D/bVhE6ja07lI8CTjTonp6SB07o8bNuFyRbsBUQg=
+github.com/gin-contrib/cors v1.6.0/go.mod h1:cI+h6iOAyxKRtUtC6iF/Si1KSFvGm/gK+kshxlCi8ro=
github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
github.com/gin-contrib/sse v1.1.0 h1:n0w2GMuUpWDVp7qSpvze6fAu9iRxJY4Hmj6AmBOU05w=
github.com/gin-contrib/sse v1.1.0/go.mod h1:hxRZ5gVpWMT7Z0B0gSNYqqsSCNIJMjzvm6fqCz9vjwM=
github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/gin-gonic/gin v1.8.2 h1:UzKToD9/PoFj/V4rvlKqTRKnQYyz8Sc1MJlv4JHPtvY=
-github.com/gin-gonic/gin v1.8.2/go.mod h1:qw5AYuDrzRTnhvusDsrov+fDIxp9Dleuu12h8nfB398=
+github.com/gin-gonic/gin v1.9.1 h1:4idEAncQnU5cB7BeOkPtxjfCSye0AAm1R0RVIqJ+Jmg=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
github.com/go-openapi/jsonpointer v0.22.0 h1:TmMhghgNef9YXxTu1tOopo+0BGEytxA+okbry0HjZsM=
@@ -105,8 +118,8 @@ github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl
github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.11.2 h1:q3SHpufmypg+erIExEKUmsgmhDTyhcJ38oeKGACXohU=
-github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
+github.com/go-playground/validator/v10 v10.19.0 h1:ol+5Fu+cSq9JD7SoSqe04GMI92cbn0+wvQ3bZ8b/AU4=
+github.com/go-playground/validator/v10 v10.19.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y=
github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg=
@@ -129,9 +142,12 @@ github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4
github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo=
github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM=
-github.com/jackc/pgx/v5 v5.2.0 h1:NdPpngX0Y6z6XDFKqmFQaE+bCtkqzvQIOt1wvBlAqs8=
github.com/jackc/pgx/v5 v5.2.0/go.mod h1:Ptn7zmohNsWEsdxRawMzk3gaKma2obW+NWTnKa0S4nk=
+github.com/jackc/pgx/v5 v5.5.4 h1:Xp2aQS8uXButQdnCMWNmvx6UysWQQC+u1EoizjguY+8=
+github.com/jackc/pgx/v5 v5.5.4/go.mod h1:ez9gk+OAat140fv9ErkZDYFWmXLfV+++K0uAOiwgm1A=
github.com/jackc/puddle/v2 v2.1.2/go.mod h1:2lpufsF5mRHO6SuZkm0fNYxM6SWHfvyFj62KwNzgels=
+github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk=
+github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4=
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
github.com/jinzhu/now v1.1.4/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
@@ -142,6 +158,10 @@ github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFF
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
+github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@@ -200,12 +220,14 @@ github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
github.com/studio-b12/gowebdav v0.10.0 h1:Yewz8FFiadcGEu4hxS/AAJQlHelndqln1bns3hcJIYc=
@@ -218,6 +240,8 @@ github.com/swaggo/gin-swagger v1.5.3/go.mod h1:3XJKSfHjDMB5dBo/0rrTXidPmgLeqsX89
github.com/swaggo/swag v1.8.1/go.mod h1:ugemnJsPZm/kRwFUnzBlbHRd0JY9zE1M4F+uy2pAaPQ=
github.com/swaggo/swag v1.16.4 h1:clWJtd9LStiG3VeijiCfOVODP6VpHtKdQy9ELFG3s1A=
github.com/swaggo/swag v1.16.4/go.mod h1:VBsHJRsDvfYvqoiMKnsdwhNV9LEMHgEDZcyVYX0sxPg=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
github.com/ugorji/go/codec v1.3.0 h1:Qd2W2sQawAfG8XSvzwhBeoGq71zXOC/Q1E9y/wUcsUA=
@@ -226,6 +250,9 @@ github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/X
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.7.0 h1:pskyeJh/3AmoQ8CPE95vxHLqp1G1GfGNXTmcl9NEKTc=
+golang.org/x/arch v0.7.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
@@ -255,6 +282,8 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
+golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -270,6 +299,7 @@ golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.35.0 h1:vz1N37gP5bs89s7He8XuIYXpyY0+QlsKmzipCbUtyxI=
golang.org/x/sys v0.35.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
@@ -313,7 +343,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -330,3 +359,5 @@ gorm.io/gorm v1.24.2/go.mod h1:DVrVomtaYTbqs7gB/x2uVvqnXzv0nqjB396B8cG4dBA=
gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
gorm.io/gorm v1.25.10 h1:dQpO+33KalOA+aFYGlK+EfxcI5MbO7EP2yYygwh9h+s=
gorm.io/gorm v1.25.10/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
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 41dd616..c504726 100644
--- a/internal/handlers/api.go
+++ b/internal/handlers/api.go
@@ -8,11 +8,7 @@ import (
"github.com/gin-gonic/gin"
"github.com/zy84338719/filecodebox/internal/common"
"github.com/zy84338719/filecodebox/internal/config"
-)
-
-// 应用版本号
-const (
- DefaultVersion = "1.0.0"
+ "github.com/zy84338719/filecodebox/internal/models"
)
// 应用启动时间
@@ -33,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.0.0"`
+ Version string `json:"version" example:"1.8.2"`
Uptime string `json:"uptime" example:"2h30m15s"`
}
@@ -49,7 +45,7 @@ func (h *APIHandler) GetHealth(c *gin.Context) {
// 从环境变量获取版本号，如果不存在则使用默认版本
version := os.Getenv("APP_VERSION")
if version == "" {
- version = DefaultVersion
+ version = models.Version
}
// 检查服务健康状态
diff --git a/internal/mcp/filecodebox.go b/internal/mcp/filecodebox.go
index bb4fbf3..ccbb5de 100644
--- a/internal/mcp/filecodebox.go
+++ b/internal/mcp/filecodebox.go
@@ -34,7 +34,7 @@ func NewFileCodeBoxMCPServer(
adminService *services.AdminService,
userService *services.UserService,
) *FileCodeBoxMCPServer {
- server := NewServer("FileCodeBox MCP Server", "1.0.0")
+ server := NewServer("FileCodeBox MCP Server", models.Version)
mcpServer := &FileCodeBoxMCPServer{
Server: server,
diff --git a/internal/mcp/manager.go b/internal/mcp/manager.go
index 99c9fb9..c40ef37 100644
--- a/internal/mcp/manager.go
+++ b/internal/mcp/manager.go
@@ -10,6 +10,7 @@ import (
"github.com/sirupsen/logrus"
"github.com/zy84338719/filecodebox/internal/config"
+ "github.com/zy84338719/filecodebox/internal/models"
"github.com/zy84338719/filecodebox/internal/repository"
"github.com/zy84338719/filecodebox/internal/services"
"github.com/zy84338719/filecodebox/internal/storage"
@@ -180,7 +181,7 @@ func (m *MCPManager) GetStatus() MCPStatus {
if m.running && m.server != nil {
status.ServerInfo = ServerInfo{
Name: "FileCodeBox MCP Server",
- Version: "1.0.0",
+ Version: models.Version,
}
}
diff --git a/internal/models/service/system.go b/internal/models/service/system.go
index 5eed5ff..c9155ba 100644
--- a/internal/models/service/system.go
+++ b/internal/models/service/system.go
@@ -19,7 +19,7 @@ var (
GitBranch = "unknown"
// Version 应用版本号
- Version = "0.0.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.
+