diff --git a/.beagle.yml b/.beagle.yml index 37923b0b7a26a2df32918f49b8a4a3accd92055b..0cf2eb6b618fee264254d93b11ccac4a97d2b3f8 100644 --- a/.beagle.yml +++ b/.beagle.yml @@ -1,7 +1,7 @@ platform: 10.11.92.34 workspace: base: /go - path: src/gitlab.wodcloud.com/apaas/apaas-meshproxy + path: src/gitlab.wodcloud.com/apaas-v3/apaas-meshproxy clone: git: image: registry.cn-qingdao.aliyuncs.com/wod/devops-git:1.0 @@ -126,5 +126,4 @@ pipeline: target: REGISTRY_PASSWORD when: branch: - - master - \ No newline at end of file + - master \ No newline at end of file diff --git a/go.mod b/go.mod index a618e0807ff4e3d3dc49ae03e2e1f4f127f4b8a7..9c993d6bc53658831f79823dec2e86974970c559 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module gitlab.wodcloud.com/apaas/apaas-meshproxy +module gitlab.wodcloud.com/apaas-v3/apaas-meshproxy go 1.12 diff --git a/src/client/db.go b/src/client/db.go index aec74ea9e2048de9f4d90bff07a9c23900cc94e3..cb4ac44c327707497ff9a82fa5ec216d04da020b 100644 --- a/src/client/db.go +++ b/src/client/db.go @@ -2,13 +2,14 @@ package client import ( "fmt" + "time" + _ "github.com/go-sql-driver/mysql" _ "github.com/lib/pq" "github.com/sirupsen/logrus" "github.com/xormplus/core" "github.com/xormplus/xorm" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" - "time" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/config" ) var DB *xorm.Engine diff --git a/src/client/redis.go b/src/client/redis.go index 41cf041f1dca8f23ad21e625d67ba282fea47c22..6fbf36a4b9b24c0e3c136430ecd4234a1917f27a 100644 --- a/src/client/redis.go +++ b/src/client/redis.go @@ -5,7 +5,7 @@ import ( "strings" "time" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/config" "github.com/go-redis/redis" ) diff --git a/src/handler/base.go b/src/handler/base.go index d0fe9c7905033f77c67769e8d2444d1f86ed1889..0dd2cb05560318e00ed0dac168f22895b7de85ea 100644 --- a/src/handler/base.go +++ b/src/handler/base.go @@ -1,9 +1,10 @@ package handler import ( - "github.com/gin-gonic/gin" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/tools" "time" + + "github.com/gin-gonic/gin" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/tools" ) func Health(c *gin.Context) { diff --git a/src/handler/proxyhandler.go b/src/handler/proxyhandler.go index ec93ad688b48ff79a05bb4d284b59c1a655f6f25..ddd7e6a602528939aeb41b2afed51a146390c0d9 100644 --- a/src/handler/proxyhandler.go +++ b/src/handler/proxyhandler.go @@ -7,12 +7,6 @@ import ( "encoding/json" "errors" "fmt" - "github.com/gin-gonic/gin" - "github.com/spf13/cast" - "github.com/vulcand/oxy/forward" - "github.com/vulcand/oxy/testutils" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/model" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/service" "io/ioutil" "log" "net/http" @@ -20,6 +14,13 @@ import ( "strconv" "strings" "time" + + "github.com/gin-gonic/gin" + "github.com/spf13/cast" + "github.com/vulcand/oxy/forward" + "github.com/vulcand/oxy/testutils" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/model" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/service" ) //var Resp *http.Response diff --git a/src/main.go b/src/main.go index 2ba3c98cae9bf68c36802588bd87648f2312b693..a86d5d4148bf601c69e63733f25cee5fbd7875dd 100644 --- a/src/main.go +++ b/src/main.go @@ -7,9 +7,9 @@ import ( "time" "github.com/sirupsen/logrus" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/router" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/router" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/config" "github.com/gin-gonic/contrib/ginrus" "github.com/spf13/pflag" diff --git a/src/router/router.go b/src/router/router.go index f746536de2a6b05bc77fb74cc1c0276d7757f2a4..32511c7afcff0b8943e75a3d226b262ae96b37e7 100644 --- a/src/router/router.go +++ b/src/router/router.go @@ -16,11 +16,12 @@ 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" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/router/middleware/header" "net/http" + + "github.com/gin-gonic/gin" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/config" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/handler" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/router/middleware/header" ) // Load loads the router diff --git a/src/service/field.go b/src/service/field.go index bad2b0852ed02998cd09b00f753462432e044fff..d983df7629f37c4799deffd42f9f5649c39d6948 100644 --- a/src/service/field.go +++ b/src/service/field.go @@ -10,16 +10,17 @@ package service import ( "errors" "fmt" - "github.com/spf13/cast" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/client" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/dao" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/model" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/model/request" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/model/tables" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/tools/dataconvertutil" "log" "time" + + "github.com/spf13/cast" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/client" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/config" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/dao" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/model" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/model/request" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/model/tables" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/tools/dataconvertutil" ) // 判断是否设置了敏感字段,并有敏感词 diff --git a/src/tools/dataconvertutil/dataconvertutil.go b/src/tools/dataconvertutil/dataconvertutil.go index 39879db1aef293d2b263f505d82dfc4cb2d4710d..f0122f234296a35615da73feffdd5ca3df513a82 100644 --- a/src/tools/dataconvertutil/dataconvertutil.go +++ b/src/tools/dataconvertutil/dataconvertutil.go @@ -2,9 +2,10 @@ package dataconvertutil import ( "encoding/json" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/logger" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/model/request" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/tools" + + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/logger" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/model/request" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/tools" ) //字段结构 转json diff --git a/src/tools/public.go b/src/tools/public.go index d8fb0e87336cc2439c3cc16bc62b071ef34ae174..912476fd3b839d57ac917f489b46ea090cfe7827 100644 --- a/src/tools/public.go +++ b/src/tools/public.go @@ -5,14 +5,15 @@ import ( "crypto/md5" "encoding/json" "fmt" - "github.com/Chain-Zhang/pinyin" - "github.com/gin-gonic/gin" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/model/tables" "io" "strconv" "strings" "time" + + "github.com/Chain-Zhang/pinyin" + "github.com/gin-gonic/gin" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/config" + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/model/tables" ) // , http请求 diff --git a/src/tools/tool.go b/src/tools/tool.go index f858e44e7384b1758ce5a3527cd286e1f08a96f9..134151a201cfc3866f49cb45160bad7dd1d40cc4 100644 --- a/src/tools/tool.go +++ b/src/tools/tool.go @@ -1,8 +1,9 @@ package tools import ( - "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" "time" + + "gitlab.wodcloud.com/apaas-v3/apaas-meshproxy/src/config" ) type JsonTime time.Time