Merge branch 'video' into debug

# Conflicts:
#	utils/config.go

.gitignore

@@ -4,4 +4,5 @@
 /.idea
 /conf
 .DS_Store
-/hongze_public_api
+/hongze_public_api
+hongze_public_api

controllers/report.go

@@ -0,0 +1,44 @@
+package controllers
+
+import (
+	"encoding/json"
+	"hongze/hongze_public_api/models"
+	"hongze/hongze_public_api/services"
+)
+
+// ReportController 报告模块
+type ReportController struct {
+	BaseAuthController
+}
+
+// HandleVideoDecibel
+// @Title 处理音频分贝大小
+// @Description 处理音频分贝大小
+// @Success 200 处理成功
+// @router /handle_video_decibel [post]
+func (this *ReportController) HandleVideoDecibel() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	body := this.Ctx.Input.RequestBody
+	req := new(models.ReportChapterReq)
+	err := json.Unmarshal(body, &req)
+	if err != nil {
+		br.Msg = "参数解析失败"
+		br.ErrMsg = "参数解析失败,Err:" + err.Error()
+		return
+	}
+
+	chapterInfo, err := models.GetReportChapterInfoById(req.ReportChapterId)
+	if err != nil {
+		br.Msg = "章节信息有误"
+		br.ErrMsg = "获取章节信息失败, Err: " + err.Error()
+		return
+	}
+	services.HandleVideoDecibel(chapterInfo)
+	br.Ret = 200
+	br.Msg = "处理成功"
+	return
+}

hongze_public_api

@@ -17,8 +17,16 @@ func init() {
 	db, _ := orm.GetDB("default")
 	db.SetConnMaxLifetime(10 * time.Minute)
 
+	_ = orm.RegisterDataBase("rddp", "mysql", utils.MYSQL_URL_RDDP)
+	orm.SetMaxIdleConns("rddp", 50)
+	orm.SetMaxOpenConns("rddp", 100)
+
+	report_db, _ := orm.GetDB("rddp")
+	report_db.SetConnMaxLifetime(10 * time.Minute)
+
 	//注册对象
 	orm.RegisterModel(
 		new(UserTemplateRecord),
+		new(ReportChapter),
 	)
-}
+}

models/report_chapter.go

@@ -0,0 +1,86 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+// ReportChapter 报告章节
+type ReportChapter struct {
+	ReportChapterId   int       `orm:"column(report_chapter_id);pk" description:"报告章节ID"`
+	ReportId          int       `description:"报告ID"`
+	ReportType        string    `description:"报告类型 day-晨报 week-周报"`
+	ClassifyIdFirst   int       `description:"一级分类id"`
+	ClassifyNameFirst string    `description:"一级分类名称"`
+	TypeId            int       `description:"品种ID"`
+	TypeName          string    `description:"品种名称"`
+	Title             string    `description:"标题"`
+	Abstract          string    `description:"摘要"`
+	AddType           int       `description:"新增方式：1:新增报告，2:继承报告"`
+	Author            string    `description:"作者"`
+	Content           string    `description:"内容"`
+	ContentSub        string    `description:"内容前两个章节"`
+	Stage             int       `description:"期数"`
+	Trend             string    `description:"趋势观点"`
+	Sort              int       `description:"排序: 数值越小越靠前"`
+	IsEdit            int       `description:"是否已编辑 0-待编辑 1-已编辑"`
+	PublishState      int       `description:"发布状态 1-待发布，2-已发布"`
+	PublishTime       time.Time `description:"发布时间"`
+	VideoUrl          string    `description:"音频文件URL"`
+	VideoName         string    `description:"音频文件名称"`
+	VideoPlaySeconds  string    `description:"音频播放时长"`
+	VideoSize         string    `description:"音频文件大小，单位M"`
+	VideoKind         int       `description:"音频生成方式:1,手动上传,2:自动生成"`
+	CreateTime        string    `description:"创建时间"`
+	ModifyTime        time.Time `description:"修改时间"`
+	OriginalVideoUrl  string    `description:"原始音频文件URL"`
+}
+
+type ReportChapterResp struct {
+	ReportChapterId  int    `description:"报告章节ID"`
+	ReportId         int    `description:"报告ID"`
+	ReportType       string `description:"报告类型 day-晨报 week-周报"`
+	TypeId           int    `description:"品种ID"`
+	TypeName         string `description:"品种名称"`
+	TypeEditImg      string `description:"后台编辑时的图片"`
+	Title            string `description:"标题"`
+	Abstract         string `description:"摘要"`
+	Author           string `description:"作者"`
+	Content          string `description:"内容"`
+	ContentSub       string `description:"内容前两个章节"`
+	Stage            int    `description:"期数"`
+	Trend            string `description:"趋势观点"`
+	Sort             int    `description:"排序: 数值越小越靠前"`
+	IsEdit           int    `description:"是否已编辑 0-待编辑 1-已编辑"`
+	PublishState     int    `description:"发布状态 1-待发布，2-已发布"`
+	VideoUrl         string `description:"音频文件URL"`
+	VideoName        string `description:"音频文件名称"`
+	VideoPlaySeconds string `description:"音频播放时长"`
+	VideoSize        string `description:"音频文件大小，单位M"`
+	VideoKind        int    `description:"音频生成方式:1,手动上传,2:自动生成"`
+	PublishTime      string `description:"发布时间"`
+	CreateTime       string `description:"创建时间"`
+	ModifyTime       string `description:"修改时间"`
+}
+
+// ReportChapterReq 报告章节id
+type ReportChapterReq struct {
+	ReportChapterId int `description:"报告章节ID"`
+}
+
+// GetReportChapterInfoById 根据主键获取报告章节
+func GetReportChapterInfoById(reportChapterId int) (item *ReportChapter, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ` SELECT * FROM report_chapter WHERE report_chapter_id = ? `
+	err = o.Raw(sql, reportChapterId).QueryRow(&item)
+
+	return
+}
+
+// UpdateChapter 更新报表章节
+func (chapterInfo *ReportChapter) UpdateChapter(cols []string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	_, err = o.Update(chapterInfo, cols...)
+
+	return
+}

routers/commentsRouter.go

@@ -25,6 +25,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:ReportController"],
+        beego.ControllerComments{
+            Method: "HandleVideoDecibel",
+            Router: `/handle_video_decibel`,
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:WechatController"],
         beego.ControllerComments{
             Method: "SendTemplateMsg",

routers/commentsRouter_controllers.go

@@ -25,6 +25,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:ReportController"] = append(beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:ReportController"],
+        beego.ControllerComments{
+            Method: "HandleVideoDecibel",
+            Router: "/handle_video_decibel",
+            AllowHTTPMethods: []string{"post"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:WechatController"] = append(beego.GlobalControllerRouter["hongze/hongze_public_api/controllers:WechatController"],
         beego.ControllerComments{
             Method: "SendTemplateMsg",

routers/router.go

@@ -25,6 +25,11 @@ func init() {
 				&controllers.WechatController{},
 			),
 		),
+		web.NSNamespace("/report",
+			web.NSInclude(
+				&controllers.ReportController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }

services/audio/audio.go

@@ -0,0 +1,164 @@
+package audio
+
+import (
+	"bytes"
+	"fmt"
+	"hongze/hongze_public_api/utils"
+	"math"
+	"os"
+	"os/exec"
+	"path"
+	"strconv"
+	"strings"
+)
+
+// ConvAudioDecibel 音频分贝转换（生成新的文件）
+func ConvAudioDecibel(inputFile string) (outputFile string, isConvDecibel bool, err error) {
+	// 转换音频格式后的音频地址
+	convAudioPath := inputFile
+
+	//音频格式转换
+	ext := path.Ext(convAudioPath)
+	inputFileStrList := strings.Split(convAudioPath, ext)
+
+	if ext != ".mp3" {
+		// 转换音频格式后的文件名
+		convAudioPath = inputFileStrList[0] + "_conv.mp3"
+		err = ConvertAudioFormat(inputFile, convAudioPath)
+		if err != nil {
+			//fmt.Println("ConvertAudioFormat Err:" + err.Error())
+			return
+		}
+		// 退出后需要删除该临时文件
+		defer func() {
+			os.Remove(convAudioPath)
+		}()
+	}
+
+	baseDecibels := -22.8 //基准音量分贝,dB
+
+	//	音频的实际分贝   音频的实际分贝与基准分贝的差值
+	var volumeFloat, diffDecibels float64
+
+	//音频声音处理
+	{
+		tmpVolumeFloat, ok, tmpErr := extractVolume(convAudioPath)
+		if tmpErr != nil {
+			err = tmpErr
+			return
+		}
+		if !ok {
+			return
+		}
+		volumeFloat = tmpVolumeFloat
+
+		// 分贝差值
+		diffDecibels = volumeFloat - baseDecibels
+		// 分贝差值在5dB误差内，那就不转了
+		if math.Abs(diffDecibels) <= 5 {
+			//fmt.Println("音频分贝在误差范围内，无需转音频")
+			return
+		}
+	}
+
+	//fmt.Println("开始转变音频分贝")
+
+	// 分贝大小变更
+	targetDecibels := "" // 目标分贝值
+
+	//fmt.Println("分贝差值：", diffDecibels)
+	if diffDecibels < 0 { // 原先的音频分贝过小，那么需要增大
+		targetDecibels = fmt.Sprintf("+%sdB", utils.SubFloatToString(math.Abs(diffDecibels), 2))
+	} else { // 原先的音频分贝过大，那么需要减小
+		targetDecibels = fmt.Sprintf("-%sdB", utils.SubFloatToString(math.Abs(diffDecibels), 2))
+	}
+	//fmt.Println("开始转音频分贝：", targetDecibels)
+
+	afCommandStr := "volume=" + targetDecibels
+	//fmt.Println(afCommandStr)
+
+	// 转换音频分贝格式后的文件名
+	outputFile = inputFileStrList[0] + "_decibel.mp3"
+	// 构建 FFmpeg 命令
+	cmd := exec.Command("ffmpeg", "-y", "-i", convAudioPath, "-af", afCommandStr, outputFile)
+	var out bytes.Buffer
+	cmd.Stderr = &out
+	// 执行 FFmpeg 命令
+	err = cmd.Run()
+	if err != nil {
+		utils.FileLog.Info("转换音频分贝格式失败，FFmpeg命令返回：\n" + out.String())
+		return
+	}
+
+	isConvDecibel = true
+
+	//fmt.Println("音频文件的音量已设置成功！")
+
+	return
+}
+
+// 从FFmpeg输出中提取音量信息
+func extractVolume(audioPath string) (decibels float64, ok bool, err error) {
+	cmd := exec.Command("ffmpeg", "-i", audioPath, "-af", "volumedetect", "-f", "null", "-")
+	var out bytes.Buffer
+	cmd.Stderr = &out
+
+	err = cmd.Run()
+	if err != nil {
+		return
+	}
+
+	output := out.String()
+	//fmt.Println("output:", output)
+
+	var volumeLine string
+	lines := strings.Split(output, "\n")
+	for _, line := range lines {
+		if strings.Contains(line, "mean_volume:") {
+			volumeLine = line
+			break
+		}
+	}
+
+	if volumeLine == `` {
+		return
+	}
+	volumeArr := strings.Split(volumeLine, " ")
+	if len(volumeArr) < 4 {
+		return
+	}
+	//fmt.Println("volume start")
+	//fmt.Println(volumeStr)
+	//fmt.Println(volumeArr)
+	//fmt.Println(len(volumeArr))
+	//for k, v := range volumeArr {
+	//	fmt.Println(k, v)
+	//}
+	//fmt.Println("volume end")
+
+	volume := volumeArr[4]
+	decibels, err = convertToFloat(volume)
+	ok = true
+	//fmt.Println(audioPath, "音量分贝值为:", decibels)
+	return
+}
+
+// 将字符串转换为浮点数
+func convertToFloat(str string) (float64, error) {
+	str = strings.TrimSpace(str)
+	value, err := strconv.ParseFloat(str, 64)
+	if err != nil {
+		return 0, err
+	}
+	return value, nil
+}
+
+// ConvertAudioFormat 转换音频文件格式
+func ConvertAudioFormat(inputFilePath, outputFilePath string) (err error) {
+	cmd := exec.Command("ffmpeg", "-y", "-i", inputFilePath, "-codec:a", "libmp3lame", outputFilePath)
+	err = cmd.Run()
+	if err != nil {
+		return
+	}
+	return nil
+}

services/oss.go

@@ -3,6 +3,7 @@ package services
 import (
 	"github.com/aliyun/aliyun-oss-go-sdk/oss"
 	"os"
+	"time"
 
 	"hongze/hongze_public_api/utils"
 )
@@ -12,7 +13,17 @@ const (
 	HzBucketName string = "hzchart"
 )
 
-//上传文件到阿里云
+// 后台用于传研报小程序二维码
+var (
+	Bucketname      string = "hzchart"
+	Endpoint        string = "oss-cn-shanghai.aliyuncs.com"
+	Imghost         string = "https://hzstatic.hzinsights.com/"
+	UploadDir       string = "static/images/"
+	AccessKeyId     string = "LTAIFMZYQhS2BTvW"
+	AccessKeySecret string = "12kk1ptCHoGWedhBnKRVW5hRJzq9Fq"
+)
+
+// 上传文件到阿里云
 func UploadFileToAliyun(filename, filepath, savePath string) error {
 	defer func() {
 		os.Remove(filepath)
@@ -35,3 +46,23 @@ func UploadFileToAliyun(filename, filepath, savePath string) error {
 	//return path,err
 	return err
 }
+
+// UploadAliYun 图片上传到阿里云
+func UploadAliYun(filename, filepath string) (string, error) {
+	client, err := oss.New(Endpoint, AccessKeyId, AccessKeySecret)
+	if err != nil {
+		return "1", err
+	}
+	bucket, err := client.Bucket(Bucketname)
+	if err != nil {
+		return "2", err
+	}
+	path := UploadDir + time.Now().Format("200601/20060102/")
+	path += filename
+	err = bucket.PutObjectFromFile(path, filepath)
+	if err != nil {
+		return "3", err
+	}
+	path = Imghost + path
+	return path, err
+}

services/report.go

@@ -0,0 +1,59 @@
+package services
+
+import (
+	"fmt"
+	"hongze/hongze_public_api/models"
+	"hongze/hongze_public_api/services/audio"
+	"hongze/hongze_public_api/utils"
+	"os"
+	"path"
+)
+
+// HandleVideoDecibel 处理报告中的音频文件
+func HandleVideoDecibel(chapterInfo *models.ReportChapter) {
+	var err error
+	//fmt.Println("开始 处理报告中的音频文件")
+	defer func() {
+		if err != nil {
+			utils.FileLog.Info(fmt.Sprint(chapterInfo.ReportChapterId, "处理报告中的音频分贝失败："+err.Error()))
+		}
+	}()
+	inputFile, err := utils.DownloadFile(chapterInfo.VideoUrl, "./static/tmpFile/")
+	if err != nil {
+		return
+	}
+	// 删除下载的临时音频文件
+	defer func() {
+		os.Remove(inputFile)
+	}()
+
+	outFileName, ok, _ := audio.ConvAudioDecibel(inputFile)
+	if !ok {
+		return
+	}
+
+	// 删除分贝变更后的音频文件
+	defer func() {
+		os.Remove(outFileName)
+	}()
+
+	// 如果输入与输出文件名一致，那么就不需要覆盖
+	if outFileName == inputFile {
+		return
+	}
+
+	// 音频分贝改变了，需要替换音频文件
+
+	//上传到阿里云
+	resourceUrl, err := UploadAliYun(path.Base(outFileName), outFileName)
+	if err != nil {
+		return
+	}
+
+	// 更改表中的音频地址
+	chapterInfo.OriginalVideoUrl = chapterInfo.VideoUrl
+	chapterInfo.VideoUrl = resourceUrl
+	err = chapterInfo.UpdateChapter([]string{"OriginalVideoUrl", "VideoUrl"})
+
+	return
+}

utils/common.go

@@ -24,7 +24,7 @@ import (
 	"time"
 )
 
-//随机数种子
+// 随机数种子
 var rnd = rand.New(rand.NewSource(time.Now().UnixNano()))
 
 func GetRandString(size int) string {
@@ -61,13 +61,13 @@ func StringsToJSON(str string) string {
 	return jsons
 }
 
-//序列化
+// 序列化
 func ToString(v interface{}) string {
 	data, _ := json.Marshal(v)
 	return string(data)
 }
 
-//md5加密
+// md5加密
 func MD5(data string) string {
 	m := md5.Sum([]byte(data))
 	return hex.EncodeToString(m[:])
@@ -95,7 +95,7 @@ func GetToday(format string) string {
 	return today
 }
 
-//获取今天剩余秒数
+// 获取今天剩余秒数
 func GetTodayLastSecond() time.Duration {
 	today := GetToday(FormatDate) + " 23:59:59"
 	end, _ := time.ParseInLocation(FormatDateTime, today, time.Local)
@@ -117,7 +117,7 @@ func GetBrithDate(idcard string) string {
 	return GetToday(FormatDate)
 }
 
-//处理性别
+// 处理性别
 func WhichSexByIdcard(idcard string) string {
 	var sexs = [2]string{"女", "男"}
 	length := len(idcard)
@@ -131,7 +131,7 @@ func WhichSexByIdcard(idcard string) string {
 	return "男"
 }
 
-//截取小数点后几位
+// 截取小数点后几位
 func SubFloatToString(f float64, m int) string {
 	n := strconv.FormatFloat(f, 'f', -1, 64)
 	if n == "" {
@@ -150,20 +150,20 @@ func SubFloatToString(f float64, m int) string {
 	return newn[0] + "." + newn[1][:m]
 }
 
-//截取小数点后几位
+// 截取小数点后几位
 func SubFloatToFloat(f float64, m int) float64 {
 	newn := SubFloatToString(f, m)
 	newf, _ := strconv.ParseFloat(newn, 64)
 	return newf
 }
 
-//截取小数点后几位
+// 截取小数点后几位
 func SubFloatToFloatStr(f float64, m int) string {
 	newn := SubFloatToString(f, m)
 	return newn
 }
 
-//获取相差时间-年
+// 获取相差时间-年
 func GetYearDiffer(start_time, end_time string) int {
 	t1, _ := time.ParseInLocation("2006-01-02", start_time, time.Local)
 	t2, _ := time.ParseInLocation("2006-01-02", end_time, time.Local)
@@ -174,7 +174,7 @@ func GetYearDiffer(start_time, end_time string) int {
 	return age
 }
 
-//获取相差时间-秒
+// 获取相差时间-秒
 func GetSecondDifferByTime(start_time, end_time time.Time) int64 {
 	diff := end_time.Unix() - start_time.Unix()
 	return diff
@@ -201,7 +201,7 @@ func StrListToString(strList []string) (str string) {
 	return ""
 }
 
-//Token
+// Token
 func GetToken() string {
 	randStr := GetRandString(64)
 	token := MD5(randStr + Md5Key)
@@ -209,30 +209,30 @@ func GetToken() string {
 	return strings.ToUpper(token + GetRandString(tokenLen))
 }
 
-//数据没有记录
+// 数据没有记录
 func ErrNoRow() string {
 	return "<QuerySeter> no row found"
 }
 
-//校验邮箱格式
+// 校验邮箱格式
 func ValidateEmailFormatat(email string) bool {
 	reg := regexp.MustCompile(RegularEmail)
 	return reg.MatchString(email)
 }
 
-//验证是否是手机号
+// 验证是否是手机号
 func ValidateMobileFormatat(mobileNum string) bool {
 	reg := regexp.MustCompile(RegularMobile)
 	return reg.MatchString(mobileNum)
 }
 
-//判断文件是否存在
+// 判断文件是否存在
 func FileIsExist(filePath string) bool {
 	_, err := os.Stat(filePath)
 	return err == nil || os.IsExist(err)
 }
 
-//获取图片扩展名
+// 获取图片扩展名
 func GetImgExt(file string) (ext string, err error) {
 	var headerByte []byte
 	headerByte = make([]byte, 8)
@@ -275,7 +275,7 @@ func GetImgExt(file string) (ext string, err error) {
 	return ext, nil
 }
 
-//保存图片
+// 保存图片
 func SaveImage(path string, img image.Image) (err error) {
 	//需要保持的文件
 	imgfile, err := os.Create(path)
@@ -309,6 +309,9 @@ func DownloadImage(imgUrl string) (filePath string, err error) {
 	if err != nil {
 		return
 	}
+	defer func() {
+		file.Close()
+	}()
 	// 获得文件的writer对象
 	writer := bufio.NewWriter(file)
 
@@ -317,7 +320,43 @@ func DownloadImage(imgUrl string) (filePath string, err error) {
 	return
 }
 
-//保存base64数据为文件
+// DownloadFile 下载文件
+func DownloadFile(fileUrl, fileDir string) (filePath string, err error) {
+	filePathDir := "./static/imgs/"
+	if fileDir != `` {
+		err = os.MkdirAll(fileDir, 0766)
+		if err != nil {
+			return
+		}
+		filePathDir = fileDir
+	}
+	fileName := path.Base(fileUrl)
+	res, err := http.Get(fileUrl)
+	if err != nil {
+		fmt.Println("A error occurred!")
+		return
+	}
+	defer res.Body.Close()
+	// 获得get请求响应的reader对象
+	reader := bufio.NewReaderSize(res.Body, 32*1024)
+
+	filePath = filePathDir + GetRandString(4) + fileName
+	file, err := os.Create(filePath)
+	if err != nil {
+		return
+	}
+	defer func() {
+		file.Close()
+	}()
+	// 获得文件的writer对象
+	writer := bufio.NewWriter(file)
+
+	_, _ = io.Copy(writer, reader)
+	//fmt.Printf("Total length: %d \n", written)
+	return
+}
+
+// 保存base64数据为文件
 func SaveBase64ToFile(content, path string) error {
 	data, err := base64.StdEncoding.DecodeString(content)
 	if err != nil {
@@ -332,7 +371,7 @@ func SaveBase64ToFile(content, path string) error {
 	return nil
 }
 
-//保存base64数据为文件
+// 保存base64数据为文件
 func SaveToFile(content, path string) error {
 	f, err := os.Create(path)
 	defer f.Close()
@@ -458,7 +497,7 @@ func GetWilsonScore(p, n float64) float64 {
 	return toFixed(((p+1.9208)/(p+n)-1.96*math.Sqrt(p*n/(p+n)+0.9604)/(p+n))/(1+3.8416/(p+n)), 2)
 }
 
-//将中文数字转化成数字，比如 第三百四十五章，返回第345章 不支持一亿及以上
+// 将中文数字转化成数字，比如 第三百四十五章，返回第345章 不支持一亿及以上
 func ChangeWordsToNum(str string) (numStr string) {
 	words := ([]rune)(str)
 	num := 0
@@ -629,12 +668,12 @@ func GetMonthStartAndEnd(myYear string, myMonth string) (startDate, endDate stri
 	return t1, t2
 }
 
-//移除字符串中的空格
+// 移除字符串中的空格
 func TrimStr(str string) (str2 string) {
 	return strings.Replace(str, " ", "", -1)
 }
 
-//字符串转换为time
+// 字符串转换为time
 func StrTimeToTime(strTime string) time.Time {
 	timeLayout := "2006-01-02 15:04:05"  //转化所需模板
 	loc, _ := time.LoadLocation("Local") //重要：获取时区
@@ -642,7 +681,7 @@ func StrTimeToTime(strTime string) time.Time {
 	return resultTime
 }
 
-//字符串类型时间转周几
+// 字符串类型时间转周几
 func StrDateTimeToWeek(strTime string) string {
 	var WeekDayMap = map[string]string{
 		"Monday":    "周一",
@@ -659,7 +698,7 @@ func StrDateTimeToWeek(strTime string) string {
 	return WeekDayMap[staweek_int]
 }
 
-//时间格式转年月日字符串
+// 时间格式转年月日字符串
 func TimeToStrYmd(time2 time.Time) string {
 	var Ymd string
 	year := time2.Year()
@@ -669,7 +708,7 @@ func TimeToStrYmd(time2 time.Time) string {
 	return Ymd
 }
 
-//时间格式去掉时分秒
+// 时间格式去掉时分秒
 func TimeRemoveHms(strTime string) string {
 	var Ymd string
 	var resultTime = StrTimeToTime(strTime)
@@ -680,7 +719,7 @@ func TimeRemoveHms(strTime string) string {
 	return Ymd
 }
 
-//文章上一次编辑时间
+// 文章上一次编辑时间
 func ArticleLastTime(strTime string) string {
 	var newTime string
 	stamp, _ := time.ParseInLocation("2006-01-02 15:04:05", strTime, time.Local)
@@ -701,7 +740,7 @@ func ArticleLastTime(strTime string) string {
 	return newTime
 }
 
-//人民币小写转大写
+// 人民币小写转大写
 func ConvertNumToCny(num float64) (str string, err error) {
 	strNum := strconv.FormatFloat(num*100, 'f', 0, 64)
 	sliceUnit := []string{"仟", "佰", "拾", "亿", "仟", "佰", "拾", "万", "仟", "佰", "拾", "元", "角", "分"}
@@ -743,7 +782,6 @@ func ConvertNumToCny(num float64) (str string, err error) {
 	return
 }
 
-
 func GetLocalIP() (ip string, err error) {
 	addrs, err := net.InterfaceAddrs()
 	if err != nil {
@@ -763,4 +801,4 @@ func GetLocalIP() (ip string, err error) {
 		return ipAddr.IP.String(), nil
 	}
 	return
-}
+}

utils/config.go

@@ -9,14 +9,15 @@ import (
 
 var (
 	RunMode        string //运行模式
-	MYSQL_URL             string //数据库连接
+	MYSQL_URL      string //数据库连接
+	MYSQL_URL_RDDP string //报告库数据库连接
 
 	REDIS_CACHE string       //缓存地址
 	Rc          *cache.Cache //redis缓存
 	Re          error        //redis错误
 )
 
-//微信配置信息
+// 微信配置信息
 var (
 	WxId                string //微信原始ID
 	WxAppId             string
@@ -68,6 +69,7 @@ func init() {
 		panic("配置文件读取错误 " + err.Error())
 	}
 	MYSQL_URL = config["mysql_url"]
+	MYSQL_URL_RDDP = config["mysql_url_rddp"]
 
 	REDIS_CACHE = config["beego_cache"]
 	if len(REDIS_CACHE) <= 0 {
@@ -93,8 +95,7 @@ func init() {
 	}
 }
 
-
-//测试环境模板消息
+// 测试环境模板消息
 func WxDebug() {
 	WxAppId = "wx9b5d7291e581233a"
 	WxAppSecret = "f4d52e34021eee262dce9682b31f8861"
@@ -109,7 +110,7 @@ func WxDebug() {
 	WxAppList[WxAppId] = WxAppSecret
 }
 
-//生产环境模板消息
+// 生产环境模板消息
 func WxRelease() {
 	WxAppId = "wx4a844c734d8c8e56"
 	WxAppSecret = "26c586e7ccb3c575433f0f37797b3eeb"
@@ -124,9 +125,8 @@ func WxRelease() {
 	WxAppList[WxAppId] = WxAppSecret
 }
 
-
-//查研观向生产环境模板消息
+// 查研观向生产环境模板消息
 func WxReleaseCygx() {
 	WxAppIdCygx = "wxb7cb8a15abad5b8e"
 	WxAppSecretCygx = "f425ba2863084249722af1e2a5cfffd3"
-}
+}