Compare commits
8 Commits
feature/my
...
186f103fa5
Author | SHA1 | Date | |
---|---|---|---|
186f103fa5 | |||
3f2f10c9c2 | |||
1cae7173d6 | |||
663a15befc | |||
daae6a16d4 | |||
4b62cd2d57 | |||
3a9e11bf55 | |||
e1dafc5e4d |
@ -1,6 +1,6 @@
|
|||||||
// Package easylock...
|
// Package easylock ...
|
||||||
//
|
//
|
||||||
// Description : easylock...
|
// Description : easylock ...
|
||||||
//
|
//
|
||||||
// Author : go_developer@163.com<白茶清欢>
|
// Author : go_developer@163.com<白茶清欢>
|
||||||
//
|
//
|
||||||
|
@ -11,7 +11,7 @@ type option struct {
|
|||||||
flag string // 锁的标识
|
flag string // 锁的标识
|
||||||
}
|
}
|
||||||
|
|
||||||
// Option 设置option选项
|
// OptionFunc 设置option选项
|
||||||
//
|
//
|
||||||
// Author : go_developer@163.com<白茶清欢>
|
// Author : go_developer@163.com<白茶清欢>
|
||||||
//
|
//
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
// Package easylock...
|
// Package easylock ...
|
||||||
//
|
//
|
||||||
// Description : easylock...
|
// Description : easylock ...
|
||||||
//
|
//
|
||||||
// Author : go_developer@163.com<白茶清欢>
|
// Author : go_developer@163.com<白茶清欢>
|
||||||
//
|
//
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Package easylock...
|
// Package easylock ...
|
||||||
//
|
//
|
||||||
// Description : 包装各种姿势的锁
|
// Description : 包装各种姿势的锁
|
||||||
//
|
//
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
// Package easylock...
|
// Package easylock ...
|
||||||
//
|
//
|
||||||
// Description : 分段的锁
|
// Description : 分段的锁
|
||||||
//
|
//
|
||||||
|
2
go.sum
2
go.sum
@ -292,7 +292,6 @@ github.com/jcmturner/rpc/v2 v2.0.3 h1:7FXXj8Ti1IaVFpSAziCZWNzbNuZmnvw/i6CqLNdWfZ
|
|||||||
github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
|
github.com/jcmturner/rpc/v2 v2.0.3/go.mod h1:VUJYCIDm3PVOEHw8sgt091/20OJjskO/YJki3ELg/Hc=
|
||||||
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E=
|
||||||
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
|
||||||
github.com/jinzhu/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI=
|
|
||||||
github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
github.com/jinzhu/now v1.1.2/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
||||||
github.com/jinzhu/now v1.1.3/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
github.com/jinzhu/now v1.1.3/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
|
||||||
github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
|
github.com/jinzhu/now v1.1.4 h1:tHnRBy1i5F2Dh8BAFxqFzxKqqvezXrL2OW1TnX+Mlas=
|
||||||
@ -934,7 +933,6 @@ gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v
|
|||||||
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
|
||||||
gorm.io/driver/mysql v1.2.0 h1:l8+9VwjjyzEkw0PNPBOr2JHhLOGVk7XEnl5hk42bcvs=
|
gorm.io/driver/mysql v1.2.0 h1:l8+9VwjjyzEkw0PNPBOr2JHhLOGVk7XEnl5hk42bcvs=
|
||||||
gorm.io/driver/mysql v1.2.0/go.mod h1:4RQmTg4okPghdt+kbe6e1bTXIQp7Ny1NnBn/3Z6ghjk=
|
gorm.io/driver/mysql v1.2.0/go.mod h1:4RQmTg4okPghdt+kbe6e1bTXIQp7Ny1NnBn/3Z6ghjk=
|
||||||
gorm.io/gorm v1.22.3 h1:/JS6z+GStEQvJNW3t1FTwJwG/gZ+A7crFdRqtvG5ehA=
|
|
||||||
gorm.io/gorm v1.22.3/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
|
gorm.io/gorm v1.22.3/go.mod h1:F+OptMscr0P2F2qU97WT1WimdH9GaQPoDW7AYd5i2Y0=
|
||||||
gorm.io/gorm v1.22.4 h1:8aPcyEJhY0MAt8aY6Dc524Pn+pO29K+ydu+e/cXSpQM=
|
gorm.io/gorm v1.22.4 h1:8aPcyEJhY0MAt8aY6Dc524Pn+pO29K+ydu+e/cXSpQM=
|
||||||
gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk=
|
gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk=
|
||||||
|
@ -20,7 +20,7 @@ import (
|
|||||||
"git.zhangdeman.cn/zhangdeman/gopkg/util"
|
"git.zhangdeman.cn/zhangdeman/gopkg/util"
|
||||||
)
|
)
|
||||||
|
|
||||||
// NewParseJSONTree 获取解析的实例
|
// NewFilter 获取解析的实例
|
||||||
//
|
//
|
||||||
// Author : go_developer@163.com<白茶清欢>
|
// Author : go_developer@163.com<白茶清欢>
|
||||||
//
|
//
|
||||||
@ -32,7 +32,7 @@ func NewFilter(data interface{}, rule map[string]string) *Filter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ParseJSONTree 解析json树
|
// Filter 解析json树
|
||||||
//
|
//
|
||||||
// Author : go_developer@163.com<白茶清欢>
|
// Author : go_developer@163.com<白茶清欢>
|
||||||
//
|
//
|
||||||
|
@ -8,6 +8,7 @@
|
|||||||
package json_tool
|
package json_tool
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"fmt"
|
"fmt"
|
||||||
"testing"
|
"testing"
|
||||||
)
|
)
|
||||||
@ -84,3 +85,43 @@ func TestSelect(t *testing.T) {
|
|||||||
}
|
}
|
||||||
fmt.Println(d.String())
|
fmt.Println(d.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestParse 测试获取JSON数据结构
|
||||||
|
//
|
||||||
|
// Author : go_developer@163.com<张德满>
|
||||||
|
//
|
||||||
|
// Date : 10:59 PM 2022/1/9
|
||||||
|
func TestParse(t *testing.T) {
|
||||||
|
source := map[string]interface{}{
|
||||||
|
"name": "zhangdeman",
|
||||||
|
"extra": map[string]interface{}{
|
||||||
|
"age": 18,
|
||||||
|
"height": 180,
|
||||||
|
"slice": []int{1, 2, 3},
|
||||||
|
"obj": map[string]interface{}{
|
||||||
|
"la": "aaaa",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"slice": []int{1, 2, 3},
|
||||||
|
"map": map[string]interface{}{"a": 1, "b": 2, "c": 4},
|
||||||
|
"table": []map[string]interface{}{
|
||||||
|
{"name": "alex", "age": 18, "number": 1, "obj": map[string]interface{}{"enen": "en"}},
|
||||||
|
{"name": "bob", "age": 28, "number": 2},
|
||||||
|
},
|
||||||
|
"two_slice": []map[string]interface{}{
|
||||||
|
{
|
||||||
|
"students": []map[string]interface{}{
|
||||||
|
{
|
||||||
|
"name": "enen",
|
||||||
|
"age": 18,
|
||||||
|
"score": []float64{1, 2, 3, 45},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
"other": []interface{}{"others"},
|
||||||
|
"read_only": 1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
byteData, _ := json.Marshal(source)
|
||||||
|
fmt.Println(GetJSONDataStruct(string(byteData)))
|
||||||
|
}
|
||||||
|
57
json_tool/parse.go
Normal file
57
json_tool/parse.go
Normal file
@ -0,0 +1,57 @@
|
|||||||
|
// Package json_tool ...
|
||||||
|
//
|
||||||
|
// Description : json_tool ...
|
||||||
|
//
|
||||||
|
// Author : go_developer@163.com<张德满>
|
||||||
|
//
|
||||||
|
// Date : 2022-01-09 10:48 PM
|
||||||
|
package json_tool
|
||||||
|
|
||||||
|
import (
|
||||||
|
"github.com/pkg/errors"
|
||||||
|
"github.com/tidwall/gjson"
|
||||||
|
)
|
||||||
|
|
||||||
|
// GetJSONDataStruct 获取JSON数据的结构
|
||||||
|
//
|
||||||
|
// Author : go_developer@163.com<张德满>
|
||||||
|
//
|
||||||
|
// Date : 10:53 PM 2022/1/9
|
||||||
|
func GetJSONDataStruct(data string) ([]string, error) {
|
||||||
|
if !gjson.Valid(data) {
|
||||||
|
return make([]string, 0), errors.New("JSON format is invalid")
|
||||||
|
}
|
||||||
|
pathList := make([]string, 0)
|
||||||
|
r := gjson.Parse(data)
|
||||||
|
r.ForEach(func(key, value gjson.Result) bool {
|
||||||
|
if value.IsObject() {
|
||||||
|
list, _ := GetJSONDataStruct(value.String())
|
||||||
|
for _, k := range list {
|
||||||
|
pathList = append(pathList, key.String()+"."+k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if value.IsArray() {
|
||||||
|
dataList := value.Array()
|
||||||
|
if len(dataList) > 0 {
|
||||||
|
if !dataList[0].IsObject() && !dataList[0].IsArray() {
|
||||||
|
pathList = append(pathList, key.String())
|
||||||
|
} else {
|
||||||
|
list, _ := GetJSONDataStruct(dataList[0].String())
|
||||||
|
for _, k := range list {
|
||||||
|
pathList = append(pathList, key.String()+".[]."+k)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
pathList = append(pathList, key.String())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if !value.IsObject() && !value.IsArray() {
|
||||||
|
pathList = append(pathList, key.String())
|
||||||
|
}
|
||||||
|
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
return pathList, nil
|
||||||
|
}
|
@ -8,13 +8,11 @@
|
|||||||
package proxy
|
package proxy
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"compress/gzip"
|
"compress/gzip"
|
||||||
"fmt"
|
|
||||||
"io"
|
"io"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"net"
|
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"net/http/httputil"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -24,72 +22,30 @@ import (
|
|||||||
//
|
//
|
||||||
// Date : 2:08 下午 2021/8/6
|
// Date : 2:08 下午 2021/8/6
|
||||||
func Forward(rw http.ResponseWriter, req *http.Request, serverConfig *Server) {
|
func Forward(rw http.ResponseWriter, req *http.Request, serverConfig *Server) {
|
||||||
fmt.Printf("Received request %s %s %s\n", req.Method, req.Host, req.RemoteAddr)
|
|
||||||
|
|
||||||
transport := http.DefaultTransport
|
if !strings.HasPrefix(serverConfig.URI, "/") {
|
||||||
|
serverConfig.URI = "/" + serverConfig.URI
|
||||||
// step 1
|
|
||||||
outReq := new(http.Request)
|
|
||||||
*outReq = *req // this only does shallow copies of maps
|
|
||||||
|
|
||||||
if clientIP, _, err := net.SplitHostPort(req.RemoteAddr); err == nil {
|
|
||||||
if prior, ok := outReq.Header["X-Forwarded-For"]; ok {
|
|
||||||
clientIP = strings.Join(prior, ", ") + ", " + clientIP
|
|
||||||
}
|
|
||||||
outReq.Header.Set("X-Forwarded-For", clientIP)
|
|
||||||
}
|
}
|
||||||
|
// 请求重写方法
|
||||||
// 写入重写的请求Header
|
director := func(req *http.Request) {
|
||||||
for k, v := range serverConfig.RewriteRequestHeader {
|
req.URL.Scheme = serverConfig.Scheme
|
||||||
outReq.Header.Set(k, v)
|
// req.URL.Host = projectDetail.GetProjectDetail().Domain + ":" + fmt.Sprintf("%v", projectDetail.GetProjectDetail().Port)
|
||||||
}
|
// req.Host = projectDetail.GetProjectDetail().Domain + ":" + fmt.Sprintf("%v", projectDetail.GetProjectDetail().Port)
|
||||||
|
req.Host = serverConfig.Host
|
||||||
// 重写请求地址
|
req.URL.Host = serverConfig.Host
|
||||||
outReq.Host = serverConfig.Host
|
req.URL.Path = serverConfig.URI
|
||||||
outReq.URL.Path = serverConfig.URI
|
req.RequestURI = serverConfig.URI
|
||||||
outReq.URL.Scheme = serverConfig.Scheme
|
// 写入重写的请求Header
|
||||||
outReq.URL.Host = serverConfig.Host
|
for k, v := range serverConfig.RewriteRequestHeader {
|
||||||
|
req.Header.Set(k, v)
|
||||||
// step 2
|
|
||||||
res, err := transport.RoundTrip(outReq)
|
|
||||||
if err != nil {
|
|
||||||
rw.WriteHeader(http.StatusBadGateway)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// step 3
|
|
||||||
for key, value := range res.Header {
|
|
||||||
for _, v := range value {
|
|
||||||
if strings.ToLower(key) == "content-encoding" {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
rw.Header().Add(key, v)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
// TODO : 重写响应数据
|
||||||
rw.WriteHeader(res.StatusCode)
|
modifyResponseFunc := func(rep *http.Response) error {
|
||||||
|
return nil
|
||||||
// 重写请求header
|
|
||||||
for k, v := range serverConfig.RewriteResponseHeader {
|
|
||||||
rw.Header().Set(k, v)
|
|
||||||
}
|
}
|
||||||
|
p := &httputil.ReverseProxy{Director: director, ModifyResponse: modifyResponseFunc}
|
||||||
defer res.Body.Close()
|
p.ServeHTTP(rw, req)
|
||||||
|
|
||||||
// 重写响应数据
|
|
||||||
if !strings.Contains(strings.ToLower(res.Header.Get("Content-Type")), "application/json") || nil == serverConfig.RewriteResponseData || len(serverConfig.RewriteResponseData) == 0 {
|
|
||||||
_, _ = io.Copy(rw, res.Body)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
var (
|
|
||||||
responseData []byte
|
|
||||||
)
|
|
||||||
|
|
||||||
responseData, err = getResponseData(res)
|
|
||||||
fmt.Println(string(responseData), err)
|
|
||||||
|
|
||||||
bytesBuffer := bytes.NewReader([]byte(`{"data":{"permission":true}}`))
|
|
||||||
_, _ = io.Copy(rw, bytesBuffer)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// getResultCompressType 获取返回结果的压缩方式
|
// getResultCompressType 获取返回结果的压缩方式
|
||||||
|
Reference in New Issue
Block a user