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.
153 lines
4.4 KiB
Go
153 lines
4.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 ghttp
|
|
|
|
import (
|
|
"net/http"
|
|
|
|
"github.com/gogf/gf/v2/container/gvar"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
)
|
|
|
|
// SetQuery sets custom query value with key-value pairs.
|
|
func (r *Request) SetQuery(key string, value any) {
|
|
r.parseQuery()
|
|
if r.queryMap == nil {
|
|
r.queryMap = make(map[string]any)
|
|
}
|
|
r.queryMap[key] = value
|
|
}
|
|
|
|
// GetQuery retrieves and return parameter with the given name `key` from query string
|
|
// and request body. It returns `def` if `key` does not exist in the query and `def` is given,
|
|
// or else it returns nil.
|
|
//
|
|
// Note that if there are multiple parameters with the same name, the parameters are retrieved
|
|
// and overwrote in order of priority: query > body.
|
|
func (r *Request) GetQuery(key string, def ...any) *gvar.Var {
|
|
r.parseQuery()
|
|
if len(r.queryMap) > 0 {
|
|
if value, ok := r.queryMap[key]; ok {
|
|
return gvar.New(value)
|
|
}
|
|
}
|
|
if r.Method == http.MethodGet {
|
|
r.parseBody()
|
|
}
|
|
if len(r.bodyMap) > 0 {
|
|
if v, ok := r.bodyMap[key]; ok {
|
|
return gvar.New(v)
|
|
}
|
|
}
|
|
if len(def) > 0 {
|
|
return gvar.New(def[0])
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetQueryMap retrieves and returns all parameters passed from the client using HTTP GET method
|
|
// as the map. The parameter `kvMap` specifies the keys retrieving from client parameters,
|
|
// the associated values are the default values if the client does not pass.
|
|
//
|
|
// Note that if there are multiple parameters with the same name, the parameters are retrieved and overwrote
|
|
// in order of priority: query > body.
|
|
func (r *Request) GetQueryMap(kvMap ...map[string]any) map[string]any {
|
|
r.parseQuery()
|
|
if r.Method == http.MethodGet {
|
|
r.parseBody()
|
|
}
|
|
var m map[string]any
|
|
if len(kvMap) > 0 && kvMap[0] != nil {
|
|
if len(r.queryMap) == 0 && len(r.bodyMap) == 0 {
|
|
return kvMap[0]
|
|
}
|
|
m = make(map[string]any, len(kvMap[0]))
|
|
if len(r.bodyMap) > 0 {
|
|
for k, v := range kvMap[0] {
|
|
if postValue, ok := r.bodyMap[k]; ok {
|
|
m[k] = postValue
|
|
} else {
|
|
m[k] = v
|
|
}
|
|
}
|
|
}
|
|
if len(r.queryMap) > 0 {
|
|
for k, v := range kvMap[0] {
|
|
if postValue, ok := r.queryMap[k]; ok {
|
|
m[k] = postValue
|
|
} else {
|
|
m[k] = v
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
m = make(map[string]any, len(r.queryMap)+len(r.bodyMap))
|
|
for k, v := range r.bodyMap {
|
|
m[k] = v
|
|
}
|
|
for k, v := range r.queryMap {
|
|
m[k] = v
|
|
}
|
|
}
|
|
return m
|
|
}
|
|
|
|
// GetQueryMapStrStr retrieves and returns all parameters passed from the client using the HTTP GET method as a
|
|
//
|
|
// map[string]string. The parameter `kvMap` specifies the keys
|
|
//
|
|
// retrieving from client parameters, the associated values are the default values if the client
|
|
// does not pass.
|
|
func (r *Request) GetQueryMapStrStr(kvMap ...map[string]any) map[string]string {
|
|
queryMap := r.GetQueryMap(kvMap...)
|
|
if len(queryMap) > 0 {
|
|
m := make(map[string]string, len(queryMap))
|
|
for k, v := range queryMap {
|
|
m[k] = gconv.String(v)
|
|
}
|
|
return m
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetQueryMapStrVar retrieves and returns all parameters passed from the client using the HTTP GET method
|
|
// as map[string]*gvar.Var. The parameter `kvMap` specifies the keys
|
|
// retrieving from client parameters, the associated values are the default values if the client
|
|
// does not pass.
|
|
func (r *Request) GetQueryMapStrVar(kvMap ...map[string]any) map[string]*gvar.Var {
|
|
queryMap := r.GetQueryMap(kvMap...)
|
|
if len(queryMap) > 0 {
|
|
m := make(map[string]*gvar.Var, len(queryMap))
|
|
for k, v := range queryMap {
|
|
m[k] = gvar.New(v)
|
|
}
|
|
return m
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetQueryStruct retrieves all parameters passed from the client using the HTTP GET method
|
|
// and converts them to a given struct object. Note that the parameter `pointer` is a pointer
|
|
// to the struct object. The optional parameter `mapping` is used to specify the key to
|
|
// attribute mapping.
|
|
func (r *Request) GetQueryStruct(pointer any, mapping ...map[string]string) error {
|
|
_, err := r.doGetQueryStruct(pointer, mapping...)
|
|
return err
|
|
}
|
|
|
|
func (r *Request) doGetQueryStruct(pointer any, mapping ...map[string]string) (data map[string]any, err error) {
|
|
r.parseQuery()
|
|
data = r.GetQueryMap()
|
|
if data == nil {
|
|
data = map[string]any{}
|
|
}
|
|
if err = r.mergeDefaultStructValue(data, pointer); err != nil {
|
|
return data, nil
|
|
}
|
|
return data, gconv.Struct(data, pointer, mapping...)
|
|
}
|