Merge branch 'pool_424_pdf_remote_gen' of eta_server/eta_report into master

controllers/report_share.go

@@ -31,6 +31,7 @@ func (this *ReportShareController) Detail() {
 
 	reportCode := this.GetString("ReportCode")
 	isReplace, _ := this.GetInt("IsReplace", 0)
+	IsPdfGenerate, _ := this.GetInt("IsPdfGenerate", 0)
 	if reportCode == "" {
 		br.Msg = "参数错误"
 		br.ErrMsg = "参数错误，reportCode 为空"
@@ -91,6 +92,14 @@ func (this *ReportShareController) Detail() {
 			return
 		}
 	}
+	var pdfReplace models.Report2ImgReplace
+	if IsPdfGenerate == 1 && conf[models.BusinessConfPdfReportUrlReplace] != "" {
+		if e := json.Unmarshal([]byte(conf[models.BusinessConfPdfReportUrlReplace]), &pdfReplace); e != nil {
+			br.Msg = "获取失败"
+			br.ErrMsg = fmt.Sprintf("获取报告替换配置失败, %v", e)
+			return
+		}
+	}
 	if conf[models.BusinessConfDisclaimer] != "" {
 		resp.Disclaimer = conf[models.BusinessConfDisclaimer]
 	}
@@ -205,6 +214,22 @@ func (this *ReportShareController) Detail() {
 		}
 	}
 
+	// 替换地址
+	if pdfReplace.IsReplace {
+		if pdfReplace.OssUrlOrigin != "" && pdfReplace.OssUrlNew != "" {
+			resp.H5ReportShareImg = strings.ReplaceAll(resp.H5ReportShareImg, pdfReplace.OssUrlOrigin, pdfReplace.OssUrlNew)
+			resp.ReportLogo = strings.ReplaceAll(resp.ReportLogo, pdfReplace.OssUrlOrigin, pdfReplace.OssUrlNew)
+			report.Content = strings.ReplaceAll(report.Content, pdfReplace.OssUrlOrigin, pdfReplace.OssUrlNew)
+			report.ContentSub = strings.ReplaceAll(report.ContentSub, pdfReplace.OssUrlOrigin, pdfReplace.OssUrlNew)
+			report.HeadImg = strings.ReplaceAll(report.HeadImg, pdfReplace.OssUrlOrigin, pdfReplace.OssUrlNew)
+			report.EndImg = strings.ReplaceAll(report.EndImg, pdfReplace.OssUrlOrigin, pdfReplace.OssUrlNew)
+		}
+		if pdfReplace.ChartUrlOrigin != "" && pdfReplace.ChartUrlNew != "" {
+			report.Content = strings.ReplaceAll(report.Content, pdfReplace.ChartUrlOrigin, pdfReplace.ChartUrlNew)
+			report.ContentSub = strings.ReplaceAll(report.ContentSub, pdfReplace.ChartUrlOrigin, pdfReplace.ChartUrlNew)
+		}
+	}
+
 	// 更新pv
 	if e = models.UpdateReportPv(report.Id); e != nil {
 		br.Msg = "获取失败"

models/business_conf.go

@@ -28,6 +28,7 @@ const (
 	BusinessConfReportEnLogoShow       = "ReportEnLogoShow"       // 报告logo
 	BusinessConfDisclaimerEn           = "DisclaimerEn"           // 英文免责声明
 	BusinessConfReport2ImgReplace      = "Report2ImgReplace"      // 报告转图替换地址
+	BusinessConfPdfReportUrlReplace    = "PdfReportUrlReplace"    // 报告转图替换地址
 	BusinessConfIsOpenChartExpired     = "IsOpenChartExpired"     // 图表是否鉴权
 	BusinessConfReportChartExpiredTime = "ReportChartExpiredTime" // 图表有效期鉴权时间，单位：分钟
 )

utils/constants.go

@@ -1,9 +1,5 @@
 package utils
 
-const (
-	Md5Key = "Ks@h64WJ#tcVgG8$&WlNfqvLAtMgpxWN"
-)
-
 // 常量定义
 const (
 	FormatTime            = "15:04:05"                  //时间格式
@@ -32,55 +28,14 @@ const (
 	RegularEmail  = `\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*`                                             //匹配电子邮箱
 )
 
-// 验证码code
-const (
-	REGISTER_CODE = iota + 1 //注册
-	LOGIN_CODE               //登录
-)
-
-// 聚合短信
-var (
-	JhGnTplId = "65692" //聚合国内模板编码
-	JhGjTplId = "10054" //聚合国内模板编码
-
-	JhGnAppKey = "4c8504c49dd335e99cfd7b6a3a9e2415" //聚合国内AppKey
-	JhGjAppKey = "3326ad2c1047a4cd92ace153e6044ca3"
-)
-
-// 科大讯飞--语音合成
-const (
-	XfSTATUS_FIRST_FRAME    = 0 //第一帧标识
-	XfSTATUS_CONTINUE_FRAME = 1 //中间帧标识
-	XfSTATUS_LAST_FRAME     = 2 //最后一帧标识
-	XfAPPID                 = "5ed70e9d"
-	XfAPIKey                = "d580509ca262e9586fb65a7064d5ce77"
-	XfAPISecret             = "a085720dc55850c720fa5576335f847a"
-	XfHostUrl               = "wss://tts-api.xfyun.cn/v2/tts"
-	XfOrigin                = "http://tts-api.xfyun.cn/"
-	XfHost                  = "tts-api.xfyun.cn"
-)
-
-// 客户状态
-const (
-	COMPANY_STATUS_TRY_OUT   = "试用"
-	COMPANY_STATUS_FOREVER   = "永续"
-	COMPANY_STATUS_FREEZE    = "冻结"
-	COMPANY_STATUS_LOSE      = "流失"
-	COMPANY_STATUS_FORMAL    = "正式"
-	COMPANY_STATUS_POTENTIAL = "潜在"
-)
-
-// 缓存key
-const (
-	CACHE_KEY_USER_VIEW = "user_view_record" //用户阅读数据
-)
-
 const (
-	key = "KcSJaJoUBC2ZAA7HEWpaiH49" //全局加密KEY
+	CACHE_CREATE_REPORT_IMGPDF_QUEUE = "eta_report:report_img_pdf_queue" // 生成报告长图PDF队列
 )
 
+// 商户号
 const (
-	CACHE_CREATE_REPORT_IMGPDF_QUEUE = "eta_report:report_img_pdf_queue" // 生成报告长图PDF队列
+	BusinessCodeSandbox = "E2023080700" // 试用平台
+	BusinessCodeRelease = "E2023080900" // 生产环境
 )
 
 // 缓存key
@@ -92,12 +47,6 @@ const (
 	CACHE_CHART_AUTH           = "eta:chart:auth:" //图表数据授权
 )
 
-// 商户号
-const (
-	BusinessCodeSandbox = "E2023080700" // 试用平台
-	BusinessCodeRelease = "E2023080900" // 生产环境
-)
-
 const (
 	DesKeySalt = "JMCqSoUrTAmyNNIRb0TtlrPk" // DesKey盐值
 )