迁移binding的请求和响应

api/api.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"context"
+	"errors"
 	"git.sxidc.com/go-tools/utils/strutils"
 	"github.com/gin-gonic/gin"
-	"github.com/pkg/errors"
 	"net/http"
 )
 

api/context.go

@@ -2,9 +2,9 @@ package api
 
 import (
 	"git.sxidc.com/go-tools/utils/strutils"
+	"git.sxidc.com/service-supports/fserr"
 	"git.sxidc.com/service-supports/fslog"
 	"github.com/gin-gonic/gin"
-	"github.com/pkg/errors"
 	"io"
 	"mime/multipart"
 )
@@ -19,7 +19,7 @@ func (c *Context) GetPathParams(pathParamNames []string) ([]string, error) {
 	for _, paramName := range pathParamNames {
 		paramValue := c.Param(paramName)
 		if strutils.IsStringEmpty(paramValue) {
-			return nil, errors.New("没有传递路径参数" + paramName)
+			return nil, fserr.New("没有传递路径参数" + paramName)
 		}
 
 		pathParamValues = append(pathParamValues, paramValue)

application/config.go

@@ -3,7 +3,7 @@ package application
 import (
 	"encoding/json"
 	"git.sxidc.com/go-tools/utils/fileutils"
-	"github.com/pkg/errors"
+	"git.sxidc.com/service-supports/fserr"
 	"gopkg.in/yaml.v3"
 	"os"
 )
@@ -19,7 +19,7 @@ type ApiConfig struct {
 
 func LoadFromJsonFile(jsonFilePath string) (Config, error) {
 	if !fileutils.PathExists(jsonFilePath) {
-		return Config{}, errors.New("配置文件不存在")
+		return Config{}, fserr.New("配置文件不存在")
 	}
 
 	jsonBytes, err := os.ReadFile(jsonFilePath)
@@ -32,7 +32,7 @@ func LoadFromJsonFile(jsonFilePath string) (Config, error) {
 
 func LoadFromYamlFile(yamlFilePath string) (Config, error) {
 	if !fileutils.PathExists(yamlFilePath) {
-		return Config{}, errors.New("配置文件不存在")
+		return Config{}, fserr.New("配置文件不存在")
 	}
 
 	yamlBytes, err := os.ReadFile(yamlFilePath)

binding/request.go

@@ -0,0 +1,62 @@
+package binding
+
+import (
+	"git.sxidc.com/go-framework/baize/api"
+	"github.com/gin-gonic/gin/binding"
+	"net/http"
+)
+
+func JsonBody[O any](c *api.Context, request any, sendFunc SendFunc[O]) bool {
+	err := c.ShouldBindJSON(request)
+	if err != nil {
+		var zero O
+		sendFunc(c, http.StatusBadRequest, zero, err)
+		return false
+	}
+
+	return true
+}
+
+func QueryParams[O any](c *api.Context, query any, sendFunc SendFunc[O]) bool {
+	err := c.ShouldBindQuery(query)
+	if err != nil {
+		var zero O
+		sendFunc(c, http.StatusBadRequest, zero, err)
+		return false
+	}
+
+	return true
+}
+
+func MultipartForm[O any](c *api.Context, request any, sendFunc SendFunc[O]) bool {
+	err := c.ShouldBindWith(request, binding.FormMultipart)
+	if err != nil {
+		var zero O
+		sendFunc(c, http.StatusBadRequest, zero, err)
+		return false
+	}
+
+	return true
+}
+
+func Form[T any](c *api.Context, request interface{}, sendFunc SendFunc[T]) bool {
+	err := c.ShouldBindWith(request, binding.Form)
+	if err != nil {
+		var zero T
+		sendFunc(c, http.StatusBadRequest, zero, err)
+		return false
+	}
+
+	return true
+}
+
+func XMLBody[T any](c *api.Context, request interface{}, sendFunc SendFunc[T]) bool {
+	err := c.ShouldBindXML(request)
+	if err != nil {
+		var zero T
+		sendFunc(c, http.StatusBadRequest, zero, err)
+		return false
+	}
+
+	return true
+}

binding/response.go

@@ -0,0 +1,183 @@
+package binding
+
+import (
+	"encoding/json"
+	"git.sxidc.com/go-framework/baize/api"
+	"git.sxidc.com/service-supports/fserr"
+	"git.sxidc.com/service-supports/fslog"
+	"git.sxidc.com/service-supports/websocket"
+)
+
+func NoResponse(_ *api.Context, _ int, _ any, _ error) {
+	return
+}
+
+func SendMsgResponse(c *api.Context, statusCode int, _ any, err error) {
+	msgResp := formMsgResponse(err)
+	c.JSON(statusCode, msgResp)
+}
+
+type IDResponse[T IDType] struct {
+	MsgResponse
+	ID T `json:"id"`
+}
+
+func SendIDResponse[T IDType](c *api.Context, statusCode int, id T, err error) {
+	msgResp := formMsgResponse(err)
+	c.JSON(statusCode, IDResponse[T]{
+		MsgResponse: msgResp,
+		ID:          id,
+	})
+}
+
+type InfoResponse[T any] struct {
+	MsgResponse
+	Info T `json:"info"`
+}
+
+func SendInfoResponse[T any](c *api.Context, statusCode int, info T, err error) {
+	msgResp := formMsgResponse(err)
+	c.JSON(statusCode, InfoResponse[T]{
+		MsgResponse: msgResp,
+		Info:        info,
+	})
+}
+
+type InfosResponse[T any] struct {
+	MsgResponse
+	InfosData[T]
+}
+
+func SendInfosResponse[T any](c *api.Context, statusCode int, data InfosData[T], err error) {
+	msgResp := formMsgResponse(err)
+	c.JSON(statusCode, InfosResponse[T]{
+		MsgResponse: msgResp,
+		InfosData:   data,
+	})
+}
+
+func StructToMap(originStruct any) map[string]any {
+	jsonBytes, err := json.Marshal(originStruct)
+	if err != nil {
+		panic(err)
+	}
+
+	retMap := make(map[string]any)
+	err = json.Unmarshal(jsonBytes, &retMap)
+	if err != nil {
+		panic(err)
+	}
+
+	return retMap
+}
+
+func SendMapResponse(c *api.Context, statusCode int, data map[string]any, err error) {
+	msgRespMap := formMapMsgResponse(err)
+	for key, value := range data {
+		msgRespMap[key] = value
+	}
+
+	c.JSON(statusCode, msgRespMap)
+}
+
+type MsgResponse struct {
+	Success bool   `json:"success"`
+	ErrCode int    `json:"errCode"`
+	Msg     string `json:"msg"`
+}
+
+func formMsgResponse(err error) MsgResponse {
+	if err != nil {
+		fslog.Error(err)
+		serviceErr := fserr.ParseCode(err)
+
+		return MsgResponse{
+			Success: false,
+			ErrCode: serviceErr.BusinessCode,
+			Msg:     serviceErr.Msg,
+		}
+	}
+
+	return MsgResponse{
+		Success: true,
+		ErrCode: 0,
+		Msg:     "操作成功",
+	}
+}
+
+func formMapMsgResponse(err error) map[string]any {
+	resp := make(map[string]any)
+	if err != nil {
+		fslog.Error(err)
+		serviceErr := fserr.ParseCode(err)
+
+		resp["success"] = false
+		resp["errCode"] = serviceErr.BusinessCode
+		resp["msg"] = serviceErr.Msg
+
+		return resp
+	}
+
+	resp["success"] = true
+	resp["errCode"] = 0
+	resp["msg"] = "操作成功"
+
+	return resp
+}
+
+func WSSendMessage(groupID string, obj any) {
+	message, err := json.Marshal(obj)
+	if err != nil {
+		fslog.Error(err)
+		return
+	}
+
+	err = websocket.GetInstance().BroadCast(groupID, message)
+	if err != nil {
+		fslog.Error(err)
+		return
+	}
+}
+
+func SendString(c *api.Context, statusCode int, data string, err error) {
+	if err != nil {
+		c.String(statusCode, err.Error())
+		return
+	}
+
+	c.String(statusCode, data)
+}
+
+func WriteBytes(c *api.Context, statusCode int, bytes []byte, err error) {
+	if err != nil {
+		c.AbortWithStatus(statusCode)
+		return
+	}
+
+	_, err = c.Writer.Write(bytes)
+	if err != nil {
+		c.AbortWithStatus(statusCode)
+		return
+	}
+
+	c.Writer.Flush()
+}
+
+type WXOrderResponse struct {
+	ReturnCode string `xml:"return_code"`
+	ReturnMsg  string `xml:"return_msg"`
+}
+
+func SendWXOrderResponse(c *api.Context, statusCode int, _ any, err error) {
+	if err != nil {
+		c.XML(statusCode, &WXOrderResponse{
+			ReturnCode: "FAIL",
+			ReturnMsg:  err.Error(),
+		})
+		return
+	}
+
+	c.XML(statusCode, &WXOrderResponse{
+		ReturnCode: "SUCCESS",
+	})
+}

binding/response_data.go

@@ -0,0 +1,7 @@
+package binding
+
+type InfosData[T any] struct {
+	Infos      []T   `json:"infos"`
+	TotalCount int64 `json:"totalCount"`
+	PageNo     int   `json:"pageNo"`
+}

binding/response_type.go

@@ -0,0 +1,9 @@
+package binding
+
+import "git.sxidc.com/go-framework/baize/api"
+
+type SendFunc[T any] func(c *api.Context, statusCode int, data T, err error)
+
+type IDType interface {
+	~string | ~uint64
+}

examples/bind/main.go

@@ -1,59 +1,50 @@
 package main
 
-//import (
-//	DEATH "github.com/vrecan/death"
-//	"go-framework/baize"
-//	"go-tools/api_binding/http_binding"
-//	"go-tools/api_binding/http_binding/binding_context"
-//	"syscall"
-//)
-
-//type Hello struct {
-//	What string `json:"what"`
-//}
+import (
+	"git.sxidc.com/go-framework/baize"
+	"git.sxidc.com/go-framework/baize/application"
+	DEATH "github.com/vrecan/death"
+	"syscall"
+)
+
+type Hello struct {
+	What string `json:"what"`
+}
 
 func main() {
-	//app, err := baize.NewApplication("10000", WithDB(config))
-	//if err != nil {
-	//	panic(err)
-	//}
-	//
-	//app.RegisterRouter("root", middlewares...).
-	//	BindRoute(binding, &http_binding.SimpleBindItem[any, map[string]any]{
-	//		Path:         "/version",
-	//		ResponseFunc: response.SendMapResponse,
-	//		BusinessFunc: func(c *binding_context.Context, inputModel any) (map[string]any, error) {
-	//			return map[string]any{
-	//				"version": "v1.0.0",
-	//			}, nil
-	//		},
-	//	})
-	//
-	//app.RegisterRouter("v1", middlewares...).
-	//	BindPost(binding, &http_binding.SimpleBindItem[Hello, map[string]any]{
-	//		Path:         "/hello",
-	//		ResponseFunc: response.SendMapResponse,
-	//		BusinessFunc: func(c *binding_context.Context, inputModel Hello) (map[string]any, error) {
-	//			return map[string]any{
-	//				"version": application.GetVersionService().Version(),
-	//			}, nil
-	//		},
-	//	})
-	//
-	//go func() {
-	//	err := app.Start()
-	//	if err != nil {
-	//		panic(err)
-	//	}
-	//}()
-	//
-	//defer func() {
-	//	err := app.Finish()
-	//	if err != nil {
-	//		panic(err)
-	//	}
-	//}()
-	//
-	//death := DEATH.NewDeath(syscall.SIGINT, syscall.SIGTERM)
-	//_ = death.WaitForDeath()
+	app := baize.NewApplication(application.Config{
+		ApiConfig: application.ApiConfig{
+			UrlPrefix: "test",
+			Port:      "10000",
+		},
+	})
+
+	versionedRouter := app.Api().PrefixRouter().RegisterVersionedRouter("v1")
+
+	binding.GetBind(versionedRouter, &binding.SimpleBindItem[any, map[string]any]{
+		Path:         "/version",
+		ResponseFunc: response.SendMapResponse,
+		BusinessFunc: func(c *binding_context.Context, inputModel any) (map[string]any, error) {
+			return map[string]any{
+				"version": "v1.0.0",
+			}, nil
+		},
+	})
+
+	go func() {
+		err := app.Start()
+		if err != nil {
+			panic(err)
+		}
+	}()
+
+	defer func() {
+		err := app.Finish()
+		if err != nil {
+			panic(err)
+		}
+	}()
+
+	death := DEATH.NewDeath(syscall.SIGINT, syscall.SIGTERM)
+	_ = death.WaitForDeath()
 }

go.mod

@@ -4,9 +4,10 @@ go 1.22.3
 
 require (
 	git.sxidc.com/go-tools/utils v1.5.7
+	git.sxidc.com/service-supports/fserr v0.3.5
 	git.sxidc.com/service-supports/fslog v0.5.9
+	git.sxidc.com/service-supports/websocket v1.3.1
 	github.com/gin-gonic/gin v1.10.0
-	github.com/pkg/errors v0.9.1
 	github.com/vrecan/death v3.0.1+incompatible
 	go.uber.org/zap v1.27.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
@@ -25,13 +26,16 @@ require (
 	github.com/go-playground/universal-translator v0.18.1 // indirect
 	github.com/go-playground/validator/v10 v10.20.0 // indirect
 	github.com/goccy/go-json v0.10.2 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/olahol/melody v1.2.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
+	github.com/puzpuzpuz/xsync v1.5.2 // indirect
 	github.com/satori/go.uuid v1.2.0 // indirect
 	github.com/smartystreets/goconvey v1.8.1 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect

go.sum

@@ -1,7 +1,11 @@
 git.sxidc.com/go-tools/utils v1.5.7 h1:vVtOfbyZPdmogyWGti2hqctv3uy+2R6Rqg88Ge3CCUg=
 git.sxidc.com/go-tools/utils v1.5.7/go.mod h1:fkobAXFpOMTvkZ82TQXWcpsayePcyk/MS5TN6GTlRDg=
+git.sxidc.com/service-supports/fserr v0.3.5 h1:1SDC60r3FIDd2iRq/oHRLK4OMa1gf67h9B7kierKTUE=
+git.sxidc.com/service-supports/fserr v0.3.5/go.mod h1:8U+W/ulZIGVPFojV6cE18shkGXqvaICuzaxIJpOcBqI=
 git.sxidc.com/service-supports/fslog v0.5.9 h1:q2XIK2o/fk/qmByy4x5kKLC+k7kolT5LrXHcWRSffXQ=
 git.sxidc.com/service-supports/fslog v0.5.9/go.mod h1:/m03ATmmOle75qtEgvEw8a1+Dcg6iHp08M1bGFXJTBU=
+git.sxidc.com/service-supports/websocket v1.3.1 h1:1mRfUwvpg0QA2JVKVMK8YJ/B33HFpDhY9srqroIuNGc=
+git.sxidc.com/service-supports/websocket v1.3.1/go.mod h1:YqEZXkN8ZFzUp01tDlekgIJJ0Yz+67d6eTXyA0ZIkgM=
 github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
 github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
@@ -31,11 +35,13 @@ github.com/go-playground/validator/v10 v10.20.0 h1:K9ISHbSaI0lyB2eWMPJo+kOS/FBEx
 github.com/go-playground/validator/v10 v10.20.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
-github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
-github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g=
 github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
@@ -53,12 +59,14 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/olahol/melody v1.2.1 h1:xdwRkzHxf+B0w4TKbGpUSSkV516ZucQZJIWLztOWICQ=
+github.com/olahol/melody v1.2.1/go.mod h1:GgkTl6Y7yWj/HtfD48Q5vLKPVoZOH+Qqgfa7CvJgJM4=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/puzpuzpuz/xsync v1.5.2 h1:yRAP4wqSOZG+/4pxJ08fPTwrfL0IzE/LKQ/cw509qGY=
+github.com/puzpuzpuz/xsync v1.5.2/go.mod h1:K98BYhX3k1dQ2M63t1YNVDanbwUPmBCAhNmVrrxfiGg=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/smarty/assertions v1.15.0 h1:cR//PqUBUiQRakZWqBiFFQ9wb8emQGDb0HeGdqGByCY=
@@ -102,8 +110,6 @@ golang.org/x/sys v0.20.0 h1:Od9JTbYCk261bKm4M/mw7AklTlFYIa0bIp9BgSm1S8Y=
 golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
 golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
-golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg=
 google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=

logger/logger.go

@@ -6,9 +6,31 @@ import (
 	"go.uber.org/zap/zapcore"
 	"gopkg.in/natefinch/lumberjack.v2"
 	"io"
+	"os"
 	"sync"
 )
 
+var loggerInstance *Logger
+
+func init() {
+	consoleCfg := zap.NewDevelopmentEncoderConfig()
+	consoleCfg.EncodeTime = zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05")
+	jsonCfg := zap.NewProductionEncoderConfig()
+	jsonCfg.EncodeTime = zapcore.TimeEncoderOfLayout("2006-01-02 15:04:05")
+
+	loggerInstance = New(WithSkipCaller(2))
+
+	loggerInstance.cores = append(loggerInstance.cores,
+		zapcore.NewCore(zapcore.NewConsoleEncoder(consoleCfg), zapcore.AddSync(os.Stdout), loggerInstance.lv),
+	)
+
+	loggerInstance.flushLogger()
+}
+
+func GetInstance() *Logger {
+	return loggerInstance
+}
+
 // Logger 是对 zap.SugaredLogger 的封装，简化其对外使用的接口，
 // 并且针对于 Logger 所有配置都是支持运行时动态修改，且并发安全。
 // Logger 也支持了针对于 zapcore.Core 的扩展，调用 Logger.AddCore 即可，