MEDIA

controllers/audio.go

@@ -0,0 +1,5 @@
+package controllers
+
+type AudioController struct {
+	BaseAuthController
+}

controllers/media.go

@@ -8,6 +8,7 @@ import (
 	"eta/eta_mini_crm_ht/services"
 	"eta/eta_mini_crm_ht/services/elastic"
 	"eta/eta_mini_crm_ht/utils"
+	"fmt"
 	"github.com/rdlucklib/rdluck_tools/paging"
 
 	"os"
@@ -671,16 +672,12 @@ const (
 	img_ext = ".jpg|.jpeg|.png|.gif|.bmp|.webp"
 )
 
-func checkMediaType(media string) bool {
-	return media == img || media == video || media == audio
-}
-
 // @Title 上传图片
 // @Description 上传图片
 // @Param   File   query   file  true       "文件"
 // @Success 200 {object} models.ReportAuthorResp
 // @router /uploadFile [post]
-func (this *MediaController) UploadAudio(mediaType string) {
+func (this *MediaController) UploadImage() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		this.Data["json"] = br
@@ -693,26 +690,16 @@ func (this *MediaController) UploadAudio(mediaType string) {
 		return
 	}
 	defer f.Close()
-	if !checkMediaType(mediaType) {
-		br.Msg = "上传文件类型失败"
-		br.ErrMsg = "上传文件类型非法，Err:" + err.Error()
-		return
-	}
-	ext := path.Ext(h.Filename)
-	//if ext != ".pdf" {
-	//	br.Msg = "文件格式不正确"
-	//	return
-	//}
 	size, err := strconv.Atoi(utils.UPLOAD_IMG_SIZE)
 	if err != nil {
 		size = 15
 	}
-	if h.Size > 1024*1024*int64(size) {
-		br.Msg = "文件大小不能超过15M"
+	if h.Size > 1024*int64(size) {
+		br.Msg = fmt.Sprintf("图片大小不能超过%dK", size)
 		return
 	}
 	dateDir := time.Now().Format("20060102")
-	uploadDir := utils.STATIC_DIR + "ht/img" + dateDir
+	uploadDir := utils.STATIC_DIR + "ht/" + dateDir
 	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
@@ -720,18 +707,18 @@ func (this *MediaController) UploadAudio(mediaType string) {
 		return
 	}
 	randStr := utils.GetRandStringNoSpecialChar(28)
-	fileName := randStr + ext
+	fileName := randStr
 	fpath := uploadDir + "/" + fileName
 	err = this.SaveToFile("File", fpath)
 	if err != nil {
-		br.Msg = "文件上传失败"
-		br.ErrMsg = "文件上传失败，Err:" + err.Error()
+		br.Msg = "图片上传失败"
+		br.ErrMsg = "图片上传失败，Err:" + err.Error()
 		return
 	}
-	pdfUploadDir := utils.RESOURCE_DIR + "img/"
+	pdfUploadDir := utils.RESOURCE_DIR + "analyst/"
 	savePdfToOssPath := pdfUploadDir + time.Now().Format("200601/20060102/")
-	pptName := utils.GetRandStringNoSpecialChar(28)
-	savePdfToOssPath += pptName + ext
+	imgName := utils.GetRandStringNoSpecialChar(28)
+	savePdfToOssPath += imgName
 
 	defer func() {
 		_ = os.Remove(fpath)
@@ -739,19 +726,20 @@ func (this *MediaController) UploadAudio(mediaType string) {
 
 	ossClient := services.NewOssClient()
 	if ossClient == nil {
-		br.Msg = "文件上传失败"
+		br.Msg = "图片上传失败"
 		br.ErrMsg = "初始化OSS服务失败"
 		return
 	}
-	pdfUrl, err := ossClient.UploadFile("", fpath, savePdfToOssPath)
+	imgUrl, err := ossClient.UploadFile("", fpath, savePdfToOssPath)
 	if err != nil {
-		br.Msg = "文件上传失败"
-		br.ErrMsg = "文件上传失败，Err:" + err.Error()
+		br.Msg = "图片上传失败"
+		br.ErrMsg = "图片上传失败，Err:" + err.Error()
 		return
 	}
+
 	base := path.Base(h.Filename)
 	resp := new(response.ReportPdfUploadResp)
-	resp.Url = pdfUrl
+	resp.Url = imgUrl
 	resp.FileName = base
 
 	br.Data = resp
@@ -778,16 +766,6 @@ func (this *MediaController) UploadVideo(mediaType string) {
 		return
 	}
 	defer f.Close()
-	if !checkMediaType(mediaType) {
-		br.Msg = "上传文件类型失败"
-		br.ErrMsg = "上传文件类型非法，Err:" + err.Error()
-		return
-	}
-	ext := path.Ext(h.Filename)
-	//if ext != ".pdf" {
-	//	br.Msg = "文件格式不正确"
-	//	return
-	//}
 	size, err := strconv.Atoi(utils.UPLOAD_IMG_SIZE)
 	if err != nil {
 		size = 15
@@ -805,7 +783,7 @@ func (this *MediaController) UploadVideo(mediaType string) {
 		return
 	}
 	randStr := utils.GetRandStringNoSpecialChar(28)
-	fileName := randStr + ext
+	fileName := randStr
 	fpath := uploadDir + "/" + fileName
 	err = this.SaveToFile("File", fpath)
 	if err != nil {
@@ -816,7 +794,7 @@ func (this *MediaController) UploadVideo(mediaType string) {
 	pdfUploadDir := utils.RESOURCE_DIR + "img/"
 	savePdfToOssPath := pdfUploadDir + time.Now().Format("200601/20060102/")
 	pptName := utils.GetRandStringNoSpecialChar(28)
-	savePdfToOssPath += pptName + ext
+	savePdfToOssPath += pptName
 
 	defer func() {
 		_ = os.Remove(fpath)

controllers/video.go

@@ -0,0 +1,5 @@
+package controllers
+
+type VideoController struct {
+	BaseAuthController
+}

routers/router.go

@@ -70,6 +70,8 @@ func init() {
 		beego.NSNamespace("/media",
 			beego.NSInclude(
 				&controllers.MediaController{},
+				&controllers.AudioController{},
+				&controllers.VideoController{},
 			),
 		),
 	)