lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-12-21 19:29:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge from mindoc-org/mindoc and resolved conflict

Browse Source
This commit is contained in:
shiqstone
2021-04-21 20:40:54 +08:00
parent 883fcec5b2 ededbbe713
commit 4ad0fe74d0
64 changed files with 722 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
controllers/BookController.go
View File

@@ -1,6 +1,7 @@
package controllers
import (
"context"
"encoding/json"
"errors"
"fmt"
@@ -17,14 +18,14 @@ import (
"net/http"
"github.com/astaxie/beego/logs"
"github.com/astaxie/beego/orm"
"github.com/beego/beego/v2/client/orm"
"github.com/beego/beego/v2/core/logs"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/graphics"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils"
"github.com/mindoc-org/mindoc/utils/pagination"
"gopkg.in/russross/blackfriday.v2"
"github.com/russross/blackfriday/v2"
)
type BookController struct {
@@ -614,7 +615,7 @@ func (c *BookController) Import() {
c.JsonResult(6006, i18n.Tr(c.Lang, "message.project_id_existed"))
}
tempPath := filepath.Join(os.TempDir(), c.CruSession.SessionID())
tempPath := filepath.Join(os.TempDir(), c.CruSession.SessionID(context.TODO()))
os.MkdirAll(tempPath, 0766)