Merge pull request 'hotfix' (#33) from hotfix into main

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

config.yaml

@@ -37,6 +37,8 @@ task:
 
 # MQ配置
 mq:
+  # 是否启用
+  enable: false
   # RabbitMQ配置
   rabbitmq:
     host: 10.0.0.247

config/mq.go

@@ -5,6 +5,7 @@ import "fmt"
 // mq
 // @description: MQ配置
 type mq struct {
+	Enable   bool     `json:"enable" yaml:"enable"`     // 是否启用
 	RabbitMQ rabbitMq `json:"rabbitmq" yaml:"rabbitmq"` // RabbitMQ配置
 }
 

model/message.go

@@ -88,7 +88,13 @@ func (m Message) IsRevokeMsg() bool {
 // @receiver m
 // @return bool
 func (m Message) IsNewUserJoin() bool {
-	sysFlag := m.Type == types.MsgTypeSys && strings.Contains(m.Content, "\"邀请\"") && strings.Contains(m.Content, "\"加入了群聊")
+	if m.Type != types.MsgTypeSys {
+		return false
+	}
+
+	isInvitation := strings.Contains(m.Content, "\"邀请\"") && strings.Contains(m.Content, "\"加入了群聊")
+	isScanQrCode := strings.Contains(m.Content, "通过扫描") && strings.Contains(m.Content, "加入群聊")
+	sysFlag := isInvitation || isScanQrCode
 	if sysFlag {
 		return true
 	}
@@ -97,7 +103,7 @@ func (m Message) IsNewUserJoin() bool {
 	if err := xml.Unmarshal([]byte(m.Content), &d); err != nil {
 		return false
 	}
-	return m.Type == types.MsgTypeSys && d.Type == "delchatroommember"
+	return d.Type == "delchatroommember"
 }
 
 // IsAt

mq/rabbitmq.go

@@ -16,6 +16,10 @@ const exchangeName = "wechat-message"
 // Init
 // @description: 初始化MQ
 func Init() {
+	if !config.Conf.Mq.Enable {
+		log.Println("未启用MQ")
+		return
+	}
 	// 读取MQ连接配置
 	mqUrl := config.Conf.Mq.RabbitMQ.GetURL()
 	if mqUrl == "" {

tasks/watergroup/month.go

@@ -60,27 +60,44 @@ func dealMonth(gid string) {
 
 	// 查询群成员总数
 	var groupUsers int64
-	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
 	if err != nil {
 		log.Printf("查询群成员总数失败, 错误信息: %v", err)
 	}
 	// 计算活跃度
-	showActivity := err != nil && groupUsers > 0
+	showActivity := err == nil && groupUsers > 0
 	activity := "0.00"
 	if groupUsers > 0 {
 		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
 	}
 
-	// 计算消息总数
-	var msgCount int64
-	for _, v := range records {
+	// 计算消息总数、中位数、前十位消息总数
+	var msgCount, medianCount, topTenCount int64
+	for idx, v := range records {
 		msgCount += v.Count
+		if idx == (len(records)/2)-1 {
+			medianCount = v.Count
+		}
+		if len(records) > 10 && idx < 10 {
+			topTenCount += v.Count
+		}
 	}
+	// 计算活跃用户人均消息条数
+	avgMsgCount := int(float64(msgCount) / float64(len(records)))
+
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ %s本群 %d 位朋友共产生 %d 条发言", monthStr, len(records), msgCount))
 	if showActivity {
-		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+		m := fmt.Sprintf("🎭 活跃度: %s%%，人均消息条数: %d，中位数: %d", activity, avgMsgCount, medianCount)
+		// 计算前十占比
+		if topTenCount > 0 {
+			m += fmt.Sprintf("，前十名占比: %.2f%%", float64(topTenCount)/float64(msgCount)*100)
+		}
+		notifyMsgs = append(notifyMsgs, m)
 	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
 

tasks/watergroup/week.go

@@ -59,27 +59,44 @@ func dealWeek(gid string) {
 
 	// 查询群成员总数
 	var groupUsers int64
-	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
 	if err != nil {
 		log.Printf("查询群成员总数失败, 错误信息: %v", err)
 	}
 	// 计算活跃度
-	showActivity := err != nil && groupUsers > 0
+	showActivity := err == nil && groupUsers > 0
 	activity := "0.00"
 	if groupUsers > 0 {
 		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
 	}
 
-	// 计算消息总数
-	var msgCount int64
-	for _, v := range records {
+	// 计算消息总数、中位数、前十位消息总数
+	var msgCount, medianCount, topTenCount int64
+	for idx, v := range records {
 		msgCount += v.Count
+		if idx == (len(records)/2)-1 {
+			medianCount = v.Count
+		}
+		if len(records) > 10 && idx < 10 {
+			topTenCount += v.Count
+		}
 	}
+	// 计算活跃用户人均消息条数
+	avgMsgCount := int(float64(msgCount) / float64(len(records)))
+
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 上周本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
 	if showActivity {
-		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+		m := fmt.Sprintf("🎭 活跃度: %s%%，人均消息条数: %d，中位数: %d", activity, avgMsgCount, medianCount)
+		// 计算前十占比
+		if topTenCount > 0 {
+			m += fmt.Sprintf("，前十名占比: %.2f%%", float64(topTenCount)/float64(msgCount)*100)
+		}
+		notifyMsgs = append(notifyMsgs, m)
 	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
 

tasks/watergroup/year.go

@@ -59,22 +59,34 @@ func dealYear(gid string) {
 
 	// 查询群成员总数
 	var groupUsers int64
-	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
 	if err != nil {
 		log.Printf("查询群成员总数失败, 错误信息: %v", err)
 	}
 	// 计算活跃度
-	showActivity := err != nil && groupUsers > 0
+	showActivity := err == nil && groupUsers > 0
 	activity := "0.00"
 	if groupUsers > 0 {
 		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
 	}
 
-	// 计算消息总数
-	var msgCount int64
-	for _, v := range records {
+	// 计算消息总数、中位数、前十位消息总数
+	var msgCount, medianCount, topTenCount int64
+	for idx, v := range records {
 		msgCount += v.Count
+		if idx == (len(records)/2)-1 {
+			medianCount = v.Count
+		}
+		if len(records) > 10 && idx < 10 {
+			topTenCount += v.Count
+		}
 	}
+	// 计算活跃用户人均消息条数
+	avgMsgCount := int(float64(msgCount) / float64(len(records)))
+
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, "亲爱的群友们，新年已经悄悄来临，让我们一起迎接这充满希望和美好的时刻。在这个特殊的日子里，我要向你们致以最真挚的祝福。")
@@ -87,7 +99,12 @@ func dealYear(gid string) {
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 去年本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
 	if showActivity {
-		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+		m := fmt.Sprintf("🎭 活跃度: %s%%，人均消息条数: %d，中位数: %d", activity, avgMsgCount, medianCount)
+		// 计算前十占比
+		if topTenCount > 0 {
+			m += fmt.Sprintf("，前十名占比: %.2f%%", float64(topTenCount)/float64(msgCount)*100)
+		}
+		notifyMsgs = append(notifyMsgs, m)
 	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")
 

tasks/watergroup/yesterday.go

@@ -61,27 +61,44 @@ func dealYesterday(gid string) {
 
 	// 查询群成员总数
 	var groupUsers int64
-	err = client.MySQL.Model(&entity.GroupUser{}).Where("group_id = ?", gid).Count(&groupUsers).Error
+	err = client.MySQL.Model(&entity.GroupUser{}).
+		Where("group_id = ?", gid).
+		Where("is_member IS TRUE").
+		Count(&groupUsers).Error
 	if err != nil {
 		log.Printf("查询群成员总数失败, 错误信息: %v", err)
 	}
 	// 计算活跃度
-	showActivity := err != nil && groupUsers > 0
+	showActivity := err == nil && groupUsers > 0
 	activity := "0.00"
 	if groupUsers > 0 {
 		activity = fmt.Sprintf("%.2f", (float64(len(records))/float64(groupUsers))*100)
 	}
 
-	// 计算消息总数
-	var msgCount int64
-	for _, v := range records {
+	// 计算消息总数、中位数、前十位消息总数
+	var msgCount, medianCount, topTenCount int64
+	for idx, v := range records {
 		msgCount += v.Count
+		if idx == (len(records)/2)-1 {
+			medianCount = v.Count
+		}
+		if len(records) > 10 && idx < 10 {
+			topTenCount += v.Count
+		}
 	}
+	// 计算活跃用户人均消息条数
+	avgMsgCount := int(float64(msgCount) / float64(len(records)))
+
 	// 组装消息总数推送信息
 	notifyMsgs = append(notifyMsgs, " ")
 	notifyMsgs = append(notifyMsgs, fmt.Sprintf("🗣️ 昨日本群 %d 位朋友共产生 %d 条发言", len(records), msgCount))
 	if showActivity {
-		notifyMsgs = append(notifyMsgs, fmt.Sprintf("🎭 活跃度: %s%", activity))
+		m := fmt.Sprintf("🎭 活跃度: %s%%，人均消息条数: %d，中位数: %d", activity, avgMsgCount, medianCount)
+		// 计算前十占比
+		if topTenCount > 0 {
+			m += fmt.Sprintf("，前十名占比: %.2f%%", float64(topTenCount)/float64(msgCount)*100)
+		}
+		notifyMsgs = append(notifyMsgs, m)
 	}
 	notifyMsgs = append(notifyMsgs, "\n🏵 活跃用户排行榜 🏵")