From 8ecb9d2cd57b9259331f89ca3845491f43fa1987 Mon Sep 17 00:00:00 2001
From: zhangjianjun_code <7844966+zhangjianjun_code@user.noreply.gitee.com>
Date: Thu, 5 Nov 2020 11:49:24 +0800
Subject: [PATCH] 1. Solve the issue: the pr integration time is inconsistent
 with the closing time, the integration time is modified pr time, and the
 information is inaccurate

---
 conf/app.conf         |  1 +
 conf/product_app.conf |  3 +++
 taskhandler/cve.go    |  2 +-
 taskhandler/excel.go  | 19 ++++++++++++++-----
 4 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/conf/app.conf b/conf/app.conf
index 51b8331..7482d24 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -76,6 +76,7 @@ owner = cve-test
 path = jasper
 email = 7844966+zhangjianjun_code@user.noreply.gitee.com
 redirect_uri = http://159.138.2.2:80/v1/issue/oauth/callback
+owner_openuler= openeuler
 
 
 scope = user_info projects pull_requests issues notes keys hook groups gists enterprises emails
diff --git a/conf/product_app.conf b/conf/product_app.conf
index 459c61b..9d51404 100644
--- a/conf/product_app.conf
+++ b/conf/product_app.conf
@@ -79,6 +79,9 @@ password = "${GITEE_PASSWORD||****}"
 
 # git token
 git_token = "${GITEE_TOKEN||xxx}"
+# openeuler owner
+owner_openuler= openeuler
+
 
 [hook]
 hookpwd = "${HOOK_PWD||***}"
diff --git a/taskhandler/cve.go b/taskhandler/cve.go
index 929541c..04f5e54 100644
--- a/taskhandler/cve.go
+++ b/taskhandler/cve.go
@@ -1613,7 +1613,7 @@ func GenerateExcelTask1() error {
 //GenerateExcelTrigger generate cve&security notice excel file by pr merge and influence package release.
 func GenerateExcelTrigger(fileName, startTime, fileCode string) {
 	//FilterCveExported()
-	logs.Error("start。。。。。")
+	logs.Error("start....")
 	dir := beego.AppConfig.DefaultString("fileDir", "download")
 	err := util.MakeDir(dir)
 	if err != nil {
diff --git a/taskhandler/excel.go b/taskhandler/excel.go
index 695020a..468c958 100644
--- a/taskhandler/excel.go
+++ b/taskhandler/excel.go
@@ -77,7 +77,8 @@ func GenerateCveExcel(excelName, snPrefix string, snSuffix int64, forceRewrite b
 }
 
 //GenerateCveExcelByTrigger Generate cve&security notice excel file by trigger
-func GenerateCveExcelByTrigger(excelName, snPrefix, startTime string, snSuffix int64, forceRewrite bool, pkgList []models.ExcelPackage) (err error) {
+func GenerateCveExcelByTrigger(excelName, snPrefix, startTime string, snSuffix int64,
+	forceRewrite bool, pkgList []models.ExcelPackage) (err error) {
 	if len(pkgList) == 0 {
 		return errors.New("No data to export! ")
 	}
@@ -816,10 +817,18 @@ func getRepoAllPR(token, owner, repo string, startTime, releaseTime int64) (prLi
 				break
 			}
 			for _, v := range pr {
-
-				ct := v.MergedAt.Local().Unix()
-				if ct >= startTime && ct <= releaseTime {
-					prList = append(prList, v)
+				mt := v.MergedAt.Local().Unix()
+				ct := v.ClosedAt.Local().Unix()
+				var pt int64
+				if mt > 0 && ct > 0 {
+					if mt > ct {
+						pt = ct
+					} else {
+						pt = mt
+					}
+					if pt >= startTime && pt <= releaseTime {
+						prList = append(prList, v)
+					}
 				}
 			}
 			if len(pr) < pageSize {
-- 
Gitee