Merge branch 'dev' into 'master'

Dev

See merge request apaas-v3/apaas-meshproxy!4

.beagle.yml

 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
@@ -127,4 +127,3 @@ pipeline:
     when:
       branch:
         - master
\ No newline at end of file
-  
\ No newline at end of file

go.mod

-module gitlab.wodcloud.com/apaas/apaas-meshproxy
+module gitlab.wodcloud.com/apaas-v3/apaas-meshproxy
 
 go 1.12
 

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

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"
 )

src/handler/base.go

 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) {

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

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"

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

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"
 )
 
 // 判断是否设置了敏感字段，并有敏感词

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

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请求

src/tools/tool.go

 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