[REV] update package api design,remove pkg dir (fixed #57)

api/apiRouters/cloud/cloudRouter.go

@@ -20,7 +20,7 @@ package cloud
 
 import (
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/pkg/api/controller"
+	"github.com/goodrain/rainbond/api/controller"
 )
 
 //Routes routes

api/apiRouters/license/license.go

@@ -19,8 +19,8 @@
 package license
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/controller"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	"github.com/goodrain/rainbond/api/controller"
+	"github.com/goodrain/rainbond/api/util"
 	"net/http"
 
 	"github.com/go-chi/chi"

api/apiRouters/rootFunc/rootFunc.go

@@ -19,7 +19,7 @@
 package rootFunc
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/controller"
+	"github.com/goodrain/rainbond/api/controller"
 
 	"github.com/go-chi/chi"
 )

api/apiRouters/version2/v2Nodes.go

@@ -19,7 +19,7 @@
 package version2
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/controller"
+	"github.com/goodrain/rainbond/api/controller"
 
 	"github.com/go-chi/chi"
 )

api/apiRouters/version2/v2Plugin.go

@@ -19,8 +19,8 @@
 package version2
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/controller"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
+	"github.com/goodrain/rainbond/api/controller"
+	"github.com/goodrain/rainbond/api/middleware"
 
 	"github.com/go-chi/chi"
 )

api/apiRouters/version2/v2Routers.go

@@ -19,8 +19,8 @@
 package version2
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/controller"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
+	"github.com/goodrain/rainbond/api/controller"
+	"github.com/goodrain/rainbond/api/middleware"
 
 	"github.com/go-chi/chi"
 )

api/apiRouters/version2/v2Rules.go

@@ -20,7 +20,7 @@ package version2
 
 import (
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/pkg/api/controller"
+	"github.com/goodrain/rainbond/api/controller"
 )
 
 //PluginRouter plugin router

api/apiRouters/version2/v2Sources.go

@@ -20,7 +20,7 @@ package version2
 
 import (
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/pkg/api/controller"
+	"github.com/goodrain/rainbond/api/controller"
 )
 
 //PluginRouter plugin router

api/apiRouters/websocket/websocket.go

@@ -19,7 +19,7 @@
 package websocket
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/controller"
+	"github.com/goodrain/rainbond/api/controller"
 
 	"github.com/go-chi/chi"
 )

api/controller/chargesVerify.go

@@ -23,13 +23,13 @@ import (
 	"os"
 	"strconv"
 
-	"github.com/goodrain/rainbond/pkg/api/handler/publiccloud"
+	"github.com/goodrain/rainbond/api/handler/publiccloud"
 
-	"github.com/goodrain/rainbond/pkg/db"
-	"github.com/goodrain/rainbond/pkg/db/model"
+	"github.com/goodrain/rainbond/db"
+	"github.com/goodrain/rainbond/db/model"
 
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/middleware"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //ChargesVerifyController service charges verify

api/controller/check.go

@@ -23,10 +23,10 @@ import (
 	"strings"
 
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/middleware"
+	api_model "github.com/goodrain/rainbond/api/model"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //Check service check

api/controller/cloud.go

@@ -22,9 +22,9 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/handler"
+	api_model "github.com/goodrain/rainbond/api/model"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //CloudManager cloud manager

api/controller/defineSources.go

@@ -22,10 +22,10 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/middleware"
+	api_model "github.com/goodrain/rainbond/api/model"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //SetDefineSource SetDefineSource

api/controller/entrance.go

@@ -19,7 +19,7 @@
 package controller
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/proxy"
+	"github.com/goodrain/rainbond/api/proxy"
 	"net/http"
 
 	"github.com/Sirupsen/logrus"

api/controller/event.go

@@ -24,8 +24,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/bitly/go-simplejson"
-	"github.com/goodrain/rainbond/pkg/db"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/db"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //Event GetLogs

api/controller/eventLog.go

@@ -23,14 +23,14 @@ import (
 	"os"
 	"strings"
 
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	httputil "github.com/goodrain/rainbond/util/http"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/go-chi/chi"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/middleware"
+	api_model "github.com/goodrain/rainbond/api/model"
 )
 
 //EventLogStruct eventlog struct

api/controller/license.go

@@ -23,9 +23,9 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
+	"github.com/goodrain/rainbond/api/handler"
 
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	httputil "github.com/goodrain/rainbond/util/http"
 
 	"github.com/Sirupsen/logrus"
 	validator "github.com/thedevsaddam/govalidator"

api/controller/manager.go

@@ -22,10 +22,10 @@ import (
 	"net/http"
 
 	"github.com/goodrain/rainbond/cmd/api/option"
-	"github.com/goodrain/rainbond/pkg/api/apiFunc"
-	"github.com/goodrain/rainbond/pkg/api/discover"
-	"github.com/goodrain/rainbond/pkg/api/proxy"
-	"github.com/goodrain/rainbond/pkg/appruntimesync/client"
+	"github.com/goodrain/rainbond/api/apiFunc"
+	"github.com/goodrain/rainbond/api/discover"
+	"github.com/goodrain/rainbond/api/proxy"
+	"github.com/goodrain/rainbond/appruntimesync/client"
 
 	"github.com/Sirupsen/logrus"
 )

api/controller/netStreamRules.go

@@ -21,10 +21,10 @@ package controller
 import (
 	"net/http"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/middleware"
+	api_model "github.com/goodrain/rainbond/api/model"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //SetDownStreamRule 设置下游规则

api/controller/nodes.go

@@ -19,7 +19,7 @@
 package controller
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/proxy"
+	"github.com/goodrain/rainbond/api/proxy"
 	"net/http"
 
 	"github.com/Sirupsen/logrus"

api/controller/plugin.go

@@ -21,13 +21,13 @@ package controller
 import (
 	"net/http"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/middleware"
 
 	"github.com/go-chi/chi"
 
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	api_model "github.com/goodrain/rainbond/api/model"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //PluginAction plugin action

api/controller/publicFunc.go

@@ -27,7 +27,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/goodrain/rainbond/pkg/db"
+	"github.com/goodrain/rainbond/db"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/go-chi/chi"

api/controller/resources.go

@@ -26,9 +26,9 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	"github.com/goodrain/rainbond/api/middleware"
+	api_model "github.com/goodrain/rainbond/api/model"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 
 	"github.com/pquerna/ffjson/ffjson"
 
@@ -36,9 +36,9 @@ import (
 	"github.com/jinzhu/gorm"
 	validator "github.com/thedevsaddam/govalidator"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/appruntimesync/client"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/appruntimesync/client"
+	httputil "github.com/goodrain/rainbond/util/http"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/renstorm/fuzzysearch/fuzzy"

api/controller/serviceAction.go

@@ -22,19 +22,19 @@ import (
 	"fmt"
 	"net/http"
 
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/event"
-	"github.com/goodrain/rainbond/pkg/worker/discover/model"
+	"github.com/goodrain/rainbond/api/middleware"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/event"
+	"github.com/goodrain/rainbond/worker/discover/model"
 
 	"time"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
-	tutil "github.com/goodrain/rainbond/pkg/util"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
+	tutil "github.com/goodrain/rainbond/util"
+	httputil "github.com/goodrain/rainbond/util/http"
 	validator "github.com/thedevsaddam/govalidator"
 )
 

api/controller/service_share.go

@@ -22,10 +22,10 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi"
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/middleware"
+	api_model "github.com/goodrain/rainbond/api/model"
+	httputil "github.com/goodrain/rainbond/util/http"
 )
 
 //Share 应用分享

api/controller/volume.go

@@ -22,12 +22,12 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/middleware"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/middleware"
 
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	api_model "github.com/goodrain/rainbond/api/model"
+	dbmodel "github.com/goodrain/rainbond/db/model"
+	httputil "github.com/goodrain/rainbond/util/http"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/go-chi/chi"

api/controller/websocket.go

@@ -22,8 +22,8 @@ import (
 	"net/http"
 	"os"
 
-	"github.com/goodrain/rainbond/pkg/api/discover"
-	"github.com/goodrain/rainbond/pkg/api/proxy"
+	"github.com/goodrain/rainbond/api/discover"
+	"github.com/goodrain/rainbond/api/proxy"
 
 	"github.com/Sirupsen/logrus"
 

api/daemon/region_api.go

@@ -19,7 +19,7 @@
 package daemon
 
 import (
-	"github.com/goodrain/rainbond/pkg/api/util"
+	"github.com/goodrain/rainbond/api/util"
 	"net/http"
 	"os"
 	"os/exec"

api/db/db.go

@@ -23,12 +23,12 @@ import (
 	"time"
 
 	"github.com/goodrain/rainbond/cmd/api/option"
-	"github.com/goodrain/rainbond/pkg/db"
-	"github.com/goodrain/rainbond/pkg/db/config"
-	"github.com/goodrain/rainbond/pkg/event"
-	"github.com/goodrain/rainbond/pkg/mq/api/grpc/client"
-	"github.com/goodrain/rainbond/pkg/mq/api/grpc/pb"
-	"github.com/goodrain/rainbond/pkg/worker/discover/model"
+	"github.com/goodrain/rainbond/db"
+	"github.com/goodrain/rainbond/db/config"
+	"github.com/goodrain/rainbond/event"
+	"github.com/goodrain/rainbond/mq/api/grpc/client"
+	"github.com/goodrain/rainbond/mq/api/grpc/pb"
+	"github.com/goodrain/rainbond/worker/discover/model"
 
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"

api/discover/discover.go

@@ -21,9 +21,9 @@ package discover
 import (
 	"sync"
 
-	"github.com/goodrain/rainbond/pkg/api/proxy"
-	corediscover "github.com/goodrain/rainbond/pkg/discover"
-	corediscoverconfig "github.com/goodrain/rainbond/pkg/discover/config"
+	"github.com/goodrain/rainbond/api/proxy"
+	corediscover "github.com/goodrain/rainbond/discover"
+	corediscoverconfig "github.com/goodrain/rainbond/discover/config"
 
 	"github.com/Sirupsen/logrus"
 )

api/handler/EventLogHandler.go

@@ -19,7 +19,7 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
+	api_model "github.com/goodrain/rainbond/api/model"
 )
 
 //EventHandler event handler interface

api/handler/LicenseHandler.go

@@ -18,7 +18,7 @@
 
 package handler
 
-import api_model "github.com/goodrain/rainbond/pkg/api/model"
+import api_model "github.com/goodrain/rainbond/api/model"
 
 //LicenseHandler LicenseAction
 type LicenseHandler interface {

api/handler/LicenseHandler_test.go

@@ -20,7 +20,7 @@ package handler
 
 import (
 	"github.com/goodrain/rainbond/cmd/api/option"
-	"github.com/goodrain/rainbond/pkg/api/db"
+	"github.com/goodrain/rainbond/api/db"
 	"fmt"
 	"testing"
 )

api/handler/PluginHandler.go

@@ -19,9 +19,9 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 )
 
 //PluginHandler plugin handler

api/handler/ServiceHandler.go

@@ -19,11 +19,11 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/builder/exector"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
-	"github.com/goodrain/rainbond/pkg/worker/discover/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/builder/exector"
+	dbmodel "github.com/goodrain/rainbond/db/model"
+	"github.com/goodrain/rainbond/worker/discover/model"
 )
 
 //ServiceHandler service handler

api/handler/TenantHandler.go

@@ -19,9 +19,9 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 )
 
 //TenantHandler tenant handler

api/handler/cloud.go

@@ -35,10 +35,10 @@ import (
 	"github.com/jinzhu/gorm"
 
 	"github.com/goodrain/rainbond/cmd/api/option"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 )
 
 //CloudAction  cloud action struct

api/handler/cloudHandler.go

@@ -19,9 +19,9 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 )
 
 //CloudHandler define source handler

api/handler/defineSources.go

@@ -25,8 +25,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/coreos/etcd/clientv3"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
 	"github.com/pquerna/ffjson/ffjson"
 )
 

api/handler/defineSourcesHandler.go

@@ -19,8 +19,8 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
 )
 
 //SourcesHandler define source handler

api/handler/eventLog.go

@@ -29,9 +29,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/goodrain/rainbond/pkg/util"
+	"github.com/goodrain/rainbond/util"
 
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
+	api_model "github.com/goodrain/rainbond/api/model"
 
 	"github.com/Sirupsen/logrus"
 
@@ -40,7 +40,7 @@ import (
 
 	"os/exec"
 
-	"github.com/goodrain/rainbond/pkg/db"
+	"github.com/goodrain/rainbond/db"
 )
 
 //LogAction  log action struct

api/handler/eventLog_test.go

@@ -20,9 +20,9 @@ package handler
 
 import (
 	"github.com/goodrain/rainbond/cmd/api/option"
-	api_db "github.com/goodrain/rainbond/pkg/api/db"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/db"
+	api_db "github.com/goodrain/rainbond/api/db"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/db"
 	"fmt"
 	"os/exec"
 	"testing"

api/handler/handler.go

@@ -21,13 +21,13 @@ package handler
 import (
 	"time"
 
-	"github.com/goodrain/rainbond/pkg/api/handler/share"
+	"github.com/goodrain/rainbond/api/handler/share"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/coreos/etcd/clientv3"
 	"github.com/goodrain/rainbond/cmd/api/option"
-	api_db "github.com/goodrain/rainbond/pkg/api/db"
-	"github.com/goodrain/rainbond/pkg/appruntimesync/client"
+	api_db "github.com/goodrain/rainbond/api/db"
+	"github.com/goodrain/rainbond/appruntimesync/client"
 )
 
 //InitHandle 初始化handle

api/handler/license.go

@@ -19,9 +19,9 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/jinzhu/gorm"

api/handler/netRules.go

@@ -27,8 +27,8 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/coreos/etcd/clientv3"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
 )
 
 //NetRulesAction  rules action struct

api/handler/netRulesHandler.go

@@ -19,8 +19,8 @@
 package handler
 
 import (
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
 )
 
 //NetRulesHandler net rules handler

api/handler/netRules_test.go

@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
+	api_model "github.com/goodrain/rainbond/api/model"
 
 	"testing"
 )

api/handler/plugin.go

@@ -28,17 +28,17 @@ import (
 
 	"github.com/jinzhu/gorm"
 
-	api_db "github.com/goodrain/rainbond/pkg/api/db"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
-	"github.com/goodrain/rainbond/pkg/event"
-	"github.com/goodrain/rainbond/pkg/mq/api/grpc/pb"
+	api_db "github.com/goodrain/rainbond/api/db"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
+	"github.com/goodrain/rainbond/event"
+	"github.com/goodrain/rainbond/mq/api/grpc/pb"
 
 	"github.com/pquerna/ffjson/ffjson"
 
-	builder_model "github.com/goodrain/rainbond/pkg/builder/model"
+	builder_model "github.com/goodrain/rainbond/builder/model"
 
 	"github.com/Sirupsen/logrus"
 )

api/handler/proxy.go

@@ -20,8 +20,8 @@ package handler
 
 import (
 	"github.com/goodrain/rainbond/cmd/api/option"
-	"github.com/goodrain/rainbond/pkg/api/discover"
-	"github.com/goodrain/rainbond/pkg/api/proxy"
+	"github.com/goodrain/rainbond/api/discover"
+	"github.com/goodrain/rainbond/api/proxy"
 )
 
 var nodeProxy proxy.Proxy

api/handler/publiccloud/chargesverify.go

@@ -28,8 +28,8 @@ import (
 	"github.com/pquerna/ffjson/ffjson"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/db/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/db/model"
 )
 
 //ChargeSverify service Charge Sverify

api/handler/rootFunc.go

@@ -24,7 +24,7 @@ import (
 	"strings"
 
 	"github.com/goodrain/rainbond/cmd/api/option"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
+	api_model "github.com/goodrain/rainbond/api/model"
 
 	"github.com/Sirupsen/logrus"
 )

api/handler/service.go

@@ -26,23 +26,23 @@ import (
 	"time"
 
 	"github.com/coreos/etcd/clientv3"
-	"github.com/goodrain/rainbond/pkg/db"
-	core_model "github.com/goodrain/rainbond/pkg/db/model"
-	"github.com/goodrain/rainbond/pkg/event"
-	"github.com/goodrain/rainbond/pkg/mq/api/grpc/pb"
+	"github.com/goodrain/rainbond/db"
+	core_model "github.com/goodrain/rainbond/db/model"
+	"github.com/goodrain/rainbond/event"
+	"github.com/goodrain/rainbond/mq/api/grpc/pb"
 	"github.com/twinj/uuid"
 
 	"github.com/jinzhu/gorm"
 
 	"github.com/pquerna/ffjson/ffjson"
 
-	api_db "github.com/goodrain/rainbond/pkg/api/db"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/appruntimesync/client"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
-	core_util "github.com/goodrain/rainbond/pkg/util"
-	"github.com/goodrain/rainbond/pkg/worker/discover/model"
+	api_db "github.com/goodrain/rainbond/api/db"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/appruntimesync/client"
+	dbmodel "github.com/goodrain/rainbond/db/model"
+	core_util "github.com/goodrain/rainbond/util"
+	"github.com/goodrain/rainbond/worker/discover/model"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/intstr"

api/handler/serviceCheck.go

@@ -26,11 +26,11 @@ import (
 	"github.com/pquerna/ffjson/ffjson"
 
 	"github.com/Sirupsen/logrus"
-	"github.com/goodrain/rainbond/pkg/builder/exector"
-	api_db "github.com/goodrain/rainbond/pkg/api/db"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	tutil "github.com/goodrain/rainbond/pkg/util"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	"github.com/goodrain/rainbond/builder/exector"
+	api_db "github.com/goodrain/rainbond/api/db"
+	api_model "github.com/goodrain/rainbond/api/model"
+	tutil "github.com/goodrain/rainbond/util"
+	"github.com/goodrain/rainbond/api/util"
 	"github.com/twinj/uuid"
 )
 

api/handler/service_plugin.go

@@ -26,10 +26,10 @@ import (
 	"github.com/jinzhu/gorm"
 
 	"github.com/Sirupsen/logrus"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 	"github.com/pquerna/ffjson/ffjson"
 )
 

api/handler/service_test.go

@@ -23,7 +23,7 @@ import (
 	"strings"
 	"testing"
 
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
+	api_model "github.com/goodrain/rainbond/api/model"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/pquerna/ffjson/ffjson"

api/handler/share/service_share.go

@@ -22,20 +22,20 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/goodrain/rainbond/pkg/builder/exector"
+	"github.com/goodrain/rainbond/builder/exector"
 
 	"github.com/twinj/uuid"
 
 	"github.com/pquerna/ffjson/ffjson"
 
-	"github.com/goodrain/rainbond/pkg/db"
+	"github.com/goodrain/rainbond/db"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/coreos/etcd/clientv3"
-	api_db "github.com/goodrain/rainbond/pkg/api/db"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/mq/api/grpc/pb"
+	api_db "github.com/goodrain/rainbond/api/db"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/mq/api/grpc/pb"
 )
 
 //ServiceShareHandle service share

api/handler/tenant.go

@@ -24,13 +24,13 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/appruntimesync/client"
-	"github.com/goodrain/rainbond/pkg/mq/api/grpc/pb"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/appruntimesync/client"
+	"github.com/goodrain/rainbond/mq/api/grpc/pb"
 
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 
 	"strings"
 

api/handler/tokenIden.go

@@ -24,10 +24,10 @@ import (
 	"time"
 
 	"github.com/goodrain/rainbond/cmd/api/option"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 )
 
 //TokenIdenAction  TokenIdenAction

api/handler/tokenIdenHandler.go

@@ -22,10 +22,10 @@ import (
 	"os"
 
 	"github.com/goodrain/rainbond/cmd/api/option"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	"github.com/goodrain/rainbond/pkg/db"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	"github.com/goodrain/rainbond/db"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 )
 
 //TokenMapHandler DefaultTokenMapHandler

api/middleware/mideware.go

@@ -23,14 +23,14 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
+	"github.com/goodrain/rainbond/api/handler"
 
 	"github.com/jinzhu/gorm"
 
-	"github.com/goodrain/rainbond/pkg/db"
-	"github.com/goodrain/rainbond/pkg/event"
+	"github.com/goodrain/rainbond/db"
+	"github.com/goodrain/rainbond/event"
 
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	httputil "github.com/goodrain/rainbond/util/http"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/go-chi/chi"

api/middleware/token.go

@@ -26,8 +26,8 @@ import (
 	"os"
 	"strings"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	"github.com/goodrain/rainbond/api/handler"
+	"github.com/goodrain/rainbond/api/util"
 
 	"github.com/Sirupsen/logrus"
 )

api/model/model.go

@@ -22,7 +22,7 @@ import (
 	"net/url"
 	"time"
 
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
+	dbmodel "github.com/goodrain/rainbond/db/model"
 )
 
 //ServiceGetCommon path参数

api/region/cloudAuth.go

@@ -24,8 +24,8 @@ import (
 	"github.com/pquerna/ffjson/ffjson"
 
 	"github.com/Sirupsen/logrus"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
 )
 
 //DefineCloudAuth DefineCloudAuth

api/region/defineSources.go

@@ -24,7 +24,7 @@ import (
 	"github.com/pquerna/ffjson/ffjson"
 
 	"github.com/Sirupsen/logrus"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
+	api_model "github.com/goodrain/rainbond/api/model"
 )
 
 //DefineSources DefineSources

api/region/node.go

@@ -27,13 +27,13 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/bitly/go-simplejson"
-	"github.com/goodrain/rainbond/pkg/node/api/model"
+	"github.com/goodrain/rainbond/node/api/model"
 	"github.com/pquerna/ffjson/ffjson"
-	//"github.com/goodrain/rainbond/pkg/grctl/cmd"
+	//"github.com/goodrain/rainbond/grctl/cmd"
 	"errors"
 
-	"github.com/goodrain/rainbond/pkg/api/util"
-	utilhttp "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/util"
+	utilhttp "github.com/goodrain/rainbond/util/http"
 )
 
 var nodeclient *RNodeClient

api/region/region.go

@@ -28,11 +28,11 @@ import (
 
 	"github.com/Sirupsen/logrus"
 	"github.com/bitly/go-simplejson"
-	"github.com/goodrain/rainbond/pkg/api/model"
-	api_model "github.com/goodrain/rainbond/pkg/api/model"
-	"github.com/goodrain/rainbond/pkg/api/util"
-	dbmodel "github.com/goodrain/rainbond/pkg/db/model"
-	utilhttp "github.com/goodrain/rainbond/pkg/util/http"
+	"github.com/goodrain/rainbond/api/model"
+	api_model "github.com/goodrain/rainbond/api/model"
+	"github.com/goodrain/rainbond/api/util"
+	dbmodel "github.com/goodrain/rainbond/db/model"
+	utilhttp "github.com/goodrain/rainbond/util/http"
 	"github.com/pquerna/ffjson/ffjson"
 )
 

api/server/api.go

@@ -25,22 +25,22 @@ import (
 	"os"
 	"time"
 
-	"github.com/goodrain/rainbond/pkg/api/handler"
+	"github.com/goodrain/rainbond/api/handler"
 
-	"github.com/goodrain/rainbond/pkg/util"
+	"github.com/goodrain/rainbond/util"
 
 	"github.com/coreos/etcd/client"
 	"github.com/goodrain/rainbond/cmd/api/option"
 
-	"github.com/goodrain/rainbond/pkg/api/apiRouters/doc"
-	"github.com/goodrain/rainbond/pkg/api/apiRouters/license"
-	"github.com/goodrain/rainbond/pkg/api/proxy"
+	"github.com/goodrain/rainbond/api/apiRouters/doc"
+	"github.com/goodrain/rainbond/api/apiRouters/license"
+	"github.com/goodrain/rainbond/api/proxy"
 
-	"github.com/goodrain/rainbond/pkg/api/apiRouters/cloud"
-	"github.com/goodrain/rainbond/pkg/api/apiRouters/version2"
-	"github.com/goodrain/rainbond/pkg/api/apiRouters/websocket"
+	"github.com/goodrain/rainbond/api/apiRouters/cloud"
+	"github.com/goodrain/rainbond/api/apiRouters/version2"
+	"github.com/goodrain/rainbond/api/apiRouters/websocket"
 
-	apimiddleware "github.com/goodrain/rainbond/pkg/api/middleware"
+	apimiddleware "github.com/goodrain/rainbond/api/middleware"
 
 	"github.com/Sirupsen/logrus"
 	"github.com/go-chi/chi"

api/util/handleError.go

@@ -19,7 +19,7 @@
 package util
 
 import (
-	httputil "github.com/goodrain/rainbond/pkg/util/http"
+	httputil "github.com/goodrain/rainbond/util/http"
 	"fmt"
 	"net/http"
 	"strings"

appruntimesync/appruntimesync.go

@@ -24,15 +24,15 @@ import (
 	"net"
 	"sync"
 
-	"github.com/goodrain/rainbond/pkg/util"
+	"github.com/goodrain/rainbond/util"
 
 	"github.com/Sirupsen/logrus"
 	client "github.com/coreos/etcd/clientv3"
 	"github.com/goodrain/rainbond/cmd/worker/option"
-	"github.com/goodrain/rainbond/pkg/appruntimesync/pb"
-	"github.com/goodrain/rainbond/pkg/appruntimesync/server"
-	discover "github.com/goodrain/rainbond/pkg/discover.v2"
-	"github.com/goodrain/rainbond/pkg/util/etcd/etcdlock"
+	"github.com/goodrain/rainbond/appruntimesync/pb"
+	"github.com/goodrain/rainbond/appruntimesync/server"
+	discover "github.com/goodrain/rainbond/discover.v2"
+	"github.com/goodrain/rainbond/util/etcd/etcdlock"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/reflection"
 )

appruntimesync/appruntimesync_test.go

@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/goodrain/rainbond/pkg/appruntimesync/client"
+	"github.com/goodrain/rainbond/appruntimesync/client"
 
 	"github.com/goodrain/rainbond/cmd/worker/option"
 )

appruntimesync/client/client.go

@@ -41,12 +41,12 @@ import (
 
 	etcdnaming "github.com/coreos/etcd/clientv3/naming"
 
-	"github.com/goodrain/rainbond/pkg/appruntimesync/pb"
+	"github.com/goodrain/rainbond/appruntimesync/pb"
 
 	"github.com/Sirupsen/logrus"
 
-	"github.com/goodrain/rainbond/pkg/discover"
-	"github.com/goodrain/rainbond/pkg/discover/config"
+	"github.com/goodrain/rainbond/discover"
+	"github.com/goodrain/rainbond/discover/config"
 	"google.golang.org/grpc"
 )