update

Author: wanghaha-dev

README.md

@@ -7,21 +7,76 @@
 go get github.com/wanghaha-dev/asyncTask
 ```
 
-使用
+简单使用
 ```go
 package main
 
 import (
 	"context"
 	"fmt"
+	"log"
+
 	"github.com/wanghaha-dev/asyncTask"
+)
+
+func main() {
+	task, err := asyncTask.NewTask(context.Background(), asyncTask.Config{
+		Addr:     "127.0.0.1:6379",
+		DB:       0,
+		Password: "",
+	})
+	if err != nil {
+		panic(err)
+	}
+
+	// put task
+	taskId, err := asyncTask.GenerateTaskId()
+	if err != nil {
+		log.Fatalln("generate taskId error!")
+	}
+	task.PutNormalTask(taskId, asyncTask.Map{
+		"name": "task1",
+		"date": asyncTask.Datetime(),
+		"user": "1001",
+	})
+
+	// take task
+	t1, err := task.TakeNormalTask()
+	if err != nil {
+		log.Fatalln("take normal task error:", err)
+	}
+
+	fmt.Println("take task is: ", t1)
+	fmt.Println(t1["task_id"], t1["data"])
+	fmt.Println(t1["data"].(map[string]interface{})["name"])
+	jsonContext, err := t1.GetJSON()
+	if err != nil {
+		log.Fatalln("GetJson error: ", err)
+	}
+	fmt.Println(t1.GetJSON())
+	// {"data":{"date":"2022-08-26 10:26:44","name":"task1","user":"1001"},"task_id":"03efb9e08b284642b5fd1ea11ae20341"}
+	fmt.Println(asyncTask.JSONGet(jsonContext, "data.name"))
+}
+```
+
+
+
+并发使用
+```go
+package main
+
+import (
+	"context"
+	"fmt"
+	"log"
 	"sync"
+
+	"github.com/wanghaha-dev/asyncTask"
 )
 
 func main() {
-	ctx := context.Background()
-	task, err := asyncTask.NewTask(ctx, asyncTask.Config{
-		Addr:      "127.0.0.1:6379",
+	task, err := asyncTask.NewTask(context.Background(), asyncTask.Config{
+		Addr:     "127.0.0.1:6379",
 		DB:       0,
 		Password: "",
 	})
@@ -30,29 +85,38 @@ func main() {
 	}
 
 	var wg sync.WaitGroup
-	wg.Add(1)
+	wg.Add(200)
 
-	// take task
+	// put task
 	go func() {
-		asyncTask.Each(1000, func() {
-			data, err := task.TakeNormalTask()
+		asyncTask.Each(100, func() {
+			taskId, err := asyncTask.GenerateTaskId()
 			if err != nil {
-				panic(err)
+				log.Fatalln("generate taskId error!")
 			}
-			fmt.Println("data:", data)
+			task.PutNormalTask(taskId, asyncTask.Map{
+				"name": "task1",
+				"date": asyncTask.Datetime(),
+				"user": "1001",
+			})
+
+			wg.Done()
 		})
-		wg.Done()
 	}()
 
-	// put task
-	asyncTask.Each(1000, func() {
-		err = task.PutNormalTask("ddd", asyncTask.Map{
-			"name": "wanghaha",
+	// take task
+	go func() {
+		asyncTask.Each(100, func() {
+			t1, err := task.TakeNormalTask()
+			if err != nil {
+				log.Fatalln("take normal task error:", err)
+			}
+
+			fmt.Println("take task is: ", t1)
+
+			wg.Done()
 		})
-		if err != nil {
-			panic(err)
-		}
-	})
+	}()
 
 	wg.Wait()
 	fmt.Println("finish.")

asyncTask.go

@@ -4,8 +4,13 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/go-redis/redis/v8"
+	"reflect"
+	"strings"
 	"time"
+
+	"github.com/go-redis/redis/v8"
+	"github.com/nacos-group/nacos-sdk-go/inner/uuid"
+	"github.com/tidwall/gjson"
 )
 
 type Config struct {
@@ -67,7 +72,7 @@ func (t *Task) PutFailTask(taskId string, data Map) error {
 	return t.putTask(taskId, "fail", data)
 }
 
-func (t *Task) takeNormalTask(list string) (Map, error) {
+func (t *Task) takeNormalTask(list string) (map[string]interface{}, error) {
 	sliceCmd := t.RedisClient.BRPop(t.ctx, 0, list)
 
 	err := sliceCmd.Err()
@@ -79,8 +84,9 @@ func (t *Task) takeNormalTask(list string) (Map, error) {
 	if err != nil {
 		return nil, err
 	}
+	fmt.Println("result:", result, reflect.TypeOf(result[1]))
 
-	data := make(map[string]interface{})
+	data := make(Map)
 	err = json.Unmarshal([]byte(result[1]), &data)
 	if err != nil {
 		return nil, err
@@ -157,6 +163,18 @@ func (t *Task) GetNormalTaskList() ([]string, error) {
 	return t.getFailTaskList("normal")
 }
 
+func (m Map) GetJSON() (string, error) {
+	data, err := json.Marshal(m)
+	if err != nil {
+		return "", err
+	}
+	return string(data), nil
+}
+
+func JSONGet(jsonContext string, key string) gjson.Result {
+	return gjson.Get(jsonContext, key)
+}
+
 func EachStrings(data []string) {
 	for _, item := range data {
 		fmt.Println(item)
@@ -172,3 +190,11 @@ func Each(count int, f func()) {
 func Datetime() string {
 	return time.Now().Format("2006-01-02 15:04:05")
 }
+
+func GenerateTaskId() (string, error) {
+	u, err := uuid.NewV4()
+	if err != nil {
+		return "", err
+	}
+	return strings.ReplaceAll(u.String(), "-", ""), nil
+}

go.mod

@@ -2,8 +2,15 @@ module github.com/wanghaha-dev/asyncTask
 
 go 1.17
 
+require (
+	github.com/go-redis/redis/v8 v8.11.5
+	github.com/nacos-group/nacos-sdk-go v1.1.2
+)
+
 require (
 	github.com/cespare/xxhash/v2 v2.1.2 // indirect
 	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
-	github.com/go-redis/redis/v8 v8.11.5 // indirect
+	github.com/tidwall/gjson v1.14.3 // indirect
+	github.com/tidwall/match v1.1.1 // indirect
+	github.com/tidwall/pretty v1.2.0 // indirect
 )