Compare commits

...

8 Commits
v1.0.6 ... main

Author SHA1 Message Date
AI Engineer
868bd819a6 chore: infrastructure alignment and doc sync (by AICoder) 2026-05-16 01:52:51 +08:00
AI Engineer
4d8d18de7b chore: infrastructure alignment and doc sync (by checkall) 2026-05-14 21:57:12 +08:00
AI Engineer
7f5ff81446 refactor: align with crypto.DefaultAES interface 2026-05-12 23:10:29 +08:00
AI Engineer
b787e35c3c 对齐 Tag v1.3.0 (By AI) 2026-05-10 15:48:38 +08:00
AI Engineer
f3bd2890bb chore: final infrastructure alignment 2026-05-10 13:12:44 +08:00
AI Engineer
8a7e709124 chore: infrastructure alignment 2026-05-10 13:04:37 +08:00
AI Engineer
b1b000d9a3 chore: release v1.0.8 - align NewIDMaker API with id.IDMaker 2026-05-10 09:52:32 +08:00
AI Engineer
e9ffae9fd2 chore(deps): align with log v1.1.13 2026-05-09 14:56:00 +08:00
8 changed files with 85 additions and 68 deletions

7
.gitignore vendored
View File

@ -1 +1,8 @@
.log.meta.json
.ai/
.geminiignore
.gemini
env.json
env.yml
env.yaml
/CODE-FULL.md

View File

@ -1,5 +1,15 @@
# CHANGELOG - redis
## v1.0.8 (2026-05-10)
- **API 对齐**:
- `NewIDMaker` 返回值从 `*IDMaker` 修改为 `*id.IDMaker`,保持全局接口统一。
- 移除了 `redis.IDMaker` 冗余的包装方法,直接使用 `id.IDMaker` 的实现。
## v1.0.7 (2026-05-09)
- **基础设施对齐**:
- 升级 `apigo.cc/go/log``v1.1.13`
- `redis` 包不涉及自定义日志类型,本次升级无代码变更。
## v1.0.6 (2026-05-07)
- **Security & Compatibility**:
- 增强 `Redis` 密码解密逻辑,支持 URL-safe Base64 编码的加密密码,提升多平台配置兼容性。

View File

@ -32,9 +32,7 @@
- `Stop()`: 停止所有订阅。
### 分布式 ID (IDMaker)
- `NewIDMaker(rd *Redis) *IDMaker`: 创建分布式 ID 生成器。
- `Get(size int)`: 获取指定长度的唯一 ID。
- `GetForMysql(size int)`: 获取针对 MySQL 优化的唯一 ID。
- `NewIDMaker(rd *Redis) *id.IDMaker`: 创建基于 Redis 的分布式 ID 生成器。
## 示例

View File

@ -31,14 +31,16 @@ type Config struct {
var redisConfigs = make(map[string]*Config)
var redisConfigsLock = sync.RWMutex{}
var confAes, _ = crypto.NewAESGCMAndEraseKey([]byte("?GQ$0K0GgLdO=f+~L68PLm$uhKr4'=tV"), []byte("VFs7@sK61cj^f?HZ"))
var keysOnce = sync.Once{}
var confAES *crypto.Symmetric
func init() {
crypto.OnSetDefaultAES(func(aes *crypto.Symmetric) {
confAES = aes
})
}
func SetEncryptKeys(key, iv []byte) {
keysOnce.Do(func() {
confAes.Close()
confAes, _ = crypto.NewAESGCMAndEraseKey(key, iv)
})
crypto.SetDefaultAES(key, iv)
}
func (conf *Config) ConfigureBy(setting string) {

45
go.mod
View File

@ -3,42 +3,21 @@ module apigo.cc/go/redis
go 1.25.0
require (
apigo.cc/go/cast v1.2.8
apigo.cc/go/config v1.0.6
apigo.cc/go/crypto v1.0.5
apigo.cc/go/encoding v1.0.5
apigo.cc/go/id v1.0.5
apigo.cc/go/log v1.1.9
apigo.cc/go/safe v1.0.5
apigo.cc/go/cast v1.3.3
apigo.cc/go/config v1.3.1
apigo.cc/go/crypto v1.3.1
apigo.cc/go/encoding v1.3.1
apigo.cc/go/id v1.3.1
apigo.cc/go/log v1.3.4
apigo.cc/go/safe v1.3.1
github.com/gomodule/redigo v1.9.3
)
require (
apigo.cc/go/file v1.0.6 // indirect
apigo.cc/go/rand v1.0.5 // indirect
apigo.cc/go/shell v1.0.5 // indirect
github.com/stretchr/testify v1.11.1 // indirect
golang.org/x/crypto v0.50.0 // indirect
golang.org/x/sys v0.43.0 // indirect
apigo.cc/go/file v1.3.2 // indirect
apigo.cc/go/rand v1.3.1 // indirect
apigo.cc/go/shell v1.3.1 // indirect
golang.org/x/crypto v0.51.0 // indirect
golang.org/x/sys v0.44.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
replace apigo.cc/go/cast => ../cast
replace apigo.cc/go/config => ../config
replace apigo.cc/go/crypto => ../crypto
replace apigo.cc/go/id => ../id
replace apigo.cc/go/log => ../log
replace apigo.cc/go/safe => ../safe
replace apigo.cc/go/rand => ../rand
replace apigo.cc/go/file => ../file
replace apigo.cc/go/encoding => ../encoding
replace apigo.cc/go/shell => ../shell

32
go.sum
View File

@ -1,3 +1,23 @@
apigo.cc/go/cast v1.3.3 h1:aln5eDR5DZVWVzZ/y5SJh1gQNgWv2sT82I25NaO9g34=
apigo.cc/go/cast v1.3.3/go.mod h1:lGlwImiOvHxG7buyMWhFzcdvQzmSaoKbmr7bcDfUpHk=
apigo.cc/go/config v1.3.1 h1:wZzUh4oL+fGD6SayVgX6prLPMsniM25etWFcEH8XzIE=
apigo.cc/go/config v1.3.1/go.mod h1:7KHz/1WmtBLM762Lln/TaXh2dmlMvJTLhnlk33zbS3U=
apigo.cc/go/crypto v1.3.1 h1:ulQ2zX9bUWirk0sEacx1Srsjs2Jow7HlZq7ED7msNcg=
apigo.cc/go/crypto v1.3.1/go.mod h1:SwHlBFDPddttWgFFtzsEMla8CM/rcFy9nvdsJjW4CIs=
apigo.cc/go/encoding v1.3.1 h1:y8O58KYAyulkThg1O2ji2BqjnFoSvk42sit9I3z+K7Y=
apigo.cc/go/encoding v1.3.1/go.mod h1:xAJk5b83VZ31mXMTnyp0dfMoBKfT/AHDn0u+cQfojgY=
apigo.cc/go/file v1.3.2 h1:pu4oiDyiqgj3/eykfnJf+/6+A9v/Z0b3ClP5XK+lwG4=
apigo.cc/go/file v1.3.2/go.mod h1:vci4h0Pz94mV6dkniQkuyBYERVYeq7/LX4jJVuCg9hs=
apigo.cc/go/id v1.3.1 h1:pkqi6VeWyQoHuIu0Zbx/RRxIAdM61Js0j6cY1M9XVCk=
apigo.cc/go/id v1.3.1/go.mod h1:P2/vl3tyW3US+ayOFSMoPIOCulNLBngNYPhXJC/Z7J4=
apigo.cc/go/log v1.3.4 h1:UT8Neb9r4QjjbCFbTzw+ZeTxd+DmdmR5gNExeR4Cj+g=
apigo.cc/go/log v1.3.4/go.mod h1:/Q/2r51xWSsrS4QN5U9jLiTw8n6qNC8kG9nuVHweY20=
apigo.cc/go/rand v1.3.1 h1:7FvsI6PtQ5XrWER0dTiLVo0p7GIxRidT/TBKhVy93j8=
apigo.cc/go/rand v1.3.1/go.mod h1:mZ/4Soa3bk+XvDaqPWJuUe1bfEi4eThBj1XmEAuYxsk=
apigo.cc/go/safe v1.3.1 h1:irTCqPAC97gGsX/Lw5AzLelDt1xXLEZIAaVhLELWe9Q=
apigo.cc/go/safe v1.3.1/go.mod h1:XdOpBhN2vkImalaykYXXmEpczqWa1y3ah6/Q72cdRqE=
apigo.cc/go/shell v1.3.1 h1:M8oD0b2HcJuCC6frQFx11b3UTcTx3lATX8XK+YXSVm8=
apigo.cc/go/shell v1.3.1/go.mod h1:ZMdJjpCpWdvsHKUXlelh/AxsV/nWdkH/k3lISfzMdUw=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/gomodule/redigo v1.9.3 h1:dNPSXeXv6HCq2jdyWfjgmhBdqnR6PRO3m/G05nvpPC8=
@ -10,12 +30,12 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI=
golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q=
golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
golang.org/x/crypto v0.51.0 h1:IBPXwPfKxY7cWQZ38ZCIRPI50YLeevDLlLnyC5wRGTI=
golang.org/x/crypto v0.51.0/go.mod h1:8AdwkbraGNABw2kOX6YFPs3WM22XqI4EXEd8g+x7Oc8=
golang.org/x/sys v0.44.0 h1:ildZl3J4uzeKP07r2F++Op7E9B29JRUy+a27EibtBTQ=
golang.org/x/sys v0.44.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=

24
id.go
View File

@ -7,22 +7,20 @@ import (
"apigo.cc/go/id"
)
type IDMaker struct {
type idMaker struct {
rd *Redis
secCurrent uint64
secIndexMax uint64
secIndexNext uint64
lock sync.Mutex
maker *id.IDMaker
}
func NewIDMaker(rd *Redis) *IDMaker {
im := &IDMaker{rd: rd}
im.maker = id.NewIDMaker(im.makeSecIndex)
return im
func NewIDMaker(rd *Redis) *id.IDMaker {
im := &idMaker{rd: rd}
return id.NewIDMaker(im.makeSecIndex)
}
func (im *IDMaker) makeSecIndex(sec uint64) uint64 {
func (im *idMaker) makeSecIndex(sec uint64) uint64 {
im.lock.Lock()
defer im.lock.Unlock()
@ -48,15 +46,3 @@ func (im *IDMaker) makeSecIndex(sec uint64) uint64 {
}
return idx
}
func (im *IDMaker) Get(size int) string {
return im.maker.Get(size)
}
func (im *IDMaker) GetForMysql(size int) string {
return im.maker.GetForMysql(size)
}
func (im *IDMaker) GetForPostgreSQL(size int) string {
return im.maker.GetForPostgreSQL(size)
}

View File

@ -76,7 +76,7 @@ func GetRedis(name string, logger *log.Logger) *Redis {
conf = parseByName(name)
}
if pwd, err := confAes.Decrypt(cast.As(encoding.UnUrlBase64FromString(conf.Password))); err == nil {
if pwd, err := confAES.Decrypt(cast.As(encoding.UnUrlBase64FromString(conf.Password))); err == nil {
conf.pwd = pwd
} else {
conf.pwd = safe.NewSafeBuf([]byte(conf.Password))
@ -113,6 +113,21 @@ func GetRedis(name string, logger *log.Logger) *Redis {
return rd.CopyByLogger(logger)
}
// Do 执行 Redis 命令 (使用默认实例 "default")
func Do(cmd string, values ...any) *Result {
return GetRedis("default", nil).Do(cmd, values...)
}
// Subscribe 订阅频道 (使用默认实例 "default")
func Subscribe(name string, reset func(), received func([]byte)) bool {
return GetRedis("default", nil).Subscribe(name, reset, received)
}
// PUBLISH 发布消息 (使用默认实例 "default")
func PUBLISH(channel, data string) bool {
return GetRedis("default", nil).PUBLISH(channel, data)
}
func NewRedis(conf *Config, logger *log.Logger) *Redis {
if logger == nil {
logger = log.DefaultLogger