Skip to content

Commit

Permalink
Merge pull request #1 from paterleng/ljh
Browse files Browse the repository at this point in the history 
fix: map nil porinter
  • Loading branch information
@paterleng
paterleng authored Sep 25, 2024
2 parents 94e1c20 + c4e3e9e commit c6f9672
Show file tree
Hide file tree
Showing 6 changed files with 44 additions and 14 deletions.
Binary file modified bug-notify
View file
Binary file not shown.
32 changes: 32 additions & 0 deletions bug-notify.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,3 +799,35 @@
{"level":"INFO","time":"2024-09-15T17:17:16.203+0800","caller":"init-tool/logger.go:36","msg":"init logger success"}
{"level":"INFO","time":"2024-09-15T17:18:50.563+0800","caller":"init-tool/logger.go:36","msg":"init logger success"}
{"level":"INFO","time":"2024-09-15T17:20:11.369+0800","caller":"init-tool/logger.go:36","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T08:53:20.333+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T08:53:22.228+0800","caller":"handle/notify-handle.go:120","msg":"更新事件，状态没有变化，不做处理"}
{"level":"INFO","time":"2024-09-25T08:53:22.903+0800","caller":"handle/notify-handle.go:120","msg":"更新事件，状态没有变化，不做处理"}
{"level":"INFO","time":"2024-09-25T08:53:48.426+0800","caller":"handle/notify-handle.go:120","msg":"更新事件，状态没有变化，不做处理"}
{"level":"INFO","time":"2024-09-25T08:53:48.432+0800","caller":"handle/notify-handle.go:120","msg":"更新事件，状态没有变化，不做处理"}
{"level":"INFO","time":"2024-09-25T08:54:33.759+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"ERROR","time":"2024-09-25T08:56:23.098+0800","caller":"handle/timeing.go:28","msg":"获取项目id失败:","error":"bad connection"}
{"level":"INFO","time":"2024-09-25T09:00:28.517+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:01:18.392+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:04:37.381+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:08:04.329+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:11:11.451+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:14:03.040+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:18:16.380+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:22:01.910+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:22:21.269+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:23:37.425+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:31:46.095+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:34:41.020+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:35:43.680+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:36:22.935+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"ERROR","time":"2024-09-25T09:37:33.601+0800","caller":"handle/timeing.go:89","msg":" 定时任务发送消息失败:","error":"Post \"https://oapi.dingtalk.com/robot/send?access_token=8ff6cde9a01910e897cb6461e75bd515ed9d683cc4924aad9439fda3e9689de1&timestamp=1727228191641&sign=s%2F9HIpthbfp5j9JpnsfYHMDMIi%2F08cktkKHAFLH7ltc%3D\": dial tcp: lookup oapi.dingtalk.com: i/o timeout"}
{"level":"INFO","time":"2024-09-25T09:37:40.144+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:40:38.214+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:41:15.304+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:43:08.976+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:46:20.287+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T09:53:15.253+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T10:23:38.971+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T10:24:21.539+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T10:25:34.552+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
{"level":"INFO","time":"2024-09-25T10:26:00.528+0800","caller":"init-tool/logger.go:35","msg":"init logger success"}
2 changes: 1 addition & 1 deletion dao/mysql.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ func GetUserInfoByUserID(id int32) (name model.UserName, err error) {

func GetStatusNumByID(statusId []int, projectId int64) ([]model.TimeData, error) {
var a []model.TimeData
err := init_tool.DB.Table("issues").Select("status_id, priority_id, count(*) as count").Where("status_id in ? and project_id = ?", statusId, projectId).Group("priority_id").Group("status_id").Find(&a).Error
err := init_tool.DB.Debug().Table("issues").Select("status_id, priority_id, count(*) as count").Where("status_id in ? and project_id = ?", statusId, projectId).Group("priority_id").Group("status_id").Find(&a).Error
return a, err
}

Expand Down
21 changes: 10 additions & 11 deletions handle/timeing.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,22 +40,21 @@ func TimeingTasks() {
}
for _, id := range ids {
a, err := dao.GetStatusNumByID(P, id)
if len(a) == 0 {
//没有任务要处理,直接跳过
continue
}

if err != nil {
zap.L().Error("查询数量失败:", zap.Error(err))
return
}
maps := map[int]map[int]int{}
for _, value := range a {
childMap := make(map[int]int)
childMap[value.StatusId] = int(value.Count)
maps[value.PriorityId] = childMap
}
maps := make(map[int]map[int]int)
for i := 0; i < 3; i++ {
for j := 0; j < 2; j++ {
if _, ok := maps[i+1][j+1]; !ok {
maps[i+1][j+1] = 0
}
}
maps[i+1] = make(map[int]int)
}
for _, value := range a {
maps[value.PriorityId][value.StatusId] = int(value.Count)
}
content := "# %s 任务状态统计 \n" +
"\n| **级别** | **未处理** | **处理中** | " +
Expand Down
1 change: 0 additions & 1 deletion init-tool/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ var lg *zap.Logger

// Init 初始化lg
func LoggerInit() (err error) {

writeSyncer := getLogWriter(Conf.LogConfig.Filename, Conf.LogConfig.MaxSize, Conf.LogConfig.MaxBackups, Conf.LogConfig.MaxAge)
encoder := getEncoder()
var l = new(zapcore.Level)
Expand Down
2 changes: 1 addition & 1 deletion pos.txt
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"Name":"binlog.000022","Pos":364616}
{"Name":"binlog.000022","Pos":403125}

0 comments on commit c6f9672

Please sign in to comment.