diff --git a/cmd/gocron/gocron.go b/cmd/gocron/gocron.go index 8d7a1a4..689ed17 100644 --- a/cmd/gocron/gocron.go +++ b/cmd/gocron/gocron.go @@ -7,12 +7,12 @@ import ( "os/signal" "syscall" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/app" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/setting" - "github.com/ouqiang/gocron/routers" - "github.com/ouqiang/gocron/service" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/app" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/setting" + "github.com/ouqiang/gocron/internal/routers" + "github.com/ouqiang/gocron/internal/service" "github.com/urfave/cli" "gopkg.in/macaron.v1" ) diff --git a/cmd/node/node.go b/cmd/node/node.go index 57c115c..3069379 100644 --- a/cmd/node/node.go +++ b/cmd/node/node.go @@ -9,9 +9,9 @@ import ( "runtime" "strings" - "github.com/ouqiang/gocron/modules/rpc/auth" - "github.com/ouqiang/gocron/modules/rpc/server" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/modules/rpc/auth" + "github.com/ouqiang/gocron/internal/modules/rpc/server" + "github.com/ouqiang/gocron/internal/modules/utils" ) var AppVersion = "1.4" diff --git a/models/host.go b/internal/models/host.go similarity index 100% rename from models/host.go rename to internal/models/host.go diff --git a/models/login_log.go b/internal/models/login_log.go similarity index 100% rename from models/login_log.go rename to internal/models/login_log.go diff --git a/models/migration.go b/internal/models/migration.go similarity index 98% rename from models/migration.go rename to internal/models/migration.go index 0ef6a52..53b195e 100644 --- a/models/migration.go +++ b/internal/models/migration.go @@ -6,7 +6,7 @@ import ( "strconv" "github.com/go-xorm/xorm" - "github.com/ouqiang/gocron/modules/logger" + "github.com/ouqiang/gocron/internal/modules/logger" ) type Migration struct{} diff --git a/models/model.go b/internal/models/model.go similarity index 94% rename from models/model.go rename to internal/models/model.go index b78394b..57e1008 100644 --- a/models/model.go +++ b/internal/models/model.go @@ -8,9 +8,9 @@ import ( _ "github.com/go-sql-driver/mysql" "github.com/go-xorm/core" "github.com/go-xorm/xorm" - "github.com/ouqiang/gocron/modules/app" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/setting" + "github.com/ouqiang/gocron/internal/modules/app" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/setting" "gopkg.in/macaron.v1" ) diff --git a/models/setting.go b/internal/models/setting.go similarity index 100% rename from models/setting.go rename to internal/models/setting.go diff --git a/models/task.go b/internal/models/task.go similarity index 100% rename from models/task.go rename to internal/models/task.go diff --git a/models/task_host.go b/internal/models/task_host.go similarity index 100% rename from models/task_host.go rename to internal/models/task_host.go diff --git a/models/task_log.go b/internal/models/task_log.go similarity index 100% rename from models/task_log.go rename to internal/models/task_log.go diff --git a/models/user.go b/internal/models/user.go similarity index 98% rename from models/user.go rename to internal/models/user.go index 66636c4..b09d7c4 100644 --- a/models/user.go +++ b/internal/models/user.go @@ -3,7 +3,7 @@ package models import ( "time" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/modules/utils" ) const PasswordSaltLength = 6 diff --git a/modules/app/app.go b/internal/modules/app/app.go similarity index 93% rename from modules/app/app.go rename to internal/modules/app/app.go index 08825bc..e098b49 100644 --- a/modules/app/app.go +++ b/internal/modules/app/app.go @@ -8,9 +8,9 @@ import ( "strconv" "strings" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/setting" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/setting" + "github.com/ouqiang/gocron/internal/modules/utils" ) var ( diff --git a/modules/httpclient/http_client.go b/internal/modules/httpclient/http_client.go similarity index 100% rename from modules/httpclient/http_client.go rename to internal/modules/httpclient/http_client.go diff --git a/modules/logger/logger.go b/internal/modules/logger/logger.go similarity index 100% rename from modules/logger/logger.go rename to internal/modules/logger/logger.go diff --git a/modules/notify/mail.go b/internal/modules/notify/mail.go similarity index 92% rename from modules/notify/mail.go rename to internal/modules/notify/mail.go index 380cdbd..a4653f4 100644 --- a/modules/notify/mail.go +++ b/internal/modules/notify/mail.go @@ -6,9 +6,9 @@ import ( "time" "github.com/go-gomail/gomail" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" ) // @author qiang.ou diff --git a/modules/notify/notify.go b/internal/modules/notify/notify.go similarity index 95% rename from modules/notify/notify.go rename to internal/modules/notify/notify.go index 431459a..d457ed7 100644 --- a/modules/notify/notify.go +++ b/internal/modules/notify/notify.go @@ -4,7 +4,7 @@ import ( "fmt" "time" - "github.com/ouqiang/gocron/modules/logger" + "github.com/ouqiang/gocron/internal/modules/logger" ) type Message map[string]interface{} diff --git a/modules/notify/slack.go b/internal/modules/notify/slack.go similarity index 90% rename from modules/notify/slack.go rename to internal/modules/notify/slack.go index d167b48..ede3c82 100644 --- a/modules/notify/slack.go +++ b/internal/modules/notify/slack.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/httpclient" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/httpclient" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" ) type Slack struct{} diff --git a/modules/rpc/auth/Certification.go b/internal/modules/rpc/auth/Certification.go similarity index 100% rename from modules/rpc/auth/Certification.go rename to internal/modules/rpc/auth/Certification.go diff --git a/modules/rpc/client/client.go b/internal/modules/rpc/client/client.go similarity index 91% rename from modules/rpc/client/client.go rename to internal/modules/rpc/client/client.go index fa8ca19..a23ff0b 100644 --- a/modules/rpc/client/client.go +++ b/internal/modules/rpc/client/client.go @@ -6,9 +6,9 @@ import ( "sync" "time" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/rpc/grpcpool" - pb "github.com/ouqiang/gocron/modules/rpc/proto" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/rpc/grpcpool" + pb "github.com/ouqiang/gocron/internal/modules/rpc/proto" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/modules/rpc/grpcpool/grpc_pool.go b/internal/modules/rpc/grpcpool/grpc_pool.go similarity index 95% rename from modules/rpc/grpcpool/grpc_pool.go rename to internal/modules/rpc/grpcpool/grpc_pool.go index abb590c..f0a98db 100644 --- a/modules/rpc/grpcpool/grpc_pool.go +++ b/internal/modules/rpc/grpcpool/grpc_pool.go @@ -6,8 +6,8 @@ import ( "sync" "time" - "github.com/ouqiang/gocron/modules/app" - "github.com/ouqiang/gocron/modules/rpc/auth" + "github.com/ouqiang/gocron/internal/modules/app" + "github.com/ouqiang/gocron/internal/modules/rpc/auth" "github.com/silenceper/pool" "google.golang.org/grpc" ) diff --git a/modules/rpc/proto/task.pb.go b/internal/modules/rpc/proto/task.pb.go similarity index 100% rename from modules/rpc/proto/task.pb.go rename to internal/modules/rpc/proto/task.pb.go diff --git a/modules/rpc/proto/task.proto b/internal/modules/rpc/proto/task.proto similarity index 100% rename from modules/rpc/proto/task.proto rename to internal/modules/rpc/proto/task.proto diff --git a/modules/rpc/server/server.go b/internal/modules/rpc/server/server.go similarity index 87% rename from modules/rpc/server/server.go rename to internal/modules/rpc/server/server.go index 068682c..a5beb5a 100644 --- a/modules/rpc/server/server.go +++ b/internal/modules/rpc/server/server.go @@ -3,9 +3,9 @@ package server import ( "net" - "github.com/ouqiang/gocron/modules/rpc/auth" - pb "github.com/ouqiang/gocron/modules/rpc/proto" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/modules/rpc/auth" + pb "github.com/ouqiang/gocron/internal/modules/rpc/proto" + "github.com/ouqiang/gocron/internal/modules/utils" "golang.org/x/net/context" "google.golang.org/grpc" "google.golang.org/grpc/credentials" diff --git a/modules/setting/setting.go b/internal/modules/setting/setting.go similarity index 96% rename from modules/setting/setting.go rename to internal/modules/setting/setting.go index 81cf304..8094b8b 100644 --- a/modules/setting/setting.go +++ b/internal/modules/setting/setting.go @@ -3,8 +3,8 @@ package setting import ( "errors" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" "gopkg.in/ini.v1" ) diff --git a/modules/utils/json.go b/internal/modules/utils/json.go similarity index 96% rename from modules/utils/json.go rename to internal/modules/utils/json.go index 714c060..1d1e131 100644 --- a/modules/utils/json.go +++ b/internal/modules/utils/json.go @@ -3,7 +3,7 @@ package utils import ( "encoding/json" - "github.com/ouqiang/gocron/modules/logger" + "github.com/ouqiang/gocron/internal/modules/logger" ) // json 格式输出 diff --git a/modules/utils/utils.go b/internal/modules/utils/utils.go similarity index 100% rename from modules/utils/utils.go rename to internal/modules/utils/utils.go diff --git a/modules/utils/utils_test.go b/internal/modules/utils/utils_test.go similarity index 100% rename from modules/utils/utils_test.go rename to internal/modules/utils/utils_test.go diff --git a/modules/utils/utils_unix.go b/internal/modules/utils/utils_unix.go similarity index 100% rename from modules/utils/utils_unix.go rename to internal/modules/utils/utils_unix.go diff --git a/modules/utils/utils_windows.go b/internal/modules/utils/utils_windows.go similarity index 100% rename from modules/utils/utils_windows.go rename to internal/modules/utils/utils_windows.go diff --git a/routers/base/base.go b/internal/routers/base/base.go similarity index 89% rename from routers/base/base.go rename to internal/routers/base/base.go index acc8175..2803d2a 100644 --- a/routers/base/base.go +++ b/internal/routers/base/base.go @@ -1,7 +1,7 @@ package base import ( - "github.com/ouqiang/gocron/models" + "github.com/ouqiang/gocron/internal/models" "gopkg.in/macaron.v1" ) diff --git a/routers/home.go b/internal/routers/home.go similarity index 100% rename from routers/home.go rename to internal/routers/home.go diff --git a/routers/host/host.go b/internal/routers/host/host.go similarity index 92% rename from routers/host/host.go rename to internal/routers/host/host.go index 2c55864..94381f4 100644 --- a/routers/host/host.go +++ b/internal/routers/host/host.go @@ -8,14 +8,14 @@ import ( "github.com/Unknwon/paginater" "github.com/go-macaron/binding" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/rpc/client" - "github.com/ouqiang/gocron/modules/rpc/grpcpool" - "github.com/ouqiang/gocron/modules/rpc/proto" - "github.com/ouqiang/gocron/modules/utils" - "github.com/ouqiang/gocron/routers/base" - "github.com/ouqiang/gocron/service" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/rpc/client" + "github.com/ouqiang/gocron/internal/modules/rpc/grpcpool" + "github.com/ouqiang/gocron/internal/modules/rpc/proto" + "github.com/ouqiang/gocron/internal/modules/utils" + "github.com/ouqiang/gocron/internal/routers/base" + "github.com/ouqiang/gocron/internal/service" "gopkg.in/macaron.v1" ) diff --git a/routers/install/install.go b/internal/routers/install/install.go similarity index 94% rename from routers/install/install.go rename to internal/routers/install/install.go index 84a75f0..b744fbb 100644 --- a/routers/install/install.go +++ b/internal/routers/install/install.go @@ -5,11 +5,11 @@ import ( "strconv" "github.com/go-macaron/binding" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/app" - "github.com/ouqiang/gocron/modules/setting" - "github.com/ouqiang/gocron/modules/utils" - "github.com/ouqiang/gocron/service" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/app" + "github.com/ouqiang/gocron/internal/modules/setting" + "github.com/ouqiang/gocron/internal/modules/utils" + "github.com/ouqiang/gocron/internal/service" "gopkg.in/macaron.v1" ) diff --git a/routers/loginlog/login_log.go b/internal/routers/loginlog/login_log.go similarity index 83% rename from routers/loginlog/login_log.go rename to internal/routers/loginlog/login_log.go index f2535e5..7aebad3 100644 --- a/routers/loginlog/login_log.go +++ b/internal/routers/loginlog/login_log.go @@ -5,9 +5,9 @@ import ( "html/template" "github.com/Unknwon/paginater" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/routers/base" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/routers/base" "gopkg.in/macaron.v1" ) diff --git a/routers/manage/manage.go b/internal/routers/manage/manage.go similarity index 95% rename from routers/manage/manage.go rename to internal/routers/manage/manage.go index 88cdd39..234e011 100644 --- a/routers/manage/manage.go +++ b/internal/routers/manage/manage.go @@ -3,9 +3,9 @@ package manage import ( "encoding/json" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" "gopkg.in/macaron.v1" ) diff --git a/routers/routers.go b/internal/routers/routers.go similarity index 92% rename from routers/routers.go rename to internal/routers/routers.go index b5f27e9..5fc05d6 100644 --- a/routers/routers.go +++ b/internal/routers/routers.go @@ -13,21 +13,22 @@ import ( "github.com/go-macaron/gzip" "github.com/go-macaron/session" "github.com/go-macaron/toolbox" - "github.com/ouqiang/gocron/modules/app" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" - "github.com/ouqiang/gocron/routers/host" - "github.com/ouqiang/gocron/routers/install" - "github.com/ouqiang/gocron/routers/loginlog" - "github.com/ouqiang/gocron/routers/manage" - "github.com/ouqiang/gocron/routers/task" - "github.com/ouqiang/gocron/routers/tasklog" - "github.com/ouqiang/gocron/routers/user" + "github.com/ouqiang/gocron/internal/modules/app" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" + "github.com/ouqiang/gocron/internal/routers/host" + "github.com/ouqiang/gocron/internal/routers/install" + "github.com/ouqiang/gocron/internal/routers/loginlog" + "github.com/ouqiang/gocron/internal/routers/manage" + "github.com/ouqiang/gocron/internal/routers/task" + "github.com/ouqiang/gocron/internal/routers/tasklog" + "github.com/ouqiang/gocron/internal/routers/user" "gopkg.in/macaron.v1" ) // 静态文件目录 -const StaticDir = "public" +const staticDir = "web/public" +const templateDir = "web/templates" // 路由注册 func Register(m *macaron.Macaron) { @@ -141,8 +142,9 @@ func RegisterMiddleware(m *macaron.Macaron) { if macaron.Env != macaron.DEV { m.Use(gzip.Gziper()) } - m.Use(macaron.Static(StaticDir)) + m.Use(macaron.Static(staticDir)) m.Use(macaron.Renderer(macaron.RenderOptions{ + Directory: templateDir, // 模板语法分隔符，默认为 ["{{", "}}"] Delims: macaron.Delims{"{%", "%}"}, Funcs: []template.FuncMap{map[string]interface{}{ diff --git a/routers/task/task.go b/internal/routers/task/task.go similarity index 97% rename from routers/task/task.go rename to internal/routers/task/task.go index ef37b34..77cccf1 100644 --- a/routers/task/task.go +++ b/internal/routers/task/task.go @@ -9,11 +9,11 @@ import ( "github.com/Unknwon/paginater" "github.com/go-macaron/binding" "github.com/jakecoffman/cron" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" - "github.com/ouqiang/gocron/routers/base" - "github.com/ouqiang/gocron/service" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" + "github.com/ouqiang/gocron/internal/routers/base" + "github.com/ouqiang/gocron/internal/service" "gopkg.in/macaron.v1" ) diff --git a/routers/tasklog/task_log.go b/internal/routers/tasklog/task_log.go similarity index 91% rename from routers/tasklog/task_log.go rename to internal/routers/tasklog/task_log.go index 7383e31..5597e69 100644 --- a/routers/tasklog/task_log.go +++ b/internal/routers/tasklog/task_log.go @@ -7,11 +7,11 @@ import ( "html/template" "github.com/Unknwon/paginater" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" - "github.com/ouqiang/gocron/routers/base" - "github.com/ouqiang/gocron/service" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" + "github.com/ouqiang/gocron/internal/routers/base" + "github.com/ouqiang/gocron/internal/service" "gopkg.in/macaron.v1" ) diff --git a/routers/user/user.go b/internal/routers/user/user.go similarity index 97% rename from routers/user/user.go rename to internal/routers/user/user.go index b67e493..b940cf0 100644 --- a/routers/user/user.go +++ b/internal/routers/user/user.go @@ -8,10 +8,10 @@ import ( "github.com/Unknwon/paginater" "github.com/go-macaron/captcha" "github.com/go-macaron/session" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/utils" - "github.com/ouqiang/gocron/routers/base" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/utils" + "github.com/ouqiang/gocron/internal/routers/base" "gopkg.in/macaron.v1" ) diff --git a/service/task.go b/internal/service/task.go similarity index 96% rename from service/task.go rename to internal/service/task.go index d265a66..f565578 100644 --- a/service/task.go +++ b/internal/service/task.go @@ -10,13 +10,13 @@ import ( "time" "github.com/jakecoffman/cron" - "github.com/ouqiang/gocron/models" - "github.com/ouqiang/gocron/modules/app" - "github.com/ouqiang/gocron/modules/httpclient" - "github.com/ouqiang/gocron/modules/logger" - "github.com/ouqiang/gocron/modules/notify" - rpcClient "github.com/ouqiang/gocron/modules/rpc/client" - pb "github.com/ouqiang/gocron/modules/rpc/proto" + "github.com/ouqiang/gocron/internal/models" + "github.com/ouqiang/gocron/internal/modules/app" + "github.com/ouqiang/gocron/internal/modules/httpclient" + "github.com/ouqiang/gocron/internal/modules/logger" + "github.com/ouqiang/gocron/internal/modules/notify" + rpcClient "github.com/ouqiang/gocron/internal/modules/rpc/client" + pb "github.com/ouqiang/gocron/internal/modules/rpc/proto" ) var ( diff --git a/makefile b/makefile index 033f379..86cd418 100644 --- a/makefile +++ b/makefile @@ -1,17 +1,21 @@ -all: build +default: build +.PHONY: build build: gocron node +.PHONY: gocron gocron: go build -o bin/gocron ./cmd/gocron +.PHONY: node node: go build -o bin/gocron-node ./cmd/node +.PHONY: clean clean: rm bin/gocron diff --git a/makefile.cross-compiles b/makefile.cross-compiles index b5e47bc..8ebcab1 100644 --- a/makefile.cross-compiles +++ b/makefile.cross-compiles @@ -2,18 +2,20 @@ LDFLAGS = -w -s -X main.AppVersion=${VERSION} -all: build - +default: build +.PHONY: build build: gocron node +.PHONY: gocron gocron: env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./gocron_darwin_amd64/gocron ./cmd/gocron env CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./gocron_linux_amd64/gocron ./cmd/gocron env CGO_ENABLED=0 GOOS=windows GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./gocron_windows_amd64/gocron.exe ./cmd/gocron +.PHONY: node node: env CGO_ENABLED=0 GOOS=darwin GOARCH=amd64 go build -ldflags "$(LDFLAGS)" -o ./gocron-node_darwin_amd64/gocron-node ./cmd/node diff --git a/package.sh b/package.sh index 423ed6a..4b224fc 100644 --- a/package.sh +++ b/package.sh @@ -46,7 +46,7 @@ package_gocron() { mkdir ${PACKAGE_DIR}/${PLATFORM_NAME} fi - for file in public templates LICENSE README.md Dockerfile-release; do + for file in web LICENSE README.md Dockerfile-release; do cp -r ${file} ${PLATFORM_NAME} done diff --git a/public/favicon.ico b/web/public/favicon.ico similarity index 100% rename from public/favicon.ico rename to web/public/favicon.ico diff --git a/public/resource/css/framework.css b/web/public/resource/css/framework.css similarity index 100% rename from public/resource/css/framework.css rename to web/public/resource/css/framework.css diff --git a/public/resource/css/jquery.tagsinput.css b/web/public/resource/css/jquery.tagsinput.css similarity index 100% rename from public/resource/css/jquery.tagsinput.css rename to web/public/resource/css/jquery.tagsinput.css diff --git a/public/resource/css/main.css b/web/public/resource/css/main.css similarity index 100% rename from public/resource/css/main.css rename to web/public/resource/css/main.css diff --git a/public/resource/css/switch.css b/web/public/resource/css/switch.css similarity index 100% rename from public/resource/css/switch.css rename to web/public/resource/css/switch.css diff --git a/public/resource/fonts/basic.icons.eot b/web/public/resource/fonts/basic.icons.eot similarity index 100% rename from public/resource/fonts/basic.icons.eot rename to web/public/resource/fonts/basic.icons.eot diff --git a/public/resource/fonts/basic.icons.svg b/web/public/resource/fonts/basic.icons.svg similarity index 100% rename from public/resource/fonts/basic.icons.svg rename to web/public/resource/fonts/basic.icons.svg diff --git a/public/resource/fonts/basic.icons.ttf b/web/public/resource/fonts/basic.icons.ttf similarity index 100% rename from public/resource/fonts/basic.icons.ttf rename to web/public/resource/fonts/basic.icons.ttf diff --git a/public/resource/fonts/basic.icons.woff b/web/public/resource/fonts/basic.icons.woff similarity index 100% rename from public/resource/fonts/basic.icons.woff rename to web/public/resource/fonts/basic.icons.woff diff --git a/public/resource/fonts/icons.eot b/web/public/resource/fonts/icons.eot similarity index 100% rename from public/resource/fonts/icons.eot rename to web/public/resource/fonts/icons.eot diff --git a/public/resource/fonts/icons.otf b/web/public/resource/fonts/icons.otf similarity index 100% rename from public/resource/fonts/icons.otf rename to web/public/resource/fonts/icons.otf diff --git a/public/resource/fonts/icons.svg b/web/public/resource/fonts/icons.svg similarity index 100% rename from public/resource/fonts/icons.svg rename to web/public/resource/fonts/icons.svg diff --git a/public/resource/fonts/icons.ttf b/web/public/resource/fonts/icons.ttf similarity index 100% rename from public/resource/fonts/icons.ttf rename to web/public/resource/fonts/icons.ttf diff --git a/public/resource/fonts/icons.woff b/web/public/resource/fonts/icons.woff similarity index 100% rename from public/resource/fonts/icons.woff rename to web/public/resource/fonts/icons.woff diff --git a/public/resource/images/arrow-white-l2r.png b/web/public/resource/images/arrow-white-l2r.png similarity index 100% rename from public/resource/images/arrow-white-l2r.png rename to web/public/resource/images/arrow-white-l2r.png diff --git a/public/resource/images/avatar-default.gif b/web/public/resource/images/avatar-default.gif similarity index 100% rename from public/resource/images/avatar-default.gif rename to web/public/resource/images/avatar-default.gif diff --git a/public/resource/images/bg-uniform.png b/web/public/resource/images/bg-uniform.png similarity index 100% rename from public/resource/images/bg-uniform.png rename to web/public/resource/images/bg-uniform.png diff --git a/public/resource/images/devicedomo01.jpg b/web/public/resource/images/devicedomo01.jpg similarity index 100% rename from public/resource/images/devicedomo01.jpg rename to web/public/resource/images/devicedomo01.jpg diff --git a/public/resource/images/gopher-avatar.png b/web/public/resource/images/gopher-avatar.png similarity index 100% rename from public/resource/images/gopher-avatar.png rename to web/public/resource/images/gopher-avatar.png diff --git a/public/resource/images/icon-sprite.png b/web/public/resource/images/icon-sprite.png similarity index 100% rename from public/resource/images/icon-sprite.png rename to web/public/resource/images/icon-sprite.png diff --git a/public/resource/images/icon_search.png b/web/public/resource/images/icon_search.png similarity index 100% rename from public/resource/images/icon_search.png rename to web/public/resource/images/icon_search.png diff --git a/public/resource/images/icon_weibo.png b/web/public/resource/images/icon_weibo.png similarity index 100% rename from public/resource/images/icon_weibo.png rename to web/public/resource/images/icon_weibo.png diff --git a/public/resource/images/loader-large-inverted.gif b/web/public/resource/images/loader-large-inverted.gif similarity index 100% rename from public/resource/images/loader-large-inverted.gif rename to web/public/resource/images/loader-large-inverted.gif diff --git a/public/resource/images/loader-large.gif b/web/public/resource/images/loader-large.gif similarity index 100% rename from public/resource/images/loader-large.gif rename to web/public/resource/images/loader-large.gif diff --git a/public/resource/images/loader-medium-inverted.gif b/web/public/resource/images/loader-medium-inverted.gif similarity index 100% rename from public/resource/images/loader-medium-inverted.gif rename to web/public/resource/images/loader-medium-inverted.gif diff --git a/public/resource/images/loader-medium.gif b/web/public/resource/images/loader-medium.gif similarity index 100% rename from public/resource/images/loader-medium.gif rename to web/public/resource/images/loader-medium.gif diff --git a/public/resource/images/loader-mini-inverted.gif b/web/public/resource/images/loader-mini-inverted.gif similarity index 100% rename from public/resource/images/loader-mini-inverted.gif rename to web/public/resource/images/loader-mini-inverted.gif diff --git a/public/resource/images/loader-mini.gif b/web/public/resource/images/loader-mini.gif similarity index 100% rename from public/resource/images/loader-mini.gif rename to web/public/resource/images/loader-mini.gif diff --git a/public/resource/images/loader-small-inverted.gif b/web/public/resource/images/loader-small-inverted.gif similarity index 100% rename from public/resource/images/loader-small-inverted.gif rename to web/public/resource/images/loader-small-inverted.gif diff --git a/public/resource/images/loader-small.gif b/web/public/resource/images/loader-small.gif similarity index 100% rename from public/resource/images/loader-small.gif rename to web/public/resource/images/loader-small.gif diff --git a/public/resource/images/logo.png b/web/public/resource/images/logo.png similarity index 100% rename from public/resource/images/logo.png rename to web/public/resource/images/logo.png diff --git a/public/resource/images/logo_footer.png b/web/public/resource/images/logo_footer.png similarity index 100% rename from public/resource/images/logo_footer.png rename to web/public/resource/images/logo_footer.png diff --git a/public/resource/images/navbar_bg.png b/web/public/resource/images/navbar_bg.png similarity index 100% rename from public/resource/images/navbar_bg.png rename to web/public/resource/images/navbar_bg.png diff --git a/public/resource/images/photo.jpg b/web/public/resource/images/photo.jpg similarity index 100% rename from public/resource/images/photo.jpg rename to web/public/resource/images/photo.jpg diff --git a/public/resource/images/yeelink-avatar.jpg b/web/public/resource/images/yeelink-avatar.jpg similarity index 100% rename from public/resource/images/yeelink-avatar.jpg rename to web/public/resource/images/yeelink-avatar.jpg diff --git a/public/resource/javascript/ZeroClipboard.swf b/web/public/resource/javascript/ZeroClipboard.swf similarity index 100% rename from public/resource/javascript/ZeroClipboard.swf rename to web/public/resource/javascript/ZeroClipboard.swf diff --git a/public/resource/javascript/alert.js b/web/public/resource/javascript/alert.js similarity index 100% rename from public/resource/javascript/alert.js rename to web/public/resource/javascript/alert.js diff --git a/public/resource/javascript/form.min.js b/web/public/resource/javascript/form.min.js similarity index 100% rename from public/resource/javascript/form.min.js rename to web/public/resource/javascript/form.min.js diff --git a/public/resource/javascript/framework.js b/web/public/resource/javascript/framework.js similarity index 100% rename from public/resource/javascript/framework.js rename to web/public/resource/javascript/framework.js diff --git a/public/resource/javascript/handlebars-v4.0.5.js b/web/public/resource/javascript/handlebars-v4.0.5.js similarity index 100% rename from public/resource/javascript/handlebars-v4.0.5.js rename to web/public/resource/javascript/handlebars-v4.0.5.js diff --git a/public/resource/javascript/jquery.min.js b/web/public/resource/javascript/jquery.min.js similarity index 100% rename from public/resource/javascript/jquery.min.js rename to web/public/resource/javascript/jquery.min.js diff --git a/public/resource/javascript/jquery.tagsinput.js b/web/public/resource/javascript/jquery.tagsinput.js similarity index 100% rename from public/resource/javascript/jquery.tagsinput.js rename to web/public/resource/javascript/jquery.tagsinput.js diff --git a/public/resource/javascript/jquery.zclip.min.js b/web/public/resource/javascript/jquery.zclip.min.js similarity index 100% rename from public/resource/javascript/jquery.zclip.min.js rename to web/public/resource/javascript/jquery.zclip.min.js diff --git a/public/resource/javascript/main.js b/web/public/resource/javascript/main.js similarity index 100% rename from public/resource/javascript/main.js rename to web/public/resource/javascript/main.js diff --git a/public/resource/javascript/new_action.js b/web/public/resource/javascript/new_action.js similarity index 100% rename from public/resource/javascript/new_action.js rename to web/public/resource/javascript/new_action.js diff --git a/public/resource/javascript/semantic.js b/web/public/resource/javascript/semantic.js similarity index 100% rename from public/resource/javascript/semantic.js rename to web/public/resource/javascript/semantic.js diff --git a/public/resource/javascript/user_new_devices.js b/web/public/resource/javascript/user_new_devices.js similarity index 100% rename from public/resource/javascript/user_new_devices.js rename to web/public/resource/javascript/user_new_devices.js diff --git a/public/resource/javascript/vue.min.js b/web/public/resource/javascript/vue.min.js similarity index 100% rename from public/resource/javascript/vue.min.js rename to web/public/resource/javascript/vue.min.js diff --git a/public/resource/sweetalert/.editorconfig b/web/public/resource/sweetalert/.editorconfig similarity index 100% rename from public/resource/sweetalert/.editorconfig rename to web/public/resource/sweetalert/.editorconfig diff --git a/public/resource/sweetalert/.gitignore b/web/public/resource/sweetalert/.gitignore similarity index 100% rename from public/resource/sweetalert/.gitignore rename to web/public/resource/sweetalert/.gitignore diff --git a/public/resource/sweetalert/.jshintrc b/web/public/resource/sweetalert/.jshintrc similarity index 100% rename from public/resource/sweetalert/.jshintrc rename to web/public/resource/sweetalert/.jshintrc diff --git a/public/resource/sweetalert/.travis.yml b/web/public/resource/sweetalert/.travis.yml similarity index 100% rename from public/resource/sweetalert/.travis.yml rename to web/public/resource/sweetalert/.travis.yml diff --git a/public/resource/sweetalert/sweetalert-dev.js b/web/public/resource/sweetalert/sweetalert-dev.js similarity index 100% rename from public/resource/sweetalert/sweetalert-dev.js rename to web/public/resource/sweetalert/sweetalert-dev.js diff --git a/public/resource/sweetalert/sweetalert.css b/web/public/resource/sweetalert/sweetalert.css similarity index 100% rename from public/resource/sweetalert/sweetalert.css rename to web/public/resource/sweetalert/sweetalert.css diff --git a/public/resource/sweetalert/sweetalert.min.js b/web/public/resource/sweetalert/sweetalert.min.js similarity index 100% rename from public/resource/sweetalert/sweetalert.min.js rename to web/public/resource/sweetalert/sweetalert.min.js diff --git a/templates/common/footer.html b/web/templates/common/footer.html similarity index 100% rename from templates/common/footer.html rename to web/templates/common/footer.html diff --git a/templates/common/header.html b/web/templates/common/header.html similarity index 100% rename from templates/common/header.html rename to web/templates/common/header.html diff --git a/templates/common/pagination.html b/web/templates/common/pagination.html similarity index 100% rename from templates/common/pagination.html rename to web/templates/common/pagination.html diff --git a/templates/error/404.html b/web/templates/error/404.html similarity index 100% rename from templates/error/404.html rename to web/templates/error/404.html diff --git a/templates/error/500.html b/web/templates/error/500.html similarity index 100% rename from templates/error/500.html rename to web/templates/error/500.html diff --git a/templates/home/index.html b/web/templates/home/index.html similarity index 100% rename from templates/home/index.html rename to web/templates/home/index.html diff --git a/templates/host/host_form.html b/web/templates/host/host_form.html similarity index 100% rename from templates/host/host_form.html rename to web/templates/host/host_form.html diff --git a/templates/host/index.html b/web/templates/host/index.html similarity index 100% rename from templates/host/index.html rename to web/templates/host/index.html diff --git a/templates/host/menu.html b/web/templates/host/menu.html similarity index 100% rename from templates/host/menu.html rename to web/templates/host/menu.html diff --git a/templates/install/create.html b/web/templates/install/create.html similarity index 100% rename from templates/install/create.html rename to web/templates/install/create.html diff --git a/templates/install/menu.html b/web/templates/install/menu.html similarity index 100% rename from templates/install/menu.html rename to web/templates/install/menu.html diff --git a/templates/manage/login_log.html b/web/templates/manage/login_log.html similarity index 100% rename from templates/manage/login_log.html rename to web/templates/manage/login_log.html diff --git a/templates/manage/mail.html b/web/templates/manage/mail.html similarity index 100% rename from templates/manage/mail.html rename to web/templates/manage/mail.html diff --git a/templates/manage/menu.html b/web/templates/manage/menu.html similarity index 100% rename from templates/manage/menu.html rename to web/templates/manage/menu.html diff --git a/templates/manage/slack.html b/web/templates/manage/slack.html similarity index 100% rename from templates/manage/slack.html rename to web/templates/manage/slack.html diff --git a/templates/task/index.html b/web/templates/task/index.html similarity index 100% rename from templates/task/index.html rename to web/templates/task/index.html diff --git a/templates/task/log.html b/web/templates/task/log.html similarity index 100% rename from templates/task/log.html rename to web/templates/task/log.html diff --git a/templates/task/menu.html b/web/templates/task/menu.html similarity index 100% rename from templates/task/menu.html rename to web/templates/task/menu.html diff --git a/templates/task/task_form.html b/web/templates/task/task_form.html similarity index 100% rename from templates/task/task_form.html rename to web/templates/task/task_form.html diff --git a/templates/user/editMyPassword.html b/web/templates/user/editMyPassword.html similarity index 100% rename from templates/user/editMyPassword.html rename to web/templates/user/editMyPassword.html diff --git a/templates/user/editPassword.html b/web/templates/user/editPassword.html similarity index 100% rename from templates/user/editPassword.html rename to web/templates/user/editPassword.html diff --git a/templates/user/index.html b/web/templates/user/index.html similarity index 100% rename from templates/user/index.html rename to web/templates/user/index.html diff --git a/templates/user/login.html b/web/templates/user/login.html similarity index 100% rename from templates/user/login.html rename to web/templates/user/login.html diff --git a/templates/user/menu.html b/web/templates/user/menu.html similarity index 100% rename from templates/user/menu.html rename to web/templates/user/menu.html diff --git a/templates/user/user_form.html b/web/templates/user/user_form.html similarity index 100% rename from templates/user/user_form.html rename to web/templates/user/user_form.html