v2 -> v3

util/gvalid/gvalid.go

@@ -13,9 +13,9 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/gogf/gf/v2/internal/intlog"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/internal/intlog"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/util/gtag"
 )
 
 // CustomMsg is the custom error message type,

util/gvalid/gvalid_error.go

@@ -9,10 +9,10 @@ package gvalid
 import (
 	"strings"
 
-	"github.com/gogf/gf/v2/container/gset"
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/container/gset"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 // Error is the validation error for validation result.

util/gvalid/gvalid_register.go

@@ -12,8 +12,8 @@ import (
 	"reflect"
 	"runtime"
 
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/internal/intlog"
+	"github.com/gogf/gf/v3/container/gvar"
+	"github.com/gogf/gf/v3/internal/intlog"
 )
 
 // RuleFunc is the custom function for data validation.

util/gvalid/gvalid_validator.go

@@ -11,11 +11,11 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/gogf/gf/v2/i18n/gi18n"
-	"github.com/gogf/gf/v2/internal/reflection"
-	"github.com/gogf/gf/v2/internal/utils"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/i18n/gi18n"
+	"github.com/gogf/gf/v3/internal/reflection"
+	"github.com/gogf/gf/v3/internal/utils"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 // Validator is the validation manager for chaining operations.

util/gvalid/gvalid_validator_check_map.go

@@ -12,9 +12,9 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/internal/reflection"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/internal/reflection"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 func (v *Validator) doCheckMap(ctx context.Context, params interface{}) Error {

util/gvalid/gvalid_validator_check_struct.go

@@ -11,12 +11,12 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/internal/empty"
-	"github.com/gogf/gf/v2/os/gstructs"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gmeta"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/internal/empty"
+	"github.com/gogf/gf/v3/os/gstructs"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gmeta"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 func (v *Validator) doCheckStruct(ctx context.Context, object interface{}) Error {

util/gvalid/gvalid_validator_check_value.go

@@ -12,14 +12,14 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/encoding/gjson"
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/text/gregex"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gvalid/internal/builtin"
+	"github.com/gogf/gf/v3/container/gvar"
+	"github.com/gogf/gf/v3/encoding/gjson"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/text/gregex"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gvalid/internal/builtin"
 )
 
 type doCheckValueInput struct {

util/gvalid/gvalid_validator_message.go

@@ -9,7 +9,7 @@ package gvalid
 import (
 	"context"
 
-	"github.com/gogf/gf/v2/util/gvalid/internal/builtin"
+	"github.com/gogf/gf/v3/util/gvalid/internal/builtin"
 )
 
 // getErrorMessageByRule retrieves and returns the error message for specified rule.

util/gvalid/gvalid_z_example_feature_rule_test.go

@@ -10,8 +10,8 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 func ExampleRule_Required() {

util/gvalid/gvalid_z_example_test.go

@@ -11,13 +11,13 @@ import (
 	"errors"
 	"fmt"
 
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/i18n/gi18n"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gvalid"
+	"github.com/gogf/gf/v3/container/gvar"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/i18n/gi18n"
+	"github.com/gogf/gf/v3/os/gctx"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gvalid"
 )
 
 func ExampleNew() {

util/gvalid/gvalid_z_unit_feature_checkmap_test.go

@@ -10,10 +10,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gvalid"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/gvalid"
 )
 
 func Test_CheckMap1(t *testing.T) {

util/gvalid/gvalid_z_unit_feature_checkstruct_test.go

@@ -10,11 +10,11 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gogf/gf/v2/container/gvar"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/container/gvar"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gtime"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 func Test_CheckStruct(t *testing.T) {

util/gvalid/gvalid_z_unit_feature_ci_test.go

@@ -9,8 +9,8 @@ package gvalid_test
 import (
 	"testing"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/test/gtest"
 )
 
 func Test_CI(t *testing.T) {

util/gvalid/gvalid_z_unit_feature_custom_error_test.go

@@ -11,8 +11,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/test/gtest"
 )
 
 func Test_Map(t *testing.T) {

util/gvalid/gvalid_z_unit_feature_custom_rule_test.go

@@ -11,11 +11,11 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/guid"
-	"github.com/gogf/gf/v2/util/gvalid"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gvalid"
 )
 
 func Test_CustomRule1(t *testing.T) {

util/gvalid/gvalid_z_unit_feature_i18n_test.go

@@ -10,9 +10,9 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gogf/gf/v2/i18n/gi18n"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gvalid"
+	"github.com/gogf/gf/v3/i18n/gi18n"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/gvalid"
 )
 
 func TestValidator_I18n(t *testing.T) {

util/gvalid/gvalid_z_unit_feature_meta_test.go

@@ -10,10 +10,10 @@ import (
 	"context"
 	"testing"
 
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gvalid"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/gvalid"
 )
 
 type UserCreateReq struct {

util/gvalid/gvalid_z_unit_feature_recursive_test.go

@@ -9,8 +9,8 @@ package gvalid_test
 import (
 	"testing"
 
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/test/gtest"
 )
 
 func Test_CheckStruct_Recursive_Struct(t *testing.T) {

util/gvalid/gvalid_z_unit_feature_rule_test.go

@@ -10,13 +10,13 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/os/gctx"
-	"github.com/gogf/gf/v2/os/gtime"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/os/gctx"
+	"github.com/gogf/gf/v3/os/gtime"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/gtag"
 )
 
 var (
@@ -1590,7 +1590,7 @@ func Test_Enums(t *testing.T) {
 		t.AssertNil(err)
 		defer t.AssertNil(gtag.SetGlobalEnums(oldEnumsJson))
 
-		err = gtag.SetGlobalEnums(`{"github.com/gogf/gf/v2/util/gvalid_test.EnumsTest": ["a","b"]}`)
+		err = gtag.SetGlobalEnums(`{"github.com/gogf/gf/v3/util/gvalid_test.EnumsTest": ["a","b"]}`)
 		t.AssertNil(err)
 
 		err = g.Validator().Data(&Params{

util/gvalid/gvalid_z_unit_internal_test.go

@@ -9,7 +9,7 @@ package gvalid
 import (
 	"testing"
 
-	"github.com/gogf/gf/v2/test/gtest"
+	"github.com/gogf/gf/v3/test/gtest"
 )
 
 func Test_parseSequenceTag(t *testing.T) {

util/gvalid/gvalid_z_unit_issue_test.go

@@ -13,12 +13,12 @@ import (
 	"testing"
 	"time"
 
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/frame/g"
-	"github.com/gogf/gf/v2/net/ghttp"
-	"github.com/gogf/gf/v2/test/gtest"
-	"github.com/gogf/gf/v2/util/guid"
-	"github.com/gogf/gf/v2/util/gvalid"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/frame/g"
+	"github.com/gogf/gf/v3/net/ghttp"
+	"github.com/gogf/gf/v3/test/gtest"
+	"github.com/gogf/gf/v3/util/guid"
+	"github.com/gogf/gf/v3/util/gvalid"
 )
 
 type Foo struct {

util/gvalid/internal/builtin/builtin.go

@@ -13,7 +13,7 @@ package builtin
 import (
 	"reflect"
 
-	"github.com/gogf/gf/v2/container/gvar"
+	"github.com/gogf/gf/v3/container/gvar"
 )
 
 type Rule interface {

util/gvalid/internal/builtin/builtin_after.go

@@ -9,9 +9,9 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleAfter implements `after` rule:

util/gvalid/internal/builtin/builtin_after_equal.go

@@ -9,9 +9,9 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleAfterEqual implements `after-equal` rule:

util/gvalid/internal/builtin/builtin_array.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v3/internal/json"
 )
 
 // RuleArray implements `array` rule:

util/gvalid/internal/builtin/builtin_before.go

@@ -9,9 +9,9 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleBefore implements `before` rule:

util/gvalid/internal/builtin/builtin_before_equal.go

@@ -9,9 +9,9 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleBeforeEqual implements `before-equal` rule:

util/gvalid/internal/builtin/builtin_between.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 // RuleBetween implements `between` rule:

util/gvalid/internal/builtin/builtin_date.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleDate implements `date` rule:

util/gvalid/internal/builtin/builtin_date_format.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v3/os/gtime"
 )
 
 // RuleDateFormat implements `date-format` rule:

util/gvalid/internal/builtin/builtin_datetime.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"time"
 
-	"github.com/gogf/gf/v2/os/gtime"
+	"github.com/gogf/gf/v3/os/gtime"
 )
 
 // RuleDatetime implements `datetime` rule:

util/gvalid/internal/builtin/builtin_different.go

@@ -10,9 +10,9 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleDifferent implements `different` rule:

util/gvalid/internal/builtin/builtin_domain.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleDomain implements `domain` rule:

util/gvalid/internal/builtin/builtin_email.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleEmail implements `email` rule:

util/gvalid/internal/builtin/builtin_enums.go

@@ -11,12 +11,12 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/internal/json"
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gtag"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/internal/json"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gtag"
 )
 
 // RuleEnums implements `enums` rule:

util/gvalid/internal/builtin/builtin_gt.go

@@ -10,9 +10,9 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleGT implements `gt` rule:

util/gvalid/internal/builtin/builtin_gte.go

@@ -10,9 +10,9 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleGTE implements `gte` rule:

util/gvalid/internal/builtin/builtin_in.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 // RuleIn implements `in` rule:

util/gvalid/internal/builtin/builtin_ip.go

@@ -9,8 +9,8 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/net/gipv4"
-	"github.com/gogf/gf/v2/net/gipv6"
+	"github.com/gogf/gf/v3/net/gipv4"
+	"github.com/gogf/gf/v3/net/gipv6"
 )
 
 // RuleIp implements `ip` rule:

util/gvalid/internal/builtin/builtin_ipv4.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/net/gipv4"
+	"github.com/gogf/gf/v3/net/gipv4"
 )
 
 // RuleIpv4 implements `ipv4` rule:

util/gvalid/internal/builtin/builtin_ipv6.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/net/gipv6"
+	"github.com/gogf/gf/v3/net/gipv6"
 )
 
 // RuleIpv6 implements `ipv6` rule:

util/gvalid/internal/builtin/builtin_json.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/internal/json"
+	"github.com/gogf/gf/v3/internal/json"
 )
 
 // RuleJson implements `json` rule:

util/gvalid/internal/builtin/builtin_length.go

@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 // RuleLength implements `length` rule:

util/gvalid/internal/builtin/builtin_lt.go

@@ -10,9 +10,9 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleLT implements `lt` rule:

util/gvalid/internal/builtin/builtin_lte.go

@@ -10,9 +10,9 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleLTE implements `lte` rule:

util/gvalid/internal/builtin/builtin_mac.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleMac implements `mac` rule:

util/gvalid/internal/builtin/builtin_max.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 // RuleMax implements `max` rule:

util/gvalid/internal/builtin/builtin_max_length.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 // RuleMaxLength implements `max-length` rule:

util/gvalid/internal/builtin/builtin_min.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 // RuleMin implements `min` rule:

util/gvalid/internal/builtin/builtin_min_length.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"strconv"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 // RuleMinLength implements `min-length` rule:

util/gvalid/internal/builtin/builtin_not_in.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v3/text/gstr"
 )
 
 // RuleNotIn implements `not-in` rule:

util/gvalid/internal/builtin/builtin_not_regex.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleNotRegex implements `not-regex` rule:

util/gvalid/internal/builtin/builtin_passport.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RulePassport implements `passport` rule:

util/gvalid/internal/builtin/builtin_password.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RulePassword implements `password` rule:

util/gvalid/internal/builtin/builtin_password2.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RulePassword2 implements `password2` rule:

util/gvalid/internal/builtin/builtin_password3.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RulePassword3 implements `password3` rule:

util/gvalid/internal/builtin/builtin_phone.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RulePhone implements `phone` rule:

util/gvalid/internal/builtin/builtin_phone_loose.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RulePhoneLoose implements `phone-loose` rule:

util/gvalid/internal/builtin/builtin_postcode.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RulePostcode implements `postcode` rule:

util/gvalid/internal/builtin/builtin_qq.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleQQ implements `qq` rule:

util/gvalid/internal/builtin/builtin_regex.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleRegex implements `regex` rule:

util/gvalid/internal/builtin/builtin_required.go

@@ -10,7 +10,7 @@ import (
 	"errors"
 	"reflect"
 
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 // RuleRequired implements `required` rule.

util/gvalid/internal/builtin/builtin_required_if.go

@@ -10,10 +10,10 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleRequiredIf implements `required-if` rule:

util/gvalid/internal/builtin/builtin_required_if_all.go

@@ -10,10 +10,10 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/errors/gcode"
-	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/errors/gcode"
+	"github.com/gogf/gf/v3/errors/gerror"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleRequiredIfAll implements `required-if-all` rule:

util/gvalid/internal/builtin/builtin_required_unless.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleRequiredUnless implements `required-unless` rule:

util/gvalid/internal/builtin/builtin_required_with.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/internal/empty"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/internal/empty"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleRequiredWith implements `required-with` rule:

util/gvalid/internal/builtin/builtin_required_with_all.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/internal/empty"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/internal/empty"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleRequiredWithAll implements `required-with-all` rule:

util/gvalid/internal/builtin/builtin_required_without.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/internal/empty"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/internal/empty"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleRequiredWithout implements `required-without` rule:

util/gvalid/internal/builtin/builtin_required_without_all.go

@@ -10,8 +10,8 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/internal/empty"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/internal/empty"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleRequiredWithoutAll implements `required-without-all` rule:

util/gvalid/internal/builtin/builtin_resident_id.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleResidentId implements `resident-id` rule:

util/gvalid/internal/builtin/builtin_same.go

@@ -10,9 +10,9 @@ import (
 	"errors"
 	"strings"
 
-	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
-	"github.com/gogf/gf/v2/util/gutil"
+	"github.com/gogf/gf/v3/text/gstr"
+	"github.com/gogf/gf/v3/util/gconv"
+	"github.com/gogf/gf/v3/util/gutil"
 )
 
 // RuleSame implements `same` rule:

util/gvalid/internal/builtin/builtin_size.go

@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/gogf/gf/v2/util/gconv"
+	"github.com/gogf/gf/v3/util/gconv"
 )
 
 // RuleSize implements `size` rule:

util/gvalid/internal/builtin/builtin_telephone.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleTelephone implements `telephone` rule:

util/gvalid/internal/builtin/builtin_url.go

@@ -9,7 +9,7 @@ package builtin
 import (
 	"errors"
 
-	"github.com/gogf/gf/v2/text/gregex"
+	"github.com/gogf/gf/v3/text/gregex"
 )
 
 // RuleUrl implements `url` rule: