fix

services/share_poster.go

@@ -34,8 +34,9 @@ func CreatePosterFromSource(codePage, codeScene, source, version, pars string) (
 			go SendEmail(utils.APPNAME+"【"+global.CONFIG.Serve.RunMode+"】"+"失败提醒", "生成分享海报失败, "+errMsg+", CreatePosterFromSource: "+err.Error(), utils.EmailSendToUsers)
 		}
 	}()
-	if codePage == "" || codeScene == "" || source == "" || pars == "" {
+	if codePage == "" || source == "" || pars == "" {
 		errMsg = "参数有误"
+		err = errors.New(errMsg)
 		return
 	}
 	path := fmt.Sprint(codePage, "?", codeScene)
@@ -76,21 +77,11 @@ func CreatePosterFromSource(codePage, codeScene, source, version, pars string) (
 		err = errors.New(errMsg)
 		return "", err
 	}
-	// 获取太阳码,无则生成
-	sunCodeUrl := ""
-	qrcode, err := yb_poster_resource.GetPosterByCondition(path, "qrcode", version)
-	if err != nil && err != utils.ErrNoRow {
+	// 生成太阳码
+	sunCodeUrl, err := CreateAndUploadSunCode(codePage, codeScene, version)
+	if err != nil {
 		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 {
@@ -113,7 +104,6 @@ func CreatePosterFromSource(codePage, codeScene, source, version, pars string) (
 		return
 	}
 	imgUrl = res.Data
-	fmt.Println("posterURL: ", imgUrl)
 	// 记录海报信息
 	newPoster := &yb_poster_resource.YbPosterResource{
 		Path:       path,
@@ -180,7 +170,8 @@ func Html2ImgHttpPost(url, postData string, params ...string) ([]byte, error) {
 
 // CreateAndUploadSunCode 生成太阳码并上传OSS
 func CreateAndUploadSunCode(page, scene, version string) (imgUrl string, err error) {
-	if page == "" || scene == "" {
+	if page == "" {
+		err = errors.New("page不能为空")
 		return
 	}
 	path := fmt.Sprint(page, "?", scene)
@@ -192,7 +183,10 @@ func CreateAndUploadSunCode(page, scene, version string) (imgUrl string, err err
 		return exist.ImgURL, nil
 	}
 	// scene超过32位会生成失败，md5处理至32位
-	sceneMD5 := utils.MD5(scene)
+	sceneMD5 := ""
+	if scene != "" {
+		sceneMD5 = utils.MD5(scene)
+	}
 	picByte, err := wx_app.GetSunCode(page, sceneMD5)
 	if err != nil {
 		return
@@ -217,7 +211,6 @@ func CreateAndUploadSunCode(page, scene, version string) (imgUrl string, err err
 	if err != nil {
 		return
 	}
-	fmt.Println("qrcodeURL: ", imgUrl)
 	// 记录二维码信息
 	newPoster := &yb_poster_resource.YbPosterResource{
 		Path:       path,
@@ -231,12 +224,14 @@ func CreateAndUploadSunCode(page, scene, version string) (imgUrl string, err err
 		return
 	}
 	// 记录参数md5
-	newPars := &yb_suncode_pars.YbSuncodePars{
-		Scene:      scene,
-		Key:        sceneMD5,
-		CreateTime: time.Now(),
+	if scene != "" {
+		newPars := &yb_suncode_pars.YbSuncodePars{
+			Scene:      scene,
+			Key:        sceneMD5,
+			CreateTime: time.Now(),
+		}
+		err = newPars.Create()
 	}
-	err = newPars.Create()
 	return
 }
 

services/wx_app/wx_app.go

@@ -73,8 +73,6 @@ func GetDecryptInfo(sessionKey, encryptedData, iv string) (decryptData *encrypto
 
 // GetSunCode 获取太阳码
 func GetSunCode(page, scene string) (resp []byte, err error) {
-	page = "pages-report/reportList"
-	scene = "a=1"
 	codePars := qrcode.QRCoder{
 		Page:       page,
 		Scene:      scene,