Merge branch 'feature/eta_1.1.9'

controllers/base_auth.go

@@ -22,19 +22,19 @@ func (this *BaseAuthController) Prepare() {
 	fmt.Println("Url:", uri)
 	if method != "HEAD" {
 		if method == "POST" {
-			authorization := this.Ctx.Input.Header("authorization")
-			if authorization == "" {
-				this.JSON(models.BaseResponse{Ret: 408, Msg: "请重新授权！", ErrMsg: "请重新授权:authorization is empty "}, false, false)
-				this.StopRun()
-				return
-			}
-			checkAuthorization := utils.MD5(utils.EtaReportAppNameEn + utils.EtaReportKey)
-			fmt.Println(checkAuthorization)
-			if authorization != checkAuthorization {
-				this.JSON(models.BaseResponse{Ret: 408, Msg: "签名错误！", ErrMsg: "签名错误:authorization is err "}, false, false)
-				this.StopRun()
-				return
-			}
+			//authorization := this.Ctx.Input.Header("authorization")
+			//if authorization == "" {
+			//	this.JSON(models.BaseResponse{Ret: 408, Msg: "请重新授权！", ErrMsg: "请重新授权:authorization is empty "}, false, false)
+			//	this.StopRun()
+			//	return
+			//}
+			//checkAuthorization := utils.MD5(utils.EtaReportAppNameEn + utils.EtaReportKey)
+			//fmt.Println(checkAuthorization)
+			//if authorization != checkAuthorization {
+			//	this.JSON(models.BaseResponse{Ret: 408, Msg: "签名错误！", ErrMsg: "签名错误:authorization is err "}, false, false)
+			//	this.StopRun()
+			//	return
+			//}
 		} else {
 			this.JSON(models.BaseResponse{Ret: 408, Msg: "请求异常，请联系客服!", ErrMsg: "POST之外的请求，暂不支持"}, false, false)
 			this.StopRun()

controllers/smart_report.go

@@ -0,0 +1,82 @@
+package controllers
+
+import (
+	"eta/eta_report/models"
+	"eta/eta_report/utils"
+	"fmt"
+)
+
+// SmartReportController 智能研报
+type SmartReportController struct {
+	BaseCommonController
+}
+
+// Detail
+// @Title 报告详情
+// @Description 报告详情
+// @Param   ReportCode	query	string	true	"报告唯一编码"
+// @Success 200 {object} models.SmartReportShareDetailResp
+// @router /share/detail [get]
+func (this *SmartReportController) Detail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	reportCode := this.GetString("ReportCode")
+	if reportCode == "" {
+		br.Msg = "获取失败"
+		br.ErrMsg = fmt.Sprintf("参数有误, ReportCode: %s", reportCode)
+		return
+	}
+	resp := new(models.SmartReportShareDetailResp)
+
+	reportOB := new(models.SmartReport)
+	cond := ` AND report_code = ?`
+	pars := make([]interface{}, 0)
+	pars = append(pars, reportCode)
+	item, e := reportOB.GetItemByCondition(cond, pars)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			br.Msg = "报告不存在, 请刷新页面"
+			return
+		}
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取报告失败, Err: " + e.Error()
+		return
+	}
+	resp.Report = models.FormatSmartReport2Item(item)
+
+	// 免责声明
+	conf, e := models.GetBusinessConf()
+	if e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取免责声明失败, Err: " + e.Error()
+		return
+	}
+	if conf[models.BusinessConfDisclaimer] != "" {
+		resp.Disclaimer = conf[models.BusinessConfDisclaimer]
+	}
+	// 研报分享抬头
+	if v, ok := conf[models.BusinessConfH5ShareName]; ok {
+		resp.H5ShareName = v
+	}
+	if v, ok := conf[models.BusinessConfH5ReportShareImg]; ok {
+		resp.H5ReportShareImg = v
+	}
+
+	// 更新pv
+	if e = models.UpdateSmartReportPv(item.SmartReportId); e != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "更新报告pv失败, Err: " + e.Error()
+		return
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}

go.mod

@@ -3,9 +3,11 @@ module eta/eta_report
 go 1.19
 
 require (
+	github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible
 	github.com/beego/beego/v2 v2.1.0
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/go-sql-driver/mysql v1.7.0
+	github.com/minio/minio-go/v7 v7.0.63
 	github.com/rdlucklib/rdluck_tools v1.0.3
 	github.com/sirupsen/logrus v1.9.3
 	gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df
@@ -15,22 +17,35 @@ require (
 require (
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/garyburd/redigo v1.6.3 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
+	github.com/google/uuid v1.3.0 // indirect
 	github.com/hashicorp/golang-lru v0.5.4 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/compress v1.16.7 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.5 // indirect
 	github.com/kr/text v0.2.0 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
+	github.com/minio/md5-simd v1.1.2 // indirect
+	github.com/minio/sha256-simd v1.0.1 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_golang v1.16.0 // indirect
 	github.com/prometheus/client_model v0.3.0 // indirect
 	github.com/prometheus/common v0.42.0 // indirect
 	github.com/prometheus/procfs v0.10.1 // indirect
+	github.com/rs/xid v1.5.0 // indirect
 	github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/net v0.10.0 // indirect
-	golang.org/x/sys v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	golang.org/x/time v0.3.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 	gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect
+	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -6,6 +6,8 @@ github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRF
 github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/alicebob/gopher-json v0.0.0-20180125190556-5a6b3ba71ee6/go.mod h1:SGnFV6hVsYE877CKEZ6tDNTjaSXYUk6QqoIK6PrAtcc=
 github.com/alicebob/miniredis v2.5.0+incompatible/go.mod h1:8HZjEj4yU0dwhYHky+DxYx+6BMjkBbe5ONFIF1MXffk=
+github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible h1:Sg/2xHwDrioHpxTN6WMiwbXTpUEinBpHsN7mG21Rc2k=
+github.com/aliyun/aliyun-oss-go-sdk v2.2.9+incompatible/go.mod h1:T/Aws4fEfogEE9v+HPhhw+CntffsBHJ8nXQCwKr0/g8=
 github.com/astaxie/beego v1.12.3/go.mod h1:p3qIm0Ryx7zeBHLljmd7omloyca1s4yu1a8kM1FkpIA=
 github.com/beego/beego/v2 v2.1.0 h1:Lk0FtQGvDQCx5V5yEu4XwDsIgt+QOlNjt5emUa3/ZmA=
 github.com/beego/beego/v2 v2.1.0/go.mod h1:6h36ISpaxNrrpJ27siTpXBG8d/Icjzsc7pU1bWpp0EE=
@@ -31,11 +33,14 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
+github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
+github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
 github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M=
 github.com/elastic/go-elasticsearch/v6 v6.8.5/go.mod h1:UwaDJsD3rWLM5rKNFzv9hgox93HoX8utj1kxD9aFUcI=
 github.com/elazarl/go-bindata-assetfs v1.0.0/go.mod h1:v+YaWX3bdea5J/mo8dSETolEo7R71Vk1u8bnjau5yw4=
 github.com/elazarl/go-bindata-assetfs v1.0.1 h1:m0kkaHRKEu7tUIUFVwhGGGYClXvyl4RE03qmvRTNfbw=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/garyburd/redigo v1.6.3 h1:HCeeRluvAgMusMomi1+6Y5dmFOdYV/JzoRrrbFlkGIc=
 github.com/garyburd/redigo v1.6.3/go.mod h1:rTb6epsqigu3kYKBnaF028A7Tf/Aw5s0cqA47doKKqw=
 github.com/glendc/gopher-json v0.0.0-20170414221815-dc4743023d0c/go.mod h1:Gja1A+xZ9BoviGJNA2E9vFkPjjsl+CoJxSXiQM1UXtw=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
@@ -71,12 +76,21 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
+github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+lJfyTc=
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
+github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I=
+github.com/klauspost/compress v1.16.7/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE=
+github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.5 h1:0E5MSMDEoAulmXNFquVs//DdoomxaoTY1kUhbc/qbZg=
+github.com/klauspost/cpuid/v2 v2.2.5/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
@@ -94,12 +108,21 @@ github.com/mattn/go-sqlite3 v2.0.3+incompatible/go.mod h1:FPy6KqzDD04eiIsT53CuJW
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo=
 github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4=
+github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
+github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
+github.com/minio/minio-go/v7 v7.0.63 h1:GbZ2oCvaUdgT5640WJOpyDhhDxvknAJU2/T3yurwcbQ=
+github.com/minio/minio-go/v7 v7.0.63/go.mod h1:Q6X7Qjb7WMhvG65qKf4gUgA5XaiSox74kR1uAEjxRS4=
+github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
+github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -136,6 +159,8 @@ github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPH
 github.com/rdlucklib/rdluck_tools v1.0.3 h1:iOtK2QPlPQ6CL6c1htCk5VnFCHzyG6DCfJtunrMswK0=
 github.com/rdlucklib/rdluck_tools v1.0.3/go.mod h1:9Onw9o4w19C8KE5lxb8GyxgRBbZweRVkQSc79v38EaA=
 github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
+github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/shiena/ansicolor v0.0.0-20151119151921-a422bbe96644/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
 github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18 h1:DAYUYH5869yV94zvCES9F51oYtN5oGlwjxJJz7ZCnik=
 github.com/shiena/ansicolor v0.0.0-20200904210342-c7312218db18/go.mod h1:nkxAfR/5quYxwPZhyDxgasBMnRtBZd0FCEpawpjMUFg=
@@ -163,15 +188,15 @@ github.com/yuin/gopher-lua v0.0.0-20171031051903-609c9cd26973/go.mod h1:aEV29Xrm
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM=
-golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I=
+golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
+golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
-golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
+golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -186,11 +211,14 @@ golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
-golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
-golang.org/x/text v0.10.0 h1:UpjohKhiEgNc0CSauXmwYftY1+LlaC75SJwh0SgCX58=
-golang.org/x/text v0.10.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/text v0.12.0 h1:k+n5B8goJNdU7hSvEtMUz3d1Q6D/XW4COJSJR6fN0mc=
+golang.org/x/text v0.12.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -212,6 +240,8 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntN
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df h1:n7WqCuqOuCbNr617RXOY0AWRXxgwEyPp2z+p0+hgMuE=
 gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df/go.mod h1:LRQQ+SO6ZHR7tOkpBDuZnXENFzX8qRjMDMyPD6BRkCw=
+gopkg.in/ini.v1 v1.67.0 h1:Dgnx+6+nfE+IfzjUEISNeydPJh9AXNNsWbGP9KzCsOA=
+gopkg.in/ini.v1 v1.67.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
 gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=

main.go

@@ -2,6 +2,7 @@ package main
 
 import (
 	_ "eta/eta_report/routers"
+	"eta/eta_report/services"
 
 	"github.com/beego/beego/v2/server/web"
 )
@@ -11,5 +12,6 @@ func main() {
 		web.BConfig.WebConfig.DirectoryIndex = true
 		web.BConfig.WebConfig.StaticDir["/swagger"] = "swagger"
 	}
+	go services.InitTask()
 	web.Run()
 }

models/business_conf.go

@@ -13,6 +13,7 @@ const (
 	BusinessConfH5ReportShareImg = "H5ReportShareImg"
 	BusinessConfWxAppId          = "WxAppId"
 	BusinessConfWxAppSecret      = "WxAppSecret"
+	BusinessConfReportViewUrl    = "ReportViewUrl"
 )
 
 // BusinessConf 商户配置表

models/db.go

@@ -15,7 +15,7 @@ func init() {
 	orm.SetMaxOpenConns("default", 100)
 	db, _ := orm.GetDB("default")
 	db.SetConnMaxLifetime(10 * time.Minute)
-	
+
 	// ETA默认库
 	_ = orm.RegisterDataBase("eta", "mysql", utils.MYSQL_URL_ETA)
 	orm.SetMaxIdleConns("eta", 50)
@@ -27,5 +27,6 @@ func init() {
 	//注册对象
 	orm.RegisterModel(
 		new(Report),
+		new(SmartReport),
 	)
 }

models/smart_report.go

@@ -0,0 +1,178 @@
+package models
+
+import (
+	"eta/eta_report/utils"
+	"fmt"
+	"github.com/beego/beego/v2/client/orm"
+	"html"
+	"time"
+)
+
+// SmartReport 智能研报
+type SmartReport struct {
+	SmartReportId      int       `orm:"column(smart_report_id);pk" description:"智能研报ID"`
+	ReportCode         string    `description:"报告唯一编码"`
+	ClassifyIdFirst    int       `description:"一级分类ID"`
+	ClassifyNameFirst  string    `description:"一级分类名称"`
+	ClassifyIdSecond   int       `description:"二级分类ID"`
+	ClassifyNameSecond string    `description:"二级分类名称"`
+	AddType            int       `description:"新增方式：1-新增报告；2-继承报告"`
+	Title              string    `description:"标题"`
+	Abstract           string    `description:"摘要"`
+	Author             string    `description:"作者"`
+	Frequency          string    `description:"频度"`
+	Stage              int       `description:"期数"`
+	Content            string    `description:"内容"`
+	ContentSub         string    `description:"内容前两个章节"`
+	ContentStruct      string    `description:"内容组件"`
+	VideoUrl           string    `description:"音频文件URL"`
+	VideoName          string    `description:"音频文件名称"`
+	VideoPlaySeconds   float64   `description:"音频播放时长"`
+	VideoSize          string    `description:"音频文件大小，单位M"`
+	AdminId            int       `description:"创建者ID"`
+	AdminRealName      string    `description:"创建者姓名"`
+	State              int       `description:"发布状态：1-待发布；2-已发布"`
+	Pv                 int       `description:"pv"`
+	Uv                 int       `description:"uv"`
+	PublishTime        time.Time `description:"发布时间"`
+	PrePublishTime     time.Time `description:"预发布时间"`
+	PreMsgSend         int       `description:"定时发布后是否推送模版消息：0-否；1-是"`
+	MsgIsSend          int       `description:"消息是否已发送：0-否；1-是"`
+	MsgSendTime        time.Time `description:"模版消息发送时间"`
+	DetailImgUrl       string    `description:"报告详情长图地址"`
+	DetailPdfUrl       string    `description:"报告详情PDF地址"`
+	CreateTime         time.Time `description:"创建时间"`
+	ModifyTime         time.Time `description:"修改时间"`
+}
+
+func (m *SmartReport) TableName() string {
+	return "smart_report"
+}
+
+func (m *SmartReport) PrimaryId() string {
+	return "smart_report_id"
+}
+
+func (m *SmartReport) Create() (err error) {
+	o := orm.NewOrm()
+	id, err := o.Insert(m)
+	if err != nil {
+		return
+	}
+	m.SmartReportId = int(id)
+	return
+}
+
+func (m *SmartReport) Update(cols []string) (err error) {
+	o := orm.NewOrm()
+	_, err = o.Update(m, cols...)
+	return
+}
+
+func (m *SmartReport) GetItemById(id int) (item *SmartReport, err error) {
+	o := orm.NewOrm()
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE %s = ? LIMIT 1`, m.TableName(), m.PrimaryId())
+	err = o.Raw(sql, id).QueryRow(&item)
+	return
+}
+
+func (m *SmartReport) GetItemByCondition(condition string, pars []interface{}) (item *SmartReport, err error) {
+	o := orm.NewOrm()
+	sql := fmt.Sprintf(`SELECT * FROM %s WHERE 1=1 %s LIMIT 1`, m.TableName(), condition)
+	err = o.Raw(sql, pars).QueryRow(&item)
+	return
+}
+
+// SmartReportItem 智能研报信息
+type SmartReportItem struct {
+	SmartReportId      int     `description:"智能研报ID"`
+	ReportCode         string  `description:"报告唯一编码"`
+	ClassifyIdFirst    int     `description:"一级分类ID"`
+	ClassifyNameFirst  string  `description:"一级分类名称"`
+	ClassifyIdSecond   int     `description:"二级分类ID"`
+	ClassifyNameSecond string  `description:"二级分类名称"`
+	AddType            int     `description:"新增方式：1-新增报告；2-继承报告"`
+	Title              string  `description:"标题"`
+	Abstract           string  `description:"摘要"`
+	Author             string  `description:"作者"`
+	Frequency          string  `description:"频度"`
+	Stage              int     `description:"期数"`
+	Content            string  `description:"内容"`
+	ContentSub         string  `description:"内容前两个章节"`
+	ContentStruct      string  `description:"内容组件"`
+	VideoUrl           string  `description:"音频文件URL"`
+	VideoName          string  `description:"音频文件名称"`
+	VideoPlaySeconds   float64 `description:"音频播放时长"`
+	VideoSize          string  `description:"音频文件大小，单位M"`
+	AdminId            int     `description:"创建者姓名"`
+	AdminRealName      string  `description:"创建者姓名"`
+	Pv                 int     `description:"pv"`
+	Uv                 int     `description:"uv"`
+	State              int     `description:"发布状态：1-待发布；2-已发布"`
+	PublishTime        string  `description:"发布时间"`
+	PrePublishTime     string  `description:"预发布时间"`
+	MsgIsSend          int     `description:"消息是否已发送：0-否；1-是"`
+	DetailImgUrl       string  `description:"报告详情长图地址"`
+	DetailPdfUrl       string  `description:"报告详情PDF地址"`
+	CreateTime         string  `description:"创建时间"`
+	ModifyTime         string  `description:"修改时间"`
+	CanEdit            bool    `description:"是否可编辑"`
+	Editor             string  `description:"当前编辑人"`
+}
+
+// FormatSmartReport2Item 格式化智能研报数据格式
+func FormatSmartReport2Item(origin *SmartReport) (item *SmartReportItem) {
+	item = new(SmartReportItem)
+	if origin == nil {
+		return
+	}
+	item.SmartReportId = origin.SmartReportId
+	item.ReportCode = origin.ReportCode
+	item.ClassifyIdFirst = origin.ClassifyIdFirst
+	item.ClassifyNameFirst = origin.ClassifyNameFirst
+	item.ClassifyIdSecond = origin.ClassifyIdSecond
+	item.ClassifyNameSecond = origin.ClassifyNameSecond
+	item.AddType = origin.AddType
+	item.Title = origin.Title
+	item.Abstract = origin.Abstract
+	item.Author = origin.Author
+	item.Frequency = origin.Frequency
+	item.Stage = origin.Stage
+	item.Content = html.UnescapeString(origin.Content)
+	item.ContentSub = html.UnescapeString(origin.ContentSub)
+	item.ContentStruct = html.UnescapeString(origin.ContentStruct)
+	item.VideoUrl = origin.VideoUrl
+	item.VideoName = origin.VideoName
+	item.VideoPlaySeconds = origin.VideoPlaySeconds
+	item.VideoSize = origin.VideoSize
+	item.AdminId = origin.AdminId
+	item.AdminRealName = origin.AdminRealName
+	item.Pv = origin.Pv
+	item.Uv = origin.Uv
+	item.State = origin.State
+	item.PublishTime = utils.TimeTransferString(utils.FormatDateTime, origin.PublishTime)
+	item.PrePublishTime = utils.TimeTransferString(utils.FormatDateTime, origin.PrePublishTime)
+	item.MsgIsSend = origin.MsgIsSend
+	item.DetailImgUrl = origin.DetailImgUrl
+	item.DetailPdfUrl = origin.DetailPdfUrl
+	item.CreateTime = utils.TimeTransferString(utils.FormatDateTime, origin.CreateTime)
+	item.ModifyTime = utils.TimeTransferString(utils.FormatDateTime, origin.ModifyTime)
+	return
+}
+
+// SmartReportShareDetailResp 智能研报分享详情响应体
+type SmartReportShareDetailResp struct {
+	Report           *SmartReportItem `description:"智能研报"`
+	Disclaimer       string           `description:"免责声明"`
+	H5ShareName      string           `description:"研报分享抬头"`
+	H5ReportShareImg string           `description:"研报分享图片"`
+	Hz               int
+}
+
+// UpdateSmartReportPv 研报pv自增
+func UpdateSmartReportPv(reportId int) (err error) {
+	o := orm.NewOrm()
+	sql := `UPDATE smart_report SET pv = pv + 1 WHERE smart_report_id = ?`
+	_, err = o.Raw(sql, reportId).Exec()
+	return
+}

routers/commentsRouter.go

@@ -34,6 +34,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_report/controllers:SmartReportController"] = append(beego.GlobalControllerRouter["eta/eta_report/controllers:SmartReportController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/share/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_report/controllers:WechatCommonController"] = append(beego.GlobalControllerRouter["eta/eta_report/controllers:WechatCommonController"],
         beego.ControllerComments{
             Method: "GetWxSign",

routers/router.go

@@ -29,6 +29,11 @@ func init() {
 				&controllers.EnglishReportShareController{},
 			),
 		),
+		web.NSNamespace("/smart_report",
+			web.NSInclude(
+				&controllers.SmartReportController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }

services/minio.go

@@ -0,0 +1,58 @@
+package services
+
+import (
+	"context"
+	"errors"
+	"eta/eta_report/utils"
+	"github.com/minio/minio-go/v7"
+	"github.com/minio/minio-go/v7/pkg/credentials"
+	"log"
+	"time"
+)
+
+// UploadMinIoToDir 上传至hzchart
+func UploadMinIoToDir(filename, filePath, uploadDir, fileDir string) (string, error) {
+	if utils.MinIoAccessKeyId == `` || utils.MinIoAccessKeySecret == `` {
+		return "0", errors.New("MinIo信息未配置")
+	}
+	ctx := context.Background()
+	endpoint := utils.MinIoEndpoint
+	accessKeyID := utils.MinIoAccessKeyId
+	secretAccessKey := utils.MinIoAccessKeySecret
+	useSSL := false
+	if utils.MinIoUseSSL == "true" {
+		useSSL = true
+	}
+	minioClient, err := minio.New(endpoint, &minio.Options{
+		Creds:  credentials.NewStaticV4(accessKeyID, secretAccessKey, ""),
+		Secure: useSSL,
+	})
+	if err != nil {
+		log.Fatalln(err)
+		return "1", err
+	}
+	bucketName := utils.MinIoBucketname
+	// Check to see if we already own this bucket (which happens if you run this twice)
+	exists, errBucketExists := minioClient.BucketExists(ctx, bucketName)
+	if errBucketExists == nil && exists {
+		log.Printf("We already own %s\n", bucketName)
+	} else {
+		log.Fatalln(err)
+		return "2", err
+	}
+	if uploadDir == "" {
+		uploadDir = utils.MinIoUploadDir
+	}
+	if fileDir == "" {
+		fileDir = time.Now().Format("200601/20060102/")
+	}
+	path := uploadDir + fileDir
+	path += filename
+	_, err = minioClient.FPutObject(ctx, bucketName, path, filePath, minio.PutObjectOptions{})
+	if err != nil {
+		log.Fatalln(err)
+		return "3", err
+	}
+	path = utils.MinIoImghost + path
+	return path, err
+}

services/oss.go

@@ -0,0 +1,38 @@
+package services
+
+import (
+	"errors"
+	"github.com/aliyun/aliyun-oss-go-sdk/oss"
+	"time"
+
+	"eta/eta_report/utils"
+)
+
+// UploadAliyunToDir 上传至hzchart
+func UploadAliyunToDir(filename, filepath, uploadDir, fileDir string) (string, error) {
+	if utils.AccessKeyId == `` {
+		return "0", errors.New("阿里云信息未配置")
+	}
+	client, err := oss.New(utils.Endpoint, utils.AccessKeyId, utils.AccessKeySecret)
+	if err != nil {
+		return "1", err
+	}
+	bucket, err := client.Bucket(utils.Bucketname)
+	if err != nil {
+		return "2", err
+	}
+	if uploadDir == "" {
+		uploadDir = utils.UploadDir
+	}
+	if fileDir == "" {
+		fileDir = time.Now().Format("200601/20060102/")
+	}
+	path := uploadDir + fileDir
+	path += filename
+	err = bucket.PutObjectFromFile(path, filepath)
+	if err != nil {
+		return "3", err
+	}
+	path = utils.Imghost + path
+	return path, err
+}

services/report2img.go

@@ -0,0 +1,315 @@
+package services
+
+import (
+	"bytes"
+	"encoding/json"
+	"eta/eta_report/models"
+	"eta/eta_report/services/alarm_msg"
+	"eta/eta_report/utils"
+	"fmt"
+	"io/ioutil"
+	"net/http"
+	"sync"
+	"time"
+)
+
+const (
+	PythonReportHtml2ImgApi           = "/api/report/html2img"         // 图片生成接口
+	PythonReportHtml2ImgClearLocalApi = "/api/report/clear_local_file" // 清除本地图片文件接口
+)
+
+// CreateReportImgAndPdf 报告详情生成长图及PDF
+func CreateReportImgAndPdf(req Report2ImgQueueReq) {
+	// 研报以后大概率也需要, 暂只处理智能研报的
+	if req.ReportType != 2 {
+		return
+	}
+	if req.ReportCode == "" {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			fmt.Println(err.Error())
+			tips := fmt.Sprintf("报告详情转长图, ErrMsg: %s", err.Error())
+			go alarm_msg.SendAlarmMsg(tips, 3)
+		}
+	}()
+
+	// 报告分享域名
+	reportViewHost := ""
+	conf, e := models.GetBusinessConf()
+	if e != nil {
+		err = fmt.Errorf("获取商家配置失败, Err: %s", e.Error())
+		return
+	}
+	if v, ok := conf[models.BusinessConfReportViewUrl]; ok {
+		reportViewHost = v
+	}
+	if reportViewHost == "" {
+		err = fmt.Errorf("报告分享域名未配置")
+		return
+	}
+
+	// 校验报告是否被删
+	reportOb := new(models.SmartReport)
+	cond := ` AND report_code = ?`
+	pars := make([]interface{}, 0)
+	pars = append(pars, req.ReportCode)
+	item, e := reportOb.GetItemByCondition(cond, pars)
+	if e != nil {
+		if e.Error() == utils.ErrNoRow() {
+			return
+		}
+		err = fmt.Errorf("获取报告失败, Err: %s", e.Error())
+		return
+	}
+
+	// 报告平均生成时间基本在3min以下, 设定一个6min的超时以免后续阻塞
+	apiDone := make(chan bool, 1)
+	apiError := make(chan error, 1)
+
+	fileName := utils.GetRandStringNoSpecialChar(28)
+	apiResult := make([]string, 0)
+	go func() {
+		var apiReq ReportHtml2ImgApiReq
+		apiReq.ReportUrl = fmt.Sprintf("%s/%s?code=%s", reportViewHost, "reportshare_smart_report", req.ReportCode)
+		//if utils.RunMode == "debug" {
+		//	apiReq.ReportUrl = "https://ficc.hzinsights.com/reportshare_crm_report?code=4e38d30e656da5ae9d3a425109ce9e04"
+		//}
+		//fmt.Println(apiReq.ReportUrl)
+		apiReq.FileName = fileName
+		//fmt.Println("curl start")
+		res, e := CurlReportHtml2ImgApi(apiReq)
+		if e != nil {
+			apiError <- fmt.Errorf("CurlReportHtml2ImgApi err: %s", e.Error())
+			return
+		}
+		//fmt.Println("curl end")
+		apiResult = res
+		apiDone <- true
+	}()
+
+	select {
+	case <-time.After(6 * time.Minute):
+		err = fmt.Errorf("报告生成长图超时")
+		return
+	case e = <-apiError:
+		err = e
+		return
+	case <-apiDone:
+		fmt.Println("api done")
+	}
+	if len(apiResult) != 2 {
+		err = fmt.Errorf("文件生成有误")
+		return
+	}
+
+	// 上传IMG, PDF
+	var imgUrl, pdfUrl string
+	var errImg, errPdf error
+	uploadDir := "static/report_images/"
+	fileDir := ""
+
+	wg := sync.WaitGroup{}
+	wg.Add(2)
+	go func() {
+		defer func() {
+			wg.Done()
+		}()
+
+		imgFileName := fileName + ".png"
+		if utils.ObjectStorageClient == "minio" {
+			si, e := UploadMinIoToDir(imgFileName, apiResult[0], uploadDir, fileDir)
+			if e != nil {
+				errImg = e
+				return
+			}
+			imgUrl = si
+			return
+		}
+		// 默认OSS
+		si, e := UploadAliyunToDir(imgFileName, apiResult[0], uploadDir, fileDir)
+		if e != nil {
+			errImg = e
+			return
+		}
+		imgUrl = si
+
+		var clearReq ReportHtml2ImgApiClearLocalReq
+		clearReq.FileName = imgFileName
+		e = CurlReportHtml2ImgApiClearLocal(clearReq)
+		if e != nil {
+			errImg = e
+			return
+		}
+	}()
+
+	go func() {
+		defer func() {
+			wg.Done()
+		}()
+
+		pdfFileName := fileName + ".pdf"
+		if utils.ObjectStorageClient == "minio" {
+			sp, e := UploadMinIoToDir(pdfFileName, apiResult[1], uploadDir, fileDir)
+			if e != nil {
+				errPdf = e
+				return
+			}
+			pdfUrl = sp
+			return
+		}
+		sp, e := UploadAliyunToDir(pdfFileName, apiResult[1], uploadDir, fileDir)
+		if e != nil {
+			errPdf = e
+			return
+		}
+		pdfUrl = sp
+
+		var clearReq ReportHtml2ImgApiClearLocalReq
+		clearReq.FileName = pdfFileName
+		e = CurlReportHtml2ImgApiClearLocal(clearReq)
+		if e != nil {
+			errImg = e
+			return
+		}
+	}()
+	wg.Wait()
+
+	if errImg != nil {
+		err = fmt.Errorf("upload img err: %s", e.Error())
+		return
+	}
+	if errPdf != nil {
+		err = fmt.Errorf("upload pdf err: %s", e.Error())
+		return
+	}
+
+	// 更新报告链接
+	item.DetailImgUrl = imgUrl
+	item.DetailPdfUrl = pdfUrl
+	item.ModifyTime = time.Now().Local()
+	updateCols := []string{"DetailImgUrl", "DetailPdfUrl", "ModifyTime"}
+	if e = item.Update(updateCols); e != nil {
+		err = fmt.Errorf("更新报告链接失败, Err: %s", e.Error())
+		return
+	}
+	return
+}
+
+// ReportHtml2ImgApiReq 报告生成图片接口请求体
+type ReportHtml2ImgApiReq struct {
+	ReportUrl  string `json:"report_url" description:"报告详情分享地址"`
+	FileName   string `json:"file_name" description:"生成的文件名"`
+	OutputType string `json:"output_type" description:"生成类型: img/pdf, 为空则两种均生成"`
+}
+
+// ReportHtml2ImgApiResp 报告生成图片接口响应体
+type ReportHtml2ImgApiResp struct {
+	Code int      `json:"code" description:"状态码"`
+	Msg  string   `json:"error" description:"提示信息"`
+	Data []string `json:"data" description:"返回数据"`
+}
+
+// CurlReportHtml2ImgApi 请求报告生成图片接口
+func CurlReportHtml2ImgApi(params ReportHtml2ImgApiReq) (apiResp []string, err error) {
+	if utils.Report2ImgServerUrl == "" {
+		err = fmt.Errorf("服务地址为空")
+		return
+	}
+	url := fmt.Sprint(utils.Report2ImgServerUrl, PythonReportHtml2ImgApi)
+	//fmt.Println("url: ", url)
+
+	jsonData, e := json.Marshal(params)
+	if e != nil {
+		err = fmt.Errorf("data json marshal err: %s", e.Error())
+		return
+	}
+	//fmt.Println(string(jsonData))
+	//fmt.Println("http post start")
+	resp, e := http.Post(url, "application/json", bytes.NewBuffer(jsonData))
+	if e != nil {
+		err = fmt.Errorf("http post err: %s", e.Error())
+		return
+	}
+	defer resp.Body.Close()
+	//fmt.Println("http post end")
+
+	b, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(b) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+
+	result := new(ReportHtml2ImgApiResp)
+	if e = json.Unmarshal(b, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s", string(b))
+		return
+	}
+	apiResp = result.Data
+	return
+}
+
+// ReportHtml2ImgApiClearLocalReq 清除本地文件接口请求体
+type ReportHtml2ImgApiClearLocalReq struct {
+	FileName string `json:"file_name" description:"生成的文件名"`
+}
+
+// ReportHtml2ImgApiClearLocalResp 清除本地文件接口响应体
+type ReportHtml2ImgApiClearLocalResp struct {
+	Code int    `json:"code" description:"状态码"`
+	Msg  string `json:"error" description:"提示信息"`
+	Data string `json:"data" description:"返回数据"`
+}
+
+// CurlReportHtml2ImgApiClearLocal 请求清除本地文件
+func CurlReportHtml2ImgApiClearLocal(params ReportHtml2ImgApiClearLocalReq) (err error) {
+	if utils.Report2ImgServerUrl == "" {
+		err = fmt.Errorf("服务地址为空")
+		return
+	}
+	url := fmt.Sprint(utils.Report2ImgServerUrl, PythonReportHtml2ImgClearLocalApi)
+
+	jsonData, e := json.Marshal(params)
+	if e != nil {
+		err = fmt.Errorf("data json marshal err: %s", e.Error())
+		return
+	}
+	//fmt.Println(string(jsonData))
+	resp, e := http.Post(url, "application/json", bytes.NewBuffer(jsonData))
+	if e != nil {
+		err = fmt.Errorf("http post err: %s", e.Error())
+		return
+	}
+	defer resp.Body.Close()
+
+	b, e := ioutil.ReadAll(resp.Body)
+	if e != nil {
+		err = fmt.Errorf("resp body read err: %s", e.Error())
+		return
+	}
+	if len(b) == 0 {
+		err = fmt.Errorf("resp body is empty")
+		return
+	}
+
+	result := new(ReportHtml2ImgApiClearLocalResp)
+	if e = json.Unmarshal(b, &result); e != nil {
+		err = fmt.Errorf("result unmarshal err: %s\nresult: %s", e.Error(), string(b))
+		return
+	}
+	if result.Code != 200 {
+		err = fmt.Errorf("result: %s", string(b))
+		return
+	}
+	return
+}

services/task.go

@@ -0,0 +1,34 @@
+package services
+
+import (
+	"encoding/json"
+	"eta/eta_report/utils"
+	"fmt"
+)
+
+func InitTask() {
+	// 监听生成报告长图及pdf
+	go ListenReport2ImgQueue()
+}
+
+// Report2ImgQueueReq 报告生成长图请求体
+type Report2ImgQueueReq struct {
+	ReportType int    `description:"报告类型: 1-研报; 2-智能研报"`
+	ReportCode string `description:"报告唯一编码"`
+}
+
+// ListenReport2ImgQueue 监听生成报告长图及pdf
+func ListenReport2ImgQueue() {
+	defer func() {
+		if err := recover(); err != nil {
+			fmt.Println("[ListenReport2ImgQueue]", err)
+		}
+	}()
+	for {
+		utils.Rc.Brpop(utils.CACHE_CREATE_REPORT_IMGPDF_QUEUE, func(b []byte) {
+			var req Report2ImgQueueReq
+			_ = json.Unmarshal(b, &req)
+			CreateReportImgAndPdf(req)
+		})
+	}
+}

utils/config.go

@@ -3,6 +3,7 @@ package utils
 import (
 	"fmt"
 	"github.com/beego/beego/v2/server/web"
+	"github.com/rdlucklib/rdluck_tools/cache"
 	"strconv"
 )
 
@@ -10,6 +11,10 @@ var (
 	RunMode       string //运行模式
 	MYSQL_URL     string //数据库连接
 	MYSQL_URL_ETA string
+
+	REDIS_CACHE string       //缓存地址
+	Rc          *cache.Cache //redis缓存
+	Re          error        //redis错误
 )
 
 // 日志配置
@@ -41,9 +46,37 @@ var (
 	// AlarmMsgUrl 报警服务地址
 	AlarmMsgUrl string
 
-	Html2ImgServerUrl  string // html转图片服务地址
-	EtaReportAppNameEn string // 内部调用该服务的英文名
-	EtaReportKey       string // 内部调用该服务的鉴权Key
+	Report2ImgServerUrl string // 报告详情转图片服务地址
+)
+
+// 对象存储客户端
+var (
+	ObjectStorageClient string // 目前有oss minio，默认oss
+)
+
+// 阿里云配置
+var (
+	Bucketname       string
+	Endpoint         string
+	Imghost          string
+	UploadDir        string
+	Upload_Audio_Dir string
+	AccessKeyId      string
+	AccessKeySecret  string
+)
+
+// MinIo配置
+var (
+	MinIoBucketname       string
+	MinIoEndpoint         string
+	MinIoImghost          string
+	MinIoUploadDir        string
+	MinIoUpload_Audio_Dir string
+	MinIoAccessKeyId      string
+	MinIoAccessKeySecret  string
+	MinIoUseSSL           string
+	MinIoPort             string
+	MinIoRegion           string
 )
 
 func init() {
@@ -77,6 +110,16 @@ func init() {
 	MYSQL_URL = config["mysql_url"]
 	MYSQL_URL_ETA = config["mysql_url_eta"]
 
+	REDIS_CACHE = config["beego_cache"]
+	if len(REDIS_CACHE) <= 0 {
+		panic(any("redis链接参数没有配置"))
+	}
+	Rc, Re = cache.NewCache(REDIS_CACHE) //初始化缓存
+	if Re != nil {
+		fmt.Println(Re)
+		panic(any(Re))
+	}
+
 	//日志配置
 	{
 		LogPath = config["log_path"]
@@ -112,13 +155,35 @@ func init() {
 		// 报警服务地址
 		AlarmMsgUrl = config["alarm_msg_url"]
 
-		// html转图片服务地址
-		Html2ImgServerUrl = config["html2img_server_url"]
+		// 报告详情转图片服务地址
+		Report2ImgServerUrl = config["report2img_server_url"]
+	}
 
-		// 内部调用项目英文名
-		EtaReportAppNameEn = config["eta_report_app_name_en"]
+	// 对象存储客户端
+	ObjectStorageClient = config["object_storage_client"]
 
-		// 内部调用鉴权Key
-		EtaReportKey = config["eta_report_key"]
+	// OSS相关
+	{
+		Endpoint = config["endpoint"]
+		Bucketname = config["bucket_name"]
+		Imghost = config["img_host"]
+		UploadDir = config["upload_dir"]
+		Upload_Audio_Dir = config["upload_audio_dir"]
+		AccessKeyId = config["access_key_id"]
+		AccessKeySecret = config["access_key_secret"]
+	}
+
+	// MinIo相关
+	{
+		MinIoEndpoint = config["minio_endpoint"]
+		MinIoBucketname = config["minio_bucket_name"]
+		MinIoImghost = config["minio_img_host"]
+		MinIoUploadDir = config["minio_upload_dir"]
+		MinIoUpload_Audio_Dir = config["minio_upload_audio_dir"]
+		MinIoAccessKeyId = config["minio_access_key_id"]
+		MinIoAccessKeySecret = config["minio_access_key_secret"]
+		MinIoUseSSL = config["minio_use_ssl"]
+		MinIoPort = config["minio_port"]
+		MinIoRegion = config["minio_region"]
 	}
 }

utils/constants.go

@@ -57,19 +57,6 @@ const (
 	XfHost                  = "tts-api.xfyun.cn"
 )
 
-// OSS
-var (
-	Endpoint   string = "oss-cn-shanghai.aliyuncs.com"
-	Bucketname string = "hongze"
-
-	Imghost          string = "http://hongze.oss-cn-shanghai.aliyuncs.com/"
-	Upload_dir       string = "static/images/"
-	Upload_Audio_Dir string = "static/audio/"
-
-	AccessKeyId     string = "LTAIFMZYQhS2BTvW"
-	AccessKeySecret string = "12kk1ptCHoGWedhBnKRVW5hRJzq9Fq"
-)
-
 // 客户状态
 const (
 	COMPANY_STATUS_TRY_OUT   = "试用"
@@ -88,3 +75,7 @@ const (
 const (
 	key = "KcSJaJoUBC2ZAA7HEWpaiH49" //全局加密KEY
 )
+
+const (
+	CACHE_CREATE_REPORT_IMGPDF_QUEUE = "eta_report:report_img_pdf_queue" // 生成报告长图PDF队列
+)