Merge branch 'master' into feature/v1.0.4

api/personnel/v1/personnel.go

@@ -36,6 +36,7 @@ type Statistics struct {
 	SearchWord      string                 `json:"search_word"  dc:"搜索词" `
 	Filter          string                 `json:"filter"  dc:"搜索条件"`
 	BreakData       map[string]interface{} `json:"breakData"  dc:"额外数据"`
+	BData           string                 `json:"break_data"  dc:"额外数据"` // 字符串
 	AppId           string                 `json:"appId"  dc:"appid"`
 	AppVersion      string                 `json:"appVersion"  dc:"版本号"`
 	MiniProgramCode string                 `json:"miniProgramCode"  dc:"来源"`

internal/controller/personnel/personnel.go

@@ -5,6 +5,7 @@ import (
 	"app.yhyue.com/moapp/jybase/encrypt"
 	"context"
 	"encoding/json"
+	"fmt"
 	"github.com/gogf/gf/v2/frame/g"
 	v1 "personnelBehavior/api/personnel/v1"
 	"personnelBehavior/internal/model"
@@ -91,6 +92,12 @@ func (p *personnel) Statistics(ctx context.Context, req *v1.PersonnelInsertReq)
 		breakData, _ := json.Marshal(req.BreakData)
 		in.BreakData = string(breakData)
 	}
+	if req.BData != "" {
+		if in.BreakData != "" {
+			in.BreakData += ","
+		}
+		in.BreakData += fmt.Sprintf("action_name=%s", req.BData)
+	}
 	// 小程序的refer是从body里面取的
 	if in.Refer == "" && req.Refer != "" && req.Refer != "undefined" {
 		in.Refer = req.Refer

internal/dao/internal/personnel.go

@@ -12,6 +12,7 @@ import (
 	. "personnelBehavior/internal/common"
 	"personnelBehavior/internal/consts"
 	"personnelBehavior/internal/model"
+	"personnelBehavior/internal/utils"
 	"strconv"
 	"time"
 )
@@ -133,6 +134,7 @@ func (dao *PersonnelDao) BatchExecInsert(ctx context.Context, in []*model.Person
 	_, err = g.DB().Model(dao.Model()).Data(insertData).Insert()
 	if err != nil {
 		g.Log().Error(ctx, "batch insert false， --err:", err)
+		utils.SendMsgByWXURL(fmt.Sprintf("人员行为统计数据存储异常。\n错误信息：\n%s", err.Error()), g.Config().MustGet(ctx, "webhookURL").Strings())
 		return
 	}
 	return

internal/utils/warn.go

@@ -0,0 +1,42 @@
+package utils
+
+import (
+	"bytes"
+	"encoding/json"
+	"github.com/gogf/gf/v2/frame/g"
+	"github.com/gogf/gf/v2/os/gctx"
+	"net/http"
+)
+
+func SendMsgByWXURL(msg string, whs []string) {
+	for _, url := range whs {
+		if ok := SendBot(url, msg); !ok {
+			g.Log().Info(gctx.New(), "企业微信机器人提醒失败--：", url, msg)
+		}
+	}
+}
+
+func SendBot(webhookURL, msg string) (b bool) {
+	// 构造请求体
+	payload := map[string]interface{}{
+		"msgtype": "text",
+		"text": map[string]string{
+			"content": msg,
+		},
+	}
+	// 转换为 JSON 字符串
+	payloadBytes, err := json.Marshal(payload)
+	if err != nil {
+		g.Log().Info(gctx.New(), "Error :", err.Error())
+		return
+	}
+	// 发送 POST 请求
+	resp, err := http.Post(webhookURL, "application/json", bytes.NewReader(payloadBytes))
+	if err != nil {
+		g.Log().Info(gctx.New(), "Error :", err.Error())
+		return
+	}
+	defer resp.Body.Close()
+	b = true
+	return
+}

manifest/config/config.yaml

@@ -41,6 +41,6 @@ cacheChanInfo:
   timeAfter: 2000   # 定时保存 毫秒
   timeout: 10000    # 缓存通道满时，超时丢弃
   sCSize: 3         # 数据库并发存储数据
-
+webhookURL: ["https://qyapi.weixin.qq.com/cgi-bin/webhook/send?key=24b0ac60-3a02-441f-842e-9cd3f75d1208"]