From ec93d383b3c429fe752ea55db1191d34a1082460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= <gc@dtapp.net>
Date: Mon, 23 May 2022 21:24:33 +0800
Subject: [PATCH] - repair bug

---
 client.go | 38 ++++++++++++++++++++++++++++++++++++++
 cron.go   | 11 ++++++-----
 server.go |  8 ++++----
 worker.go |  4 ++--
 4 files changed, 50 insertions(+), 11 deletions(-)
 create mode 100644 client.go

diff --git a/client.go b/client.go
new file mode 100644
index 0000000..c798e21
--- /dev/null
+++ b/client.go
@@ -0,0 +1,38 @@
+package gojobs
+
+import (
+	"google.golang.org/grpc"
+)
+
+// ClientConfig 客户端配置
+type ClientConfig struct {
+	Address string // 服务端口 127.0.0.1:8888
+}
+
+// Client 定时任务
+type Client struct {
+	ClientConfig                  // 配置
+	Conn         *grpc.ClientConn // 链接信息
+}
+
+// NewClient 创建客户端
+func NewClient(config *ClientConfig) *Client {
+
+	if config.Address == "" {
+		panic("[客户端]请填写服务端口")
+	}
+
+	c := &Client{}
+
+	c.Address = config.Address
+
+	var err error
+
+	// 建立连接 获取client
+	c.Conn, err = grpc.Dial(c.Address, grpc.WithInsecure())
+	if err != nil {
+		panic("[客户端]{连接失败} " + err.Error())
+	}
+
+	return c
+}
diff --git a/cron.go b/cron.go
index c057826..ce4ddb4 100644
--- a/cron.go
+++ b/cron.go
@@ -23,7 +23,7 @@ type Cron struct {
 func NewCron(config *CronConfig) *Cron {
 
 	if config.Address == "" {
-		panic("请填写服务端口")
+		panic("[定时任务]请填写服务端口")
 	}
 
 	c := &Cron{}
@@ -35,7 +35,7 @@ func NewCron(config *CronConfig) *Cron {
 	// 建立连接 获取client
 	c.Conn, err = grpc.Dial(c.Address, grpc.WithInsecure())
 	if err != nil {
-		panic("连接失败: " + err.Error())
+		panic("[定时任务]{连接失败} " + err.Error())
 	}
 
 	// 新建一个客户端
@@ -45,11 +45,12 @@ func NewCron(config *CronConfig) *Cron {
 }
 
 // Send 发送
-func (c *Cron) Send(in *pb.PublishRequest) (*pb.PublishRequest, error) {
+func (c *Cron) Send(in *pb.PublishRequest) (*pb.PublishResponse, error) {
+	log.Printf("[定时任务]{广播开始} 编号：%s 类型：%s ip：%s\n", in.GetId(), in.GetValue(), in.GetIp())
 	stream, err := c.Pub.Publish(context.Background(), in)
 	if err != nil {
-		log.Printf("[定时任务]发送失败：%v\n", err)
+		log.Printf("[定时任务]{广播失败} 编号：%s %v\n", in.GetId(), err)
 	}
-	log.Println("[定时任务]发送成功", stream)
+	log.Printf("[定时任务]{广播成功} 编号：%s 类型：%s ip：%s\n", in.GetId(), in.GetValue(), in.GetIp())
 	return stream, err
 }
diff --git a/server.go b/server.go
index 347f0f3..ac3b785 100644
--- a/server.go
+++ b/server.go
@@ -28,7 +28,7 @@ type Server struct {
 func NewServer(config *ServerConfig) *Server {
 
 	if config.Address == "" {
-		panic("请填写服务端口")
+		panic("[服务中转]请填写服务端口")
 	}
 
 	s := &Server{}
@@ -54,14 +54,14 @@ func (s *Server) StartUp() error {
 	// 监听本地端口
 	lis, err := net.Listen("tcp", s.Address)
 	if err != nil {
-		return errors.New("创建监听失败:" + err.Error())
+		return errors.New("[服务中转]{创建监听失败} " + err.Error())
 	}
-	log.Printf("正在监听的地址：%v", lis.Addr())
+	log.Println("[服务中转]{监听] ", lis.Addr())
 
 	// 启动grpc
 	err = s.Conn.Serve(lis)
 	if err != nil {
-		return errors.New("创建服务失败:" + err.Error())
+		return errors.New("[服务中转]{创建服务失败} " + err.Error())
 	}
 
 	return nil
diff --git a/worker.go b/worker.go
index 20dd745..19da636 100644
--- a/worker.go
+++ b/worker.go
@@ -21,7 +21,7 @@ type Worker struct {
 func NewWorker(config *WorkerConfig) *Worker {
 
 	if config.Address == "" {
-		panic("请填写服务端口")
+		panic("[工作线]请填写服务端口")
 	}
 
 	w := &Worker{}
@@ -33,7 +33,7 @@ func NewWorker(config *WorkerConfig) *Worker {
 	// 建立连接 获取client
 	w.Conn, err = grpc.Dial(w.Address, grpc.WithInsecure())
 	if err != nil {
-		panic("连接失败: " + err.Error())
+		panic("[工作线]{连接失败} " + err.Error())
 	}
 
 	// 新建一个客户端