mirror of
https://gitee.com/johng/gf
synced 2026-06-07 02:12:11 +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.
269 lines
7.6 KiB
Go
269 lines
7.6 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 (
|
|
"github.com/gogf/gf/v2/container/gvar"
|
|
"github.com/gogf/gf/v2/net/goai"
|
|
"github.com/gogf/gf/v2/os/gstructs"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
"github.com/gogf/gf/v2/util/gutil"
|
|
)
|
|
|
|
// GetRequest retrieves and returns the parameter named `key` passed from the client and
|
|
// custom params as any, no matter what HTTP method the client is using. The
|
|
// parameter `def` specifies the default value if the `key` does not exist.
|
|
//
|
|
// GetRequest is one of the most commonly used functions for retrieving parameters.
|
|
//
|
|
// Note that if there are multiple parameters with the same name, the parameters are
|
|
// retrieved and overwrote in order of priority: router < query < body < form < custom.
|
|
func (r *Request) GetRequest(key string, def ...any) *gvar.Var {
|
|
value := r.GetParam(key)
|
|
if value.IsNil() {
|
|
value = r.GetForm(key)
|
|
}
|
|
if value.IsNil() {
|
|
r.parseBody()
|
|
if len(r.bodyMap) > 0 {
|
|
if v := r.bodyMap[key]; v != nil {
|
|
value = gvar.New(v)
|
|
}
|
|
}
|
|
}
|
|
if value.IsNil() {
|
|
value = r.GetQuery(key)
|
|
}
|
|
if value.IsNil() {
|
|
value = r.GetRouter(key)
|
|
}
|
|
if !value.IsNil() {
|
|
return value
|
|
}
|
|
if len(def) > 0 {
|
|
return gvar.New(def[0])
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetRequestMap retrieves and returns all parameters passed from the client and custom params
|
|
// as the map, no matter what HTTP method the client is using. The parameter `kvMap` specifies
|
|
// the keys retrieving from client parameters, the associated values are the default values
|
|
// if the client does not pass the according keys.
|
|
//
|
|
// GetRequestMap is one of the most commonly used functions for retrieving parameters.
|
|
//
|
|
// Note that if there are multiple parameters with the same name, the parameters are retrieved
|
|
// and overwrote in order of priority: router < query < body < form < custom.
|
|
func (r *Request) GetRequestMap(kvMap ...map[string]any) map[string]any {
|
|
r.parseQuery()
|
|
r.parseForm()
|
|
r.parseBody()
|
|
var (
|
|
ok, filter bool
|
|
)
|
|
if len(kvMap) > 0 && kvMap[0] != nil {
|
|
filter = true
|
|
}
|
|
m := make(map[string]any)
|
|
for k, v := range r.routerMap {
|
|
if filter {
|
|
if _, ok = kvMap[0][k]; !ok {
|
|
continue
|
|
}
|
|
}
|
|
m[k] = v
|
|
}
|
|
for k, v := range r.queryMap {
|
|
if filter {
|
|
if _, ok = kvMap[0][k]; !ok {
|
|
continue
|
|
}
|
|
}
|
|
m[k] = v
|
|
}
|
|
for k, v := range r.formMap {
|
|
if filter {
|
|
if _, ok = kvMap[0][k]; !ok {
|
|
continue
|
|
}
|
|
}
|
|
m[k] = v
|
|
}
|
|
for k, v := range r.bodyMap {
|
|
if filter {
|
|
if _, ok = kvMap[0][k]; !ok {
|
|
continue
|
|
}
|
|
}
|
|
m[k] = v
|
|
}
|
|
for k, v := range r.paramsMap {
|
|
if filter {
|
|
if _, ok = kvMap[0][k]; !ok {
|
|
continue
|
|
}
|
|
}
|
|
m[k] = v
|
|
}
|
|
// File uploading.
|
|
if r.MultipartForm != nil {
|
|
for name := range r.MultipartForm.File {
|
|
if uploadFiles := r.GetUploadFiles(name); len(uploadFiles) == 1 {
|
|
m[name] = uploadFiles[0]
|
|
} else {
|
|
m[name] = uploadFiles
|
|
}
|
|
}
|
|
}
|
|
// Check none exist parameters and assign it with default value.
|
|
if filter {
|
|
for k, v := range kvMap[0] {
|
|
if _, ok = m[k]; !ok {
|
|
m[k] = v
|
|
}
|
|
}
|
|
}
|
|
return m
|
|
}
|
|
|
|
// GetRequestMapStrStr retrieve and returns all parameters passed from the client and custom
|
|
// params as map[string]string, no matter what HTTP method the client is using. 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) GetRequestMapStrStr(kvMap ...map[string]any) map[string]string {
|
|
requestMap := r.GetRequestMap(kvMap...)
|
|
if len(requestMap) > 0 {
|
|
m := make(map[string]string, len(requestMap))
|
|
for k, v := range requestMap {
|
|
m[k] = gconv.String(v)
|
|
}
|
|
return m
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetRequestMapStrVar retrieve and returns all parameters passed from the client and custom
|
|
// params as map[string]*gvar.Var, no matter what HTTP method the client is using. 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) GetRequestMapStrVar(kvMap ...map[string]any) map[string]*gvar.Var {
|
|
requestMap := r.GetRequestMap(kvMap...)
|
|
if len(requestMap) > 0 {
|
|
m := make(map[string]*gvar.Var, len(requestMap))
|
|
for k, v := range requestMap {
|
|
m[k] = gvar.New(v)
|
|
}
|
|
return m
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// GetRequestStruct retrieves all parameters passed from the client and custom params no matter
|
|
// what HTTP method the client is using, and converts them to give the 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) GetRequestStruct(pointer any, mapping ...map[string]string) error {
|
|
_, err := r.doGetRequestStruct(pointer, mapping...)
|
|
return err
|
|
}
|
|
|
|
func (r *Request) doGetRequestStruct(pointer any, mapping ...map[string]string) (data map[string]any, err error) {
|
|
data = r.GetRequestMap()
|
|
if data == nil {
|
|
data = map[string]any{}
|
|
}
|
|
|
|
// `in` Tag Struct values.
|
|
if err = r.mergeInTagStructValue(data); err != nil {
|
|
return data, nil
|
|
}
|
|
|
|
// Default struct values.
|
|
if err = r.mergeDefaultStructValue(data, pointer); err != nil {
|
|
return data, nil
|
|
}
|
|
|
|
return data, gconv.Struct(data, pointer, mapping...)
|
|
}
|
|
|
|
// mergeDefaultStructValue merges the request parameters with default values from struct tag definition.
|
|
func (r *Request) mergeDefaultStructValue(data map[string]any, pointer any) error {
|
|
fields := r.serveHandler.Handler.Info.ReqStructFields
|
|
if len(fields) > 0 {
|
|
for _, field := range fields {
|
|
if tagValue := field.TagDefault(); tagValue != "" {
|
|
mergeTagValueWithFoundKey(data, false, field.Name(), field.Name(), tagValue)
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// provide non strict routing
|
|
tagFields, err := gstructs.TagFields(pointer, defaultValueTags)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
if len(tagFields) > 0 {
|
|
for _, field := range tagFields {
|
|
mergeTagValueWithFoundKey(data, false, field.Name(), field.Name(), field.TagValue)
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
// mergeInTagStructValue merges the request parameters with header or cookie values from struct `in` tag definition.
|
|
func (r *Request) mergeInTagStructValue(data map[string]any) error {
|
|
fields := r.serveHandler.Handler.Info.ReqStructFields
|
|
if len(fields) > 0 {
|
|
var (
|
|
foundKey string
|
|
foundValue any
|
|
headerMap = make(map[string]any)
|
|
cookieMap = make(map[string]any)
|
|
)
|
|
|
|
for k, v := range r.Header {
|
|
if len(v) > 0 {
|
|
headerMap[k] = v[0]
|
|
}
|
|
}
|
|
|
|
for _, cookie := range r.Cookies() {
|
|
cookieMap[cookie.Name] = cookie.Value
|
|
}
|
|
|
|
for _, field := range fields {
|
|
if tagValue := field.TagIn(); tagValue != "" {
|
|
findKey := field.TagPriorityName()
|
|
switch tagValue {
|
|
case goai.ParameterInHeader:
|
|
foundKey, foundValue = gutil.MapPossibleItemByKey(headerMap, findKey)
|
|
case goai.ParameterInCookie:
|
|
foundKey, foundValue = gutil.MapPossibleItemByKey(cookieMap, findKey)
|
|
}
|
|
if foundKey != "" {
|
|
mergeTagValueWithFoundKey(data, true, foundKey, field.Name(), foundValue)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
return nil
|
|
}
|
|
|
|
// mergeTagValueWithFoundKey merges the request parameters when the key does not exist in the map or overwritten is true or the value is nil.
|
|
func mergeTagValueWithFoundKey(data map[string]any, overwritten bool, findKey string, fieldName string, tagValue any) {
|
|
if foundKey, foundValue := gutil.MapPossibleItemByKey(data, findKey); foundKey == "" {
|
|
data[fieldName] = tagValue
|
|
} else {
|
|
if overwritten || foundValue == nil {
|
|
data[foundKey] = tagValue
|
|
}
|
|
}
|
|
}
|