chore: update README.md

.github/workflows/release.yml

@@ -1,169 +1,65 @@
-name: Release Image & Asset
+name: release image & asset
 
 on:
-  push:
+ push:
-    tags:
+   tags:
       - "v*"
 
-permissions:
-  contents: write
-  packages: write
-  id-token: write # for SLSA provenance
-  attestations: write # for attestations
-
-env:
-  REGISTRY: docker.io
-  GOPROXY: https://goproxy.io,direct
-
 jobs:
-  # Job 1: 打包源码 tar 文件
+  package:
-  package-source:
     runs-on: ubuntu-latest
-    outputs:
-      tag: ${{ steps.vars.outputs.tag }}
-      sha: ${{ steps.vars.outputs.sha }}
-      date: ${{ steps.vars.outputs.date }}
     steps:
-      - name: Checkout repository
+    - name: Checkout
-        uses: actions/checkout@v4
+      uses: actions/checkout@v3
 
-      - name: Set up Go
+    - name: Set up QEMU
-        uses: actions/setup-go@v5
+      uses: docker/setup-qemu-action@v2
-        with:
+      with:
-          go-version-file: go.mod
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
-          cache: true
 
-      - name: Extract metadata
+    - name: Set up Docker Buildx
-        id: vars
+      uses: docker/setup-buildx-action@v2
-        run: |
-          echo "tag=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          echo "sha=${GITHUB_SHA::8}" >> $GITHUB_OUTPUT
-          echo "date=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
 
-      - name: Package tar archive
+    - name: Docker tag
-        run: scripts/dist_tar.sh ${{ steps.vars.outputs.tag }}
+      id: vars
+      run: echo ::set-output name=tag::$(echo ${GITHUB_REF:10})
+    - name: Login to Docker Hub
+      uses: docker/login-action@v2
+      with:
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        username: ${{ secrets.DOCKER_USERNAME }}
 
-      - name: Upload tar artifacts
+    - name: Build and push eiblog
-        uses: actions/upload-artifact@v4
+      uses: docker/build-push-action@v3
-        with:
+      with:
-          name: release-archives
+        context: .
-          path: "*.tar.gz"
+        file: ./build/package/eiblog.Dockerfile
-          retention-days: 7
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
+        push: true
+        tags: |
+          deepzz0/eiblog:${{ steps.vars.outputs.tag }}
+          deepzz0/eiblog:latest
 
-  # Job 2: 构建并推送 Docker 镜像
+    - name: Build and push backup
-  build-images:
+      uses: docker/build-push-action@v3
-    runs-on: ubuntu-latest
+      with:
-    needs: package-source
+        context: .
-    strategy:
+        file: ./build/package/backup.Dockerfile
-      fail-fast: false
+        platforms: linux/amd64,linux/arm64,linux/arm/v7
-      matrix:
+        push: true
-        app: [eiblog, backup]
+        tags: |
-        include:
+          deepzz0/backup:${{ steps.vars.outputs.tag }}
-          - app: eiblog
+          deepzz0/backup:latest
-            port: 9000
-          - app: backup
-            port: 9001
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
 
-      - name: Set up QEMU
+    - name: Package tar
-        uses: docker/setup-qemu-action@v3
+      env:
-        with:
+        GOPROXY: https://goproxy.io,direct
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+      run: scripts/dist_tar.sh ${{ steps.vars.outputs.tag }}
-
+    - name: Release push
-      - name: Set up Docker Buildx
+      uses: softprops/action-gh-release@v1
-        uses: docker/setup-buildx-action@v3
+      if: startsWith(github.ref, 'refs/tags/')
-
+      env:
-      - name: Login to Docker Hub
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        uses: docker/login-action@v3
+      with:
-        with:
+        files: |
-          username: ${{ secrets.DOCKER_USERNAME }}
+          *.tar.gz
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Extract metadata for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ${{ env.REGISTRY }}/deepzz0/${{ matrix.app }}
-          tags: |
-            type=ref,event=tag
-            type=raw,value=latest,enable={{is_default_branch}}
-          labels: |
-            org.opencontainers.image.title=${{ matrix.app }}
-            org.opencontainers.image.description=eiblog ${{ matrix.app }} service
-            org.opencontainers.image.vendor=deepzz
-            org.opencontainers.image.revision=${{ needs.package-source.outputs.sha }}
-            org.opencontainers.image.created=${{ needs.package-source.outputs.date }}
-
-      - name: Build and push ${{ matrix.app }} image
-        id: build
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          file: ./build/package/${{ matrix.app }}/Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha,scope=${{ matrix.app }}
-          cache-to: type=gha,mode=max,scope=${{ matrix.app }}
-          provenance: true
-          sbom: true
-
-      - name: Generate SLSA attestation
-        uses: actions/attest-build-provenance@v1
-        with:
-          subject-name: ${{ env.REGISTRY }}/deepzz0/${{ matrix.app }}
-          subject-digest: ${{ steps.build.outputs.digest }}
-
-  # Job 3: 创建 GitHub Release
-  create-release:
-    runs-on: ubuntu-latest
-    needs: [package-source, build-images]
-    steps:
-      - name: Download tar artifacts
-        uses: actions/download-artifact@v4
-        with:
-          name: release-archives
-
-      - name: Create release summary
-        run: |
-          cat >> $GITHUB_STEP_SUMMARY << 'EOF'
-          # 🎉 Release ${{ needs.package-source.outputs.tag }} Created!
-          
-          ## 📦 Docker Images
-          - **eiblog**: `deepzz0/eiblog:${{ needs.package-source.outputs.tag }}`
-          - **backup**: `deepzz0/backup:${{ needs.package-source.outputs.tag }}`
-          
-          ## 🏗️ Build Info
-          - **Tag**: ${{ needs.package-source.outputs.tag }}
-          - **Commit**: ${{ needs.package-source.outputs.sha }}
-          - **Built**: ${{ needs.package-source.outputs.date }}
-          - **Platforms**: linux/amd64, linux/arm64, linux/arm/v7
-          
-          ## 🔐 Security
-          - ✅ SLSA Build Provenance
-          - ✅ SBOM (Software Bill of Materials)
-          - ✅ Container Signing
-          EOF
-
-      - name: Create GitHub release
-        uses: softprops/action-gh-release@v2
-        with:
-          files: "*.tar.gz"
-          generate_release_notes: true
-          name: Release ${{ needs.package-source.outputs.tag }}
-          body: |
-            ## Docker Images
-            ```bash
-            docker pull deepzz0/eiblog:${{ needs.package-source.outputs.tag }}
-            docker pull deepzz0/backup:${{ needs.package-source.outputs.tag }}
-            ```
-            
-            ## Multi-Architecture Support
-            - linux/amd64
-            - linux/arm64  
-            - linux/arm/v7
-            
-            Built with commit ${{ needs.package-source.outputs.sha }} on ${{ needs.package-source.outputs.date }}

.gitignore

@@ -7,6 +7,7 @@
 *.DS_Store
 *.tar.gz
 *.db
+backend
 
 # Test binary, built with `go test -c`
 *.test
@@ -17,7 +18,5 @@
 # Dependency directories (remove the comment below to include it)
 # vendor/
 bin
-cmd/eiblog/etc/assets/*.xml
+assets/*.*
-cmd/eiblog/etc/assets/*.txt
 db.sqlite
-cmd/*/backend

CHANGELOG.md

@@ -2,35 +2,6 @@
 
 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.2](https://github.com/eiblog/eiblog/compare/v3.0.1...v3.0.2) (2025-07-25)
-
-
-### Bug Fixes
-
-* ci ([ccb5e45](https://github.com/eiblog/eiblog/commit/ccb5e4546e224182c949e72e9eae82fbbe1a02fe))
-
-### [3.0.1](https://github.com/eiblog/eiblog/compare/v3.0.0...v3.0.1) (2025-07-25)
-
-
-### Bug Fixes
-
-* dist tar ([cb2ed7c](https://github.com/eiblog/eiblog/commit/cb2ed7cb8244dda8cbd8c5966c7ed02e177777e5))
-
-## [3.0.0](https://github.com/eiblog/eiblog/compare/v2.2.17...v3.0.0) (2025-07-24)
-
-
-### Features
-
-* support custom page ([b69248f](https://github.com/eiblog/eiblog/commit/b69248f6a4937f8157d2393bd44c6c55174ae3e7))
-* twofactor bind ([e5100fa](https://github.com/eiblog/eiblog/commit/e5100fa018e2955c3d649b70245e3a379658d7ba))
-
-
-### Bug Fixes
-
-* ci ([f4c70b4](https://github.com/eiblog/eiblog/commit/f4c70b46c19d8761c252b767c92016c195299c0c))
-* ci dist tar ([24bfe52](https://github.com/eiblog/eiblog/commit/24bfe528b28b995c3d5b2c13314c8849a036942b))
-* custom page support embed ([aee4194](https://github.com/eiblog/eiblog/commit/aee4194c71dd98a7a84da96810a060f716d1ea57))
-
 ### [2.2.16](https://github.com/eiblog/eiblog/compare/v2.2.15...v2.2.16) (2025-03-13)
 
 

Makefile

@@ -22,6 +22,10 @@ backup:
 dist:
 	@scripts/dist_tar.sh $(tag)
 
+# clean
+clean:
+	@rm -rf bin && rm -f *.tar.gz && rm -f backend
+
 # protoc
 protoc:
 	@cd pkg/proto && make protoc

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` 版本，稳定性和维护你是不用担心的。[V3 版本](https://github.com/eiblog/eiblog/tree/v3) 正在积极开发中！
-
-用过其它博客系统，不喜欢，不够轻，不够快！这是我开发的第二款博客系统，也实在不想再在这件事情上过多纠结了。`EiBlog` 是一个比较稳定的博客系统，现已迭代至 `2.0` 版本，稳定性和维护你是不用担心的。
 
 但它有着部署简单（上线复杂！）的特点，不推荐没有计算机知识的朋友搭建，欢迎咨询。该博客的个中优点（简洁、轻快，安全），等你体验。
 
@@ -33,8 +31,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
 ```
 

build/package/backup.Dockerfile

@@ -2,20 +2,20 @@ FROM golang:1.20 AS builder
 
 WORKDIR /eiblog
 COPY . .
-RUN scripts/run_build.sh backup
+RUN ./scripts/run_build.sh backup
+
 
 FROM alpine:latest
 LABEL maintainer="deepzz.qi@gmail.com"
 
 RUN apk add --update --no-cache tzdata ca-certificates \
-    mongodb-tools libc6-compat gcompat
+  mongodb-tools libc6-compat gcompat
-
 COPY README.md /app/README.md
 COPY CHANGELOG.md /app/CHANGELOG.md
 COPY LICENSE /app/LICENSE
 
-COPY --from=builder /eiblog/cmd/backup/backend /app/backend
+COPY --from=builder /eiblog/bin/backend /app/backend
-COPY cmd/backup/etc /app/etc
+COPY conf /app/conf
 
 EXPOSE 9001
 

build/package/eiblog.Dockerfile

@@ -2,19 +2,21 @@ FROM golang:1.20 AS builder
 
 WORKDIR /eiblog
 COPY . .
-RUN scripts/run_build.sh eiblog
+RUN ./scripts/run_build.sh eiblog
+
 
 FROM alpine:latest
 LABEL maintainer="deepzz.qi@gmail.com"
 
-RUN apk add --update --no-cache tzdata ca-certificates
+RUN apk add --update --no-cache tzdata
-
 COPY README.md /app/README.md
 COPY CHANGELOG.md /app/CHANGELOG.md
 COPY LICENSE /app/LICENSE
 
-COPY --from=builder /eiblog/cmd/eiblog/backend /app/backend
+COPY --from=builder /eiblog/bin/backend /app/backend
-COPY cmd/eiblog/etc /app/etc
+COPY conf /app/conf
+COPY website /app/website
+COPY assets /app/assets
 
 EXPOSE 9000
 

cmd/backup/config/config.go

@@ -1,67 +0,0 @@
-package config
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/eiblog/eiblog/pkg/config"
-
-	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
-)
-
-// Config config
-type Config struct {
-	config.APIMode
-
-	Database config.Database // 数据库配置
-	BackupTo string          // 备份到, default: qiniu
-	Interval string          // 备份周期, default: 7d
-	Validity int             // 备份保留时间, default: 60
-	Qiniu    config.Qiniu    // 七牛OSS配置
-}
-
-// Conf 配置
-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)
-	}
-	logrus.Infof("Run mode:%s", mode)
-
-	// 加载配置文件
-	etc, err := config.WorkEtcPath()
-	if err != nil {
-		panic(err)
-	}
-	path := filepath.Join(etc, "app.yml")
-
-	data, err := os.ReadFile(path)
-	if err != nil {
-		panic(err)
-	}
-	err = yaml.Unmarshal(data, &Conf)
-	if err != nil {
-		panic(err)
-	}
-	Conf.RunMode = mode
-
-	// read env
-	readDatabaseEnv()
-}
-
-func readDatabaseEnv() {
-	key := strings.ToUpper(Conf.Name) + "_DB_DRIVER"
-	if d := os.Getenv(key); d != "" {
-		Conf.Database.Driver = d
-	}
-	key = strings.ToUpper(Conf.Name) + "_DB_SOURCE"
-	if s := os.Getenv(key); s != "" {
-		Conf.Database.Source = s
-	}
-}

cmd/backup/docs/docs.go

@@ -1,60 +0,0 @@
-// Package docs Code generated by swaggo/swag. DO NOT EDIT
-package docs
-
-import "github.com/swaggo/swag"
-
-const docTemplate = `{
-    "schemes": {{ marshal .Schemes }},
-    "swagger": "2.0",
-    "info": {
-        "description": "{{escape .Description}}",
-        "title": "{{.Title}}",
-        "contact": {},
-        "version": "{{.Version}}"
-    },
-    "host": "{{.Host}}",
-    "basePath": "{{.BasePath}}",
-    "paths": {
-        "/ping": {
-            "get": {
-                "description": "ping",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "ping"
-                ],
-                "summary": "ping",
-                "responses": {
-                    "200": {
-                        "description": "it's ok",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        }
-    }
-}`
-
-// SwaggerInfo holds exported Swagger Info so clients can modify it
-var SwaggerInfo = &swag.Spec{
-	Version:          "1.0",
-	Host:             "",
-	BasePath:         "",
-	Schemes:          []string{},
-	Title:            "backup API",
-	Description:      "This is a backup server.",
-	InfoInstanceName: "swagger",
-	SwaggerTemplate:  docTemplate,
-	LeftDelim:        "{{",
-	RightDelim:       "}}",
-}
-
-func init() {
-	swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo)
-}

cmd/backup/docs/swagger.json

@@ -1,34 +0,0 @@
-{
-    "swagger": "2.0",
-    "info": {
-        "description": "This is a backup server.",
-        "title": "backup API",
-        "contact": {},
-        "version": "1.0"
-    },
-    "paths": {
-        "/ping": {
-            "get": {
-                "description": "ping",
-                "consumes": [
-                    "application/json"
-                ],
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "ping"
-                ],
-                "summary": "ping",
-                "responses": {
-                    "200": {
-                        "description": "it's ok",
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                }
-            }
-        }
-    }
-}

cmd/backup/docs/swagger.yaml

@@ -1,22 +0,0 @@
-info:
-  contact: {}
-  description: This is a backup server.
-  title: backup API
-  version: "1.0"
-paths:
-  /ping:
-    get:
-      consumes:
-      - application/json
-      description: ping
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: it's ok
-          schema:
-            type: string
-      summary: ping
-      tags:
-      - ping
-swagger: "2.0"

cmd/backup/etc/app.yml

@@ -1,14 +0,0 @@
-apimode:
-  name: cmd-backup
-  listen: 0.0.0.0:9000
-database: # 数据库配置
-  driver: mongodb
-  source: mongodb://localhost:27017
-backupto: qiniu # 备份到, default: qiniu
-interval: 7d # 备份周期, default: 7d
-validity: 60 # 备份保留时间, default: 60
-qiniu: # 七牛OSS
-  bucket: eiblog
-  domain: st.deepzz.com
-  accesskey: MB6AXl_Sj_mmFsL-Lt59Dml2Vmy2o8XMmiCbbSeC
-  secretkey: BIrMy0fsZ0_SHNceNXk3eDuo7WmVYzj2-zrmd5Tf

cmd/backup/handler/internal/internal.go

@@ -1,17 +0,0 @@
-package internal
-
-import (
-	"github.com/eiblog/eiblog/cmd/backup/config"
-	"github.com/eiblog/eiblog/pkg/third/qiniu"
-)
-
-// QiniuClient 七牛客户端
-var QiniuClient *qiniu.QiniuClient
-
-func init() {
-	var err error
-	QiniuClient, err = qiniu.NewQiniuClient(config.Conf.Qiniu)
-	if err != nil {
-		panic(err)
-	}
-}

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

@@ -1,7 +0,0 @@
-package db
-
-// Storage 备份恢复器
-type Storage interface {
-	Backup(name string) (string, error)
-	Restore(path string) error
-}

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

@@ -1,72 +0,0 @@
-package db
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"os/exec"
-	"time"
-
-	"github.com/eiblog/eiblog/cmd/backup/config"
-	"github.com/eiblog/eiblog/pkg/connector/db"
-)
-
-// MongoStorage 备份恢复器
-type MongoStorage struct{}
-
-// Backup 备份
-func (r MongoStorage) Backup(name string) (string, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
-	defer cancel()
-
-	// dump
-	u, err := url.Parse(config.Conf.Database.Source)
-	if err != nil {
-		return "", err
-	}
-	arg := fmt.Sprintf("mongodump -h %s -d eiblog -o /tmp", u.Host)
-	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)
-	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
-	err = cmd.Run()
-	if err != nil {
-		return "", err
-	}
-	return "/tmp/" + name, nil
-}
-
-// Restore 恢复
-func (r MongoStorage) Restore(path string) error {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*20)
-	defer cancel()
-
-	// drop database
-	mdb, err := db.NewMDB(config.Conf.Database)
-	if err != nil {
-		return err
-	}
-	err = mdb.Drop(ctx)
-	if err != nil {
-		return err
-	}
-	// unarchive
-	arg := fmt.Sprintf("tar xzf %s -C /tmp", path)
-	cmd := exec.CommandContext(ctx, "sh", "-c", arg)
-	err = cmd.Run()
-	if err != nil {
-		return err
-	}
-	// restore
-	u, err := url.Parse(config.Conf.Database.Source)
-	if err != nil {
-		return err
-	}
-	arg = fmt.Sprintf("mongorestore -h %s -d eiblog /tmp/eiblog", u.Host)
-	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
-	return cmd.Run()
-}

cmd/backup/handler/timer/timer.go

@@ -1,95 +0,0 @@
-package timer
-
-import (
-	"errors"
-	"fmt"
-	"strconv"
-	"time"
-
-	"github.com/eiblog/eiblog/cmd/backup/config"
-	"github.com/eiblog/eiblog/cmd/backup/handler/timer/db"
-	"github.com/eiblog/eiblog/cmd/backup/handler/timer/to"
-
-	"github.com/sirupsen/logrus"
-)
-
-// Start to backup with ticker
-func Start(restore bool) (err error) {
-	var (
-		storage  db.Storage
-		backupTo to.BackupRestorer
-	)
-
-	// backup from
-	switch config.Conf.Database.Driver {
-	case "mongodb":
-		storage = db.MongoStorage{}
-
-	default:
-		return errors.New("timer: unknown backup from driver: " +
-			config.Conf.Database.Driver)
-	}
-
-	// backup to
-	switch config.Conf.BackupTo {
-	case "qiniu":
-		backupTo = to.QiniuBackupRestorer{}
-
-	default:
-		return errors.New("timer: unknown backup to driver: " +
-			config.Conf.BackupTo)
-	}
-
-	// restore
-	if restore {
-		path, err := backupTo.Download()
-		if err != nil {
-			return err
-		}
-		err = storage.Restore(path)
-		if err != nil {
-			return err
-		}
-		logrus.Info("timer: Restore success")
-	}
-
-	// backup
-	interval, err := ParseDuration(config.Conf.Interval)
-	if err != nil {
-		return err
-	}
-	t := time.NewTicker(interval)
-	for now := range t.C {
-		name := fmt.Sprintf("eiblog-%s.tar.gz", now.Format("2006-01-02"))
-		path, err := storage.Backup(name)
-		if err != nil {
-			logrus.Error("timer: Start.Backup: ", now.Format(time.RFC3339), err)
-			continue
-		}
-		err = backupTo.Upload(path)
-		if err != nil {
-			logrus.Error("timer: Start.Backup: ", now.Format(time.RFC3339), err)
-		}
-	}
-	return nil
-}
-
-// ParseDuration parse string to duration
-func ParseDuration(d string) (time.Duration, error) {
-	if len(d) == 0 {
-		return 0, errors.New("timer: incorrect duration input")
-	}
-
-	length := len(d)
-	switch d[length-1] {
-	case 's', 'm', 'h':
-		return time.ParseDuration(d)
-	case 'd':
-		di, err := strconv.Atoi(d[:length-1])
-		if err != nil {
-			return 0, err
-		}
-		return time.Duration(di) * time.Hour * 24, nil
-	}
-	return 0, errors.New("timer: unsupported duration:" + d)
-}

cmd/backup/handler/timer/to/qiniu.go

@@ -1,66 +0,0 @@
-package to
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/eiblog/eiblog/cmd/backup/config"
-	"github.com/eiblog/eiblog/cmd/backup/handler/internal"
-	"github.com/eiblog/eiblog/pkg/third/qiniu"
-)
-
-// QiniuBackupRestorer qiniu backup restorer
-type QiniuBackupRestorer struct{}
-
-// Upload implements timer.BackupRestorer
-func (s QiniuBackupRestorer) Upload(path string) error {
-	name := filepath.Base(path)
-
-	// upload file
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	fi, err := f.Stat()
-	if err != nil {
-		return err
-	}
-	uploadParams := qiniu.UploadParams{
-		Name:           filepath.Join("blog", name), // blog/eiblog-xx.tar.gz
-		Size:           fi.Size(),
-		Data:           f,
-		NoCompletePath: true,
-	}
-	_, err = internal.QiniuClient.Upload(uploadParams)
-	if err != nil {
-		return err
-	}
-	// after days delete
-	deleteParams := qiniu.DeleteParams{
-		Name:           filepath.Join("blog", name), // blog/eiblog-xx.tar.gz
-		Days:           config.Conf.Validity,
-		NoCompletePath: true,
-	}
-	return internal.QiniuClient.Delete(deleteParams)
-}
-
-// Download implements timer.BackupRestorer
-func (s QiniuBackupRestorer) Download() (string, error) {
-	// backup file
-	params := qiniu.ContentParams{
-		Prefix: "blog/",
-	}
-	raw, err := internal.QiniuClient.Content(params)
-	if err != nil {
-		return "", err
-	}
-
-	path := filepath.Join("/tmp", "eiblog.tar.gz")
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0644)
-	if err != nil {
-		return "", err
-	}
-	_, _ = f.Write(raw)
-	defer f.Close()
-	return path, nil
-}

cmd/backup/handler/timer/to/to.go

@@ -1,7 +0,0 @@
-package to
-
-// BackupRestorer 备份存储接口
-type BackupRestorer interface {
-	Upload(path string) error
-	Download() (path string, err error)
-}

cmd/backup/main.go

@@ -3,20 +3,16 @@ package main
 
 import (
 	"flag"
+	"fmt"
 
-	"github.com/eiblog/eiblog/cmd/backup/config"
+	"github.com/eiblog/eiblog/pkg/config"
-	"github.com/eiblog/eiblog/cmd/backup/handler/ping"
+	"github.com/eiblog/eiblog/pkg/core/backup/ping"
-	"github.com/eiblog/eiblog/cmd/backup/handler/swag"
+	"github.com/eiblog/eiblog/pkg/core/backup/swag"
-	"github.com/eiblog/eiblog/cmd/backup/handler/timer"
+	"github.com/eiblog/eiblog/pkg/core/backup/timer"
 
 	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 )
 
-// @title backup API
-// @version 1.0
-// @description This is a backup server.
-
 var restore bool
 
 func init() {
@@ -24,15 +20,15 @@ func init() {
 }
 
 func main() {
-	logrus.Info("Hi, it's App " + config.Conf.Name)
+	fmt.Println("Hi, it's App " + config.Conf.BackupApp.Name)
-
 	flag.Parse()
+
 	endRun := make(chan error, 1)
 
 	runCommand(restore, endRun)
 
 	runHTTPServer(endRun)
-	logrus.Fatal(<-endRun)
+	fmt.Println(<-endRun)
 }
 
 func runCommand(restore bool, endRun chan error) {
@@ -42,7 +38,11 @@ func runCommand(restore bool, endRun chan error) {
 }
 
 func runHTTPServer(endRun chan error) {
-	if config.Conf.RunMode.IsReleaseMode() {
+	if !config.Conf.BackupApp.EnableHTTP {
+		return
+	}
+
+	if config.Conf.RunMode == config.ModeProd {
 		gin.SetMode(gin.ReleaseMode)
 	}
 	e := gin.Default()
@@ -54,8 +54,9 @@ func runHTTPServer(endRun chan error) {
 	ping.RegisterRoutes(e)
 
 	// start
+	address := fmt.Sprintf(":%d", config.Conf.BackupApp.HTTPPort)
 	go func() {
-		endRun <- e.Run(config.Conf.Listen)
+		endRun <- e.Run(address)
 	}()
-	logrus.Info("HTTP server running on: " + config.Conf.Listen)
+	fmt.Println("HTTP server running on: " + address)
 }

cmd/eiblog/config/config.go

@@ -1,83 +0,0 @@
-package config
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/eiblog/eiblog/pkg/config"
-
-	"github.com/sirupsen/logrus"
-	"gopkg.in/yaml.v3"
-)
-
-var (
-	// Conf 配置
-	Conf Config
-	// EtcDir 工作目录
-	EtcDir string
-)
-
-// Config config
-type Config struct {
-	config.APIMode
-	// 静态资源版本, 每次更改了 js/css 都需要提高该值
-	StaticVersion int
-	// 数据库配置
-	Database config.Database
-	// 热词, 手动指定, 用于搜索
-	HotWords []string
-	// Elasticsearch 配置
-	ESHost string
-
-	General config.General
-	Disqus  config.Disqus
-	Google  config.Google
-	Qiniu   config.Qiniu
-	Twitter config.Twitter
-	FeedRPC config.FeedRPC
-	Account config.Account
-	Pages   []config.CustomPage
-}
-
-// init 初始化配置
-func init() {
-	// run mode
-	mode := config.RunMode(os.Getenv("RUN_MODE"))
-	if !mode.IsRunMode() {
-		panic("config: unsupported env RUN_MODE: " + mode)
-	}
-	logrus.Infof("Run mode:%s", mode)
-
-	// 加载配置文件
-	var err error
-	EtcDir, err = config.WorkEtcPath()
-	if err != nil {
-		panic(err)
-	}
-	path := filepath.Join(EtcDir, "app.yml")
-
-	data, err := os.ReadFile(path)
-	if err != nil {
-		panic(err)
-	}
-	err = yaml.Unmarshal(data, &Conf)
-	if err != nil {
-		panic(err)
-	}
-	Conf.RunMode = mode
-
-	// 读取环境变量配置
-	readDatabaseEnv()
-}
-
-func readDatabaseEnv() {
-	key := strings.ToUpper(Conf.Name) + "_DB_DRIVER"
-	if d := os.Getenv(key); d != "" {
-		Conf.Database.Driver = d
-	}
-	key = strings.ToUpper(Conf.Name) + "_DB_SOURCE"
-	if s := os.Getenv(key); s != "" {
-		Conf.Database.Source = s
-	}
-}

cmd/eiblog/docs/docs.go

@@ -1,36 +0,0 @@
-// Package docs Code generated by swaggo/swag. DO NOT EDIT
-package docs
-
-import "github.com/swaggo/swag"
-
-const docTemplate = `{
-    "schemes": {{ marshal .Schemes }},
-    "swagger": "2.0",
-    "info": {
-        "description": "{{escape .Description}}",
-        "title": "{{.Title}}",
-        "contact": {},
-        "version": "{{.Version}}"
-    },
-    "host": "{{.Host}}",
-    "basePath": "{{.BasePath}}",
-    "paths": {}
-}`
-
-// SwaggerInfo holds exported Swagger Info so clients can modify it
-var SwaggerInfo = &swag.Spec{
-	Version:          "",
-	Host:             "",
-	BasePath:         "",
-	Schemes:          []string{},
-	Title:            "",
-	Description:      "",
-	InfoInstanceName: "swagger",
-	SwaggerTemplate:  docTemplate,
-	LeftDelim:        "{{",
-	RightDelim:       "}}",
-}
-
-func init() {
-	swag.Register(SwaggerInfo.InstanceName(), SwaggerInfo)
-}

cmd/eiblog/docs/swagger.json

@@ -1,7 +0,0 @@
-{
-    "swagger": "2.0",
-    "info": {
-        "contact": {}
-    },
-    "paths": {}
-}

cmd/eiblog/docs/swagger.yaml

@@ -1,4 +0,0 @@
-info:
-  contact: {}
-paths: {}
-swagger: "2.0"

cmd/eiblog/etc/app.yml

@@ -1,59 +0,0 @@
-apimode:
-  name: cmd-eiblog
-  listen: 0.0.0.0:9000
-  host: example.com
-database: # 数据库配置
-  driver: sqlite
-  source: ./db.sqlite
-hotwords: # 热搜词
-  - docker
-  - mongodb
-  - curl
-  - dns
-staticversion: 1
-eshost: # http://elasticsearch:9200
-pages:
-  - name: 自定义页面
-    path: /page/custom.html
-    showinnav: true
-    isembed: false
-  - name: 自定义页面2
-    path: /page/custom2.html
-    showinnav: true
-    isembed: true
-general: # 常规配置
-  pagenum: 10 # 首页展示文章数量
-  pagesize: 20 # 管理界面
-  descprefix: "Desc:" # 文章描述前缀
-  identifier: <!--more--> # 截取预览标识
-  length: 400 # 自动截取预览, 字符数
-  timezone: Asia/Shanghai # 时区
-  twofactor: true # 是否启用两步验证
-disqus: # 评论相关
-  shortname: xxxxxx
-  publickey: wdSgxRm9rdGAlLKFcFdToBe3GT4SibmV7Y8EjJQ0r4GWXeKtxpopMAeIeoI2dTEg
-  accesstoken: 50023908f39f4607957e909b495326af
-google: # 谷歌分析
-  url: https://www.google-analytics.com/g/collect
-  tid: G-xxxxxxxxxx
-  v: "2"
-  adsense: <script async src="https://pagead2.googlesyndication.com/xxx" crossorigin="anonymous"></script>
-qiniu: # 七牛OSS
-  bucket: eiblog
-  domain: st.deepzz.com
-  accesskey: MB6AXl_Sj_mmFsL-Lt59Dml2Vmy2o8XMmiCbbSeC
-  secretkey: BIrMy0fsZ0_SHNceNXk3eDuo7WmVYzj2-zrmd5Tf
-twitter: # twitter card
-  card: summary
-  site: deepzz02
-  image: st.deepzz.com/static/img/avatar.jpg
-  address: twitter.com/deepzz02
-feedrpc: # rss ping
-  feedrurl: https://deepzz.superfeedr.com/
-  pingrpc:
-  - http://ping.baidu.com/ping/RPC2
-  - http://rpc.pingomatic.com/
-# 数据初始化操作，可到博客后台修改
-account:
-  username: deepzz # *后台登录用户名
-  password: deepzz # *登录明文密码

cmd/eiblog/etc/page/custom.html

@@ -1,8 +0,0 @@
-<html>
-    <head>
-        <title>Custom Page</title>
-    </head>
-    <body>
-        <h1>Custom Page</h1>
-    </body>
-</html>

cmd/eiblog/etc/page/custom2.html

@@ -1,10 +0,0 @@
-{{define "custom2.html"}}
-<div id=content class=inner>
-    <article class="post" itemscope itemtype="http://schema.org/Article">
-        <h1 class=title itemprop=headline>Custom Page</h1>
-        <div class="entry-content" itemprop=articleBody>
-            <p>Custom Page</p>
-        </div>
-    </article>
-</div>
-{{end}}

cmd/eiblog/handler/file/file.go

@@ -1,69 +0,0 @@
-package file
-
-import (
-	"net/http"
-	"path/filepath"
-
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
-
-	"github.com/gin-gonic/gin"
-)
-
-// RegisterRoutes register routes
-func RegisterRoutes(e *gin.Engine) {
-	e.GET("/rss.html", handleFeed())
-	e.GET("/feed", handleFeed())
-	e.GET("/opensearch.xml", handleOpensearch())
-	e.GET("/sitemap.xml", handleSitemap())
-	e.GET("/robots.txt", handleRobots())
-	e.GET("/crossdomain.xml", handleCrossDomain())
-	e.GET("/favicon.ico", handleFavicon())
-}
-
-// handleFeed feed.xml
-func handleFeed() gin.HandlerFunc {
-	path := filepath.Join(config.EtcDir, "assets", "feed.xml")
-	return func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, path)
-	}
-}
-
-// handleOpensearch opensearch.xml
-func handleOpensearch() gin.HandlerFunc {
-	path := filepath.Join(config.EtcDir, "assets", "opensearch.xml")
-	return func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, path)
-	}
-}
-
-// handleRobots robotx.txt
-func handleRobots() gin.HandlerFunc {
-	path := filepath.Join(config.EtcDir, "assets", "robots.txt")
-	return func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, path)
-	}
-}
-
-// handleSitemap sitemap.xml
-func handleSitemap() gin.HandlerFunc {
-	path := filepath.Join(config.EtcDir, "assets", "sitemap.xml")
-	return func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, path)
-	}
-}
-
-// handleCrossDomain crossdomain.xml
-func handleCrossDomain() gin.HandlerFunc {
-	path := filepath.Join(config.EtcDir, "assets", "crossdomain.xml")
-	return func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, path)
-	}
-}
-
-// handleFavicon favicon.ico
-func handleFavicon() gin.HandlerFunc {
-	path := filepath.Join(config.EtcDir, "assets", "favicon.ico")
-	return func(c *gin.Context) {
-		http.ServeFile(c.Writer, c.Request, path)
-	}
-}

cmd/eiblog/handler/internal/internal.go

@@ -1,98 +0,0 @@
-package internal
-
-import (
-	"io/fs"
-	"path/filepath"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/internal/store"
-	"github.com/eiblog/eiblog/pkg/third/disqus"
-	"github.com/eiblog/eiblog/pkg/third/es"
-	"github.com/eiblog/eiblog/pkg/third/pinger"
-	"github.com/eiblog/eiblog/pkg/third/qiniu"
-	"github.com/eiblog/eiblog/tools"
-
-	"github.com/sirupsen/logrus"
-)
-
-var (
-	XMLTemplate  *template.Template // template/xml模板
-	HTMLTemplate *template.Template // page/html | website/html模板
-
-	Store           store.Store // 数据库存储
-	Ei              *Cache      // 博客数据缓存
-	TwoFactorSecret string      // 缓存两步验证密钥
-
-	ESClient     *es.ESClient         // es 客户端
-	DisqusClient *disqus.DisqusClient // disqus 客户端
-	QiniuClient  *qiniu.QiniuClient   // qiniu客户端
-	Pinger       *pinger.Pinger       // pinger 客户端
-)
-
-func init() {
-	var err error
-	tools.TimeLocation, err = time.LoadLocation(config.Conf.General.Timezone)
-	if err != nil {
-		logrus.Fatal("init timezone: ", err)
-	}
-	// 模板解析初始化
-	root := filepath.Join(config.EtcDir, "xml", "*.xml")
-	XMLTemplate, err = template.New("eiblog").Funcs(tools.TplFuncMap).ParseGlob(root)
-	if err != nil {
-		logrus.Fatal("init xml template: ", err)
-	}
-	root = filepath.Join(config.EtcDir, "template")
-	files := tools.ReadDirFiles(root, func(fi fs.DirEntry) bool {
-		// should not read dir & .DS_Store
-		return strings.HasPrefix(fi.Name(), ".")
-	})
-	root = filepath.Join(config.EtcDir, "page")
-	pageFiles := tools.ReadDirFiles(root, func(fi fs.DirEntry) bool {
-		return !strings.HasSuffix(fi.Name(), ".html")
-	})
-	files = append(files, pageFiles...)
-	HTMLTemplate, err = template.New("eiblog").Funcs(tools.TplFuncMap).ParseFiles(files...)
-	if err != nil {
-		logrus.Fatal("init html template: ", err)
-	}
-
-	// 数据库初始化
-	logrus.Info("store drivers: ", store.Drivers())
-	Store, err = store.NewStore(config.Conf.Database)
-	if err != nil {
-		logrus.Fatal("init store: ", err)
-	}
-
-	Ei, err = NewCache()
-	if err != nil {
-		logrus.Fatal("init blog cache: ", err)
-	}
-
-	if config.Conf.ESHost != "" {
-		ESClient, err = es.NewESClient(config.Conf.ESHost)
-		if err != nil {
-			logrus.Fatal("init es client: ", err)
-		}
-	}
-
-	DisqusClient, err = disqus.NewDisqusClient(config.Conf.Host, config.Conf.Disqus)
-	if err != nil {
-		logrus.Fatal("init disqus client: ", err)
-	}
-
-	QiniuClient, err = qiniu.NewQiniuClient(config.Conf.Qiniu)
-	if err != nil {
-		logrus.Fatal("init qiniu client: ", err)
-	}
-
-	Pinger, err = pinger.NewPinger(config.Conf.Host, config.Conf.FeedRPC)
-	if err != nil {
-		logrus.Fatal("init pinger: ", err)
-	}
-
-	// 启动定时器
-	go startTimer()
-}

cmd/eiblog/handler/internal/timer.go

@@ -1,160 +0,0 @@
-package internal
-
-import (
-	"context"
-	"errors"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
-
-	"github.com/sirupsen/logrus"
-)
-
-func startTimer() {
-	err := generateOpensearch()
-	if err != nil {
-		logrus.Error("startTimer.generateOpensearch: ", err)
-	}
-	err = generateRobots()
-	if err != nil {
-		logrus.Error("startTimer.generateRobots: ", err)
-	}
-	err = generateCrossdomain()
-	if err != nil {
-		logrus.Error("startTimer.generateCrossdomain: ", err)
-	}
-
-	ticker := time.NewTicker(time.Hour)
-	for now := range ticker.C {
-		// 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)
-			}
-		}
-		// clean expired articles
-		exp := now.Add(-48 * time.Hour)
-		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)
-			}
-		}
-	}
-}
-
-// generateFeed 定时刷新feed
-func generateFeed() error {
-	tpl := XMLTemplate.Lookup("feedTpl.xml")
-	if tpl == nil {
-		return errors.New("not found: feedTpl.xml")
-	}
-
-	_, _, articles := Ei.PageArticleFE(1, 20)
-	params := map[string]interface{}{
-		"Title":     Ei.Blogger.BTitle,
-		"SubTitle":  Ei.Blogger.SubTitle,
-		"Host":      config.Conf.Host,
-		"FeedrURL":  config.Conf.FeedRPC.FeedrURL,
-		"BuildDate": time.Now().Format(time.RFC1123Z),
-		"Articles":  articles,
-	}
-	path := filepath.Join(config.EtcDir, "assets", "feed.xml")
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return tpl.Execute(f, params)
-}
-
-// generateSitemap 定时刷新sitemap
-func generateSitemap() error {
-	tpl := XMLTemplate.Lookup("sitemapTpl.xml")
-	if tpl == nil {
-		return errors.New("not found: sitemapTpl.xml")
-	}
-
-	params := map[string]interface{}{
-		"Articles": Ei.Articles,
-		"Host":     config.Conf.Host,
-	}
-	path := filepath.Join(config.EtcDir, "assets", "sitemap.xml")
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return tpl.Execute(f, params)
-}
-
-// generateOpensearch 生成opensearch.xml
-func generateOpensearch() error {
-	tpl := XMLTemplate.Lookup("opensearchTpl.xml")
-	if tpl == nil {
-		return errors.New("not found: opensearchTpl.xml")
-	}
-
-	params := map[string]string{
-		"BTitle":   Ei.Blogger.BTitle,
-		"SubTitle": Ei.Blogger.SubTitle,
-		"Host":     config.Conf.Host,
-	}
-	path := filepath.Join(config.EtcDir, "assets", "opensearch.xml")
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return tpl.Execute(f, params)
-}
-
-// generateRobots 生成robots.txt
-func generateRobots() error {
-	tpl := XMLTemplate.Lookup("robotsTpl.xml")
-	if tpl == nil {
-		return errors.New("not found: robotsTpl.xml")
-	}
-
-	params := map[string]string{
-		"Host": config.Conf.Host,
-	}
-	path := filepath.Join(config.EtcDir, "assets", "robots.txt")
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return tpl.Execute(f, params)
-}
-
-// generateCrossdomain 生成crossdomain.xml
-func generateCrossdomain() error {
-	tpl := XMLTemplate.Lookup("crossdomainTpl.xml")
-	if tpl == nil {
-		return errors.New("not found: crossdomainTpl.xml")
-	}
-
-	params := map[string]string{
-		"Host": config.Conf.Host,
-	}
-	path := filepath.Join(config.EtcDir, "assets", "crossdomain.xml")
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return tpl.Execute(f, params)
-}

cmd/eiblog/main.go

@@ -2,69 +2,71 @@
 package main
 
 import (
+	"fmt"
 	"path/filepath"
 
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
+	"github.com/eiblog/eiblog/pkg/config"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/admin"
+	"github.com/eiblog/eiblog/pkg/core/eiblog"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/file"
+	"github.com/eiblog/eiblog/pkg/core/eiblog/admin"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/pages"
+	"github.com/eiblog/eiblog/pkg/core/eiblog/file"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/swag"
+	"github.com/eiblog/eiblog/pkg/core/eiblog/page"
-
+	"github.com/eiblog/eiblog/pkg/core/eiblog/swag"
-	"github.com/eiblog/eiblog/pkg/middleware"
+	"github.com/eiblog/eiblog/pkg/mid"
 
 	"github.com/gin-gonic/gin"
-	"github.com/sirupsen/logrus"
 )
 
 func main() {
-	logrus.Info("Hi, it's App " + config.Conf.Name)
+	fmt.Println("Hi, it's App " + config.Conf.EiBlogApp.Name)
 
 	endRun := make(chan error, 1)
 
 	runHTTPServer(endRun)
-	logrus.Fatal(<-endRun)
+	fmt.Println(<-endRun)
 }
 
 func runHTTPServer(endRun chan error) {
-	if config.Conf.RunMode.IsReleaseMode() {
+	if !config.Conf.EiBlogApp.EnableHTTP {
+		return
+	}
+
+	if config.Conf.RunMode == config.ModeProd {
 		gin.SetMode(gin.ReleaseMode)
 	}
 	e := gin.Default()
 	// middleware
-	e.Use(middleware.UserMiddleware())
+	e.Use(mid.UserMiddleware())
-	e.Use(middleware.SessionMiddleware(
+	e.Use(mid.SessionMiddleware(mid.SessionOpts{
-		middleware.SessionOpts{
+		Name:   "su",
-			Name:   "su",
+		Secure: config.Conf.RunMode == config.ModeProd,
-			Secure: config.Conf.RunMode.IsReleaseMode(),
+		Secret: []byte("ZGlzvcmUoMTAsICI="),
-			Secret: []byte("ZGlzvcmUoMTAsICI="),
+	}))
-		}))
 
 	// swag
 	swag.RegisterRoutes(e)
 
 	// static files, page
-	e.Static("/static", filepath.Join(config.EtcDir, "assets"))
+	root := filepath.Join(config.WorkDir, "assets")
-
+	e.Static("/static", root)
-	// custom pages
-	pages.RegisterRoutesCustomPages(e)
 
 	// static files
 	file.RegisterRoutes(e)
 	// frontend pages
-	pages.RegisterRoutes(e)
+	page.RegisterRoutes(e)
 	// unauthz api
 	admin.RegisterRoutes(e)
 
 	// admin router
-	group := e.Group("/admin", middleware.AuthFilter)
+	group := e.Group("/admin", eiblog.AuthFilter)
 	{
-		pages.RegisterRoutesAuthz(group)
+		page.RegisterRoutesAuthz(group)
 		admin.RegisterRoutesAuthz(group)
 	}
 
 	// start
+	address := fmt.Sprintf(":%d", config.Conf.EiBlogApp.HTTPPort)
 	go func() {
-		endRun <- e.Run(config.Conf.Listen)
+		endRun <- e.Run(address)
 	}()
-	logrus.Info("HTTP server running on: " + config.Conf.Listen)
+	fmt.Println("HTTP server running on: " + address)
 }

conf/README.md

@@ -0,0 +1,3 @@
+Configuration file templates or default configs.
+
+Put your confd or consul-template template files here.

conf/app.yml

@@ -0,0 +1,66 @@
+appname: eiblog
+database:
+  driver: sqlite
+  source: ./db.sqlite
+eshost: # http://elasticsearch:9200
+eiblogapp:
+  mode:
+    name: cmd-eiblog
+    enablehttp: true
+    httpport: 9000
+    host: example.com
+  staticversion: 1 # 静态文件版本
+  hotwords: # 热搜词
+  - docker
+  - mongodb
+  - curl
+  - dns
+  general: # 常规配置
+    pagenum: 10 # 首页展示文章数量
+    pagesize: 20 # 管理界面
+    startid: 11 # 起始ID，预留id不时之需, 不用管
+    descprefix: "Desc:" # 文章描述前缀
+    identifier: <!--more--> # 截取预览标识
+    length: 400 # 自动截取预览, 字符数
+    timezone: Asia/Shanghai # 时区
+  disqus: # 评论相关
+    shortname: xxxxxx
+    publickey: wdSgxRm9rdGAlLKFcFdToBe3GT4SibmV7Y8EjJQ0r4GWXeKtxpopMAeIeoI2dTEg
+    accesstoken: 50023908f39f4607957e909b495326af
+  google: # 谷歌分析
+    url: https://www.google-analytics.com/g/collect
+    tid: G-xxxxxxxxxx
+    v: "2"
+    adsense: <script async src="https://pagead2.googlesyndication.com/xxx" crossorigin="anonymous"></script>
+  qiniu: # 七牛OSS
+    bucket: eiblog
+    domain: st.deepzz.com
+    accesskey: MB6AXl_Sj_mmFsL-Lt59Dml2Vmy2o8XMmiCbbSeC
+    secretkey: BIrMy0fsZ0_SHNceNXk3eDuo7WmVYzj2-zrmd5Tf
+  twitter: # twitter card
+    card: summary
+    site: deepzz02
+    image: st.deepzz.com/static/img/avatar.jpg
+    address: twitter.com/deepzz02
+  feedrpc: # rss ping
+    feedrurl: https://deepzz.superfeedr.com/
+    pingrpc:
+    - http://ping.baidu.com/ping/RPC2
+    - http://rpc.pingomatic.com/
+  # 数据初始化操作，可到博客后台修改
+  account:
+    username: deepzz # *后台登录用户名
+    password: deepzz # *登录明文密码
+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

docker-compose.yml

@@ -1,3 +1,4 @@
+version: '3'
 services:
   mongodb:
     image: mongo:3.2
@@ -9,11 +10,10 @@ services:
     volumes:
     - ${PWD}/esdata:/usr/share/elasticsearch/data
     restart: always
-
   eiblog:
     image: deepzz0/eiblog:latest
     volumes:
-    - ${PWD}/eiblog/etc:/app/etc
+    - ${PWD}/conf:/app/conf
     extra_hosts:
     - "disqus.com:151.101.192.134"
     - "deepzz.disqus.com:151.101.192.134"
@@ -25,12 +25,11 @@ services:
     ports:
     - 127.0.0.1:9000:9000
     restart: always
-
   backup:
     image: deepzz0/backup:latest
     #command: ./backend --restore true
     volumes:
-    - ${PWD}/backup/etc:/app/etc
+    - ${PWD}/conf:/app/conf
     links:
     - mongodb
     restart: always

go.mod

@@ -7,13 +7,12 @@ require (
 	github.com/gin-contrib/sessions v0.0.4
 	github.com/gin-gonic/gin v1.9.1
 	github.com/lib/pq v1.10.9
-	github.com/pquerna/otp v1.5.0
 	github.com/qiniu/go-sdk/v7 v7.11.0
 	github.com/satori/go.uuid v1.2.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/swaggo/files v1.0.1
+	github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14
-	github.com/swaggo/gin-swagger v1.6.0
+	github.com/swaggo/gin-swagger v1.3.3
-	github.com/swaggo/swag v1.16.4
+	github.com/swaggo/swag v1.7.4
 	go.mongodb.org/mongo-driver v1.5.4
 	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/clickhouse v0.4.2

go.sum

@@ -33,12 +33,9 @@ github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPI
 github.com/aws/aws-sdk-go v1.34.28/go.mod h1:H7NKnBqNVzoTJpGfLrQkkD+ytBA93eiDYi/+8rV9s48=
 github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
 github.com/boj/redistore v0.0.0-20180917114910-cd5dcc76aeff/go.mod h1:+RTT1BOk5P97fT2CiHkbFQwkK3mjsFAP6zCYV2aXtjw=
-github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc h1:biVzkmvwrH8WK8raXaxBx6fRVTlJILwEwQGL1I/ByEI=
-github.com/boombuler/barcode v1.0.1-0.20190219062509-6c824513bacc/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl3JlRe0mD8=
 github.com/bradfitz/gomemcache v0.0.0-20190913173617-a41fca850d0b/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
 github.com/bradleypeabody/gorilla-sessions-memcache v0.0.0-20181103040241-659414f458e1/go.mod h1:dkChI7Tbtx7H1Tj7TqGSZMOeGpMP5gLHtjroHd4agiI=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
-github.com/bytedance/sonic v1.8.0/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/bytedance/sonic v1.9.1 h1:6iJ6NqdoxCDr6mbY8h18oSO+cShGSMRGCEo7F2h0x8s=
 github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
 github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
@@ -58,15 +55,14 @@ github.com/eiblog/blackfriday v0.0.0-20161010144836-c0ec111761ae/go.mod h1:HzHqT
 github.com/gabriel-vasile/mimetype v1.4.2 h1:w5qFW6JKBz9Y393Y4q372O9A7cUSequkh1Q7OhCmWKU=
 github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
-github.com/gin-contrib/gzip v0.0.6 h1:NjcunTcGAj5CO1gn4N8jHOSIeRFHIbn51z6K+xaN4d4=
+github.com/gin-contrib/gzip v0.0.3 h1:etUaeesHhEORpZMp18zoOhepboiWnFtXrBZxszWUn4k=
-github.com/gin-contrib/gzip v0.0.6/go.mod h1:QOJlmV2xmayAjkNS2Y8NQsMneuRShOU/kjovCXNuzzk=
+github.com/gin-contrib/gzip v0.0.3/go.mod h1:YxxswVZIqOvcHEQpsSn+QF5guQtO1dCfy0shBPy4jFc=
 github.com/gin-contrib/sessions v0.0.4 h1:gq4fNa1Zmp564iHP5G6EBuktilEos8VKhe2sza1KMgo=
 github.com/gin-contrib/sessions v0.0.4/go.mod h1:pQ3sIyviBBGcxgyR8mkeJuXbeV3h3NYmhJADQTq5+Vo=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
-github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR9tTTk=
-github.com/gin-gonic/gin v1.9.0/go.mod h1:W1Me9+hsUSyj3CePGrd1/QrKJMSJ1Tu/0hFEH89961k=
 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/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8/go.mod h1:xkRDCp4j0OGD1HRkm4kmhM+pmpv3AKq5SU7GMg4oO/Q=
@@ -78,13 +74,13 @@ github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiU
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
 github.com/go-openapi/jsonpointer v0.19.5/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
-github.com/go-openapi/jsonreference v0.19.6 h1:UBIxjkht+AWIgYzCDSv2GN+E/togfwXUJFRTWhl2Jjs=
+github.com/go-openapi/jsonreference v0.19.5 h1:1WJP/wi4OjB4iV8KVbH73rQaoialJrqv8gitZLxGLtM=
-github.com/go-openapi/jsonreference v0.19.6/go.mod h1:diGHMEHg2IqXZGKxqyvWdfWU/aim5Dprw5bqpKkTvns=
+github.com/go-openapi/jsonreference v0.19.5/go.mod h1:RdybgQwPxbL4UEjuAruzK1x3nE69AqPYEJeo/TWfEeg=
-github.com/go-openapi/spec v0.20.4 h1:O8hJrt0UMnhHcluhIdUgCLRWyM2x7QkBXRvOs7m+O1M=
+github.com/go-openapi/spec v0.20.3 h1:uH9RQ6vdyPSs2pSy9fL8QPspDF2AMIMPtmK5coSSjtQ=
-github.com/go-openapi/spec v0.20.4/go.mod h1:faYFR1CvsJZ0mNsmsphTMSoRrNV3TEDoAM7FOEWeq8I=
+github.com/go-openapi/spec v0.20.3/go.mod h1:gG4F8wdEDN+YPBMVnzE85Rbhf+Th2DTvA9nFPQ5AYEg=
 github.com/go-openapi/swag v0.19.5/go.mod h1:POnQmlKehdgb5mhVOsnJFsivZCEZ/vjK9gh66Z9tfKk=
-github.com/go-openapi/swag v0.19.15 h1:D2NRCBzS9/pEY3gP9Nl8aDqGUcPFrwG2p+CNFrLyrCM=
+github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5Fng=
-github.com/go-openapi/swag v0.19.15/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
+github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
 github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
@@ -96,10 +92,9 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
 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.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-playground/validator/v10 v10.8.0/go.mod h1:9JhgTzTaE31GZDpH/HSvHiRJrJ3iKAgqqH0Bl/Ocjdk=
-github.com/go-playground/validator/v10 v10.10.0/go.mod h1:74x4gJWsvQexRdW8Pn3dXSGrTK4nAUsbPlLADvpJkos=
-github.com/go-playground/validator/v10 v10.11.2/go.mod h1:NieE624vt4SCTJtD87arVLvdmjPAeV8BQlHtMnw9D7s=
 github.com/go-playground/validator/v10 v10.14.0 h1:vgvQWe3XCz3gIeFDm/HnTIbj6UGmg/+t63MyGU2n5js=
 github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
@@ -132,10 +127,9 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe
 github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ=
 github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0=
 github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw=
-github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/goccy/go-json v0.10.0/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRxnplIgP/c0N/04lM=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-jwt/jwt/v4 v4.4.3/go.mod h1:m21LjoU+eqJr34lmDMbreY2eSTRJ1cv77w39/MY0Ch0=
 github.com/golang-jwt/jwt/v4 v4.5.0 h1:7cYmW1XlMY7h7ii7UhUyChSgS5wUJEnm9uZVTGqOWzg=
@@ -239,8 +233,6 @@ github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJ
 github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE=
 github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
-github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
@@ -265,8 +257,6 @@ github.com/paulmach/orb v0.7.1/go.mod h1:FWRlTgl88VI1RBx/MkrwWDRhQ96ctqMCh8boXhm
 github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY=
 github.com/pelletier/go-toml v1.7.0 h1:7utD74fnzVc/cpcyy8sjrlFr5vYpypUixARcHIMIGuI=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
-github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo=
-github.com/pelletier/go-toml/v2 v2.0.6/go.mod h1:eumQOmlWiOPt5WriQQqoM5y18pDHwha2N+QD+EUNTek=
 github.com/pelletier/go-toml/v2 v2.0.8 h1:0ctb6s9mE31h0/lhu+J6OPmVeDxJn+kYnJc2jZR9tGQ=
 github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
 github.com/pierrec/lz4 v2.0.5+incompatible h1:2xWsjqPFWcplujydGg4WmhC/6fZqK42wMM8aXeqhl0I=
@@ -282,8 +272,6 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/pquerna/otp v1.5.0 h1:NMMR+WrmaqXU4EzdGJEE1aUUI0AMRzsp96fFFWNPwxs=
-github.com/pquerna/otp v1.5.0/go.mod h1:dkJfzwRKNiegxyNb54X/3fLwhCynbMspSyWKnvi1AEg=
 github.com/qiniu/dyn v1.3.0/go.mod h1:E8oERcm8TtwJiZvkQPbcAh0RL8jO1G0VXJMW3FAWdkk=
 github.com/qiniu/go-sdk/v7 v7.11.0 h1:Cdx/1E3ybv0OFKnkGwoDN/t6bCCntjrWhwWuRaqI3XQ=
 github.com/qiniu/go-sdk/v7 v7.11.0/go.mod h1:btsaOc8CA3hdVloULfFdDgDc+g4f3TDZEFsDY0BLE+w=
@@ -301,6 +289,7 @@ github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdh
 github.com/shirou/gopsutil v2.19.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/gopsutil v3.21.11+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA=
 github.com/shirou/w32 v0.0.0-20160930032740-bb4de0191aa4/go.mod h1:qsXQc7+bwAM3Q1u/4XEfrquwF8Lw7D7y5cD8CuHnfIc=
+github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5gKV8=
 github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
 github.com/shurcooL/sanitized_anchor_name v1.0.0 h1:PdmoCO6wvbs+7yrJyMORt4/BmY5IYyJwS/kOiWx8mHo=
@@ -329,25 +318,21 @@ github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o
 github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
-github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
+github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14 h1:PyYN9JH5jY9j6av01SpfRMb+1DWg/i3MbGOKPxJ2wjM=
-github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
+github.com/swaggo/files v0.0.0-20190704085106-630677cd5c14/go.mod h1:gxQT6pBGRuIGunNf/+tSOB5OHvguWi8Tbt82WOkf35E=
-github.com/swaggo/gin-swagger v1.6.0 h1:y8sxvQ3E20/RCyrXeFfg60r6H0Z+SwpTjMYsMm+zy8M=
+github.com/swaggo/gin-swagger v1.3.3 h1:XHyYmeNVFG5PbyWHG4jXtxOm2P4kiZapDCWsyDDiQ/I=
-github.com/swaggo/gin-swagger v1.6.0/go.mod h1:BG00cCEy294xtVpyIAHG6+e2Qzj/xKlRdOqDkvq0uzo=
+github.com/swaggo/gin-swagger v1.3.3/go.mod h1:ymsZuGpbbu+S7ZoQ49QPpZoDBj6uqhb8WizgQPVgWl0=
-github.com/swaggo/swag v1.8.12/go.mod h1:lNfm6Gg+oAq3zRJQNEMBE66LIJKM44mxFqhEEgy2its=
+github.com/swaggo/swag v1.7.4 h1:up+ixy8yOqJKiFcuhMgkuYuF4xnevuhnFAXXF8OSfNg=
-github.com/swaggo/swag v1.16.4 h1:clWJtd9LStiG3VeijiCfOVODP6VpHtKdQy9ELFG3s1A=
+github.com/swaggo/swag v1.7.4/go.mod h1:zD8h6h4SPv7t3l+4BKdRquqW1ASWjKZgT6Qv9z3kNqI=
-github.com/swaggo/swag v1.16.4/go.mod h1:VBsHJRsDvfYvqoiMKnsdwhNV9LEMHgEDZcyVYX0sxPg=
 github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4=
 github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
 github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk=
 github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ=
 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.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
-github.com/ugorji/go v1.2.7 h1:qYhyWUUd6WbiM+C6JZAUkIJt/1WrjzNHY9+KCIjVqTo=
-github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
-github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY=
-github.com/ugorji/go/codec v1.2.9/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/ugorji/go/codec v1.2.11 h1:BMaWp1Bb6fHwEtbplGBGJ498wD+LKlNSl25MjdZY4dU=
 github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/urfave/cli/v2 v2.3.0/go.mod h1:LJmUH05zAU44vOAcrfzZQKsZbVcdbOG8rtL3/XcUArI=
@@ -380,41 +365,35 @@ golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPh
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.5.0/go.mod h1:NK/OQwhpMQP3MwtdjgLlYHnH9ebylxKWv3e0fK+mkQU=
 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.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc=
 golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4=
-golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
-golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
-golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 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 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs=
-golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 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-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20201010224723-4f7140c49acb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
-golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 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 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
-golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
-golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190412183630-56d357773e84/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -436,11 +415,10 @@ golang.org/x/sys v0.0.0-20191220220014-0732a990476f/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210616045830-e2b7044e8c71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20211020174200-9d6173849985/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220429233432-b5fbb4746d32/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -448,26 +426,19 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.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.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
 golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
-golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 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.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
 golang.org/x/term v0.11.0/go.mod h1:zC9APTIj3jG3FdV/Ons+XE1riIZXG4aZ4GTHiPZJPIU=
 golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U=
-golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
-golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -475,14 +446,12 @@ golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
-golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 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.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k=
 golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
-golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
-golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
@@ -491,10 +460,10 @@ golang.org/x/tools v0.0.0-20190531172133-b3315ee88b7d/go.mod h1:/rFqwRUd4F7ZHNgw
 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.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
-golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s=
 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=
@@ -502,8 +471,6 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1N
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng=
 google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
@@ -521,7 +488,6 @@ 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=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gorm.io/driver/clickhouse v0.4.2 h1:vt7WkXX0u5SeCDyR4w/Jz0ce25/tYqgoP3UUERgMZmY=
@@ -540,4 +506,3 @@ gorm.io/gorm v1.25.2-0.20230610234218-206613868439/go.mod h1:L4uxeKpfBml98NYqVqw
 gorm.io/gorm v1.25.5 h1:zR9lOiiYf09VNh5Q1gphfyia1JpiClIWG9hQaxB/mls=
 gorm.io/gorm v1.25.5/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
 rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
-sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=

pkg/cache/cache.go

@@ -1,5 +1,5 @@
-// Package internal provides ...
+// Package cache provides ...
-package internal
+package cache
 
 import (
 	"bytes"
@@ -11,13 +11,20 @@ import (
 	"sync"
 	"time"
 
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
+	"github.com/eiblog/eiblog/pkg/cache/render"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/internal/store"
+	"github.com/eiblog/eiblog/pkg/cache/store"
+	"github.com/eiblog/eiblog/pkg/config"
+	"github.com/eiblog/eiblog/pkg/internal"
 	"github.com/eiblog/eiblog/pkg/model"
 	"github.com/eiblog/eiblog/tools"
+
+	"github.com/sirupsen/logrus"
 )
 
 var (
+	// Ei eiblog cache
+	Ei *Cache
+
 	// PagesCh regenerate pages chan
 	PagesCh = make(chan string, 2)
 	// PageSeries the page series regenerate flag
@@ -27,11 +34,45 @@ var (
 
 	// ArticleStartID article start id
 	ArticleStartID = 11
+	// TrashArticleExp trash article timeout
+	TrashArticleExp = time.Duration(-48) * time.Hour
 )
 
+func init() {
+	// init timezone
+	var err error
+	tools.TimeLocation, err = time.LoadLocation(
+		config.Conf.EiBlogApp.General.Timezone)
+	if err != nil {
+		panic(err)
+	}
+	// init store
+	logrus.Info("store drivers: ", store.Drivers())
+	store, err := store.NewStore(config.Conf.Database.Driver,
+		config.Conf.Database.Source)
+	if err != nil {
+		panic(err)
+	}
+	// Ei init
+	Ei = &Cache{
+		lock:        sync.Mutex{},
+		Store:       store,
+		TagArticles: make(map[string]model.SortedArticles),
+		ArticlesMap: make(map[string]*model.Article),
+	}
+	err = Ei.loadOrInit()
+	if err != nil {
+		panic(err)
+	}
+	go Ei.regeneratePages()
+	go Ei.timerClean()
+	go Ei.timerDisqus()
+}
+
 // Cache 整站缓存
 type Cache struct {
 	lock sync.Mutex
+	store.Store
 
 	// load from db
 	Blogger  *model.Blogger
@@ -47,30 +88,13 @@ type Cache struct {
 	ArticlesMap  map[string]*model.Article       // slug:article
 }
 
-// NewCache 缓存整个博客数据
-func NewCache() (*Cache, error) {
-	// Ei init
-	cache := &Cache{
-		lock:        sync.Mutex{},
-		TagArticles: make(map[string]model.SortedArticles),
-		ArticlesMap: make(map[string]*model.Article),
-	}
-	err := cache.loadOrInit()
-	if err != nil {
-		return nil, err
-	}
-	// 异步渲染series,archive页面
-	go cache.regeneratePages()
-	return cache, nil
-}
-
 // AddArticle 添加文章
-func (cache *Cache) AddArticle(article *model.Article) error {
+func (c *Cache) AddArticle(article *model.Article) error {
-	cache.lock.Lock()
+	c.lock.Lock()
-	defer cache.lock.Unlock()
+	defer c.lock.Unlock()
 
 	// store
-	err := Store.InsertArticle(context.Background(), article, ArticleStartID)
+	err := c.InsertArticle(context.Background(), article, ArticleStartID)
 	if err != nil {
 		return err
 	}
@@ -79,77 +103,77 @@ func (cache *Cache) AddArticle(article *model.Article) error {
 		return nil
 	}
 	// 正式发布文章
-	cache.refreshCache(article, false)
+	c.refreshCache(article, false)
 	return nil
 }
 
 // RepArticle 替换文章
-func (cache *Cache) RepArticle(oldArticle, newArticle *model.Article) {
+func (c *Cache) RepArticle(oldArticle, newArticle *model.Article) {
-	cache.lock.Lock()
+	c.lock.Lock()
-	defer cache.lock.Unlock()
+	defer c.lock.Unlock()
 
-	cache.ArticlesMap[newArticle.Slug] = newArticle
+	c.ArticlesMap[newArticle.Slug] = newArticle
-	GenerateExcerptMarkdown(newArticle)
+	render.GenerateExcerptMarkdown(newArticle)
 	if newArticle.ID < ArticleStartID {
 		return
 	}
 	if oldArticle != nil { // 移除旧文章
-		cache.refreshCache(oldArticle, true)
+		c.refreshCache(oldArticle, true)
 	}
-	cache.refreshCache(newArticle, false)
+	c.refreshCache(newArticle, false)
 }
 
 // DelArticle 删除文章
-func (cache *Cache) DelArticle(id int) error {
+func (c *Cache) DelArticle(id int) error {
-	cache.lock.Lock()
+	c.lock.Lock()
-	defer cache.lock.Unlock()
+	defer c.lock.Unlock()
 
-	article, _ := cache.FindArticleByID(id)
+	article, _ := c.FindArticleByID(id)
 	if article == nil {
 		return nil
 	}
 	// set delete
-	err := Store.UpdateArticle(context.Background(), id, map[string]interface{}{
+	err := c.UpdateArticle(context.Background(), id, map[string]interface{}{
 		"deleted_at": time.Now(),
 	})
 	if err != nil {
 		return err
 	}
 	// drop from tags,series,archives
-	cache.refreshCache(article, true)
+	c.refreshCache(article, true)
 	return nil
 }
 
 // AddSerie 添加专题
-func (cache *Cache) AddSerie(serie *model.Serie) error {
+func (c *Cache) AddSerie(serie *model.Serie) error {
-	cache.lock.Lock()
+	c.lock.Lock()
-	defer cache.lock.Unlock()
+	defer c.lock.Unlock()
 
-	err := Store.InsertSerie(context.Background(), serie)
+	err := c.InsertSerie(context.Background(), serie)
 	if err != nil {
 		return err
 	}
-	cache.Series = append(cache.Series, serie)
+	c.Series = append(c.Series, serie)
 	PagesCh <- PageSeries
 	return nil
 }
 
 // DelSerie 删除专题
-func (cache *Cache) DelSerie(id int) error {
+func (c *Cache) DelSerie(id int) error {
-	cache.lock.Lock()
+	c.lock.Lock()
-	defer cache.lock.Unlock()
+	defer c.lock.Unlock()
 
-	for i, serie := range cache.Series {
+	for i, serie := range c.Series {
 		if serie.ID == id {
 			if len(serie.Articles) > 0 {
 				return errors.New("请删除该专题下的所有文章")
 			}
-			err := Store.RemoveSerie(context.Background(), id)
+			err := c.RemoveSerie(context.Background(), id)
 			if err != nil {
 				return err
 			}
-			cache.Series[i] = nil
+			c.Series[i] = nil
-			cache.Series = append(cache.Series[:i], cache.Series[i+1:]...)
+			c.Series = append(c.Series[:i], c.Series[i+1:]...)
 			PagesCh <- PageSeries
 			break
 		}
@@ -158,12 +182,12 @@ func (cache *Cache) DelSerie(id int) error {
 }
 
 // PageArticleFE 文章翻页
-func (cache *Cache) PageArticleFE(page int, pageSize int) (prev,
+func (c *Cache) PageArticleFE(page int, pageSize int) (prev,
 	next int, articles []*model.Article) {
 
 	var l int
-	for l = len(cache.Articles); l > 0; l-- {
+	for l = len(c.Articles); l > 0; l-- {
-		if cache.Articles[l-1].ID >= ArticleStartID {
+		if c.Articles[l-1].ID >= ArticleStartID {
 			break
 		}
 	}
@@ -188,12 +212,12 @@ func (cache *Cache) PageArticleFE(page int, pageSize int) (prev,
 	if e > l {
 		e = l
 	}
-	articles = cache.Articles[s:e]
+	articles = c.Articles[s:e]
 	return
 }
 
 // PageArticleBE 后台文章分页
-func (cache *Cache) PageArticleBE(se int, kw string, draft, del bool, p,
+func (c *Cache) PageArticleBE(se int, kw string, draft, del bool, p,
 	n int) ([]*model.Article, int) {
 
 	search := store.SearchArticles{
@@ -214,7 +238,7 @@ func (cache *Cache) PageArticleBE(se int, kw string, draft, del bool, p,
 			search.Fields[store.SearchArticleTitle] = kw
 		}
 	}
-	articles, count, err := Store.LoadArticleList(context.Background(), search)
+	articles, count, err := c.LoadArticleList(context.Background(), search)
 	if err != nil {
 		return nil, 0
 	}
@@ -226,8 +250,8 @@ func (cache *Cache) PageArticleBE(se int, kw string, draft, del bool, p,
 }
 
 // FindArticleByID 通过ID查找文章
-func (cache *Cache) FindArticleByID(id int) (*model.Article, int) {
+func (c *Cache) FindArticleByID(id int) (*model.Article, int) {
-	for i, article := range cache.Articles {
+	for i, article := range c.Articles {
 		if article.ID == id {
 			return article, i
 		}
@@ -236,32 +260,32 @@ func (cache *Cache) FindArticleByID(id int) (*model.Article, int) {
 }
 
 // refreshCache 刷新缓存
-func (cache *Cache) refreshCache(article *model.Article, del bool) {
+func (c *Cache) refreshCache(article *model.Article, del bool) {
 	if del {
-		_, idx := cache.FindArticleByID(article.ID)
+		_, idx := c.FindArticleByID(article.ID)
 
-		delete(cache.ArticlesMap, article.Slug)
+		delete(c.ArticlesMap, article.Slug)
-		cache.Articles = append(cache.Articles[:idx], cache.Articles[idx+1:]...)
+		c.Articles = append(c.Articles[:idx], c.Articles[idx+1:]...)
 		// 从链表移除
-		cache.recalcLinkedList(article, true)
+		c.recalcLinkedList(article, true)
 		// 从tag、serie、archive移除
-		cache.redelArticle(article)
+		c.redelArticle(article)
 		return
 	}
 	// 添加文章
-	defer GenerateExcerptMarkdown(article)
+	defer render.GenerateExcerptMarkdown(article)
 
-	cache.ArticlesMap[article.Slug] = article
+	c.ArticlesMap[article.Slug] = article
-	cache.Articles = append([]*model.Article{article}, cache.Articles...)
+	c.Articles = append([]*model.Article{article}, c.Articles...)
-	sort.Sort(cache.Articles)
+	sort.Sort(c.Articles)
 	// 从链表添加
-	cache.recalcLinkedList(article, false)
+	c.recalcLinkedList(article, false)
 	// 从tag、serie、archive添加
-	cache.readdArticle(article, true)
+	c.readdArticle(article, true)
 }
 
 // recalcLinkedList 重算文章链表
-func (cache *Cache) recalcLinkedList(article *model.Article, del bool) {
+func (c *Cache) recalcLinkedList(article *model.Article, del bool) {
 	// 删除操作
 	if del {
 		if article.Prev == nil && article.Next != nil {
@@ -275,56 +299,56 @@ func (cache *Cache) recalcLinkedList(article *model.Article, del bool) {
 		return
 	}
 	// 添加操作
-	_, idx := cache.FindArticleByID(article.ID)
+	_, idx := c.FindArticleByID(article.ID)
-	if idx == 0 && cache.Articles[idx+1].ID >= ArticleStartID {
+	if idx == 0 && c.Articles[idx+1].ID >= ArticleStartID {
-		article.Next = cache.Articles[idx+1]
+		article.Next = c.Articles[idx+1]
-		cache.Articles[idx+1].Prev = article
+		c.Articles[idx+1].Prev = article
-	} else if idx > 0 && cache.Articles[idx-1].ID >= ArticleStartID {
+	} else if idx > 0 && c.Articles[idx-1].ID >= ArticleStartID {
-		article.Prev = cache.Articles[idx-1]
+		article.Prev = c.Articles[idx-1]
-		if cache.Articles[idx-1].Next != nil {
+		if c.Articles[idx-1].Next != nil {
-			article.Next = cache.Articles[idx-1].Next
+			article.Next = c.Articles[idx-1].Next
-			cache.Articles[idx-1].Next.Prev = article
+			c.Articles[idx-1].Next.Prev = article
 		}
-		cache.Articles[idx-1].Next = article
+		c.Articles[idx-1].Next = article
 	}
 }
 
 // readdArticle 添加文章到tag、series、archive
-func (cache *Cache) readdArticle(article *model.Article, needSort bool) {
+func (c *Cache) readdArticle(article *model.Article, needSort bool) {
 	// tag
 	for _, tag := range article.Tags {
-		cache.TagArticles[tag] = append(cache.TagArticles[tag], article)
+		c.TagArticles[tag] = append(c.TagArticles[tag], article)
 		if needSort {
-			sort.Sort(cache.TagArticles[tag])
+			sort.Sort(c.TagArticles[tag])
 		}
 	}
 	// series
-	for i, serie := range cache.Series {
+	for i, serie := range c.Series {
 		if serie.ID != article.SerieID {
 			continue
 		}
-		cache.Series[i].Articles = append(cache.Series[i].Articles, article)
+		c.Series[i].Articles = append(c.Series[i].Articles, article)
 		if needSort {
-			sort.Sort(cache.Series[i].Articles)
+			sort.Sort(c.Series[i].Articles)
 			PagesCh <- PageSeries // 重建专题
 		}
 	}
 	// archive
 	y, m, _ := article.CreatedAt.Date()
-	for i, archive := range cache.Archives {
+	for i, archive := range c.Archives {
 		ay, am, _ := archive.Time.Date()
 		if y != ay || m != am {
 			continue
 		}
-		cache.Archives[i].Articles = append(cache.Archives[i].Articles, article)
+		c.Archives[i].Articles = append(c.Archives[i].Articles, article)
 		if needSort {
-			sort.Sort(cache.Archives[i].Articles)
+			sort.Sort(c.Archives[i].Articles)
 			PagesCh <- PageArchive // 重建归档
 		}
 		return
 	}
 	// 新建归档
-	cache.Archives = append(cache.Archives, &model.Archive{
+	c.Archives = append(c.Archives, &model.Archive{
 		Time:     article.CreatedAt,
 		Articles: model.SortedArticles{article},
 	})
@@ -334,25 +358,25 @@ func (cache *Cache) readdArticle(article *model.Article, needSort bool) {
 }
 
 // redelArticle 从tag、series、archive删除文章
-func (cache *Cache) redelArticle(article *model.Article) {
+func (c *Cache) redelArticle(article *model.Article) {
 	// tag
 	for _, tag := range article.Tags {
-		for i, v := range cache.TagArticles[tag] {
+		for i, v := range c.TagArticles[tag] {
 			if v == article {
-				cache.TagArticles[tag] = append(cache.TagArticles[tag][0:i], cache.TagArticles[tag][i+1:]...)
+				c.TagArticles[tag] = append(c.TagArticles[tag][0:i], c.TagArticles[tag][i+1:]...)
-				if len(cache.TagArticles[tag]) == 0 {
+				if len(c.TagArticles[tag]) == 0 {
-					delete(cache.TagArticles, tag)
+					delete(c.TagArticles, tag)
 				}
 			}
 		}
 	}
 	// serie
-	for i, serie := range cache.Series {
+	for i, serie := range c.Series {
 		if serie.ID == article.SerieID {
 			for j, v := range serie.Articles {
 				if v == article {
-					cache.Series[i].Articles = append(cache.Series[i].Articles[0:j],
+					c.Series[i].Articles = append(c.Series[i].Articles[0:j],
-						cache.Series[i].Articles[j+1:]...)
+						c.Series[i].Articles[j+1:]...)
 					PagesCh <- PageSeries
 					break
 				}
@@ -360,15 +384,15 @@ func (cache *Cache) redelArticle(article *model.Article) {
 		}
 	}
 	// archive
-	for i, archive := range cache.Archives {
+	for i, archive := range c.Archives {
 		ay, am, _ := archive.Time.Date()
 		if y, m, _ := article.CreatedAt.Date(); ay == y && am == m {
 			for j, v := range archive.Articles {
 				if v == article {
-					cache.Archives[i].Articles = append(cache.Archives[i].Articles[0:j],
+					c.Archives[i].Articles = append(c.Archives[i].Articles[0:j],
-						cache.Archives[i].Articles[j+1:]...)
+						c.Archives[i].Articles[j+1:]...)
-					if len(cache.Archives[i].Articles) == 0 {
+					if len(c.Archives[i].Articles) == 0 {
-						cache.Archives = append(cache.Archives[:i], cache.Archives[i+1:]...)
+						c.Archives = append(c.Archives[:i], c.Archives[i+1:]...)
 					}
 					PagesCh <- PageArchive
 					break
@@ -379,79 +403,81 @@ func (cache *Cache) redelArticle(article *model.Article) {
 }
 
 // loadOrInit 读取数据或初始化
-func (cache *Cache) loadOrInit() error {
+func (c *Cache) loadOrInit() error {
+	blogapp := config.Conf.EiBlogApp
 	// blogger
 	blogger := &model.Blogger{
-		BlogName:  strings.Title(config.Conf.Account.Username),
+		BlogName:  strings.Title(blogapp.Account.Username),
 		SubTitle:  "Rome was not built in one day.",
 		BeiAn:     "蜀ICP备xxxxxxxx号-1",
-		BTitle:    fmt.Sprintf("%s's Blog", strings.Title(config.Conf.Account.Username)),
+		BTitle:    fmt.Sprintf("%s's Blog", strings.Title(blogapp.Account.Username)),
 		Copyright: `本站使用「<a href="//creativecommons.org/licenses/by/4.0/">署名 4.0 国际</a>」创作共享协议，转载请注明作者及原网址。`,
 	}
-	created, err := Store.LoadInsertBlogger(context.Background(), blogger)
+	created, err := c.LoadInsertBlogger(context.Background(), blogger)
 	if err != nil {
 		return err
 	}
-	cache.Blogger = blogger
+	c.Blogger = blogger
 	if created { // init articles: about blogroll
 		about := &model.Article{
 			ID:        1, // 固定ID
-			Author:    config.Conf.Account.Username,
+			Author:    blogapp.Account.Username,
 			Title:     "关于",
 			Slug:      "about",
 			CreatedAt: time.Time{}.AddDate(0, 0, 1),
 		}
-		err = Store.InsertArticle(context.Background(), about, ArticleStartID)
+		err = c.InsertArticle(context.Background(), about, ArticleStartID)
 		if err != nil {
 			return err
 		}
 		// 推送到 disqus
-		go DisqusClient.ThreadCreate(about, blogger.BTitle)
+		go internal.ThreadCreate(about, blogger.BTitle)
 		blogroll := &model.Article{
 			ID:        2, // 固定ID
-			Author:    config.Conf.Account.Username,
+			Author:    blogapp.Account.Username,
 			Title:     "友情链接",
 			Slug:      "blogroll",
 			CreatedAt: time.Time{}.AddDate(0, 0, 7),
 		}
-		err = Store.InsertArticle(context.Background(), blogroll, ArticleStartID)
+		err = c.InsertArticle(context.Background(), blogroll, ArticleStartID)
 		if err != nil {
 			return err
 		}
 	}
 	// account
-	pwd := tools.EncryptPasswd(config.Conf.Account.Username, config.Conf.Account.Password)
+	pwd := tools.EncryptPasswd(blogapp.Account.Username,
+		blogapp.Account.Password)
 
 	account := &model.Account{
-		Username: config.Conf.Account.Username,
+		Username: blogapp.Account.Username,
 		Password: pwd,
 	}
-	_, err = Store.LoadInsertAccount(context.Background(), account)
+	_, err = c.LoadInsertAccount(context.Background(), account)
 	if err != nil {
 		return err
 	}
-	cache.Account = account
+	c.Account = account
 	// series
-	series, err := Store.LoadAllSerie(context.Background())
+	series, err := c.LoadAllSerie(context.Background())
 	if err != nil {
 		return err
 	}
-	cache.Series = series
+	c.Series = series
 	// all articles
 	search := store.SearchArticles{
 		Page:   1,
 		Limit:  9999,
 		Fields: map[string]interface{}{store.SearchArticleDraft: false},
 	}
-	articles, _, err := Store.LoadArticleList(context.Background(), search)
+	articles, _, err := c.LoadArticleList(context.Background(), search)
 	if err != nil {
 		return err
 	}
 	for i, v := range articles {
 		// 渲染页面
-		GenerateExcerptMarkdown(v)
+		render.GenerateExcerptMarkdown(v)
 
-		cache.ArticlesMap[v.Slug] = v
+		c.ArticlesMap[v.Slug] = v
 		// 分析文章
 		if v.ID < ArticleStartID {
 			continue
@@ -463,9 +489,9 @@ func (cache *Cache) loadOrInit() error {
 			articles[i+1].ID >= ArticleStartID {
 			v.Next = articles[i+1]
 		}
-		cache.readdArticle(v, false)
+		c.readdArticle(v, false)
 	}
-	cache.Articles = articles
+	Ei.Articles = articles
 	// 重建专题与归档
 	PagesCh <- PageSeries
 	PagesCh <- PageArchive
@@ -473,15 +499,15 @@ func (cache *Cache) loadOrInit() error {
 }
 
 // regeneratePages 重新生成series,archive页面
-func (cache *Cache) regeneratePages() {
+func (c *Cache) regeneratePages() {
 	for {
 		switch page := <-PagesCh; page {
 		case PageSeries:
-			sort.Sort(cache.Series)
+			sort.Sort(c.Series)
 			buf := bytes.Buffer{}
-			buf.WriteString(cache.Blogger.SeriesSay)
+			buf.WriteString(c.Blogger.SeriesSay)
 			buf.WriteString("\n\n")
-			for _, series := range cache.Series {
+			for _, series := range c.Series {
 				buf.WriteString(fmt.Sprintf("### %s{#toc-%d}", series.Name, series.ID))
 				buf.WriteByte('\n')
 				buf.WriteString(series.Desc)
@@ -494,16 +520,16 @@ func (cache *Cache) regeneratePages() {
 				}
 				buf.WriteString("\n")
 			}
-			cache.PageSeries = string(PageRender(buf.Bytes()))
+			c.PageSeries = string(render.PageRender(buf.Bytes()))
 		case PageArchive:
-			sort.Sort(cache.Archives)
+			sort.Sort(c.Archives)
 			buf := bytes.Buffer{}
-			buf.WriteString(cache.Blogger.ArchivesSay + "\n")
+			buf.WriteString(c.Blogger.ArchivesSay + "\n")
 			var (
 				currentYear string
-				gt12Month   = len(cache.Archives) > 12
+				gt12Month   = len(c.Archives) > 12
 			)
-			for _, archive := range cache.Archives {
+			for _, archive := range c.Archives {
 				t := archive.Time.In(tools.TimeLocation)
 				if gt12Month {
 					year := t.Format("2006 年")
@@ -527,7 +553,32 @@ func (cache *Cache) regeneratePages() {
 					}
 				}
 			}
-			cache.PageArchives = string(PageRender(buf.Bytes()))
+			c.PageArchives = string(render.PageRender(buf.Bytes()))
+		}
+	}
+}
+
+// timerClean 定时清理文章
+func (c *Cache) timerClean() {
+	ticker := time.NewTicker(time.Hour)
+
+	for now := range ticker.C {
+		exp := now.Add(TrashArticleExp)
+		err := c.CleanArticles(context.Background(), exp)
+		if err != nil {
+			logrus.Error("cache.timerClean.CleanArticles: ", err)
+		}
+	}
+}
+
+// timerDisqus disqus定时操作
+func (c *Cache) timerDisqus() {
+	ticker := time.NewTicker(5 * time.Hour)
+
+	for range ticker.C {
+		err := internal.PostsCount(c.ArticlesMap)
+		if err != nil {
+			logrus.Error("cache.timerDisqus.PostsCount: ", err)
 		}
 	}
 }

pkg/cache/render/render.go

@@ -1,10 +1,11 @@
-package internal
+// Package render provides ...
+package render
 
 import (
 	"regexp"
 	"strings"
 
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
+	"github.com/eiblog/eiblog/pkg/config"
 	"github.com/eiblog/eiblog/pkg/model"
 	"github.com/eiblog/eiblog/tools"
 
@@ -36,7 +37,7 @@ const (
 
 var (
 	// 渲染markdown操作和截取摘要操作
-	regIdentifier = regexp.MustCompile(config.Conf.General.Identifier)
+	regIdentifier = regexp.MustCompile(config.Conf.EiBlogApp.General.Identifier)
 	// header
 	regHeader = regexp.MustCompile("</nav></div>")
 )
@@ -49,9 +50,11 @@ func PageRender(md []byte) []byte {
 
 // GenerateExcerptMarkdown 生成预览和描述
 func GenerateExcerptMarkdown(article *model.Article) {
-	if strings.HasPrefix(article.Content, config.Conf.General.DescPrefix) {
+	blogapp := config.Conf.EiBlogApp
+
+	if strings.HasPrefix(article.Content, blogapp.General.DescPrefix) {
 		index := strings.Index(article.Content, "\r\n")
-		prefix := article.Content[len(config.Conf.General.DescPrefix):index]
+		prefix := article.Content[len(blogapp.General.DescPrefix):index]
 
 		article.Desc = tools.IgnoreHTMLTag(prefix)
 		article.Content = article.Content[index:]
@@ -74,7 +77,7 @@ func GenerateExcerptMarkdown(article *model.Article) {
 		return
 	}
 	uc := []rune(article.Content)
-	length := config.Conf.General.Length
+	length := blogapp.General.Length
 	if len(uc) < length {
 		length = len(uc)
 	}

pkg/cache/store/mongodb.go

@@ -326,6 +326,11 @@ func (db *mongodb) LoadArticleList(ctx context.Context, search SearchArticles) (
 	return articles, int(count), nil
 }
 
+// DropDatabase drop eiblog database
+func (db *mongodb) DropDatabase(ctx context.Context) error {
+	return db.Database(mongoDBName).Drop(ctx)
+}
+
 // counter counter
 type counter struct {
 	Name    string

pkg/cache/store/mongodb_test.go

@@ -6,7 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/eiblog/eiblog/pkg/config"
 	"github.com/eiblog/eiblog/pkg/model"
 )
 
@@ -20,10 +19,7 @@ var (
 
 func init() {
 	var err error
-	store, err = NewStore(config.Database{
+	store, err = NewStore("mongodb", "mongodb://127.0.0.1:27017")
-		Driver: "mongodb",
-		Source: "mongodb://127.0.0.1:27017",
-	})
 	if err != nil {
 		panic(err)
 	}

pkg/cache/store/rdbms.go

@@ -8,7 +8,6 @@ import (
 
 	"github.com/eiblog/eiblog/pkg/model"
 
-	"github.com/sirupsen/logrus"
 	"gorm.io/driver/clickhouse"
 	"gorm.io/driver/mysql"
 	"gorm.io/driver/postgres"
@@ -64,15 +63,12 @@ func (db *rdbms) Init(name, source string) (Store, error) {
 		return nil, err
 	}
 	// auto migrate
-	err = gormDB.AutoMigrate(
+	gormDB.AutoMigrate(
 		&model.Account{},
 		&model.Blogger{},
 		&model.Article{},
 		&model.Serie{},
 	)
-	if err != nil {
-		logrus.Error("rdbms.AutoMigrate: ", err)
-	}
 	db.DB = gormDB
 	return db, nil
 }

pkg/cache/store/store.go

@@ -8,7 +8,6 @@ import (
 	"sync"
 	"time"
 
-	"github.com/eiblog/eiblog/pkg/config"
 	"github.com/eiblog/eiblog/pkg/model"
 )
 
@@ -65,6 +64,9 @@ type Store interface {
 	LoadArticle(ctx context.Context, id int) (*model.Article, error)
 	// LoadArticleList 查找文章列表
 	LoadArticleList(ctx context.Context, search SearchArticles) (model.SortedArticles, int, error)
+
+	// 危险操作
+	DropDatabase(ctx context.Context) error
 }
 
 // Driver 存储驱动
@@ -100,14 +102,13 @@ func Drivers() []string {
 }
 
 // NewStore 新建存储
-func NewStore(conf config.Database) (Store, error) {
+func NewStore(name string, source string) (Store, error) {
 	storeMu.RLock()
-	driver, ok := stores[conf.Driver]
+	driver, ok := stores[name]
 	storeMu.RUnlock()
-
 	if !ok {
-		return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", conf.Driver)
+		return nil, fmt.Errorf("store: unknown driver %q (forgotten import?)", name)
 	}
 
-	return driver.Init(conf.Driver, conf.Source)
+	return driver.Init(name, source)
 }

pkg/config/config.go

@@ -4,48 +4,172 @@ package config
 import (
 	"os"
 	"path/filepath"
+	"strings"
+
+	"gopkg.in/yaml.v3"
 )
 
-// RunMode 列表
+var (
-const (
+	// Conf config instance
-	RunModeLocal RunMode = "local" // 本地环境
+	Conf Config
-	RunModeDev   RunMode = "dev"   // 开发环境
+
-	RunModeProd  RunMode = "pro"   // 生产环境
+	// ModeDev run mode as development
+	ModeDev = "dev"
+	// ModeProd run mode as production
+	ModeProd = "prod"
+	// WorkDir workspace dir
+	WorkDir string
 )
 
-// RunMode 运行模式
+// Mode run mode
-type RunMode string
+type Mode struct {
-
+	Name       string `yaml:"name"`
-// IsReleaseMode 是否
+	EnableHTTP bool   `yaml:"enablehttp"`
-func (mode RunMode) IsReleaseMode() bool {
+	HTTPPort   int    `yaml:"httpport"`
-	return mode == RunModeProd
+	EnableGRPC bool   `yaml:"enablegrpc"`
+	GRPCPort   int    `yaml:"grpcport"`
+	Host       string `yaml:"host"`
 }
 
-// IsRunMode 是否是runmode
+// Database sql database
-func (mode RunMode) IsRunMode() bool {
+type Database struct {
-	return mode == RunModeDev || mode == RunModeProd || mode == RunModeLocal
+	Driver string `yaml:"driver"`
+	Source string `yaml:"source"`
 }
 
-// WorkEtcPath walk etc dir
+// General common
-func WorkEtcPath() (string, error) {
+type General struct {
-	gopath := os.Getenv("GOPATH")
+	PageNum    int    `yaml:"pagenum"`    // 前台每页文章数量
-	wd, err := os.Getwd()
+	PageSize   int    `yaml:"pagesize"`   // 后台每页文章数量
+	StartID    int    `yaml:"startid"`    // 文章启始ID
+	DescPrefix string `yaml:"descprefix"` // 文章描述前缀
+	Identifier string `yaml:"identifier"` // 文章截取标识
+	Length     int    `yaml:"length"`     // 文章预览长度
+	Timezone   string `yaml:"timezone"`   // 时区
+}
+
+// Disqus comments
+type Disqus struct {
+	ShortName   string `yaml:"shortname"`
+	PublicKey   string `yaml:"publickey"`
+	AccessToken string `yaml:"accesstoken"`
+}
+
+// Twitter card
+type Twitter struct {
+	Card    string `yaml:"card"`
+	Site    string `yaml:"site"`
+	Image   string `yaml:"image"`
+	Address string `yaml:"address"`
+}
+
+// Google analytics
+type Google struct {
+	URL     string `yaml:"url"`
+	Tid     string `yaml:"tid"`
+	V       string `yaml:"v"`
+	AdSense string `yaml:"adsense"`
+}
+
+// Qiniu oss
+type Qiniu struct {
+	Bucket    string `yaml:"bucket"`
+	Domain    string `yaml:"domain"`
+	AccessKey string `yaml:"accesskey"`
+	SecretKey string `yaml:"secretkey"`
+}
+
+// FeedRPC feedr
+type FeedRPC struct {
+	FeedrURL string   `yaml:"feedrurl"`
+	PingRPC  []string `yaml:"pingrpc"`
+}
+
+// Account info
+type Account struct {
+	Username    string `yaml:"username"` // *
+	Password    string `yaml:"password"` // *
+	Email       string `yaml:"email"`
+	PhoneNumber string `yaml:"phonenumber"`
+	Address     string `yaml:"address"`
+}
+
+// Blogger info
+type Blogger struct {
+	BlogName  string `yaml:"blogname"`
+	SubTitle  string `yaml:"subtitle"`
+	BeiAn     string `yaml:"beian"`
+	BTitle    string `yaml:"btitle"`
+	Copyright string `yaml:"copyright"`
+}
+
+// EiBlogApp config
+type EiBlogApp struct {
+	Mode
+
+	StaticVersion int      `yaml:"staticversion"`
+	HotWords      []string `yaml:"hotwords"`
+	General       General  `yaml:"general"`
+	Disqus        Disqus   `yaml:"disqus"`
+	Google        Google   `yaml:"google"`
+	Qiniu         Qiniu    `yaml:"qiniu"`
+	Twitter       Twitter  `yaml:"twitter"`
+	FeedRPC       FeedRPC  `yaml:"feedrpc"`
+	Account       Account  `yaml:"account"`
+	Blogger       Blogger  `yaml:"blogger"`
+}
+
+// BackupApp config
+type BackupApp struct {
+	Mode
+
+	BackupTo string `yaml:"backupto"`
+	Interval string `yaml:"interval"` // circle backup, default: 7d
+	Validity int    `yaml:"validity"` // storage days, default: 60
+	Qiniu    Qiniu  `yaml:"qiniu"`    // qiniu config
+}
+
+// Config app config
+type Config struct {
+	RunMode   string    `yaml:"runmode"`
+	AppName   string    `yaml:"appname"`
+	Database  Database  `yaml:"database"`
+	ESHost    string    `yaml:"eshost"`
+	EiBlogApp EiBlogApp `yaml:"eiblogapp"`
+	BackupApp BackupApp `yaml:"backupapp"`
+}
+
+// load config file
+func init() {
+	// compatibility linux and windows
+	var err error
+	WorkDir = workDir()
+	path := filepath.Join(WorkDir, "conf", "app.yml")
+
+	data, err := os.ReadFile(path)
 	if err != nil {
-		return "", err
+		panic(err)
 	}
-	// find etc path, try 3 times
+	err = yaml.Unmarshal(data, &Conf)
-	var etc string
+	if err != nil {
-	for gopath != wd && wd != "/" {
+		panic(err)
-		etc = filepath.Join(wd, "etc")
+	}
-
+	// read run mode from env
-		_, err := os.Stat(etc)
+	Conf.RunMode = ModeDev
-		if err == nil {
+	if runmode := os.Getenv("RUN_MODE"); runmode == ModeProd {
-			break
+		Conf.RunMode = runmode
-		}
+	}
-		if !os.IsNotExist(err) {
+	// read env
-			return "", err
+	readDBEnv()
-		}
+}
-		wd = filepath.Dir(wd)
+
+func readDBEnv() {
+	key := strings.ToUpper(Conf.AppName) + "_DB_DRIVER"
+	if d := os.Getenv(key); d != "" {
+		Conf.Database.Driver = d
+	}
+	key = strings.ToUpper(Conf.AppName) + "_DB_SOURCE"
+	if s := os.Getenv(key); s != "" {
+		Conf.Database.Source = s
 	}
-	return etc, nil
 }

pkg/config/dev.go

@@ -0,0 +1,29 @@
+// +build !prod
+
+// Package config provides ...
+package config
+
+import (
+	"os"
+	"path"
+	"path/filepath"
+)
+
+// workDir recognize workspace dir
+var workDir = func() string {
+	wd, err := os.Getwd()
+	if err != nil {
+		panic(err)
+	}
+	for wd != "" {
+		name := filepath.Join(wd, "conf")
+		_, err := os.Stat(name)
+		if err != nil {
+			dir, _ := path.Split(wd)
+			wd = path.Clean(dir)
+			continue
+		}
+		return wd
+	}
+	return ""
+}

pkg/config/enums.go

@@ -1,132 +0,0 @@
-package config
-
-// APIMode 应用配置
-type APIMode struct {
-	// 运行模式，可根据不同模式做相关判断，如日志打印等
-	RunMode RunMode
-
-	// 服务名称，如 eiblog, backup
-	Name string
-	// 监听地址，如 0.0.0.0:9000
-	Listen string
-	// 所属域名，如 deepzz.com
-	Host string
-	// 一般的应用都会有个密钥，可以用这个字段
-	Secret string
-}
-
-// Database 数据库配置
-type Database struct {
-	// 数据库驱动，如 sqlite, mysql, postgres 等
-	Driver string
-	// 数据库连接字符串，如
-	//   sqlite:./db.sqlite
-	//   mysql:root:123456@tcp(127.0.0.1:3306)/eiblog?charset=utf8mb4&parseTime=True&loc=Local
-	Source string
-}
-
-// Disqus 评论配置
-type Disqus struct {
-	// 短名称，如 deepzz
-	ShortName string
-	// 公共密钥 wdSgxRm9rdGAlLKFcFdToBe3GT4SibmV7Y8EjJQ0r4GWXeKtxpopMAeIeoI2dTEg
-	PublicKey string
-	// 访问令牌, 需自行创建
-	AccessToken string
-}
-
-// Twitter 社交配置
-type Twitter struct {
-	// 卡片, 可选 summary, summary_large_image, player
-	Card string
-	// id号, 如 deepzz02
-	Site string
-	// 图片, 如 st.deepzz.cn/static/img/avatar.jpg
-	Image string
-	// 地址, 如 twitter.com/deepzz02
-	Address string
-}
-
-// Google 分析配置
-type Google struct {
-	// url, 如 https://www.google-analytics.com/g/collect
-	URL string
-	// tid, 如 G-S085VRC5PF
-	Tid string
-	// v, 如 "2"
-	V string
-	// 如果开启广发, 配置 <script async src="xxx" crossorigin="anonymous"></script>
-	AdSense string
-}
-
-// Qiniu 对象存储配置
-type Qiniu struct {
-	// bucket, 如 eiblog
-	Bucket string
-	// domain, 如 st.deepzz.cn
-	Domain string
-	// accesskey, 如 1234567890
-	AccessKey string
-	// secretkey, 如 1234567890
-	SecretKey string
-}
-
-// FeedRPC 订阅配置
-type FeedRPC struct {
-	// feedrurl, 如 https://deepzz.superfeedr.com/
-	FeedrURL string
-	// pingrpc, 如 http://ping.baidu.com/ping/RPC2, http://rpc.pingomatic.com/
-	PingRPC []string
-}
-
-// General 博客通用配置
-type General struct {
-	// 前台每页文章数量, 一般配置为 10
-	PageNum int
-	// 后台每页文章数量, 一般配置为 20
-	PageSize int
-	// 文章描述前缀, 一般配置为 Desc:
-	DescPrefix string
-	// 文章截取标识, 一般配置为 <!--more-->
-	Identifier string
-	// 文章预览长度, 一般配置为 400
-	Length int
-	// 时区, 一般配置为 Asia/Shanghai
-	Timezone string
-	// 是否启用两步验证
-	TwoFactor bool
-}
-
-// Account 账户配置
-type Account struct {
-	// *必须配置, 后台登录用户名
-	Username string
-	// *必须配置, 后台登录密码。登录后请后台立即修改
-	Password string
-}
-
-// Blogger 博客配置, 无需配置，程序默认初始化，可在后台更改
-type Blogger struct {
-	// 博客名称, 如 deepzz
-	BlogName string
-	// 格言, 如 Rome was not built in one day.
-	SubTitle string
-	// 备案号, 不填则不显示在网站底部, 如 蜀ICP备xxxxxxxx号-1
-	BeiAn string
-	// 标题, 如 deepzz's Blog
-	BTitle string
-	// 版权, 如 本站使用「<a href="//creativecommons.org/licenses/by/4.0/">署名 4.0 国际</a>」创作共享协议，转载请注明作者及原网址。
-	Copyright string // 版权
-}
-
-// CustomPage 自定义页面配置
-type CustomPage struct {
-	// 页面名称, 如 独立作品
-	Name string
-	// 页面链接, 如 /works
-	Path string
-	// 是否显示在导航栏, 如 true
-	ShowInNav bool
-	// 是否嵌入, 如 true
-	IsEmbed bool
-}

pkg/config/pro.go

@@ -0,0 +1,7 @@
+// +build prod
+
+// Package config provides ...
+package config
+
+// workDir production use current dir
+var workDir = func() string { return "" }

pkg/connector/db/db.go

@@ -1,46 +0,0 @@
-package db
-
-import (
-	"context"
-	"errors"
-	"net/url"
-	"time"
-
-	"github.com/eiblog/eiblog/pkg/config"
-
-	"go.mongodb.org/mongo-driver/mongo"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"go.mongodb.org/mongo-driver/mongo/readpref"
-)
-
-// NewMDB new mongodb
-// https://docs.mongodb.com/manual/reference/connection-string/
-// mongodb://db0.example.com,db1.example.com,db2.example.com/dbname?replicaSet=myRepl&w=majority&wtimeoutMS=5000
-func NewMDB(opts config.Database) (*mongo.Database, error) {
-	if opts.Driver != "mongodb" {
-		return nil, errors.New("db: driver must be mongodb, but " + opts.Driver)
-	}
-	u, err := url.Parse(opts.Source)
-	if err != nil {
-		return nil, errors.New("db: " + err.Error())
-	}
-	database := u.Path
-	if database == "" {
-		return nil, errors.New("db: please specify a database")
-	}
-	database = database[1:]
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*2)
-	defer cancel()
-
-	// remove database
-	u.Path = ""
-	client, err := mongo.Connect(ctx, options.Client().ApplyURI(u.String()))
-	if err != nil {
-		return nil, err
-	}
-	err = client.Ping(ctx, readpref.Primary())
-	if err != nil {
-		return nil, err
-	}
-	return client.Database(database), nil
-}

pkg/core/backup/api.go

@@ -0,0 +1,8 @@
+// Package backup provides ...
+package backup
+
+// @title APP Demo API
+// @version 1.0
+// @description This is a sample server celler server.
+
+// @BasePath /api

pkg/core/backup/docs/docs.go

@@ -0,0 +1,80 @@
+// Package docs GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// This file was generated by swaggo/swag
+package docs
+
+import (
+	"bytes"
+	"encoding/json"
+	"strings"
+	"text/template"
+
+	"github.com/swaggo/swag"
+)
+
+var doc = `{
+    "schemes": {{ marshal .Schemes }},
+    "swagger": "2.0",
+    "info": {
+        "description": "{{escape .Description}}",
+        "title": "{{.Title}}",
+        "contact": {},
+        "version": "{{.Version}}"
+    },
+    "host": "{{.Host}}",
+    "basePath": "{{.BasePath}}",
+    "paths": {}
+}`
+
+type swaggerInfo struct {
+	Version     string
+	Host        string
+	BasePath    string
+	Schemes     []string
+	Title       string
+	Description string
+}
+
+// SwaggerInfo holds exported Swagger Info so clients can modify it
+var SwaggerInfo = swaggerInfo{
+	Version:     "1.0",
+	Host:        "",
+	BasePath:    "/api",
+	Schemes:     []string{},
+	Title:       "APP Demo API",
+	Description: "This is a sample server celler server.",
+}
+
+type s struct{}
+
+func (s *s) ReadDoc() string {
+	sInfo := SwaggerInfo
+	sInfo.Description = strings.Replace(sInfo.Description, "\n", "\\n", -1)
+
+	t, err := template.New("swagger_info").Funcs(template.FuncMap{
+		"marshal": func(v interface{}) string {
+			a, _ := json.Marshal(v)
+			return string(a)
+		},
+		"escape": func(v interface{}) string {
+			// escape tabs
+			str := strings.Replace(v.(string), "\t", "\\t", -1)
+			// replace " with \", and if that results in \\", replace that with \\\"
+			str = strings.Replace(str, "\"", "\\\"", -1)
+			return strings.Replace(str, "\\\\\"", "\\\\\\\"", -1)
+		},
+	}).Parse(doc)
+	if err != nil {
+		return doc
+	}
+
+	var tpl bytes.Buffer
+	if err := t.Execute(&tpl, sInfo); err != nil {
+		return doc
+	}
+
+	return tpl.String()
+}
+
+func init() {
+	swag.Register(swag.Name, &s{})
+}

pkg/core/backup/docs/swagger.json

@@ -0,0 +1,11 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "description": "This is a sample server celler server.",
+        "title": "APP Demo API",
+        "contact": {},
+        "version": "1.0"
+    },
+    "basePath": "/api",
+    "paths": {}
+}

pkg/core/backup/docs/swagger.yaml

@@ -0,0 +1,8 @@
+basePath: /api
+info:
+  contact: {}
+  description: This is a sample server celler server.
+  title: APP Demo API
+  version: "1.0"
+paths: {}
+swagger: "2.0"

pkg/core/backup/ping/ping.go

@@ -1,3 +1,4 @@
+// Package ping provides ...
 package ping
 
 import (
@@ -12,13 +13,6 @@ func RegisterRoutes(group gin.IRoutes) {
 }
 
 // handlePing ping
-// @Summary ping
-// @Description ping
-// @Tags ping
-// @Accept json
-// @Produce json
-// @Success 200 {string} string "it's ok"
-// @Router /ping [get]
 func handlePing(c *gin.Context) {
 	c.String(http.StatusOK, "it's ok")
 }

pkg/core/backup/swag/swag.go

@@ -1,7 +1,8 @@
+// Package swag provides ...
 package swag
 
 import (
-	_ "github.com/eiblog/eiblog/cmd/eiblog/docs" // docs
+	_ "github.com/eiblog/eiblog/pkg/core/backup/docs" // docs
 
 	"github.com/gin-gonic/gin"
 	swaggerFiles "github.com/swaggo/files"

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

@@ -0,0 +1,145 @@
+// Package qiniu provides ...
+package qiniu
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"net/url"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"time"
+
+	"github.com/eiblog/eiblog/pkg/cache/store"
+	"github.com/eiblog/eiblog/pkg/config"
+	"github.com/eiblog/eiblog/pkg/internal"
+)
+
+// Storage qiniu storage
+type Storage struct{}
+
+// BackupData implements timer.Storage
+func (s Storage) BackupData(now time.Time) error {
+	switch config.Conf.Database.Driver {
+	case "mongodb":
+		return backupFromMongoDB(now)
+	default:
+		return errors.New("unsupported source backup to qiniu: " +
+			config.Conf.Database.Driver)
+	}
+}
+
+// RestoreData implements timer.Storage
+func (s Storage) RestoreData() error {
+	switch config.Conf.Database.Driver {
+	case "mongodb":
+		return restoreToMongoDB()
+	default:
+		return errors.New("unsupported source restore from qiniu: " +
+			config.Conf.Database.Driver)
+	}
+}
+
+func backupFromMongoDB(now time.Time) error {
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*20)
+	defer cancel()
+
+	// dump
+	u, err := url.Parse(config.Conf.Database.Source)
+	if err != nil {
+		return err
+	}
+	arg := fmt.Sprintf("mongodump -h %s -d eiblog -o /tmp", u.Host)
+	cmd := exec.CommandContext(ctx, "sh", "-c", arg)
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+	// tar
+	name := fmt.Sprintf("eiblog-%s.tar.gz", now.Format("2006-01-02"))
+	arg = fmt.Sprintf("tar czf /tmp/%s -C /tmp eiblog", name)
+	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+
+	// upload file
+	f, err := os.Open("/tmp/" + name)
+	if err != nil {
+		return err
+	}
+	s, err := f.Stat()
+	if err != nil {
+		return err
+	}
+	uploadParams := internal.UploadParams{
+		Name:           filepath.Join("blog", name), // blog/eiblog-xx.tar.gz
+		Size:           s.Size(),
+		Data:           f,
+		NoCompletePath: true,
+
+		Conf: config.Conf.BackupApp.Qiniu,
+	}
+	_, err = internal.QiniuUpload(uploadParams)
+	if err != nil {
+		return err
+	}
+	// after days delete
+	deleteParams := internal.DeleteParams{
+		Name:           filepath.Join("blog", name), // blog/eiblog-xx.tar.gz
+		Days:           config.Conf.BackupApp.Validity,
+		NoCompletePath: true,
+
+		Conf: config.Conf.BackupApp.Qiniu,
+	}
+	return internal.QiniuDelete(deleteParams)
+}
+
+func restoreToMongoDB() error {
+	// backup file
+	params := internal.ContentParams{
+		Prefix: "blog/",
+
+		Conf: config.Conf.BackupApp.Qiniu,
+	}
+	raw, err := internal.QiniuContent(params)
+	if err != nil {
+		return err
+	}
+	f, err := os.OpenFile("/tmp/eiblog.tar.gz", os.O_WRONLY|os.O_CREATE, 0644)
+	if err != nil {
+		return err
+	}
+	_, _ = f.Write(raw)
+	defer f.Close()
+
+	ctx, cancel := context.WithTimeout(context.Background(), time.Minute*20)
+	defer cancel()
+	// drop database
+	store, err := store.NewStore(config.Conf.Database.Driver,
+		config.Conf.Database.Source)
+	if err != nil {
+		return err
+	}
+	err = store.DropDatabase(ctx)
+	if err != nil {
+		return err
+	}
+	// unarchive
+	arg := fmt.Sprintf("tar xzf /tmp/eiblog.tar.gz -C /tmp")
+	cmd := exec.CommandContext(ctx, "sh", "-c", arg)
+	err = cmd.Run()
+	if err != nil {
+		return err
+	}
+	// restore
+	u, err := url.Parse(config.Conf.Database.Source)
+	if err != nil {
+		return err
+	}
+	arg = fmt.Sprintf("mongorestore -h %s -d eiblog /tmp/eiblog", u.Host)
+	cmd = exec.CommandContext(ctx, "sh", "-c", arg)
+	return cmd.Run()
+}

pkg/core/backup/timer/timer.go

@@ -0,0 +1,74 @@
+// Package timer provides ...
+package timer
+
+import (
+	"errors"
+	"strconv"
+	"time"
+
+	"github.com/eiblog/eiblog/pkg/config"
+	"github.com/eiblog/eiblog/pkg/core/backup/timer/qiniu"
+
+	"github.com/sirupsen/logrus"
+)
+
+// Start to backup with ticker
+func Start(restore bool) (err error) {
+	var storage Storage
+	// backup instance
+	switch config.Conf.BackupApp.BackupTo {
+	case "qiniu":
+		storage = qiniu.Storage{}
+
+	default:
+		return errors.New("timer: unknown backup to driver: " +
+			config.Conf.BackupApp.BackupTo)
+	}
+	if restore {
+		err = storage.RestoreData()
+		if err != nil {
+			return err
+		}
+		logrus.Info("timer: RestoreData success")
+	}
+	// parse duration
+	interval, err := ParseDuration(config.Conf.BackupApp.Interval)
+	if err != nil {
+		return err
+	}
+	t := time.NewTicker(interval)
+	for now := range t.C {
+		err = storage.BackupData(now)
+		if err != nil {
+			logrus.Error("timer: Start.BackupData: ", now.Format(time.RFC3339), err)
+		}
+	}
+	return nil
+}
+
+// ParseDuration parse string to duration
+func ParseDuration(d string) (time.Duration, error) {
+	if len(d) == 0 {
+		return 0, errors.New("timer: incorrect duration input")
+	}
+
+	length := len(d)
+	switch d[length-1] {
+	case 's', 'm', 'h':
+		return time.ParseDuration(d)
+	case 'd':
+		di, err := strconv.Atoi(d[:length-1])
+		if err != nil {
+			return 0, err
+		}
+		return time.Duration(di) * time.Hour * 24, nil
+	}
+
+	return 0, errors.New("timer: unsupported duration:" + d)
+}
+
+// Storage backup backend
+type Storage interface {
+	BackupData(now time.Time) error
+	RestoreData() error
+}

pkg/core/eiblog/admin/admin.go

@@ -1,3 +1,4 @@
+// Package admin provides ...
 package admin
 
 import (
@@ -9,13 +10,12 @@ import (
 	"strings"
 	"time"
 
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
+	"github.com/eiblog/eiblog/pkg/cache"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/internal"
+	"github.com/eiblog/eiblog/pkg/config"
-	"github.com/eiblog/eiblog/pkg/middleware"
+	"github.com/eiblog/eiblog/pkg/core/eiblog"
+	"github.com/eiblog/eiblog/pkg/internal"
 	"github.com/eiblog/eiblog/pkg/model"
-	"github.com/eiblog/eiblog/pkg/third/qiniu"
 	"github.com/eiblog/eiblog/tools"
-	"github.com/pquerna/otp/totp"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
@@ -48,74 +48,36 @@ func RegisterRoutesAuthz(group gin.IRoutes) {
 	group.POST("/api/trash-recover", handleAPITrashRecover)
 	group.POST("/api/file-upload", handleAPIQiniuUpload)
 	group.POST("/api/file-delete", handleAPIQiniuDelete)
-	group.POST("/api/twofactor", handleAPITwoFactor)
 }
 
 // handleAcctLogin 登录接口
 func handleAcctLogin(c *gin.Context) {
 	user := c.PostForm("user")
 	pwd := c.PostForm("password")
-	code := c.PostForm("code")
+	// code := c.PostForm("code") // 二次验证
 	if user == "" || pwd == "" {
 		logrus.Warnf("参数错误: %s %s", user, pwd)
 		c.Redirect(http.StatusFound, "/admin/login")
 		return
 	}
-	if internal.Ei.Account.Username != user ||
+	if cache.Ei.Account.Username != user ||
-		internal.Ei.Account.Password != tools.EncryptPasswd(user, pwd) {
+		cache.Ei.Account.Password != tools.EncryptPasswd(user, pwd) {
 		logrus.Warnf("账号或密码错误 %s, %s", user, pwd)
 		c.Redirect(http.StatusFound, "/admin/login")
 		return
 	}
-	// 两步验证
-	if config.Conf.General.TwoFactor &&
-		internal.Ei.Account.TwoFactorSecret != "" {
-		valid := totp.Validate(code, internal.Ei.Account.TwoFactorSecret)
-		if !valid {
-			logrus.Warnf("两步验证: %s", code)
-			c.Redirect(http.StatusFound, "/admin/login")
-			return
-		}
-	}
 	// 登录成功
-	middleware.SetLogin(c, user)
+	eiblog.SetLogin(c, user)
 
-	internal.Ei.Account.LoginIP = c.ClientIP()
+	cache.Ei.Account.LoginIP = c.ClientIP()
-	internal.Ei.Account.LoginAt = time.Now()
+	cache.Ei.Account.LoginAt = time.Now()
-	internal.Store.UpdateAccount(context.Background(), user, map[string]interface{}{
+	cache.Ei.UpdateAccount(context.Background(), user, map[string]interface{}{
-		"login_ip": internal.Ei.Account.LoginIP,
+		"login_ip": cache.Ei.Account.LoginIP,
-		"login_at": internal.Ei.Account.LoginAt,
+		"login_at": cache.Ei.Account.LoginAt,
 	})
 	c.Redirect(http.StatusFound, "/admin/profile")
 }
 
-// handleAPITwoFactor 两步验证
-func handleAPITwoFactor(c *gin.Context) {
-	code := c.PostForm("code")
-	if code == "" {
-		responseNotice(c, NoticeNotice, "验证码不能为空", "")
-		return
-	}
-	valid := totp.Validate(code, internal.TwoFactorSecret)
-	if !valid {
-		responseNotice(c, NoticeNotice, "验证码错误", "")
-		return
-	}
-	err := internal.Store.UpdateAccount(context.Background(), internal.Ei.Account.Username,
-		map[string]interface{}{
-			"two_factor_secret": internal.TwoFactorSecret,
-		})
-	if err != nil {
-		logrus.Error("handleAPITwoFactor.UpdateAccount: ", err)
-		responseNotice(c, NoticeNotice, err.Error(), "")
-		return
-	}
-	internal.Ei.Account.TwoFactorSecret = internal.TwoFactorSecret
-	internal.TwoFactorSecret = ""
-	c.Request.Header.Set("Referer", "/admin/profile")
-	responseNotice(c, NoticeSuccess, "绑定成功", "")
-}
-
 // handleAPIBlogger 更新博客信息
 func handleAPIBlogger(c *gin.Context) {
 	bn := c.PostForm("blogName")
@@ -129,7 +91,7 @@ func handleAPIBlogger(c *gin.Context) {
 		return
 	}
 
-	err := internal.Store.UpdateBlogger(context.Background(), map[string]interface{}{
+	err := cache.Ei.UpdateBlogger(context.Background(), map[string]interface{}{
 		"blog_name":    bn,
 		"b_title":      bt,
 		"bei_an":       ba,
@@ -142,14 +104,14 @@ func handleAPIBlogger(c *gin.Context) {
 		responseNotice(c, NoticeNotice, err.Error(), "")
 		return
 	}
-	internal.Ei.Blogger.BlogName = bn
+	cache.Ei.Blogger.BlogName = bn
-	internal.Ei.Blogger.BTitle = bt
+	cache.Ei.Blogger.BTitle = bt
-	internal.Ei.Blogger.BeiAn = ba
+	cache.Ei.Blogger.BeiAn = ba
-	internal.Ei.Blogger.SubTitle = st
+	cache.Ei.Blogger.SubTitle = st
-	internal.Ei.Blogger.SeriesSay = ss
+	cache.Ei.Blogger.SeriesSay = ss
-	internal.Ei.Blogger.ArchivesSay = as
+	cache.Ei.Blogger.ArchivesSay = as
-	internal.PagesCh <- internal.PageSeries
+	cache.PagesCh <- cache.PageSeries
-	internal.PagesCh <- internal.PageArchive
+	cache.PagesCh <- cache.PageArchive
 	responseNotice(c, NoticeSuccess, "更新成功", "")
 }
 
@@ -164,7 +126,7 @@ func handleAPIAccount(c *gin.Context) {
 		return
 	}
 
-	err := internal.Store.UpdateAccount(context.Background(), internal.Ei.Account.Username,
+	err := cache.Ei.UpdateAccount(context.Background(), cache.Ei.Account.Username,
 		map[string]interface{}{
 			"email":   e,
 			"phone_n": pn,
@@ -175,9 +137,9 @@ func handleAPIAccount(c *gin.Context) {
 		responseNotice(c, NoticeNotice, err.Error(), "")
 		return
 	}
-	internal.Ei.Account.Email = e
+	cache.Ei.Account.Email = e
-	internal.Ei.Account.PhoneN = pn
+	cache.Ei.Account.PhoneN = pn
-	internal.Ei.Account.Address = ad
+	cache.Ei.Account.Address = ad
 	responseNotice(c, NoticeSuccess, "更新成功", "")
 }
 
@@ -194,13 +156,13 @@ func handleAPIPassword(c *gin.Context) {
 		responseNotice(c, NoticeNotice, "密码格式错误", "")
 		return
 	}
-	if internal.Ei.Account.Password != tools.EncryptPasswd(internal.Ei.Account.Username, od) {
+	if cache.Ei.Account.Password != tools.EncryptPasswd(cache.Ei.Account.Username, od) {
 		responseNotice(c, NoticeNotice, "原始密码不正确", "")
 		return
 	}
-	newPwd := tools.EncryptPasswd(internal.Ei.Account.Username, nw)
+	newPwd := tools.EncryptPasswd(cache.Ei.Account.Username, nw)
 
-	err := internal.Store.UpdateAccount(context.Background(), internal.Ei.Account.Username,
+	err := cache.Ei.UpdateAccount(context.Background(), cache.Ei.Account.Username,
 		map[string]interface{}{
 			"password": newPwd,
 		})
@@ -209,7 +171,7 @@ func handleAPIPassword(c *gin.Context) {
 		responseNotice(c, NoticeNotice, err.Error(), "")
 		return
 	}
-	internal.Ei.Account.Password = newPwd
+	cache.Ei.Account.Password = newPwd
 	responseNotice(c, NoticeSuccess, "更新成功", "")
 }
 
@@ -221,7 +183,7 @@ func handleDraftDelete(c *gin.Context) {
 			responseNotice(c, NoticeNotice, "参数错误", "")
 			return
 		}
-		err = internal.Store.RemoveArticle(context.Background(), id)
+		err = cache.Ei.RemoveArticle(context.Background(), id)
 		if err != nil {
 			logrus.Error("handleDraftDelete.RemoveArticle: ", err)
 			responseNotice(c, NoticeNotice, "删除失败", "")
@@ -236,11 +198,11 @@ func handleAPIPostDelete(c *gin.Context) {
 	var ids []int
 	for _, v := range c.PostFormArray("cid[]") {
 		id, err := strconv.Atoi(v)
-		if err != nil || id < internal.ArticleStartID {
+		if err != nil || id < config.Conf.EiBlogApp.General.StartID {
 			responseNotice(c, NoticeNotice, "参数错误", "")
 			return
 		}
-		err = internal.Ei.DelArticle(id)
+		err = cache.Ei.DelArticle(id)
 		if err != nil {
 			logrus.Error("handleAPIPostDelete.DelArticle: ", err)
 
@@ -250,14 +212,12 @@ func handleAPIPostDelete(c *gin.Context) {
 		ids = append(ids, id)
 	}
 	// elasticsearch
-	if internal.ESClient != nil {
+	err := internal.ElasticDelIndex(ids)
-		err := internal.ESClient.ElasticDelIndex(ids)
+	if err != nil {
-		if err != nil {
+		logrus.Error("handleAPIPostDelete.ElasticDelIndex: ", err)
-			logrus.Error("handleAPIPostDelete.ElasticDelIndex: ", err)
-		}
 	}
 	// TODO disqus delete
-	responseNotice(c, NoticeSuccess, "删除成功，已移入到回收箱", "")
+	responseNotice(c, NoticeSuccess, "删除成功", "")
 }
 
 // handleAPIPostCreate 创建文章
@@ -311,7 +271,7 @@ func handleAPIPostCreate(c *gin.Context) {
 		Content:   text,
 		Slug:      slug,
 		IsDraft:   do != "publish",
-		Author:    internal.Ei.Account.Username,
+		Author:    cache.Ei.Account.Username,
 		SerieID:   serieid,
 		Tags:      tags,
 		CreatedAt: date,
@@ -319,7 +279,7 @@ func handleAPIPostCreate(c *gin.Context) {
 	cid, err = strconv.Atoi(c.PostForm("cid"))
 	// 新文章
 	if err != nil || cid < 1 {
-		err = internal.Ei.AddArticle(article)
+		err = cache.Ei.AddArticle(article)
 		if err != nil {
 			logrus.Error("handleAPIPostCreate.AddArticle: ", err)
 			return
@@ -329,22 +289,20 @@ func handleAPIPostCreate(c *gin.Context) {
 
 		if !article.IsDraft {
 			// disqus
-			internal.DisqusClient.ThreadCreate(article, internal.Ei.Blogger.BTitle)
+			internal.ThreadCreate(article, cache.Ei.Blogger.BTitle)
 			// 异步执行，快
 			go func() {
 				// elastic
-				if internal.ESClient != nil {
+				internal.ElasticAddIndex(article)
-					internal.ESClient.ElasticAddIndex(article)
-				}
 				// rss
-				internal.Pinger.PingFunc(internal.Ei.Blogger.BTitle, slug)
+				internal.PingFunc(cache.Ei.Blogger.BTitle, slug)
 			}()
 		}
 		return
 	}
 	// 旧文章
 	article.ID = cid
-	artc, _ := internal.Ei.FindArticleByID(article.ID) // cache
+	artc, _ := cache.Ei.FindArticleByID(article.ID) // cache
 	if artc != nil {
 		article.IsDraft = false
 		article.Count = artc.Count
@@ -354,7 +312,7 @@ func handleAPIPostCreate(c *gin.Context) {
 		article.UpdatedAt = time.Now()
 	}
 	// 数据库更新
-	err = internal.Store.UpdateArticle(context.Background(), article.ID, map[string]interface{}{
+	err = cache.Ei.UpdateArticle(context.Background(), article.ID, map[string]interface{}{
 		"title":      article.Title,
 		"content":    article.Content,
 		"serie_id":   article.SerieID,
@@ -368,19 +326,17 @@ func handleAPIPostCreate(c *gin.Context) {
 		return
 	}
 	if !article.IsDraft {
-		internal.Ei.RepArticle(artc, article)
+		cache.Ei.RepArticle(artc, article)
 		// disqus
 		if artc == nil {
-			internal.DisqusClient.ThreadCreate(article, internal.Ei.Blogger.BTitle)
+			internal.ThreadCreate(article, cache.Ei.Blogger.BTitle)
 		}
 		// 异步执行，快
 		go func() {
 			// elastic
-			if internal.ESClient != nil {
+			internal.ElasticAddIndex(article)
-				internal.ESClient.ElasticAddIndex(article)
-			}
 			// rss
-			internal.Pinger.PingFunc(internal.Ei.Blogger.BTitle, slug)
+			internal.PingFunc(cache.Ei.Blogger.BTitle, slug)
 		}()
 	}
 }
@@ -393,7 +349,7 @@ func handleAPISerieDelete(c *gin.Context) {
 			responseNotice(c, NoticeNotice, err.Error(), "")
 			return
 		}
-		err = internal.Ei.DelSerie(id)
+		err = cache.Ei.DelSerie(id)
 		if err != nil {
 			responseNotice(c, NoticeNotice, err.Error(), "")
 			return
@@ -420,7 +376,7 @@ func handleAPISerieCreate(c *gin.Context) {
 	mid, err := strconv.Atoi(c.PostForm("mid"))
 	if err == nil && mid > 0 {
 		var serie *model.Serie
-		for _, v := range internal.Ei.Series {
+		for _, v := range cache.Ei.Series {
 			if v.ID == mid {
 				serie = v
 				break
@@ -430,7 +386,7 @@ func handleAPISerieCreate(c *gin.Context) {
 			responseNotice(c, NoticeNotice, "专题不存在", "")
 			return
 		}
-		err = internal.Store.UpdateSerie(context.Background(), mid, map[string]interface{}{
+		err = cache.Ei.UpdateSerie(context.Background(), mid, map[string]interface{}{
 			"slug": slug,
 			"name": name,
 			"desc": desc,
@@ -443,9 +399,9 @@ func handleAPISerieCreate(c *gin.Context) {
 		serie.Slug = slug
 		serie.Name = name
 		serie.Desc = desc
-		internal.PagesCh <- internal.PageSeries
+		cache.PagesCh <- cache.PageSeries
 	} else {
-		err = internal.Ei.AddSerie(&model.Serie{
+		err = cache.Ei.AddSerie(&model.Serie{
 			Slug:      slug,
 			Name:      name,
 			Desc:      desc,
@@ -468,7 +424,7 @@ func handleAPITrashDelete(c *gin.Context) {
 			responseNotice(c, NoticeNotice, "参数错误", "")
 			return
 		}
-		err = internal.Store.RemoveArticle(context.Background(), id)
+		err = cache.Ei.RemoveArticle(context.Background(), id)
 		if err != nil {
 			responseNotice(c, NoticeNotice, err.Error(), "")
 			return
@@ -486,7 +442,7 @@ func handleAPITrashRecover(c *gin.Context) {
 			return
 
 		}
-		err = internal.Store.UpdateArticle(context.Background(), id, map[string]interface{}{
+		err = cache.Ei.UpdateArticle(context.Background(), id, map[string]interface{}{
 			"deleted_at": time.Time{},
 			"is_draft":   true,
 		})
@@ -517,12 +473,14 @@ func handleAPIQiniuUpload(c *gin.Context) {
 	}
 	filename := strings.ToLower(header.Filename)
 
-	params := qiniu.UploadParams{
+	params := internal.UploadParams{
 		Name: filename,
 		Size: s.Size(),
 		Data: file,
+
+		Conf: config.Conf.EiBlogApp.Qiniu,
 	}
-	url, err := internal.QiniuClient.Upload(params)
+	url, err := internal.QiniuUpload(params)
 	if err != nil {
 		logrus.Error("handleAPIQiniuUpload.QiniuUpload: ", err)
 		c.String(http.StatusBadRequest, err.Error())
@@ -547,10 +505,12 @@ func handleAPIQiniuDelete(c *gin.Context) {
 		return
 	}
 
-	params := qiniu.DeleteParams{
+	params := internal.DeleteParams{
 		Name: name,
+
+		Conf: config.Conf.EiBlogApp.Qiniu,
 	}
-	err := internal.QiniuClient.Delete(params)
+	err := internal.QiniuDelete(params)
 	if err != nil {
 		logrus.Error("handleAPIQiniuDelete.QiniuDelete: ", err)
 	}

pkg/core/eiblog/api.go

@@ -0,0 +1,56 @@
+// Package eiblog provides ...
+package eiblog
+
+import (
+	"net/http"
+
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-gonic/gin"
+)
+
+// @title APP Demo API
+// @version 1.0
+// @description This is a sample server celler server.
+
+// @BasePath /api
+
+// AuthFilter auth filter
+func AuthFilter(c *gin.Context) {
+	if !IsLogined(c) {
+		c.Abort()
+		c.Status(http.StatusUnauthorized)
+		c.Redirect(http.StatusFound, "/admin/login")
+		return
+	}
+
+	c.Next()
+}
+
+// SetLogin login user
+func SetLogin(c *gin.Context, username string) {
+	session := sessions.Default(c)
+	session.Set("username", username)
+	session.Save()
+}
+
+// SetLogout logout user
+func SetLogout(c *gin.Context) {
+	session := sessions.Default(c)
+	session.Delete("username")
+	session.Save()
+}
+
+// IsLogined account logined
+func IsLogined(c *gin.Context) bool {
+	return GetUsername(c) != ""
+}
+
+// GetUsername get logined account
+func GetUsername(c *gin.Context) string {
+	session := sessions.Default(c)
+	username := session.Get("username")
+	if username == nil {
+		return ""
+	}
+	return username.(string)
+}

pkg/core/eiblog/docs/docs.go

@@ -0,0 +1,80 @@
+// Package docs GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// This file was generated by swaggo/swag
+package docs
+
+import (
+	"bytes"
+	"encoding/json"
+	"strings"
+	"text/template"
+
+	"github.com/swaggo/swag"
+)
+
+var doc = `{
+    "schemes": {{ marshal .Schemes }},
+    "swagger": "2.0",
+    "info": {
+        "description": "{{escape .Description}}",
+        "title": "{{.Title}}",
+        "contact": {},
+        "version": "{{.Version}}"
+    },
+    "host": "{{.Host}}",
+    "basePath": "{{.BasePath}}",
+    "paths": {}
+}`
+
+type swaggerInfo struct {
+	Version     string
+	Host        string
+	BasePath    string
+	Schemes     []string
+	Title       string
+	Description string
+}
+
+// SwaggerInfo holds exported Swagger Info so clients can modify it
+var SwaggerInfo = swaggerInfo{
+	Version:     "1.0",
+	Host:        "",
+	BasePath:    "/api",
+	Schemes:     []string{},
+	Title:       "APP Demo API",
+	Description: "This is a sample server celler server.",
+}
+
+type s struct{}
+
+func (s *s) ReadDoc() string {
+	sInfo := SwaggerInfo
+	sInfo.Description = strings.Replace(sInfo.Description, "\n", "\\n", -1)
+
+	t, err := template.New("swagger_info").Funcs(template.FuncMap{
+		"marshal": func(v interface{}) string {
+			a, _ := json.Marshal(v)
+			return string(a)
+		},
+		"escape": func(v interface{}) string {
+			// escape tabs
+			str := strings.Replace(v.(string), "\t", "\\t", -1)
+			// replace " with \", and if that results in \\", replace that with \\\"
+			str = strings.Replace(str, "\"", "\\\"", -1)
+			return strings.Replace(str, "\\\\\"", "\\\\\\\"", -1)
+		},
+	}).Parse(doc)
+	if err != nil {
+		return doc
+	}
+
+	var tpl bytes.Buffer
+	if err := t.Execute(&tpl, sInfo); err != nil {
+		return doc
+	}
+
+	return tpl.String()
+}
+
+func init() {
+	swag.Register(swag.Name, &s{})
+}

pkg/core/eiblog/docs/swagger.json

@@ -0,0 +1,11 @@
+{
+    "swagger": "2.0",
+    "info": {
+        "description": "This is a sample server celler server.",
+        "title": "APP Demo API",
+        "contact": {},
+        "version": "1.0"
+    },
+    "basePath": "/api",
+    "paths": {}
+}

pkg/core/eiblog/docs/swagger.yaml

@@ -0,0 +1,8 @@
+basePath: /api
+info:
+  contact: {}
+  description: This is a sample server celler server.
+  title: APP Demo API
+  version: "1.0"
+paths: {}
+swagger: "2.0"

pkg/core/eiblog/file/file.go

@@ -0,0 +1,49 @@
+// Package file provides ...
+package file
+
+import (
+	"net/http"
+
+	"github.com/gin-gonic/gin"
+)
+
+// RegisterRoutes register routes
+func RegisterRoutes(e *gin.Engine) {
+	e.GET("/rss.html", handleFeed)
+	e.GET("/feed", handleFeed)
+	e.GET("/opensearch.xml", handleOpensearch)
+	e.GET("/sitemap.xml", handleSitemap)
+	e.GET("/robots.txt", handleRobots)
+	e.GET("/crossdomain.xml", handleCrossDomain)
+	e.GET("/favicon.ico", handleFavicon)
+}
+
+// handleFeed feed.xml
+func handleFeed(c *gin.Context) {
+	http.ServeFile(c.Writer, c.Request, "assets/feed.xml")
+}
+
+// handleOpensearch opensearch.xml
+func handleOpensearch(c *gin.Context) {
+	http.ServeFile(c.Writer, c.Request, "assets/opensearch.xml")
+}
+
+// handleRobots robotx.txt
+func handleRobots(c *gin.Context) {
+	http.ServeFile(c.Writer, c.Request, "assets/robots.txt")
+}
+
+// handleSitemap sitemap.xml
+func handleSitemap(c *gin.Context) {
+	http.ServeFile(c.Writer, c.Request, "assets/sitemap.xml")
+}
+
+// handleCrossDomain crossdomain.xml
+func handleCrossDomain(c *gin.Context) {
+	http.ServeFile(c.Writer, c.Request, "assets/crossdomain.xml")
+}
+
+// handleFavicon favicon.ico
+func handleFavicon(c *gin.Context) {
+	http.ServeFile(c.Writer, c.Request, "assets/favicon.ico")
+}

pkg/core/eiblog/file/timer.go

@@ -0,0 +1,164 @@
+// Package file provides ...
+package file
+
+import (
+	"os"
+	"path/filepath"
+	"text/template"
+	"time"
+
+	"github.com/eiblog/eiblog/pkg/cache"
+	"github.com/eiblog/eiblog/pkg/config"
+	"github.com/eiblog/eiblog/tools"
+
+	"github.com/sirupsen/logrus"
+)
+
+var xmlTmpl *template.Template
+
+func init() {
+	root := filepath.Join(config.WorkDir, "website", "template", "*.xml")
+
+	var err error
+	xmlTmpl, err = template.New("").Funcs(template.FuncMap{
+		"dateformat":  tools.DateFormat,
+		"imgtonormal": tools.ImgToNormal,
+	}).ParseGlob(root)
+	if err != nil {
+		panic(err)
+	}
+	generateOpensearch()
+	generateRobots()
+	generateCrossdomain()
+	go timerFeed()
+	go timerSitemap()
+}
+
+// timerFeed 定时刷新feed
+func timerFeed() {
+	tpl := xmlTmpl.Lookup("feedTpl.xml")
+	if tpl == nil {
+		logrus.Info("file: not found: feedTpl.xml")
+		return
+	}
+
+	now := time.Now()
+	_, _, articles := cache.Ei.PageArticleFE(1, 20)
+	params := map[string]interface{}{
+		"Title":     cache.Ei.Blogger.BTitle,
+		"SubTitle":  cache.Ei.Blogger.SubTitle,
+		"Host":      config.Conf.EiBlogApp.Host,
+		"FeedrURL":  config.Conf.EiBlogApp.FeedRPC.FeedrURL,
+		"BuildDate": now.Format(time.RFC1123Z),
+		"Articles":  articles,
+	}
+	f, err := os.OpenFile("assets/feed.xml", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	if err != nil {
+		logrus.Error("file: timerFeed.OpenFile: ", err)
+		return
+	}
+	defer f.Close()
+	err = tpl.Execute(f, params)
+	if err != nil {
+		logrus.Error("file: timerFeed.Execute: ", err)
+		return
+	}
+	time.AfterFunc(time.Hour*4, timerFeed)
+}
+
+// timerSitemap 定时刷新sitemap
+func timerSitemap() {
+	tpl := xmlTmpl.Lookup("sitemapTpl.xml")
+	if tpl == nil {
+		logrus.Info("file: not found: sitemapTpl.xml")
+		return
+	}
+
+	params := map[string]interface{}{
+		"Articles": cache.Ei.Articles,
+		"Host":     config.Conf.EiBlogApp.Host,
+	}
+	f, err := os.OpenFile("assets/sitemap.xml", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	if err != nil {
+		logrus.Error("file: timerSitemap.OpenFile: ", err)
+		return
+	}
+	defer f.Close()
+	err = tpl.Execute(f, params)
+	if err != nil {
+		logrus.Error("file: timerSitemap.Execute: ", err)
+		return
+	}
+	time.AfterFunc(time.Hour*24, timerSitemap)
+}
+
+// generateOpensearch 生成opensearch.xml
+func generateOpensearch() {
+	tpl := xmlTmpl.Lookup("opensearchTpl.xml")
+	if tpl == nil {
+		logrus.Info("file: not found: opensearchTpl.xml")
+		return
+	}
+	params := map[string]string{
+		"BTitle":   cache.Ei.Blogger.BTitle,
+		"SubTitle": cache.Ei.Blogger.SubTitle,
+		"Host":     config.Conf.EiBlogApp.Host,
+	}
+	f, err := os.OpenFile("assets/opensearch.xml", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	if err != nil {
+		logrus.Error("file: generateOpensearch.OpenFile: ", err)
+		return
+	}
+	defer f.Close()
+	err = tpl.Execute(f, params)
+	if err != nil {
+		logrus.Error("file: generateOpensearch.Execute: ", err)
+		return
+	}
+}
+
+// generateRobots 生成robots.txt
+func generateRobots() {
+	tpl := xmlTmpl.Lookup("robotsTpl.xml")
+	if tpl == nil {
+		logrus.Info("file: not found: robotsTpl.xml")
+		return
+	}
+	params := map[string]string{
+		"Host": config.Conf.EiBlogApp.Host,
+	}
+	f, err := os.OpenFile("assets/robots.txt", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	if err != nil {
+		logrus.Error("file: generateRobots.OpenFile: ", err)
+		return
+	}
+	defer f.Close()
+	err = tpl.Execute(f, params)
+	if err != nil {
+		logrus.Error("file: generateRobots.Execute: ", err)
+		return
+	}
+}
+
+// generateCrossdomain 生成crossdomain.xml
+func generateCrossdomain() {
+	tpl := xmlTmpl.Lookup("crossdomainTpl.xml")
+	if tpl == nil {
+		logrus.Info("file: not found: crossdomainTpl.xml")
+		return
+	}
+	params := map[string]string{
+		"Host": config.Conf.EiBlogApp.Host,
+	}
+	f, err := os.OpenFile("assets/crossdomain.xml", os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0666)
+	if err != nil {
+		logrus.Error("file: generateCrossdomain.OpenFile: ", err)
+		return
+	}
+	defer f.Close()
+	err = tpl.Execute(f, params)
+	if err != nil {
+		logrus.Error("file: generateCrossdomain.Execute: ", err)
+		return
+	}
+}

pkg/core/eiblog/page/be.go

@@ -1,31 +1,29 @@
-package pages
+// Package page provides ...
+package page
 
 import (
 	"bytes"
 	"context"
-	"encoding/base64"
 	"encoding/json"
 	"fmt"
-	"html/template"
+	htemplate "html/template"
-	"image/png"
 	"net/http"
 	"strconv"
 
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
+	"github.com/eiblog/eiblog/pkg/cache"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/internal"
+	"github.com/eiblog/eiblog/pkg/cache/store"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/internal/store"
+	"github.com/eiblog/eiblog/pkg/config"
-	"github.com/eiblog/eiblog/pkg/middleware"
+	"github.com/eiblog/eiblog/pkg/core/eiblog"
-	"github.com/pquerna/otp/totp"
 
 	"github.com/gin-gonic/gin"
 	"github.com/sirupsen/logrus"
 )
 
 // baseBEParams 基础参数
-func baseBEParams(_ *gin.Context) gin.H {
+func baseBEParams(c *gin.Context) gin.H {
 	return gin.H{
-		"Author": internal.Ei.Account.Username,
+		"Author": cache.Ei.Account.Username,
-		"Qiniu":  config.Conf.Qiniu,
+		"Qiniu":  config.Conf.EiBlogApp.Qiniu,
 	}
 }
 
@@ -33,51 +31,22 @@ func baseBEParams(_ *gin.Context) gin.H {
 func handleLoginPage(c *gin.Context) {
 	logout := c.Query("logout")
 	if logout == "true" {
-		middleware.SetLogout(c)
+		eiblog.SetLogout(c)
-	} else if middleware.IsLogined(c) {
+	} else if eiblog.IsLogined(c) {
 		c.Redirect(http.StatusFound, "/admin/profile")
 		return
 	}
-	params := gin.H{
+	params := gin.H{"BTitle": cache.Ei.Blogger.BTitle}
-		"BTitle": internal.Ei.Blogger.BTitle,
-		"TwoFactor": config.Conf.General.TwoFactor &&
-			internal.Ei.Account.TwoFactorSecret != "",
-	}
 	renderHTMLAdminLayout(c, "login.html", params)
 }
 
 // handleAdminProfile 个人配置
 func handleAdminProfile(c *gin.Context) {
 	params := baseBEParams(c)
-	params["Title"] = "个人配置 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "个人配置 | " + cache.Ei.Blogger.BTitle
 	params["Path"] = c.Request.URL.Path
 	params["Console"] = true
-	params["Ei"] = internal.Ei
+	params["Ei"] = cache.Ei
-	if c.Query("unbind") == "true" {
-		internal.Ei.Account.TwoFactorSecret = ""
-		_ = internal.Store.UpdateAccount(context.Background(), internal.Ei.Account.Username,
-			map[string]interface{}{
-				"two_factor_secret": "",
-			})
-	}
-	if config.Conf.General.TwoFactor &&
-		internal.Ei.Account.TwoFactorSecret == "" {
-		key, err := totp.Generate(totp.GenerateOpts{
-			Issuer:      config.Conf.Host,
-			AccountName: internal.Ei.Account.Username,
-		})
-		internal.TwoFactorSecret = key.Secret()
-		if err == nil {
-			var buf bytes.Buffer
-			img, err := key.Image(200, 200)
-			if err != nil {
-				panic(err)
-			}
-			png.Encode(&buf, img)
-			b64 := base64.StdEncoding.EncodeToString(buf.Bytes())
-			params["TwoFactorSecret"] = "data:image/png;base64," + b64
-		}
-	}
 	renderHTMLAdminLayout(c, "admin-profile", params)
 }
 
@@ -92,20 +61,20 @@ func handleAdminPost(c *gin.Context) {
 	params := baseBEParams(c)
 	id, err := strconv.Atoi(c.Query("cid"))
 	if err == nil && id > 0 {
-		article, _ := internal.Store.LoadArticle(context.Background(), id)
+		article, _ := cache.Ei.LoadArticle(context.Background(), id)
 		if article != nil {
-			params["Title"] = "编辑文章 | " + internal.Ei.Blogger.BTitle
+			params["Title"] = "编辑文章 | " + cache.Ei.Blogger.BTitle
 			params["Edit"] = article
 		}
 	}
 	if params["Title"] == nil {
-		params["Title"] = "撰写文章 | " + internal.Ei.Blogger.BTitle
+		params["Title"] = "撰写文章 | " + cache.Ei.Blogger.BTitle
 	}
 	params["Path"] = c.Request.URL.Path
-	params["Domain"] = config.Conf.Host
+	params["Domain"] = config.Conf.EiBlogApp.Host
-	params["Series"] = internal.Ei.Series
+	params["Series"] = cache.Ei.Series
 	var tags []T
-	for tag := range internal.Ei.TagArticles {
+	for tag := range cache.Ei.TagArticles {
 		tags = append(tags, T{tag, tag})
 	}
 	str, _ := json.Marshal(tags)
@@ -128,15 +97,15 @@ func handleAdminPosts(c *gin.Context) {
 	vals := c.Request.URL.Query()
 
 	params := baseBEParams(c)
-	params["Title"] = "文章管理 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "文章管理 | " + cache.Ei.Blogger.BTitle
 	params["Manage"] = true
 	params["Path"] = c.Request.URL.Path
-	params["Series"] = internal.Ei.Series
+	params["Series"] = cache.Ei.Series
 	params["Serie"] = se
 	params["KW"] = kw
 	var max int
-	params["List"], max = internal.Ei.PageArticleBE(se, kw, false, false,
+	params["List"], max = cache.Ei.PageArticleBE(se, kw, false, false,
-		pg, config.Conf.General.PageSize)
+		pg, config.Conf.EiBlogApp.General.PageSize)
 	if pg < max {
 		vals.Set("page", fmt.Sprint(pg+1))
 		params["Next"] = vals.Encode()
@@ -157,10 +126,10 @@ func handleAdminPosts(c *gin.Context) {
 // handleAdminSeries 专题列表
 func handleAdminSeries(c *gin.Context) {
 	params := baseBEParams(c)
-	params["Title"] = "专题管理 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "专题管理 | " + cache.Ei.Blogger.BTitle
 	params["Manage"] = true
 	params["Path"] = c.Request.URL.Path
-	params["List"] = internal.Ei.Series
+	params["List"] = cache.Ei.Series
 	renderHTMLAdminLayout(c, "admin-series", params)
 }
 
@@ -169,11 +138,11 @@ func handleAdminSerie(c *gin.Context) {
 	params := baseBEParams(c)
 
 	id, err := strconv.Atoi(c.Query("mid"))
-	params["Title"] = "新增专题 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "新增专题 | " + cache.Ei.Blogger.BTitle
 	if err == nil && id > 0 {
-		for _, v := range internal.Ei.Series {
+		for _, v := range cache.Ei.Series {
 			if v.ID == id {
-				params["Title"] = "编辑专题 | " + internal.Ei.Blogger.BTitle
+				params["Title"] = "编辑专题 | " + cache.Ei.Blogger.BTitle
 				params["Edit"] = v
 				break
 			}
@@ -187,10 +156,10 @@ func handleAdminSerie(c *gin.Context) {
 // handleAdminTags 标签列表
 func handleAdminTags(c *gin.Context) {
 	params := baseBEParams(c)
-	params["Title"] = "标签管理 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "标签管理 | " + cache.Ei.Blogger.BTitle
 	params["Manage"] = true
 	params["Path"] = c.Request.URL.Path
-	params["List"] = internal.Ei.TagArticles
+	params["List"] = cache.Ei.TagArticles
 	renderHTMLAdminLayout(c, "admin-tags", params)
 }
 
@@ -201,7 +170,7 @@ func handleDraftDelete(c *gin.Context) {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "参数错误"})
 		return
 	}
-	err = internal.Store.RemoveArticle(context.Background(), id)
+	err = cache.Ei.RemoveArticle(context.Background(), id)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, gin.H{"error": "删除错误"})
 		return
@@ -213,7 +182,7 @@ func handleDraftDelete(c *gin.Context) {
 func handleAdminDraft(c *gin.Context) {
 	params := baseBEParams(c)
 
-	params["Title"] = "草稿箱 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "草稿箱 | " + cache.Ei.Blogger.BTitle
 	params["Manage"] = true
 	params["Path"] = c.Request.URL.Path
 	var err error
@@ -222,7 +191,7 @@ func handleAdminDraft(c *gin.Context) {
 		Limit:  9999,
 		Fields: map[string]interface{}{store.SearchArticleDraft: true},
 	}
-	params["List"], _, err = internal.Store.LoadArticleList(context.Background(), search)
+	params["List"], _, err = cache.Ei.LoadArticleList(context.Background(), search)
 	if err != nil {
 		logrus.Error("handleDraft.LoadDraftArticles: ", err)
 		c.Status(http.StatusBadRequest)
@@ -235,7 +204,7 @@ func handleAdminDraft(c *gin.Context) {
 // handleAdminTrash 回收箱页
 func handleAdminTrash(c *gin.Context) {
 	params := baseBEParams(c)
-	params["Title"] = "回收箱 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "回收箱 | " + cache.Ei.Blogger.BTitle
 	params["Manage"] = true
 	params["Path"] = c.Request.URL.Path
 	var err error
@@ -244,7 +213,7 @@ func handleAdminTrash(c *gin.Context) {
 		Limit:  9999,
 		Fields: map[string]interface{}{store.SearchArticleTrash: true},
 	}
-	params["List"], _, err = internal.Store.LoadArticleList(context.Background(), search)
+	params["List"], _, err = cache.Ei.LoadArticleList(context.Background(), search)
 	if err != nil {
 		logrus.Error("handleTrash.LoadArticleList: ", err)
 	}
@@ -254,7 +223,7 @@ func handleAdminTrash(c *gin.Context) {
 // handleAdminGeneral 基本设置
 func handleAdminGeneral(c *gin.Context) {
 	params := baseBEParams(c)
-	params["Title"] = "基本设置 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "基本设置 | " + cache.Ei.Blogger.BTitle
 	params["Setting"] = true
 	params["Path"] = c.Request.URL.Path
 	renderHTMLAdminLayout(c, "admin-general", params)
@@ -263,7 +232,7 @@ func handleAdminGeneral(c *gin.Context) {
 // handleAdminDiscussion 阅读设置
 func handleAdminDiscussion(c *gin.Context) {
 	params := baseBEParams(c)
-	params["Title"] = "阅读设置 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "阅读设置 | " + cache.Ei.Blogger.BTitle
 	params["Setting"] = true
 	params["Path"] = c.Request.URL.Path
 	renderHTMLAdminLayout(c, "admin-discussion", params)
@@ -274,19 +243,19 @@ func renderHTMLAdminLayout(c *gin.Context, name string, data gin.H) {
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	// special page
 	if name == "login.html" {
-		err := internal.HTMLTemplate.ExecuteTemplate(c.Writer, name, data)
+		err := htmlTmpl.ExecuteTemplate(c.Writer, name, data)
 		if err != nil {
 			panic(err)
 		}
 		return
 	}
 	buf := bytes.Buffer{}
-	err := internal.HTMLTemplate.ExecuteTemplate(&buf, name, data)
+	err := htmlTmpl.ExecuteTemplate(&buf, name, data)
 	if err != nil {
 		panic(err)
 	}
-	data["LayoutContent"] = template.HTML(buf.String())
+	data["LayoutContent"] = htemplate.HTML(buf.String())
-	err = internal.HTMLTemplate.ExecuteTemplate(c.Writer, "adminLayout.html", data)
+	err = htmlTmpl.ExecuteTemplate(c.Writer, "adminLayout.html", data)
 	if err != nil {
 		panic(err)
 	}

pkg/core/eiblog/page/fe.go

@@ -1,10 +1,11 @@
-package pages
+// Package page provides ...
+package page
 
 import (
 	"bytes"
 	"context"
 	"fmt"
-	"html/template"
+	htemplate "html/template"
 	"io"
 	"math/rand"
 	"net/http"
@@ -12,10 +13,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/eiblog/eiblog/cmd/eiblog/config"
+	"github.com/eiblog/eiblog/pkg/cache"
-	"github.com/eiblog/eiblog/cmd/eiblog/handler/internal"
+	"github.com/eiblog/eiblog/pkg/config"
-	pconfig "github.com/eiblog/eiblog/pkg/config"
+	"github.com/eiblog/eiblog/pkg/internal"
-	"github.com/eiblog/eiblog/pkg/third/disqus"
 	"github.com/eiblog/eiblog/tools"
 
 	"github.com/gin-gonic/gin"
@@ -28,22 +28,21 @@ func baseFEParams(c *gin.Context) gin.H {
 
 	cookie, err := c.Request.Cookie("v")
 	if err != nil || cookie.Value !=
-		fmt.Sprint(config.Conf.StaticVersion) {
+		fmt.Sprint(config.Conf.EiBlogApp.StaticVersion) {
-		version = config.Conf.StaticVersion
+		version = config.Conf.EiBlogApp.StaticVersion
 	}
 	return gin.H{
-		"BlogName": internal.Ei.Blogger.BlogName,
+		"BlogName": cache.Ei.Blogger.BlogName,
-		"SubTitle": internal.Ei.Blogger.SubTitle,
+		"SubTitle": cache.Ei.Blogger.SubTitle,
-		"BTitle":   internal.Ei.Blogger.BTitle,
+		"BTitle":   cache.Ei.Blogger.BTitle,
-		"BeiAn":    internal.Ei.Blogger.BeiAn,
+		"BeiAn":    cache.Ei.Blogger.BeiAn,
-		"Domain":   config.Conf.Host,
+		"Domain":   config.Conf.EiBlogApp.Host,
 		"CopyYear": time.Now().Year(),
-		"Twitter":  config.Conf.Twitter,
+		"Twitter":  config.Conf.EiBlogApp.Twitter,
-		"Qiniu":    config.Conf.Qiniu,
+		"Qiniu":    config.Conf.EiBlogApp.Qiniu,
-		"Disqus":   config.Conf.Disqus,
+		"Disqus":   config.Conf.EiBlogApp.Disqus,
-		"AdSense":  config.Conf.Google.AdSense,
+		"AdSense":  config.Conf.EiBlogApp.Google.AdSense,
 		"Version":  version,
-		"Pages":    config.Conf.Pages,
 	}
 }
 
@@ -60,16 +59,16 @@ func handleNotFound(c *gin.Context) {
 // handleHomePage 首页
 func handleHomePage(c *gin.Context) {
 	params := baseFEParams(c)
-	params["Title"] = internal.Ei.Blogger.BTitle + " | " + internal.Ei.Blogger.SubTitle
+	params["Title"] = cache.Ei.Blogger.BTitle + " | " + cache.Ei.Blogger.SubTitle
-	params["Description"] = "博客首页，" + internal.Ei.Blogger.SubTitle
+	params["Description"] = "博客首页，" + cache.Ei.Blogger.SubTitle
 	params["Path"] = c.Request.URL.Path
 	params["CurrentPage"] = "blog-home"
 	pn, err := strconv.Atoi(c.Query("pn"))
 	if err != nil || pn < 1 {
 		pn = 1
 	}
-	params["Prev"], params["Next"], params["List"] = internal.Ei.PageArticleFE(pn,
+	params["Prev"], params["Next"], params["List"] = cache.Ei.PageArticleFE(pn,
-		config.Conf.General.PageNum)
+		config.Conf.EiBlogApp.General.PageNum)
 
 	renderHTMLHomeLayout(c, "home", params)
 }
@@ -77,13 +76,13 @@ func handleHomePage(c *gin.Context) {
 // handleArticlePage 文章页
 func handleArticlePage(c *gin.Context) {
 	slug := c.Param("slug")
-	if !strings.HasSuffix(slug, ".html") || internal.Ei.ArticlesMap[slug[:len(slug)-5]] == nil {
+	if !strings.HasSuffix(slug, ".html") || cache.Ei.ArticlesMap[slug[:len(slug)-5]] == nil {
 		handleNotFound(c)
 		return
 	}
-	article := internal.Ei.ArticlesMap[slug[:len(slug)-5]]
+	article := cache.Ei.ArticlesMap[slug[:len(slug)-5]]
 	params := baseFEParams(c)
-	params["Title"] = article.Title + " | " + internal.Ei.Blogger.BTitle
+	params["Title"] = article.Title + " | " + cache.Ei.Blogger.BTitle
 	params["Path"] = c.Request.URL.Path
 	params["CurrentPage"] = "post-" + article.Slug
 	params["Article"] = article
@@ -92,21 +91,21 @@ func handleArticlePage(c *gin.Context) {
 	switch slug {
 	case "blogroll.html":
 		name = "blogroll"
-		params["Description"] = "友情连接，" + internal.Ei.Blogger.SubTitle
+		params["Description"] = "友情连接，" + cache.Ei.Blogger.SubTitle
 	case "about.html":
 		name = "about"
-		params["Description"] = "关于作者，" + internal.Ei.Blogger.SubTitle
+		params["Description"] = "关于作者，" + cache.Ei.Blogger.SubTitle
 	default:
-		params["Description"] = article.Desc + "，" + internal.Ei.Blogger.SubTitle
+		params["Description"] = article.Desc + "，" + cache.Ei.Blogger.SubTitle
 		name = "article"
-		params["Copyright"] = internal.Ei.Blogger.Copyright
+		params["Copyright"] = cache.Ei.Blogger.Copyright
 		if !article.UpdatedAt.IsZero() {
-			params["Days"] = int(time.Since(article.UpdatedAt).Hours()) / 24
+			params["Days"] = int(time.Now().Sub(article.UpdatedAt).Hours()) / 24
 		} else {
-			params["Days"] = int(time.Since(article.CreatedAt).Hours()) / 24
+			params["Days"] = int(time.Now().Sub(article.CreatedAt).Hours()) / 24
 		}
 		if article.SerieID > 0 {
-			for _, series := range internal.Ei.Series {
+			for _, series := range cache.Ei.Series {
 				if series.ID == article.SerieID {
 					params["Serie"] = series
 				}
@@ -119,65 +118,65 @@ func handleArticlePage(c *gin.Context) {
 // handleSeriesPage 专题页
 func handleSeriesPage(c *gin.Context) {
 	params := baseFEParams(c)
-	params["Title"] = "专题 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "专题 | " + cache.Ei.Blogger.BTitle
-	params["Description"] = "专题列表，" + internal.Ei.Blogger.SubTitle
+	params["Description"] = "专题列表，" + cache.Ei.Blogger.SubTitle
 	params["Path"] = c.Request.URL.Path
 	params["CurrentPage"] = "series"
-	params["Article"] = internal.Ei.PageSeries
+	params["Article"] = cache.Ei.PageSeries
 	renderHTMLHomeLayout(c, "series", params)
 }
 
 // handleArchivePage 归档页
 func handleArchivePage(c *gin.Context) {
 	params := baseFEParams(c)
-	params["Title"] = "归档 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "归档 | " + cache.Ei.Blogger.BTitle
-	params["Description"] = "博客归档，" + internal.Ei.Blogger.SubTitle
+	params["Description"] = "博客归档，" + cache.Ei.Blogger.SubTitle
 	params["Path"] = c.Request.URL.Path
 	params["CurrentPage"] = "archives"
-	params["Article"] = internal.Ei.PageArchives
+	params["Article"] = cache.Ei.PageArchives
 	renderHTMLHomeLayout(c, "archives", params)
 }
 
 // handleSearchPage 搜索页
 func handleSearchPage(c *gin.Context) {
 	params := baseFEParams(c)
-	params["Title"] = "站内搜索 | " + internal.Ei.Blogger.BTitle
+	params["Title"] = "站内搜索 | " + cache.Ei.Blogger.BTitle
-	params["Description"] = "站内搜索，" + internal.Ei.Blogger.SubTitle
+	params["Description"] = "站内搜索，" + cache.Ei.Blogger.SubTitle
 	params["Path"] = ""
 	params["CurrentPage"] = "search-post"
-	q := strings.TrimSpace(c.Query("q"))
-	params["Word"] = q
 
-	if q != "" && internal.ESClient != nil {
+	q := strings.TrimSpace(c.Query("q"))
+	if q != "" {
 		start, err := strconv.Atoi(c.Query("start"))
 		if start < 1 || err != nil {
 			start = 1
 		}
+		params["Word"] = q
 
 		vals := c.Request.URL.Query()
-		result, err := internal.ESClient.ElasticSearch(q, config.Conf.General.PageNum, start-1)
+		result, err := internal.ElasticSearch(q, config.Conf.EiBlogApp.General.PageNum, start-1)
 		if err != nil {
 			logrus.Error("HandleSearchPage.ElasticSearch: ", err)
 		} else {
 			result.Took /= 1000
 			for i, v := range result.Hits.Hits {
-				article := internal.Ei.ArticlesMap[v.Source.Slug]
+				article := cache.Ei.ArticlesMap[v.Source.Slug]
 				if len(v.Highlight.Content) == 0 && article != nil {
 					result.Hits.Hits[i].Highlight.Content = []string{article.Excerpt}
 				}
 			}
 			params["SearchResult"] = result
-			if num := start - config.Conf.General.PageNum; num > 0 {
+			if num := start - config.Conf.EiBlogApp.General.PageNum; num > 0 {
 				vals.Set("start", fmt.Sprint(num))
 				params["Prev"] = vals.Encode()
 			}
-			if num := start + config.Conf.General.PageNum; result.Hits.Total >= num {
+			if num := start + config.Conf.EiBlogApp.General.PageNum; result.Hits.Total >= num {
 				vals.Set("start", fmt.Sprint(num))
 				params["Next"] = vals.Encode()
 			}
 		}
 	} else {
-		params["HotWords"] = config.Conf.HotWords
+		params["HotWords"] = config.Conf.EiBlogApp.HotWords
 	}
 	renderHTMLHomeLayout(c, "search", params)
 }
@@ -201,11 +200,11 @@ func handleDisqusList(c *gin.Context) {
 
 	slug := c.Param("slug")
 	cursor := c.Query("cursor")
-	artc := internal.Ei.ArticlesMap[slug]
+	artc := cache.Ei.ArticlesMap[slug]
 	if artc != nil {
 		dcs.Data.Thread = artc.Thread
 	}
-	postsList, err := internal.DisqusClient.PostsList(artc, cursor)
+	postsList, err := internal.PostsList(artc, cursor)
 	if err != nil {
 		logrus.Error("hadnleDisqusList.PostsList: ", err)
 		dcs.ErrNo = 0
@@ -237,10 +236,10 @@ func handleDisqusList(c *gin.Context) {
 	if artc != nil && artc.Thread == "" {
 		if dcs.Data.Thread != "" {
 			artc.Thread = dcs.Data.Thread
-		} else if internal.DisqusClient.ThreadDetails(artc) == nil {
+		} else if internal.ThreadDetails(artc) == nil {
 			dcs.Data.Thread = artc.Thread
 		}
-		internal.Store.UpdateArticle(context.Background(), artc.ID,
+		cache.Ei.UpdateArticle(context.Background(), artc.ID,
 			map[string]interface{}{
 				"thread": artc.Thread,
 			})
@@ -254,9 +253,9 @@ func handleDisqusPage(c *gin.Context) {
 		c.String(http.StatusOK, "出错啦。。。")
 		return
 	}
-	article := internal.Ei.ArticlesMap[array[0]]
+	article := cache.Ei.ArticlesMap[array[0]]
 	params := gin.H{
-		"Title":  "发表评论 | " + internal.Ei.Blogger.BTitle,
+		"Title":  "发表评论 | " + cache.Ei.Blogger.BTitle,
 		"ATitle": article.Title,
 		"Thread": array[1],
 		"Slug":   article.Slug,
@@ -301,7 +300,7 @@ func handleDisqusCreate(c *gin.Context) {
 	}
 	logrus.Infof("email: %s comments: %s", email, thread)
 
-	comment := disqus.PostComment{
+	comment := internal.PostComment{
 		Message:     msg,
 		Parent:      c.PostForm("parent"),
 		Thread:      thread,
@@ -310,14 +309,14 @@ func handleDisqusCreate(c *gin.Context) {
 		Identifier:  identifier,
 		IPAddress:   c.ClientIP(),
 	}
-	postDetail, err := internal.DisqusClient.PostCreate(&comment)
+	postDetail, err := internal.PostCreate(&comment)
 	if err != nil {
 		logrus.Error("handleDisqusCreate.PostCreate: ", err)
 		resp.ErrNo = 1
 		resp.ErrMsg = "提交评论失败，请重试"
 		return
 	}
-	err = internal.DisqusClient.PostApprove(postDetail.Response.ID)
+	err = internal.PostApprove(postDetail.Response.ID)
 	if err != nil {
 		logrus.Error("handleDisqusCreate.PostApprove: ", err)
 		resp.ErrNo = 1
@@ -342,8 +341,8 @@ func handleBeaconPage(c *gin.Context) {
 	ua := c.Request.UserAgent()
 
 	vals := c.Request.URL.Query()
-	vals.Set("v", config.Conf.Google.V)
+	vals.Set("v", config.Conf.EiBlogApp.Google.V)
-	vals.Set("tid", config.Conf.Google.Tid)
+	vals.Set("tid", config.Conf.EiBlogApp.Google.Tid)
 	cookie, _ := c.Cookie("u")
 	vals.Set("cid", cookie)
 
@@ -355,7 +354,7 @@ func handleBeaconPage(c *gin.Context) {
 	vals.Set("_p", fmt.Sprint(201226219+rand.Intn(499999999))) // random page load hash
 	vals.Set("_ee", "1")                                       // external event
 	go func() {
-		url := config.Conf.Google.URL + "?" + vals.Encode()
+		url := config.Conf.EiBlogApp.Google.URL + "?" + vals.Encode()
 		req, err := http.NewRequest("POST", url, nil)
 		if err != nil {
 			logrus.Error("HandleBeaconPage.NewRequest: ", err)
@@ -383,61 +382,24 @@ func handleBeaconPage(c *gin.Context) {
 	c.Status(http.StatusNoContent)
 }
 
-// handleCustomPage 自定义页面
-func handleCustomPage(c *gin.Context) {
-	path := c.Request.URL.Path
-	if !strings.HasSuffix(path, ".html") {
-		handleNotFound(c)
-		return
-	}
-	// find config
-	var page *pconfig.CustomPage
-	for _, p := range config.Conf.Pages {
-		if p.Path == path {
-			page = &p
-			break
-		}
-	}
-	if page == nil {
-		handleNotFound(c)
-		return
-	}
-	var params gin.H
-	if page.IsEmbed {
-		params = baseFEParams(c)
-		params["Path"] = c.Request.URL.Path
-		params["Title"] = page.Name + " | " + internal.Ei.Blogger.SubTitle
-	}
-	// serve custom page
-	name := c.Param("path")
-	renderHTMLHomeLayout(c, name, params)
-}
-
 // renderHTMLHomeLayout homelayout html
 func renderHTMLHomeLayout(c *gin.Context, name string, data gin.H) {
 	c.Header("Content-Type", "text/html; charset=utf-8")
 	// special page
-	switch {
+	if name == "disqus.html" {
-	case name == "disqus.html":
+		err := htmlTmpl.ExecuteTemplate(c.Writer, name, data)
-		err := internal.HTMLTemplate.ExecuteTemplate(c.Writer, name, data)
-		if err != nil {
-			panic(err)
-		}
-		return
-	case data == nil:
-		err := internal.HTMLTemplate.ExecuteTemplate(c.Writer, name, nil)
 		if err != nil {
 			panic(err)
 		}
 		return
 	}
 	buf := bytes.Buffer{}
-	err := internal.HTMLTemplate.ExecuteTemplate(&buf, name, data)
+	err := htmlTmpl.ExecuteTemplate(&buf, name, data)
 	if err != nil {
 		panic(err)
 	}
-	data["LayoutContent"] = template.HTML(buf.String())
+	data["LayoutContent"] = htemplate.HTML(buf.String())
-	err = internal.HTMLTemplate.ExecuteTemplate(c.Writer, "homeLayout.html", data)
+	err = htmlTmpl.ExecuteTemplate(c.Writer, "homeLayout.html", data)
 	if err != nil {
 		panic(err)
 	}

pkg/core/eiblog/page/page.go

@@ -1,12 +1,38 @@
-package pages
+// Package page provides ...
+package page
 
 import (
+	"io/fs"
+	"path/filepath"
+	"text/template"
+
+	"github.com/eiblog/eiblog/pkg/config"
+	"github.com/eiblog/eiblog/tools"
+
 	"github.com/gin-gonic/gin"
 )
 
-// RegisterRoutesCustomPages 注册自定义页面
+// htmlTmpl html template cache
-func RegisterRoutesCustomPages(e *gin.Engine) {
+var htmlTmpl *template.Template
-	e.GET("/page/:path", handleCustomPage)
+
+func init() {
+	htmlTmpl = template.New("eiblog").Funcs(tools.TplFuncMap)
+	root := filepath.Join(config.WorkDir, "website")
+	files := tools.ReadDirFiles(root, func(fi fs.DirEntry) 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...)
+	if err != nil {
+		panic(err)
+	}
 }
 
 // RegisterRoutes register routes

pkg/core/eiblog/swag/swag.go

@@ -1,7 +1,8 @@
+// Package swag provides ...
 package swag
 
 import (
-	_ "github.com/eiblog/eiblog/cmd/eiblog/docs" // docs
+	_ "github.com/eiblog/eiblog/pkg/core/eiblog/docs" // docs
 
 	"github.com/gin-gonic/gin"
 	swaggerFiles "github.com/swaggo/files"

pkg/internal/CHANGELOG.md

@@ -0,0 +1,10 @@
+# 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.
+
+### [2.2.17](https://github.com/eiblog/eiblog/compare/v2.2.16...v2.2.17) (2025-04-22)
+
+
+### Bug Fixes
+
+* backup file auto delete ([0fe849a](https://github.com/eiblog/eiblog/commit/0fe849ae67de36f2d249e3306ac7d098bc057070))

pkg/internal/disqus.go

@@ -1,4 +1,5 @@
-package disqus
+// Package internal provides ...
+package internal
 
 import (
 	"encoding/json"
@@ -25,19 +26,13 @@ const (
 	disqusAPIKey = "E8Uh5l5fHZ6gD8U3KycjAIAk46f68Zw7C6eW8WSjZvCLXebZ7p0r1yrYDrLilk2F"
 )
 
-// DisqusClient disqus client
+func checkDisqusConfig() error {
-type DisqusClient struct {
+	if config.Conf.EiBlogApp.Disqus.ShortName != "" &&
-	Host string
+		config.Conf.EiBlogApp.Disqus.PublicKey != "" &&
-
+		config.Conf.EiBlogApp.Disqus.AccessToken != "" {
-	Conf config.Disqus
+		return nil
-}
-
-// NewDisqusClient new disqus client
-func NewDisqusClient(host string, conf config.Disqus) (*DisqusClient, error) {
-	if conf.ShortName == "" || conf.PublicKey == "" || conf.AccessToken == "" {
-		return nil, errors.New("disqus: config incompleted")
 	}
-	return &DisqusClient{Host: host, Conf: conf}, nil
+	return errors.New("disqus: config incompleted")
 }
 
 // postsCountResp 评论数量响应
@@ -51,10 +46,14 @@ type postsCountResp struct {
 }
 
 // PostsCount 获取文章评论数量
-func (cli *DisqusClient) PostsCount(articles map[string]*model.Article) error {
+func PostsCount(articles map[string]*model.Article) error {
+	if err := checkDisqusConfig(); err != nil {
+		return err
+	}
+
 	vals := url.Values{}
-	vals.Set("api_key", cli.Conf.PublicKey)
+	vals.Set("api_key", config.Conf.EiBlogApp.Disqus.PublicKey)
-	vals.Set("forum", cli.Conf.ShortName)
+	vals.Set("forum", config.Conf.EiBlogApp.Disqus.ShortName)
 	// batch get
 	var count, index int
 	for _, article := range articles {
@@ -66,7 +65,7 @@ func (cli *DisqusClient) PostsCount(articles map[string]*model.Article) error {
 			continue
 		}
 		count = 0
-		resp, err := http.DefaultClient.Get(apiPostsCount + "?" + vals.Encode())
+		resp, err := httpGet(apiPostsCount + "?" + vals.Encode())
 		if err != nil {
 			return err
 		}
@@ -128,16 +127,20 @@ type postDetail struct {
 }
 
 // PostsList 评论列表
-func (cli *DisqusClient) PostsList(article *model.Article, cursor string) (*PostsListResp, error) {
+func PostsList(article *model.Article, cursor string) (*PostsListResp, error) {
+	if err := checkDisqusConfig(); err != nil {
+		return nil, err
+	}
+
 	vals := url.Values{}
 	vals.Set("api_key", disqusAPIKey)
-	vals.Set("forum", cli.Conf.ShortName)
+	vals.Set("forum", config.Conf.EiBlogApp.Disqus.ShortName)
 	vals.Set("thread:ident", "post-"+article.Slug)
 	vals.Set("cursor", cursor)
 	vals.Set("order", "popular")
 	vals.Set("limit", "50")
 
-	resp, err := http.DefaultClient.Get(apiPostsList + "?" + vals.Encode())
+	resp, err := httpGet(apiPostsList + "?" + vals.Encode())
 	if err != nil {
 		return nil, err
 	}
@@ -178,7 +181,10 @@ type PostCreateResp struct {
 }
 
 // PostCreate 评论文章
-func (cli *DisqusClient) PostCreate(pc *PostComment) (*PostCreateResp, error) {
+func PostCreate(pc *PostComment) (*PostCreateResp, error) {
+	if err := checkDisqusConfig(); err != nil {
+		return nil, err
+	}
 	vals := url.Values{}
 	vals.Set("api_key", disqusAPIKey)
 	vals.Set("message", pc.Message)
@@ -188,14 +194,8 @@ func (cli *DisqusClient) PostCreate(pc *PostComment) (*PostCreateResp, error) {
 	vals.Set("author_name", pc.AuthorName)
 	// vals.Set("state", "approved")
 
-	req, err := http.NewRequest(http.MethodPost, apiPostCreate, strings.NewReader(vals.Encode()))
+	header := http.Header{"Referer": {"https://disqus.com"}}
-	if err != nil {
+	resp, err := httpPostHeader(apiPostCreate, vals, header)
-		return nil, err
-	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Referer", "https://disqus.com")
-
-	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return nil, err
 	}
@@ -225,19 +225,18 @@ type approvedResp struct {
 }
 
 // PostApprove 批准评论
-func (cli *DisqusClient) PostApprove(post string) error {
+func PostApprove(post string) error {
-	vals := url.Values{}
+	if err := checkDisqusConfig(); err != nil {
-	vals.Set("api_key", disqusAPIKey)
-	vals.Set("access_token", cli.Conf.AccessToken)
-	vals.Set("post", post)
-
-	req, err := http.NewRequest(http.MethodPost, apiPostApprove, strings.NewReader(vals.Encode()))
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Referer", "https://disqus.com")
-	if err != nil {
 		return err
 	}
-	resp, err := http.DefaultClient.Do(req)
+
+	vals := url.Values{}
+	vals.Set("api_key", config.Conf.EiBlogApp.Disqus.PublicKey)
+	vals.Set("access_token", config.Conf.EiBlogApp.Disqus.AccessToken)
+	vals.Set("post", post)
+
+	header := http.Header{"Referer": {"https://disqus.com"}}
+	resp, err := httpPostHeader(apiPostApprove, vals, header)
 	if err != nil {
 		return err
 	}
@@ -265,28 +264,26 @@ type threadCreateResp struct {
 }
 
 // ThreadCreate 创建thread
-func (cli *DisqusClient) ThreadCreate(article *model.Article, btitle string) error {
+func ThreadCreate(article *model.Article, btitle string) error {
+	if err := checkDisqusConfig(); err != nil {
+		return err
+	}
+
 	vals := url.Values{}
-	vals.Set("api_key", disqusAPIKey)
+	vals.Set("api_key", config.Conf.EiBlogApp.Disqus.PublicKey)
-	vals.Set("access_token", cli.Conf.AccessToken)
+	vals.Set("access_token", config.Conf.EiBlogApp.Disqus.AccessToken)
-	vals.Set("forum", cli.Conf.ShortName)
+	vals.Set("forum", config.Conf.EiBlogApp.Disqus.ShortName)
 	vals.Set("title", article.Title+" | "+btitle)
 	vals.Set("identifier", "post-"+article.Slug)
 
-	urlPath := fmt.Sprintf("https://%s/post/%s.html", cli.Host, article.Slug)
+	urlPath := fmt.Sprintf("https://%s/post/%s.html", config.Conf.EiBlogApp.Host, article.Slug)
 	vals.Set("url", urlPath)
 
-	req, err := http.NewRequest(http.MethodPost, apiThreadCreate, strings.NewReader(vals.Encode()))
+	resp, err := httpPost(apiThreadCreate, vals)
 	if err != nil {
 		return err
 	}
-	req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
-	req.Header.Set("Referer", "https://disqus.com")
 
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return err
-	}
 	b, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
@@ -314,14 +311,18 @@ type threadDetailsResp struct {
 }
 
 // ThreadDetails thread详细
-func (cli *DisqusClient) ThreadDetails(article *model.Article) error {
+func ThreadDetails(article *model.Article) error {
+	if err := checkDisqusConfig(); err != nil {
+		return err
+	}
+
 	vals := url.Values{}
-	vals.Set("api_key", disqusAPIKey)
+	vals.Set("api_key", config.Conf.EiBlogApp.Disqus.PublicKey)
-	vals.Set("access_token", cli.Conf.AccessToken)
+	vals.Set("access_token", config.Conf.EiBlogApp.Disqus.AccessToken)
-	vals.Set("forum", cli.Conf.ShortName)
+	vals.Set("forum", config.Conf.EiBlogApp.Disqus.ShortName)
 	vals.Set("thread:ident", "post-"+article.Slug)
 
-	resp, err := http.DefaultClient.Get(apiThreadDetails + "?" + vals.Encode())
+	resp, err := httpGet(apiThreadDetails + "?" + vals.Encode())
 	if err != nil {
 		return err
 	}

pkg/internal/es.go

@@ -1,4 +1,5 @@
-package es
+// Package internal provides ...
+package internal
 
 import (
 	"bytes"
@@ -11,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/eiblog/eiblog/pkg/config"
 	"github.com/eiblog/eiblog/pkg/model"
 	"github.com/eiblog/eiblog/tools"
 
@@ -27,26 +29,30 @@ const (
 	ElasticType  = "article"
 )
 
-// ESClient es client
+func init() {
-type ESClient struct {
+	if checkESConfig() != nil {
-	Host string
+		return
+	}
+
+	mappings := fmt.Sprintf(`{"mappings":{"%s":{"properties":{"content":{"analyzer":"ik_syno","search_analyzer":"ik_syno","term_vector":"with_positions_offsets","type":"string"},"date":{"index":"not_analyzed","type":"date"},"slug":{"type":"string"},"tag":{"index":"not_analyzed","type":"string"},"title":{"analyzer":"ik_syno","search_analyzer":"ik_syno","term_vector":"with_positions_offsets","type":"string"}}}}}`, "article")
+	err := createIndexAndMappings(ElasticIndex, ElasticType, []byte(mappings))
+	if err != nil {
+		panic(err)
+	}
 }
 
-// NewESClient new es client
+func checkESConfig() error {
-func NewESClient(host string) (*ESClient, error) {
+	if config.Conf.ESHost == "" {
-	if host == "" {
+		return errors.New("es: elasticsearch not config")
-		return nil, errors.New("es: elasticsearch host is empty")
 	}
-	es := &ESClient{Host: host}
+	return nil
-	err := es.createIndexAndMappings(ElasticIndex, ElasticType)
-	if err != nil {
-		return nil, err
-	}
-	return es, nil
 }
 
 // ElasticSearch 搜索文章
-func (cli *ESClient) 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
+	}
 	// 分析查询
 	var (
 		regTerm = regexp.MustCompile(`(tag|slug|date):`)
@@ -94,13 +100,17 @@ func (cli *ESClient) ElasticSearch(query string, size, from int) (*SearchIndexRe
 	// 判断是否为空，判断搜索方式
 	dsl := fmt.Sprintf("{"+SearchFilter+"}", strings.Join(filter, ","))
 	if kw != "" {
-		dsl = strings.ReplaceAll(strings.ReplaceAll(`{"highlight":{"fields":{"content":{},"title":{}},"post_tags":["\u003c/b\u003e"],"pre_tags":["\u003cb\u003e"]},"query":{"dis_max":{"queries":[{"match":{"title":{"boost":4,"minimum_should_match":"50%","query":"$1"}}},{"match":{"content":{"boost":4,"minimum_should_match":"75%","query":"$1"}}},{"match":{"tag":{"boost":2,"minimum_should_match":"100%","query":"$1"}}},{"match":{"slug":{"boost":1,"minimum_should_match":"100%","query":"$1"}}}],"tie_breaker":0.3}},$2}`, "$1", kw), "$2", fmt.Sprintf(SearchFilter, strings.Join(filter, ",")))
+		dsl = strings.Replace(strings.Replace(`{"highlight":{"fields":{"content":{},"title":{}},"post_tags":["\u003c/b\u003e"],"pre_tags":["\u003cb\u003e"]},"query":{"dis_max":{"queries":[{"match":{"title":{"boost":4,"minimum_should_match":"50%","query":"$1"}}},{"match":{"content":{"boost":4,"minimum_should_match":"75%","query":"$1"}}},{"match":{"tag":{"boost":2,"minimum_should_match":"100%","query":"$1"}}},{"match":{"slug":{"boost":1,"minimum_should_match":"100%","query":"$1"}}}],"tie_breaker":0.3}},$2}`, "$1", kw, -1), "$2", fmt.Sprintf(SearchFilter, strings.Join(filter, ",")), -1)
 	}
-	return cli.indexQueryDSL(ElasticIndex, ElasticType, size, from, []byte(dsl))
+	return indexQueryDSL(ElasticIndex, ElasticType, size, from, []byte(dsl))
 }
 
 // ElasticAddIndex 添加或更新索引
-func (cli *ESClient) ElasticAddIndex(article *model.Article) error {
+func ElasticAddIndex(article *model.Article) error {
+	if err := checkESConfig(); err != nil {
+		return err
+	}
+
 	img := tools.PickFirstImage(article.Content)
 	mapping := map[string]interface{}{
 		"title":   article.Title,
@@ -111,16 +121,20 @@ func (cli *ESClient) ElasticAddIndex(article *model.Article) error {
 		"date":    article.CreatedAt,
 	}
 	data, _ := json.Marshal(mapping)
-	return cli.indexOrUpdateDocument(ElasticIndex, ElasticType, article.ID, data)
+	return indexOrUpdateDocument(ElasticIndex, ElasticType, article.ID, data)
 }
 
 // ElasticDelIndex 删除索引
-func (cli *ESClient) ElasticDelIndex(ids []int) error {
+func ElasticDelIndex(ids []int) error {
+	if err := checkESConfig(); err != nil {
+		return err
+	}
+
 	var target []string
 	for _, id := range ids {
 		target = append(target, fmt.Sprint(id))
 	}
-	return cli.deleteIndexDocument(ElasticIndex, ElasticType, target)
+	return deleteIndexDocument(ElasticIndex, ElasticType, target)
 }
 
 // indicesCreateResult 索引创建结果
@@ -129,11 +143,9 @@ type indicesCreateResult struct {
 }
 
 // createIndexAndMappings 创建索引和映射关系
-func (cli *ESClient) createIndexAndMappings(index, typ string) error {
+func createIndexAndMappings(index, typ string, mappings []byte) error {
-	mappings := fmt.Sprintf(`{"mappings":{"%s":{"properties":{"content":{"analyzer":"ik_syno","search_analyzer":"ik_syno","term_vector":"with_positions_offsets","type":"string"},"date":{"index":"not_analyzed","type":"date"},"slug":{"type":"string"},"tag":{"index":"not_analyzed","type":"string"},"title":{"analyzer":"ik_syno","search_analyzer":"ik_syno","term_vector":"with_positions_offsets","type":"string"}}}}}`, typ)
+	rawurl := fmt.Sprintf("%s/%s/%s", config.Conf.ESHost, index, typ)
-
+	resp, err := httpHead(rawurl)
-	rawurl := fmt.Sprintf("%s/%s/%s", cli.Host, index, typ)
-	resp, err := http.DefaultClient.Head(rawurl)
 	if err != nil {
 		return err
 	}
@@ -142,13 +154,8 @@ func (cli *ESClient) createIndexAndMappings(index, typ string) error {
 		return nil
 	}
 
-	rawurl = fmt.Sprintf("%s/%s", cli.Host, index)
+	rawurl = fmt.Sprintf("%s/%s", config.Conf.ESHost, index)
-	req, err := http.NewRequest(http.MethodPut, rawurl, bytes.NewReader([]byte(mappings)))
+	resp, err = httpPut(rawurl, mappings)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	resp, err = http.DefaultClient.Do(req)
 	if err != nil {
 		return err
 	}
@@ -169,15 +176,9 @@ func (cli *ESClient) createIndexAndMappings(index, typ string) error {
 }
 
 // indexOrUpdateDocument 创建或更新索引
-func (cli *ESClient) indexOrUpdateDocument(index, typ string, id int, doc []byte) (err error) {
+func indexOrUpdateDocument(index, typ string, id int, doc []byte) (err error) {
-	rawurl := fmt.Sprintf("%s/%s/%s/%d", cli.Host, index, typ, id)
+	rawurl := fmt.Sprintf("%s/%s/%s/%d", config.Conf.ESHost, index, typ, id)
-
+	resp, err := httpPut(rawurl, doc)
-	req, err := http.NewRequest(http.MethodPut, rawurl, bytes.NewReader(doc))
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return err
 	}
@@ -204,7 +205,7 @@ type deleteIndexResult struct {
 }
 
 // deleteIndexDocument 删除文档
-func (cli *ESClient) deleteIndexDocument(index, typ string, ids []string) error {
+func deleteIndexDocument(index, typ string, ids []string) error {
 	buf := bytes.Buffer{}
 	for _, id := range ids {
 		dd := deleteIndexReq{Index: index, Type: typ, ID: id}
@@ -213,13 +214,8 @@ func (cli *ESClient) deleteIndexDocument(index, typ string, ids []string) error
 		buf.Write(b)
 		buf.WriteByte('\n')
 	}
-	rawurl := fmt.Sprintf("%s/_bulk", cli.Host)
+	rawurl := fmt.Sprintf("%s/_bulk", config.Conf.ESHost)
-	req, err := http.NewRequest(http.MethodPost, rawurl, bytes.NewReader(buf.Bytes()))
+	resp, err := httpPost(rawurl, buf.Bytes())
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	resp, err := http.DefaultClient.Do(req)
 	if err != nil {
 		return err
 	}
@@ -268,10 +264,10 @@ type SearchIndexResult struct {
 }
 
 // indexQueryDSL 语句查询文档
-func (c *ESClient) 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", c.Host,
+	rawurl := fmt.Sprintf("%s/%s/%s/_search?size=%d&from=%d", config.Conf.ESHost,
 		index, typ, size, from)
-	resp, err := http.Post(rawurl, "application/json", bytes.NewReader(dsl))
+	resp, err := httpPost(rawurl, dsl)
 	if err != nil {
 		return nil, err
 	}

pkg/internal/http.go

@@ -0,0 +1,139 @@
+// Package internal provides ...
+package internal
+
+import (
+	"bytes"
+	"crypto/tls"
+	"fmt"
+	"net"
+	"net/http"
+	"net/url"
+	"strings"
+	"time"
+)
+
+var httpClient = &http.Client{
+	Transport: &http.Transport{
+		Proxy: http.ProxyFromEnvironment,
+		DialContext: (&net.Dialer{
+			Timeout:   30 * time.Second,
+			KeepAlive: 30 * time.Second,
+			DualStack: true,
+		}).DialContext,
+		ForceAttemptHTTP2:     true,
+		MaxIdleConns:          100,
+		IdleConnTimeout:       90 * time.Second,
+		TLSHandshakeTimeout:   10 * time.Second,
+		ExpectContinueTimeout: 1 * time.Second,
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true,
+		},
+	},
+}
+
+func newRequest(method, rawurl string, data interface{}) (*http.Request, error) {
+	u, err := url.Parse(rawurl)
+	if err != nil {
+		return nil, err
+	}
+	originHost := u.Host
+	// 获取主机IP
+	host, port, err := net.SplitHostPort(u.Host)
+	if err != nil {
+		addrErr := err.(*net.AddrError)
+		if addrErr.Err != "missing port in address" {
+			return nil, err
+		}
+		// set default value
+		host = originHost
+		switch u.Scheme {
+		case "http":
+			port = "80"
+		case "https":
+			port = "443"
+		}
+	}
+	ips, err := net.LookupHost(host)
+	if err != nil {
+		return nil, err
+	}
+	if len(ips) == 0 {
+		return nil, fmt.Errorf("http: not found ip(%s)", u.Host)
+	}
+	host = net.JoinHostPort(ips[0], port)
+	u.Host = host
+	// 创建HTTP Request
+	var req *http.Request
+	switch raw := data.(type) {
+	case url.Values:
+		req, err = http.NewRequest(method, u.String(),
+			strings.NewReader(raw.Encode()))
+		req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
+	case []byte:
+		req, err = http.NewRequest(method, u.String(),
+			bytes.NewReader(raw))
+	case nil:
+		req, err = http.NewRequest(method, u.String(), nil)
+	default:
+		return nil, fmt.Errorf("http: unsupported data type: %T", data)
+	}
+	if err != nil {
+		return nil, err
+	}
+	// 设置Host
+	req.Host = originHost
+	return req, nil
+}
+
+// httpHead HTTP HEAD请求
+func httpHead(rawurl string) (*http.Response, error) {
+	req, err := newRequest(http.MethodHead, rawurl, nil)
+	if err != nil {
+		return nil, err
+	}
+	return httpClient.Do(req)
+}
+
+// httpGet HTTP GET请求
+func httpGet(rawurl string) (*http.Response, error) {
+	req, err := newRequest(http.MethodGet, rawurl, nil)
+	if err != nil {
+		return nil, err
+	}
+	// 发起请求
+	return httpClient.Do(req)
+}
+
+// httpPost HTTP POST请求, 自动识别是否是form
+func httpPost(rawurl string, data interface{}) (*http.Response, error) {
+	req, err := newRequest(http.MethodPost, rawurl, data)
+	if err != nil {
+		return nil, err
+	}
+	// 发起请求
+	return httpClient.Do(req)
+}
+
+// httpPostHeader HTTP POST请求，自定义Header
+func httpPostHeader(rawurl string, data interface{},
+	header http.Header) (*http.Response, error) {
+
+	req, err := newRequest(http.MethodPost, rawurl, data)
+	if err != nil {
+		return nil, err
+	}
+	// set header
+	req.Header = header
+	// 发起请求
+	return httpClient.Do(req)
+}
+
+// httpPut HTTP PUT请求
+func httpPut(rawurl string, data interface{}) (*http.Response, error) {
+	req, err := newRequest(http.MethodPut, rawurl, data)
+	if err != nil {
+		return nil, err
+	}
+	// 发起请求
+	return httpClient.Do(req)
+}

pkg/internal/pinger.go

@@ -1,4 +1,5 @@
-package pinger
+// Package internal provides ...
+package internal
 
 import (
 	"bytes"
@@ -13,50 +14,29 @@ import (
 	"github.com/sirupsen/logrus"
 )
 
-// Pinger pinger
-type Pinger struct {
-	Host string
-
-	Conf config.FeedRPC
-}
-
-// NewPinger new pinger
-func NewPinger(host string, conf config.FeedRPC) (*Pinger, error) {
-	if conf.FeedrURL == "" {
-		return nil, fmt.Errorf("feedr url is empty")
-	}
-	return &Pinger{Host: host, Conf: conf}, nil
-}
-
-// PingFunc ping blog article to SE
-func (p *Pinger) PingFunc(btitle, slug string) {
-	err := p.feedrPingFunc(btitle, slug)
-	if err != nil {
-		logrus.Error("pinger: PingFunc feedr: ", err)
-	}
-	err = p.rpcPingFunc(btitle, slug)
-	if err != nil {
-		logrus.Error("pinger: PingFunc: rpc: ", err)
-	}
-}
-
 // feedrPingFunc http://<your-hub-name>.superfeedr.com/
-func (p *Pinger) feedrPingFunc(btitle, slug string) error {
+var feedrPingFunc = func(btitle, slug string) error {
+	feedrHost := config.Conf.EiBlogApp.FeedRPC.FeedrURL
+	if feedrHost == "" {
+		return nil
+	}
+
 	vals := url.Values{}
 	vals.Set("hub.mode", "publish")
-	vals.Add("hub.url", fmt.Sprintf("https://%s/post/%s.html", p.Host, slug))
+	vals.Add("hub.url", fmt.Sprintf("https://%s/post/%s.html",
-	resp, err := http.DefaultClient.PostForm(p.Conf.FeedrURL, vals)
+		config.Conf.BackupApp.Host, slug))
+	resp, err := httpPost(feedrHost, vals)
 	if err != nil {
 		return err
 	}
 	defer resp.Body.Close()
-
 	data, err := io.ReadAll(resp.Body)
 	if err != nil {
 		return err
 	}
 	if resp.StatusCode != 204 {
-		return fmt.Errorf("pinger: status code: %d, %s", resp.StatusCode, string(data))
+		return fmt.Errorf("pinger: status code: %d, %s",
+			resp.StatusCode, string(data))
 	}
 	return nil
 }
@@ -81,13 +61,16 @@ type rpcValue struct {
 }
 
 // rpcPingFunc ping rpc
-func (p *Pinger) rpcPingFunc(btitle, slug string) error {
+var rpcPingFunc = func(btitle, slug string) error {
+	if len(config.Conf.EiBlogApp.FeedRPC.PingRPC) == 0 {
+		return nil
+	}
 	param := rpcPingParam{MethodName: "weblogUpdates.extendedPing"}
 	param.Params.Param = [4]rpcValue{
-		0: {Value: btitle},
+		0: rpcValue{Value: btitle},
-		1: {Value: "https://" + p.Host},
+		1: rpcValue{Value: "https://" + config.Conf.EiBlogApp.Host},
-		2: {Value: fmt.Sprintf("https://%s/post/%s.html", p.Host, slug)},
+		2: rpcValue{Value: fmt.Sprintf("https://%s/post/%s.html", config.Conf.EiBlogApp.Host, slug)},
-		3: {Value: "https://" + p.Host + "/rss.html"},
+		3: rpcValue{Value: "https://" + config.Conf.EiBlogApp.Host + "/rss.html"},
 	}
 	buf := bytes.Buffer{}
 	buf.WriteString(xml.Header)
@@ -98,15 +81,13 @@ func (p *Pinger) rpcPingFunc(btitle, slug string) error {
 	data := buf.Bytes()
 	header := http.Header{}
 	header.Set("Content-Type", "text/xml")
-
+	for _, addr := range config.Conf.EiBlogApp.FeedRPC.PingRPC {
-	for _, addr := range p.Conf.PingRPC {
+		resp, err := httpPostHeader(addr, data, header)
-		resp, err := http.DefaultClient.Post(addr, "text/xml", bytes.NewReader(data))
 		if err != nil {
 			logrus.Error("rpcPingFunc.httpPostHeader: ", err)
 			continue
 		}
 		defer resp.Body.Close()
-
 		data, err := io.ReadAll(resp.Body)
 		if err != nil {
 			logrus.Error("rpcPingFunc.ReadAll: ", err)
@@ -118,3 +99,15 @@ func (p *Pinger) rpcPingFunc(btitle, slug string) error {
 	}
 	return nil
 }
+
+// PingFunc ping blog article to SE
+func PingFunc(btitle, slug string) {
+	err := feedrPingFunc(btitle, slug)
+	if err != nil {
+		logrus.Error("pinger: PingFunc feedr: ", err)
+	}
+	err = rpcPingFunc(btitle, slug)
+	if err != nil {
+		logrus.Error("pinger: PingFunc: rpc: ", err)
+	}
+}

pkg/internal/qiniu.go

@@ -1,4 +1,5 @@
-package qiniu
+// Package internal provides ...
+package internal
 
 import (
 	"context"
@@ -14,49 +15,39 @@ import (
 	"github.com/qiniu/go-sdk/v7/storage"
 )
 
-// QiniuClient qiniu client
-type QiniuClient struct {
-	Conf config.Qiniu
-}
-
-// NewQiniuClient new qiniu client
-func NewQiniuClient(conf config.Qiniu) (*QiniuClient, error) {
-	if conf.AccessKey == "" ||
-		conf.SecretKey == "" ||
-		conf.Bucket == "" ||
-		conf.Domain == "" {
-		return nil, errors.New("qiniu config error")
-	}
-	return &QiniuClient{Conf: conf}, nil
-}
-
 // UploadParams upload params
 type UploadParams struct {
 	Name           string
 	Size           int64
 	Data           io.Reader
 	NoCompletePath bool
+
+	Conf config.Qiniu
 }
 
-// Upload 上传文件
+// QiniuUpload 上传文件
-func (cli *QiniuClient) Upload(params UploadParams) (string, error) {
+func QiniuUpload(params UploadParams) (string, error) {
+	if params.Conf.AccessKey == "" ||
+		params.Conf.SecretKey == "" {
+		return "", errors.New("qiniu config error")
+	}
 	key := params.Name
 	if !params.NoCompletePath {
 		key = filepath.Base(params.Name)
 	}
 
-	mac := qbox.NewMac(cli.Conf.AccessKey,
+	mac := qbox.NewMac(params.Conf.AccessKey,
-		cli.Conf.SecretKey)
+		params.Conf.SecretKey)
 	// 设置上传策略
 	putPolicy := &storage.PutPolicy{
-		Scope:      cli.Conf.Bucket,
+		Scope:      params.Conf.Bucket,
 		Expires:    3600,
 		InsertOnly: 1,
 	}
 	// 上传token
 	uploadToken := putPolicy.UploadToken(mac)
 	// 上传配置
-	region, err := storage.GetRegion(cli.Conf.AccessKey, cli.Conf.Bucket)
+	region, err := storage.GetRegion(params.Conf.AccessKey, params.Conf.Bucket)
 	if err != nil {
 		return "", err
 	}
@@ -74,7 +65,7 @@ func (cli *QiniuClient) Upload(params UploadParams) (string, error) {
 	if err != nil {
 		return "", err
 	}
-	url := "https://" + cli.Conf.Domain + "/" + key
+	url := "https://" + params.Conf.Domain + "/" + key
 	return url, nil
 }
 
@@ -83,19 +74,21 @@ type DeleteParams struct {
 	Name           string
 	Days           int
 	NoCompletePath bool
+
+	Conf config.Qiniu
 }
 
 // QiniuDelete 删除文件
-func (cli *QiniuClient) Delete(params DeleteParams) error {
+func QiniuDelete(params DeleteParams) error {
 	key := params.Name
 	if !params.NoCompletePath {
 		key = completeQiniuKey(params.Name)
 	}
 
-	mac := qbox.NewMac(cli.Conf.AccessKey,
+	mac := qbox.NewMac(params.Conf.AccessKey,
-		cli.Conf.SecretKey)
+		params.Conf.SecretKey)
 	// 上传配置
-	region, err := storage.GetRegion(cli.Conf.AccessKey, cli.Conf.Bucket)
+	region, err := storage.GetRegion(params.Conf.AccessKey, params.Conf.Bucket)
 	if err != nil {
 		return err
 	}
@@ -107,22 +100,24 @@ func (cli *QiniuClient) Delete(params DeleteParams) error {
 	bucketManager := storage.NewBucketManager(mac, cfg)
 	// Delete
 	if params.Days > 0 {
-		return bucketManager.DeleteAfterDays(cli.Conf.Bucket, key, params.Days)
+		return bucketManager.DeleteAfterDays(params.Conf.Bucket, key, params.Days)
 	}
-	return bucketManager.Delete(cli.Conf.Bucket, key)
+	return bucketManager.Delete(params.Conf.Bucket, key)
 }
 
 // ContentParams list params
 type ContentParams struct {
 	Prefix string
+
+	Conf config.Qiniu
 }
 
-// Content 获取文件内容
+// QiniuContent 获取文件列表
-func (cli *QiniuClient) Content(params ContentParams) ([]byte, error) {
+func QiniuContent(params ContentParams) ([]byte, error) {
-	mac := qbox.NewMac(cli.Conf.AccessKey,
+	mac := qbox.NewMac(params.Conf.AccessKey,
-		cli.Conf.SecretKey)
+		params.Conf.SecretKey)
 	// region
-	region, err := storage.GetRegion(cli.Conf.AccessKey, cli.Conf.Bucket)
+	region, err := storage.GetRegion(params.Conf.AccessKey, params.Conf.Bucket)
 	if err != nil {
 		return nil, err
 	}
@@ -133,7 +128,7 @@ func (cli *QiniuClient) Content(params ContentParams) ([]byte, error) {
 	// manager
 	bucketManager := storage.NewBucketManager(mac, cfg)
 	// list file
-	files, _, _, _, err := bucketManager.ListFiles(cli.Conf.Bucket, params.Prefix, "", "", 1)
+	files, _, _, _, err := bucketManager.ListFiles(params.Conf.Bucket, params.Prefix, "", "", 1)
 	if err != nil {
 		return nil, err
 	}
@@ -141,7 +136,7 @@ func (cli *QiniuClient) Content(params ContentParams) ([]byte, error) {
 		return nil, errors.New("no file")
 	}
 	deadline := time.Now().Add(time.Second * 60).Unix()
-	url := storage.MakePrivateURLv2(mac, "https://"+cli.Conf.Domain, files[0].Key, deadline)
+	url := storage.MakePrivateURLv2(mac, "https://"+params.Conf.Domain, files[0].Key, deadline)
 	resp, err := http.Get(url)
 	if err != nil {
 		return nil, err
@@ -156,16 +151,27 @@ func completeQiniuKey(name string) string {
 	ext := filepath.Ext(name)
 
 	switch ext {
-	case ".bmp", ".png", ".jpg", ".gif", ".ico", ".jpeg":
+	case ".bmp", ".png", ".jpg",
+		".gif", ".ico", ".jpeg":
+
 		name = "blog/img/" + name
 	case ".mov", ".mp4":
 		name = "blog/video/" + name
-	case ".go", ".js", ".css", ".cpp", ".php", ".rb", ".java",
+	case ".go", ".js", ".css",
-		".py", ".sql", ".lua", ".html", ".sh", ".xml", ".cs":
+		".cpp", ".php", ".rb",
+		".java", ".py", ".sql",
+		".lua", ".html", ".sh",
+		".xml", ".cs":
+
 		name = "blog/code/" + name
-	case ".txt", ".md", ".ini", ".yaml", ".yml", ".doc", ".ppt", ".pdf":
+	case ".txt", ".md", ".ini",
+		".yaml", ".yml", ".doc",
+		".ppt", ".pdf":
+
 		name = "blog/document/" + name
-	case ".zip", ".rar", ".tar", ".gz":
+	case ".zip", ".rar", ".tar",
+		".gz":
+
 		name = "blog/archive/" + name
 	default:
 		name = "blog/other/" + name

pkg/internal/qiniu_test.go

@@ -1,4 +1,5 @@
-package qiniu
+// Package internal provides ...
+package internal
 
 import (
 	"os"
@@ -9,16 +10,6 @@ import (
 )
 
 func TestQiniuUpload(t *testing.T) {
-	cli, err := NewQiniuClient(config.Qiniu{
-		AccessKey: os.Getenv("QINIU_ACCESSKEY"),
-		SecretKey: os.Getenv("QINIU_SECRETKEY"),
-		Bucket:    os.Getenv("QINIU_BUCKET"),
-		Domain:    os.Getenv("QINIU_DOMAIN"),
-	})
-	if err != nil {
-		t.Errorf("NewQiniuClient error = %v", err)
-		return
-	}
 
 	f, _ := os.Open("qiniu_test.go")
 	fi, _ := f.Stat()
@@ -36,11 +27,17 @@ func TestQiniuUpload(t *testing.T) {
 			Name: "test-" + time.Now().Format("200601021504059999") + ".go",
 			Size: fi.Size(),
 			Data: f,
+			Conf: config.Qiniu{
+				AccessKey: os.Getenv("QINIU_ACCESSKEY"),
+				SecretKey: os.Getenv("QINIU_SECRETKEY"),
+				Bucket:    os.Getenv("QINIU_BUCKET"),
+				Domain:    "bu.st.deepzz.com",
+			},
 		}}, false},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := cli.Upload(tt.args.params)
+			got, err := QiniuUpload(tt.args.params)
 			if (err != nil) != tt.wantErr {
 				t.Errorf("QiniuUpload() error = %v, wantErr %v", err, tt.wantErr)
 				return
@@ -51,21 +48,15 @@ func TestQiniuUpload(t *testing.T) {
 }
 
 func TestQiniuContent(t *testing.T) {
-	cli, err := NewQiniuClient(config.Qiniu{
-		AccessKey: os.Getenv("QINIU_ACCESSKEY"),
-		SecretKey: os.Getenv("QINIU_SECRETKEY"),
-		Bucket:    os.Getenv("QINIU_BUCKET"),
-		Domain:    os.Getenv("QINIU_DOMAIN"),
-	})
-	if err != nil {
-		t.Errorf("NewQiniuClient error = %v", err)
-		return
-	}
-
 	params := ContentParams{
-		Prefix: "blog/",
+		Conf: config.Qiniu{
+			AccessKey: os.Getenv("QINIU_ACCESSKEY"),
+			SecretKey: os.Getenv("QINIU_SECRETKEY"),
+			Bucket:    os.Getenv("QINIU_BUCKET"),
+			Domain:    "bu.st.deepzz.com",
+		},
 	}
-	_, err = cli.Content(params)
+	_, err := QiniuContent(params)
 	if err != nil {
 		t.Errorf("QiniuList error = %v", err)
 	}

pkg/mid/language.go

@@ -0,0 +1,55 @@
+// Package mid provides ...
+package mid
+
+import (
+	"strings"
+
+	"github.com/gin-gonic/gin"
+)
+
+// LangOpts 语言选项
+type LangOpts struct {
+	CookieName string
+	Default    string
+	Supported  []string
+}
+
+// isExist language
+func (opts LangOpts) isExist(l string) bool {
+	for _, v := range opts.Supported {
+		if v == l {
+			return true
+		}
+	}
+	return false
+}
+
+// LangMiddleware set language
+func LangMiddleware(opts LangOpts) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		lang, err := c.Cookie(opts.CookieName)
+		// found cookie
+		if err == nil {
+			c.Set(opts.CookieName, lang)
+			return
+		}
+		// set cookie
+		al := strings.ToLower(c.GetHeader("Accept-Language"))
+		if al != "" {
+			// choose default if not supported
+			lang = opts.Default
+
+			langs := strings.Split(al, ",")
+			for _, v := range langs {
+				if opts.isExist(v) {
+					lang = v
+					break
+				}
+			}
+		} else {
+			lang = opts.Default
+		}
+		c.SetCookie(opts.CookieName, lang, 86400*365, "/", "", false, false)
+		c.Set(opts.CookieName, lang)
+	}
+}

pkg/mid/session.go

@@ -0,0 +1,34 @@
+// Package mid provides ...
+package mid
+
+import (
+	"github.com/gin-contrib/sessions"
+	"github.com/gin-contrib/sessions/cookie"
+	"github.com/gin-gonic/gin"
+)
+
+// SessionOpts 设置选项
+type SessionOpts struct {
+	Name   string
+	Secure bool   // required
+	Secret []byte // required
+	// redis store
+	RedisAddr string
+	RedisPwd  string
+}
+
+// SessionMiddleware session中间件
+func SessionMiddleware(opts SessionOpts) gin.HandlerFunc {
+	store := cookie.NewStore(opts.Secret)
+	store.Options(sessions.Options{
+		MaxAge:   86400 * 30,
+		Path:     "/",
+		Secure:   opts.Secure,
+		HttpOnly: true,
+	})
+	name := "SESSIONID"
+	if opts.Name != "" {
+		name = opts.Name
+	}
+	return sessions.Sessions(name, store)
+}

pkg/mid/u.go

@@ -0,0 +1,18 @@
+// Package mid provides ...
+package mid
+
+import (
+	"github.com/gin-gonic/gin"
+	uuid "github.com/satori/go.uuid"
+)
+
+// UserMiddleware 用户cookie标记
+func UserMiddleware() gin.HandlerFunc {
+	return func(c *gin.Context) {
+		cookie, err := c.Cookie("u")
+		if err != nil || cookie == "" {
+			u1 := uuid.NewV4().String()
+			c.SetCookie("u", u1, 86400*730, "/", "", true, true)
+		}
+	}
+}

pkg/middleware/session.go

@@ -1,88 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-
-	"github.com/gin-contrib/sessions"
-	"github.com/gin-contrib/sessions/cookie"
-	"github.com/gin-gonic/gin"
-	uuid "github.com/satori/go.uuid"
-)
-
-// SessionOpts 设置选项
-type SessionOpts struct {
-	Name   string
-	Secure bool   // required
-	Secret []byte // required
-	// redis store
-	RedisAddr string
-	RedisPwd  string
-}
-
-// SessionMiddleware session中间件
-func SessionMiddleware(opts SessionOpts) gin.HandlerFunc {
-	store := cookie.NewStore(opts.Secret)
-	store.Options(sessions.Options{
-		MaxAge:   86400 * 30,
-		Path:     "/",
-		Secure:   opts.Secure,
-		HttpOnly: true,
-	})
-	name := "SESSIONID"
-	if opts.Name != "" {
-		name = opts.Name
-	}
-	return sessions.Sessions(name, store)
-}
-
-// UserMiddleware 用户cookie标记
-func UserMiddleware() gin.HandlerFunc {
-	return func(c *gin.Context) {
-		cookie, err := c.Cookie("u")
-		if err != nil || cookie == "" {
-			u1 := uuid.NewV4().String()
-			c.SetCookie("u", u1, 86400*730, "/", "", true, true)
-		}
-	}
-}
-
-// AuthFilter auth filter
-func AuthFilter(c *gin.Context) {
-	if !IsLogined(c) {
-		c.Abort()
-		c.Status(http.StatusUnauthorized)
-		c.Redirect(http.StatusFound, "/admin/login")
-		return
-	}
-
-	c.Next()
-}
-
-// SetLogin login user
-func SetLogin(c *gin.Context, username string) {
-	session := sessions.Default(c)
-	session.Set("username", username)
-	session.Save()
-}
-
-// SetLogout logout user
-func SetLogout(c *gin.Context) {
-	session := sessions.Default(c)
-	session.Delete("username")
-	session.Save()
-}
-
-// IsLogined account logined
-func IsLogined(c *gin.Context) bool {
-	return GetUsername(c) != ""
-}
-
-// GetUsername get logined account
-func GetUsername(c *gin.Context) string {
-	session := sessions.Default(c)
-	username := session.Get("username")
-	if username == nil {
-		return ""
-	}
-	return username.(string)
-}

pkg/model/account.go

@@ -7,12 +7,11 @@ import "time"
 
 // Account 博客账户
 type Account struct {
-	Username        string `gorm:"column:username;primaryKey" bson:"username"`        // 用户名
+	Username string `gorm:"column:username;primaryKey" bson:"username"` // 用户名
-	Password        string `gorm:"column:password;not null" bson:"password"`          // 密码
+	Password string `gorm:"column:password;not null" bson:"password"`   // 密码
-	Email           string `gorm:"column:email;not null" bson:"email"`                // 邮件地址
+	Email    string `gorm:"column:email;not null" bson:"email"`         // 邮件地址
-	PhoneN          string `gorm:"column:phone_n;not null" bson:"phone_n"`            // 手机号
+	PhoneN   string `gorm:"column:phone_n;not null" bson:"phone_n"`     // 手机号
-	Address         string `gorm:"column:address;not null" bson:"address"`            // 地址信息
+	Address  string `gorm:"column:address;not null" bson:"address"`     // 地址信息
-	TwoFactorSecret string `gorm:"column:two_factor_secret" bson:"two_factor_secret"` // 两步验证密钥
 
 	LogoutAt  time.Time `gorm:"column:logout_at;not null" bson:"logout_at"`                    // 登出时间
 	LoginIP   string    `gorm:"column:login_ip;not null" bson:"login_ip"`                      // 最近登录IP

scripts/dist_tar.sh

@@ -5,21 +5,17 @@ set -e
 _tag="$1"
 _arch=$(go env GOARCH)
 
-for file in cmd/*; do
+for file in pkg/core/*; do
-  # Skip if not a directory
-  if [ ! -d "$file" ]; then
-    continue
-  fi
-
   app="$(basename $file)";
   # tar platform
   for os in linux darwin windows; do
     _target="$app-$_tag.$os-$_arch.tar.gz"
-    GOOS=$os GOARCH=$_arch scripts/run_build.sh $app
+    GOOS=$os GOARCH=$_arch \
-
+      go build -tags prod -ldflags '-extldflags "-static"' -o backend "./cmd/$app"
-    # Create tar with flattened structure using -C parameter
+    if [ "$app" = "eiblog" ]; then
-    tar czf "$_target" \
+      tar czf $_target conf website assets backend
-      CHANGELOG.md LICENSE README.md \
+    else
-      -C "./cmd/$app" etc backend
+      tar czf $_target conf backend
+    fi
   done
 done

scripts/run_app.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env sh
 
-cd cmd/$1 && go run main.go
+go run cmd/$1/main.go