Merge pull request '🎨 优化好友列表同步处理逻辑' (#55) from hotfix into main

Reviewed-on: https://gitee.ltd/lxh/go-wxhelper/pulls/55

plugin/plugins/command/kfc.go

@@ -4,6 +4,7 @@ import (
 	"github.com/go-resty/resty/v2"
 	"go-wechat/utils"
 	"log"
+	"net/http"
 )
 
 // KfcCrazyThursdayCmd
@@ -33,8 +34,9 @@ func kfcApi1() string {
 	res := resty.New()
 	resp, err := res.R().
 		Post("https://api.jixs.cc/api/wenan-fkxqs/index.php")
-	if err != nil {
-		log.Panicf("KFC接口1文案获取失败: %s", err.Error())
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		log.Printf("KFC接口1文案获取失败: %v", err)
+		return ""
 	}
 	log.Printf("KFC接口1文案获取结果: %s", resp.String())
 	return resp.String()
@@ -58,8 +60,9 @@ func kfcApi2() string {
 	resp, err := res.R().
 		SetResult(&resData).
 		Post("https://api.jixs.cc/api/wenan-fkxqs/index.php")
-	if err != nil {
-		log.Panicf("KFC接口2文案获取失败: %s", err.Error())
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		log.Printf("KFC接口2文案获取失败: %v", err)
+		return ""
 	}
 	log.Printf("KFC接口2文案获取结果: %s", resp.String())
 	if resData.Data.Msg != "" {
@@ -84,8 +87,9 @@ func kfcApi3() string {
 	resp, err := res.R().
 		SetResult(&resData).
 		Post("https://api.pearktrue.cn/api/kfc")
-	if err != nil {
-		log.Panicf("KFC接口3文案获取失败: %s", err.Error())
+	if err != nil || resp.StatusCode() != http.StatusOK {
+		log.Printf("KFC接口3文案获取失败: %v", err)
+		return ""
 	}
 	log.Printf("KFC接口3文案获取结果: %s", resp.String())
 	if resData.Text != "" {

service/message.go

@@ -73,6 +73,8 @@ func GetTextMessagesById(id string) (records []vo.TextMessageItem, err error) {
 		Where("tm.`from_user` = ?", id).
 		Where(`(tm.type = 1 OR ( tm.type = 49 AND EXTRACTVALUE ( tm.content, "/msg/appmsg/type" ) IN (?) ))`, appMsgList).
 		Where("DATE ( tm.create_at ) = DATE ( CURDATE() - INTERVAL 1 DAY )").
+		Where("tm.content NOT LIKE '#昨日水群排行榜%'").
+		Where("tm.content NOT LIKE '#昨日消息总结%'").
 		Order("tm.create_at ASC")
 
 	err = tx.Find(&records).Error

tasks/friends/friends.go

@@ -103,6 +103,7 @@ func Sync() {
 				"custom_account": friend.CustomAccount,
 				"pinyin":         friend.Pinyin,
 				"pinyin_all":     friend.PinyinAll,
+				"is_ok":          true,
 			}
 			err = tx.Model(&entity.Friend{}).Where("wxid = ?", friend.Wxid).Updates(pm).Error
 			if err != nil {
@@ -122,12 +123,12 @@ func Sync() {
 		// 组装成一句话
 		msg := []string{"#新好友通知\n"}
 		for wxId, nickname := range newItmes {
-			msg = append(msg, "微信Id: "+wxId+" -> 昵称: "+nickname)
+			msg = append(msg, "微信Id: "+wxId+"\n昵称: "+nickname)
 		}
 		for _, user := range config.Conf.System.NewFriendNotify.ToUser {
 			if user != "" {
 				// 发送一条新消息
-				utils.SendMessage(user, "", strings.Join(msg, "\n"), 0)
+				utils.SendMessage(user, "", strings.Join(msg, "\n-------\n"), 0)
 			}
 		}
 	}

tasks/news/news.go

@@ -24,7 +24,7 @@ func DailyNews() {
 		return
 	}
 
-	newsStr := fmt.Sprintf("#每日早报#\n\n又是新的一天了，让我们康康一觉醒来世界又发生了哪些变化~\n\n%s", strings.Join(news, "\n"))
+	newsStr := fmt.Sprintf("#每日早报\n\n又是新的一天了，让我们康康一觉醒来世界又发生了哪些变化~\n\n%s", strings.Join(news, "\n"))
 
 	// 循环发送新闻
 	for _, group := range groups {

tasks/summary/summary.go

@@ -42,11 +42,12 @@ func AiSummary() {
 注意，他们可能是多个话题，请仔细甄别。
 每一行代表一个人的发言，每一行的的格式为： {"{nickname}": "{content}"}--end--
 
+群名称: %s
 聊天记录如下:
 %s
 `
 
-		msg := fmt.Sprintf(msgTmp, strings.Join(content, "\n"))
+		msg := fmt.Sprintf(msgTmp, group.Nickname, strings.Join(content, "\n"))
 
 		// AI总结
 		messages := []openai.ChatCompletionMessage{