diff --git a/src/config/conf.go b/src/config/conf.go index 851ebe09fd5b65f98eddf9ce784b937f9a66a8fe..5283783128fd8ea4ec7616684a54553c5d43cbaf 100644 --- a/src/config/conf.go +++ b/src/config/conf.go @@ -3,6 +3,7 @@ package config var ( RedisURL string RedisTag string + MeshId string Prefix string Url string RedisUrl string diff --git a/src/main.go b/src/main.go index f106ce6064800a56d83f86576d248c18fc1921e3..8d0a87de8df613cf513feb65fda0be832e52c69a 100644 --- a/src/main.go +++ b/src/main.go @@ -18,6 +18,7 @@ import ( var ( argPort = pflag.Int("port", 8011, "") argPrefix = pflag.String("prefix", "/bgmesh/fiddler", "") + meshId = pflag.String("meshId", "", "") redisUrl = pflag.String("redisUrl", "redis://apaas-redis.apaas-v3:6379", "") redisTag = pflag.String("redisTag", "apaas-mesh-proxy", "") confPath = pflag.String("confPath", "/app/config/proxy.json", "") @@ -53,6 +54,7 @@ func initEnv() { func initConfig() { config.RedisTag = *redisTag config.RedisURL = *redisUrl + config.MeshId = *meshId config.Prefix = *argPrefix config.DriverName = *dbDriverName config.DbURL = *dbURL diff --git a/src/router/router.go b/src/router/router.go index 16ddbdbe56a334d29e063157910f58c5712a74ae..d2780bb981963e99ab60e7f12013ef0897a2cf79 100644 --- a/src/router/router.go +++ b/src/router/router.go @@ -15,6 +15,7 @@ package router import ( + "fmt" "github.com/gin-gonic/gin" "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/handler" @@ -29,10 +30,10 @@ func Load(middleware ...gin.HandlerFunc) http.Handler { e.Use(header.Options) e.Use(header.Secure) e.Use(middleware...) - root := e.Group(config.Prefix) + root := e.Group(fmt.Sprintf("%s/%s", config.Prefix, config.MeshId)) { - root.Any("/:svcId/:applyId", handler.Proxy) - root.GET("/:svcId/:applyId/health", handler.Proxy) + root.Any("/:applyId", handler.Proxy) + root.GET("/:applyId/health", handler.Proxy) } return e }