- 增加https参数

- 修复bug "「资产」无法通过「资产标签」过滤" close #33
- 修复bug "切換授權使用者登錄後,進入資產列表後會有錯誤" close #53
This commit is contained in:
dushixiang
2021-02-12 16:50:38 +08:00
parent 7599c09191
commit 1b7dd820b3
6 changed files with 37 additions and 8 deletions

12
main.go
View File

@ -10,6 +10,7 @@ import (
"gorm.io/driver/mysql"
"gorm.io/driver/sqlite"
"gorm.io/gorm"
"gorm.io/gorm/logger"
"io"
"next-terminal/pkg/api"
"next-terminal/pkg/config"
@ -73,7 +74,9 @@ func Run() error {
//Logger: logger.Default.LogMode(logger.Info),
})
} else {
global.DB, err = gorm.Open(sqlite.Open(global.Config.Sqlite.File), &gorm.Config{})
global.DB, err = gorm.Open(sqlite.Open(global.Config.Sqlite.File), &gorm.Config{
Logger: logger.Default.LogMode(logger.Info),
})
}
if err != nil {
@ -206,5 +209,10 @@ func Run() error {
go handle.RunTicker()
go handle.RunDataFix()
return e.Start(global.Config.Server.Addr)
if global.Config.Server.Cert != "" && global.Config.Server.Key != "" {
return e.StartTLS(global.Config.Server.Addr, global.Config.Server.Cert, global.Config.Server.Key)
} else {
return e.Start(global.Config.Server.Addr)
}
}