diff --git a/controllers/DocumentController.go b/controllers/DocumentController.go
index ed6ee87cdd7488cc117fd97dbb5ce7bfc5c81092..10c09785d2df4df0a490c16c1772de2218fd9d68 100644
--- a/controllers/DocumentController.go
+++ b/controllers/DocumentController.go
@@ -715,7 +715,15 @@ func (this *DocumentController) Upload() {
 			this.JsonResult(6005, "保存文件失败")
 		}
 	}
-	osspath := fmt.Sprintf("projects/%v/%v", identify, fileName+filepath.Ext(attachment.HttpPath))
+
+	//文件和图片分开放在项目文件夹内
+	var osspath = ""
+	if strings.EqualFold(ext, ".jpg") || strings.EqualFold(ext, ".jpeg") || strings.EqualFold(ext, ".png") || strings.EqualFold(ext, ".gif") {
+		osspath = fmt.Sprintf("projects/%v/%v", identify, fileName+filepath.Ext(attachment.HttpPath))
+	} else {
+		osspath = strings.Replace(filepath.Join("projects", identify, "files", fileName+ext), "\\", "/", -1)
+	}
+
 	switch utils.StoreType {
 	case utils.StoreOss:
 		if err := store.ModelStoreOss.MoveToOss("."+attachment.HttpPath, osspath, true, false); err != nil {
@@ -725,10 +733,23 @@ func (this *DocumentController) Upload() {
 		attachment.HttpPath = "/" + osspath
 	case utils.StoreLocal:
 		osspath = "uploads/" + osspath
-		if err := store.ModelStoreLocal.MoveToStore("."+attachment.HttpPath, osspath); err != nil {
-			beego.Error(err.Error())
+		//图片是正确的，先不修改
+		if strings.EqualFold(ext, ".jpg") || strings.EqualFold(ext, ".jpeg") || strings.EqualFold(ext, ".png") || strings.EqualFold(ext, ".gif") {
+			if err := store.ModelStoreLocal.MoveToStore("."+attachment.HttpPath, osspath); err != nil {
+				beego.Error(err.Error())
+			}
+			attachment.HttpPath = "/" + osspath
+			attachment.FilePath = filepath.Join(commands.WorkingDirectory, osspath)
+		} else {
+			if err := store.ModelStoreLocal.MoveToStore(filePath, osspath); err != nil {
+				beego.Error(err.Error())
+			}
+			attachment.FilePath = osspath
+		}
+		if err := attachment.Update(); err != nil {
+			beego.Error("SaveToFile => ", err)
+			this.JsonResult(6005, "保存文件失败")
 		}
-		attachment.HttpPath = "/" + osspath
 	}
 
 	result := map[string]interface{}{
diff --git a/views/document/markdown_edit_template.html b/views/document/markdown_edit_template.html
index 5fc28a9e7d576198e012f9c14ba9c88e36aa58be..b70e49146d07208b0abafe4ea36dfa0b1dac0863 100644
--- a/views/document/markdown_edit_template.html
+++ b/views/document/markdown_edit_template.html
@@ -100,7 +100,7 @@
             <a href="javascript:;" data-toggle="tooltip" data-title="添加表格"><i class="fa fa-table item" name="table" unselectable="on"></i></a>
             <a href="javascript:;" data-toggle="tooltip" data-title="GFM 任务列表"><i class="fa fa-tasks item" name="tasks" aria-hidden="true"></i></a>
             <a href="javascript:;" data-toggle="tooltip" data-title="引用"><i class="fa fa-quote-right item" name="quote" unselectable="on"></i></a>
-        {{/*<a href="javascript:;" data-toggle="tooltip" data-title="附件"><i class="fa fa-paperclip item" aria-hidden="true" name="attachment"></i></a>*/}}
+			<a href="javascript:;" data-toggle="tooltip" data-title="附件"><i class="fa fa-paperclip item" aria-hidden="true" name="attachment"></i></a>
             <a href="javascript:;" data-toggle="tooltip" data-title="模板"><i class="fa fa-tachometer item" name="template"></i></a>
             <a href="javascript:;" data-toggle="tooltip" data-title="使用帮助"><i class="fa fa-question-circle-o last" aria-hidden="true" name="help"></i></a>
         </div>