|
|
@@ -76,11 +76,21 @@ func CreatePosterFromSource(codePage, codeScene, source, version, pars string) (
|
|
|
err = errors.New(errMsg)
|
|
|
return "", err
|
|
|
}
|
|
|
- // 生成太阳码
|
|
|
- sunCodeUrl, err := CreateAndUploadSunCode(codePage, codeScene, version)
|
|
|
- if err != nil {
|
|
|
+ // 获取太阳码,无则生成
|
|
|
+ sunCodeUrl := ""
|
|
|
+ qrcode, err := yb_poster_resource.GetPosterByCondition(path, "qrcode", version)
|
|
|
+ if err != nil && err != utils.ErrNoRow {
|
|
|
return
|
|
|
}
|
|
|
+ if qrcode != nil && qrcode.ImgURL != "" {
|
|
|
+ sunCodeUrl = qrcode.ImgURL
|
|
|
+ } else {
|
|
|
+ // 生成太阳码
|
|
|
+ sunCodeUrl, err = CreateAndUploadSunCode(codePage, codeScene, version)
|
|
|
+ if err != nil {
|
|
|
+ return
|
|
|
+ }
|
|
|
+ }
|
|
|
// 填充html内容
|
|
|
contentStr, err := fillContent2Html(source, pars, sunCodeUrl)
|
|
|
if err != nil {
|
|
|
@@ -128,7 +138,7 @@ func postHtml2Img(param map[string]interface{}) (resp *Html2ImgResp, err error)
|
|
|
if global.CONFIG.Serve.RunMode == "release" {
|
|
|
|
|
|
} else {
|
|
|
- pythonUrl = "http://127.0.0.1:8888/"
|
|
|
+ pythonUrl = "http://127.0.0.1:5008/"
|
|
|
}
|
|
|
postUrl := pythonUrl + "htm2img"
|
|
|
postData, err := json.Marshal(param)
|
