优化

client.dotask.go

@@ -6,10 +6,11 @@ import (
     "log"
 )
 
+// 完成单次任务
 func DoTask(dbname, siteid, userId, task_type string, url ...string) (bool, error) {
 
-    if dbname == "" || userId == "" || task_type == ""{
-        return false, errors.New("参数错误")
+    if dbname == "" || userId == "" || task_type == "" || siteid == "" {
+        return false, errors.New("参数不能为空")
     }
 
     conn, err := rpc_server_conn(url...)
@@ -57,3 +58,57 @@ func DoTask(dbname, siteid, userId, task_type string, url ...string) (bool, erro
 
     return task_res, nil
 }
+
+// 完成循环类任务
+func DoCycleTask(dbname, siteid, userId, task_id, task_category string, url ...string) (bool, error) {
+
+    if dbname == "" || userId == "" || task_id == "" {
+        return false, errors.New("参数错误")
+    }
+
+    conn, err := rpc_server_conn(url...)
+    if err != nil {
+        return false, err
+    }
+    defer conn.Close()
+
+    data := DoCycleTaskParam{}
+    data.Dbname = dbname
+    data.SiteId = siteid
+    data.UserId = userId
+    data.TaskId = task_id
+    data.TaskCategroy = task_category
+
+    req, err := SetReqData(data)
+    if err != nil {
+        log.Println("DoCycleTask crypter error:", err)
+        return false, err
+    }
+
+    res := &Response{}
+
+    err = conn.DoCycleTask(req, res)
+
+    if err != nil {
+        log.Println("taskrpc DoCycleTask error:", err)
+        return false, err
+    }
+
+    res_data_de, err := GetResData(res)
+
+    if err != nil {
+        return false, err
+    }
+    if res_data_de == "" {
+        return false, nil
+    }
+
+    var task_res bool
+    err = json.Unmarshal([]byte(res_data_de), &task_res)
+
+    if err != nil {
+        return false, err
+    }
+
+    return task_res, nil
+}

client.dotask_test.go

@@ -5,13 +5,26 @@ import (
 )
 
 func Test_DoTask(t *testing.T) {
-	dbname := "shop_v2_org"
-	siteid := ""
-	userid := "2"
-	task_type := "phone"
+	dbname := "shop"
+	siteid := "1198881"
+	userid := "532"
+	task_type := "vip"
 
 	list, err := DoTask(dbname,siteid,userid,task_type)
 
 	t.Log(list)
 	t.Log(err)
 }
+
+func Test_DoCycleTask(t *testing.T) {
+	dbname := "shop"
+	siteid := "1198881"
+	userid := "19"
+	task_id := "43"
+	task_category := "normal"
+
+	list, err := DoCycleTask(dbname,siteid,userid,task_id,task_category)
+
+	t.Log(list)
+	t.Log(err)
+}

common.go

@@ -1,7 +1,7 @@
 package taskrpc
 
 import (
-    "git.tetele.net/tgo/conf"
+    "git.tetele.net/yueheng/conf"
 )
 
 type Req struct {

go.mod

@@ -3,8 +3,8 @@ module git.tetele.net/tgo/taskrpc
 go 1.17
 
 require (
-	git.tetele.net/tgo/conf v0.39.4
 	git.tetele.net/tgo/crypter v0.2.2
+	git.tetele.net/yueheng/conf v1.3.2
 	github.com/chai2010/protorpc v1.1.3
 	github.com/golang/protobuf v1.5.2
 )

go.sum

@@ -1,7 +1,7 @@
-git.tetele.net/tgo/conf v0.39.4 h1:tkhb9+i1QC8CW81VuTCR2f4VpS2oR23WbhxmIePo0Ak=
-git.tetele.net/tgo/conf v0.39.4/go.mod h1:AWVIBEDE5dtotthUgR0SWaR2Qa6/f+O5WQ3s7Tj8q7A=
 git.tetele.net/tgo/crypter v0.2.2 h1:YMQJh2Gj5Po4ZfelJUmXBKi01UbmtiSy3bmqRfnYQMo=
 git.tetele.net/tgo/crypter v0.2.2/go.mod h1:vfvRLZA8+lHNgNXneOcgvVhDyuv25ZRb+C6xHOmXNx0=
+git.tetele.net/yueheng/conf v1.3.2 h1:mkSShvXkfY0zBdaInRZZecifoQMRtGRf88kMPKyc3tY=
+git.tetele.net/yueheng/conf v1.3.2/go.mod h1:xlp2rxZG7FFEkTx3F8yFLaaIYxvySRpm2b2mozQW2Ek=
 github.com/chai2010/protorpc v1.1.3 h1:VJK5hIoZn0XCGol0GmbxZkUG6FbTI5LP2Lam6RVd15w=
 github.com/chai2010/protorpc v1.1.3/go.mod h1:/wO0kiyVdu7ug8dCMrA2yDr2vLfyhsLEuzLa9J2HJ+I=
 github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=

task.pb.go

@@ -99,6 +99,7 @@ func init() {
 
 type TaskService interface {
 	DoTask(in *Request, out *Response) error
+	DoCycleTask(in *Request, out *Response) error
 }
 
 // AcceptTaskServiceClient accepts connections on the listener and serves requests
@@ -173,6 +174,9 @@ func NewTaskServiceClient(conn io.ReadWriteCloser) (*TaskServiceClient, *rpc.Cli
 func (c *TaskServiceClient) DoTask(in *Request, out *Response) error {
 	return c.Call("TaskService.DoTask", in, out)
 }
+func (c *TaskServiceClient) DoCycleTask(in *Request, out *Response) error {
+	return c.Call("TaskService.DoCycleTask", in, out)
+}
 
 // DialTaskService connects to an TaskService at the specified network address.
 func DialTaskService(network, addr string) (*TaskServiceClient, *rpc.Client, error) {

task.proto

@@ -18,4 +18,5 @@ message Response {
 // rpc方法
 service TaskService {
     rpc DoTask (Request) returns (Response);    // 完成了某项任务
+    rpc DoCycleTask (Request) returns (Response);    // 完成循环类任务
 }

variable.go

@@ -3,8 +3,16 @@ package taskrpc
 var DES_KEY = "task2296"
 
 type DoTaskParam struct {
-	SiteId string `json:"site_id"`
-	Dbname string `json:"database"`
-	Type   string `json:"type"`
-	UserId string `json:"user_id"`
+    SiteId string `json:"site_id"`
+    Dbname string `json:"database"`
+    Type   string `json:"type"`
+    UserId string `json:"user_id"`
+}
+
+type DoCycleTaskParam struct {
+    SiteId       string `json:"site_id"`
+    Dbname       string `json:"database"`
+    TaskId       string `json:"task_id"`
+    TaskCategroy string `json:"task_category"`
+    UserId       string `json:"user_id"`
 }