目录结构调整

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"
 )

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"

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{}

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"
 )
 

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

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 (

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<qingqianludao@gmail.com>

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{}

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{}

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"

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"
 )

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"

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"
 )
 

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 格式输出

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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"
 )
 

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{}{

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"
 )
 

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"
 )
 

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"
 )
 

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 (

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

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

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