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

10
controllers/ManagerController.go
View File

@@ -13,16 +13,16 @@ import (
"io/ioutil"
"os"
"github.com/astaxie/beego"
"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/beego/beego/v2/server/web"
"github.com/beego/i18n"
"github.com/mindoc-org/mindoc/conf"
"github.com/mindoc-org/mindoc/models"
"github.com/mindoc-org/mindoc/utils"
"github.com/mindoc-org/mindoc/utils/filetil"
"github.com/mindoc-org/mindoc/utils/pagination"
"gopkg.in/russross/blackfriday.v2"
"github.com/russross/blackfriday/v2"
)
type ManagerController struct {
@@ -748,7 +748,7 @@ func (c *ManagerController) Config() {
tf.WriteString(content)
err = beego.LoadAppConfig("ini", tf.Name())
err = web.LoadAppConfig("ini", tf.Name())
if err != nil {
logs.Error("加载配置文件失败 ->", err)