#10 #14

app/controllers/FileController.go

@@ -17,32 +17,16 @@ type File struct {
 	BaseController
 }
 
-// 过时 已弃用!
-func (c File) UploadImage(renderHtml string) revel.Result {
-	if renderHtml == "" {
-		renderHtml = "file/image.html"
-	}
-	
-	re := c.uploadImage("", "");
-	
-	c.RenderArgs["fileUrlPath"] = siteUrl + re.Id
-	c.RenderArgs["resultCode"] = re.Code
-	c.RenderArgs["resultMsg"] = re.Msg
-
-	return c.RenderTemplate(renderHtml)
-}
-
-// 已弃用
-func (c File) UploadImageJson(from, noteId string) revel.Result {
-	re := c.uploadImage(from, "");
-	return c.RenderJson(re)
-}
-
-
 // 上传的是博客logo
 // TODO logo不要设置权限, 另外的目录
 func (c File) UploadBlogLogo() revel.Result {
-	return c.UploadImage("file/blog_logo.html");
+	re := c.uploadImage("logo", "");
+	
+	c.RenderArgs["fileUrlPath"] = siteUrl + "/" + re.Id
+	c.RenderArgs["resultCode"] = re.Code
+	c.RenderArgs["resultMsg"] = re.Msg
+
+	return c.RenderTemplate("file/blog_logo.html")
 }
 
 // 拖拉上传, pasteImage
@@ -97,7 +81,11 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 	}
 	defer file.Close()
 	// 生成上传路径
-	fileUrlPath = "files/" + c.GetUserId() + "/images"
+	if(from == "logo") {
+		fileUrlPath = "public/upload/" + c.GetUserId() + "/images/logo"
+	} else {
+		fileUrlPath = "files/" + c.GetUserId() + "/images"
+	}
 	dir := revel.BasePath + "/" +  fileUrlPath
 	err = os.MkdirAll(dir, 0755)
 	if err != nil {
@@ -154,6 +142,10 @@ func (c File) uploadImage(from, albumId string) (re info.Re) {
 	id := bson.NewObjectId();
 	fileInfo.FileId = id
 	fileId = id.Hex()
+	if(from == "logo") {
+		fileId = "public/upload/" + c.GetUserId() + "/images/logo/" + filename
+	}
+	
 	Ok = fileService.AddImage(fileInfo, albumId, c.GetUserId())
 	
 	fileInfo.Path = ""; // 不要返回
@@ -250,3 +242,25 @@ func (c File) CopyImage(userId, fileId, toUserId string) revel.Result {
 	
 	return c.RenderJson(re)
 }
+
+//------------
+// 过时 已弃用!
+func (c File) UploadImage(renderHtml string) revel.Result {
+	if renderHtml == "" {
+		renderHtml = "file/image.html"
+	}
+	
+	re := c.uploadImage("", "");
+	
+	c.RenderArgs["fileUrlPath"] = siteUrl + re.Id
+	c.RenderArgs["resultCode"] = re.Code
+	c.RenderArgs["resultMsg"] = re.Msg
+
+	return c.RenderTemplate(renderHtml)
+}
+
+// 已弃用
+func (c File) UploadImageJson(from, noteId string) revel.Result {
+	re := c.uploadImage(from, "");
+	return c.RenderJson(re)
+}

app/service/FileService.go

@@ -8,6 +8,7 @@ import (
 	"gopkg.in/mgo.v2/bson"
 	"time"
 	"os"
+	"strings"
 )
 
 const DEFAULT_ALBUM_ID = "52d3e8ac99c37b7f0d000001"
@@ -90,7 +91,14 @@ func (this *FileService) DeleteImage(userId, fileId string) (bool, string) {
 		if db.DeleteByIdAndUserId(db.Files, fileId, userId) {
 			// delete image
 			// TODO
-			err := os.Remove(revel.BasePath + "/public/" + file.Path)
+			file.Path = strings.TrimLeft(file.Path, "/")
+			var err error
+			if strings.HasPrefix(file.Path, "upload") {
+				Log(file.Path)
+				err = os.Remove(revel.BasePath + "/public/" + file.Path)
+			} else {
+				err = os.Remove(revel.BasePath + "/" + file.Path)
+			}
 			if err == nil {
 				return true, ""
 			}

app/views/Note/note.html

@@ -1016,7 +1016,7 @@ initSlimScroll();
 <link href="/public/mdeditor/editor/editor.css" rel="stylesheet">
 <script src="/public/mdeditor/editor/pagedown/Markdown.Converter-min.js"></script>
 <script src="/public/mdeditor/editor/pagedown/Markdown.Sanitizer-min.js"></script>
-<script src="/public/mdeditor/editor/pagedown/Markdown.Editor.js"></script>
+<script src="/public/mdeditor/editor/pagedown/Markdown.Editor-min.js"></script>
 <script src="/public/mdeditor/editor/pagedown/local/Markdown.local.zh-min.js"></script>
 <script src="/public/mdeditor/editor/Markdown.Extra-min.js"></script>
 <script src="/public/mdeditor/editor/underscore-min.js"></script>

public/tinymce/plugins/paste/plugin.dev.js

@@ -117,4 +117,4 @@
 	writeScripts();
 })(this);
 
-// $hash: 3d47d6168ca064ff0c3f626e575ff2e8
+// $hash: 2adcfc4a6218fe6af3637ab6842f075f