Merge remote-tracking branch 'origin/master' into pgsqlDevelop

# Conflicts:
#	server/initialize/router.go
#	server/middleware/cors.go

server/middleware/email.go

@@ -1,12 +1,13 @@
 package middleware
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/plugin/email/utils"
-	utils2 "github.com/flipped-aurora/gin-vue-admin/server/utils"
 	"io/ioutil"
 	"strconv"
 	"time"
 
+	"github.com/flipped-aurora/gin-vue-admin/server/plugin/email/utils"
+	utils2 "github.com/flipped-aurora/gin-vue-admin/server/utils"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/service"

server/middleware/jwt.go

@@ -1,10 +1,11 @@
 package middleware
 
 import (
-	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 	"strconv"
 	"time"
 
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/common/response"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"

server/middleware/limit_ip.go

@@ -48,10 +48,8 @@ func DefaultCheckOrMark(key string, expire int, limit int) (err error) {
 	}
 	if err = SetLimitWithTime(key, limit, time.Duration(expire)*time.Second); err != nil {
 		global.GVA_LOG.Error("limit", zap.Error(err))
-
 	}
 	return err
-
 }
 
 func DefaultLimit() gin.HandlerFunc {
@@ -76,7 +74,7 @@ func SetLimitWithTime(key string, limit int, expiration time.Duration) error {
 		_, err = pipe.Exec(context.Background())
 		return err
 	} else {
-		//次数
+		// 次数
 		if times, err := global.GVA_REDIS.Get(context.Background(), key).Int(); err != nil {
 			return err
 		} else {

server/middleware/loadtls.go

@@ -2,6 +2,7 @@ package middleware
 
 import (
 	"fmt"
+
 	"github.com/gin-gonic/gin"
 	"github.com/unrolled/secure"
 )

server/middleware/operation.go

@@ -2,12 +2,13 @@ package middleware
 
 import (
 	"bytes"
-	"github.com/flipped-aurora/gin-vue-admin/server/utils"
 	"io/ioutil"
 	"net/http"
 	"strconv"
 	"time"
 
+	"github.com/flipped-aurora/gin-vue-admin/server/utils"
+
 	"github.com/flipped-aurora/gin-vue-admin/server/global"
 	"github.com/flipped-aurora/gin-vue-admin/server/model/system"
 	"github.com/flipped-aurora/gin-vue-admin/server/service"