优化

client.dotask.go

@@ -1 +1,114 @@
 package taskrpc
+
+import (
+    "encoding/json"
+    "errors"
+    "log"
+)
+
+// 完成单次任务
+func DoTask(dbname, siteid, userId, task_type string, url ...string) (bool, error) {
+
+    if dbname == "" || userId == "" || task_type == "" || siteid == "" {
+        return false, errors.New("参数不能为空")
+    }
+
+    conn, err := rpc_server_conn(url...)
+    if err != nil {
+        return false, err
+    }
+    defer conn.Close()
+
+    data := DoTaskParam{}
+    data.Dbname = dbname
+    data.SiteId = siteid
+    data.UserId = userId
+    data.Type = task_type
+
+    req, err := SetReqData(data)
+    if err != nil {
+        log.Println("DoTask crypter error:", err)
+        return false, err
+    }
+
+    res := &Response{}
+
+    err = conn.DoTask(req, res)
+
+    if err != nil {
+        log.Println("taskrpc DoTask 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
+}
+
+// 完成循环类任务
+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

@@ -0,0 +1,30 @@
+package taskrpc
+
+import (
+	"testing"
+)
+
+func Test_DoTask(t *testing.T) {
+	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

@@ -0,0 +1,34 @@
+package taskrpc
+
+import (
+    "git.tetele.net/yueheng/conf"
+)
+
+type Req struct {
+    SiteId string
+    Dbname string
+}
+
+type Res struct {
+    Errcode int
+    Errmsg  string
+}
+
+func rpc_server_conn(url ...string) (*TaskServiceClient, error) {
+
+    var rpc_url string
+    if len(url) > 0 && url[0] != "" {
+        rpc_url = url[0]
+    } else if conf.TASK_RPC_URL != "" {
+        rpc_url = conf.TASK_RPC_URL
+    } else {
+        rpc_url = "127.0.0.1:" + conf.TASK_RPC_PORT
+    }
+
+    conn, _, err := DialTaskService("tcp", rpc_url)
+    if err != nil {
+        return nil, err
+    }
+
+    return conn, nil
+}

go.mod

@@ -0,0 +1,16 @@
+module git.tetele.net/tgo/taskrpc
+
+go 1.17
+
+require (
+	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
+)
+
+require (
+	github.com/golang/snappy v0.0.3 // indirect
+	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
+	google.golang.org/protobuf v1.26.0 // indirect
+)

go.sum

@@ -0,0 +1,27 @@
+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=
+github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
+github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
+github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA=
+github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
+github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
+github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 h1:7I4JAnoQBe7ZtJcBaYHi5UtiO8tQHbUSXxL+pnGRANg=
+golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
+google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk=
+google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=

sign.go

@@ -0,0 +1,37 @@
+package taskrpc
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+	"strings"
+)
+
+/**
+ * 签名
+ */
+func Sign(data string, salt string) string {
+
+	var build strings.Builder
+
+	build.WriteString(data)
+	build.WriteString(salt)
+	build.WriteString("ta334signsk98")
+
+	data_str := build.String()
+
+	h := md5.New()
+	h.Write([]byte(data_str))             // 需要加密的字符串
+	return hex.EncodeToString(h.Sum(nil)) // 输出加密结果
+
+}
+
+/**
+ * 验证签名
+ */
+func CheckSign(sign_str, data, salt string) bool {
+	sign := Sign(data, salt)
+	if strings.Compare(sign_str, sign) > -1 {
+		return true
+	}
+	return false
+}

task.pb.go

@@ -3,7 +3,7 @@
 // DO NOT EDIT!
 
 /*
-Package tastrpc is a generated protocol buffer package.
+Package taskrpc is a generated protocol buffer package.
 
 It is generated from these files:
 	task.proto
@@ -12,7 +12,7 @@ It has these top-level messages:
 	Request
 	Response
 */
-package tastrpc
+package taskrpc
 
 import proto "github.com/chai2010/protorpc/proto"
 import math "math"
@@ -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

@@ -1,5 +1,5 @@
 syntax = "proto3";
-package tastrpc;
+package taskrpc;
 
 // 配置信息请求结构
 message Request {
@@ -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"`
 }