Merge branch 'github-master'
This commit is contained in:
commit
f1dd9fc2ed
167 changed files with 2002 additions and 513 deletions
|
|
@ -1,26 +1,25 @@
|
|||
package main
|
||||
|
||||
import (
|
||||
imagorvideoextended "git.cef.icu/CEF/imagorextended"
|
||||
"github.com/cshum/imagor/config"
|
||||
"github.com/cshum/imagor/config/awsconfig"
|
||||
"github.com/cshum/imagor/config/gcloudconfig"
|
||||
"github.com/cshum/imagor/config/vipsconfig"
|
||||
"github.com/cshum/imagorvideo"
|
||||
"os"
|
||||
// imagorvideoextended "git.cef.icu/CEF/imagorextended"
|
||||
"github.com/cshum/imagor/config"
|
||||
"github.com/cshum/imagor/config/awsconfig"
|
||||
"github.com/cshum/imagor/config/gcloudconfig"
|
||||
"github.com/cshum/imagor/config/vipsconfig"
|
||||
"github.com/cshum/imagorvideo"
|
||||
"os"
|
||||
)
|
||||
|
||||
func main() {
|
||||
var server = config.CreateServer(
|
||||
os.Args[1:],
|
||||
//imagorvideoextended.LoaderConfig,
|
||||
imagorvideoextended.Config,
|
||||
imagorvideo.Config,
|
||||
vipsconfig.WithVips,
|
||||
awsconfig.WithAWS,
|
||||
gcloudconfig.WithGCloud,
|
||||
)
|
||||
if server != nil {
|
||||
server.Run()
|
||||
}
|
||||
var server = config.CreateServer(
|
||||
os.Args[1:],
|
||||
// imagorvideoextended.Config,
|
||||
imagorvideo.Config,
|
||||
vipsconfig.WithVips,
|
||||
awsconfig.WithAWS,
|
||||
gcloudconfig.WithGCloud,
|
||||
)
|
||||
if server != nil {
|
||||
server.Run()
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue