Merge pull request #46 from eiblog/dependabot/go_modules/golang.org/x/crypto-0.45.0

chore(deps): bump golang.org/x/crypto from 0.40.0 to 0.45.0

CHANGELOG.md

@@ -2,6 +2,41 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.0.11](https://github.com/eiblog/eiblog/compare/v3.0.10...v3.0.11) (2026-01-04)
+
+
+### Bug Fixes
+
+* title in xml not escape ([14b4534](https://github.com/eiblog/eiblog/commit/14b4534c1e034684b19808168ad0fbf5464e18ef))
+
+### [3.0.10](https://github.com/eiblog/eiblog/compare/v3.0.9...v3.0.10) (2025-11-12)
+
+
+### Bug Fixes
+
+* default RUN_MODE=prod ([5aa8152](https://github.com/eiblog/eiblog/commit/5aa81528027eca648e430503a1f5a04118ca650e))
+
+### [3.0.9](https://github.com/eiblog/eiblog/compare/v3.0.8...v3.0.9) (2025-11-12)
+
+
+### Bug Fixes
+
+* image RUN_MODE ([71c0226](https://github.com/eiblog/eiblog/commit/71c02266bc0173a4af1ffc876dc36051377e1af0))
+
+### [3.0.8](https://github.com/eiblog/eiblog/compare/v3.0.7...v3.0.8) (2025-10-14)
+
+
+### Bug Fixes
+
+* upload file path ([523ee64](https://github.com/eiblog/eiblog/commit/523ee64931a0dc1f9f743682fe84b1a1f250686c))
+
+### [3.0.7](https://github.com/eiblog/eiblog/compare/v3.0.6...v3.0.7) (2025-07-26)
+
+
+### Bug Fixes
+
+* feed not generate ([11b22da](https://github.com/eiblog/eiblog/commit/11b22da339c542eb6d697cb3ac7bc78a401c6420))
+
 ### [3.0.6](https://github.com/eiblog/eiblog/compare/v3.0.5...v3.0.6) (2025-07-25)
 
 

README.md

@@ -1,8 +1,6 @@
 # EiBlog [![License](https://img.shields.io/badge/license-MIT-brightgreen.svg)](LICENSE.md) [![Versuib](https://img.shields.io/github/tag/eiblog/eiblog.svg)](https://github.com/eiblog/eiblog/releases) 
 
-> 博客项目结构参考模版：https://github.com/deepzz0/appdemo
-
-用过其它博客系统，不喜欢，不够轻，不够快！这是我开发的第二款博客系统，也实在不想再在这件事情上过多纠结了。`EiBlog` 是一个比较稳定的博客系统，现已迭代至 `2.0` 版本，稳定性和维护你是不用担心的。
+用过其它博客系统，不喜欢，不够轻，不够快！这是我开发的第二款博客系统，也实在不想再在这件事情上过多纠结了。`EiBlog` 是一个比较稳定的博客系统，博主已稳定使用多年。这里是 `3.0` 版本，如果仍在使用 `2.0` [请点击这里](https://github.com/eiblog/eiblog/tree/v2)。
 
 但它有着部署简单（上线复杂！）的特点，不推荐没有计算机知识的朋友搭建，欢迎咨询。该博客的个中优点（简洁、轻快，安全），等你体验。
 
@@ -12,6 +10,13 @@ Docker镜像地址：
 * 博客搜索：[deepzz0/elasticsearch](https://hub.docker.com/r/deepzz0/elasticsearch)
 * 数据备份：[deepzz0/backup](https://hub.docker.com/r/deepzz0/backup)
 
+### 功能变化
+
+- [x] 增对 **TOTP 双因素认证** 的支持，配置开启后后台绑定
+- [x] 新增 **自定义页面**，支持独立页面和内嵌页面
+- [x] 优化项目结构，更加清晰，各个 app 之间配置独立
+- [ ] 支持多搜索引擎，如数据库原生、[zincsearch](https://github.com/zincsearch/zincsearch)、bleve 等
+
 ### 快速体验
 
 **二进制**
@@ -33,8 +38,6 @@ $ docker run --name eiblog \
 参考项目根目录下的 [docker-compose.yml](https://github.com/eiblog/eiblog/blob/v2/docker-compose.yml)，修改相关配置：
 
 ```
-$ docker compose up -d
-或
 $ docker-compose up -d
 ```
 
@@ -46,7 +49,7 @@ $ docker-compose up -d
 
 | 类型（driver） | 地址（source）示例                                           |
 | -------------- | ------------------------------------------------------------ |
-| mongodb        | mongodb://localhost:27017                                    |
+| mongodb        | mongodb://localhost:27017/eiblog                             |
 | mysql          | user:password@tcp(localhost:3306)/eiblog?charset=utf8mb4&parseTime=True&loc=Local |
 | postgres       | host=localhost port=5432 user=user password=password dbname=eiblog sslmode=disable |
 | sqlite         | /path/eiblog.db                                              |

cmd/backup/config/config.go

@@ -28,9 +28,12 @@ var Conf Config
 // load config file
 func init() {
 	// run mode
-	mode := config.RunMode(os.Getenv("RUN_MODE"))
-	if !mode.IsRunMode() {
-		panic("config: unsupported env RUN_MODE: " + mode)
+	mode := config.RunModeProd
+	if m := os.Getenv("RUN_MODE"); m != "" {
+		mode = config.RunMode(m)
+		if !mode.IsRunMode() {
+			panic("config: unsupported env RUN_MODE: " + mode)
+		}
 	}
 	logrus.Infof("Run mode:%s", mode)
 

cmd/backup/etc/app.yml

@@ -3,7 +3,7 @@ apimode:
   listen: 0.0.0.0:9000
 database: # 数据库配置
   driver: mongodb
-  source: mongodb://localhost:27017
+  source: mongodb://localhost:27017/eiblog
 backupto: qiniu # 备份到, default: qiniu
 interval: 7d # 备份周期, default: 7d
 validity: 60 # 备份保留时间, default: 60

cmd/backup/handler/timer/db/mgodb.go

@@ -24,14 +24,17 @@ func (r MongoStorage) Backup(name string) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	arg := fmt.Sprintf("mongodump -h %s -d eiblog -o /tmp", u.Host)
+	if u.Path == "" {
+		return "", fmt.Errorf("no database specified")
+	}
+	arg := fmt.Sprintf("mongodump -h %s -d %s -o /tmp", u.Host, u.Path)
 	cmd := exec.CommandContext(ctx, "sh", "-c", arg)
 	err = cmd.Run()
 	if err != nil {
 		return "", err
 	}
 	// tar
-	arg = fmt.Sprintf("tar czf /tmp/%s -C /tmp eiblog", name)
+	arg = fmt.Sprintf("tar czf /tmp/%s -C /tmp %s", name, u.Path)
 	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
 	err = cmd.Run()
 	if err != nil {
@@ -66,7 +69,7 @@ func (r MongoStorage) Restore(path string) error {
 	if err != nil {
 		return err
 	}
-	arg = fmt.Sprintf("mongorestore -h %s -d eiblog /tmp/eiblog", u.Host)
+	arg = fmt.Sprintf("mongorestore -h %s -d %s /tmp/%s", u.Host, u.Path, u.Path)
 	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
 	return cmd.Run()
 }

cmd/eiblog/CHANGELOG.md

@@ -1,5 +0,0 @@
-# Changelog
-
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
-
-### [3.0.3](https://github.com/eiblog/eiblog/compare/v3.0.2...v3.0.3) (2025-07-25)

cmd/eiblog/config/config.go

@@ -43,9 +43,12 @@ type Config struct {
 // init 初始化配置
 func init() {
 	// run mode
-	mode := config.RunMode(os.Getenv("RUN_MODE"))
-	if !mode.IsRunMode() {
-		panic("config: unsupported env RUN_MODE: " + mode)
+	mode := config.RunModeProd
+	if rm := os.Getenv("RUN_MODE"); rm != "" {
+		mode = config.RunMode(rm)
+		if !mode.IsRunMode() {
+			panic("config: unsupported env RUN_MODE: " + mode)
+		}
 	}
 	logrus.Infof("Run mode:%s", mode)
 

cmd/eiblog/etc/app.yml

@@ -40,13 +40,13 @@ google: # 谷歌分析
   adsense: <script async src="https://pagead2.googlesyndication.com/xxx" crossorigin="anonymous"></script>
 qiniu: # 七牛OSS
   bucket: eiblog
-  domain: st.deepzz.com
+  domain: st.deepzz.cn
   accesskey: MB6AXl_Sj_mmFsL-Lt59Dml2Vmy2o8XMmiCbbSeC
   secretkey: BIrMy0fsZ0_SHNceNXk3eDuo7WmVYzj2-zrmd5Tf
 twitter: # twitter card
   card: summary
   site: deepzz02
-  image: st.deepzz.com/static/img/avatar.jpg
+  image: st.deepzz.cn/static/img/avatar.jpg
   address: twitter.com/deepzz02
 feedrpc: # rss ping
   feedrurl: https://deepzz.superfeedr.com/

cmd/eiblog/etc/xml/feedTpl.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
     <channel>
-        <title>{{.Title}}</title>
+        <title>{{xmlescape .Title}}</title>
         <link>https://{{.Host}}</link>
-        <description>{{.SubTitle}}</description>
+        <description>{{xmlescape .SubTitle}}</description>
         <atom:link href="https://{{.Host}}/rss.html" rel="self" />
         <atom:link href="{{.FeedrURL}}" rel="hub" />
         <language>zh-CN</language>
         <lastBuildDate>{{.BuildDate}}</lastBuildDate>
         {{range .Articles}}
         <item>
-            <title>{{.Title}}</title>
+            <title>{{xmlescape .Title}}</title>
             <link>https://{{$.Host}}/post/{{.Slug}}.html</link>
             <comments>https://{{$.Host}}/post/{{.Slug}}.html#comments</comments>
             <guid>https://{{$.Host}}/post/{{.Slug}}.html</guid>

cmd/eiblog/handler/internal/timer.go

@@ -90,32 +90,28 @@ func generateCrossdomain() error {
 
 // refreshFeedAndSitemap 定时刷新feed和sitemap
 func refreshFeedAndSitemap() {
-	defer time.AfterFunc(time.Hour, refreshFeedAndSitemap)
+	defer time.AfterFunc(time.Hour*4, refreshFeedAndSitemap)
 
 	now := time.Now()
 	// generate feed & sitemap
-	if now.Hour()%4 == 0 {
-		err := generateFeed()
-		if err != nil {
-			logrus.Error("startTimer.generateFeed: ", err)
-		}
-		err = generateSitemap()
-		if err != nil {
-			logrus.Error("startTimer.generateSitemap: ", err)
-		}
+	err := generateFeed()
+	if err != nil {
+		logrus.Error("startTimer.generateFeed: ", err)
+	}
+	err = generateSitemap()
+	if err != nil {
+		logrus.Error("startTimer.generateSitemap: ", err)
 	}
 	// clean expired articles
 	exp := now.Add(-48 * time.Hour)
-	err := Store.CleanArticles(context.Background(), exp)
+	err = Store.CleanArticles(context.Background(), exp)
 	if err != nil {
 		logrus.Error("startTimer.CleanArticles: ", err)
 	}
 	// fetch disqus count
-	if now.Hour()%5 == 0 {
-		err = DisqusClient.PostsCount(Ei.ArticlesMap)
-		if err != nil {
-			logrus.Error("startTimer.PostsCount: ", err)
-		}
+	err = DisqusClient.PostsCount(Ei.ArticlesMap)
+	if err != nil {
+		logrus.Error("startTimer.PostsCount: ", err)
 	}
 }
 

compose.yml

@@ -13,7 +13,7 @@ services:
   eiblog:
     image: deepzz0/eiblog:latest
     volumes:
-    - ${PWD}/eiblog/etc:/app/etc
+    - ${PWD}/eiblog/etc/app.yml:/app/etc/app.yml
     extra_hosts:
     - "disqus.com:151.101.192.134"
     - "deepzz.disqus.com:151.101.192.134"
@@ -30,7 +30,9 @@ services:
     image: deepzz0/backup:latest
     #command: ./backend --restore true
     volumes:
-    - ${PWD}/backup/etc:/app/etc
+    - ${PWD}/backup/etc/app.yml:/app/etc/app.yml
     links:
     - mongodb
+    environment:
+    - RUN_MODE=prod
     restart: always

docs/backup.md

@@ -7,19 +7,20 @@ EiBlog 镜像仓库地址：https://hub.docker.com/u/deepzz0，备份镜像为
 目前仅支持同步 mongodb 数据到七牛云，参考 `app.yml`：
 
 ```
-backupapp:
-  mode:
-    name: cmd-backup
-    enablehttp: true
-    httpport: 9001
-  backupto: qiniu # 备份到七牛云
-  interval: 7d # 多久备份一次
-  validity: 60 # 保存时长days
-  qiniu: # 七牛OSS
-    bucket: backup
-    domain: st.deepzz.com
-    accesskey: MB6AXl_Sj_mmFsL-Lt59Dml2Vmy2o8XMmiCbbSeC
-    secretkey: BIrMy0fsZ0_SHNceNXk3eDuo7WmVYzj2-zrmd5Tf
+apimode:
+  name: cmd-backup
+  listen: 0.0.0.0:9000
+database: # 数据库配置
+  driver: mongodb
+  source: mongodb://localhost:27017/eiblog
+backupto: qiniu # 备份到, default: qiniu
+interval: 7d # 备份周期, default: 7d
+validity: 60 # 备份保留时间, default: 60
+qiniu: # 七牛OSS
+  bucket: eiblog
+  domain: st.deepzz.cn
+  accesskey: MB6AXl_Sj_mmFsL-Lt59Dml2Vmy2o8XMmiCbbSeC
+  secretkey: BIrMy0fsZ0_SHNceNXk3eDuo7WmVYzj2-zrmd5Tf
 ```
 
 
@@ -36,7 +37,7 @@ $ docker pull deepzz0/backup
 
 ```
 $ docker run --name backup \
-    -v ${PWD}/conf:/app/conf
+    -v ${PWD}/etc/app.yml:/app/etc/app.yml
 ```
 
 Docker-compose 请参考项目根目录下的 `docker-compose.yml` 文件。

docs/install.md

@@ -5,7 +5,7 @@
 * [准备工作](#准备工作)
 * [开始部署](#开始部署)
 
-博主提供了下面将要用到的镜像，可到这里查看：[https://hub.docker.com/u/deepzz0](https://hub.docker.com/u/deepzz0)。由于所有配置均在 `app/conf.yml` 下，所以在通过 docker 部署时建议将配置映射出来方便调试。
+博主提供了下面将要用到的镜像，可到这里查看：[https://hub.docker.com/u/deepzz0](https://hub.docker.com/u/deepzz0)。在通过 docker 部署时建议将配置映射出来方便调试。
 
 ### 存储后端
 
@@ -13,7 +13,7 @@
 
 ```
 # driver     # source
-mongodb      mongodb://localhost:27017
+mongodb      mongodb://localhost:27017/eiblog
 postgres     host=localhost port=5432 user=user dbname=eiblog sslmode=disable password=password
 mysql        user:password@tcp(127.0.0.1:3306)/eiblog?charset=utf8mb4&parseTime=True&loc=Local
 sqlite       /path/eiblog.db
@@ -74,8 +74,8 @@ eshost: http://localhost:9200
 | favicon.ico        | st.example.com/static/img/favicon.ico        | cdn 名为 `static/img/favicon.ico`。你也可以在代理服务器自行配置，只要通过 example.com/favicon.ico 也是能够访问到。 |
 | bg04.jpg           | st.example.com/static/img/bg04.jpg           | cdn 名为 `static/img/bg04.jpg`，首页左侧的大背景图，需要更名请到 website/st_blog.css 修改。 |
 | avatar.png         | st.example.com/static/img/avatar.png         | cdn 名为 `static/img/avatar.png`，个人博客头像               |
-| blank.gif          | st.example.com/static/img/blank.gif          | cdn 名为 `static/img/blank.gif`，空白图片，复制链接下载 https://st.deepzz.com/static/img/blank.gif。 |
-| default_avatar.png | st.example.com/static/img/default_avatar.png | cdn 名为 `static/img/default_avatar.png`，disqus 默认头像图片，复制链接下载 https://st.deepzz.com/static/img/default_avatar.png |
+| blank.gif          | st.example.com/static/img/blank.gif          | cdn 名为 `static/img/blank.gif`，空白图片，复制链接下载 https://st.deepzz.cn/static/img/blank.gif。 |
+| default_avatar.png | st.example.com/static/img/default_avatar.png | cdn 名为 `static/img/default_avatar.png`，disqus 默认头像图片，复制链接下载 https://st.deepzz.cn/static/img/default_avatar.png |
 
 >  注意：
 >
@@ -85,21 +85,27 @@ eshost: http://localhost:9200
 
 #### 配置说明
 
-走到这里，我相信只走到 `80%` 的路程。放弃还来得及。这里会对 `eiblog/conf` 下的所有文件做说明，希望你做好准备。
+走到这里，我相信只走到 `80%` 的路程。这里会对 `cmd/eiblog/etc` 下的所有文件做说明：
 
-具体的配置内容已经在 `app.yml` 中进行说明了。
+```
+cmd/eiblog/etc
+├── app.yml  # 博客配置文件
+├── assets   # 后台所需的资源文件
+├── page     # 自定义的页面文件
+├── template # 前台渲染的模板
+└── xml      # xml 渲染模板，如 sitemap
+```
 
-如果用 nginx 作为代理服务器，博主提供了一份示例配置 `eiblog/eiblog.conf`，该配置涉及到 `ssl` 相关配置建议存放于 `/etc/nginx/ssl` 下。其中关于 `ssl_dhparam`、站点认证均提供了相关配置。
+具体的配置内容已经在 `app.yml` 中进行说明了。如果用 nginx 作为代理服务器，博主提供了一份示例配置 `eiblog/eiblog.conf`，该配置涉及到 `ssl` 相关配置建议存放于 `/etc/nginx/ssl` 下。其中关于 `ssl_dhparam`、站点认证均提供了相关配置。
 
 ### 开始部署
 
 下面是博主通过 `docker-compose` 一键部署的文件内容，仅供参考：
 
 ```
-version: '3'
 services:
   mongodb:
-    image: mongo:3.2
+    image: mongo:3.6
     volumes:
     - ${PWD}/mgodb:/data/db
     restart: always
@@ -108,24 +114,32 @@ services:
     volumes:
     - ${PWD}/esdata:/usr/share/elasticsearch/data
     restart: always
+
   eiblog:
-    iamge: deepzz0/eiblog:latest
+    image: deepzz0/eiblog:latest
     volumes:
-    - ${PWD}/conf:/app/conf
+    - ${PWD}/eiblog/etc/app.yml:/app/etc/app.yml
     extra_hosts:
     - "disqus.com:151.101.192.134"
+    - "deepzz.disqus.com:151.101.192.134"
     links:
     - elasticsearch
     - mongodb
+    environment:
+    - RUN_MODE=prod
     ports:
-    - 9000:9000
+    - 127.0.0.1:9000:9000
     restart: always
+
   backup:
     image: deepzz0/backup:latest
+    #command: ./backend --restore true
     volumes:
-    - ${PWD}/conf:/app/conf
+    - ${PWD}/backup/etc/app.yml:/app/etc/app.yml
     links:
     - mongodb
+    environment:
+    - RUN_MODE=prod
     restart: always
 ```
 

go.mod

@@ -1,6 +1,6 @@
 module github.com/eiblog/eiblog
 
-go 1.23.0
+go 1.24.0
 
 require (
 	github.com/eiblog/blackfriday v0.0.0-20161010144836-c0ec111761ae
@@ -89,12 +89,12 @@ require (
 	go.opentelemetry.io/otel v1.37.0 // indirect
 	go.opentelemetry.io/otel/trace v1.37.0 // indirect
 	golang.org/x/arch v0.19.0 // indirect
-	golang.org/x/crypto v0.40.0 // indirect
-	golang.org/x/net v0.42.0 // indirect
-	golang.org/x/sync v0.16.0 // indirect
-	golang.org/x/sys v0.34.0 // indirect
-	golang.org/x/text v0.27.0 // indirect
-	golang.org/x/tools v0.34.0 // indirect
+	golang.org/x/crypto v0.45.0 // indirect
+	golang.org/x/net v0.47.0 // indirect
+	golang.org/x/sync v0.18.0 // indirect
+	golang.org/x/sys v0.38.0 // indirect
+	golang.org/x/text v0.31.0 // indirect
+	golang.org/x/tools v0.38.0 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -282,14 +282,14 @@ golang.org/x/crypto v0.6.0/go.mod h1:OFC/31mSvZgRz0V1QTNCzfAI1aIRzbiufJtkMIlEp58
 golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
 golang.org/x/crypto v0.9.0/go.mod h1:yrmDGqONDYtNj3tH8X9dzUun2m2lzPa9ngI6/RUPGR0=
 golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
-golang.org/x/crypto v0.40.0 h1:r4x+VvoG5Fm+eJcxMaY8CQM7Lb0l1lsmjGBQ6s8BfKM=
-golang.org/x/crypto v0.40.0/go.mod h1:Qr1vMER5WyS2dfPHAlsOj01wgLbsyWtFn/aY+5+ZdxY=
+golang.org/x/crypto v0.45.0 h1:jMBrvKuj23MTlT0bQEOBcAE0mjg8mK9RXFhRH6nyF3Q=
+golang.org/x/crypto v0.45.0/go.mod h1:XTGrrkGJve7CYK7J8PEww4aY7gM3qMCElcJQ8n8JdX4=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
-golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+golang.org/x/mod v0.29.0 h1:HV8lRxZC4l2cr3Zq1LvtOsi/ThTgWnUk/y64QSs8GwA=
+golang.org/x/mod v0.29.0/go.mod h1:NyhrlYXJ2H4eJiRy/WDBO6HMqZQ6q9nk4JzS3NuCK+w=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -305,8 +305,8 @@ golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/net v0.42.0 h1:jzkYrhi3YQWD6MLBJcsklgQsoAcw89EcZbJw8Z614hs=
-golang.org/x/net v0.42.0/go.mod h1:FF1RA5d3u7nAYA4z2TkclSCKh68eSXtiFwcWQpPXdt8=
+golang.org/x/net v0.47.0 h1:Mx+4dIFzqraBXUugkia1OOvlD6LemFo1ALMHjrXDOhY=
+golang.org/x/net v0.47.0/go.mod h1:/jNxtkgq5yWUGYkaZGqo27cfGZ1c5Nen03aYrrKpVRU=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -314,8 +314,8 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/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.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
-golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.18.0 h1:kr88TuHDroi+UVf+0hZnirlk8o8T+4MrK6mr60WkH/I=
+golang.org/x/sync v0.18.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
 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-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -333,8 +333,8 @@ 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.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.34.0 h1:H5Y5sJ2L2JRdyv7ROF1he/lPdvFsd0mJHFw2ThKHxLA=
-golang.org/x/sys v0.34.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
+golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -351,16 +351,16 @@ golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.27.0 h1:4fGWRpyh641NLlecmyl4LOe6yDdfaYNrGb2zdfo4JV4=
-golang.org/x/text v0.27.0/go.mod h1:1D28KMCvyooCX9hBiosv5Tz/+YLxj0j7XhWjpSUF7CU=
+golang.org/x/text v0.31.0 h1:aC8ghyu4JhP8VojJ2lEHBnochRno1sgL6nEi9WGFGMM=
+golang.org/x/text v0.31.0/go.mod h1:tKRAlv61yKIjGGHX/4tP1LTbc13YSec1pxVEWXzfoeM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.34.0 h1:qIpSLOxeCYGg9TrcJokLBG4KFA6d795g0xkBkiESGlo=
-golang.org/x/tools v0.34.0/go.mod h1:pAP9OwEaY1CAW3HOmg3hLZC5Z0CCmzjAF2UQMSqNARg=
+golang.org/x/tools v0.38.0 h1:Hx2Xv8hISq8Lm16jvBZ2VQf+RLmbd7wVUsALibYI/IQ=
+golang.org/x/tools v0.38.0/go.mod h1:yEsQ/d/YK8cjh0L6rZlY8tgtlKiBNTL14pGDJPJpYQs=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

pkg/third/qiniu/qiniu.go

@@ -42,7 +42,7 @@ type UploadParams struct {
 func (cli *QiniuClient) Upload(params UploadParams) (string, error) {
 	key := params.Name
 	if !params.NoCompletePath {
-		key = filepath.Base(params.Name)
+		key = completeQiniuKey(params.Name)
 	}
 
 	mac := qbox.NewMac(cli.Conf.AccessKey,

tools/tmplfunc.go

@@ -3,6 +3,7 @@ package tools
 
 import (
 	"encoding/base64"
+	"html"
 	htmpl "html/template"
 	"io"
 	"log"
@@ -26,6 +27,7 @@ func init() {
 	TplFuncMap["isnotzero"] = IsNotZero
 	TplFuncMap["getavatar"] = GetAvatar
 	TplFuncMap["imgtonormal"] = ImgToNormal
+	TplFuncMap["xmlescape"] = html.EscapeString
 }
 
 // Str2html string to html