Merge branch 'yb/3.1' of hongze/hongze_yb into master

services/share_poster.go

@@ -41,7 +41,7 @@ func CreatePosterFromSource(codePage, codeScene, source, version, pars string) (
 			reqSlice = append(reqSlice, fmt.Sprint("Source:", source, "\n"))
 			reqSlice = append(reqSlice, fmt.Sprint("Version:", version, "\n"))
 			reqSlice = append(reqSlice, fmt.Sprint("Pars:", pars, "\n"))
-			go alarm_msg.SendAlarmMsg("CreatePosterFromSource生成分享海报失败, Msg:"+errMsg+";Err:"+err.Error()+";Req:\n"+strings.Join(reqSlice, ";"), 2)
+			go alarm_msg.SendAlarmMsg("CreatePosterFromSource生成分享海报失败, Msg:"+errMsg+";Err:"+err.Error()+"\n;Req:\n"+strings.Join(reqSlice, ";"), 3)
 		}
 	}()
 	if codePage == "" || source == "" || pars == "" {

services/wx_app/wx_app.go

@@ -9,6 +9,7 @@ import (
 	"github.com/silenceper/wechat/v2/miniprogram/config"
 	"github.com/silenceper/wechat/v2/miniprogram/encryptor"
 	"github.com/silenceper/wechat/v2/miniprogram/qrcode"
+	"hongze/hongze_yb/global"
 )
 
 //微信小程序配置信息
@@ -25,10 +26,6 @@ func init() {
 	WxId = `gh_75abb562a946`
 	WxAppSecret = `1737c73e9f69a21de1a345b8f0800258`
 	WxPlatform = 6 //弘则研报来源
-	EnvVersion = "release"
-	//if global.CONFIG.Serve.RunMode == "release" {
-	//	EnvVersion = "release"
-	//}
 }
 
 func GetWxApp() (miniprogram *miniprogram.MiniProgram) {
@@ -72,10 +69,15 @@ func GetDecryptInfo(sessionKey, encryptedData, iv string) (decryptData *encrypto
 
 // GetSunCode 获取太阳码
 func GetSunCode(page, scene string) (resp []byte, err error) {
+	// 此处因初始化顺序问题不放在init中
+	env := "trial"
+	if global.CONFIG.Serve.RunMode == "release" {
+		env = "release"
+	}
 	codePars := qrcode.QRCoder{
 		Page:       page,
 		Scene:      scene,
-		EnvVersion: EnvVersion,
+		EnvVersion: env,
 	}
 	wechatClient := GetWxApp()
 	qr := wechatClient.GetQRCode()