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

chore!(all): attempt to update beego to v2

Browse Source 
BREAKING CHANGE: beego has update to v2, and this version of mindoc IS
NOT TESTED AND STABLE!!!
This commit is contained in:
roberChen
2021-03-23 21:55:50 +08:00
parent 79f70d830d
commit 90c1329de2
56 changed files with 1021 additions and 766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
conf/enumerate.go
View File

@@ -4,11 +4,12 @@ package conf
import (
"strings"
"github.com/astaxie/beego"
"strconv"
"path/filepath"
"os"
"fmt"
"os"
"path/filepath"
"strconv"
"github.com/beego/beego/v2/adapter"
)
// 登录用户的Session名
@@ -80,32 +81,32 @@ var (
// app_key
func GetAppKey() string {
return beego.AppConfig.DefaultString("app_key", "mindoc")
return adapter.AppConfig.DefaultString("app_key", "mindoc")
}
func GetDatabasePrefix() string {
return beego.AppConfig.DefaultString("db_prefix", "md_")
return adapter.AppConfig.DefaultString("db_prefix", "md_")
}
//获取默认头像
func GetDefaultAvatar() string {
return URLForWithCdnImage(beego.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg"))
return URLForWithCdnImage(adapter.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg"))
}
//获取阅读令牌长度.
func GetTokenSize() int {
return beego.AppConfig.DefaultInt("token_size", 12)
return adapter.AppConfig.DefaultInt("token_size", 12)
}
//获取默认文档封面.
func GetDefaultCover() string {
return URLForWithCdnImage(beego.AppConfig.DefaultString("cover", "/static/images/book.jpg"))
return URLForWithCdnImage(adapter.AppConfig.DefaultString("cover", "/static/images/book.jpg"))
}
//获取允许的商城文件的类型.
func GetUploadFileExt() []string {
ext := beego.AppConfig.DefaultString("upload_file_ext", "png|jpg|jpeg|gif|txt|doc|docx|pdf")
ext := adapter.AppConfig.DefaultString("upload_file_ext", "png|jpg|jpeg|gif|txt|doc|docx|pdf")
temp := strings.Split(ext, "|")
@@ -123,7 +124,7 @@ func GetUploadFileExt() []string {
// 获取上传文件允许的最大值
func GetUploadFileSize() int64 {
size := beego.AppConfig.DefaultString("upload_file_size", "0")
size := adapter.AppConfig.DefaultString("upload_file_size", "0")
if strings.HasSuffix(size, "MB") {
if s, e := strconv.ParseInt(size[0:len(size)-2], 10, 64); e == nil {
@@ -148,32 +149,32 @@ func GetUploadFileSize() int64 {
//是否启用导出
func GetEnableExport() bool {
return beego.AppConfig.DefaultBool("enable_export", true)
return adapter.AppConfig.DefaultBool("enable_export", true)
}
//同一项目导出线程的并发数
func GetExportProcessNum() int {
exportProcessNum := beego.AppConfig.DefaultInt("export_process_num", 1)
exportProcessNum := adapter.AppConfig.DefaultInt("export_process_num", 1)
if exportProcessNum <= 0 || exportProcessNum > 4 {
exportProcessNum = 1
}
return exportProcessNum;
return exportProcessNum
}
//导出项目队列的并发数量
func GetExportLimitNum() int {
exportLimitNum := beego.AppConfig.DefaultInt("export_limit_num", 1)
exportLimitNum := adapter.AppConfig.DefaultInt("export_limit_num", 1)
if exportLimitNum < 0 {
exportLimitNum = 1
}
return exportLimitNum;
return exportLimitNum
}
//等待导出队列的长度
func GetExportQueueLimitNum() int {
exportQueueLimitNum := beego.AppConfig.DefaultInt("export_queue_limit_num", 10)
exportQueueLimitNum := adapter.AppConfig.DefaultInt("export_queue_limit_num", 10)
if exportQueueLimitNum <= 0 {
exportQueueLimitNum = 100
@@ -183,7 +184,7 @@ func GetExportQueueLimitNum() int {
//默认导出项目的缓存目录
func GetExportOutputPath() string {
exportOutputPath := filepath.Join(beego.AppConfig.DefaultString("export_output_path", filepath.Join(WorkingDirectory, "cache")), "books")
exportOutputPath := filepath.Join(adapter.AppConfig.DefaultString("export_output_path", filepath.Join(WorkingDirectory, "cache")), "books")
return exportOutputPath
}
@@ -209,8 +210,8 @@ func IsAllowUploadFileExt(ext string) bool {
//重写生成URL的方法，加上完整的域名
func URLFor(endpoint string, values ...interface{}) string {
baseUrl := beego.AppConfig.DefaultString("baseurl", "")
pathUrl := beego.URLFor(endpoint, values ...)
baseUrl := adapter.AppConfig.DefaultString("baseurl", "")
pathUrl := adapter.URLFor(endpoint, values...)
if baseUrl == "" {
baseUrl = BaseUrl
@@ -224,12 +225,12 @@ func URLFor(endpoint string, values ...interface{}) string {
if !strings.HasPrefix(pathUrl, "/") && !strings.HasSuffix(baseUrl, "/") {
return baseUrl + "/" + pathUrl
}
return baseUrl + beego.URLFor(endpoint, values ...)
return baseUrl + adapter.URLFor(endpoint, values...)
}
func URLForNotHost(endpoint string,values ...interface{}) string {
baseUrl := beego.AppConfig.DefaultString("baseurl", "")
pathUrl := beego.URLFor(endpoint, values ...)
func URLForNotHost(endpoint string, values ...interface{}) string {
baseUrl := adapter.AppConfig.DefaultString("baseurl", "")
pathUrl := adapter.URLFor(endpoint, values...)
if baseUrl == "" {
baseUrl = "/"
@@ -243,17 +244,17 @@ func URLForNotHost(endpoint string,values ...interface{}) string {
if !strings.HasPrefix(pathUrl, "/") && !strings.HasSuffix(baseUrl, "/") {
return baseUrl + "/" + pathUrl
}
return baseUrl + beego.URLFor(endpoint, values ...)
return baseUrl + adapter.URLFor(endpoint, values...)
}
func URLForWithCdnImage(p string) string {
if strings.HasPrefix(p, "http://") || strings.HasPrefix(p, "https://") {
return p
}
cdn := beego.AppConfig.DefaultString("cdnimg", "")
cdn := adapter.AppConfig.DefaultString("cdnimg", "")
//如果没有设置cdn，则使用baseURL拼接
if cdn == "" {
baseUrl := beego.AppConfig.DefaultString("baseurl", "/")
baseUrl := adapter.AppConfig.DefaultString("baseurl", "/")
if strings.HasPrefix(p, "/") && strings.HasSuffix(baseUrl, "/") {
return baseUrl + p[1:]
@@ -273,7 +274,7 @@ func URLForWithCdnImage(p string) string {
}
func URLForWithCdnCss(p string, v ...string) string {
cdn := beego.AppConfig.DefaultString("cdncss", "")
cdn := adapter.AppConfig.DefaultString("cdncss", "")
if strings.HasPrefix(p, "http://") || strings.HasPrefix(p, "https://") {
return p
}
@@ -284,7 +285,7 @@ func URLForWithCdnCss(p string, v ...string) string {
}
//如果没有设置cdn，则使用baseURL拼接
if cdn == "" {
baseUrl := beego.AppConfig.DefaultString("baseurl", "/")
baseUrl := adapter.AppConfig.DefaultString("baseurl", "/")
if strings.HasPrefix(p, "/") && strings.HasSuffix(baseUrl, "/") {
return baseUrl + p[1:]
@@ -304,7 +305,7 @@ func URLForWithCdnCss(p string, v ...string) string {
}
func URLForWithCdnJs(p string, v ...string) string {
cdn := beego.AppConfig.DefaultString("cdnjs", "")
cdn := adapter.AppConfig.DefaultString("cdnjs", "")
if strings.HasPrefix(p, "http://") || strings.HasPrefix(p, "https://") {
return p
}
@@ -317,7 +318,7 @@ func URLForWithCdnJs(p string, v ...string) string {
//如果没有设置cdn，则使用baseURL拼接
if cdn == "" {
baseUrl := beego.AppConfig.DefaultString("baseurl", "/")
baseUrl := adapter.AppConfig.DefaultString("baseurl", "/")
if strings.HasPrefix(p, "/") && strings.HasSuffix(baseUrl, "/") {
return baseUrl + p[1:]