diff --git a/app/controller/test/test.go b/app/controller/test/test.go index d38b2277..a1c219cb 100644 --- a/app/controller/test/test.go +++ b/app/controller/test/test.go @@ -3,10 +3,10 @@ package test import ( "fmt" "github.com/gin-gonic/gin" - "go-gin-api/app/util/aes" - "go-gin-api/app/util/md5" + "github.com/xinliangnote/go-util/aes" + "github.com/xinliangnote/go-util/md5" + "github.com/xinliangnote/go-util/rsa" "go-gin-api/app/util/response" - "go-gin-api/app/util/rsa" "time" ) diff --git a/app/route/middleware/exception/exception.go b/app/route/middleware/exception/exception.go index e5eb5ec1..74dbdf8b 100644 --- a/app/route/middleware/exception/exception.go +++ b/app/route/middleware/exception/exception.go @@ -3,10 +3,10 @@ package exception import ( "fmt" "github.com/gin-gonic/gin" + "github.com/xinliangnote/go-util/mail" + "github.com/xinliangnote/go-util/time" "go-gin-api/app/config" - "go-gin-api/app/util/mail" "go-gin-api/app/util/response" - "go-gin-api/app/util/time" "runtime/debug" "strings" ) diff --git a/app/route/middleware/logger/logger.go b/app/route/middleware/logger/logger.go index 86772cf8..db8abe43 100644 --- a/app/route/middleware/logger/logger.go +++ b/app/route/middleware/logger/logger.go @@ -5,10 +5,10 @@ import ( "encoding/json" "fmt" "github.com/gin-gonic/gin" + jsonUtil "github.com/xinliangnote/go-util/json" + "github.com/xinliangnote/go-util/time" "go-gin-api/app/config" - jsonUtil "go-gin-api/app/util/json" "go-gin-api/app/util/response" - "go-gin-api/app/util/time" "log" "os" ) diff --git a/app/route/middleware/requestid/requestid.go b/app/route/middleware/requestid/requestid.go index 1d931d6e..bd0902bc 100644 --- a/app/route/middleware/requestid/requestid.go +++ b/app/route/middleware/requestid/requestid.go @@ -2,7 +2,7 @@ package requestid import ( "github.com/gin-gonic/gin" - "go-gin-api/app/util/uuid" + "github.com/xinliangnote/go-util/uuid" ) func SetUp() gin.HandlerFunc { diff --git a/app/route/middleware/sign/aes/aes.go b/app/route/middleware/sign/aes/aes.go index 65b5eeae..83074276 100644 --- a/app/route/middleware/sign/aes/aes.go +++ b/app/route/middleware/sign/aes/aes.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/xinliangnote/go-util/aes" + timeUtil "github.com/xinliangnote/go-util/time" "go-gin-api/app/config" - "go-gin-api/app/util/aes" "go-gin-api/app/util/response" - timeUtil "go-gin-api/app/util/time" "net/url" "sort" "strconv" diff --git a/app/route/middleware/sign/md5/md5.go b/app/route/middleware/sign/md5/md5.go index 74ccbc51..b5522e54 100644 --- a/app/route/middleware/sign/md5/md5.go +++ b/app/route/middleware/sign/md5/md5.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/xinliangnote/go-util/md5" + timeUtil "github.com/xinliangnote/go-util/time" "go-gin-api/app/config" - "go-gin-api/app/util/md5" "go-gin-api/app/util/response" - timeUtil "go-gin-api/app/util/time" "net/url" "sort" "strconv" diff --git a/app/route/middleware/sign/rsa/rsa.go b/app/route/middleware/sign/rsa/rsa.go index ad5147be..c1a14217 100644 --- a/app/route/middleware/sign/rsa/rsa.go +++ b/app/route/middleware/sign/rsa/rsa.go @@ -4,10 +4,10 @@ import ( "errors" "fmt" "github.com/gin-gonic/gin" + "github.com/xinliangnote/go-util/rsa" + timeUtil "github.com/xinliangnote/go-util/time" "go-gin-api/app/config" "go-gin-api/app/util/response" - "go-gin-api/app/util/rsa" - timeUtil "go-gin-api/app/util/time" "net/url" "sort" "strconv" diff --git a/app/util/error/error.go b/app/util/error/error.go index c9e5daf9..1114489b 100644 --- a/app/util/error/error.go +++ b/app/util/error/error.go @@ -2,11 +2,11 @@ package error import ( "fmt" + "github.com/xinliangnote/go-util/json" + "github.com/xinliangnote/go-util/mail" + timeUtil "github.com/xinliangnote/go-util/time" "go-gin-api/app/config" "go-gin-api/app/route/middleware/exception" - "go-gin-api/app/util/json" - "go-gin-api/app/util/mail" - timeUtil "go-gin-api/app/util/time" "log" "os" "runtime/debug" diff --git a/app/util/grpc_log/grpc_log.go b/app/util/grpc_log/grpc_log.go index 9cb77cba..58dedb14 100644 --- a/app/util/grpc_log/grpc_log.go +++ b/app/util/grpc_log/grpc_log.go @@ -3,9 +3,9 @@ package grpc_log import ( "context" "fmt" + "github.com/xinliangnote/go-util/json" + "github.com/xinliangnote/go-util/time" "go-gin-api/app/config" - "go-gin-api/app/util/json" - "go-gin-api/app/util/time" "google.golang.org/grpc" "log" "os" diff --git a/go.mod b/go.mod index 9f1a300c..fc58be7e 100644 --- a/go.mod +++ b/go.mod @@ -9,16 +9,17 @@ require ( github.com/go-playground/locales v0.12.1 // indirect github.com/go-playground/universal-translator v0.16.0 // indirect github.com/golang/protobuf v1.3.2 - github.com/google/uuid v1.1.1 + github.com/google/uuid v1.1.1 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 github.com/leodido/go-urn v1.1.0 // indirect github.com/opentracing/opentracing-go v1.1.0 github.com/uber-go/atomic v1.4.0 // indirect github.com/uber/jaeger-client-go v2.18.1+incompatible github.com/uber/jaeger-lib v2.1.1+incompatible // indirect + github.com/xinliangnote/go-util v0.0.0-20191109055458-c8d858c8d8b9 golang.org/x/time v0.0.0-20190921001708-c4c64cad1fd0 google.golang.org/grpc v1.23.1 gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/go-playground/validator.v9 v9.29.1 - gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df + gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df // indirect ) diff --git a/go.sum b/go.sum index 83555e3d..e1001393 100644 --- a/go.sum +++ b/go.sum @@ -66,6 +66,8 @@ github.com/uber/jaeger-lib v2.1.1+incompatible h1:VY/6p2WopO09BPnw787RbaCIlfKbCR github.com/uber/jaeger-lib v2.1.1+incompatible/go.mod h1:ComeNDZlWwrWnDv8aPp0Ba6+uUTzImX/AauajbLI56U= github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/xinliangnote/go-util v0.0.0-20191109055458-c8d858c8d8b9 h1:MoyZSQWPGWmLE8R5nIEUlxoxwaDYlz34Zh2K5QLgoKw= +github.com/xinliangnote/go-util v0.0.0-20191109055458-c8d858c8d8b9/go.mod h1:3ZornrplU9tYj9ar9jchik1XPQ10ZbSXkbgxXR5PVaU= go.uber.org/atomic v1.4.0 h1:cxzIVoETapQEqDhQu3QfnvXAV4AlzcvUCxkVUFw3+EU= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= diff --git a/app/util/aes/aes.go b/vendor/github.com/xinliangnote/go-util/aes/aes.go similarity index 100% rename from app/util/aes/aes.go rename to vendor/github.com/xinliangnote/go-util/aes/aes.go diff --git a/app/util/json/json.go b/vendor/github.com/xinliangnote/go-util/json/json.go similarity index 100% rename from app/util/json/json.go rename to vendor/github.com/xinliangnote/go-util/json/json.go diff --git a/app/util/mail/mail.go b/vendor/github.com/xinliangnote/go-util/mail/mail.go similarity index 100% rename from app/util/mail/mail.go rename to vendor/github.com/xinliangnote/go-util/mail/mail.go diff --git a/app/util/md5/md5.go b/vendor/github.com/xinliangnote/go-util/md5/md5.go similarity index 100% rename from app/util/md5/md5.go rename to vendor/github.com/xinliangnote/go-util/md5/md5.go diff --git a/app/util/rsa/rsa.go b/vendor/github.com/xinliangnote/go-util/rsa/rsa.go similarity index 100% rename from app/util/rsa/rsa.go rename to vendor/github.com/xinliangnote/go-util/rsa/rsa.go diff --git a/app/util/time/time.go b/vendor/github.com/xinliangnote/go-util/time/time.go similarity index 100% rename from app/util/time/time.go rename to vendor/github.com/xinliangnote/go-util/time/time.go diff --git a/app/util/uuid/uuid.go b/vendor/github.com/xinliangnote/go-util/uuid/uuid.go similarity index 100% rename from app/util/uuid/uuid.go rename to vendor/github.com/xinliangnote/go-util/uuid/uuid.go diff --git a/vendor/modules.txt b/vendor/modules.txt index 08aefee1..622858b5 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -60,6 +60,14 @@ github.com/uber/jaeger-client-go/thrift-gen/baggage github.com/uber/jaeger-lib/metrics # github.com/ugorji/go v1.1.4 github.com/ugorji/go/codec +# github.com/xinliangnote/go-util v0.0.0-20191109055458-c8d858c8d8b9 +github.com/xinliangnote/go-util/aes +github.com/xinliangnote/go-util/md5 +github.com/xinliangnote/go-util/rsa +github.com/xinliangnote/go-util/mail +github.com/xinliangnote/go-util/time +github.com/xinliangnote/go-util/json +github.com/xinliangnote/go-util/uuid # golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c golang.org/x/net/trace golang.org/x/net/internal/timeseries