From 27b770270c7f4a07f0c088e73ceddbd2b567177a Mon Sep 17 00:00:00 2001 From: zhangyasong Date: Wed, 9 Mar 2022 16:12:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9gitlb=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .beagle.yml | 5 ++--- go.mod | 2 +- src/client/db.go | 5 +++-- src/client/redis.go | 2 +- src/handler/base.go | 5 +++-- src/handler/proxyhandler.go | 13 +++++++------ src/main.go | 4 ++-- src/router/router.go | 9 +++++---- src/service/field.go | 17 +++++++++-------- src/tools/dataconvertutil/dataconvertutil.go | 7 ++++--- src/tools/public.go | 9 +++++---- src/tools/tool.go | 3 ++- 12 files changed, 44 insertions(+), 37 deletions(-) diff --git a/.beagle.yml b/.beagle.yml index 37923b0..0cf2eb6 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 a618e08..9c993d6 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 aec74ea..cb4ac44 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 41cf041..6fbf36a 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 d0fe9c7..0dd2cb0 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 ec93ad6..ddd7e6a 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 2ba3c98..a86d5d4 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 f746536..32511c7 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 bad2b08..d983df7 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 39879db..f0122f2 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 d8fb0e8..912476f 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 f858e44..134151a 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 -- 2.26.0