Browse Source

fix:调整目录创建权限

Roc 1 year ago
parent
commit
ac51952599

+ 1 - 1
controllers/banner.go

@@ -34,7 +34,7 @@ func (this *BannerController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

+ 1 - 1
controllers/cloud_disk.go

@@ -564,7 +564,7 @@ func (this *CloudDiskController) ResourceUpload() {
 	}
 
 	uploadDir := utils.STATIC_DIR + "hongze/" + time.Now().Format("20060102")
-	if e = os.MkdirAll(uploadDir, 766); e != nil {
+	if e = os.MkdirAll(uploadDir, utils.DIR_MOD); e != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败, Err:" + e.Error()
 		return

+ 1 - 1
controllers/data_manage/chart_info.go

@@ -2174,7 +2174,7 @@ func (this *ChartInfoController) ChartInfoBase64Upload() {
 
 	uploadDir := "static/images/"
 	if !utils.FileIsExist(uploadDir) {
-		err := os.MkdirAll(uploadDir, 777)
+		err := os.MkdirAll(uploadDir, utils.DIR_MOD)
 		if err != nil {
 			br.Msg = "图表保存失败"
 			br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

+ 1 - 1
controllers/data_manage/future_good/future_good_chart_info.go

@@ -2351,7 +2351,7 @@ func (this *FutureGoodChartInfoController) ChartInfoBase64Upload() {
 
 	uploadDir := "static/images/"
 	if !utils.FileIsExist(uploadDir) {
-		err := os.MkdirAll(uploadDir, 777)
+		err := os.MkdirAll(uploadDir, utils.DIR_MOD)
 		if err != nil {
 			br.Msg = "图表保存失败"
 			br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

+ 1 - 1
controllers/english_report/email.go

@@ -885,7 +885,7 @@ func (this *EnglishReportEmailController) ImportListMatch() {
 	}
 
 	uploadDir := "static/xls"
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

+ 1 - 3
controllers/ppt_english.go

@@ -492,7 +492,7 @@ func (this *PptEnglishController) PptUpload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -536,8 +536,6 @@ func (this *PptEnglishController) PptUpload() {
 		pptxUrl = utils.Imghost + savePptxToOssPath
 	}
 
-
-
 	defer func() {
 		os.Remove(fpath)
 	}()

+ 2 - 3
controllers/ppt_v2.go

@@ -493,7 +493,7 @@ func (this *PptV2Controller) PptUpload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -537,7 +537,6 @@ func (this *PptV2Controller) PptUpload() {
 		pptxUrl = utils.Imghost + savePptxToOssPath
 	}
 
-
 	defer func() {
 		os.Remove(fpath)
 	}()
@@ -1129,4 +1128,4 @@ func (this *PptV2Controller) TitleCheck() {
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "校验成功"
-}
+}

+ 2 - 2
controllers/report.go

@@ -794,7 +794,7 @@ func (this *ReportController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -1113,7 +1113,7 @@ func (this *ReportUploadCommonController) UploadImg() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		return
 	}

+ 4 - 8
controllers/resource.go

@@ -42,7 +42,7 @@ func (this *ResourceController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -128,7 +128,7 @@ func (this *ResourceController) VideoUpload() {
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
 	//uploadDir := "./" + dateDir
 	fmt.Println(uploadDir)
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -262,7 +262,6 @@ func (this *ResourceController) VideoUpload() {
 	utils.FileLog.Info("%s:", time.Now().Format(utils.FormatDateTime))
 	utils.FileLog.Info("end update oss ")
 
-
 	item := new(models.Resource)
 	item.ResourceUrl = resourceUrl
 	item.ResourceType = 3
@@ -324,7 +323,7 @@ func (this *ResourceController) VoiceUpload() {
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
 	//uploadDir := "./" + dateDir
 	fmt.Println(uploadDir)
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
@@ -439,7 +438,6 @@ func (this *ResourceController) VoiceUpload() {
 	utils.FileLog.Info(fmt.Sprintf("%s:", time.Now().Format(utils.FormatDateTime)))
 	utils.FileLog.Info("end update oss ")
 
-
 	item := new(models.Resource)
 	item.ResourceUrl = resourceUrl
 	item.ResourceType = 3
@@ -604,8 +602,6 @@ func (this *ResourceController) UploadImageBase64() {
 	utils.FileLog.Info("%s:", time.Now().Format(utils.FormatDateTime))
 	utils.FileLog.Info("end update oss ")
 
-
-
 	item := new(models.Resource)
 	item.ResourceUrl = resourceUrl
 	item.ResourceType = 1
@@ -709,7 +705,7 @@ func (this *ResourceController) UploadV2() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

+ 4 - 4
controllers/voice.go

@@ -2,12 +2,12 @@ package controllers
 
 import (
 	"archive/zip"
-	"fmt"
-	"github.com/rdlucklib/rdluck_tools/file"
-	"github.com/rdlucklib/rdluck_tools/http"
 	"eta/eta_api/models"
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
+	"fmt"
+	"github.com/rdlucklib/rdluck_tools/file"
+	"github.com/rdlucklib/rdluck_tools/http"
 	"io/ioutil"
 	"os"
 	"path"
@@ -56,7 +56,7 @@ func (this *VoiceController) Upload() {
 	ext := path.Ext(h.Filename)
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 777)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		br.Msg = "存储目录创建失败"
 		br.ErrMsg = "存储目录创建失败,Err:" + err.Error()

+ 1 - 1
services/excel/lucky_sheet.go

@@ -738,7 +738,7 @@ func (item *LuckySheetData) ToExcel() (downloadFilePath string, err error) {
 func getDownloadPath() (fpath string, err error) {
 	dateDir := time.Now().Format("20060102")
 	uploadDir := "static/xls/" + dateDir
-	err = os.MkdirAll(uploadDir, 0766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		return
 	}

+ 1 - 1
services/file.go

@@ -14,7 +14,7 @@ import (
 func UploadToOssAndFileName(fileMulti multipart.File, newFileName string) (resourceUrl string, err error) {
 	dateDir := time.Now().Format("20060102")
 	uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	err = os.MkdirAll(uploadDir, 766)
+	err = os.MkdirAll(uploadDir, utils.DIR_MOD)
 	if err != nil {
 		err = errors.New("存储目录创建失败,Err:" + err.Error())
 		return

+ 1 - 1
utils/common.go

@@ -323,7 +323,7 @@ func DownloadImage(imgUrl string) (filePath string, err error) {
 func DownloadFile(fileUrl, fileDir string) (filePath string, err error) {
 	filePathDir := "./static/imgs/"
 	if fileDir != `` {
-		err = os.MkdirAll(fileDir, 0766)
+		err = os.MkdirAll(fileDir, utils.DIR_MOD)
 		if err != nil {
 			return
 		}

+ 7 - 0
utils/constants.go

@@ -1,5 +1,9 @@
 package utils
 
+import (
+	"io/fs"
+)
+
 // 常量定义
 const (
 	FormatTime                 = "15:04:05"                //时间格式
@@ -327,3 +331,6 @@ const (
 	STORAGESOURCE_OSS   = 1 //阿里云OSS
 	STORAGESOURCE_MINIO = 2 //MinIo
 )
+
+// DIR_MOD 目录创建权限
+const DIR_MOD fs.FileMode = 0766 // Unix permission bits