diff --git a/conf/app.conf b/conf/app.conf
index c104096adbd3e805e75bbbe914adfb2c83dd2c86..ff5d4376e84b0e2e8b70712b49b5c48dc182243d 100644
--- a/conf/app.conf
+++ b/conf/app.conf
@@ -59,7 +59,7 @@ oricvecheck = 0 16 19 * * *
getissueflag = 2
getissue = 0 50 10 * * *
issueflag = 2
-createissue = 0 18 10 * * *
+createissue = 0 18 15 * * *
emergissueflag = 2
emergcreateissue = 0 */3 * * * *
test = 0/10 * * * * *
diff --git a/controllers/gauss.go b/controllers/gauss.go
index ddac65cd16fbe41e9cc38804133fe541dd2c27f2..7ef481b4ad6d7895b9af24fa2865519113bcab82 100644
--- a/controllers/gauss.go
+++ b/controllers/gauss.go
@@ -369,7 +369,11 @@ func CreateSaDetailData(ird *GaussSaDetailData, osl models.OpenGaussSiteList) {
}
ird.Theme = osl.Theme
ird.Description = osl.Description
- ird.Description = strings.ReplaceAll(ird.Description, "\n\n", "
")
+ if strings.Index(ird.Description, "\n\n") >= 0 {
+ ird.Description = strings.ReplaceAll(ird.Description, "\n\n", "
")
+ }else if strings.Index(ird.Description, "\n") >= 0 {
+ ird.Description = strings.ReplaceAll(ird.Description, "\n", "
")
+ }
ird.CveNumbers = osl.CveNums
cveLinkSlice := make([]string, 0)
if len(osl.CveNums) > 1 {
@@ -653,7 +657,11 @@ func CreateCveDetailData(gdd *GaussCveDetailData, ocl models.OpenGaussCveList) {
gdd.CveId = ocl.Id
gdd.CveNum = ocl.CveNum
gdd.Description = ocl.Description
- gdd.Description = strings.ReplaceAll(gdd.Description, "\n\n", "
")
+ if strings.Index(gdd.Description, "\n\n") >= 0 {
+ gdd.Description = strings.ReplaceAll(gdd.Description, "\n\n", "
")
+ }else if strings.Index(gdd.Description, "\n") >= 0 {
+ gdd.Description = strings.ReplaceAll(gdd.Description, "\n", "
")
+ }
gdd.NvdScore = ocl.NVDScore
gdd.UpdateTime = ocl.UpdateTime
if len(ocl.CreateTime) > 10 {
diff --git a/taskhandler/createissue.go b/taskhandler/createissue.go
index 37f131ddfdf924329bfd84ecb9ce87e507153f05..3cccab7118364b2953eb045136bce908ca0413ee 100644
--- a/taskhandler/createissue.go
+++ b/taskhandler/createissue.go
@@ -120,12 +120,20 @@ func CreateIssueToGit(accessToken, owner, path, assignee string,
assignee = sia.Assignee
}
}
+ assigneeGite := ""
if it.TemplateId > 0 && len(it.IssueNum) > 1 {
- issueErr, _ := GetGiteeIssue(accessToken, owner, path, it.IssueNum)
+ issueErr, issueBody := GetGiteeIssue(accessToken, owner, path, it.IssueNum)
if issueErr != nil {
models.DeleteIssueTemplate(it.TemplateId)
models.UpdateIssueStatus(cve, 0)
return "", errors.New("Recreate issue")
+ } else {
+ if issueBody != nil && issueBody["assignee"] != nil {
+ assigneeObj := issueBody["assignee"].(map[string]interface{})
+ if assigneeObj != nil && assigneeObj["login"] != nil {
+ assigneeGite = assigneeObj["login"].(string)
+ }
+ }
}
} else {
logs.Error("CreateIssueToGit, GetIssueTemplateByColName, templateErr: ", templateErr, ",it: ", it)
@@ -164,6 +172,9 @@ func CreateIssueToGit(accessToken, owner, path, assignee string,
it.AffectedVersion = brandStr
}
}
+ if len(assigneeGite) > 1 {
+ it.Assignee = assigneeGite
+ }
requestBody := CreateIssueBody(accessToken, owner, path, it.Assignee,
cve, sc, OpenEulerScore, score, labels, it, 1, it.IssueType, "", brandArray)
if requestBody != "" && len(requestBody) > 1 {
@@ -350,12 +361,22 @@ func UpdateIssueToGit(accessToken string, owner string, path string,
gaussIssuePath := beego.AppConfig.String("opengauss::gauss_issue_path")
path = gaussIssuePath
}
+ assigneeGite := ""
if its.IssueNum != "" && len(its.IssueNum) > 0 {
- issueErr, _ := GetGiteeIssue(accessToken, owner, path, its.IssueNum)
+ issueErr, issueBody := GetGiteeIssue(accessToken, owner, path, its.IssueNum)
if issueErr != nil {
models.DeleteIssueTemplate(its.TemplateId)
models.UpdateIssueStatus(cve, 0)
return "", errors.New("Recreate issue")
+ } else {
+ if issueBody != nil {
+ if issueBody != nil && issueBody["assignee"] != nil {
+ assigneeObj := issueBody["assignee"].(map[string]interface{})
+ if assigneeObj != nil && assigneeObj["login"] != nil {
+ assigneeGite = assigneeObj["login"].(string)
+ }
+ }
+ }
}
}
//labels := its.IssueLabel
@@ -389,6 +410,9 @@ func UpdateIssueToGit(accessToken string, owner string, path string,
if !scok {
logs.Error("UpdateIssueToGit, Score does not exist, cve: ", cve)
}
+ if len(assigneeGite) > 1 {
+ its.Assignee = assigneeGite
+ }
requestBody := CreateIssueBody(accessToken, owner, path, its.Assignee,
cve, sc, OpenEulerScore, score, labels, its, 3, its.IssueType, pkgLink, brandArray)
logs.Info("UpdateIssueToGit, isssue_body: ", requestBody)
diff --git a/taskhandler/cve.go b/taskhandler/cve.go
index fd889dbb906b7920380b34ee9c1341a49fae2051..b6819cb7cbdfcdebc20d4de6ebbc94db356947ce 100644
--- a/taskhandler/cve.go
+++ b/taskhandler/cve.go
@@ -339,9 +339,13 @@ func UpdateCveGroups(cveData models.OriginUpstream, cveRef string, openeulerNum
cveDesc models.OriginUpstreamDesc, cveScV3 models.OriginUpstreamImpactScoreV3, goe models.GitPackageInfo,
scopeType string, cveScV2 models.OriginUpstreamImpactScoreV2, pkList []string, organizationID int8) (bool, error) {
var OpenEulId int64
- CveRes.Description = cveDesc.EnDescription
+ if len(cveDesc.EnDescription) > 2 {
+ CveRes.Description = cveDesc.EnDescription
+ }
CveRes.CveVersion = pkList[1]
- CveRes.RepairTime = cveData.PublishedDate
+ if len(CveRes.RepairTime) < 2 && len(cveData.PublishedDate) > 2 {
+ CveRes.RepairTime = cveData.PublishedDate
+ }
CveRes.PackName = pkList[0]
CveRes.CveUrl = cveRef + cveData.CveNum
CveRes.CveLevel = cveScV3.CveLevel