加入hashUtils

httpcli/httpcli.go

@@ -7,14 +7,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/entity"
-	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/httpContentType"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
 	"time"
 
+	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/entity"
+	"gitlab.wanzhuangkj.com/tush/xpkg/httpcli/httpContentType"
+
 	"github.com/duke-git/lancet/v2/retry"
 	"gitlab.wanzhuangkj.com/tush/xpkg/gin/ctxUtils"
 	"gitlab.wanzhuangkj.com/tush/xpkg/logger"
@@ -36,6 +37,8 @@ type Request struct {
 	request  *http.Request
 	response *Response
 	err      error
+
+	omitLog bool
 }
 
 // Response HTTP response
@@ -134,6 +137,10 @@ func (x *Request) SetRetry(count uint) *Request {
 	x.retryCount = count
 	return x
 }
+func (x *Request) OmitLog() *Request {
+	x.omitLog = true
+	return x
+}
 
 // SetContentType set ContentType
 func (x *Request) SetContentType(a string) *Request {
@@ -275,14 +282,16 @@ func (x *Request) send(ctx context.Context) {
 	}
 	ctx, cancel := context.WithTimeout(ctx, x.timeout)
 	defer cancel()
-	x.request.WithContext(ctx)
+	x.request = x.request.WithContext(ctx)
 
-	logger.Info("[httpCli] req",
-		logger.String("method", x.method),
-		logger.String("url", x.url),
-		logger.Any("header", x.request.Header),
-		logger.String("body", bodyBuf.String()),
-		ctxUtils.CtxTraceIDField(ctx))
+	if !x.omitLog {
+		logger.Info("[httpCli] req",
+			logger.String("method", x.method),
+			logger.String("url", x.url),
+			logger.Any("header", x.request.Header),
+			logger.String("body", bodyBuf.String()),
+			ctxUtils.CtxTraceIDField(ctx))
+	}
 
 	st := time.Now()
 	if x.retryCount > 0 {
@@ -302,14 +311,15 @@ func (x *Request) send(ctx context.Context) {
 	if httpContentType.IsMedia(x.response.Header) {
 		body = string(getResponseBody(x.Response().BodyBuf(), 16))
 	}
-
-	logger.Info("[httpCli] rsp",
-		logger.String("cost", time.Since(st).String()),
-		logger.Int("statusCode", x.response.StatusCode),
-		logger.String("status", x.response.Status),
-		logger.Any("header", x.Response().Header),
-		logger.String("body", body),
-		ctxUtils.CtxTraceIDField(ctx))
+	if !x.omitLog {
+		logger.Info("[httpCli] rsp",
+			logger.String("cost", time.Since(st).String()),
+			logger.Int("statusCode", x.response.StatusCode),
+			logger.String("status", x.response.Status),
+			logger.Any("header", x.Response().Header),
+			logger.String("body", body),
+			ctxUtils.CtxTraceIDField(ctx))
+	}
 }
 
 // If there is sensitive information in the body, you can use WithIgnoreRoutes set the route to ignore logging

utils/dxsf/dxsf.go

@@ -13,8 +13,8 @@ import (
 )
 
 var (
-	xsfAddr    string
-	httpClient = &client{
+	xsfAddr string
+	api     = &client{
 		cli: httpcli.NewClient(
 			&http.Client{
 				Transport: &http.Transport{
@@ -24,6 +24,7 @@ var (
 				},
 			}),
 	}
+	ErrNoXsfAddr = errors.New("缺少环境变量XSF_ADDR")
 )
 
 type client struct {
@@ -35,21 +36,25 @@ func init() {
 }
 
 func GenerateApiID(ctx context.Context, bizTag string) (xsf.ID, error) {
+	if xsfAddr == "" {
+		return xsf.ID(-1), ErrNoXsfAddr
+	}
 	url := fmt.Sprintf(`http://%s/api/leaf?biz_tag=%s`, xsfAddr, bizTag)
 	reply := &IDReply{}
-	if err := httpClient.cli.NewRequest().SetRetry(3).SetContentType("application/json").SetURL(url).GET(ctx).BindJSON(reply).Err(); err != nil {
-		return xsf.ID(0), err
+	if err := api.cli.NewRequest().OmitLog().SetRetry(3).
+		SetContentType("application/json").SetURL(url).GET(ctx).BindJSON(reply).Err(); err != nil {
+		return xsf.ID(-1), err
 	}
 	if reply.Code == 0 {
 		return xsf.ParseInt64(reply.Data.ID), nil
 	}
-	return xsf.ID(0), errors.New(reply.Msg)
+	return xsf.ID(-1), errors.New(reply.Msg)
 }
 
 type IDReply struct {
 	Code int `json:"code"`
 	Data struct {
-		ID int64 `json:"ID"`
+		ID int64 `json:"id"`
 	} `json:"data"`
 	Msg string `json:"msg"`
 }

utils/hashUtils/md5.go

+package hashUtils
+
+import (
+	"crypto/md5"
+	"encoding/hex"
+)
+
+func Md5(d []byte) string {
+	hashed := md5.Sum(d)
+	return hex.EncodeToString(hashed[:])
+}
+
+func Md5Stream(d []byte) string {
+	hash := md5.New()
+	hash.Write(d)
+	hashed := hash.Sum(nil)
+	return hex.EncodeToString(hashed)
+}