🎨 Improve project directory structure

.gitignore

@@ -1,2 +1,3 @@
 files/
 log/
+.vendor/

.travis.yml

@@ -3,7 +3,7 @@ services:
   - docker
 language: go
 go:
-  - 1.10.3
+  - 1.11.2
 install: true
 
 before_install:
@@ -19,8 +19,8 @@ script:
 
 branches:
   only:
-  # - deploy
-  - master
+  - deploy
+  # - master
 addons:
   ssh_known_hosts:
   - 118.24.155.105

handler/handler.go → api/api.go

@@ -1,4 +1,4 @@
-package handler
+package api
 
 import (
 	"net/http"

handler/qiniu/create-file.go → api/qiniu/create-file.go

@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"github.com/gin-gonic/gin"
-	. "github.com/jweboy/api-server/handler"
+	. "github.com/jweboy/api-server/api"
 	"github.com/jweboy/api-server/model"
 	"github.com/jweboy/api-server/pkg/errno"
 	"github.com/qiniu/api.v7/storage"
@@ -25,6 +25,7 @@ import (
 func UploadFile(c *gin.Context) {
 	// TODO: 文件大小需要作限制
 	// TODO: 请求参数校验整理
+	// TODO: 文件上传改为字节或者数据 https://gist.github.com/ZenGround0/49e4a1aa126736f966a1dfdcb84abdae
 
 	bucket := c.Param("bucket")
 	if bucket == "" {

handler/qiniu/delete-file.go → api/qiniu/delete-file.go

@@ -4,15 +4,19 @@ import (
 	"fmt"
 	"strconv"
 
+	"github.com/jweboy/api-server/pkg/setting"
+
 	"github.com/gin-gonic/gin"
-	. "github.com/jweboy/api-server/handler"
+	. "github.com/jweboy/api-server/api"
 	"github.com/jweboy/api-server/model"
 	"github.com/jweboy/api-server/pkg/errno"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
 	log "qiniupkg.com/x/log.v7"
 )
 
+// TODO: 请求字段比较繁琐需要优化
+
 // Query 删除文件Query请求参数
 type Query struct {
 	Bucket string `form:"bucket"`
@@ -41,8 +45,10 @@ func DeleteFile(c *gin.Context) {
 	}
 
 	// 删除七牛云指定文件
-	accessKey, secretKey := getKeys()
-	mac := qbox.NewMac(accessKey, secretKey)
+	mac := qbox.NewMac(
+		setting.QiniuSetting.AccessKey,
+		setting.QiniuSetting.SecretKey,
+	)
 	cfg := storage.Config{}
 	bucketManager := storage.NewBucketManager(mac, &cfg)
 	if err := bucketManager.Delete(query.Bucket, query.Name); err != nil {

handler/qiniu/list-bucket.go → api/qiniu/list-bucket.go

@@ -1,8 +1,12 @@
 package qiniu
 
 import (
+	"fmt"
+
+	"github.com/jweboy/api-server/pkg/setting"
+
 	"github.com/gin-gonic/gin"
-	. "github.com/jweboy/api-server/handler"
+	. "github.com/jweboy/api-server/api"
 	"github.com/jweboy/api-server/pkg/errno"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
@@ -17,11 +21,11 @@ import (
 // @Router /qiniu/bucket [get]
 // @Success 200 {object} handler.Response "{"code":0,"message":"ok", "data": []}"
 func ListBucket(c *gin.Context) {
-	// get keys
-	accessKey, secretKey := getKeys()
-
 	// new qbox mac
-	mac := qbox.NewMac(accessKey, secretKey)
+	mac := qbox.NewMac(
+		setting.QiniuSetting.AccessKey,
+		setting.QiniuSetting.SecretKey,
+	)
 
 	// set default storage config => default http
 	cfg := storage.Config{}
@@ -34,6 +38,7 @@ func ListBucket(c *gin.Context) {
 	buckets, err := bucketManger.Buckets(true)
 
 	if err != nil {
+		fmt.Print(err, accessKey, secretKey)
 		SendResponse(c, errno.ErrListBucketError, nil)
 		return
 	}

handler/qiniu/list-file.go → api/qiniu/list-file.go

@@ -2,7 +2,7 @@ package qiniu
 
 import (
 	"github.com/gin-gonic/gin"
-	. "github.com/jweboy/api-server/handler"
+	. "github.com/jweboy/api-server/api"
 	"github.com/jweboy/api-server/model"
 	"github.com/jweboy/api-server/pkg/errno"
 )

handler/qiniu/qiniu.go → api/qiniu/qiniu.go

@@ -1,21 +1,28 @@
 package qiniu
 
 import (
+	"github.com/jweboy/api-server/pkg/setting"
 	"github.com/qiniu/api.v7/auth/qbox"
 	"github.com/qiniu/api.v7/storage"
-	"github.com/spf13/viper"
+)
+
+var (
+	accessKey = setting.QiniuSetting.AccessKey
+	secretKey = setting.QiniuSetting.SecretKey
+	AccessKey = setting.QiniuSetting.AccessKey
+	// secretKey = setting.QiniuSetting.SecretKey
 )
 
 func getKeys() (string, string) {
-	accessKey := viper.GetString("qiniu.accessKey")
-	secretKey := viper.GetString("qiniu.secretKey")
 	return accessKey, secretKey
 }
 
 func getToken(bucket string) string {
-	accessKey, secretKey := getKeys()
 	// get mac
-	mac := qbox.NewMac(accessKey, secretKey)
+	mac := qbox.NewMac(
+		setting.QiniuSetting.AccessKey,
+		setting.QiniuSetting.SecretKey,
+	)
 	// get policy
 	putPolicy := storage.PutPolicy{
 		Scope: bucket,

conf/app.ini

@@ -0,0 +1,26 @@
+[app]
+PageSize = 10
+
+
+[server]
+# debug or release
+RunMode = debug
+HTTPPort = 4000
+ReadTimeout = 60
+WriteTimeout = 60
+
+[database]
+Type = mysql
+User = jl
+Password = Jl940630.
+Host = 118.24.155.105:3306
+Name = dev_db
+TablePrefix = blog_
+Gormlog = true
+SetMaxOpenConns = 2000
+SetMaxIdleConns = 0
+
+[qiniu]
+AccessKey = KgNS98Sj66CuXFi64xNHs11vfrO8iXmX8Zcht-Id
+SecretKey = gohLJusvDqZcwwYaL_DcF-KeTDX65zDdEzaEyayP
+Expires = 7200