diff --git a/.beagle.yml b/.beagle.yml index 30b4a3e00529de08131973b3038e564d929d2378..4118ff3e6083d4e00cf47116c2a74d25125cd0f9 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -42,15 +42,15 @@ pipeline: target: REGISTRY_PASSWORD when: branch: [master] - # deploy: - # image: registry-vpc.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0 - # namespace: apaas - # deployment: apaas-meshproxy - # container: apaas-meshproxy - # registry: hub.wodcloud.com - # secrets: - # - source: KUBERNETES_SERVER - # target: KUBERNETES_SERVER - # - source: KUBERNETES_TOKEN - # target: KUBERNETES_TOKEN + deploy: + image: registry-vpc.cn-qingdao.aliyuncs.com/wod-devops/kubernetes:1.0 + namespace: cig + deployment: apaas-meshproxy + container: apaas-meshproxy + registry: hub.wodcloud.com + secrets: + - source: KUBERNETES_SERVER + target: KUBERNETES_SERVER + - source: KUBERNETES_TOKEN + target: KUBERNETES_TOKEN diff --git a/.gitignore b/.gitignore index 75e554d46b68a89fa77c4b315d6c841d8c4db275..27a3bb014738de828c778e3666fabf8a11ef6ec6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .vscode .idea/ -vendor \ No newline at end of file +vendor +__debug_bin \ No newline at end of file diff --git a/src/main.go b/src/main.go index 933c6dcb4d03821034ae025bf43ebd465fa6b91f..f2a2df5a75417a664af62984e688239972b3689e 100644 --- a/src/main.go +++ b/src/main.go @@ -13,9 +13,10 @@ import ( ) var ( - argPort = pflag.Int("port", 8088, "") - redisUrl = pflag.String("redisUrl", "redis://redis:16379", "") - redisTag = pflag.String("redisTag", "apaas-mesh-proxy", "") + argPort = pflag.Int("port", 8088, "") + argPrefix = pflag.String("prefix", "/vuemap", "") + redisUrl = pflag.String("redisUrl", "redis://redis:16379", "") + redisTag = pflag.String("redisTag", "apaas-mesh-proxy", "") ) func main() { @@ -24,8 +25,8 @@ func main() { initConfig() proxyhandler, _ := handler.CreateProxyHandler() counthandler, _ := handler.CreateCountHandler() - http.Handle("/count", counthandler) - http.Handle("/", proxyhandler) + http.Handle(fmt.Sprintf("%s%s", *argPrefix, "/count"), counthandler) + http.Handle(*argPrefix+"/", proxyhandler) if err := http.ListenAndServe(fmt.Sprintf(":%d", *argPort), nil); err != nil { log.Error("Listen Server err:", err) }