From dd83d8bc3e1ac15725b4d41fa6ddfdba9a6327e7 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 15 Jul 2022 17:09:41 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_analysis_for_activity.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go index d241fa72c..f0e3fe653 100644 --- a/models/user_analysis_for_activity.go +++ b/models/user_analysis_for_activity.go @@ -1,6 +1,7 @@ package models import ( + "encoding/json" "fmt" "time" @@ -298,6 +299,11 @@ func queryCreateIssuePublic(start_unix int64, end_unix int64, publicAllRepo map[ break } } + resultMapJson, _ := json.Marshal(resultMap) + log.Info("issue resultMapJson=" + string(resultMapJson)) + + publicRepoIssueIdMapJson, _ := json.Marshal(publicRepoIssueIdMap) + log.Info("issue publicRepoIssueIdMapJson=" + string(publicRepoIssueIdMapJson)) return resultMap, publicRepoIssueIdMap } @@ -334,6 +340,9 @@ func queryCommentPublic(start_unix int64, end_unix int64, publicRepoIssueIdMap m break } } + resultMapJson, _ := json.Marshal(resultMap) + log.Info("Comment resultMapJson=" + string(resultMapJson)) + return resultMap } From 292fc10880c9cd345773fe293b526f283b244928 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 15 Jul 2022 17:19:49 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_analysis_for_activity.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go index f0e3fe653..95b8dc4fd 100644 --- a/models/user_analysis_for_activity.go +++ b/models/user_analysis_for_activity.go @@ -322,7 +322,7 @@ func queryCommentPublic(start_unix int64, end_unix int64, publicRepoIssueIdMap m var indexTotal int64 indexTotal = 0 for { - sess.Select("id,type,poster_id").Table("comment").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) + sess.Select("id,type,poster_id,issue_id").Table("comment").Where(cond).OrderBy("id asc").Limit(PAGE_SIZE, int(indexTotal)) commentList := make([]*Comment, 0) sess.Find(&commentList) log.Info("query Comment size=" + fmt.Sprint(len(commentList))) From 16e5d1e95cf23d43f7dc5e493e80fce4437f8fc6 Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 15 Jul 2022 17:50:51 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_analysis_for_activity.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go index 95b8dc4fd..1da21b1f6 100644 --- a/models/user_analysis_for_activity.go +++ b/models/user_analysis_for_activity.go @@ -1,7 +1,6 @@ package models import ( - "encoding/json" "fmt" "time" @@ -299,11 +298,11 @@ func queryCreateIssuePublic(start_unix int64, end_unix int64, publicAllRepo map[ break } } - resultMapJson, _ := json.Marshal(resultMap) - log.Info("issue resultMapJson=" + string(resultMapJson)) + //resultMapJson, _ := json.Marshal(resultMap) + //log.Info("issue resultMapJson=" + string(resultMapJson)) - publicRepoIssueIdMapJson, _ := json.Marshal(publicRepoIssueIdMap) - log.Info("issue publicRepoIssueIdMapJson=" + string(publicRepoIssueIdMapJson)) + //publicRepoIssueIdMapJson, _ := json.Marshal(publicRepoIssueIdMap) + //log.Info("issue publicRepoIssueIdMapJson=" + string(publicRepoIssueIdMapJson)) return resultMap, publicRepoIssueIdMap } @@ -340,8 +339,8 @@ func queryCommentPublic(start_unix int64, end_unix int64, publicRepoIssueIdMap m break } } - resultMapJson, _ := json.Marshal(resultMap) - log.Info("Comment resultMapJson=" + string(resultMapJson)) + //resultMapJson, _ := json.Marshal(resultMap) + //log.Info("Comment resultMapJson=" + string(resultMapJson)) return resultMap } From 06097447d42cc3e3f067fd15cd88403712018ebe Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 15 Jul 2022 17:51:13 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=89=93=E5=8D=B0?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- models/user_analysis_for_activity.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/models/user_analysis_for_activity.go b/models/user_analysis_for_activity.go index 1da21b1f6..e69eecae0 100644 --- a/models/user_analysis_for_activity.go +++ b/models/user_analysis_for_activity.go @@ -298,11 +298,6 @@ func queryCreateIssuePublic(start_unix int64, end_unix int64, publicAllRepo map[ break } } - //resultMapJson, _ := json.Marshal(resultMap) - //log.Info("issue resultMapJson=" + string(resultMapJson)) - - //publicRepoIssueIdMapJson, _ := json.Marshal(publicRepoIssueIdMap) - //log.Info("issue publicRepoIssueIdMapJson=" + string(publicRepoIssueIdMapJson)) return resultMap, publicRepoIssueIdMap } @@ -339,9 +334,6 @@ func queryCommentPublic(start_unix int64, end_unix int64, publicRepoIssueIdMap m break } } - //resultMapJson, _ := json.Marshal(resultMap) - //log.Info("Comment resultMapJson=" + string(resultMapJson)) - return resultMap }