Merge branch 'hotfix/doc_add_attachment' into debug

controllers/report.go

@@ -38,16 +38,20 @@ func (this *ReportController) 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 {
+		br.Msg = "创建文件夹失败"
+		br.ErrMsg = "创建文件夹失败,Err:" + err.Error()
 		return
 	}
 	randStr := utils.GetRandStringNoSpecialChar(28)
 	fileName := randStr + ext
 	fpath := uploadDir + "/" + fileName
-	
+
 	err = this.SaveToFile("file", fpath)
 	if err != nil {
+		br.Msg = "保存文件失败"
+		br.ErrMsg = "保存文件失败,Err:" + err.Error()
 		return
 	}
 
@@ -79,6 +83,8 @@ func (this *ReportController) UploadImg() {
 	item.CreateTime = time.Now()
 	newId, err := models.AddResource(item)
 	if err != nil {
+		br.Msg = "保存资源失败"
+		br.ErrMsg = "保存资源失败,Err:" + err.Error()
 		return
 	}
 	resp := new(models.ResourceResp)

models/db.go

@@ -116,6 +116,7 @@ func initHelpDoc() {
 	orm.RegisterModel(
 		new(help_doc.HelpDocClassify), //分类
 		new(help_doc.HelpDoc),         //文章
+		new(Resource),        //文件
 	)
 }
 

utils/config.go

@@ -219,7 +219,7 @@ func init() {
 	STATIC_DIR = config["static_dir"]
 	if STATIC_DIR == "" {
 		// 静态文件目录
-		STATIC_DIR = "static"
+		STATIC_DIR = "static/"
 	}
 
 	{