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.
305 lines
9.5 KiB
Go
305 lines
9.5 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 (
|
|
"context"
|
|
"fmt"
|
|
"reflect"
|
|
"strings"
|
|
|
|
"github.com/gogf/gf/v2/os/gfile"
|
|
"github.com/gogf/gf/v2/text/gregex"
|
|
"github.com/gogf/gf/v2/text/gstr"
|
|
)
|
|
|
|
// BindObject registers object to server routes with a given pattern.
|
|
//
|
|
// The optional parameter `method` is used to specify the method to be registered, which
|
|
// supports multiple method names; multiple methods are separated by char ',', case-sensitive.
|
|
func (s *Server) BindObject(pattern string, object any, method ...string) {
|
|
var bindMethod = ""
|
|
if len(method) > 0 {
|
|
bindMethod = method[0]
|
|
}
|
|
s.doBindObject(context.TODO(), doBindObjectInput{
|
|
Prefix: "",
|
|
Pattern: pattern,
|
|
Object: object,
|
|
Method: bindMethod,
|
|
Middleware: nil,
|
|
Source: "",
|
|
})
|
|
}
|
|
|
|
// BindObjectMethod registers specified method of the object to server routes with a given pattern.
|
|
//
|
|
// The optional parameter `method` is used to specify the method to be registered, which
|
|
// does not support multiple method names but only one, case-sensitive.
|
|
func (s *Server) BindObjectMethod(pattern string, object any, method string) {
|
|
s.doBindObjectMethod(context.TODO(), doBindObjectMethodInput{
|
|
Prefix: "",
|
|
Pattern: pattern,
|
|
Object: object,
|
|
Method: method,
|
|
Middleware: nil,
|
|
Source: "",
|
|
})
|
|
}
|
|
|
|
// BindObjectRest registers object in REST API styles to server with a specified pattern.
|
|
func (s *Server) BindObjectRest(pattern string, object any) {
|
|
s.doBindObjectRest(context.TODO(), doBindObjectInput{
|
|
Prefix: "",
|
|
Pattern: pattern,
|
|
Object: object,
|
|
Method: "",
|
|
Middleware: nil,
|
|
Source: "",
|
|
})
|
|
}
|
|
|
|
type doBindObjectInput struct {
|
|
Prefix string
|
|
Pattern string
|
|
Object any
|
|
Method string
|
|
Middleware []HandlerFunc
|
|
Source string
|
|
}
|
|
|
|
func (s *Server) doBindObject(ctx context.Context, in doBindObjectInput) {
|
|
// Convert input method to map for convenience and high performance searching purpose.
|
|
var methodMap map[string]bool
|
|
if len(in.Method) > 0 {
|
|
methodMap = make(map[string]bool)
|
|
for _, v := range strings.Split(in.Method, ",") {
|
|
methodMap[strings.TrimSpace(v)] = true
|
|
}
|
|
}
|
|
// If the `method` in `pattern` is `defaultMethod`,
|
|
// it removes for convenience for next statement control.
|
|
domain, method, path, err := s.parsePattern(in.Pattern)
|
|
if err != nil {
|
|
s.Logger().Fatalf(ctx, `%+v`, err)
|
|
return
|
|
}
|
|
if gstr.Equal(method, defaultMethod) {
|
|
in.Pattern = s.serveHandlerKey("", path, domain)
|
|
}
|
|
var (
|
|
handlerMap = make(map[string]*HandlerItem)
|
|
reflectValue = reflect.ValueOf(in.Object)
|
|
reflectType = reflectValue.Type()
|
|
initFunc func(*Request)
|
|
shutFunc func(*Request)
|
|
)
|
|
// If given `object` is not pointer, it then creates a temporary one,
|
|
// of which the value is `reflectValue`.
|
|
// It then can retrieve all the methods both of struct/*struct.
|
|
if reflectValue.Kind() == reflect.Struct {
|
|
newValue := reflect.New(reflectType)
|
|
newValue.Elem().Set(reflectValue)
|
|
reflectValue = newValue
|
|
reflectType = reflectValue.Type()
|
|
}
|
|
structName := reflectType.Elem().Name()
|
|
if reflectValue.MethodByName(specialMethodNameInit).IsValid() {
|
|
initFunc = reflectValue.MethodByName(specialMethodNameInit).Interface().(func(*Request))
|
|
}
|
|
if reflectValue.MethodByName(specialMethodNameShut).IsValid() {
|
|
shutFunc = reflectValue.MethodByName(specialMethodNameShut).Interface().(func(*Request))
|
|
}
|
|
pkgPath := reflectType.Elem().PkgPath()
|
|
pkgName := gfile.Basename(pkgPath)
|
|
for i := 0; i < reflectValue.NumMethod(); i++ {
|
|
methodName := reflectType.Method(i).Name
|
|
if methodMap != nil && !methodMap[methodName] {
|
|
continue
|
|
}
|
|
if methodName == specialMethodNameInit || methodName == specialMethodNameShut {
|
|
continue
|
|
}
|
|
objName := gstr.Replace(reflectType.String(), fmt.Sprintf(`%s.`, pkgName), "")
|
|
if objName[0] == '*' {
|
|
objName = fmt.Sprintf(`(%s)`, objName)
|
|
}
|
|
|
|
funcInfo, err := s.checkAndCreateFuncInfo(reflectValue.Method(i).Interface(), pkgPath, objName, methodName)
|
|
if err != nil {
|
|
s.Logger().Fatalf(ctx, `%+v`, err)
|
|
}
|
|
|
|
key := s.mergeBuildInNameToPattern(in.Pattern, structName, methodName, true)
|
|
handlerMap[key] = &HandlerItem{
|
|
Name: fmt.Sprintf(`%s.%s.%s`, pkgPath, objName, methodName),
|
|
Type: HandlerTypeObject,
|
|
Info: funcInfo,
|
|
InitFunc: initFunc,
|
|
ShutFunc: shutFunc,
|
|
Middleware: in.Middleware,
|
|
Source: in.Source,
|
|
}
|
|
// If there's "Index" method, then an additional route is automatically added
|
|
// to match the main URI, for example:
|
|
// If pattern is "/user", then "/user" and "/user/index" are both automatically
|
|
// registered.
|
|
//
|
|
// Note that if there's built-in variables in pattern, this route will not be added
|
|
// automatically.
|
|
var (
|
|
isIndexMethod = strings.EqualFold(methodName, specialMethodNameIndex)
|
|
hasBuildInVar = gregex.IsMatchString(`\{\.\w+\}`, in.Pattern)
|
|
hashTwoParams = funcInfo.Type.NumIn() == 2
|
|
)
|
|
if isIndexMethod && !hasBuildInVar && !hashTwoParams {
|
|
p := gstr.PosRI(key, "/index")
|
|
k := key[0:p] + key[p+6:]
|
|
if len(k) == 0 || k[0] == '@' {
|
|
k = "/" + k
|
|
}
|
|
handlerMap[k] = &HandlerItem{
|
|
Name: fmt.Sprintf(`%s.%s.%s`, pkgPath, objName, methodName),
|
|
Type: HandlerTypeObject,
|
|
Info: funcInfo,
|
|
InitFunc: initFunc,
|
|
ShutFunc: shutFunc,
|
|
Middleware: in.Middleware,
|
|
Source: in.Source,
|
|
}
|
|
}
|
|
}
|
|
s.bindHandlerByMap(ctx, in.Prefix, handlerMap)
|
|
}
|
|
|
|
type doBindObjectMethodInput struct {
|
|
Prefix string
|
|
Pattern string
|
|
Object any
|
|
Method string
|
|
Middleware []HandlerFunc
|
|
Source string
|
|
}
|
|
|
|
func (s *Server) doBindObjectMethod(ctx context.Context, in doBindObjectMethodInput) {
|
|
var (
|
|
handlerMap = make(map[string]*HandlerItem)
|
|
reflectValue = reflect.ValueOf(in.Object)
|
|
reflectType = reflectValue.Type()
|
|
initFunc func(*Request)
|
|
shutFunc func(*Request)
|
|
)
|
|
// If given `object` is not pointer, it then creates a temporary one,
|
|
// of which the value is `v`.
|
|
if reflectValue.Kind() == reflect.Struct {
|
|
newValue := reflect.New(reflectType)
|
|
newValue.Elem().Set(reflectValue)
|
|
reflectValue = newValue
|
|
reflectType = reflectValue.Type()
|
|
}
|
|
var (
|
|
structName = reflectType.Elem().Name()
|
|
methodName = strings.TrimSpace(in.Method)
|
|
methodValue = reflectValue.MethodByName(methodName)
|
|
)
|
|
if !methodValue.IsValid() {
|
|
s.Logger().Fatalf(ctx, "invalid method name: %s", methodName)
|
|
return
|
|
}
|
|
if reflectValue.MethodByName(specialMethodNameInit).IsValid() {
|
|
initFunc = reflectValue.MethodByName(specialMethodNameInit).Interface().(func(*Request))
|
|
}
|
|
if reflectValue.MethodByName(specialMethodNameShut).IsValid() {
|
|
shutFunc = reflectValue.MethodByName(specialMethodNameShut).Interface().(func(*Request))
|
|
}
|
|
var (
|
|
pkgPath = reflectType.Elem().PkgPath()
|
|
pkgName = gfile.Basename(pkgPath)
|
|
objName = gstr.Replace(reflectType.String(), fmt.Sprintf(`%s.`, pkgName), "")
|
|
)
|
|
if objName[0] == '*' {
|
|
objName = fmt.Sprintf(`(%s)`, objName)
|
|
}
|
|
|
|
funcInfo, err := s.checkAndCreateFuncInfo(methodValue.Interface(), pkgPath, objName, methodName)
|
|
if err != nil {
|
|
s.Logger().Fatalf(ctx, `%+v`, err)
|
|
}
|
|
|
|
key := s.mergeBuildInNameToPattern(in.Pattern, structName, methodName, false)
|
|
handlerMap[key] = &HandlerItem{
|
|
Name: fmt.Sprintf(`%s.%s.%s`, pkgPath, objName, methodName),
|
|
Type: HandlerTypeObject,
|
|
Info: funcInfo,
|
|
InitFunc: initFunc,
|
|
ShutFunc: shutFunc,
|
|
Middleware: in.Middleware,
|
|
Source: in.Source,
|
|
}
|
|
|
|
s.bindHandlerByMap(ctx, in.Prefix, handlerMap)
|
|
}
|
|
|
|
func (s *Server) doBindObjectRest(ctx context.Context, in doBindObjectInput) {
|
|
var (
|
|
handlerMap = make(map[string]*HandlerItem)
|
|
reflectValue = reflect.ValueOf(in.Object)
|
|
reflectType = reflectValue.Type()
|
|
initFunc func(*Request)
|
|
shutFunc func(*Request)
|
|
)
|
|
// If given `object` is not pointer, it then creates a temporary one,
|
|
// of which the value is `v`.
|
|
if reflectValue.Kind() == reflect.Struct {
|
|
newValue := reflect.New(reflectType)
|
|
newValue.Elem().Set(reflectValue)
|
|
reflectValue = newValue
|
|
reflectType = reflectValue.Type()
|
|
}
|
|
structName := reflectType.Elem().Name()
|
|
if reflectValue.MethodByName(specialMethodNameInit).IsValid() {
|
|
initFunc = reflectValue.MethodByName(specialMethodNameInit).Interface().(func(*Request))
|
|
}
|
|
if reflectValue.MethodByName(specialMethodNameShut).IsValid() {
|
|
shutFunc = reflectValue.MethodByName(specialMethodNameShut).Interface().(func(*Request))
|
|
}
|
|
pkgPath := reflectType.Elem().PkgPath()
|
|
for i := 0; i < reflectValue.NumMethod(); i++ {
|
|
methodName := reflectType.Method(i).Name
|
|
if _, ok := methodsMap[strings.ToUpper(methodName)]; !ok {
|
|
continue
|
|
}
|
|
pkgName := gfile.Basename(pkgPath)
|
|
objName := gstr.Replace(reflectType.String(), fmt.Sprintf(`%s.`, pkgName), "")
|
|
if objName[0] == '*' {
|
|
objName = fmt.Sprintf(`(%s)`, objName)
|
|
}
|
|
|
|
funcInfo, err := s.checkAndCreateFuncInfo(
|
|
reflectValue.Method(i).Interface(),
|
|
pkgPath,
|
|
objName,
|
|
methodName,
|
|
)
|
|
if err != nil {
|
|
s.Logger().Fatalf(ctx, `%+v`, err)
|
|
}
|
|
|
|
key := s.mergeBuildInNameToPattern(methodName+":"+in.Pattern, structName, methodName, false)
|
|
handlerMap[key] = &HandlerItem{
|
|
Name: fmt.Sprintf(`%s.%s.%s`, pkgPath, objName, methodName),
|
|
Type: HandlerTypeObject,
|
|
Info: funcInfo,
|
|
InitFunc: initFunc,
|
|
ShutFunc: shutFunc,
|
|
Middleware: in.Middleware,
|
|
Source: in.Source,
|
|
}
|
|
}
|
|
s.bindHandlerByMap(ctx, in.Prefix, handlerMap)
|
|
}
|