update & fix

Sakurasan · Apr 7, 2017 · cbf9a10 · cbf9a10
1 parent f5c900b
commit cbf9a10
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 4 deletions.
diff --git a/controllers/atopic.go b/controllers/atopic.go
@@ -1,9 +1,12 @@
 package controllers
 
 import (
-	"github.com/astaxie/beego"
 	"ONE/models"
+	"github.com/astaxie/beego"
 	"net/http"
+	"os"
+	"strconv"
+	"time"
 )
 
 type ATopicController struct {
@@ -131,3 +134,39 @@ func (this *ATopicController) Delete() {
 	this.Redirect("/topic", 302)
 	return
 }
+
+// 接收文件
+func (this *ATopicController) Upload() {
+	// 获取本月日期
+	now := time.Now().Format("2006/01")
+	// 设置保存目录
+	mpath := "/upload/image/" + now + "/"
+	// 创建目录
+	os.MkdirAll(mpath, 0755)
+
+	_, h, err := this.GetFile("editormd-image-file")
+	if err != nil {
+		this.Data["json"] = map[string]interface{}{"success": 0, "message": err.Error()}
+		this.ServeJSON()
+	}
+
+	fpath := mpath + h.Filename
+
+	for i := 0; ; i++ {
+		_, err = os.Stat(fpath)
+		if err == nil {
+			fpath = mpath + strconv.Itoa(i) + h.Filename
+		} else {
+			break
+		}
+	}
+
+	err = this.SaveToFile("editormd-image-file", fpath)
+	if err != nil {
+		this.Data["json"] = map[string]interface{}{"success": 0, "message": err.Error()}
+	} else {
+		this.Data["json"] = map[string]interface{}{"success": 1, "message": "文件上传成功！", "url": fpath[1:]}
+	}
+
+	this.ServeJSON()
+}
diff --git a/controllers/tholeaf.go b/controllers/tholeaf.go
@@ -1,8 +1,8 @@
 package controllers
 
 import (
-	"github.com/astaxie/beego"
 	"ONE/models"
+	"github.com/astaxie/beego"
 	"path"
 )
 
@@ -45,7 +45,7 @@ func (this *TholeafController) Post() {
 	if fh != nil {
 		image = fh.Filename
 		beego.Info(image)
-		err := this.SaveToFile("file", path.Join("static/upload/image", image))
+		err := this.SaveToFile("file", path.Join("upload/image", image))
 		if err != nil {
 			beego.Error(err)
 		}
@@ -55,4 +55,6 @@ func (this *TholeafController) Post() {
 	if err != nil {
 		beego.Error(err)
 	}
+
+	this.Redirect("/tholeaf", 302)
 }
diff --git a/controllers/topic.go b/controllers/topic.go
@@ -3,10 +3,12 @@ package controllers
 import (
 	"ONE/models"
 
-	//"strconv"
 	"net/http"
 
 	"github.com/astaxie/beego"
+	"os"
+	"strconv"
+	"time"
 )
 
 type TopicController struct {
@@ -95,6 +97,7 @@ func (this *TopicController) View() {
 
 	this.Data["Replies"] = replies
 	this.Data["IsLogin"] = checkAccount(this.Ctx)
+	this.Data["IsLogin2"] = checkAccount(this.Ctx)
 
 }
 
@@ -134,3 +137,39 @@ func (this *TopicController) Delete() {
 	this.Redirect("/topic", 302)
 	return
 }
+
+// 接收文件
+func (this *TopicController) Upload() {
+	// 获取本月日期
+	now := time.Now().Format("2006/01")
+	// 设置保存目录
+	mpath := "upload/image/" + now + "/"
+	// 创建目录
+	os.MkdirAll(mpath, 0755)
+
+	_, h, err := this.GetFile("editormd-image-file")
+	if err != nil {
+		this.Data["json"] = map[string]interface{}{"success": 0, "message": err.Error()}
+		this.ServeJSON()
+	}
+
+	fpath := mpath + h.Filename
+
+	for i := 0; ; i++ {
+		_, err = os.Stat(fpath)
+		if err == nil {
+			fpath = mpath + strconv.Itoa(i) + h.Filename
+		} else {
+			break
+		}
+	}
+
+	err = this.SaveToFile("editormd-image-file", fpath)
+	if err != nil {
+		this.Data["json"] = map[string]interface{}{"success": 0, "message": err.Error()}
+	} else {
+		this.Data["json"] = map[string]interface{}{"success": 1, "message": "文件上传成功！", "url": beego.AppConfig.String("url") + fpath[0:]}
+	}
+
+	this.ServeJSON()
+}
diff --git a/upload/image/2017/03/1f338.png b/upload/image/2017/03/1f338.png
diff --git a/upload/image/2017/03/未名湖畔好读书.jpg b/upload/image/2017/03/未名湖畔好读书.jpg
diff --git a/upload/image/2017/03/未名湖畔秋色浓.jpg b/upload/image/2017/03/未名湖畔秋色浓.jpg
diff --git a/upload/image/2017/03/此间.jpg b/upload/image/2017/03/此间.jpg
diff --git a/upload/image/2017/03/那朵花.jpg b/upload/image/2017/03/那朵花.jpg
diff --git a/upload/image/2017/03/面码.jpg b/upload/image/2017/03/面码.jpg
diff --git a/upload/image/星游记.jpg b/upload/image/星游记.jpg