From ba06b05e8f5a9e8fabd236e7ff09aca9377d9e42 Mon Sep 17 00:00:00 2001 From: ziming Date: Wed, 26 Mar 2025 15:45:52 +0800 Subject: [PATCH] ctx --- internal/pkg/cmb/sm2_test.go | 2 +- internal/service/cmb_order.go | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/internal/pkg/cmb/sm2_test.go b/internal/pkg/cmb/sm2_test.go index 41ef4e7..511443f 100644 --- a/internal/pkg/cmb/sm2_test.go +++ b/internal/pkg/cmb/sm2_test.go @@ -193,7 +193,7 @@ func TestDecryptBody(t *testing.T) { //content := "BDUuuPClIlUKDJdpHtNBIU6u5JTetrVG53AfKDSrhah9Q0QZWAj3K5pZF8G/HFtzj/KvbrHfP/gnHri0L7L91HaKYYc1vqy/q8Z69v7MEiIWL2LeLOsc2b0cHmnt7Qey5aZzYVbZJJNhus2gvhahGwOPpPL50JFC8IqAlU4+E/kUBgx+RgzAIkLLs8Se|k1WOt2Eb+xkxSobw/1DaLblguznhnsk1ga87sfqrrPATRuTyszzdVrRtCUuUHRKJ+vQwlZAR1ypkBC1vPMdt8zccI/CeNof+4Ap23enbQwTJQ4KRvij4kbJd6ycY97B+vHnI+oSnwfmjK0EWNUeRrCr2Uau7yxmzlFwJHprbgPZpHVuUjAzMIXNixOfxSTdc9dL+j3/tR7+yookvd9W3hNm96XZFPTheI0FqUKkbKWUUcVs4lC1/yEgjwXFcD4NM" //content := "BDqANzEC9vq82FTu9wR89Ou/8o2J2vD7yeoExb1Uxl2PSA9EsvI7YQNGSkSdxoloqRBn4vIrA8Uh+FmWtJ9wbFEEtbC+Epj8qHWN8S+lH9JEnvJhPhEtMgmHeuGDtvzHMACvc7KoBmJ/6XZIoEyLeRgkJnCTVVxnD78KMJ4eXzj7C2ErkISJ5r3qcL9t|cPw/uy87PW74aeU1RwGwUsYXZlXYkG0m+BoO/3qT4rLSIWsHvBN76yQJlTk89aa9VALdtwcU7H0q7ivCLZ9uflB6YFkg5QRQoj1b2AFFU4TPkpgAdCBAKs5+6z9cwDn+QQyuamKAnp1wJfMj7Ksa3HxLwCxTh/w2dF6LuruLFWZstMK1g9ID7tVTPqc05VNmktmNhc97BYuIH66xa0ZFgr+0i/3hFMx0hNTOau5UWFM6v4Lb1iM/v9ggM5ZvAheUspfgvRUhpD2TZvgyneWxqg==" //content := "BOk+pytaf5faPeISKp/rzspV2ngCr/RuHe3lTTGv+0csaKh3y/x/e6njEbpYpQXCcYTI4eN9pjKMyU9ByA1hsfmiCSU4ziUCu5+ltxDFt/FHuhspBwIYRkVCQM9WefydXgGEuXBd0S+yB6BhBMqJgSUuyjxyF5AecdFoB9AoRyslbqSflqn2cctw5pIx|yvTLMRUfjO+9XV4ilxNBMD9jLwA1PYdthta5uhOOSzaJVOdNDhC+aAltyrLrZkBIUOrPZX7U3RtJVLnsk0y+t8/di+XxriZtnZZ0vTJC0q5tAONN9IE7s9clGGclX5dXYGV4jhP70tFzSeTlWsviLAs9sCvsuIloKEGLJdDvJ53vxiYskX3+pOF0uvOkAlJb70pfOHXsIzSAEhFC88O6o9AR4BRa18ex3V+CqN0CkFUqVazvxoyPFlhzxRXZyBkt" - content := "BAXb6/fN05Wz6rW9oBk58Kt99qjPAKj6eq/3xQOzOqLo8ojyJ7If44Rpsf8So9paFTQFF5phzVm8cbfJUhfIZrXEyKhLejFis+kFn4nCEZzk6n2IYfN/3unJwP3w1R7+m3Uc4rLcHJgMx1f/x5diLZkoMXh4CHdpsUMKVCE7dlYVo5bS4wU5Z+LRUZxT|8dbwjvRxM+6qbUinivHoS2pEWZ1k15PWCPpy5EcEU2g=" + content := "BOk+pytaf5faPeISKp/rzspV2ngCr/RuHe3lTTGv+0csaKh3y/x/e6njEbpYpQXCcYTI4eN9pjKMyU9ByA1hsfmiCSU4ziUCu5+ltxDFt/FHuhspBwIYRkVCQM9WefydXgGEuXBd0S+yB6BhBMqJgSUuyjxyF5AecdFoB9AoRyslbqSflqn2cctw5pIx|yvTLMRUfjO+9XV4ilxNBMD9jLwA1PYdthta5uhOOSzaJVOdNDhC+aAltyrLrZkBIUOrPZX7U3RtJVLnsk0y+t8/di+XxriZtnZZ0vTJC0q5tAONN9IE7s9clGGclX5dXYGV4jhP70tFzSeTlWsviLAs9sCvsuIloKEGLJdDvJ53vxiYskX3+pOF0uvOkAlJb70pfOHXsIzSAEhFC88O6o9AR4BRa18ex3V+CqN0CkFUqVazvxoyPFlhzxRXZyBkt" rs, err := DecryptBody(&Decrypts{content, priKey}) if err != nil { diff --git a/internal/service/cmb_order.go b/internal/service/cmb_order.go index 0b7ecd2..c04690c 100644 --- a/internal/service/cmb_order.go +++ b/internal/service/cmb_order.go @@ -47,18 +47,18 @@ func (c *CmbService) OrderFail(ctx context.Context, err error) (*v1.CmbReply, er return c.GetResponse(ctx, replyBizContent) } -func (c *CmbService) Order(ctx2 context.Context, request *v1.CmbRequest) (*v1.CmbReply, error) { +func (c *CmbService) Order(ctx context.Context, request *v1.CmbRequest) (*v1.CmbReply, error) { //ctx2, cancel := context.WithCancel(ctx) //defer cancel() - orderNo, err := c.order(ctx2, request) + orderNo, err := c.order(ctx, request) if err != nil { - return c.OrderFail(ctx2, err) + return c.OrderFail(ctx, err) } - return c.OrderSuccess(ctx2, orderNo) + return c.OrderSuccess(ctx, orderNo) } func (c *CmbService) order(ctx context.Context, request *v1.CmbRequest) (string, error) { @@ -68,6 +68,8 @@ func (c *CmbService) order(ctx context.Context, request *v1.CmbRequest) (string, return "", err } + ctx2 := context.Background() + if bizContent.ActivityId == "001" { time.Sleep(400 * time.Millisecond) } @@ -83,7 +85,7 @@ func (c *CmbService) order(ctx context.Context, request *v1.CmbRequest) (string, NotifyUrl: c.bc.Cmb.NotifyUrl, } - orderNo, err := c.VoucherBiz.CmbOrder(ctx, boReq) + orderNo, err := c.VoucherBiz.CmbOrder(ctx2, boReq) if err != nil { return "", err }