chore(release): 2.1.18

2. optimization variable naming

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: eiblog
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2']

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   package:
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
     - name: Golang env
       uses: actions/setup-go@v2

.gitignore

@@ -19,3 +19,4 @@ backend
 # vendor/
 bin
 assets/*.*
+db.sqlite

CHANGELOG.md

@@ -2,6 +2,67 @@
 
 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.
 
+### [2.1.18](https://github.com/eiblog/eiblog/compare/v2.1.17...v2.1.18) (2023-01-05)
+
+
+### Bug Fixes
+
+* **backup:** can not execute ([f6ba716](https://github.com/eiblog/eiblog/commit/f6ba716f554cfb638752875c4842e4ffb1b7e9a6))
+* disqus api using http post ([b2e6c16](https://github.com/eiblog/eiblog/commit/b2e6c168c5f63b29cf5c2884e04dd99caa677bc0))
+
+### [2.1.17](https://github.com/eiblog/eiblog/compare/v2.1.16...v2.1.17) (2023-01-05)
+
+
+### Bug Fixes
+
+* 1. template read panic ([f6d8656](https://github.com/eiblog/eiblog/commit/f6d8656c83591584581383643d109611d7ed2caa))
+* **disqus:** failed to commit disqus comments ([a9e8e39](https://github.com/eiblog/eiblog/commit/a9e8e39d342488ec46175997f3df9ab109f2fecf))
+* fist comment of disqus error ([17792e5](https://github.com/eiblog/eiblog/commit/17792e5a7edb7e84623d9307555e7983ba306565))
+
+### [2.1.16](https://github.com/eiblog/eiblog/compare/v2.1.15...v2.1.16) (2022-11-20)
+
+
+### Bug Fixes
+
+* **backup:** error path in compressed file ([aa91997](https://github.com/eiblog/eiblog/commit/aa91997c0caca27e9979692879f8877765dabd9d))
+* rss image path incorrect: data-src -> src ([4bfff2e](https://github.com/eiblog/eiblog/commit/4bfff2e5e9b0efb4112a5f2f6bc55eebcef1c6eb))
+
+### [2.1.15](https://github.com/eiblog/eiblog/compare/v2.1.14...v2.1.15) (2022-09-28)
+
+### [2.1.14](https://github.com/eiblog/eiblog/compare/v2.1.13...v2.1.14) (2022-09-28)
+
+
+### Bug Fixes
+
+* cgo and sqlite build in alpine image closed [#28](https://github.com/eiblog/eiblog/issues/28) ([b93c320](https://github.com/eiblog/eiblog/commit/b93c320987a936db6e5ca50c547022de9ab9a0f1))
+
+### [2.1.13](https://github.com/eiblog/eiblog/compare/v2.1.12...v2.1.13) (2022-09-27)
+
+### [2.1.12](https://github.com/eiblog/eiblog/compare/v2.1.11...v2.1.12) (2022-08-09)
+
+
+### Bug Fixes
+
+* [#35](https://github.com/eiblog/eiblog/issues/35) no pubDate added for feed generation ([289b814](https://github.com/eiblog/eiblog/commit/289b8145bcdabd0060c9a0d5f40f5df69d3882d3))
+
+### [2.1.11](https://github.com/eiblog/eiblog/compare/v2.1.10...v2.1.11) (2022-07-19)
+
+
+### Bug Fixes
+
+* **backup:** configuration error ([38aa704](https://github.com/eiblog/eiblog/commit/38aa704198070d3e1436b230b40b1deb3e94c5ac))
+
+### [2.1.10](https://github.com/eiblog/eiblog/compare/v2.1.9...v2.1.10) (2022-04-22)
+
+### [2.1.9](https://github.com/eiblog/eiblog/compare/v2.1.8...v2.1.9) (2022-02-14)
+
+
+### Bug Fixes
+
+* **eiblog:** comments title error ([5170844](https://github.com/eiblog/eiblog/commit/517084462336ce01c3f79099c1e54297979f5877))
+
+### [2.1.8](https://github.com/eiblog/eiblog/compare/v2.1.7...v2.1.8) (2021-11-18)
+
 ### [2.1.7](https://github.com/eiblog/eiblog/compare/v2.1.6...v2.1.7) (2021-11-13)
 
 ### [2.1.6](https://github.com/eiblog/eiblog/compare/v2.1.5...v2.1.6) (2021-11-12)

README.md

@@ -6,9 +6,43 @@
 
 但它有着部署简单（上线复杂！）的特点，不推荐没有计算机知识的朋友搭建，欢迎咨询。该博客的个中优点（简洁、轻快，安全），等你体验。
 
+Docker镜像地址：
+
+* 博客服务：[deepzz0/eiblog](https://hub.docker.com/r/deepzz0/eiblog)
+* 博客搜索：[deepzz0/elasticsearch](https://hub.docker.com/r/deepzz0/elasticsearch)
+* 数据备份：[deepzz0/backup](https://hub.docker.com/r/deepzz0/backup)
+
 ### 快速体验
 
-这里以 mongodb 为例，更多支持的后端存储服务如下：
+**二进制**
+
+1、下载压缩包，到 [这里](https://github.com/eiblog/eiblog/releases) 下载 eiblog（非backup） 相应系统压缩包，然后解压缩。
+
+2、启动服务：`./backend`
+
+**Docker**
+
+```
+$ docker run --name eiblog \
+    -p 9000:9000 \
+    deepzz0/eiblog:latest
+```
+
+**Compose**
+
+参考项目根目录下的 [docker-compose.yml](https://github.com/eiblog/eiblog/blob/v2/docker-compose.yml)，修改相关配置：
+
+```
+$ docker compose up -d
+或
+$ docker-compose up -d
+```
+
+然后访问 `localhost:9000` 就可以了，后台地址 `localhost:9000/admin/login`，默认账户密码 `deepzz/deepzz`。
+
+> 默认情况下未开启博客搜索 `elasticsearch`，需要的话需要启动 es 服务并修改配置 `app.yml`。
+
+**数据库支持**
 
 | 类型（driver） | 地址（source）示例                                           |
 | -------------- | ------------------------------------------------------------ |
@@ -19,42 +53,6 @@
 | sqlserver      | sqlserver://user:password@localhost:9930?database=eiblog     |
 | clickhouse     | tcp://localhost:9000?database=eiblog&username=user&password=password&read_timeout=10&write_timeout=20 |
 
-1、启动依赖服务，mongodb、elasticsearch：
-
-```
-$ docker run --name mongodb \
-    -p 27017:27017 \
-    -v ${PWD}/mgodb:/data/db \
-    mongo:3.2
-
-$ docker run --name elasticsearch \
-    -p 9200:9200 \
-    -v ${PWD}/esdata:/usr/share/elasticsearch/data \
-    deepzz0/elasticsearch:2.4.1
-```
-
-2、下载压缩包，到 [这里](https://github.com/eiblog/eiblog/releases) 下载 eiblog（非backup） 相应系统压缩包，然后解压缩。
-
-3、修改配置，将数据库与ES地址修改为相应地址：
-
-```
-# 修改 conf/app.yml 数据库连接配置
-database:
-  driver: mongodb
-  source: mongodb://localhost:27017
-
-# 修改 conf/app.yml ES连接配置，如果不启用搜索功能可以置空
-eshost: http://localhost:9200
-```
-
-4、启动服务：
-
-```
-./backend
-```
-
-然后访问 `localhost:9000` 就可以了，后台地址 `localhost:9000/admin/login`，默认账户密码 `deepzz/deepzz`。
-
 ### 功能特性
 
 本着博客本质用来分享知识的特点，`EiBlog` 不会有较强的定制功能（包括主题，CDN支持等），仅保持常用简单页面与功能：
@@ -85,12 +83,11 @@ eshost: http://localhost:9200
 
 ### 博客页面
 
-可以容易的看到 [httpsecurityreport](https://httpsecurityreport.com/?report=deepzz.com) 评分`96`，[ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=deepzz.com&latest) 评分`A+`，[myssl](https://myssl.com/deepzz.com) 评分`A+`，堪称完美。这些安全的相关配置会在后面的部署过程中接触到。
+可以容易的看到 [ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=deepzz.com&latest) 评分`A+`，[myssl](https://myssl.com/deepzz.com) 评分`A+`，堪称完美。这些安全的相关配置会在后面的部署过程中接触到。
 
-![show-home](https://st.deepzz.com/blog/img/show-home.png)
-![show-home2](https://st.deepzz.com/blog/img/show-home2.png)
-
-![show-admin](https://st.deepzz.com/blog/img/show-admin.png)
+![show-home](./docs/img/show-home.png)
+![show-home2](./docs/img/show-home2.png)
+![show-admin](./docs/img/show-admin.png)
 
 ### 更多文档
 

build/package/backup.Dockerfile

@@ -1,7 +1,8 @@
 FROM alpine:latest
 LABEL maintainer="deepzz.qi@gmail.com"
 
-RUN apk add --update --no-cache tzdata ca-certificates mongodb-tools
+RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
+    && apk add --update --no-cache tzdata ca-certificates mongodb-tools libc6-compat
 COPY README.md /app/README.md
 COPY CHANGELOG.md /app/CHANGELOG.md
 COPY LICENSE /app/LICENSE

build/package/eiblog.Dockerfile

@@ -1,7 +1,8 @@
 FROM alpine:latest
 LABEL maintainer="deepzz.qi@gmail.com"
 
-RUN apk add --update --no-cache tzdata
+RUN sed -i "s/dl-cdn.alpinelinux.org/mirrors.aliyun.com/g" /etc/apk/repositories \
+    && apk add --update --no-cache tzdata
 COPY README.md /app/README.md
 COPY CHANGELOG.md /app/CHANGELOG.md
 COPY LICENSE /app/LICENSE

cmd/backup/main.go

@@ -30,7 +30,7 @@ func runTimer(endRun chan error) {
 }
 
 func runHTTPServer(endRun chan error) {
-	if !config.Conf.EiBlogApp.EnableHTTP {
+	if !config.Conf.BackupApp.EnableHTTP {
 		return
 	}
 
@@ -46,7 +46,7 @@ func runHTTPServer(endRun chan error) {
 	ping.RegisterRoutes(e)
 
 	// start
-	address := fmt.Sprintf(":%d", config.Conf.EiBlogApp.HTTPPort)
+	address := fmt.Sprintf(":%d", config.Conf.BackupApp.HTTPPort)
 	go func() {
 		endRun <- e.Run(address)
 	}()

conf/app.yml

@@ -1,7 +1,7 @@
 appname: eiblog
 database:
-  driver: postgres
-  source: host=localhost port=5432 user=postgres dbname=eiblog sslmode=disable password=MTI3LjAuMC4x
+  driver: sqlite
+  source: ./db.sqlite
 eshost:
 eiblogapp:
   mode:

docker-compose.yml

@@ -21,7 +21,6 @@ services:
     - elasticsearch
     - mongodb
     environment:
-    - GODEBUG=netdns=cgo
     - RUN_MODE=prod
     ports:
     - 127.0.0.1:9000:9000

docs/README.md

@@ -2,42 +2,58 @@
 
 > 博客项目结构参考模版：https://github.com/deepzz0/appdemo
 
-EiBlog 镜像仓库地址：https://hub.docker.com/u/deepzz0
-
 用过其它博客系统，不喜欢，不够轻，不够快！这是我开发的第二款博客系统，也实在不想再在这件事情上过多纠结了。`EiBlog` 是一个比较稳定的博客系统，现已迭代至 `2.0` 版本，稳定性和维护你是不用担心的。
 
 但它有着部署简单（上线复杂！）的特点，不推荐没有计算机知识的朋友搭建，欢迎咨询。该博客的个中优点（简洁、轻快，安全），等你体验。
 
 ### 快速体验
 
-1、下载程序压缩包：到 [这里](https://github.com/eiblog/eiblog/releases) 下载 eiblog 相应系统压缩包，然后解压缩。
+这里以 mongodb 为例，更多支持的后端存储服务如下：
 
-2、启动数据库服务：博客支持多种数据库后端，如MongoDB、MySQL、Postgres、SQLite等。
+| 类型（driver） | 地址（source）示例                                           |
+| -------------- | ------------------------------------------------------------ |
+| mongodb        | mongodb://localhost:27017                                    |
+| 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                                              |
+| sqlserver      | sqlserver://user:password@localhost:9930?database=eiblog     |
+| clickhouse     | tcp://localhost:9000?database=eiblog&username=user&password=password&read_timeout=10&write_timeout=20 |
+
+1、启动依赖服务，mongodb、elasticsearch：
+
+```
+$ docker run --name mongodb \
+    -p 27017:27017 \
+    -v ${PWD}/mgodb:/data/db \
+    mongo:3.2
+
+$ docker run --name elasticsearch \
+    -p 9200:9200 \
+    -v ${PWD}/esdata:/usr/share/elasticsearch/data \
+    deepzz0/elasticsearch:2.4.1
+```
+
+2、下载压缩包，到 [这里](https://github.com/eiblog/eiblog/releases) 下载 eiblog（非backup） 相应系统压缩包，然后解压缩。
+
+3、修改配置，将数据库与ES地址修改为相应地址：
 
 ```
 # 修改 conf/app.yml 数据库连接配置
-# driver可选：mongodb、mysql、postgres、sqlite、sqlserver、clickhouse、redis等
-# source为相应的连接地址
 database:
-  driver: postgres
-  source: host=localhost port=5432 user=postgres dbname=eiblog sslmode=disable password=MTI3LjAuMC4x
-```
+  driver: mongodb
+  source: mongodb://localhost:27017
 
-3、启动 ES 搜索服务：博客使用 ElasticSearch 2.4.1 做为搜索引擎。
-
-```
-# 修改 conf/app.yml ElasticSearch连接配置
-# 如果不启用搜索功能可以置空
+# 修改 conf/app.yml ES连接配置，如果不启用搜索功能可以置空
 eshost: http://localhost:9200
 ```
 
-4、启动博客程序。
+4、启动服务：
 
 ```
 ./backend
 ```
 
-然后访问 `localhost:9000` 就可以了。
+然后访问 `localhost:9000` 就可以了，后台地址 `localhost:9000/admin/login`，默认账户密码 `deepzz/deepzz`。
 
 ### 功能特性
 
@@ -49,16 +65,16 @@ eshost: http://localhost:9200
 
 功能说明：
 
-- [x] 博客归档，利用时间线帮助我们将归纳博文，内容少于一年按月归档，大于则按年归档。
-- [x] 博客专题，有时候博文是同一系列，专题能够帮助我们很好归纳博文，对阅读者是非常友好的。
-- [x] 标签系统，每篇博文都可以打上不同标签，使得在归档和专题不满足的情况下自定义归档，这块辅助搜索简直完美。
-- [x] 搜索系统，依托ElasticSearch实现的站内搜索，速度与效率并存，再加上google opensearch，搜索只流畅。
-- [x] 管理后台，内嵌全功能 `Typecho` 后台系统，全功能 `Markdown` 编辑器让你感觉什么是简洁清爽。
-- [x] 谷歌统计，由于google api的速度问题，从而实现了后端API异步统计，使得博客页面加载飞速。
-- [x] Disqus评论，国内评论系统不友好，因此选择disqus，又由于众所周知原因国内不能用，实现另类disqus评论方式。
-- [x] 多存储后端，支持mongodb、mysql、postgres、sqlite等存储后端。
-- [x] 七牛CDN，支持在 `Markdown` 编辑器直接上传附件，让你只考虑编辑内容，解放思想。
-- [x] 自动备份，支持多存储后端的备份功能，备份数据保存到七牛CDN上。
+* 博客归档，利用时间线帮助我们将归纳博文，内容少于一年按月归档，大于则按年归档。
+* 博客专题，有时候博文是同一系列，专题能够帮助我们很好归纳博文，对阅读者是非常友好的。
+* 标签系统，每篇博文都可以打上不同标签，使得在归档和专题不满足的情况下自定义归档，这块辅助搜索简直完美。
+* 搜索系统，依托ElasticSearch实现的站内搜索，速度与效率并存，再加上google opensearch，搜索只流畅。
+* 管理后台，内嵌全功能 `Typecho` 后台系统，全功能 `Markdown` 编辑器让你感觉什么是简洁清爽。
+* 谷歌统计，由于google api的速度问题，从而实现了后端API异步统计，使得博客页面加载飞速。
+* Disqus评论，国内评论系统不友好，因此选择disqus，又由于众所周知原因国内不能用，实现另类disqus评论方式。
+* 多存储后端，支持mongodb、mysql、postgres、sqlite等存储后端。
+* 七牛CDN，支持在 `Markdown` 编辑器直接上传附件，让你只考虑编辑内容，解放思想。
+* 自动备份，支持多存储后端的备份功能，备份数据保存到七牛CDN上。
 
 当然，为了让整个系统加载速度更快，还做了更多优化措施：
 
@@ -71,10 +87,9 @@ eshost: http://localhost:9200
 
 可以容易的看到 [httpsecurityreport](https://httpsecurityreport.com/?report=deepzz.com) 评分`96`，[ssllabs](https://www.ssllabs.com/ssltest/analyze.html?d=deepzz.com&latest) 评分`A+`，[myssl](https://myssl.com/deepzz.com) 评分`A+`，堪称完美。这些安全的相关配置会在后面的部署过程中接触到。
 
-![show-home](https://st.deepzz.com/blog/img/show-home.png)
-![show-home2](https://st.deepzz.com/blog/img/show-home2.png)
-
-![show-admin](https://st.deepzz.com/blog/img/show-admin.png)
+![show-home](./img/show-home.png)
+![show-home2](./img/show-home2.png)
+![show-admin](./img/show-admin.png)
 
 ### 更多文档
 

docs/amusing.md

@@ -13,13 +13,13 @@ twitter:
 
 每当你发部一个推文，你如果带上你的网址，它会自动给你展示成卡片的形式
 
-![twitter-pub](https://st.deepzz.com/blog/img/twitter-pub.png)
+![twitter-pub](./img/twitter-pub.png)
 
-![twitter-pub2](https://st.deepzz.com/blog/img/twitter-pub2.png)
+![twitter-pub2](./img/twitter-pub2.png)
 
 可以看到`，`之前是没有内容的，该内容是我们文章的描述。
 
 ### Google OpenSearch
 在 Chrome 浏览器上，你可以在输入网站后按 TAB 键进入搜索模式，如：
 
-![opensearch](/Users/edz/go/src/github.com/eiblog/eiblog/opensearch.gif)
+![opensearch](./img/opensearch.gif)

docs/writing.md

@@ -24,14 +24,14 @@
 
 结果是：
 
-![article-title](https://st.deepzz.com/blog/img/article-title.png)
+![article-title](./img/article-title.png)
 
 ### 文章描述
 文章描述，主要是给`html->head->meta`中的 name 为 description 用的。现采用了一个临时的办法：在文章的第一行通过前缀识别（只看第一行）。
 
 该前缀可到`conf/app.yml`设置，默认为`Desc:`，如：
 
-![article-description](https://st.deepzz.com/blog/img/article-description.png)
+![article-description](./img/article-description.png)
 
 ### 图片懒加载
 博客系统提供图片懒加载功能（浏览到某个位置，图片才会加载），以此来提高页面加载速度。我们可根据需要是否使用。当然由此带来的坏处就是rss不能够正确加载图片。后续看是否解决这个问题或朋友提PR。
@@ -44,7 +44,7 @@
 ```
 ![sublime-dialog](https://st.deepzz.com/blog/img/dialog-box-without-all-contols.png)
 ```
-![sublime-dialog](https://st.deepzz.com/blog/img/dialog-box-without-all-contols.png)
+![sublime-dialog](./img/dialog-box-without-all-contols.png)
 
 懒加载，需要为该图片指定大小（长高）：
 ```
@@ -61,7 +61,7 @@ x 为小写字母（x,y,z）中的 x。使页面未加载时也占了相应的
 ### 摘要截取
 摘要截取主要是提供给首页显示，如：
 
-![deepzz-home-page](https://st.deepzz.com/blog/img/deepzz-home-page.jpg)
+![deepzz-home-page](./img/deepzz-home-page.jpeg)
 
 红框中圈出来的就是截取出来的内容。在 `conf/app.yml` 的配置项有两个：
 

eiblog.conf

@@ -17,7 +17,7 @@ server {
     server_tokens                off;
 
     location / {
-        rewrite                  ^/(.*)$ https://$host/$1 permanent;
+        rewrite                  ^/(.*)$ https://deepzz.com/$1 permanent;
     }
 }
 
@@ -61,6 +61,10 @@ server {
         root                     /usr/share/nginx/html;
         expires                  1d;
     }
+    
+    if ($host != 'deepzz.com' ) {
+        rewrite          ^/(.*)$  https://deepzz.com/$1 permanent;
+    }
 
     # proxy setting
     proxy_http_version           1.1;

go.mod

@@ -3,7 +3,6 @@ module github.com/eiblog/eiblog
 go 1.15
 
 require (
-	github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751
 	github.com/eiblog/blackfriday v0.0.0-20161010144836-c0ec111761ae
 	github.com/gin-contrib/sessions v0.0.3
 	github.com/gin-gonic/gin v1.7.4
@@ -17,7 +16,7 @@ require (
 	go.mongodb.org/mongo-driver v1.5.1
 	google.golang.org/grpc v1.35.0
 	google.golang.org/protobuf v1.25.0
-	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	gorm.io/driver/clickhouse v0.1.0
 	gorm.io/driver/mysql v1.0.6
 	gorm.io/driver/postgres v1.0.8

go.sum

@@ -8,8 +8,6 @@ github.com/PuerkitoBio/purell v1.1.1 h1:WEQqlqaGbrPkxLJWfBwQmfEAE1Z7ONdDLqrN38tN
 github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM=
-github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPIk=
 github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 github.com/bkaradzic/go-lz4 v1.0.0 h1:RXc4wYsyz985CkXXeX04y4VnZFGG8Rd43pRaHsOXAKk=

pkg/cache/cache.go

@@ -25,9 +25,11 @@ var (
 	// Ei eiblog cache
 	Ei *Cache
 
-	// regenerate pages chan
-	PagesCh     = make(chan string, 2)
-	PageSeries  = "series-md"
+	// PagesCh regenerate pages chan
+	PagesCh = make(chan string, 2)
+	// PageSeries the page series regenerate flag
+	PageSeries = "series-md"
+	// PageArchive the page archive regenerate flag
 	PageArchive = "archive-md"
 
 	// ArticleStartID article start id
@@ -518,7 +520,7 @@ func (c *Cache) regeneratePages() {
 				}
 				buf.WriteString("\n")
 			}
-			c.PageSeries = string(render.RenderPage(buf.Bytes()))
+			c.PageSeries = string(render.PageRender(buf.Bytes()))
 		case PageArchive:
 			sort.Sort(c.Archives)
 			buf := bytes.Buffer{}
@@ -551,7 +553,7 @@ func (c *Cache) regeneratePages() {
 					}
 				}
 			}
-			c.PageArchives = string(render.RenderPage(buf.Bytes()))
+			c.PageArchives = string(render.PageRender(buf.Bytes()))
 		}
 	}
 }

pkg/cache/render/render.go

@@ -14,7 +14,7 @@ import (
 
 // blackfriday 配置
 const (
-	commonHtmlFlags = 0 |
+	commonHTMLFlags = 0 |
 		blackfriday.HTML_TOC |
 		blackfriday.HTML_USE_XHTML |
 		blackfriday.HTML_USE_SMARTYPANTS |
@@ -42,9 +42,9 @@ var (
 	regHeader = regexp.MustCompile("</nav></div>")
 )
 
-// RenderPage 渲染markdown
-func RenderPage(md []byte) []byte {
-	renderer := blackfriday.HtmlRenderer(commonHtmlFlags, "", "")
+// PageRender 渲染markdown
+func PageRender(md []byte) []byte {
+	renderer := blackfriday.HtmlRenderer(commonHTMLFlags, "", "")
 	return blackfriday.Markdown(md, renderer, commonExtensions)
 }
 
@@ -56,12 +56,12 @@ func GenerateExcerptMarkdown(article *model.Article) {
 		index := strings.Index(article.Content, "\r\n")
 		prefix := article.Content[len(blogapp.General.DescPrefix):index]
 
-		article.Desc = tools.IgnoreHtmlTag(prefix)
+		article.Desc = tools.IgnoreHTMLTag(prefix)
 		article.Content = article.Content[index:]
 	}
 
 	// 查找目录
-	content := RenderPage([]byte(article.Content))
+	content := PageRender([]byte(article.Content))
 	index := regHeader.FindIndex(content)
 	if index != nil {
 		article.Header = string(content[0:index[1]])
@@ -73,7 +73,7 @@ func GenerateExcerptMarkdown(article *model.Article) {
 	// excerpt
 	index = regIdentifier.FindStringIndex(article.Content)
 	if index != nil {
-		article.Excerpt = tools.IgnoreHtmlTag(article.Content[:index[0]])
+		article.Excerpt = tools.IgnoreHTMLTag(article.Content[:index[0]])
 		return
 	}
 	uc := []rune(article.Content)
@@ -81,5 +81,5 @@ func GenerateExcerptMarkdown(article *model.Article) {
 	if len(uc) < length {
 		length = len(uc)
 	}
-	article.Excerpt = tools.IgnoreHtmlTag(string(uc[0:length]))
+	article.Excerpt = tools.IgnoreHTMLTag(string(uc[0:length]))
 }

pkg/config/config.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"gopkg.in/yaml.v2"
+	"gopkg.in/yaml.v3"
 )
 
 var (

pkg/core/backup/timer/qiniu/qiniu.go

@@ -44,7 +44,7 @@ func backupFromMongoDB(now time.Time) error {
 	}
 	// tar
 	name := fmt.Sprintf("eiblog-%s.tar.gz", now.Format("2006-01-02"))
-	arg = fmt.Sprintf("tar czf /tmp/%s /tmp/eiblog", name)
+	arg = fmt.Sprintf("tar czf /tmp/%s -C /tmp eiblog", name)
 	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
 	err = cmd.Run()
 	if err != nil {

pkg/core/eiblog/admin/admin.go

@@ -301,7 +301,7 @@ func handleAPIPostCreate(c *gin.Context) {
 	}
 	// 旧文章
 	article.ID = cid
-	artc, _ := cache.Ei.FindArticleByID(article.ID)
+	artc, _ := cache.Ei.FindArticleByID(article.ID) // cache
 	if artc != nil {
 		article.IsDraft = false
 		article.Count = artc.Count

pkg/core/eiblog/file/timer.go

@@ -21,7 +21,8 @@ func init() {
 
 	var err error
 	xmlTmpl, err = template.New("").Funcs(template.FuncMap{
-		"dateformat": tools.DateFormat,
+		"dateformat":  tools.DateFormat,
+		"imgtonormal": tools.ImgToNormal,
 	}).ParseGlob(root)
 	if err != nil {
 		panic(err)

pkg/core/eiblog/page/be.go

@@ -50,6 +50,7 @@ func handleAdminProfile(c *gin.Context) {
 	renderHTMLAdminLayout(c, "admin-profile", params)
 }
 
+// T tag struct
 type T struct {
 	ID   string `json:"id"`
 	Tags string `json:"tags"`

pkg/core/eiblog/page/fe.go

@@ -3,6 +3,7 @@ package page
 
 import (
 	"bytes"
+	"context"
 	"fmt"
 	htemplate "html/template"
 	"io/ioutil"
@@ -198,7 +199,8 @@ func handleDisqusList(c *gin.Context) {
 
 	slug := c.Param("slug")
 	cursor := c.Query("cursor")
-	if artc := cache.Ei.ArticlesMap[slug]; artc != nil {
+	artc := cache.Ei.ArticlesMap[slug]
+	if artc != nil {
 		dcs.Data.Thread = artc.Thread
 	}
 	postsList, err := internal.PostsList(slug, cursor)
@@ -222,13 +224,25 @@ func handleDisqusList(c *gin.Context) {
 			ID:           v.ID,
 			Name:         v.Author.Name,
 			Parent:       v.Parent,
-			Url:          v.Author.ProfileUrl,
+			URL:          v.Author.ProfileURL,
 			Avatar:       v.Author.Avatar.Cache,
 			CreatedAtStr: tools.ConvertStr(v.CreatedAt),
 			Message:      v.Message,
 			IsDeleted:    v.IsDeleted,
 		}
 	}
+	// query thread & update
+	if artc != nil && artc.Thread == "" {
+		if dcs.Data.Thread != "" {
+			artc.Thread = dcs.Data.Thread
+		} else if internal.ThreadDetails(artc) == nil {
+			dcs.Data.Thread = artc.Thread
+		}
+		cache.Ei.UpdateArticle(context.Background(), artc.ID,
+			map[string]interface{}{
+				"thread": artc.Thread,
+			})
+	}
 }
 
 // handleDisqusPage 评论页
@@ -240,7 +254,7 @@ func handleDisqusPage(c *gin.Context) {
 	}
 	article := cache.Ei.ArticlesMap[array[0]]
 	params := gin.H{
-		"Titile": "发表评论 | " + cache.Ei.Blogger.BTitle,
+		"Title":  "发表评论 | " + cache.Ei.Blogger.BTitle,
 		"ATitle": article.Title,
 		"Thread": array[1],
 		"Slug":   article.Slug,
@@ -261,7 +275,7 @@ type commentsDetail struct {
 	ID           string `json:"id"`
 	Parent       int    `json:"parent"`
 	Name         string `json:"name"`
-	Url          string `json:"url"`
+	URL          string `json:"url"`
 	Avatar       string `json:"avatar"`
 	CreatedAtStr string `json:"createdAtStr"`
 	Message      string `json:"message"`
@@ -274,7 +288,7 @@ func handleDisqusCreate(c *gin.Context) {
 	defer c.JSON(http.StatusOK, resp)
 
 	msg := c.PostForm("message")
-	email := c.PostForm("author_name")
+	email := c.PostForm("author_email")
 	name := c.PostForm("author_name")
 	thread := c.PostForm("thread")
 	identifier := c.PostForm("identifier")
@@ -283,7 +297,7 @@ func handleDisqusCreate(c *gin.Context) {
 		resp.ErrMsg = "参数错误"
 		return
 	}
-	logrus.Info("email: %s comments: %s", email, thread)
+	logrus.Infof("email: %s comments: %s", email, thread)
 
 	comment := internal.PostComment{
 		Message:     msg,
@@ -292,7 +306,7 @@ func handleDisqusCreate(c *gin.Context) {
 		AuthorEmail: email,
 		AuthorName:  name,
 		Identifier:  identifier,
-		IpAddress:   c.ClientIP(),
+		IPAddress:   c.ClientIP(),
 	}
 	postDetail, err := internal.PostCreate(&comment)
 	if err != nil {
@@ -312,7 +326,7 @@ func handleDisqusCreate(c *gin.Context) {
 		ID:           postDetail.Response.ID,
 		Name:         name,
 		Parent:       postDetail.Response.Parent,
-		Url:          postDetail.Response.Author.ProfileUrl,
+		URL:          postDetail.Response.Author.ProfileURL,
 		Avatar:       postDetail.Response.Author.Avatar.Cache,
 		CreatedAtStr: tools.ConvertStr(postDetail.Response.CreatedAt),
 		Message:      postDetail.Response.Message,

pkg/core/eiblog/page/page.go

@@ -2,6 +2,7 @@
 package page
 
 import (
+	"io/fs"
 	"path/filepath"
 	"text/template"
 
@@ -17,10 +18,15 @@ var htmlTmpl *template.Template
 func init() {
 	htmlTmpl = template.New("eiblog").Funcs(tools.TplFuncMap)
 	root := filepath.Join(config.WorkDir, "website")
-	files := tools.ReadDirFiles(root, func(name string) bool {
+	files := tools.ReadDirFiles(root, func(fi fs.FileInfo) bool {
+		name := fi.Name()
 		if name == ".DS_Store" {
 			return true
 		}
+		// should not read template dir
+		if fi.IsDir() && name == "template" {
+			return true
+		}
 		return false
 	})
 	_, err := htmlTmpl.ParseFiles(files...)

pkg/internal/disqus.go

@@ -16,11 +16,12 @@ import (
 
 // disqus api
 const (
-	apiPostsCount   = "https://disqus.com/api/3.0/threads/set.json"
-	apiPostsList    = "https://disqus.com/api/3.0/threads/listPosts.json"
-	apiPostCreate   = "https://disqus.com/api/3.0/posts/create.json"
-	apiPostApprove  = "https://disqus.com/api/3.0/posts/approve.json"
-	apiThreadCreate = "https://disqus.com/api/3.0/threads/create.json"
+	apiPostsCount    = "https://disqus.com/api/3.0/threads/set.json"
+	apiPostsList     = "https://disqus.com/api/3.0/threads/listPosts.json"
+	apiPostCreate    = "https://disqus.com/api/3.0/posts/create.json"
+	apiPostApprove   = "https://disqus.com/api/3.0/posts/approve.json"
+	apiThreadCreate  = "https://disqus.com/api/3.0/threads/create.json"
+	apiThreadDetails = "https://disqus.com/api/3.0/threads/details.json"
 )
 
 func checkDisqusConfig() error {
@@ -95,8 +96,8 @@ func PostsCount(articles map[string]*model.Article) error {
 	return nil
 }
 
-// postsListResp 获取评论列表
-type postsListResp struct {
+// PostsListResp 获取评论列表
+type PostsListResp struct {
 	Cursor struct {
 		HasNext bool
 		Next    string
@@ -113,7 +114,7 @@ type postDetail struct {
 	IsDeleted bool
 	Author    struct {
 		Name       string
-		ProfileUrl string
+		ProfileURL string
 		Avatar     struct {
 			Cache string
 		}
@@ -122,7 +123,7 @@ type postDetail struct {
 }
 
 // PostsList 评论列表
-func PostsList(slug, cursor string) (*postsListResp, error) {
+func PostsList(slug, cursor string) (*PostsListResp, error) {
 	if err := checkDisqusConfig(); err != nil {
 		return nil, err
 	}
@@ -148,7 +149,7 @@ func PostsList(slug, cursor string) (*postsListResp, error) {
 		return nil, errors.New(string(b))
 	}
 
-	result := &postsListResp{}
+	result := &PostsListResp{}
 	err = json.Unmarshal(b, result)
 	if err != nil {
 		return nil, err
@@ -163,18 +164,19 @@ type PostComment struct {
 	Thread      string
 	AuthorEmail string
 	AuthorName  string
-	IpAddress   string
+	IPAddress   string
 	Identifier  string
 	UserAgent   string
 }
 
-type postCreateResp struct {
+// PostCreateResp create comments resp
+type PostCreateResp struct {
 	Code     int
 	Response postDetail
 }
 
 // PostCreate 评论文章
-func PostCreate(pc *PostComment) (*postCreateResp, error) {
+func PostCreate(pc *PostComment) (*PostCreateResp, error) {
 	if err := checkDisqusConfig(); err != nil {
 		return nil, err
 	}
@@ -201,7 +203,7 @@ func PostCreate(pc *PostComment) (*postCreateResp, error) {
 	if resp.StatusCode != http.StatusOK {
 		return nil, errors.New(string(b))
 	}
-	result := &postCreateResp{}
+	result := &PostCreateResp{}
 	err = json.Unmarshal(b, result)
 	if err != nil {
 		return nil, err
@@ -294,3 +296,46 @@ func ThreadCreate(article *model.Article, btitle string) error {
 	article.Thread = result.Response.ID
 	return nil
 }
+
+// threadDetailsResp thread info
+type threadDetailsResp struct {
+	Code     int
+	Response struct {
+		ID string
+	}
+}
+
+// ThreadDetails thread详细
+func ThreadDetails(article *model.Article) error {
+	if err := checkDisqusConfig(); err != nil {
+		return err
+	}
+
+	vals := url.Values{}
+	vals.Set("api_key", config.Conf.EiBlogApp.Disqus.PublicKey)
+	vals.Set("access_token", config.Conf.EiBlogApp.Disqus.AccessToken)
+	vals.Set("forum", config.Conf.EiBlogApp.Disqus.ShortName)
+	vals.Set("thread:ident", "post-"+article.Slug)
+
+	resp, err := httpGet(apiThreadDetails + "?" + vals.Encode())
+	if err != nil {
+		return err
+	}
+
+	b, err := ioutil.ReadAll(resp.Body)
+	if err != nil {
+		return err
+	}
+
+	if resp.StatusCode != http.StatusOK {
+		return errors.New(string(b))
+	}
+
+	result := &threadDetailsResp{}
+	err = json.Unmarshal(b, result)
+	if err != nil {
+		return err
+	}
+	article.Thread = result.Response.ID
+	return nil
+}

pkg/internal/es.go

@@ -49,7 +49,7 @@ func checkESConfig() error {
 }
 
 // ElasticSearch 搜索文章
-func ElasticSearch(query string, size, from int) (*searchIndexResult, error) {
+func ElasticSearch(query string, size, from int) (*SearchIndexResult, error) {
 	if err := checkESConfig(); err != nil {
 		return nil, err
 	}
@@ -114,7 +114,7 @@ func ElasticAddIndex(article *model.Article) error {
 	img := tools.PickFirstImage(article.Content)
 	mapping := map[string]interface{}{
 		"title":   article.Title,
-		"content": tools.IgnoreHtmlTag(article.Content),
+		"content": tools.IgnoreHTMLTag(article.Content),
 		"slug":    article.Slug,
 		"tag":     article.Tags,
 		"img":     img,
@@ -241,8 +241,8 @@ func deleteIndexDocument(index, typ string, ids []string) error {
 	return nil
 }
 
-// searchIndexResult 查询结果
-type searchIndexResult struct {
+// SearchIndexResult 查询结果
+type SearchIndexResult struct {
 	Took float32 `json:"took"`
 	Hits struct {
 		Total int `json:"total"`
@@ -264,7 +264,7 @@ type searchIndexResult struct {
 }
 
 // indexQueryDSL 语句查询文档
-func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*searchIndexResult, error) {
+func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*SearchIndexResult, error) {
 	rawurl := fmt.Sprintf("%s/%s/%s/_search?size=%d&from=%d", config.Conf.ESHost,
 		index, typ, size, from)
 	resp, err := httpPost(rawurl, dsl)
@@ -276,7 +276,7 @@ func indexQueryDSL(index, typ string, size, from int, dsl []byte) (*searchIndexR
 	if err != nil {
 		return nil, err
 	}
-	result := &searchIndexResult{}
+	result := &SearchIndexResult{}
 	err = json.Unmarshal(data, result)
 	if err != nil {
 		return nil, err

pkg/model/article.go

@@ -20,6 +20,7 @@ type Article struct {
 	SerieID int            `gorm:"column:serie_id;not null" bson:"serie_id"`     // 专题ID
 	Tags    pq.StringArray `gorm:"column:tags;type:text[]" bson:"tags"`          // tags
 	IsDraft bool           `gorm:"column:is_draft;not null" bson:"is_draft"`     // 是否是草稿
+	Thread  string         `gorm:"column:thread" bson:"thread"`                  // disqus thread
 
 	DeletedAt time.Time `gorm:"column:deleted_at;not null" bson:"deleted_at"`                  // 删除时间
 	UpdatedAt time.Time `gorm:"column:updated_at;default:current_timestamp" bson:"updated_at"` // 更新时间
@@ -28,7 +29,6 @@ type Article struct {
 	Header  string   `gorm:"-" bson:"-"` // header
 	Excerpt string   `gorm:"-" bson:"-"` // 预览信息
 	Desc    string   `gorm:"-" bson:"-"` // 描述
-	Thread  string   `gorm:"-" bson:"-"` // disqus thread
 	Prev    *Article `gorm:"-" bson:"-"` // 上篇文章
 	Next    *Article `gorm:"-" bson:"-"` // 下篇文章
 }

scripts/dist_tar.sh

@@ -10,8 +10,8 @@ for file in pkg/core/*; do
   # tar platform
   for os in linux darwin windows; do
     _target="$app-$_tag.$os-$_arch.tar.gz"
-    CGO_ENABLED=0 GOOS=$os GOARCH=$_arch \
-      go build -tags prod -o backend "./cmd/$app"
+    GOOS=$os GOARCH=$_arch \
+      go build -tags prod -ldflags '-extldflags "-static"' -o backend "./cmd/$app"
     if [ "$app" = "eiblog" ]; then
       tar czf $_target conf website assets backend
     else

scripts/run_build.sh

@@ -20,7 +20,7 @@ mkdir -p ./bin
 # build demo app
 for file in pkg/core/*; do
   app="$(basename $file)";
-  CGO_ENABLED=0 go build -tags prod -o bin/backend "./cmd/$app"
+  go build -tags prod -ldflags '-extldflags "-static"' -o bin/backend "./cmd/$app"
   # docker image
   docker buildx build --platform "$_platform" \
     -f "build/package/$app.Dockerfile" \

tools/tmplfunc.go

@@ -73,3 +73,8 @@ func GetAvatar(domain string) string {
 
 	return avatar
 }
+
+// ImgToNormal replace lazy image attr data-src to src
+func ImgToNormal(content string) string {
+	return strings.ReplaceAll(content, "data-src=", "src=")
+}

tools/tools.go

@@ -5,6 +5,7 @@ import (
 	"crypto/sha256"
 	"fmt"
 	"io"
+	"io/fs"
 	"io/ioutil"
 	"path"
 	"regexp"
@@ -22,13 +23,13 @@ func EncryptPasswd(name, pass string) string {
 }
 
 // ReadDirFiles 读取目录
-func ReadDirFiles(dir string, filter func(name string) bool) (files []string) {
+func ReadDirFiles(dir string, filter func(fi fs.FileInfo) bool) (files []string) {
 	fileInfos, err := ioutil.ReadDir(dir)
 	if err != nil {
 		return
 	}
 	for _, fi := range fileInfos {
-		if filter(fi.Name()) {
+		if filter(fi) {
 			continue
 		}
 		if fi.IsDir() {
@@ -42,19 +43,19 @@ func ReadDirFiles(dir string, filter func(name string) bool) (files []string) {
 
 // 2016-10-22T07:03:01
 const (
-	JUST_NOW    = "几秒前"
-	MINUTES_AGO = "%d分钟前"
-	HOURS_AGO   = "%d小时前"
-	DAYS_AGO    = "%d天前"
-	MONTH_AGO   = "%d月前"
-	YEARS_AGO   = "%d年前"
+	JustNow    = "几秒前"
+	MinutesAgo = "%d分钟前"
+	HoursAgo   = "%d小时前"
+	DaysAgo    = "%d天前"
+	MonthAgo   = "%d月前"
+	YearsAgo   = "%d年前"
 )
 
 // ConvertStr 时间转换为间隔
 func ConvertStr(str string) string {
 	t, err := time.ParseInLocation("2006-01-02T15:04:05", str, time.UTC)
 	if err != nil {
-		return JUST_NOW
+		return JustNow
 	}
 	now := time.Now().UTC()
 	y1, m1, d1 := t.Date()
@@ -62,17 +63,17 @@ func ConvertStr(str string) string {
 	h1, mi1, s1 := t.Clock()
 	h2, mi2, s2 := now.Clock()
 	if y := y2 - y1; y > 1 || (y == 1 && m2-m1 >= 0) {
-		return fmt.Sprintf(YEARS_AGO, y)
+		return fmt.Sprintf(YearsAgo, y)
 	} else if m := y*12 + int(m2-m1); m > 1 || (m == 1 && d2-d1 >= 0) {
-		return fmt.Sprintf(MONTH_AGO, m)
+		return fmt.Sprintf(MonthAgo, m)
 	} else if d := m*dayIn(y1, m1) + d2 - d1; d > 1 || (d == 1 && h2-h1 >= 0) {
-		return fmt.Sprintf(DAYS_AGO, d)
+		return fmt.Sprintf(DaysAgo, d)
 	} else if h := d*24 + h2 - h1; h > 1 || (h == 1 && mi2-mi1 >= 0) {
-		return fmt.Sprintf(HOURS_AGO, h)
+		return fmt.Sprintf(HoursAgo, h)
 	} else if mi := h*60 + mi2 - mi1; mi > 1 || (mi == 1 && s2-s1 >= 0) {
-		return fmt.Sprintf(MINUTES_AGO, mi)
+		return fmt.Sprintf(MinutesAgo, mi)
 	}
-	return JUST_NOW
+	return JustNow
 }
 
 // dayIn 获取天数
@@ -120,8 +121,8 @@ var (
 	regexpEnter    = regexp.MustCompile(`\s+`)
 )
 
-// IgnoreHtmlTag 去掉 html tag
-func IgnoreHtmlTag(src string) string {
+// IgnoreHTMLTag 去掉 html tag
+func IgnoreHTMLTag(src string) string {
 	// 去除所有尖括号内的HTML代码
 	src = regexpBrackets.ReplaceAllString(src, "")
 	// 去除换行符

website/template/feedTpl.xml

@@ -15,8 +15,9 @@
             <comments>https://{{$.Host}}/post/{{.Slug}}.html#comments</comments>
             <guid>https://{{$.Host}}/post/{{.Slug}}.html</guid>
             <description>
-                <![CDATA[<blockquote>{{.Content}}<p>本文链接：<a href="https://{{$.Host}}/post/{{.Slug}}.html">https://{{$.Host}}/post/{{.Slug}}.html</a>，<a href="https://{{$.Host}}/post/{{.Slug}}.html#comments">参与评论 »</a></p>]]>
+                <![CDATA[{{imgtonormal .Content}}<p>本文链接：<a href="https://{{$.Host}}/post/{{.Slug}}.html">https://{{$.Host}}/post/{{.Slug}}.html</a>，<a href="https://{{$.Host}}/post/{{.Slug}}.html#comments">参与评论 »</a></p>]]>
             </description>
+            <pubDate>{{dateformat .CreatedAt "Mon, 02 Jan 2006 15:04:05 -0700"}}</pubDate>
         </item>
         {{end}}
     </channel>