liuxiulin 2 days ago
parent
commit
ca0453eabd

+ 5 - 10
pkg/ruleEngine/nodes/dingtalk_robot_node.go

@@ -54,21 +54,16 @@ func (d *DingTalkRobotNode) OnMessage(ctx ruleEngine.Context, message *protocol.
 		return err
 	}
 	fmt.Printf("webhook:-----------%s\n", d.config.WebHook)
-	req, err := utils.NewRequest("POST", d.config.WebHook, gjson.New(body))
-	if err != nil {
-		server.Log.Error(err)
-		return err
-	}
-	req.Header.Add("Content-Type", "application/json")
+	req, err := d.client.Post(d.config.WebHook, "application/json", gjson.New(body))
+
 	return d.pool.Add(func() {
-		res, err := d.client.Do(req)
 		if err != nil {
 			server.Log.Errorf("请求出错%s", err.Error())
 			return
 		}
-		if res != nil && res.Response() != nil {
-			defer res.Close()
-			if res.Response().StatusCode == http.StatusOK {
+		if req != nil && req.Response() != nil {
+			defer req.Close()
+			if req.Response().StatusCode == http.StatusOK {
 				ctx.TellSuccess(message)
 			}
 		}

+ 19 - 0
pkg/ruleEngine/nodes/reg_types_test.go

@@ -2,7 +2,10 @@ package nodes
 
 import (
 	"encoding/json"
+	"github.com/gogf/gf/encoding/gjson"
 	"sparrow/pkg/ruleEngine"
+	"sparrow/pkg/server"
+	"sparrow/pkg/utils"
 	"strings"
 	"testing"
 	"text/template"
@@ -37,3 +40,19 @@ func TestMQTTBrokerNode_OnMessage(t *testing.T) {
 	}
 	t.Log(stringBuf.String())
 }
+
+func TestMQTTBrokerNode_OnMessage2(t *testing.T) {
+	msg := map[string]interface{}{
+		"content": "测试",
+	}
+	body := map[string]interface{}{
+		"msgtype": "text",
+		"text":    msg,
+	}
+	j := gjson.New(body)
+	client := utils.NewHttpClient()
+	_, err := client.Post("https://oapi.dingtalk.com/robot/send?access_token=0aad9626a5e0c7eb37aa8acf77cb2303201a2bff716fb8e0ed2fe6a55a290729", "application/json", j)
+	if err != nil {
+		server.Log.Error(err)
+	}
+}

+ 0 - 2
pkg/ruleEngine/nodes/temp_alarm_node.go

@@ -49,7 +49,6 @@ func (t *TempAlarmNode) OnMessage(ctx ruleEngine.Context, message *protocol.Mess
 		if err != nil {
 			return err
 		}
-		fmt.Printf("消息组合成功,传递下一节点-----------\n")
 		ctx.TellNext(message, protocol.True)
 	} else {
 		ctx.TellNext(message, protocol.False)
@@ -128,7 +127,6 @@ func (t *TempAlarmNode) newAlarmMessage(message *protocol.Message) error {
 	if err != nil {
 		return err
 	}
-	fmt.Printf("message:-----------%s\n", message.AlarmMessage)
 	return nil
 }