Merge pull request #16 from go-admin-team/dev

依赖拆分

go.mod

@@ -7,30 +7,19 @@ require (
 	github.com/bitly/go-simplejson v0.5.0
 	github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 // indirect
 	github.com/bsm/redislock v0.5.0
-	github.com/casbin/casbin/v2 v2.24.0
-	github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd
-	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/fsnotify/fsnotify v1.4.7
 	github.com/ghodss/yaml v1.0.0
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-admin-team/gorm-adapter/v3 v3.2.1-0.20210310135230-1608cc35b95b
-	github.com/go-playground/validator/v10 v10.2.0
 	github.com/go-redis/redis/v7 v7.4.0
 	github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0
 	github.com/golang/protobuf v1.4.2
 	github.com/google/uuid v1.1.2
-	github.com/gorilla/websocket v1.4.2
 	github.com/imdario/mergo v0.3.9
-	github.com/mojocn/base64Captcha v1.3.1
 	github.com/pkg/errors v0.9.1
-	github.com/robfig/cron/v3 v3.0.1
 	github.com/robinjoseph08/redisqueue/v2 v2.1.0
-	github.com/satori/go.uuid v1.2.0
-	github.com/shamsher31/goimgext v1.0.0
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
 	github.com/smartystreets/goconvey v1.6.4
 	github.com/spf13/cast v1.3.1
-	go.uber.org/zap v1.10.0
 	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
 	golang.org/x/image v0.0.0-20210220032944-ac19c3e999fb // indirect
 	google.golang.org/protobuf v1.25.0

plugins/logger/logrus/go.mod

@@ -3,7 +3,7 @@ module github.com/go-admin-team/go-admin-core/plugins/logger/logrus
 go 1.14
 
 require (
-	github.com/go-admin-team/go-admin-core v1.3.0-rc.2
+	github.com/go-admin-team/go-admin-core 40bb8878c4c00555fe2c38f16914712eab4d41ed
 	github.com/sirupsen/logrus v1.8.0
 )
 

plugins/logger/zap/go.mod

@@ -0,0 +1,10 @@
+module github.com/go-admin-team/go-admin-core/plugins/logger/zap
+
+go 1.14
+
+require (
+	github.com/go-admin-team/go-admin-core 40bb8878c4c00555fe2c38f16914712eab4d41ed
+	go.uber.org/zap v1.10.0
+)
+
+replace github.com/go-admin-team/go-admin-core => ../../../

sdk/go.mod

@@ -0,0 +1,24 @@
+module github.com/go-admin-team/go-admin-core/sdk
+
+go 1.14
+
+require (
+	github.com/bsm/redislock v0.5.0
+	github.com/casbin/casbin/v2 v2.24.0
+	github.com/chanxuehong/wechat v0.0.0-20201110083048-0180211b69fd
+	github.com/dgrijalva/jwt-go v3.2.0+incompatible
+	github.com/gin-gonic/gin v1.6.3
+	github.com/go-admin-team/go-admin-core 40bb8878c4c00555fe2c38f16914712eab4d41ed
+	github.com/go-admin-team/gorm-adapter/v3 v3.2.1-0.20210310135230-1608cc35b95b
+	github.com/go-redis/redis/v7 v7.4.0
+	github.com/google/uuid v1.1.2
+	github.com/gorilla/websocket v1.4.2
+	github.com/mojocn/base64Captcha v1.3.1
+	github.com/robfig/cron/v3 v3.0.1
+	github.com/robinjoseph08/redisqueue/v2 v2.1.0
+	github.com/shamsher31/goimgext v1.0.0
+	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9
+	gorm.io/gorm v1.21.6
+)
+
+replace github.com/go-admin-team/go-admin-core => ../

sdk/pkg/utils/utils.go

@@ -4,11 +4,12 @@ import (
 	"crypto/md5"
 	"encoding/base64"
 	"encoding/hex"
-	uuid "github.com/satori/go.uuid"
 	"io/ioutil"
 	"os"
 	"strings"
 	"time"
+
+	"github.com/google/uuid"
 )
 
 func Hmac(data string) string {
@@ -22,7 +23,7 @@ func IsStringEmpty(str string) bool {
 }
 
 func GetUUID() string {
-	u := uuid.NewV4()
+	u := uuid.New()
 	return strings.ReplaceAll(u.String(), "-", "")
 }