From fef6562e7cb20b0d0add42b968696e5a6987ff3e Mon Sep 17 00:00:00 2001 From: yxs <597985317@qq.com> Date: Mon, 5 Jul 2021 17:01:46 +0800 Subject: [PATCH 1/2] add --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4a72ee9..b96774d 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ # go-gulu go 轱辘 + +v2 版本 \ No newline at end of file From b7c6a2ac1af54692a902e560236884992853ccbc Mon Sep 17 00:00:00 2001 From: yxs <597985317@qq.com> Date: Mon, 5 Jul 2021 17:15:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7v2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- conv/arrayconv/arrayconv_test.go | 2 +- conv/arrayconv/removeRepeat_test.go | 2 +- conv/byteconv/byteconv_test.go | 2 +- conv/stringconv/stringconv_test.go | 2 +- conv/structureconv/structureconv_test.go | 2 +- go.mod | 2 +- nice/file/upload/file.go | 6 +++--- nice/file/upload/local/local.go | 4 ++-- nice/file/upload/oss/oss.go | 2 +- nice/person/captcha.go | 2 +- nice/person/ip.go | 2 +- nice/person/password.go | 4 ++-- pkg/fire/crud.go | 4 ++-- pkg/fire/pageParam_test.go | 2 +- pkg/ginMiddleware/mwJwt/mwJwt.go | 2 +- pkg/ginMiddleware/mwLogger/mwLogger.go | 2 +- pkg/gredis/mobileCode/utils.go | 2 +- pkg/logging/logging.go | 2 +- pkg/paramValidator/validateCreate_test.go | 2 +- pkg/viperine/viperine_test.go | 2 +- sync/eventGroup/eventGroup_test.go | 2 +- sync/rwMutexLog/rwMutexLog.go | 2 +- sync/rwMutexLog/rwMutexLog_test.go | 2 +- 23 files changed, 28 insertions(+), 28 deletions(-) diff --git a/conv/arrayconv/arrayconv_test.go b/conv/arrayconv/arrayconv_test.go index 2d8209d..f27d8c7 100644 --- a/conv/arrayconv/arrayconv_test.go +++ b/conv/arrayconv/arrayconv_test.go @@ -5,7 +5,7 @@ package arrayconv_test import ( - "github.com/lifegit/go-gulu/conv/arrayconv" + "github.com/lifegit/go-gulu/v2/conv/arrayconv" "github.com/stretchr/testify/assert" "testing" ) diff --git a/conv/arrayconv/removeRepeat_test.go b/conv/arrayconv/removeRepeat_test.go index 62af982..5f9b50d 100644 --- a/conv/arrayconv/removeRepeat_test.go +++ b/conv/arrayconv/removeRepeat_test.go @@ -5,7 +5,7 @@ package arrayconv_test import ( - "github.com/lifegit/go-gulu/conv/arrayconv" + "github.com/lifegit/go-gulu/v2/conv/arrayconv" "github.com/stretchr/testify/assert" "testing" ) diff --git a/conv/byteconv/byteconv_test.go b/conv/byteconv/byteconv_test.go index eff06b6..97c954a 100644 --- a/conv/byteconv/byteconv_test.go +++ b/conv/byteconv/byteconv_test.go @@ -5,7 +5,7 @@ package byteconv_test import ( - "github.com/lifegit/go-gulu/conv/byteconv" + "github.com/lifegit/go-gulu/v2/conv/byteconv" "github.com/stretchr/testify/assert" "testing" ) diff --git a/conv/stringconv/stringconv_test.go b/conv/stringconv/stringconv_test.go index 171e08e..ddff17b 100644 --- a/conv/stringconv/stringconv_test.go +++ b/conv/stringconv/stringconv_test.go @@ -5,7 +5,7 @@ package stringconv_test import ( - "github.com/lifegit/go-gulu/conv/stringconv" + "github.com/lifegit/go-gulu/v2/conv/stringconv" "github.com/stretchr/testify/assert" "testing" ) diff --git a/conv/structureconv/structureconv_test.go b/conv/structureconv/structureconv_test.go index bfcb24f..0efae0b 100644 --- a/conv/structureconv/structureconv_test.go +++ b/conv/structureconv/structureconv_test.go @@ -5,7 +5,7 @@ package structureconv_test import ( - "github.com/lifegit/go-gulu/conv/structureconv" + "github.com/lifegit/go-gulu/v2/conv/structureconv" "github.com/stretchr/testify/assert" "testing" ) diff --git a/go.mod b/go.mod index abe4136..e46830d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/lifegit/go-gulu +module github.com/lifegit/go-gulu/v2 go 1.16 diff --git a/nice/file/upload/file.go b/nice/file/upload/file.go index 18c26f7..157f149 100755 --- a/nice/file/upload/file.go +++ b/nice/file/upload/file.go @@ -6,9 +6,9 @@ package upload import ( "fmt" - "github.com/lifegit/go-gulu/nice/crypto" - "github.com/lifegit/go-gulu/nice/file" - "github.com/lifegit/go-gulu/nice/rand" + "github.com/lifegit/go-gulu/v2/nice/crypto" + "github.com/lifegit/go-gulu/v2/nice/file" + "github.com/lifegit/go-gulu/v2/nice/rand" "os" "path" "strconv" diff --git a/nice/file/upload/local/local.go b/nice/file/upload/local/local.go index effb027..7a147f4 100644 --- a/nice/file/upload/local/local.go +++ b/nice/file/upload/local/local.go @@ -7,8 +7,8 @@ package local import ( "errors" "github.com/gin-gonic/gin" - "github.com/lifegit/go-gulu/nice/file" - upload2 "github.com/lifegit/go-gulu/nice/file/upload" + "github.com/lifegit/go-gulu/v2/nice/file" + upload2 "github.com/lifegit/go-gulu/v2/nice/file/upload" "io" "os" "strconv" diff --git a/nice/file/upload/oss/oss.go b/nice/file/upload/oss/oss.go index 2b872c7..185fdf9 100644 --- a/nice/file/upload/oss/oss.go +++ b/nice/file/upload/oss/oss.go @@ -9,7 +9,7 @@ import ( "errors" "github.com/aliyun/aliyun-oss-go-sdk/oss" "github.com/gin-gonic/gin" - upload2 "github.com/lifegit/go-gulu/nice/file/upload" + upload2 "github.com/lifegit/go-gulu/v2/nice/file/upload" "strconv" ) diff --git a/nice/person/captcha.go b/nice/person/captcha.go index bf6cabc..393e395 100644 --- a/nice/person/captcha.go +++ b/nice/person/captcha.go @@ -6,7 +6,7 @@ package person import ( "github.com/go-redis/redis" - "github.com/lifegit/go-gulu/pkg/gredis/cacheCount" + "github.com/lifegit/go-gulu/v2/pkg/gredis/cacheCount" "time" ) diff --git a/nice/person/ip.go b/nice/person/ip.go index ac14ae0..cab1774 100644 --- a/nice/person/ip.go +++ b/nice/person/ip.go @@ -6,7 +6,7 @@ package person import ( "github.com/go-redis/redis" - "github.com/lifegit/go-gulu/pkg/gredis/cacheCount" + "github.com/lifegit/go-gulu/v2/pkg/gredis/cacheCount" "time" ) diff --git a/nice/person/password.go b/nice/person/password.go index 53b2d31..98d4a0e 100644 --- a/nice/person/password.go +++ b/nice/person/password.go @@ -6,8 +6,8 @@ package person import ( "errors" - "github.com/lifegit/go-gulu/nice/crypto" - "github.com/lifegit/go-gulu/nice/rand" + "github.com/lifegit/go-gulu/v2/nice/crypto" + "github.com/lifegit/go-gulu/v2/nice/rand" "github.com/wenzhenxi/gorsa" "golang.org/x/crypto/bcrypt" "strconv" diff --git a/pkg/fire/crud.go b/pkg/fire/crud.go index 191d65a..d644802 100644 --- a/pkg/fire/crud.go +++ b/pkg/fire/crud.go @@ -8,8 +8,8 @@ import ( "errors" "fmt" "github.com/imdario/mergo" - "github.com/lifegit/go-gulu/conv/arrayconv" - "github.com/lifegit/go-gulu/conv/structureconv" + "github.com/lifegit/go-gulu/v2/conv/arrayconv" + "github.com/lifegit/go-gulu/v2/conv/structureconv" "gorm.io/gorm" "gorm.io/gorm/clause" "gorm.io/gorm/schema" diff --git a/pkg/fire/pageParam_test.go b/pkg/fire/pageParam_test.go index 733a8ec..82d0e5d 100644 --- a/pkg/fire/pageParam_test.go +++ b/pkg/fire/pageParam_test.go @@ -6,7 +6,7 @@ package fire_test import ( "github.com/gin-gonic/gin" - "github.com/lifegit/go-gulu/pkg/out" + "github.com/lifegit/go-gulu/v2/pkg/out" "github.com/stretchr/testify/assert" "net/http" "testing" diff --git a/pkg/ginMiddleware/mwJwt/mwJwt.go b/pkg/ginMiddleware/mwJwt/mwJwt.go index 01c5e2c..70912ef 100755 --- a/pkg/ginMiddleware/mwJwt/mwJwt.go +++ b/pkg/ginMiddleware/mwJwt/mwJwt.go @@ -2,7 +2,7 @@ package mwJwt import ( "github.com/gin-gonic/gin" - "github.com/lifegit/go-gulu/pkg/jwt" + "github.com/lifegit/go-gulu/v2/pkg/jwt" "net/http" "strings" ) diff --git a/pkg/ginMiddleware/mwLogger/mwLogger.go b/pkg/ginMiddleware/mwLogger/mwLogger.go index 916515e..e19ac19 100644 --- a/pkg/ginMiddleware/mwLogger/mwLogger.go +++ b/pkg/ginMiddleware/mwLogger/mwLogger.go @@ -4,7 +4,7 @@ import ( "encoding/json" "fmt" "github.com/gin-gonic/gin" - "github.com/lifegit/go-gulu/pkg/logging" + "github.com/lifegit/go-gulu/v2/pkg/logging" "github.com/sirupsen/logrus" "io" "net/http" diff --git a/pkg/gredis/mobileCode/utils.go b/pkg/gredis/mobileCode/utils.go index 1add0f2..c4298e5 100644 --- a/pkg/gredis/mobileCode/utils.go +++ b/pkg/gredis/mobileCode/utils.go @@ -5,7 +5,7 @@ package mobileCode import ( - "github.com/lifegit/go-gulu/nice/rand" + "github.com/lifegit/go-gulu/v2/nice/rand" "regexp" ) diff --git a/pkg/logging/logging.go b/pkg/logging/logging.go index 05164ce..bc08a63 100644 --- a/pkg/logging/logging.go +++ b/pkg/logging/logging.go @@ -6,7 +6,7 @@ package logging import ( "github.com/lestrrat-go/file-rotatelogs" - "github.com/lifegit/go-gulu/nice/file" + "github.com/lifegit/go-gulu/v2/nice/file" "github.com/rifflock/lfshook" "github.com/sirupsen/logrus" "os" diff --git a/pkg/paramValidator/validateCreate_test.go b/pkg/paramValidator/validateCreate_test.go index 712e815..7035fce 100644 --- a/pkg/paramValidator/validateCreate_test.go +++ b/pkg/paramValidator/validateCreate_test.go @@ -5,7 +5,7 @@ package paramValidator_test import ( - "github.com/lifegit/go-gulu/pkg/paramValidator" + "github.com/lifegit/go-gulu/v2/pkg/paramValidator" "github.com/stretchr/testify/assert" "testing" ) diff --git a/pkg/viperine/viperine_test.go b/pkg/viperine/viperine_test.go index 67589d0..23a601d 100644 --- a/pkg/viperine/viperine_test.go +++ b/pkg/viperine/viperine_test.go @@ -7,7 +7,7 @@ package viperine_test import ( "fmt" "github.com/fsnotify/fsnotify" - "github.com/lifegit/go-gulu/pkg/viperine" + "github.com/lifegit/go-gulu/v2/pkg/viperine" "github.com/sirupsen/logrus" "github.com/spf13/viper" "github.com/stretchr/testify/assert" diff --git a/sync/eventGroup/eventGroup_test.go b/sync/eventGroup/eventGroup_test.go index 066721a..62e6286 100644 --- a/sync/eventGroup/eventGroup_test.go +++ b/sync/eventGroup/eventGroup_test.go @@ -6,7 +6,7 @@ package eventGroup_test import ( "fmt" - "github.com/lifegit/go-gulu/sync/eventGroup" + "github.com/lifegit/go-gulu/v2/sync/eventGroup" "testing" "time" ) diff --git a/sync/rwMutexLog/rwMutexLog.go b/sync/rwMutexLog/rwMutexLog.go index 0541449..a2b0178 100644 --- a/sync/rwMutexLog/rwMutexLog.go +++ b/sync/rwMutexLog/rwMutexLog.go @@ -10,7 +10,7 @@ package rwMutexLog import ( "fmt" - "github.com/lifegit/go-gulu/pkg/logging" + "github.com/lifegit/go-gulu/v2/pkg/logging" "github.com/sirupsen/logrus" "runtime" "strings" diff --git a/sync/rwMutexLog/rwMutexLog_test.go b/sync/rwMutexLog/rwMutexLog_test.go index cffcfb9..a863049 100644 --- a/sync/rwMutexLog/rwMutexLog_test.go +++ b/sync/rwMutexLog/rwMutexLog_test.go @@ -6,7 +6,7 @@ package rwMutexLog_test import ( "fmt" - "github.com/lifegit/go-gulu/sync/rwMutexLog" + "github.com/lifegit/go-gulu/v2/sync/rwMutexLog" "testing" )