lsm/mindoc
1
0
Fork 0
mirror of https://github.com/mindoc-org/mindoc.git synced 2025-10-24 18:25:01 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(all): don't use adapter in FuncMap and Filter etc.

Browse Source
This commit is contained in:
roberChen
2021-03-26 15:37:19 +08:00
parent 967ef37ce9
commit debc3aa5c9
7 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
conf/enumerate.go
View File

@@ -9,7 +9,6 @@ import (
"path/filepath"
"strconv"
"github.com/beego/beego/v2/adapter"
"github.com/beego/beego/v2/server/web"
)
@@ -212,7 +211,7 @@ func IsAllowUploadFileExt(ext string) bool {
//重写生成URL的方法，加上完整的域名
func URLFor(endpoint string, values ...interface{}) string {
baseUrl := web.AppConfig.DefaultString("baseurl", "")
pathUrl := adapter.URLFor(endpoint, values...)
pathUrl := web.URLFor(endpoint, values...)
if baseUrl == "" {
baseUrl = BaseUrl
@@ -226,12 +225,12 @@ func URLFor(endpoint string, values ...interface{}) string {
if !strings.HasPrefix(pathUrl, "/") && !strings.HasSuffix(baseUrl, "/") {
return baseUrl + "/" + pathUrl
}
return baseUrl + adapter.URLFor(endpoint, values...)
return baseUrl + web.URLFor(endpoint, values...)
}
func URLForNotHost(endpoint string, values ...interface{}) string {
baseUrl := web.AppConfig.DefaultString("baseurl", "")
pathUrl := adapter.URLFor(endpoint, values...)
pathUrl := web.URLFor(endpoint, values...)
if baseUrl == "" {
baseUrl = "/"
@@ -245,7 +244,7 @@ func URLForNotHost(endpoint string, values ...interface{}) string {
if !strings.HasPrefix(pathUrl, "/") && !strings.HasSuffix(baseUrl, "/") {
return baseUrl + "/" + pathUrl
}
return baseUrl + adapter.URLFor(endpoint, values...)
return baseUrl + web.URLFor(endpoint, values...)
}
func URLForWithCdnImage(p string) string {