From ec72eed9545836bc0b584ccd54ff4f4bd5570da1 Mon Sep 17 00:00:00 2001 From: yedf2 <120050102@qq.com> Date: Thu, 24 Feb 2022 10:45:11 +0800 Subject: [PATCH] fix lint --- conf.sample.yml | 2 +- dtmsvr/api_json_rpc_http.go | 58 ++++++++++++++++++------------------- dtmsvr/config/config.go | 2 +- dtmsvr/svr.go | 10 +++---- dtmsvr/trans_class.go | 3 +- 5 files changed, 38 insertions(+), 37 deletions(-) diff --git a/conf.sample.yml b/conf.sample.yml index d9052a5..1fd557e 100644 --- a/conf.sample.yml +++ b/conf.sample.yml @@ -56,7 +56,7 @@ # HttpPort: 36789 # GrpcPort: 36790 -# JsonRpcHttp: 36791 +# JSONRPC: 36791 ### advanced options # UpdateBranchAsyncGoroutineNum: 1 # num of async goroutine to update branch status diff --git a/dtmsvr/api_json_rpc_http.go b/dtmsvr/api_json_rpc_http.go index 4f174e4..edfc426 100644 --- a/dtmsvr/api_json_rpc_http.go +++ b/dtmsvr/api_json_rpc_http.go @@ -3,96 +3,96 @@ package dtmsvr import ( "encoding/json" "fmt" + "net/http" + "github.com/dtm-labs/dtm/dtmcli" "github.com/dtm-labs/dtm/dtmcli/logger" "github.com/gin-gonic/gin" - "net/http" ) -type jsonRpcHttpReq struct { +type jsonRPCReq struct { Method string `json:"method"` Jsonrpc string `json:"jsonrpc"` Params interface{} `json:"params"` - Id string `json:"id"` + ID string `json:"id"` } -func addJsonRpcHttpRouter(engine *gin.Engine) { +func addJSONRPCRouter(engine *gin.Engine) { engine.POST("/", dispatcher) } func dispatcher(c *gin.Context) { - req := new(jsonRpcHttpReq) + req := new(jsonRPCReq) err := c.BindJSON(req) logger.Infof("request:%s\n", req) if err != nil { - c.JSON(http.StatusOK, gin.H{"id": req.Id, "result": nil, "error": map[string]interface{}{"code": -32700, "message": "Parse error"}}) + c.JSON(http.StatusOK, gin.H{"id": req.ID, "result": nil, "error": map[string]interface{}{"code": -32700, "message": "Parse error"}}) return } if req.Method == "dtmserver.NewGid" { - res, err := jsonRpcHttpNewGid() - c.JSON(http.StatusOK, gin.H{"id": req.Id, "result": res, "error": err}) + res := jsonRPCNewGid() + c.JSON(http.StatusOK, gin.H{"id": req.ID, "result": res, "error": err}) return } if req.Method == "dtmserver.Prepare" { - res := jsonRpcHttpPrepare(req.Params) - c.JSON(http.StatusOK, gin.H{"id": req.Id, "result": res, "error": nil}) + res := jsonRPCPrepare(req.Params) + c.JSON(http.StatusOK, gin.H{"id": req.ID, "result": res, "error": nil}) return } if req.Method == "dtmserver.Submit" { - res := jsonRpcHttpSubmit(req.Params) - c.JSON(http.StatusOK, gin.H{"id": req.Id, "result": res, "error": nil}) + res := jsonRPCSubmit(req.Params) + c.JSON(http.StatusOK, gin.H{"id": req.ID, "result": res, "error": nil}) return } if req.Method == "dtmserver.Abort" { - res := jsonRpcHttpAbort(req.Params) - c.JSON(http.StatusOK, gin.H{"id": req.Id, "result": res, "error": nil}) + res := jsonRPCAbort(req.Params) + c.JSON(http.StatusOK, gin.H{"id": req.ID, "result": res, "error": nil}) return } if req.Method == "dtmserver.RegisterBranch" { - res := jsonRpcHttpRegisterBranch(req.Params) - c.JSON(http.StatusOK, gin.H{"id": req.Id, "result": res, "error": nil}) + res := jsonRPCRegisterBranch(req.Params) + c.JSON(http.StatusOK, gin.H{"id": req.ID, "result": res, "error": nil}) return } - c.JSON(http.StatusOK, gin.H{"id": req.Id, "result": nil, "error": map[string]interface{}{"code": -32601, "message": "Method not found"}}) - return + c.JSON(http.StatusOK, gin.H{"id": req.ID, "result": nil, "error": map[string]interface{}{"code": -32601, "message": "Method not found"}}) } -func jsonRpcHttpNewGid() (interface{}, error) { - return map[string]interface{}{"gid": GenGid(), "dtm_result": dtmcli.ResultSuccess}, nil +func jsonRPCNewGid() interface{} { + return map[string]interface{}{"gid": GenGid(), "dtm_result": dtmcli.ResultSuccess} } -func jsonRpcHttpPrepare(params interface{}) interface{} { - res := svcPrepare(TransFromJsonRpcHttpContext(params)) +func jsonRPCPrepare(params interface{}) interface{} { + res := svcPrepare(TransFromJSONRPCContext(params)) if res == nil { return map[string]string{"dtm_result": "SUCCESS"} } return map[string]string{"dtm_result": "FAILURE", "message": fmt.Sprintf("%v", res)} } -func jsonRpcHttpSubmit(params interface{}) interface{} { - res := svcSubmit(TransFromJsonRpcHttpContext(params)) +func jsonRPCSubmit(params interface{}) interface{} { + res := svcSubmit(TransFromJSONRPCContext(params)) if res == nil { return map[string]string{"dtm_result": "SUCCESS"} } return map[string]string{"dtm_result": "FAILURE", "message": fmt.Sprintf("%v", res)} } -func jsonRpcHttpAbort(params interface{}) interface{} { - res := svcAbort(TransFromJsonRpcHttpContext(params)) +func jsonRPCAbort(params interface{}) interface{} { + res := svcAbort(TransFromJSONRPCContext(params)) if res == nil { return map[string]string{"dtm_result": "SUCCESS"} } return map[string]string{"dtm_result": "FAILURE", "message": fmt.Sprintf("%v", res)} } -func jsonRpcHttpRegisterBranch(params interface{}) interface{} { +func jsonRPCRegisterBranch(params interface{}) interface{} { data := map[string]string{} - paramsJson, _ := json.Marshal(params) - err := json.Unmarshal(paramsJson, &data) + paramsJSON, _ := json.Marshal(params) + err := json.Unmarshal(paramsJSON, &data) if err != nil { return map[string]string{"dtm_result": "FAILURE", "message": err.Error()} } diff --git a/dtmsvr/config/config.go b/dtmsvr/config/config.go index 4f9ce1c..7f69588 100644 --- a/dtmsvr/config/config.go +++ b/dtmsvr/config/config.go @@ -76,7 +76,7 @@ type configType struct { RequestTimeout int64 `yaml:"RequestTimeout" default:"3"` HTTPPort int64 `yaml:"HttpPort" default:"36789"` GrpcPort int64 `yaml:"GrpcPort" default:"36790"` - JsonRpcHttpPort int64 `yaml:"JsonRpcHttpPort" default:"36791"` + JSONRPCPort int64 `yaml:"JSONRPCPort" default:"36791"` MicroService MicroService `yaml:"MicroService"` UpdateBranchSync int64 `yaml:"UpdateBranchSync"` UpdateBranchAsyncGoroutineNum int64 `yaml:"UpdateBranchAsyncGoroutineNum" default:"1"` diff --git a/dtmsvr/svr.go b/dtmsvr/svr.go index 7989986..62b06d6 100644 --- a/dtmsvr/svr.go +++ b/dtmsvr/svr.go @@ -68,12 +68,12 @@ func StartSvr() { logger.FatalIfError(err) // start json-rpc server - jsonRpcHttpApp := dtmutil.GetGinApp() - jsonRpcHttpApp = httpMetrics(jsonRpcHttpApp) - addJsonRpcHttpRouter(jsonRpcHttpApp) - logger.Infof("dtmsvr listen at: %d", conf.JsonRpcHttpPort) + jsonRPCApp := dtmutil.GetGinApp() + jsonRPCApp = httpMetrics(jsonRPCApp) + addJSONRPCRouter(jsonRPCApp) + logger.Infof("dtmsvr listen at: %d", conf.JSONRPCPort) go func() { - err := jsonRpcHttpApp.Run(fmt.Sprintf(":%d", conf.JsonRpcHttpPort)) + err := jsonRPCApp.Run(fmt.Sprintf(":%d", conf.JSONRPCPort)) if err != nil { logger.Errorf("start server err: %v", err) } diff --git a/dtmsvr/trans_class.go b/dtmsvr/trans_class.go index 8b039b9..48538cc 100644 --- a/dtmsvr/trans_class.go +++ b/dtmsvr/trans_class.go @@ -85,7 +85,8 @@ func TransFromContext(c *gin.Context) *TransGlobal { return &m } -func TransFromJsonRpcHttpContext(params interface{}) *TransGlobal { +// TransFromJSONRPCContext 1 +func TransFromJSONRPCContext(params interface{}) *TransGlobal { jsonStr, _ := json.Marshal(params) m := TransGlobal{} err := json.Unmarshal(jsonStr, &m)