Merge pull request #2 from lifegit/v2

V2

README.md

@@ -1,2 +1,4 @@
 # go-gulu
 go 轱辘
+
+v2 版本

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"
 )

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"
 )

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"
 )

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"
 )

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"
 )

go.mod

@@ -1,4 +1,4 @@
-module github.com/lifegit/go-gulu
+module github.com/lifegit/go-gulu/v2
 
 go 1.16
 

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"

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"

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"
 )
 

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"
 )
 

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"
 )
 

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"

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"

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"

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"
 )

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"

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"
 )
 

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"

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"
 )

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"

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"
 )

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"

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"
 )