🐛修复微信通知bug

cron/task/client.go

@@ -49,13 +49,14 @@ func (c networkClient) ClientOfflineNotify() error {
 	// 查询一下通知配置
 	code, err := service.Setting().GetByCode("WECHAT_NOTIFY")
 	if err != nil {
+		log.Errorf("获取微信通知配置失败: %v", err.Error())
 		return err
 	}
 
 	for _, peer := range connectedPeers {
 		var clientName string
 		if !slices.ContainsFunc(clients, func(cli model.Client) bool {
-			isExist := peer.PublicKey.String() == jsoniter.Get([]byte(cli.Keys), "PublicKey").ToString()
+			isExist := peer.PublicKey.String() == jsoniter.Get([]byte(cli.Keys), "publicKey").ToString()
 			if isExist {
 				clientName = cli.Name
 			}
@@ -65,7 +66,7 @@ func (c networkClient) ClientOfflineNotify() error {
 		}
 
 		// 如果存在,判断离线时间
-		if time.Since(peer.LastHandshakeTime) < 3 {
+		if time.Since(peer.LastHandshakeTime).Minutes() < 3 {
 			var ipAllocation string
 			for _, iaip := range peer.AllowedIPs {
 				ipAllocation += iaip.String() + ","

utils/wechat_notify.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"gitee.ltd/lxh/logger/log"
 	jsoniter "github.com/json-iterator/go"
+	"strings"
 	"wireguard-ui/global/client"
 	"wireguard-ui/model"
 )
@@ -26,7 +27,7 @@ func WechatNotify(setting *model.Setting) wechatNotify {
 		Addr:     sm["addr"],
 		Path:     sm["path"],
 		Method:   sm["method"],
-		toUserId: sm["toUserId"],
+		toUserId: sm["toUserWxId"],
 	}
 }
 
@@ -36,6 +37,7 @@ func WechatNotify(setting *model.Setting) wechatNotify {
 // @param msg
 // @return error
 func (w wechatNotify) SendTextMessage(msg string) error {
+	log.Debugf("发送通知到微信: %v", msg)
 	req := client.HttpClient.R()
 
 	req.SetHeader("Content-Type", "application/json")
@@ -43,7 +45,13 @@ func (w wechatNotify) SendTextMessage(msg string) error {
 		"wxid": w.toUserId,
 		"msg":  msg,
 	})
-	result, err := req.Post(fmt.Sprintf("%s:%s", w.Addr, w.Path))
+
+	req.URL = fmt.Sprintf("%s:%s", w.Addr, w.Path)
+	switch strings.ToUpper(w.Method) {
+	case "POST":
+		req.Method = "POST"
+	}
+	result, err := req.SetDebug(true).Send()
 	if err != nil {
 		return err
 	}