- update redis

const.go

@@ -1,3 +1,3 @@
 package dorm
 
-const Version = "1.0.13"
+const Version = "1.0.14"

go.mod

@@ -4,7 +4,6 @@ go 1.19
 
 require (
 	github.com/basgys/goxml2json v1.1.0
-	github.com/go-redis/redis/v8 v8.11.5
 	github.com/go-redis/redis/v9 v9.0.0-beta.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/kamva/mgm/v3 v3.4.1

go.sum

@@ -89,8 +89,6 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
-github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI=
-github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo=
 github.com/go-redis/redis/v9 v9.0.0-beta.1 h1:oW3jlPic5HhGUbYMH0lidnP+72BgsT+lCwlVud6o2Mc=
 github.com/go-redis/redis/v9 v9.0.0-beta.1/go.mod h1:6gNX1bXdwkpEG0M/hEBNK/Fp8zdyCkjwwKc6vBbfCDI=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=

redis.go

@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	"github.com/go-redis/redis/v8"
+	"github.com/go-redis/redis/v9"
 	"time"
 )
 

redis_6.go

@@ -1,47 +0,0 @@
-package dorm
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"github.com/go-redis/redis/v8"
-	"time"
-)
-
-// RedisClient6
-// https://redis.uptrace.dev/
-type RedisClient6 struct {
-	Db     *redis.Client      // 驱动
-	config *ConfigRedisClient // 配置
-}
-
-// NewRedisClient6 Redis 6
-func NewRedisClient6(config *ConfigRedisClient) (*RedisClient6, error) {
-
-	c := &RedisClient6{}
-	c.config = config
-	if c.config.PoolSize == 0 {
-		c.config.PoolSize = 100
-	}
-
-	c.Db = redis.NewClient(&redis.Options{
-		Addr:     c.config.Addr,     // 地址
-		Password: c.config.Password, // 密码
-		DB:       c.config.DB,       // 数据库
-		PoolSize: c.config.PoolSize, // 连接池大小
-	})
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	_, err := c.Db.Ping(ctx).Result()
-	if err != nil {
-		return nil, errors.New(fmt.Sprintf("连接失败：%v", err))
-	}
-
-	return c, nil
-}
-
-func (c *RedisClient6) GetDb() *redis.Client {
-	return c.Db
-}

redis_7.go

@@ -1,47 +0,0 @@
-package dorm
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"github.com/go-redis/redis/v9"
-	"time"
-)
-
-// RedisClient7
-// https://redis.uptrace.dev/
-type RedisClient7 struct {
-	Db     *redis.Client      // 驱动
-	config *ConfigRedisClient // 配置
-}
-
-// NewRedisClient7 Redis 7
-func NewRedisClient7(config *ConfigRedisClient) (*RedisClient7, error) {
-
-	c := &RedisClient7{}
-	c.config = config
-	if c.config.PoolSize == 0 {
-		c.config.PoolSize = 100
-	}
-
-	c.Db = redis.NewClient(&redis.Options{
-		Addr:     c.config.Addr,     // 地址
-		Password: c.config.Password, // 密码
-		DB:       c.config.DB,       // 数据库
-		PoolSize: c.config.PoolSize, // 连接池大小
-	})
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	_, err := c.Db.Ping(ctx).Result()
-	if err != nil {
-		return nil, errors.New(fmt.Sprintf("连接失败：%v", err))
-	}
-
-	return c, nil
-}
-
-func (c *RedisClient7) GetDb() *redis.Client {
-	return c.Db
-}

redis_get.go

@@ -1,6 +1,6 @@
 package dorm
 
-import "github.com/go-redis/redis/v8"
+import "github.com/go-redis/redis/v9"
 
 // GetDb 获取驱动
 func (c *RedisClient) GetDb() *redis.Client {

redis_hash_operation.go

@@ -2,7 +2,7 @@ package dorm
 
 import (
 	"context"
-	"github.com/go-redis/redis/v8"
+	"github.com/go-redis/redis/v9"
 )
 
 type HashOperation struct {

redis_list_operation.go

@@ -2,7 +2,7 @@ package dorm
 
 import (
 	"context"
-	"github.com/go-redis/redis/v8"
+	"github.com/go-redis/redis/v9"
 )
 
 type ListOperation struct {

redis_simple_operation.go

@@ -2,7 +2,7 @@ package dorm
 
 import (
 	"context"
-	"github.com/go-redis/redis/v8"
+	"github.com/go-redis/redis/v9"
 	"time"
 )
 

redis_string_operation.go

@@ -2,7 +2,7 @@ package dorm
 
 import (
 	"context"
-	"github.com/go-redis/redis/v8"
+	"github.com/go-redis/redis/v9"
 	"time"
 )