refactor: 代码优化

Author: ouqiang

README.md

@@ -136,8 +136,8 @@ URL地址 `/delete`
 |   id  | string     |    Job唯一标识       |            |
 
 
-### 查询任务  
-URL地址 `/get`   
+### 完成任务   
+URL地址 `/finish`   
 
 ```json
 {
@@ -147,39 +147,54 @@ URL地址 `/get`
 
 |  参数名 |     类型    |     含义     |        备注       |
 |:-------:|:-----------:|:------------:|:-----------------:|
-|   id  | string     |    Job唯一标识       |            |
+|   id  | string     |    Job唯一标识    |                     |
 
 
+### 查询任务  
+URL地址 `/get`   
 
-队列中有任务返回值
 ```json
 {
-  "code": 0,
-  "message": "操作成功",
-  "data": {
-    "id": "15702398321",
-    "body": "{\"uid\": 10829378,\"created\": 1498657365 }"
-  }
+  "id": "15702398321"
 }
 ```
-队列为空返回值   
+
+|  参数名 |     类型    |     含义     |        备注       |
+|:-------:|:-----------:|:------------:|:-----------------:|
+|   id  | string     |    Job唯一标识       |            |
+
+
+返回值
 ```json
 {
-  "code": 0,
-  "message": "操作成功",
-  "data": null
+    "code": 0,
+    "message": "操作成功",
+    "data": {
+        "topic": "order",
+        "id": "15702398321",
+        "delay": 1506787453,
+        "ttr": 60,
+        "body": "{\"uid\": 10829378,\"created\": 1498657365 }"
+    
+    }
 }
 ```
-  
-### 完成任务   
-URL地址 `/finish`   
 
+|  参数名 |     类型    |     含义     |        备注       |
+|:-------:|:-----------:|:------------:|:-----------------:|
+|   topic  | string     |    Job类型                   |                     |
+|   id     | string     |    Job唯一标识           |                   |
+|   delay  | int        |    Job延迟执行的时间戳    |                   |
+|   ttr  | int        |    Job执行超时时间, 单位：秒   |                   |
+|   body   | string     |    Job内容，供消费者做具体的业务处理 | 
+
+
+Job不存在返回值  
 ```json
 {
-  "id": "15702398321"
+  "code": 0,
+  "message": "操作成功",
+  "data": null
 }
 ```
-
-|  参数名 |     类型    |     含义     |        备注       |
-|:-------:|:-----------:|:------------:|:-----------------:|
-|   id  | string     |    Job唯一标识    |                     |
+  

delayqueue/job.go

@@ -5,11 +5,11 @@ import (
 )
 
 type Job struct {
-	Topic string `json:"topic"`
-	Id    string `json:"id"`    // job唯一标识ID
-	Delay int64  `json:"delay"` // 延迟时间, unix时间戳
-	TTR   int64  `json:"ttr"`
-	Body  string `json:"body"`
+	Topic string `json:"topic" msgpack:"1"`
+	Id    string `json:"id" msgpack:"2"`    // job唯一标识ID
+	Delay int64  `json:"delay" msgpack:"3"` // 延迟时间, unix时间戳
+	TTR   int64  `json:"ttr" msgpack:"4"`
+	Body  string `json:"body" msgpack:"5"`
 }
 
 // 获取Job

routers/routers.go

@@ -11,11 +11,11 @@ import (
 	"github.com/ouqiang/delay-queue/delayqueue"
 )
 
-type PopRequest struct {
+type TopicRequest struct {
 	Topic string `json:"topic"`
 }
 
-type DeleteRequest struct {
+type IdRequest struct {
 	Id string `json:"id"`
 }
 
@@ -54,20 +54,21 @@ func Push(resp http.ResponseWriter, req *http.Request) {
 	err = delayqueue.Push(job)
 
 	if err != nil {
-		resp.Write(generateFailureBody("添加失败"))
+		log.Printf("添加job失败", err.Error())
+		resp.Write(generateFailureBody(err.Error()))
 	} else {
 		resp.Write(generateSuccessBody("添加成功", nil))
 	}
 }
 
 // 获取job
 func Pop(resp http.ResponseWriter, req *http.Request) {
-	var popRequest PopRequest
-	err := readBody(resp, req, &popRequest)
+	var topicRequest TopicRequest
+	err := readBody(resp, req, &topicRequest)
 	if err != nil {
 		return
 	}
-	topic := strings.TrimSpace(popRequest.Topic)
+	topic := strings.TrimSpace(topicRequest.Topic)
 	if topic == "" {
 		resp.Write(generateFailureBody("topic不能为空"))
 		return
@@ -77,7 +78,7 @@ func Pop(resp http.ResponseWriter, req *http.Request) {
 	job, err := delayqueue.Pop(topics)
 	if err != nil {
 		log.Printf("获取job失败#%s", err.Error())
-		resp.Write(generateFailureBody("获取Job失败"))
+		resp.Write(generateFailureBody(err.Error()))
 		return
 	}
 
@@ -103,43 +104,44 @@ func Pop(resp http.ResponseWriter, req *http.Request) {
 
 // 删除job
 func Delete(resp http.ResponseWriter, req *http.Request) {
-	var deleteRequest DeleteRequest
-	err := readBody(resp, req, &deleteRequest)
+	var idRequest IdRequest
+	err := readBody(resp, req, &idRequest)
 	if err != nil {
 		return
 	}
-	id := strings.TrimSpace(deleteRequest.Id)
+	id := strings.TrimSpace(idRequest.Id)
 	if id == "" {
 		resp.Write(generateFailureBody("job id不能为空"))
 		return
 	}
 
+	log.Printf("delete job#jobId-%s\n", id)
 	err = delayqueue.Remove(id)
 	if err != nil {
-		resp.Write(generateFailureBody("删除失败"))
+		log.Printf("删除job失败#%s", err.Error())
+		resp.Write(generateFailureBody(err.Error()))
 		return
 	}
-	log.Printf("delete job#jobId-%s\n", id)
 
 	resp.Write(generateSuccessBody("操作成功", nil))
 }
 
 // 查询job
 func Get(resp http.ResponseWriter, req *http.Request) {
-	var deleteRequest DeleteRequest
-	err := readBody(resp, req, &deleteRequest)
+	var idRequest IdRequest
+	err := readBody(resp, req, &idRequest)
 	if err != nil {
 		return
 	}
-	id := strings.TrimSpace(deleteRequest.Id)
+	id := strings.TrimSpace(idRequest.Id)
 	if id == "" {
 		resp.Write(generateFailureBody("job id不能为空"))
 		return
 	}
 	job, err := delayqueue.Get(id)
 	if err != nil {
 		log.Printf("查询job失败#%s", err.Error())
-		resp.Write(generateFailureBody("查询Job失败"))
+		resp.Write(generateFailureBody(err.Error()))
 		return
 	}
 
@@ -148,19 +150,7 @@ func Get(resp http.ResponseWriter, req *http.Request) {
 		return
 	}
 
-	type Data struct {
-		Id   string `json:"id"`
-		Body string `json:"body"`
-	}
-
-	data := Data{
-		Id:   job.Id,
-		Body: job.Body,
-	}
-
-	log.Printf("get job#%+v", data)
-
-	resp.Write(generateSuccessBody("操作成功", data))
+	resp.Write(generateSuccessBody("操作成功", job))
 }
 
 type ResponseBody struct {