chore(release): 2.1.5

qiniu upload remove zone, support all zone upload

.github/workflows/release.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   package:
-    runs-on: ubuntu-16.04
+    runs-on: self-hosted
     steps:
     - name: Golang env
       uses: actions/setup-go@v2
@@ -35,9 +35,13 @@ jobs:
         password: ${{ secrets.DOCKER_PASSWORD }}
         username: ${{ secrets.DOCKER_USERNAME }}
     - name: Build image
+      env:
+        GOPROXY: https://goproxy.io,direct
       run: scripts/run_build.sh deepzz0 ${{ steps.vars.outputs.tag }}
 
     - name: Package tar
+      env:
+        GOPROXY: https://goproxy.io,direct
       run: scripts/dist_tar.sh ${{ steps.vars.outputs.tag }}
     - name: Release push
       uses: softprops/action-gh-release@v1

CHANGELOG.md

@@ -2,6 +2,38 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.1.5](https://github.com/eiblog/eiblog/compare/v2.1.4...v2.1.5) (2021-10-27)
+
+
+### Bug Fixes
+
+* **release:** golang env ([4f6f85a](https://github.com/eiblog/eiblog/commit/4f6f85a85ae56849c49e91d76bbbce1790f16e29))
+
+### [2.1.4](https://github.com/eiblog/eiblog/compare/v2.1.3...v2.1.4) (2021-10-26)
+
+
+### Bug Fixes
+
+* **release:** github action runner ([82fba0d](https://github.com/eiblog/eiblog/commit/82fba0ddb47c1f66cb659f775c120c08dd2b4447))
+
+### [2.1.4](https://github.com/eiblog/eiblog/compare/v2.1.3...v2.1.4) (2021-10-26)
+
+
+### Bug Fixes
+
+* **release:** github action runner ([82fba0d](https://github.com/eiblog/eiblog/commit/82fba0ddb47c1f66cb659f775c120c08dd2b4447))
+
+### [2.1.3](https://github.com/eiblog/eiblog/compare/v2.1.2...v2.1.3) (2021-10-15)
+
+
+### Bug Fixes
+
+* **auto_save:** fix auto save return empty id ([cfaa25e](https://github.com/eiblog/eiblog/commit/cfaa25e1239aba580e0718d40f1a2bf31158b217))
+* backup app judge db driver ([78f5bfc](https://github.com/eiblog/eiblog/commit/78f5bfc1ce017bf77a7442f40963a706e608df51))
+* **pwd:** fix init pwd ([7d04b8f](https://github.com/eiblog/eiblog/commit/7d04b8f5c0846bcd0c7e07d0fc3704a535f6360a))
+
+### [2.1.2](https://github.com/eiblog/eiblog/compare/v2.1.1...v2.1.2) (2021-07-27)
+
 ### [2.1.1](https://github.com/eiblog/eiblog/compare/v2.1.0...v2.1.1) (2021-07-27)
 
 

README.md

@@ -29,7 +29,7 @@ $ docker run --name mongodb \
 
 $ docker run --name elasticsearch \
     -p 9200:9200 \
-    -p ${PWD}/esdata:/usr/share/elasticsearch/data \
+    -v ${PWD}/esdata:/usr/share/elasticsearch/data \
     deepzz0/elasticsearch:2.4.1
 ```
 

conf/app.yml

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

pkg/cache/cache.go

@@ -443,7 +443,7 @@ func (c *Cache) loadOrInit() error {
 		}
 	}
 	// account
-	pwd := tools.EncryptPasswd(blogapp.Account.Password,
+	pwd := tools.EncryptPasswd(blogapp.Account.Username,
 		blogapp.Account.Password)
 
 	account := &model.Account{

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

@@ -18,7 +18,7 @@ type Storage struct{}
 
 // BackupData implements timer.Storage
 func (s Storage) BackupData(now time.Time) error {
-	switch config.Conf.Database.Source {
+	switch config.Conf.Database.Driver {
 	case "mongodb":
 		return backupFromMongoDB(now)
 	default:

pkg/core/eiblog/admin/admin.go

@@ -283,6 +283,9 @@ func handleAPIPostCreate(c *gin.Context) {
 			logrus.Error("handleAPIPostCreate.AddArticle: ", err)
 			return
 		}
+
+		cid = article.ID
+
 		if !article.IsDraft {
 			// 异步执行，快
 			go func() {

pkg/internal/qiniu.go

@@ -42,7 +42,6 @@ func QiniuUpload(params UploadParams) (string, error) {
 	uploadToken := putPolicy.UploadToken(mac)
 	// 上传配置
 	cfg := &storage.Config{
-		Zone:     &storage.ZoneHuadong,
 		UseHTTPS: true,
 	}
 	// uploader

pkg/internal/qiniu_test.go

@@ -0,0 +1,47 @@
+// Package internal provides ...
+package internal
+
+import (
+	"os"
+	"testing"
+	"time"
+
+	"github.com/eiblog/eiblog/pkg/config"
+)
+
+func TestQiniuUpload(t *testing.T) {
+
+	f, _ := os.Open("qiniu_test.go")
+	fi, _ := f.Stat()
+
+	type args struct {
+		params UploadParams
+	}
+	tests := []struct {
+		name    string
+		args    args
+		wantErr bool
+	}{
+		// TODO: Add test cases.
+		{"1", args{params: UploadParams{
+			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"),
+			},
+		}}, false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got, err := QiniuUpload(tt.args.params)
+			if (err != nil) != tt.wantErr {
+				t.Errorf("QiniuUpload() error = %v, wantErr %v", err, tt.wantErr)
+				return
+			}
+			t.Logf("QiniuUpload() = %v", got)
+		})
+	}
+}

scripts/run_build.sh

@@ -1,7 +1,5 @@
 #!/usr/bin/env sh
 
-set -e
-
 _registry="$1"
 _tag="$2"
 _platform="linux/amd64,linux/arm64,linux/386"
@@ -11,11 +9,14 @@ if [ -z "$_registry" ] || [ -z "$_tag" ]; then
   exit 0;
 fi
 
+# create and use builder
+docker buildx inspect builder >/dev/null 2>&1
+if [ "$?" != "0" ]; then
+  docker buildx create --use --name builder
+fi
+
 # prepare dir ./bin
 mkdir -p ./bin
-# create builder
-docker buildx create --use --name builder
-
 # build demo app
 for file in pkg/core/*; do
   app="$(basename $file)";