Commit a498ce3f authored by leitao.zhang's avatar leitao.zhang

接口id

parent 5c4cbd1e
...@@ -22,6 +22,7 @@ require ( ...@@ -22,6 +22,7 @@ require (
github.com/onsi/ginkgo v1.10.2 // indirect github.com/onsi/ginkgo v1.10.2 // indirect
github.com/onsi/gomega v1.7.0 // indirect github.com/onsi/gomega v1.7.0 // indirect
github.com/sirupsen/logrus v1.4.2 github.com/sirupsen/logrus v1.4.2
github.com/spf13/cast v1.3.1
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5
github.com/tealeg/xlsx v1.0.5 // indirect github.com/tealeg/xlsx v1.0.5 // indirect
github.com/vulcand/oxy v1.0.0 github.com/vulcand/oxy v1.0.0
......
...@@ -143,6 +143,8 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn ...@@ -143,6 +143,8 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4= github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
......
...@@ -32,8 +32,9 @@ func Proxy(c *gin.Context) { ...@@ -32,8 +32,9 @@ func Proxy(c *gin.Context) {
c.JSON(200, res) c.JSON(200, res)
return return
} }
apiId := c.Param("apiid")
//获取服务相关信息 //获取服务相关信息
proxyData, err := service.GetRealPath(applyId) proxyData, err := service.GetRealPath(applyId, apiId)
if err != nil { if err != nil {
fmt.Println("err......", err.Error()) fmt.Println("err......", err.Error())
......
...@@ -34,6 +34,7 @@ func Load(middleware ...gin.HandlerFunc) http.Handler { ...@@ -34,6 +34,7 @@ func Load(middleware ...gin.HandlerFunc) http.Handler {
{ {
root.GET("/health", handler.HealthCheck) root.GET("/health", handler.HealthCheck)
root.Any("/service/:applyId", handler.Proxy) root.Any("/service/:applyId", handler.Proxy)
root.Any("/service/:applyId/:apiid", handler.Proxy)
} }
return e return e
} }
...@@ -11,6 +11,7 @@ import ( ...@@ -11,6 +11,7 @@ import (
"encoding/json" "encoding/json"
"errors" "errors"
"fmt" "fmt"
"github.com/spf13/cast"
"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/client" "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/client"
"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config" "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/config"
"gitlab.wodcloud.com/apaas/apaas-meshproxy/src/dao" "gitlab.wodcloud.com/apaas/apaas-meshproxy/src/dao"
...@@ -431,10 +432,14 @@ func FilterSensituveField(model interface{}, returnData interface{}) (body inter ...@@ -431,10 +432,14 @@ func FilterSensituveField(model interface{}, returnData interface{}) (body inter
} }
// 获取真实地址和返回结构、调用限定次数 // 获取真实地址和返回结构、调用限定次数
func GetRealPath(applyId string) (res model.ProxyData, err error) { func GetRealPath(applyId, apiId string) (res model.ProxyData, err error) {
db, err := client.GetConnect() db, err := client.GetConnect()
if err != nil { if err != nil {
return return
}
apiid := cast.ToInt64(apiId)
if apiid == 0 {
} }
has, err := db. has, err := db.
Select(`service_apply.res_fields as res_fields,service.req_url as req_url,service_request_spcs.count as count,service_safe_config.sensituve_word as sensituve_word Select(`service_apply.res_fields as res_fields,service.req_url as req_url,service_request_spcs.count as count,service_safe_config.sensituve_word as sensituve_word
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment