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.
310 lines
8.4 KiB
Go
310 lines
8.4 KiB
Go
// 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 gjson_test
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/gogf/gf/v2/encoding/gjson"
|
|
"github.com/gogf/gf/v2/test/gtest"
|
|
)
|
|
|
|
func Test_GetScan(t *testing.T) {
|
|
type User struct {
|
|
Name string
|
|
Score float64
|
|
}
|
|
j := gjson.New(`[{"name":"john", "score":"100"},{"name":"smith", "score":"60"}]`)
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var user *User
|
|
err := j.Get("1").Scan(&user)
|
|
t.AssertNil(err)
|
|
t.Assert(user, &User{
|
|
Name: "smith",
|
|
Score: 60,
|
|
})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var users []User
|
|
err := j.Get(".").Scan(&users)
|
|
t.AssertNil(err)
|
|
t.Assert(users, []User{
|
|
{
|
|
Name: "john",
|
|
Score: 100,
|
|
},
|
|
{
|
|
Name: "smith",
|
|
Score: 60,
|
|
},
|
|
})
|
|
})
|
|
}
|
|
|
|
func Test_GetScanDeep(t *testing.T) {
|
|
type User struct {
|
|
Name string
|
|
Score float64
|
|
}
|
|
j := gjson.New(`[{"name":"john", "score":"100"},{"name":"smith", "score":"60"}]`)
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var user *User
|
|
err := j.Get("1").Scan(&user)
|
|
t.AssertNil(err)
|
|
t.Assert(user, &User{
|
|
Name: "smith",
|
|
Score: 60,
|
|
})
|
|
})
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var users []User
|
|
err := j.Get(".").Scan(&users)
|
|
t.AssertNil(err)
|
|
t.Assert(users, []User{
|
|
{
|
|
Name: "john",
|
|
Score: 100,
|
|
},
|
|
{
|
|
Name: "smith",
|
|
Score: 60,
|
|
},
|
|
})
|
|
})
|
|
}
|
|
|
|
func Test_Scan1(t *testing.T) {
|
|
type User struct {
|
|
Name string
|
|
Score float64
|
|
}
|
|
j := gjson.New(`[{"name":"john", "score":"100"},{"name":"smith", "score":"60"}]`)
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var users []User
|
|
err := j.Var().Scan(&users)
|
|
t.AssertNil(err)
|
|
t.Assert(users, []User{
|
|
{
|
|
Name: "john",
|
|
Score: 100,
|
|
},
|
|
{
|
|
Name: "smith",
|
|
Score: 60,
|
|
},
|
|
})
|
|
})
|
|
}
|
|
|
|
func Test_Scan2(t *testing.T) {
|
|
type User struct {
|
|
Name string
|
|
Score float64
|
|
}
|
|
j := gjson.New(`[{"name":"john", "score":"100"},{"name":"smith", "score":"60"}]`)
|
|
gtest.C(t, func(t *gtest.T) {
|
|
var users []User
|
|
err := j.Var().Scan(&users)
|
|
t.AssertNil(err)
|
|
t.Assert(users, []User{
|
|
{
|
|
Name: "john",
|
|
Score: 100,
|
|
},
|
|
{
|
|
Name: "smith",
|
|
Score: 60,
|
|
},
|
|
})
|
|
})
|
|
}
|
|
|
|
func Test_Struct1(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type BaseInfoItem struct {
|
|
IdCardNumber string `db:"id_card_number" json:"idCardNumber" field:"id_card_number"`
|
|
IsHouseholder bool `db:"is_householder" json:"isHouseholder" field:"is_householder"`
|
|
HouseholderRelation string `db:"householder_relation" json:"householderRelation" field:"householder_relation"`
|
|
UserName string `db:"user_name" json:"userName" field:"user_name"`
|
|
UserSex string `db:"user_sex" json:"userSex" field:"user_sex"`
|
|
UserAge int `db:"user_age" json:"userAge" field:"user_age"`
|
|
UserNation string `db:"user_nation" json:"userNation" field:"user_nation"`
|
|
}
|
|
|
|
type UserCollectionAddReq struct {
|
|
BaseInfo []BaseInfoItem `db:"_" json:"baseInfo" field:"_"`
|
|
}
|
|
jsonContent := []byte(`{
|
|
"baseInfo": [{
|
|
"idCardNumber": "520101199412141111",
|
|
"isHouseholder": true,
|
|
"householderRelation": "户主",
|
|
"userName": "李四",
|
|
"userSex": "男",
|
|
"userAge": 32,
|
|
"userNation": "苗族",
|
|
"userPhone": "13084183323",
|
|
"liveAddress": {},
|
|
"occupationInfo": [{
|
|
"occupationType": "经商",
|
|
"occupationBusinessInfo": [{
|
|
"occupationClass": "制造业",
|
|
"businessLicenseNumber": "32020000012300",
|
|
"businessName": "土灶柴火鸡",
|
|
"spouseName": "",
|
|
"spouseIdCardNumber": "",
|
|
"businessLicensePhotoId": 125,
|
|
"businessPlace": "租赁房产",
|
|
"hasGoodsInsurance": true,
|
|
"businessScopeStr": "柴火鸡;烧烤",
|
|
"businessAddress": {},
|
|
"businessPerformAbility": {
|
|
"businessType": "服务业",
|
|
"businessLife": 5,
|
|
"salesRevenue": 8000,
|
|
"familyEquity": 6000
|
|
}
|
|
}],
|
|
"occupationWorkInfo": {
|
|
"occupationClass": "",
|
|
"companyName": "",
|
|
"companyType": "",
|
|
"workYearNum": 0,
|
|
"spouseName": "",
|
|
"spouseIdCardNumber": "",
|
|
"spousePhone": "",
|
|
"spouseEducation": "",
|
|
"spouseCompanyName": "",
|
|
"workLevel": "",
|
|
"workAddress": {},
|
|
"workPerformAbility": {
|
|
"familyAnnualIncome": 0,
|
|
"familyEquity": 0,
|
|
"workCooperationState": "",
|
|
"workMoneyCooperationState": ""
|
|
}
|
|
},
|
|
"occupationAgricultureInfo": []
|
|
}],
|
|
"assetsInfo": [],
|
|
"expenditureInfo": [],
|
|
"incomeInfo": [],
|
|
"liabilityInfo": []
|
|
}]
|
|
}
|
|
`)
|
|
data := new(UserCollectionAddReq)
|
|
j, err := gjson.LoadJson(jsonContent, true)
|
|
t.AssertNil(err)
|
|
err = j.Scan(data)
|
|
t.AssertNil(err)
|
|
})
|
|
}
|
|
|
|
func Test_Struct(t *testing.T) {
|
|
gtest.C(t, func(t *gtest.T) {
|
|
type Item struct {
|
|
Title string `json:"title"`
|
|
Key string `json:"key"`
|
|
}
|
|
|
|
type M struct {
|
|
Id string `json:"id"`
|
|
Me map[string]any `json:"me"`
|
|
Txt string `json:"txt"`
|
|
Items []*Item `json:"items"`
|
|
}
|
|
|
|
txt := []byte(`
|
|
{
|
|
"id":"88888",
|
|
"me":{"name":"mikey","day":"20009"},
|
|
"txt":"hello",
|
|
"items":null
|
|
}
|
|
`)
|
|
|
|
j, err := gjson.LoadContent(txt)
|
|
t.AssertNil(err)
|
|
t.Assert(j.Get("me.name").String(), "mikey")
|
|
t.Assert(j.Get("items").String(), "")
|
|
t.Assert(j.Get("items").Bool(), false)
|
|
t.Assert(j.Get("items").Array(), nil)
|
|
m := new(M)
|
|
err = j.Scan(m)
|
|
t.AssertNil(err)
|
|
t.AssertNE(m.Me, nil)
|
|
t.Assert(m.Me["day"], "20009")
|
|
t.Assert(m.Items, nil)
|
|
})
|
|
}
|
|
|
|
func Test_Struct_Complicated(t *testing.T) {
|
|
type CertInfo struct {
|
|
UserRealName string `json:"userRealname,omitempty"`
|
|
IdentType string `json:"identType,omitempty"`
|
|
IdentNo string `json:"identNo,omitempty"`
|
|
CompanyName string `json:"companyName,omitempty"`
|
|
Website string `json:"website,omitempty"`
|
|
RegisterNo string `json:"registerNo,omitempty"`
|
|
AreaCode string `json:"areaCode,omitempty"`
|
|
Address string `json:"address,omitempty"`
|
|
CommunityCreditCode string `json:"communityCreditCode,omitempty"`
|
|
PhoneNumber string `json:"phoneNumber,omitempty"`
|
|
AreaName string `json:"areaName,omitempty"`
|
|
PhoneAreaCode string `json:"phoneAreaCode,omitempty"`
|
|
OperateRange string `json:"operateRange,omitempty"`
|
|
Email string `json:"email,omitempty"`
|
|
LegalPersonName string `json:"legalPersonName,omitempty"`
|
|
OrgCode string `json:"orgCode,omitempty"`
|
|
BusinessLicense string `json:"businessLicense,omitempty"`
|
|
FilePath1 string `json:"filePath1,omitempty"`
|
|
MobileNo string `json:"mobileNo,omitempty"`
|
|
CardName string `json:"cardName,omitempty"`
|
|
BankMobileNo string `json:"bankMobileNo,omitempty"`
|
|
BankCode string `json:"bankCode,omitempty"`
|
|
BankCard string `json:"bankCard,omitempty"`
|
|
}
|
|
|
|
type CertList struct {
|
|
StatusCode uint `json:"statusCode,string"`
|
|
SrcType uint `json:"srcType,string"`
|
|
CertID string `json:"certId"`
|
|
CardType string `json:"cardType,omitempty"`
|
|
CertInfo CertInfo `json:"certInfo"`
|
|
}
|
|
|
|
type Response struct {
|
|
UserLevel uint `json:"userLevel,string,omitempty"`
|
|
CertList []CertList `json:"certList"`
|
|
}
|
|
|
|
gtest.C(t, func(t *gtest.T) {
|
|
jsonContent := []byte(`
|
|
{
|
|
"certList":[
|
|
{"certId":"2023313","certInfo":"{\"address\":\"xxxxxxx\",\"phoneNumber\":\"15084890\",\"companyName\":\"dddd\",\"communityCreditCode\":\"91110111MBE1G2B\",\"operateRange\":\"fff\",\"registerNo\":\"91110111MA00G2B\",\"legalPersonName\":\"rrr\"}","srcType":"1","statusCode":"2"},
|
|
{"certId":"2023314","certInfo":"{\"identNo\":\"342224196507051\",\"userRealname\":\"xxxx\",\"identType\":\"01\"}","srcType":"8","statusCode":"0"},
|
|
{"certId":"2023322","certInfo":"{\"businessLicense\":\"91110111MA00BE1G\",\"companyName\":\"sssss\",\"communityCreditCode\":\"91110111MA00BE1\"}","srcType":"2","statusCode":"0"}
|
|
]
|
|
}
|
|
`)
|
|
j, err := gjson.LoadContent(jsonContent)
|
|
t.AssertNil(err)
|
|
var response = new(Response)
|
|
err = j.Scan(response)
|
|
t.AssertNil(err)
|
|
t.Assert(len(response.CertList), 3)
|
|
t.Assert(response.CertList[0].CertID, 2023313)
|
|
t.Assert(response.CertList[1].CertID, 2023314)
|
|
t.Assert(response.CertList[2].CertID, 2023322)
|
|
t.Assert(response.CertList[0].CertInfo.PhoneNumber, "15084890")
|
|
t.Assert(response.CertList[1].CertInfo.IdentNo, "342224196507051")
|
|
t.Assert(response.CertList[2].CertInfo.BusinessLicense, "91110111MA00BE1G")
|
|
})
|
|
}
|