mirror of
https://gitee.com/johng/gf
synced 2026-06-06 02:25:47 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
248 lines
6.9 KiB
Go
Executable File
248 lines
6.9 KiB
Go
Executable File
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gvalid_test
|
|
|
|
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"
|
|
)
|
|
|
|
func Test_CheckMap1(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
data := map[string]any{
|
|
"id": "0",
|
|
"name": "john",
|
|
}
|
|
rules := map[string]string{
|
|
"id": "required|between:1,100",
|
|
"name": "required|length:6,16",
|
|
}
|
|
if m := g.Validator().Data(data).Rules(rules).Run(context.TODO()); m == nil {
|
|
t.Error("CheckMap校验失败")
|
|
} else {
|
|
t.Assert(len(m.Maps()), 2)
|
|
t.Assert(m.Maps()["id"]["between"], "The id value `0` must be between 1 and 100")
|
|
t.Assert(m.Maps()["name"]["length"], "The name value `john` length must be between 6 and 16")
|
|
}
|
|
})
|
|
}
|
|
|
|
func Test_CheckMap2(t *testing.T) {
|
|
var params any
|
|
gtest.C(t, func(t *gtest.T) {
|
|
if err := g.Validator().Data(params).Run(context.TODO()); err == nil {
|
|
t.AssertNil(err)
|
|
}
|
|
})
|
|
|
|
kvmap := map[string]any{
|
|
"id": "0",
|
|
"name": "john",
|
|
}
|
|
rules := map[string]string{
|
|
"id": "required|between:1,100",
|
|
"name": "required|length:6,16",
|
|
}
|
|
msgs := gvalid.CustomMsg{
|
|
"id": "ID不能为空|ID范围应当为{min}到{max}",
|
|
"name": map[string]string{
|
|
"required": "名称不能为空",
|
|
"length": "名称长度为{min}到{max}个字符",
|
|
},
|
|
}
|
|
if m := g.Validator().Data(kvmap).Rules(rules).Messages(msgs).Run(context.TODO()); m == nil {
|
|
t.Error("CheckMap校验失败")
|
|
}
|
|
|
|
kvmap = map[string]any{
|
|
"id": "1",
|
|
"name": "john",
|
|
}
|
|
rules = map[string]string{
|
|
"id": "required|between:1,100",
|
|
"name": "required|length:4,16",
|
|
}
|
|
msgs = map[string]any{
|
|
"id": "ID不能为空|ID范围应当为{min}到{max}",
|
|
"name": map[string]string{
|
|
"required": "名称不能为空",
|
|
"length": "名称长度为{min}到{max}个字符",
|
|
},
|
|
}
|
|
if m := g.Validator().Data(kvmap).Rules(rules).Messages(msgs).Run(context.TODO()); m != nil {
|
|
t.Error(m)
|
|
}
|
|
|
|
kvmap = map[string]any{
|
|
"id": "1",
|
|
"name": "john",
|
|
}
|
|
rules = map[string]string{
|
|
"id": "",
|
|
"name": "",
|
|
}
|
|
msgs = map[string]any{
|
|
"id": "ID不能为空|ID范围应当为{min}到{max}",
|
|
"name": map[string]string{
|
|
"required": "名称不能为空",
|
|
"length": "名称长度为{min}到{max}个字符",
|
|
},
|
|
}
|
|
if m := g.Validator().Data(kvmap).Rules(rules).Messages(msgs).Run(context.TODO()); m != nil {
|
|
t.Error(m)
|
|
}
|
|
|
|
kvmap = map[string]any{
|
|
"id": "1",
|
|
"name": "john",
|
|
}
|
|
rules2 := []string{
|
|
"@required|between:1,100",
|
|
"@required|length:4,16",
|
|
}
|
|
msgs = map[string]any{
|
|
"id": "ID不能为空|ID范围应当为{min}到{max}",
|
|
"name": map[string]string{
|
|
"required": "名称不能为空",
|
|
"length": "名称长度为{min}到{max}个字符",
|
|
},
|
|
}
|
|
if m := g.Validator().Data(kvmap).Rules(rules2).Messages(msgs).Run(context.TODO()); m != nil {
|
|
t.Error(m)
|
|
}
|
|
|
|
kvmap = map[string]any{
|
|
"id": "1",
|
|
"name": "john",
|
|
}
|
|
rules2 = []string{
|
|
"id@required|between:1,100",
|
|
"name@required|length:4,16#名称不能为空|",
|
|
}
|
|
msgs = map[string]any{
|
|
"id": "ID不能为空|ID范围应当为{min}到{max}",
|
|
"name": map[string]string{
|
|
"required": "名称不能为空",
|
|
"length": "名称长度为{min}到{max}个字符",
|
|
},
|
|
}
|
|
if m := g.Validator().Data(kvmap).Rules(rules2).Messages(msgs).Run(context.TODO()); m != nil {
|
|
t.Error(m)
|
|
}
|
|
|
|
kvmap = map[string]any{
|
|
"id": "1",
|
|
"name": "john",
|
|
}
|
|
rules2 = []string{
|
|
"id@required|between:1,100",
|
|
"name@required|length:4,16#名称不能为空",
|
|
}
|
|
msgs = map[string]any{
|
|
"id": "ID不能为空|ID范围应当为{min}到{max}",
|
|
"name": map[string]string{
|
|
"required": "名称不能为空",
|
|
"length": "名称长度为{min}到{max}个字符",
|
|
},
|
|
}
|
|
if m := g.Validator().Data(kvmap).Rules(rules2).Messages(msgs).Run(context.TODO()); m != nil {
|
|
t.Error(m)
|
|
}
|
|
}
|
|
|
|
func Test_CheckMapWithNilAndNotRequiredField(t *testing.T) {
|
|
data := map[string]any{
|
|
"id": "1",
|
|
}
|
|
rules := map[string]string{
|
|
"id": "required",
|
|
"name": "length:4,16",
|
|
}
|
|
if m := g.Validator().Data(data).Rules(rules).Run(context.TODO()); m != nil {
|
|
t.Error(m)
|
|
}
|
|
}
|
|
|
|
func Test_Sequence(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
params := map[string]any{
|
|
"passport": "",
|
|
"password": "123456",
|
|
"password2": "1234567",
|
|
}
|
|
rules := []string{
|
|
"passport@required|length:6,16#账号不能为空|账号长度应当在{min}到{max}之间",
|
|
"password@required|length:6,16|same:password2#密码不能为空|密码长度应当在{min}到{max}之间|两次密码输入不相等",
|
|
"password2@required|length:6,16#",
|
|
}
|
|
err := g.Validator().Data(params).Rules(rules).Run(context.TODO())
|
|
t.AssertNE(err, nil)
|
|
t.Assert(len(err.Map()), 2)
|
|
t.Assert(err.Map()["required"], "账号不能为空")
|
|
t.Assert(err.Map()["length"], "账号长度应当在6到16之间")
|
|
t.Assert(len(err.Maps()), 2)
|
|
|
|
t.Assert(len(err.Items()), 2)
|
|
t.Assert(err.Items()[0]["passport"]["length"], "账号长度应当在6到16之间")
|
|
t.Assert(err.Items()[0]["passport"]["required"], "账号不能为空")
|
|
t.Assert(err.Items()[1]["password"]["same"], "两次密码输入不相等")
|
|
|
|
t.Assert(err.String(), "账号不能为空; 账号长度应当在6到16之间; 两次密码输入不相等")
|
|
t.Assert(err.Strings(), []string{"账号不能为空", "账号长度应当在6到16之间", "两次密码输入不相等"})
|
|
|
|
k, m := err.FirstItem()
|
|
t.Assert(k, "passport")
|
|
t.Assert(m, err.Map())
|
|
|
|
r, s := err.FirstRule()
|
|
t.Assert(r, "required")
|
|
t.Assert(s, "账号不能为空")
|
|
|
|
t.Assert(gerror.Current(err), "账号不能为空")
|
|
})
|
|
}
|
|
|
|
func Test_Map_Bail(t *testing.T) {
|
|
// global bail
|
|
gtest.C(t, func(t *gtest.T) {
|
|
params := map[string]any{
|
|
"passport": "",
|
|
"password": "123456",
|
|
"password2": "1234567",
|
|
}
|
|
rules := []string{
|
|
"passport@required|length:6,16#账号不能为空|账号长度应当在{min}到{max}之间",
|
|
"password@required|length:6,16|same:password2#密码不能为空|密码长度应当在{min}到{max}之间|两次密码输入不相等",
|
|
"password2@required|length:6,16#",
|
|
}
|
|
err := g.Validator().Bail().Rules(rules).Data(params).Run(ctx)
|
|
t.AssertNE(err, nil)
|
|
t.Assert(err.String(), "账号不能为空")
|
|
})
|
|
// global bail with rule bail
|
|
gtest.C(t, func(t *gtest.T) {
|
|
params := map[string]any{
|
|
"passport": "",
|
|
"password": "123456",
|
|
"password2": "1234567",
|
|
}
|
|
rules := []string{
|
|
"passport@bail|required|length:6,16#|账号不能为空|账号长度应当在{min}到{max}之间",
|
|
"password@required|length:6,16|same:password2#密码不能为空|密码长度应当在{min}到{max}之间|两次密码输入不相等",
|
|
"password2@required|length:6,16#",
|
|
}
|
|
err := g.Validator().Bail().Rules(rules).Data(params).Run(ctx)
|
|
t.AssertNE(err, nil)
|
|
t.Assert(err.String(), "账号不能为空")
|
|
})
|
|
}
|