From a203ac53874611b4104c55e3ef54bd6f681b4885 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F=E4=B9=90?= <mogfee@163.com>
Date: Thu, 2 Mar 2023 14:23:35 +0800
Subject: [PATCH] pkg

---
 pkg/xredis/xredis.go      | 59 ---------------------------------------
 pkg/xredis/xredis_test.go | 28 -------------------
 pkg/xstring/stringx.go    |  7 ++---
 3 files changed, 3 insertions(+), 91 deletions(-)
 delete mode 100644 pkg/xredis/xredis.go
 delete mode 100644 pkg/xredis/xredis_test.go

diff --git a/pkg/xredis/xredis.go b/pkg/xredis/xredis.go
deleted file mode 100644
index dceb8ca..0000000
--- a/pkg/xredis/xredis.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package xredis
-
-//
-//import (
-//	"context"
-//	"encoding/json"
-//	"fmt"
-//	"github.com/go-redis/redis/v8"
-//	"github.com/pkg/errors"
-//	"time"
-//)
-//
-//var redisClient *redis.Client
-//
-//func Init(host, password string, db int) error {
-//	redisClient = redis.NewClient(&redis.Options{
-//		Network:  "tcp",
-//		Addr:     host,
-//		Password: password,
-//		DB:       db,
-//	})
-//	return redisClient.Ping(context.Background()).Err()
-//}
-//
-//func Client() *redis.Client {
-//	return redisClient
-//}
-//
-//func GetData[T any](ctx context.Context, key string, fn func() (T, error), dur time.Duration) (T, error) {
-//	var result T
-//	res := redisClient.Get(ctx, key).Val()
-//	if res != "" {
-//		err := json.Unmarshal([]byte(res), &result)
-//		if err == nil {
-//			return result, nil
-//		}
-//	}
-//	r, err := fn()
-//	if err != nil {
-//		return result, err
-//	}
-//	if b, err := json.Marshal(r); err == nil {
-//		redisClient.Set(ctx, key, string(b), dur)
-//	}
-//	return r, nil
-//}
-//func Lock[T any](ctx context.Context, key string, fn func() (T, error)) (T, error) {
-//	var res T
-//	lockKey := fmt.Sprintf("lock:%s", key)
-//	ok, err := redisClient.SetNX(ctx, lockKey, 1, time.Second*20).Result()
-//	if err != nil {
-//		return res, errors.Wrap(err, "")
-//	}
-//	if !ok {
-//		return res, errors.Wrap(errors.New(fmt.Sprintf("lock %s exists", lockKey)), "")
-//	}
-//	defer redisClient.Del(ctx, lockKey)
-//	return fn()
-//}
diff --git a/pkg/xredis/xredis_test.go b/pkg/xredis/xredis_test.go
deleted file mode 100644
index d93be3c..0000000
--- a/pkg/xredis/xredis_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package xredis
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-)
-
-type Res struct {
-	Name string
-}
-
-func TestGetData(t *testing.T) {
-	_ = Init("localhost:6379", "", 1)
-	res, err := GetData(context.Background(), "userId1212", func() (*Res, error) {
-		fmt.Println("from db")
-		in := &Res{
-			Name: "ttt",
-		}
-		return in, nil
-	}, time.Second*50)
-
-	if err != nil {
-		t.Error(err)
-	}
-	fmt.Printf("%+v\n", res)
-}
diff --git a/pkg/xstring/stringx.go b/pkg/xstring/stringx.go
index f8aba13..be5b176 100644
--- a/pkg/xstring/stringx.go
+++ b/pkg/xstring/stringx.go
@@ -233,14 +233,13 @@ func UnSerializeBind(data []byte, post any) error {
 	reader := bytes.NewReader(data)
 	b, err := unMarshalByReader(reader)
 	if err != nil {
-		return errors.Wrap(err, "")
+		return err
 	}
 	bb, err := json.Marshal(b)
 	if err != nil {
-		return errors.Wrap(err, "")
+		return err
 	}
-	err = json.Unmarshal(bb, post)
-	return errors.Wrap(err, "")
+	return json.Unmarshal(bb, post)
 }
 
 func unMarshalByReader(reader *bytes.Reader) (interface{}, error) {