增加json格式合法性校验

Reviewed-on: #11

easylock/abstruct.go

@@ -1,6 +1,6 @@
-// Package easylock...
+// Package easylock ...
 //
-// Description : easylock...
+// Description : easylock ...
 //
 // Author : go_developer@163.com<白茶清欢>
 //

easylock/define.go

@@ -11,7 +11,7 @@ type option struct {
 	flag string // 锁的标识
 }
 
-// Option 设置option选项
+// OptionFunc 设置option选项
 //
 // Author : go_developer@163.com<白茶清欢>
 //

easylock/error.go

@@ -1,6 +1,6 @@
-// Package easylock...
+// Package easylock ...
 //
-// Description : easylock...
+// Description : easylock ...
 //
 // Author : go_developer@163.com<白茶清欢>
 //

easylock/lock.go

@@ -1,4 +1,4 @@
-// Package easylock...
+// Package easylock ...
 //
 // Description : 包装各种姿势的锁
 //

easylock/lock_segment.go

@@ -1,4 +1,4 @@
-// Package easylock...
+// Package easylock ...
 //
 // Description : 分段的锁
 //

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/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/now v1.1.2 h1:eVKgfIdy9b6zbWBMgFpfDPoAMifwSZagU9HmEU6zgiI=
 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.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=
 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/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.4 h1:8aPcyEJhY0MAt8aY6Dc524Pn+pO29K+ydu+e/cXSpQM=
 gorm.io/gorm v1.22.4/go.mod h1:1aeVC+pe9ZmvKZban/gW4QPra7PRoTEssyc922qCAkk=

json_tool/filter.go

@@ -20,7 +20,7 @@ import (
 	"git.zhangdeman.cn/zhangdeman/gopkg/util"
 )
 
-// NewParseJSONTree 获取解析的实例
+// NewFilter 获取解析的实例
 //
 // 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<白茶清欢>
 //

json_tool/json_test.go

@@ -8,6 +8,7 @@
 package json_tool
 
 import (
+	"encoding/json"
 	"fmt"
 	"testing"
 )
@@ -84,3 +85,43 @@ func TestSelect(t *testing.T) {
 	}
 	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)))
+}

json_tool/parse.go

@@ -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
+}

logger/wrapper/gorm_v2.go

@@ -10,8 +10,11 @@ package wrapper
 import (
 	"context"
 	"fmt"
+	"strings"
 	"time"
 
+	"github.com/gin-gonic/gin"
+
 	"gorm.io/gorm"
 
 	"go.uber.org/zap/zapcore"
@@ -47,15 +50,36 @@ func NewGormV2(loggerLevel zapcore.Level, consoleOutput bool, encoder zapcore.En
 	}, nil
 }
 
+// NewGormLoggerWithInstance 获取gorm日志实现
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 3:36 PM 2021/12/24
+func NewGormLoggerWithInstance(ctx *gin.Context, dbClient *gorm.DB, instance *zap.Logger, node string, extraCtxFieldList []string) logger.Interface {
+	return &Gorm{
+		dbClient:          dbClient,
+		instance:          instance,
+		traceIDField:      "",
+		extraCtxFieldList: extraCtxFieldList,
+		flag:              "",
+		node:              node,
+		ctx:               ctx,
+	}
+}
+
 // Gorm v2 版本库日志实现
 //
 // Author : go_developer@163.com<白茶清欢>
 //
 // Date : 9:55 下午 2021/3/1
 type Gorm struct {
-	instance     *zap.Logger // 日志实例
+	dbClient          *gorm.DB
-	traceIDField string      // 串联请求上下文的的ID
+	instance          *zap.Logger  // 日志实例
-	flag         string      // 数据库标识
+	traceIDField      string       // 串联请求上下文的的ID
+	extraCtxFieldList []string     // 从请求上线问提取的字段
+	flag              string       // 数据库标识
+	node              string       // 数据库节点 master / slave
+	ctx               *gin.Context // gin上下文
 }
 
 // LogMode ...
@@ -73,12 +97,7 @@ func (g *Gorm) LogMode(level logger.LogLevel) logger.Interface {
 //
 // Date : 10:18 下午 2021/3/1
 func (g *Gorm) Info(ctx context.Context, s string, i ...interface{}) {
-	g.instance.Info(
+	g.write(nil, "info")
-		"Info日志",
-		zap.String(g.traceIDField, g.getTraceID(ctx)),
-		zap.String("db_flag", g.flag),
-		zap.String("message", fmt.Sprintf(s, i...)),
-	)
 }
 
 // Warn ...
@@ -87,12 +106,7 @@ func (g *Gorm) Info(ctx context.Context, s string, i ...interface{}) {
 //
 // Date : 10:16 下午 2021/3/1
 func (g *Gorm) Warn(ctx context.Context, s string, i ...interface{}) {
-	g.instance.Warn(
+	g.write(nil, "warn")
-		"SQL执行产生Warning",
-		zap.String(g.traceIDField, g.getTraceID(ctx)),
-		zap.String("db_flag", g.flag),
-		zap.String("message", fmt.Sprintf(s, i...)),
-	)
 }
 
 // Error 日志
@@ -101,12 +115,7 @@ func (g *Gorm) Warn(ctx context.Context, s string, i ...interface{}) {
 //
 // Date : 10:18 下午 2021/3/1
 func (g *Gorm) Error(ctx context.Context, s string, i ...interface{}) {
-	g.instance.Warn(
+	g.write(nil, "error")
-		"SQL执行产生Error",
-		zap.String(g.traceIDField, g.getTraceID(ctx)),
-		zap.String("db_flag", g.flag),
-		zap.String("message", fmt.Sprintf(s, i...)),
-	)
 }
 
 // Trace Trace 记录
@@ -123,8 +132,7 @@ func (g *Gorm) Trace(ctx context.Context, begin time.Time, fc func() (string, in
 		sql, affectRows = fc()
 	}
 
-	g.instance.Info(
+	dataList := []zap.Field{
-		"SQL执行记录",
 		zap.String(g.traceIDField, g.getTraceID(ctx)),
 		zap.String("db_flag", g.flag),
 		zap.Int64("begin_time", start),
@@ -133,7 +141,45 @@ func (g *Gorm) Trace(ctx context.Context, begin time.Time, fc func() (string, in
 		zap.String("sql", sql),
 		zap.Int64("affect_rows", affectRows),
 		zap.Error(err),
-	)
+	}
+	g.write(dataList, "info")
+
+}
+
+// write ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 4:11 PM 2021/12/24
+func (g *Gorm) write(dataList []zap.Field, level string) {
+	if nil == g.instance {
+		// 未设置日志实例
+		return
+	}
+	if nil == dataList {
+		dataList = make([]zap.Field, 0)
+	}
+	if nil != g.ctx {
+		for _, extraField := range g.extraCtxFieldList {
+			dataList = append(dataList, zap.Any(extraField, g.ctx.Value(extraField)))
+		}
+	}
+
+	// 补齐 flag、node
+	sql := g.dbClient.Dialector.Explain(g.dbClient.Statement.SQL.String(), g.dbClient.Statement.Vars...)
+	affectRows := g.dbClient.RowsAffected
+	dataList = append(dataList, zap.String("db_node", g.node), zap.String("db_flag", g.flag), zap.String("execute_sql", sql), zap.Int64("affext_rows", affectRows))
+	message := "SQL执行记录"
+	switch strings.ToLower(level) {
+	case "info":
+		g.instance.Info(message, dataList...)
+	case "warn":
+		g.instance.Warn(message, dataList...)
+	case "error":
+		g.instance.Error(message, dataList...)
+	default:
+		g.instance.Info(message, dataList...)
+	}
 }
 
 // getTraceID 获取traceID
@@ -145,7 +191,7 @@ func (g *Gorm) getTraceID(ctx context.Context) string {
 	return fmt.Sprintf("%v", ctx.Value(g.traceIDField))
 }
 
-// GetGormSQL 获取tracefn
+// GetGormSQL 获取trace fn
 //
 // Author : go_developer@163.com<白茶清欢>
 //

middleware/mysql/client.go

@@ -10,14 +10,107 @@ package mysql
 import (
 	"fmt"
 
-	"git.zhangdeman.cn/zhangdeman/gopkg/logger"
-
 	"git.zhangdeman.cn/zhangdeman/gopkg/logger/wrapper"
+	"github.com/gin-gonic/gin"
+
+	"go.uber.org/zap"
+
+	"git.zhangdeman.cn/zhangdeman/gopkg/logger"
+	gormLogger "gorm.io/gorm/logger"
 
 	"gorm.io/driver/mysql"
 	"gorm.io/gorm"
 )
 
+// NewDBClient ...
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 3:09 PM 2021/12/24
+func NewDBClient(masterConf *DBConfig, slaveConf *DBConfig, logConf *LogConfig, loggerInstance *zap.Logger, extraRequestFieldList []string) (*DBClient, error) {
+	client := &DBClient{
+		extraFieldList: extraRequestFieldList,
+	}
+	var err error
+	// 日志初始化失败
+	if client.loggerInstance, err = getLogInstance(logConf, loggerInstance); nil != err {
+		return nil, err
+	}
+	if client.master, err = GetDatabaseClient(masterConf, nil); nil != err {
+		return nil, err
+	}
+	if client.slave, err = GetDatabaseClient(slaveConf, nil); nil != err {
+		return nil, err
+	}
+	return client, nil
+}
+
+// DBClient 包装日志实例
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 3:09 PM 2021/12/24
+type DBClient struct {
+	loggerInstance *zap.Logger
+	master         *gorm.DB
+	slave          *gorm.DB
+	extraFieldList []string
+}
+
+// GetMaster 获取主库连接
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 3:28 PM 2021/12/24
+func (dc *DBClient) GetMaster(ctx *gin.Context) *gorm.DB {
+	session := dc.master.Session(&gorm.Session{})
+	session.Logger = dc.getLogger(ctx, session, "slave")
+	return session
+}
+
+// GetSlave 获取从库链接
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 3:29 PM 2021/12/24
+func (dc *DBClient) GetSlave(ctx *gin.Context) *gorm.DB {
+	session := dc.slave.Session(&gorm.Session{})
+	session.Logger = dc.getLogger(ctx, session, "slave")
+	return session
+}
+
+// getLogger 获取日志实例
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 3:45 PM 2021/12/24
+func (dc *DBClient) getLogger(ctx *gin.Context, dbClient *gorm.DB, node string) gormLogger.Interface {
+	return wrapper.NewGormLoggerWithInstance(ctx, dbClient, dc.loggerInstance, node, dc.extraFieldList)
+}
+
+// getLogInstance 获取日志实例
+//
+// Author : go_developer@163.com<白茶清欢>
+//
+// Date : 3:20 PM 2021/12/24
+func getLogInstance(logConf *LogConfig, loggerInstance *zap.Logger) (*zap.Logger, error) {
+	if nil != loggerInstance {
+		return loggerInstance, nil
+	}
+	logConfList := []logger.SetLoggerOptionFunc{logger.WithEncoder(logConf.Encoder), logger.WithCallerSkip(logConf.Skip), logger.WithCaller()}
+	if logConf.ConsoleOutput {
+		logConfList = append(logConfList, logger.WithConsoleOutput())
+	}
+
+	var (
+		err error
+	)
+	if loggerInstance, err = logger.NewLogger(logConf.Level, logConf.SplitConfig, logConfList...); nil != err {
+		return nil, err
+	}
+	return loggerInstance, nil
+}
+
 // GetDatabaseClient 获取日志实例
 //
 // Author : go_developer@163.com<白茶清欢>
@@ -25,35 +118,22 @@ import (
 // Date : 10:49 下午 2021/3/1
 func GetDatabaseClient(conf *DBConfig, logConf *LogConfig) (*gorm.DB, error) {
 	var (
-		instance *gorm.DB
+		instance       *gorm.DB
-		err      error
+		err            error
+		loggerInstance *zap.Logger
 	)
 
 	if instance, err = gorm.Open(mysql.Open(buildConnectionDSN(conf)), &gorm.Config{}); nil != err {
 		return nil, err
 	}
 
-	if len(logConf.TraceFieldName) == 0 {
+	if nil != logConf {
-		logConf.TraceFieldName = defaultTraceFieldName
+		if loggerInstance, err = getLogInstance(logConf, nil); nil != err {
+			return nil, err
+		}
+		instance.Logger = wrapper.NewGormLoggerWithInstance(nil, instance, loggerInstance, "", nil)
 	}
 
-	splitConfigFuncList := []logger.SetRotateLogConfigFunc{
-		logger.WithTimeIntervalType(logConf.SplitConfig.TimeIntervalType),
-		logger.WithDivisionChar(logConf.SplitConfig.DivisionChar),
-		logger.WithMaxAge(logConf.SplitConfig.MaxAge),
-	}
-
-	splitConfig, _ := logger.NewRotateLogConfig(logConf.SplitConfig.LogPath, logConf.SplitConfig.LogFileName, splitConfigFuncList...)
-
-	if instance.Logger, err = wrapper.NewGormV2(
-		logConf.Level,
-		logConf.ConsoleOutput,
-		logConf.Encoder,
-		splitConfig,
-		logConf.TraceFieldName,
-		logConf.Skip); nil != err {
-		return nil, CreateDBLogError(err)
-	}
 	return instance, nil
 }
 

middleware/mysql/define.go

@@ -42,8 +42,3 @@ type LogConfig struct {
 	TraceFieldName   string
 	Skip             int
 }
-
-const (
-	// defaultTraceFieldName 默认trace_id字段
-	defaultTraceFieldName = "trace_id"
-)

proxy/forward.go

@@ -8,13 +8,11 @@
 package proxy
 
 import (
-	"bytes"
 	"compress/gzip"
-	"fmt"
 	"io"
 	"io/ioutil"
-	"net"
 	"net/http"
+	"net/http/httputil"
 	"strings"
 )
 
@@ -24,72 +22,30 @@ import (
 //
 // Date : 2:08 下午 2021/8/6
 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 获取返回结果的压缩方式