mirror of
https://gitee.com/johng/gf
synced 2026-06-06 16:21:40 +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.
386 lines
8.6 KiB
Go
386 lines
8.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 gsession_test
|
|
|
|
import (
|
|
"fmt"
|
|
"time"
|
|
|
|
"github.com/gogf/gf/v2/container/gmap"
|
|
"github.com/gogf/gf/v2/frame/g"
|
|
"github.com/gogf/gf/v2/os/gctx"
|
|
"github.com/gogf/gf/v2/os/gsession"
|
|
)
|
|
|
|
func ExampleNew() {
|
|
manager := gsession.New(time.Second)
|
|
fmt.Println(manager.GetTTL())
|
|
|
|
// Output:
|
|
// 1s
|
|
}
|
|
|
|
func ExampleManager_SetStorage() {
|
|
manager := gsession.New(time.Second)
|
|
manager.SetStorage(gsession.NewStorageMemory())
|
|
fmt.Println(manager.GetTTL())
|
|
|
|
// Output:
|
|
// 1s
|
|
}
|
|
|
|
func ExampleManager_GetStorage() {
|
|
manager := gsession.New(time.Second, gsession.NewStorageMemory())
|
|
size, _ := manager.GetStorage().GetSize(gctx.New(), "id")
|
|
fmt.Println(size)
|
|
|
|
// Output:
|
|
// 0
|
|
}
|
|
|
|
func ExampleManager_SetTTL() {
|
|
manager := gsession.New(time.Second)
|
|
manager.SetTTL(time.Minute)
|
|
fmt.Println(manager.GetTTL())
|
|
|
|
// Output:
|
|
// 1m0s
|
|
}
|
|
|
|
func ExampleSession_Set() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
s := manager.New(gctx.New())
|
|
fmt.Println(s.Set("key", "val") == nil)
|
|
|
|
// Output:
|
|
// true
|
|
}
|
|
|
|
func ExampleSession_SetMap() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
s := manager.New(gctx.New())
|
|
fmt.Println(s.SetMap(map[string]any{}) == nil)
|
|
|
|
// Output:
|
|
// true
|
|
}
|
|
|
|
func ExampleSession_Remove() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
s1 := manager.New(gctx.New())
|
|
fmt.Println(s1.Remove("key"))
|
|
|
|
s2 := manager.New(gctx.New(), "Remove")
|
|
fmt.Println(s2.Remove("key"))
|
|
|
|
// Output:
|
|
// <nil>
|
|
// <nil>
|
|
}
|
|
|
|
func ExampleSession_RemoveAll() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
s1 := manager.New(gctx.New())
|
|
fmt.Println(s1.RemoveAll())
|
|
|
|
s2 := manager.New(gctx.New(), "Remove")
|
|
fmt.Println(s2.RemoveAll())
|
|
|
|
// Output:
|
|
// <nil>
|
|
// <nil>
|
|
}
|
|
|
|
func ExampleSession_Id() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
s := manager.New(gctx.New(), "Id")
|
|
id, _ := s.Id()
|
|
fmt.Println(id)
|
|
|
|
// Output:
|
|
// Id
|
|
}
|
|
|
|
func ExampleSession_SetId() {
|
|
nilSession := &gsession.Session{}
|
|
fmt.Println(nilSession.SetId("id"))
|
|
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
s := manager.New(gctx.New())
|
|
s.Id()
|
|
fmt.Println(s.SetId("id"))
|
|
|
|
// Output:
|
|
// <nil>
|
|
// session already started
|
|
}
|
|
|
|
func ExampleSession_SetIdFunc() {
|
|
nilSession := &gsession.Session{}
|
|
fmt.Println(nilSession.SetIdFunc(func(ttl time.Duration) string {
|
|
return "id"
|
|
}))
|
|
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
s := manager.New(gctx.New())
|
|
s.Id()
|
|
fmt.Println(s.SetIdFunc(func(ttl time.Duration) string {
|
|
return "id"
|
|
}))
|
|
|
|
// Output:
|
|
// <nil>
|
|
// session already started
|
|
}
|
|
|
|
func ExampleSession_Data() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
|
|
s1 := manager.New(gctx.New())
|
|
data1, _ := s1.Data()
|
|
fmt.Println(data1)
|
|
|
|
s2 := manager.New(gctx.New(), "id_data")
|
|
data2, _ := s2.Data()
|
|
fmt.Println(data2)
|
|
|
|
// Output:
|
|
// map[]
|
|
// map[]
|
|
}
|
|
|
|
func ExampleSession_Size() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
|
|
s1 := manager.New(gctx.New())
|
|
size1, _ := s1.Size()
|
|
fmt.Println(size1)
|
|
|
|
s2 := manager.New(gctx.New(), "Size")
|
|
size2, _ := s2.Size()
|
|
fmt.Println(size2)
|
|
|
|
// Output:
|
|
// 0
|
|
// 0
|
|
}
|
|
|
|
func ExampleSession_Contains() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
manager := gsession.New(time.Second, storage)
|
|
|
|
s1 := manager.New(gctx.New())
|
|
notContains, _ := s1.Contains("Contains")
|
|
fmt.Println(notContains)
|
|
|
|
s2 := manager.New(gctx.New(), "Contains")
|
|
contains, _ := s2.Contains("Contains")
|
|
fmt.Println(contains)
|
|
|
|
// Output:
|
|
// false
|
|
// false
|
|
}
|
|
|
|
func ExampleStorageFile_SetCryptoKey() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
storage.SetCryptoKey([]byte("key"))
|
|
|
|
size, _ := storage.GetSize(gctx.New(), "id")
|
|
fmt.Println(size)
|
|
|
|
// Output:
|
|
// 0
|
|
}
|
|
|
|
func ExampleStorageFile_SetCryptoEnabled() {
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
storage.SetCryptoEnabled(true)
|
|
|
|
size, _ := storage.GetSize(gctx.New(), "id")
|
|
fmt.Println(size)
|
|
|
|
// Output:
|
|
// 0
|
|
}
|
|
|
|
func ExampleStorageFile_UpdateTTL() {
|
|
var (
|
|
ctx = gctx.New()
|
|
)
|
|
|
|
storage := gsession.NewStorageFile("", time.Second)
|
|
fmt.Println(storage.UpdateTTL(ctx, "id", time.Second*15))
|
|
|
|
time.Sleep(time.Second * 11)
|
|
|
|
// Output:
|
|
// <nil>
|
|
}
|
|
|
|
func ExampleStorageRedis_Get() {
|
|
storage := gsession.NewStorageRedis(g.Redis())
|
|
val, _ := storage.Get(gctx.New(), "id", "key")
|
|
fmt.Println(val)
|
|
|
|
// May Output:
|
|
// <nil>
|
|
}
|
|
|
|
func ExampleStorageRedis_Data() {
|
|
storage := gsession.NewStorageRedis(g.Redis())
|
|
val, _ := storage.Data(gctx.New(), "id")
|
|
fmt.Println(val)
|
|
|
|
// May Output:
|
|
// map[]
|
|
}
|
|
|
|
func ExampleStorageRedis_GetSize() {
|
|
storage := gsession.NewStorageRedis(g.Redis())
|
|
val, _ := storage.GetSize(gctx.New(), "id")
|
|
fmt.Println(val)
|
|
|
|
// May Output:
|
|
// 0
|
|
}
|
|
|
|
func ExampleStorageRedis_Remove() {
|
|
storage := gsession.NewStorageRedis(g.Redis())
|
|
err := storage.Remove(gctx.New(), "id", "key")
|
|
fmt.Println(err != nil)
|
|
|
|
// May Output:
|
|
// true
|
|
}
|
|
|
|
func ExampleStorageRedis_RemoveAll() {
|
|
storage := gsession.NewStorageRedis(g.Redis())
|
|
err := storage.RemoveAll(gctx.New(), "id")
|
|
fmt.Println(err != nil)
|
|
|
|
// May Output:
|
|
// true
|
|
}
|
|
|
|
func ExampleStorageRedis_UpdateTTL() {
|
|
storage := gsession.NewStorageRedis(g.Redis())
|
|
err := storage.UpdateTTL(gctx.New(), "id", time.Second*15)
|
|
fmt.Println(err)
|
|
|
|
time.Sleep(time.Second * 11)
|
|
|
|
// May Output:
|
|
// <nil>
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_Get() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
|
|
v, err := storage.Get(gctx.New(), "id", "key")
|
|
|
|
fmt.Println(v)
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
// <nil>
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_Data() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
|
|
data, err := storage.Data(gctx.New(), "id")
|
|
|
|
fmt.Println(data)
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
// map[]
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_GetSize() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
|
|
size, err := storage.GetSize(gctx.New(), "id")
|
|
|
|
fmt.Println(size)
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
// 0
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_Remove() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
|
|
err := storage.Remove(gctx.New(), "id", "key")
|
|
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_RemoveAll() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
|
|
err := storage.RemoveAll(gctx.New(), "id")
|
|
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_GetSession() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
data, err := storage.GetSession(gctx.New(), "id", time.Second)
|
|
|
|
fmt.Println(data)
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
//
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_SetSession() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
|
|
strAnyMap := gmap.StrAnyMap{}
|
|
|
|
err := storage.SetSession(gctx.New(), "id", &strAnyMap, time.Second)
|
|
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|
|
|
|
func ExampleStorageRedisHashTable_UpdateTTL() {
|
|
storage := gsession.NewStorageRedisHashTable(g.Redis())
|
|
|
|
err := storage.UpdateTTL(gctx.New(), "id", time.Second)
|
|
|
|
fmt.Println(err)
|
|
|
|
// May Output:
|
|
// redis adapter is not set, missing configuration or adapter register? possible reference: https://github.com/gogf/gf/tree/master/contrib/nosql/redis
|
|
}
|