|
@@ -89,7 +89,6 @@ func CreatePosterFromSource(codePage, codeScene, source, version, pars string) (
|
|
|
contentStr, err := fillContent2Html(source, pars, sunCodeUrl)
|
|
contentStr, err := fillContent2Html(source, pars, sunCodeUrl)
|
|
|
if err != nil {
|
|
if err != nil {
|
|
|
errMsg = "html内容有误"
|
|
errMsg = "html内容有误"
|
|
|
- err = errors.New(errMsg)
|
|
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
// 请求python服务htm2img
|
|
// 请求python服务htm2img
|
|
@@ -99,10 +98,11 @@ func CreatePosterFromSource(codePage, codeScene, source, version, pars string) (
|
|
|
htm2ImgReq["height"] = height
|
|
htm2ImgReq["height"] = height
|
|
|
res, err := postHtml2Img(htm2ImgReq)
|
|
res, err := postHtml2Img(htm2ImgReq)
|
|
|
if err != nil || res == nil {
|
|
if err != nil || res == nil {
|
|
|
- err = errors.New("html转图片请求失败")
|
|
|
|
|
|
|
+ errMsg = "html转图片请求失败"
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
|
if res.Code != 200 {
|
|
if res.Code != 200 {
|
|
|
|
|
+ errMsg = "html转图片请求失败"
|
|
|
err = errors.New("html转图片失败: " + res.Msg)
|
|
err = errors.New("html转图片失败: " + res.Msg)
|
|
|
return
|
|
return
|
|
|
}
|
|
}
|
|
@@ -350,12 +350,12 @@ func fillContent2Html(source string, pars, sunCodeUrl string) (contentStr string
|
|
|
contentStr = strings.Replace(contentStr, "{{REPORT_ABSTRACT}}", params.ReportAbstract, 1)
|
|
contentStr = strings.Replace(contentStr, "{{REPORT_ABSTRACT}}", params.ReportAbstract, 1)
|
|
|
case "special_column_list":
|
|
case "special_column_list":
|
|
|
contentStr = strings.Replace(contentStr, "{{LIST_TITLE}}", params.ListTitle, 1)
|
|
contentStr = strings.Replace(contentStr, "{{LIST_TITLE}}", params.ListTitle, 1)
|
|
|
- contentStr = strings.Replace(contentStr, "{{STAGE_1}}", params.Stage1, 1)
|
|
|
|
|
|
|
+ contentStr = strings.Replace(contentStr, "{{STAGE_1}}", "第" + params.Stage1 + "期", 1)
|
|
|
contentStr = strings.Replace(contentStr, "{{AVATAR_1}}", params.Avatar1, 1)
|
|
contentStr = strings.Replace(contentStr, "{{AVATAR_1}}", params.Avatar1, 1)
|
|
|
contentStr = strings.Replace(contentStr, "{{TITLE_1}}", params.Title1, 1)
|
|
contentStr = strings.Replace(contentStr, "{{TITLE_1}}", params.Title1, 1)
|
|
|
contentStr = strings.Replace(contentStr, "{{AUTHOR_1}}", params.Author1, 1)
|
|
contentStr = strings.Replace(contentStr, "{{AUTHOR_1}}", params.Author1, 1)
|
|
|
contentStr = strings.Replace(contentStr, "{{TAG_1}}", params.Tag1, 1)
|
|
contentStr = strings.Replace(contentStr, "{{TAG_1}}", params.Tag1, 1)
|
|
|
- contentStr = strings.Replace(contentStr, "{{STAGE_2}}", params.Stage2, 1)
|
|
|
|
|
|
|
+ contentStr = strings.Replace(contentStr, "{{STAGE_2}}", "第" + params.Stage2 + "期", 1)
|
|
|
contentStr = strings.Replace(contentStr, "{{AVATAR_2}}", params.Avatar2, 1)
|
|
contentStr = strings.Replace(contentStr, "{{AVATAR_2}}", params.Avatar2, 1)
|
|
|
contentStr = strings.Replace(contentStr, "{{TITLE_2}}", params.Title2, 1)
|
|
contentStr = strings.Replace(contentStr, "{{TITLE_2}}", params.Title2, 1)
|
|
|
contentStr = strings.Replace(contentStr, "{{AUTHOR_2}}", params.Author2, 1)
|
|
contentStr = strings.Replace(contentStr, "{{AUTHOR_2}}", params.Author2, 1)
|
|
@@ -378,9 +378,9 @@ func fillContent2Html(source string, pars, sunCodeUrl string) (contentStr string
|
|
|
contentStr = strings.Replace(contentStr, "{{TIME_2}}", params.Time2, 1)
|
|
contentStr = strings.Replace(contentStr, "{{TIME_2}}", params.Time2, 1)
|
|
|
case "activity_list":
|
|
case "activity_list":
|
|
|
bgColorMap := map[string]string{
|
|
bgColorMap := map[string]string{
|
|
|
- "未开始": "#3385FF",
|
|
|
|
|
- "进行中": "#A2A2A2",
|
|
|
|
|
- "已结束": "#E3B377",
|
|
|
|
|
|
|
+ "未开始": "#E3B377",
|
|
|
|
|
+ "进行中": "#3385FF",
|
|
|
|
|
+ "已结束": "#A2A2A2",
|
|
|
}
|
|
}
|
|
|
statusItemMap := map[string]string{
|
|
statusItemMap := map[string]string{
|
|
|
"未开始": "block",
|
|
"未开始": "block",
|
