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(config): use web.AppConfig instead of adapter

Browse Source 
- use web.AppConfig, and change related codes

TODO: handles errors
This commit is contained in:
roberChen
2021-03-25 10:42:18 +08:00
parent e3a792e6df
commit 2d05b5a80f
11 changed files with 95 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
conf/enumerate.go
View File

@@ -10,6 +10,7 @@ import (
"strconv"
"github.com/beego/beego/v2/adapter"
"github.com/beego/beego/v2/server/web"
)
// 登录用户的Session名
@@ -81,32 +82,32 @@ var (
// app_key
func GetAppKey() string {
return adapter.AppConfig.DefaultString("app_key", "mindoc")
return web.AppConfig.DefaultString("app_key", "mindoc")
}
func GetDatabasePrefix() string {
return adapter.AppConfig.DefaultString("db_prefix", "md_")
return web.AppConfig.DefaultString("db_prefix", "md_")
}
//获取默认头像
func GetDefaultAvatar() string {
return URLForWithCdnImage(adapter.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg"))
return URLForWithCdnImage(web.AppConfig.DefaultString("avatar", "/static/images/headimgurl.jpg"))
}
//获取阅读令牌长度.
func GetTokenSize() int {
return adapter.AppConfig.DefaultInt("token_size", 12)
return web.AppConfig.DefaultInt("token_size", 12)
}
//获取默认文档封面.
func GetDefaultCover() string {
return URLForWithCdnImage(adapter.AppConfig.DefaultString("cover", "/static/images/book.jpg"))
return URLForWithCdnImage(web.AppConfig.DefaultString("cover", "/static/images/book.jpg"))
}
//获取允许的商城文件的类型.
func GetUploadFileExt() []string {
ext := adapter.AppConfig.DefaultString("upload_file_ext", "png|jpg|jpeg|gif|txt|doc|docx|pdf")
ext := web.AppConfig.DefaultString("upload_file_ext", "png|jpg|jpeg|gif|txt|doc|docx|pdf")
temp := strings.Split(ext, "|")
@@ -124,7 +125,7 @@ func GetUploadFileExt() []string {
// 获取上传文件允许的最大值
func GetUploadFileSize() int64 {
size := adapter.AppConfig.DefaultString("upload_file_size", "0")
size := web.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 {
@@ -149,12 +150,12 @@ func GetUploadFileSize() int64 {
//是否启用导出
func GetEnableExport() bool {
return adapter.AppConfig.DefaultBool("enable_export", true)
return web.AppConfig.DefaultBool("enable_export", true)
}
//同一项目导出线程的并发数
func GetExportProcessNum() int {
exportProcessNum := adapter.AppConfig.DefaultInt("export_process_num", 1)
exportProcessNum := web.AppConfig.DefaultInt("export_process_num", 1)
if exportProcessNum <= 0 || exportProcessNum > 4 {
exportProcessNum = 1
@@ -164,7 +165,7 @@ func GetExportProcessNum() int {
//导出项目队列的并发数量
func GetExportLimitNum() int {
exportLimitNum := adapter.AppConfig.DefaultInt("export_limit_num", 1)
exportLimitNum := web.AppConfig.DefaultInt("export_limit_num", 1)
if exportLimitNum < 0 {
exportLimitNum = 1
@@ -174,7 +175,7 @@ func GetExportLimitNum() int {
//等待导出队列的长度
func GetExportQueueLimitNum() int {
exportQueueLimitNum := adapter.AppConfig.DefaultInt("export_queue_limit_num", 10)
exportQueueLimitNum := web.AppConfig.DefaultInt("export_queue_limit_num", 10)
if exportQueueLimitNum <= 0 {
exportQueueLimitNum = 100
@@ -184,7 +185,7 @@ func GetExportQueueLimitNum() int {
//默认导出项目的缓存目录
func GetExportOutputPath() string {
exportOutputPath := filepath.Join(adapter.AppConfig.DefaultString("export_output_path", filepath.Join(WorkingDirectory, "cache")), "books")
exportOutputPath := filepath.Join(web.AppConfig.DefaultString("export_output_path", filepath.Join(WorkingDirectory, "cache")), "books")
return exportOutputPath
}
@@ -210,7 +211,7 @@ func IsAllowUploadFileExt(ext string) bool {
//重写生成URL的方法，加上完整的域名
func URLFor(endpoint string, values ...interface{}) string {
baseUrl := adapter.AppConfig.DefaultString("baseurl", "")
baseUrl := web.AppConfig.DefaultString("baseurl", "")
pathUrl := adapter.URLFor(endpoint, values...)
if baseUrl == "" {
@@ -229,7 +230,7 @@ func URLFor(endpoint string, values ...interface{}) string {
}
func URLForNotHost(endpoint string, values ...interface{}) string {
baseUrl := adapter.AppConfig.DefaultString("baseurl", "")
baseUrl := web.AppConfig.DefaultString("baseurl", "")
pathUrl := adapter.URLFor(endpoint, values...)
if baseUrl == "" {
@@ -251,10 +252,10 @@ func URLForWithCdnImage(p string) string {
if strings.HasPrefix(p, "http://") || strings.HasPrefix(p, "https://") {
return p
}
cdn := adapter.AppConfig.DefaultString("cdnimg", "")
cdn := web.AppConfig.DefaultString("cdnimg", "")
//如果没有设置cdn，则使用baseURL拼接
if cdn == "" {
baseUrl := adapter.AppConfig.DefaultString("baseurl", "/")
baseUrl := web.AppConfig.DefaultString("baseurl", "/")
if strings.HasPrefix(p, "/") && strings.HasSuffix(baseUrl, "/") {
return baseUrl + p[1:]
@@ -274,7 +275,7 @@ func URLForWithCdnImage(p string) string {
}
func URLForWithCdnCss(p string, v ...string) string {
cdn := adapter.AppConfig.DefaultString("cdncss", "")
cdn := web.AppConfig.DefaultString("cdncss", "")
if strings.HasPrefix(p, "http://") || strings.HasPrefix(p, "https://") {
return p
}
@@ -285,7 +286,7 @@ func URLForWithCdnCss(p string, v ...string) string {
}
//如果没有设置cdn，则使用baseURL拼接
if cdn == "" {
baseUrl := adapter.AppConfig.DefaultString("baseurl", "/")
baseUrl := web.AppConfig.DefaultString("baseurl", "/")
if strings.HasPrefix(p, "/") && strings.HasSuffix(baseUrl, "/") {
return baseUrl + p[1:]
@@ -305,7 +306,7 @@ func URLForWithCdnCss(p string, v ...string) string {
}
func URLForWithCdnJs(p string, v ...string) string {
cdn := adapter.AppConfig.DefaultString("cdnjs", "")
cdn := web.AppConfig.DefaultString("cdnjs", "")
if strings.HasPrefix(p, "http://") || strings.HasPrefix(p, "https://") {
return p
}
@@ -318,7 +319,7 @@ func URLForWithCdnJs(p string, v ...string) string {
//如果没有设置cdn，则使用baseURL拼接
if cdn == "" {
baseUrl := adapter.AppConfig.DefaultString("baseurl", "/")
baseUrl := web.AppConfig.DefaultString("baseurl", "/")
if strings.HasPrefix(p, "/") && strings.HasSuffix(baseUrl, "/") {
return baseUrl + p[1:]