merge video

Author: TruthHun88

.gitignore

@@ -47,4 +47,5 @@ output
 virtualroot
 docker
 license.cert
-index
+index
+index/

change.md

@@ -31,6 +31,22 @@
 - [ ] 友链交换入口
 - [ ] 程序员网址导航
 
+## v2.10 升级日志
+- [x] 支持音频和视频上传
+    - [x] 如果开启了OSS云存储，则将音视频上传上去的同时将音视频设置为私有
+- [x] 支持音频和视频播放管理
+- [x] 管理后台，恢复和优化附件管理功能
+- [x] 如果管理员或者用户是书籍项目所有人，则音视频链接支持直链播放，否则对音视频链接进行一定的防盗链处理
+- [x] 优化程序内的 `cmd` 执行
+- [x] 内容阅读页面音频视频播放功能
+    - [x] 音频和视频播放倍速控制
+    - [x] 视频画中画播放
+    - [x] 禁止音频和视频直接下载
+- [x] 增加和升级API，使小程序和APP支持音频和视频播放，以及图片放大预览
+    - [x] 小程序/APP返回的音视频内容进行加密
+- [x] 优化`html2json`仓库，解析`HTML`内容，使小程序支持音频和视频播放功能，以及图片放大预览功能
+- [x] BookStack 依赖检测，以便程序可以正常使用完整功能进行工作，检测项：chrome、puppeteer、git、calibre
+
 ## v2.9 升级日志
 - [x] 对无权限创建书籍书籍的用户，隐藏创建书籍入口
 - [x] 优化首页分类索引高亮显示，并增加`回到顶部`功能

commands/command.go

@@ -24,7 +24,6 @@ import (
 
 var (
 	ConfigurationFile = "./conf/app.conf"
-	WorkingDirectory  = "./"
 	LogFile           = "./logs"
 )
 
@@ -226,49 +225,40 @@ func RegisterFunction() {
 
 func ResolveCommand(args []string) {
 	flagSet := flag.NewFlagSet("MinDoc command: ", flag.ExitOnError)
-	flagSet.StringVar(&ConfigurationFile, "config", "", "MinDoc configuration file.")
-	flagSet.StringVar(&WorkingDirectory, "dir", "", "MinDoc working directory.")
-	flagSet.StringVar(&LogFile, "log", "", "MinDoc log file path.")
+	flagSet.StringVar(&ConfigurationFile, "config", "", "BookStack configuration file.")
+	flagSet.StringVar(&LogFile, "log", "", "BookStack log file path.")
 
 	flagSet.Parse(args)
 
-	if WorkingDirectory == "" {
-		if p, err := filepath.Abs(os.Args[0]); err == nil {
-			WorkingDirectory = filepath.Dir(p)
-		}
-	}
-	if LogFile == "" {
-		LogFile = filepath.Join(WorkingDirectory, "logs")
-	}
 	if ConfigurationFile == "" {
-		ConfigurationFile = filepath.Join(WorkingDirectory, "conf", "app.conf")
-		config := filepath.Join(WorkingDirectory, "conf", "app.conf.example")
+		ConfigurationFile = filepath.Join("conf", "app.conf")
+		config := filepath.Join("conf", "app.conf.example")
 		if !utils.FileExists(ConfigurationFile) && utils.FileExists(config) {
 			utils.CopyFile(ConfigurationFile, config)
 		}
 	}
-	gocaptcha.ReadFonts(filepath.Join(WorkingDirectory, "static", "fonts"), ".ttf")
+	gocaptcha.ReadFonts(filepath.Join("static", "fonts"), ".ttf")
 
 	err := beego.LoadAppConfig("ini", ConfigurationFile)
 
 	if err != nil {
 		log.Println("An error occurred:", err)
 		os.Exit(1)
 	}
-	uploads := filepath.Join(WorkingDirectory, "uploads")
+	uploads := filepath.Join("uploads")
 
 	os.MkdirAll(uploads, 0666)
 
-	beego.BConfig.WebConfig.StaticDir["/static"] = filepath.Join(WorkingDirectory, "static")
-	beego.BConfig.WebConfig.StaticDir["/uploads"] = uploads
-	beego.BConfig.WebConfig.ViewsPath = filepath.Join(WorkingDirectory, "views")
+	beego.BConfig.WebConfig.StaticDir["/static"] = filepath.Join("static")
+	// beego.BConfig.WebConfig.StaticDir["/uploads"] = uploads
+	beego.BConfig.WebConfig.ViewsPath = filepath.Join("views")
 
-	fonts := filepath.Join(WorkingDirectory, "static", "fonts")
+	fonts := filepath.Join("static", "fonts")
 
 	if !utils.FileExists(fonts) {
 		log.Fatal("Font path not exist.")
 	}
-	gocaptcha.ReadFonts(filepath.Join(WorkingDirectory, "static", "fonts"), ".ttf")
+	gocaptcha.ReadFonts(filepath.Join("static", "fonts"), ".ttf")
 
 	RegisterDataBase()
 	RegisterModel()
@@ -280,8 +270,4 @@ func init() {
 
 	gocaptcha.ReadFonts("./static/fonts", ".ttf")
 	gob.Register(models.Member{})
-
-	if p, err := filepath.Abs(os.Args[0]); err == nil {
-		WorkingDirectory = filepath.Dir(p)
-	}
 }

commands/daemon/daemon.go

@@ -20,11 +20,10 @@ type Daemon struct {
 func NewDaemon() *Daemon {
 
 	config := &service.Config{
-		Name:             "BookStackd",                            //服务显示名称
-		DisplayName:      "BookStack Service",                     //服务名称
-		Description:      "A document online management program.", //服务描述
-		WorkingDirectory: commands.WorkingDirectory,
-		Arguments:        os.Args[1:],
+		Name:        "BookStackd",                            //服务显示名称
+		DisplayName: "BookStack Service",                     //服务名称
+		Description: "A document online management program.", //服务描述
+		Arguments:   os.Args[1:],
 	}
 
 	return &Daemon{

conf/app.conf.example

@@ -11,6 +11,9 @@ appId=""
 # 微信小程序appSecret
 appSecret=""
 
+# 是否允许跨域(针对小程序或者APP开发)
+allowCors = true
+
 # 是否限制API请求，也就是如果不是上述配置的微信小程序的appId请求的接口，则直接拒绝
 limitReferer=false
 

conf/enumerate.go

@@ -3,6 +3,7 @@ package conf
 
 import (
 	"strings"
+	"sync"
 
 	"github.com/astaxie/beego"
 )
@@ -66,6 +67,24 @@ var (
 	GO_VERSION string
 )
 
+var (
+	AudioExt sync.Map
+	VideoExt sync.Map
+)
+
+// 初始化支持的音视频格式
+func init() {
+	// 音频格式
+	for _, ext := range []string{".flac", ".wma", ".weba", ".aac", ".oga", ".ogg", ".mp3", ".webm", ".mid", ".wav", ".opus", ".m4a", ".amr", ".aiff", ".au"} {
+		AudioExt.Store(ext, true)
+	}
+
+	// 视频格式
+	for _, ext := range []string{".ogm", ".wmv", ".asx", ".mpg", ".webm", ".mp4", ".ogv", ".mpeg", ".mov", ".m4v", ".avi"} {
+		VideoExt.Store(ext, true)
+	}
+}
+
 // app_key
 func GetAppKey() string {
 	return beego.AppConfig.DefaultString("app_key", "godoc")
@@ -109,7 +128,17 @@ func GetUploadFileExt() []string {
 }
 
 //判断是否是允许商城的文件类型.
-func IsAllowUploadFileExt(ext string) bool {
+func IsAllowUploadFileExt(ext string, typ ...string) bool {
+	if len(typ) > 0 {
+		t := strings.ToLower(strings.TrimSpace(typ[0]))
+		if t == "audio" {
+			_, ok := AudioExt.Load(ext)
+			return ok
+		} else if t == "video" {
+			_, ok := VideoExt.Load(ext)
+			return ok
+		}
+	}
 
 	if strings.HasPrefix(ext, ".") {
 		ext = string(ext[1:])

controllers/BookController.go

@@ -19,7 +19,6 @@ import (
 	"github.com/TruthHun/BookStack/models/store"
 	"github.com/russross/blackfriday"
 
-	"github.com/TruthHun/BookStack/commands"
 	"github.com/TruthHun/BookStack/conf"
 	"github.com/TruthHun/BookStack/models"
 	"github.com/TruthHun/BookStack/utils"
@@ -414,7 +413,7 @@ func (this *BookController) UploadCover() {
 		this.JsonResult(500, "图片剪切")
 	}
 
-	filePath = filepath.Join(commands.WorkingDirectory, "uploads", time.Now().Format("200601"), fileName+ext)
+	filePath = filepath.Join("uploads", time.Now().Format("200601"), fileName+ext)
 
 	//生成缩略图并保存到磁盘
 	err = graphics.ImageResizeSaveFile(subImg, 175, 230, filePath)
@@ -423,7 +422,7 @@ func (this *BookController) UploadCover() {
 		this.JsonResult(500, "保存图片失败")
 	}
 
-	url := "/" + strings.Replace(strings.TrimPrefix(filePath, commands.WorkingDirectory), "\\", "/", -1)
+	url := "/" + strings.Replace(filePath, "\\", "/", -1)
 	if strings.HasPrefix(url, "//") {
 		url = string(url[1:])
 	}
@@ -691,9 +690,8 @@ func (this *BookController) Delete() {
 	this.JsonResult(0, "ok")
 }
 
-//发布书籍.
+// 发布书籍.
 func (this *BookController) Release() {
-
 	identify := this.GetString("identify")
 	bookId := 0
 	if this.Member.IsAdministrator() {