rename ngin to rest

.golangci.yml

@@ -9,7 +9,7 @@ run:
     - example
     - kmq
     - kq
-    - ngin
+    - rest
     - rq
     - rpcx
     #    - service

core/discov/subscriber_test.go

@@ -184,6 +184,7 @@ func TestContainer(t *testing.T) {
 						})
 					}
 				}
+
 				assert.True(t, c.dirty.True())
 				assert.ElementsMatch(t, test.expect, c.getValues())
 				assert.False(t, c.dirty.True())

example/graceful/dns/api/config/config.go

@@ -1,11 +1,11 @@
 package config
 
 import (
-	"zero/ngin"
+	"zero/rest"
 	"zero/rpcx"
 )
 
 type Config struct {
-	ngin.NgConf
+	rest.RtConf
 	Rpc rpcx.RpcClientConf
 }

example/graceful/dns/api/graceful.go

@@ -7,7 +7,7 @@ import (
 	"zero/example/graceful/dns/api/config"
 	"zero/example/graceful/dns/api/handler"
 	"zero/example/graceful/dns/api/svc"
-	"zero/ngin"
+	"zero/rest"
 	"zero/rpcx"
 )
 
@@ -24,7 +24,7 @@ func main() {
 		Client: client,
 	}
 
-	engine := ngin.MustNewEngine(c.NgConf)
+	engine := rest.MustNewEngine(c.RtConf)
 	defer engine.Stop()
 
 	handler.RegisterHandlers(engine, ctx)

example/graceful/dns/api/handler/gracefulhandler.go

@@ -12,7 +12,7 @@ import (
 	"zero/example/graceful/dns/api/svc"
 	"zero/example/graceful/dns/api/types"
 	"zero/example/graceful/dns/rpc/graceful"
-	"zero/ngin/httpx"
+	"zero/rest/httpx"
 )
 
 func gracefulHandler(ctx *svc.ServiceContext) http.HandlerFunc {

example/graceful/dns/api/handler/routes.go

@@ -5,11 +5,11 @@ import (
 	"net/http"
 
 	"zero/example/graceful/dns/api/svc"
-	"zero/ngin"
+	"zero/rest"
 )
 
-func RegisterHandlers(engine *ngin.Engine, ctx *svc.ServiceContext) {
-	engine.AddRoutes([]ngin.Route{
+func RegisterHandlers(engine *rest.Engine, ctx *svc.ServiceContext) {
+	engine.AddRoutes([]rest.Route{
 		{
 			Method:  http.MethodGet,
 			Path:    "/api/graceful",

example/graceful/etcd/api/config/config.go

@@ -1,11 +1,11 @@
 package config
 
 import (
-	"zero/ngin"
+	"zero/rest"
 	"zero/rpcx"
 )
 
 type Config struct {
-	ngin.NgConf
+	rest.RtConf
 	Rpc rpcx.RpcClientConf
 }

example/graceful/etcd/api/graceful.go

@@ -7,7 +7,7 @@ import (
 	"zero/example/graceful/etcd/api/config"
 	"zero/example/graceful/etcd/api/handler"
 	"zero/example/graceful/etcd/api/svc"
-	"zero/ngin"
+	"zero/rest"
 	"zero/rpcx"
 )
 
@@ -24,7 +24,7 @@ func main() {
 		Client: client,
 	}
 
-	engine := ngin.MustNewEngine(c.NgConf)
+	engine := rest.MustNewEngine(c.RtConf)
 	defer engine.Stop()
 
 	handler.RegisterHandlers(engine, ctx)

example/graceful/etcd/api/handler/gracefulhandler.go

@@ -12,7 +12,7 @@ import (
 	"zero/example/graceful/etcd/api/svc"
 	"zero/example/graceful/etcd/api/types"
 	"zero/example/graceful/etcd/rpc/graceful"
-	"zero/ngin/httpx"
+	"zero/rest/httpx"
 )
 
 func gracefulHandler(ctx *svc.ServiceContext) http.HandlerFunc {

example/graceful/etcd/api/handler/routes.go

@@ -5,11 +5,11 @@ import (
 	"net/http"
 
 	"zero/example/graceful/etcd/api/svc"
-	"zero/ngin"
+	"zero/rest"
 )
 
-func RegisterHandlers(engine *ngin.Engine, ctx *svc.ServiceContext) {
-	engine.AddRoutes([]ngin.Route{
+func RegisterHandlers(engine *rest.Engine, ctx *svc.ServiceContext) {
+	engine.AddRoutes([]rest.Route{
 		{
 			Method:  http.MethodGet,
 			Path:    "/api/graceful",

example/http/breaker/server.go

@@ -9,13 +9,13 @@ import (
 	"zero/core/service"
 	"zero/core/stat"
 	"zero/core/syncx"
-	"zero/ngin"
+	"zero/rest"
 )
 
 func main() {
 	logx.Disable()
 	stat.SetReporter(nil)
-	server := ngin.MustNewEngine(ngin.NgConf{
+	server := rest.MustNewEngine(rest.RtConf{
 		ServiceConf: service.ServiceConf{
 			Name: "breaker",
 			Log: logx.LogConf{
@@ -28,7 +28,7 @@ func main() {
 		Timeout:  3000,
 	})
 	latch := syncx.NewLimit(10)
-	server.AddRoute(ngin.Route{
+	server.AddRoute(rest.Route{
 		Method: http.MethodGet,
 		Path:   "/heavy",
 		Handler: func(w http.ResponseWriter, r *http.Request) {
@@ -47,7 +47,7 @@ func main() {
 			}
 		},
 	})
-	server.AddRoute(ngin.Route{
+	server.AddRoute(rest.Route{
 		Method: http.MethodGet,
 		Path:   "/good",
 		Handler: func(w http.ResponseWriter, r *http.Request) {

example/http/demo/main.go

@@ -6,8 +6,8 @@ import (
 
 	"zero/core/logx"
 	"zero/core/service"
-	"zero/ngin"
-	"zero/ngin/httpx"
+	"zero/rest"
+	"zero/rest/httpx"
 )
 
 var (
@@ -47,7 +47,7 @@ func handle(w http.ResponseWriter, r *http.Request) {
 func main() {
 	flag.Parse()
 
-	engine := ngin.MustNewEngine(ngin.NgConf{
+	engine := rest.MustNewEngine(rest.RtConf{
 		ServiceConf: service.ServiceConf{
 			Log: logx.LogConf{
 				Mode: "console",
@@ -61,7 +61,7 @@ func main() {
 
 	engine.Use(first)
 	engine.Use(second)
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodGet,
 		Path:    "/",
 		Handler: handle,

example/http/post/main.go

@@ -7,8 +7,8 @@ import (
 
 	"zero/core/logx"
 	"zero/core/service"
-	"zero/ngin"
-	"zero/ngin/httpx"
+	"zero/rest"
+	"zero/rest/httpx"
 )
 
 var (
@@ -37,7 +37,7 @@ func handlePost(w http.ResponseWriter, r *http.Request) {
 func main() {
 	flag.Parse()
 
-	engine := ngin.MustNewEngine(ngin.NgConf{
+	engine := rest.MustNewEngine(rest.RtConf{
 		ServiceConf: service.ServiceConf{
 			Log: logx.LogConf{
 				Mode: "console",
@@ -51,12 +51,12 @@ func main() {
 	})
 	defer engine.Stop()
 
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodGet,
 		Path:    "/",
 		Handler: handleGet,
 	})
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodPost,
 		Path:    "/",
 		Handler: handlePost,

example/http/shedding/main.go

@@ -8,8 +8,8 @@ import (
 
 	"zero/core/logx"
 	"zero/core/service"
-	"zero/ngin"
-	"zero/ngin/httpx"
+	"zero/rest"
+	"zero/rest/httpx"
 )
 
 var (
@@ -42,7 +42,7 @@ func main() {
 	flag.Parse()
 
 	logx.Disable()
-	engine := ngin.MustNewEngine(ngin.NgConf{
+	engine := rest.MustNewEngine(rest.RtConf{
 		ServiceConf: service.ServiceConf{
 			Log: logx.LogConf{
 				Mode: "console",
@@ -54,7 +54,7 @@ func main() {
 	})
 	defer engine.Stop()
 
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodGet,
 		Path:    "/",
 		Handler: handle,

example/http/signature/server/server.go

@@ -7,8 +7,8 @@ import (
 
 	"zero/core/logx"
 	"zero/core/service"
-	"zero/ngin"
-	"zero/ngin/httpx"
+	"zero/rest"
+	"zero/rest/httpx"
 )
 
 var keyPem = flag.String("prikey", "private.pem", "the private key file")
@@ -31,16 +31,16 @@ func handle(w http.ResponseWriter, r *http.Request) {
 func main() {
 	flag.Parse()
 
-	engine := ngin.MustNewEngine(ngin.NgConf{
+	engine := rest.MustNewEngine(rest.RtConf{
 		ServiceConf: service.ServiceConf{
 			Log: logx.LogConf{
 				Path: "logs",
 			},
 		},
 		Port: 3333,
-		Signature: ngin.SignatureConf{
+		Signature: rest.SignatureConf{
 			Strict: true,
-			PrivateKeys: []ngin.PrivateKeyConf{
+			PrivateKeys: []rest.PrivateKeyConf{
 				{
 					Fingerprint: "bvw8YlnSqb+PoMf3MBbLdQ==",
 					KeyFile:     *keyPem,
@@ -50,7 +50,7 @@ func main() {
 	})
 	defer engine.Stop()
 
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodPost,
 		Path:    "/a/b",
 		Handler: handle,

example/jwt/user/user.go

@@ -9,8 +9,8 @@ import (
 	"time"
 
 	"zero/core/conf"
-	"zero/ngin"
-	"zero/ngin/httpx"
+	"zero/rest"
+	"zero/rest/httpx"
 
 	"github.com/dgrijalva/jwt-go"
 	"github.com/dgrijalva/jwt-go/request"
@@ -20,7 +20,7 @@ const jwtUserField = "user"
 
 type (
 	Config struct {
-		ngin.NgConf
+		rest.RtConf
 		AccessSecret  string
 		AccessExpire  int64 `json:",default=1209600"` // 2 weeks
 		RefreshSecret string
@@ -79,27 +79,27 @@ func main() {
 	var c Config
 	conf.MustLoad("user.json", &c)
 
-	engine, err := ngin.NewEngine(c.NgConf)
+	engine, err := rest.NewEngine(c.RtConf)
 	if err != nil {
 		log.Fatal(err)
 	}
 	defer engine.Stop()
 
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodPost,
 		Path:    "/login",
 		Handler: LoginHandler(c),
 	})
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodGet,
 		Path:    "/resource",
 		Handler: ProtectedHandler,
-	}, ngin.WithJwt(c.AccessSecret))
-	engine.AddRoute(ngin.Route{
+	}, rest.WithJwt(c.AccessSecret))
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodPost,
 		Path:    "/refresh",
 		Handler: RefreshHandler(c),
-	}, ngin.WithJwt(c.RefreshSecret))
+	}, rest.WithJwt(c.RefreshSecret))
 
 	fmt.Println("Now listening...")
 	engine.Start()

example/load/simulate/server/server.go

@@ -10,7 +10,7 @@ import (
 	"zero/core/logx"
 	"zero/core/service"
 	"zero/core/stat"
-	"zero/ngin"
+	"zero/rest"
 )
 
 const duration = time.Millisecond
@@ -25,7 +25,7 @@ func main() {
 	}()
 
 	logx.Disable()
-	engine := ngin.MustNewEngine(ngin.NgConf{
+	engine := rest.MustNewEngine(rest.RtConf{
 		ServiceConf: service.ServiceConf{
 			Log: logx.LogConf{
 				Mode: "console",
@@ -36,7 +36,7 @@ func main() {
 		CpuThreshold: 800,
 	})
 	defer engine.Stop()
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method: http.MethodGet,
 		Path:   "/",
 		Handler: func(w http.ResponseWriter, r *http.Request) {

example/tracing/edge/main.go

@@ -9,8 +9,8 @@ import (
 	"zero/core/logx"
 	"zero/core/service"
 	"zero/example/tracing/remote/portal"
-	"zero/ngin"
-	"zero/ngin/httpx"
+	"zero/rest"
+	"zero/rest/httpx"
 	"zero/rpcx"
 )
 
@@ -42,7 +42,7 @@ func main() {
 	var c rpcx.RpcClientConf
 	conf.MustLoad(*configFile, &c)
 	client = rpcx.MustNewClient(c)
-	engine := ngin.MustNewEngine(ngin.NgConf{
+	engine := rest.MustNewEngine(rest.RtConf{
 		ServiceConf: service.ServiceConf{
 			Log: logx.LogConf{
 				Mode: "console",
@@ -52,7 +52,7 @@ func main() {
 	})
 	defer engine.Stop()
 
-	engine.AddRoute(ngin.Route{
+	engine.AddRoute(rest.Route{
 		Method:  http.MethodGet,
 		Path:    "/",
 		Handler: handle,

ngin/config.go → rest/config.go

@@ -1,4 +1,4 @@
-package ngin
+package rest
 
 import (
 	"time"
@@ -18,7 +18,13 @@ type (
 		PrivateKeys []PrivateKeyConf
 	}
 
-	NgConf struct {
+	// why not name it as Conf, because we need to consider usage like:
+	// type Config struct {
+	//     rpcx.RpcConf
+	//     rest.RtConf
+	// }
+	// if with the name Conf, there will be two Conf inside Config.
+	RtConf struct {
 		service.ServiceConf
 		Host     string `json:",default=0.0.0.0"`
 		Port     int

ngin/handler/authhandler.go → rest/handler/authhandler.go

@@ -7,7 +7,7 @@ import (
 	"net/http/httputil"
 
 	"zero/core/logx"
-	"zero/ngin/internal"
+	"zero/rest/internal"
 
 	"github.com/dgrijalva/jwt-go"
 )

ngin/handler/breakerhandler.go → rest/handler/breakerhandler.go

@@ -8,8 +8,8 @@ import (
 	"zero/core/breaker"
 	"zero/core/logx"
 	"zero/core/stat"
-	"zero/ngin/internal"
-	"zero/ngin/internal/security"
+	"zero/rest/internal"
+	"zero/rest/internal/security"
 )
 
 const breakerSeparator = "://"

ngin/handler/contentsecurityhandler.go → rest/handler/contentsecurityhandler.go

@@ -6,8 +6,8 @@ import (
 
 	"zero/core/codec"
 	"zero/core/logx"
-	"zero/ngin/httpx"
-	"zero/ngin/internal/security"
+	"zero/rest/httpx"
+	"zero/rest/internal/security"
 )
 
 const contentSecurity = "X-Content-Security"

ngin/handler/contentsecurityhandler_test.go → rest/handler/contentsecurityhandler_test.go

@@ -18,7 +18,7 @@ import (
 	"time"
 
 	"zero/core/codec"
-	"zero/ngin/httpx"
+	"zero/rest/httpx"
 
 	"github.com/stretchr/testify/assert"
 )

ngin/handler/gunziphandler.go → rest/handler/gunziphandler.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"zero/ngin/httpx"
+	"zero/rest/httpx"
 )
 
 const gzipEncoding = "gzip"

ngin/handler/gunziphandler_test.go → rest/handler/gunziphandler_test.go

@@ -10,7 +10,7 @@ import (
 	"testing"
 
 	"zero/core/codec"
-	"zero/ngin/httpx"
+	"zero/rest/httpx"
 
 	"github.com/stretchr/testify/assert"
 )

ngin/handler/loghandler.go → rest/handler/loghandler.go

@@ -13,7 +13,7 @@ import (
 	"zero/core/logx"
 	"zero/core/timex"
 	"zero/core/utils"
-	"zero/ngin/internal"
+	"zero/rest/internal"
 )
 
 const slowThreshold = time.Millisecond * 500

ngin/handler/loghandler_test.go → rest/handler/loghandler_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"zero/ngin/internal"
+	"zero/rest/internal"
 
 	"github.com/stretchr/testify/assert"
 )

ngin/handler/maxbyteshandler.go → rest/handler/maxbyteshandler.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"net/http"
 
-	"zero/ngin/internal"
+	"zero/rest/internal"
 )
 
 func MaxBytesHandler(n int64) func(http.Handler) http.Handler {

ngin/handler/maxconnshandler.go → rest/handler/maxconnshandler.go

@@ -5,7 +5,7 @@ import (
 
 	"zero/core/logx"
 	"zero/core/syncx"
-	"zero/ngin/internal"
+	"zero/rest/internal"
 )
 
 func MaxConns(n int) func(http.Handler) http.Handler {

ngin/handler/prommetrichandler.go → rest/handler/prommetrichandler.go

@@ -7,7 +7,7 @@ import (
 
 	"zero/core/metric"
 	"zero/core/timex"
-	"zero/ngin/internal/security"
+	"zero/rest/internal/security"
 )
 
 const serverNamespace = "http_server"

ngin/handler/recoverhandler.go → rest/handler/recoverhandler.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"runtime/debug"
 
-	"zero/ngin/internal"
+	"zero/rest/internal"
 )
 
 func RecoverHandler(next http.Handler) http.Handler {

ngin/handler/sheddinghandler.go → rest/handler/sheddinghandler.go

@@ -7,8 +7,8 @@ import (
 	"zero/core/load"
 	"zero/core/logx"
 	"zero/core/stat"
-	"zero/ngin/internal"
-	"zero/ngin/internal/security"
+	"zero/rest/internal"
+	"zero/rest/internal/security"
 )
 
 const serviceType = "api"

ngin/httpx/requests.go → rest/httpx/requests.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"zero/core/mapping"
-	"zero/ngin/internal/context"
+	"zero/rest/internal/context"
 )
 
 const (

ngin/httpx/requests_test.go → rest/httpx/requests_test.go

@@ -10,7 +10,7 @@ import (
 	"strings"
 	"testing"
 
-	"zero/ngin/internal/router"
+	"zero/rest/internal/router"
 
 	"github.com/stretchr/testify/assert"
 )

ngin/internal/router/patrouter.go → rest/internal/router/patrouter.go

@@ -6,7 +6,7 @@ import (
 	"strings"
 
 	"zero/core/search"
-	"zero/ngin/internal/context"
+	"zero/rest/internal/context"
 )
 
 const (

ngin/internal/router/patrouter_test.go → rest/internal/router/patrouter_test.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"zero/ngin/internal/context"
+	"zero/rest/internal/context"
 )
 
 type mockedResponseWriter struct {

ngin/internal/security/contentsecurity.go → rest/internal/security/contentsecurity.go

@@ -15,7 +15,7 @@ import (
 	"zero/core/codec"
 	"zero/core/iox"
 	"zero/core/logx"
-	"zero/ngin/httpx"
+	"zero/rest/httpx"
 )
 
 const (

ngin/ngin.go → rest/ngin.go

@@ -1,12 +1,12 @@
-package ngin
+package rest
 
 import (
 	"log"
 	"net/http"
 
 	"zero/core/logx"
-	"zero/ngin/handler"
-	"zero/ngin/internal/router"
+	"zero/rest/handler"
+	"zero/rest/internal/router"
 )
 
 type (
@@ -22,7 +22,7 @@ type (
 	}
 )
 
-func MustNewEngine(c NgConf, opts ...RunOption) *Engine {
+func MustNewEngine(c RtConf, opts ...RunOption) *Engine {
 	engine, err := NewEngine(c, opts...)
 	if err != nil {
 		log.Fatal(err)
@@ -31,7 +31,7 @@ func MustNewEngine(c NgConf, opts ...RunOption) *Engine {
 	return engine
 }
 
-func NewEngine(c NgConf, opts ...RunOption) (*Engine, error) {
+func NewEngine(c RtConf, opts ...RunOption) (*Engine, error) {
 	if err := c.SetUp(); err != nil {
 		return nil, err
 	}

ngin/ngin_test.go → rest/ngin_test.go

@@ -1,4 +1,4 @@
-package ngin
+package rest
 
 import (
 	"fmt"
@@ -7,8 +7,8 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	"zero/ngin/httpx"
-	router2 "zero/ngin/internal/router"
+	"zero/rest/httpx"
+	router2 "zero/rest/internal/router"
 
 	"github.com/stretchr/testify/assert"
 )

ngin/server.go → rest/server.go

@@ -1,4 +1,4 @@
-package ngin
+package rest
 
 import (
 	"errors"
@@ -9,9 +9,9 @@ import (
 	"zero/core/codec"
 	"zero/core/load"
 	"zero/core/stat"
-	"zero/ngin/handler"
-	"zero/ngin/internal"
-	"zero/ngin/internal/router"
+	"zero/rest/handler"
+	"zero/rest/internal"
+	"zero/rest/internal/router"
 
 	"github.com/justinas/alice"
 )
@@ -25,7 +25,7 @@ type (
 	Middleware func(next http.HandlerFunc) http.HandlerFunc
 
 	server struct {
-		conf                 NgConf
+		conf                 RtConf
 		routes               []featuredRoutes
 		unauthorizedCallback handler.UnauthorizedCallback
 		unsignedCallback     handler.UnsignedCallback
@@ -35,7 +35,7 @@ type (
 	}
 )
 
-func newServer(c NgConf) *server {
+func newServer(c RtConf) *server {
 	srv := &server{
 		conf: c,
 	}

ngin/types.go → rest/types.go

@@ -1,4 +1,4 @@
-package ngin
+package rest
 
 import "net/http"
 

tools/goctl/api/demo/config/config.go

@@ -1,7 +1,7 @@
 package config
 
-import "zero/ngin"
+import "zero/rest"
 
 type Config struct {
-	ngin.NgConf
+	rest.RtConf
 }

tools/goctl/api/demo/demo.go

@@ -4,7 +4,7 @@ import (
 	"flag"
 
 	"zero/core/conf"
-	"zero/ngin"
+	"zero/rest"
 	"zero/tools/goctl/api/demo/config"
 	"zero/tools/goctl/api/demo/handler"
 )
@@ -17,7 +17,7 @@ func main() {
 	var c config.Config
 	conf.MustLoad(*configFile, &c)
 
-	engine := ngin.MustNewEngine(c.NgConf)
+	engine := rest.MustNewEngine(c.RtConf)
 	defer engine.Stop()
 
 	handler.RegisterHandlers(engine)

tools/goctl/api/demo/handler/getuserhandler.go

@@ -3,7 +3,7 @@ package handler
 import (
 	"net/http"
 
-	"zero/ngin/httpx"
+	"zero/rest/httpx"
 )
 
 type (

tools/goctl/api/demo/handler/handlers.go

@@ -3,11 +3,11 @@ package handler
 import (
 	"net/http"
 
-	"zero/ngin"
+	"zero/rest"
 )
 
-func RegisterHandlers(engine *ngin.Engine) {
-	engine.AddRoutes([]ngin.Route{
+func RegisterHandlers(engine *rest.Engine) {
+	engine.AddRoutes([]rest.Route{
 		{
 			Method:  http.MethodGet,
 			Path:    "/",

tools/goctl/api/gogen/genconfig.go

@@ -13,12 +13,12 @@ const (
 	configTemplate = `package config
 
 import (
-	"zero/ngin"
+	"zero/rest"
 	{{.authImport}}
 )
 
 type Config struct {
-	ngin.NgConf
+	rest.RtConf
 }
 `
 )

tools/goctl/api/gogen/genmain.go

@@ -30,7 +30,7 @@ func main() {
 
 	ctx := svc.NewServiceContext(c)
 
-	engine := ngin.MustNewEngine(c.NgConf)
+	engine := rest.MustNewEngine(c.RtConf)
 	defer engine.Stop()
 
 	handler.RegisterHandlers(engine, ctx)
@@ -75,7 +75,7 @@ func genMain(dir string, api *spec.ApiSpec) error {
 func genMainImports(parentPkg string) string {
 	imports := []string{
 		`"zero/core/conf"`,
-		`"zero/ngin"`,
+		`"zero/rest"`,
 	}
 	imports = append(imports, fmt.Sprintf("\"%s\"", path.Join(parentPkg, configDir)))
 	imports = append(imports, fmt.Sprintf("\"%s\"", path.Join(parentPkg, handlerDir)))

tools/goctl/api/gogen/genroutes.go

@@ -26,12 +26,12 @@ import (
 	{{.importPackages}}
 )
 
-func RegisterHandlers(engine *ngin.Engine, serverCtx *svc.ServiceContext) {
+func RegisterHandlers(engine *rest.Engine, serverCtx *svc.ServiceContext) {
 	{{.routesAdditions}}
 }
 `
 	routesAdditionTemplate = `
-	engine.AddRoutes([]ngin.Route{
+	engine.AddRoutes([]rest.Route{
 		{{.routes}}
 	}{{.jwt}}{{.signature}})
 `
@@ -80,11 +80,11 @@ func genRoutes(dir string, api *spec.ApiSpec) error {
 		}
 		jwt := ""
 		if g.jwtEnabled {
-			jwt = fmt.Sprintf(", ngin.WithJwt(serverCtx.Config.%s.AccessSecret)", g.authName)
+			jwt = fmt.Sprintf(", rest.WithJwt(serverCtx.Config.%s.AccessSecret)", g.authName)
 		}
 		signature := ""
 		if g.signatureEnabled {
-			signature = fmt.Sprintf(", ngin.WithSignature(serverCtx.Config.%s.Signature)", g.authName)
+			signature = fmt.Sprintf(", rest.WithSignature(serverCtx.Config.%s.Signature)", g.authName)
 		}
 		if err := gt.Execute(&builder, map[string]string{
 			"routes":    strings.TrimSpace(gbuilder.String()),
@@ -130,7 +130,7 @@ func genRoutes(dir string, api *spec.ApiSpec) error {
 
 func genRouteImports(parentPkg string, api *spec.ApiSpec) string {
 	var importSet = collection.NewSet()
-	importSet.AddStr(`"zero/ngin"`)
+	importSet.AddStr(`"zero/rest"`)
 	importSet.AddStr(fmt.Sprintf("\"%s\"", path.Join(parentPkg, contextDir)))
 	for _, group := range api.Service.Groups {
 		for _, route := range group.Routes {