diff --git a/internal/data/mixrepoimpl/cmb.go b/internal/data/mixrepoimpl/cmb.go index 4e86e39..bfd140b 100644 --- a/internal/data/mixrepoimpl/cmb.go +++ b/internal/data/mixrepoimpl/cmb.go @@ -144,7 +144,6 @@ func (s *CmbMixRepoImpl) VerifyNew(_ context.Context, req *v1.CmbRequest) (strin str := cmb.SortStructStr(req) - //b, err := cmb.Verify(s.bc.Cmb.CmbSm2Puk, str, req.Sign) b, err := cmb.VerifyBody(str, req.Sign, s.bc.Cmb.CmbSm2Puk) if err != nil { return "", err2.ErrorCmbVerifyFail(err.Error()) @@ -164,7 +163,6 @@ func (s *CmbMixRepoImpl) VerifyNew(_ context.Context, req *v1.CmbRequest) (strin func (s *CmbMixRepoImpl) GetRequest(_ context.Context, reqBo *bo.CmbRequestBo) (*v1.CmbRequest, error) { - //encryptBody, err := cmb.Encrypt(s.bc.Cmb.CmbSm2Puk, reqBo.BizContent) encryptBody, err := cmb.EncryptBody(&cmb.Encrypts{SoaPubKey: s.bc.Cmb.CmbSm2Puk, JsonParam: reqBo.BizContent}) if err != nil { return nil, err @@ -203,7 +201,6 @@ func (s *CmbMixRepoImpl) GetMockRequest(_ context.Context, bizContent string) (* return nil, errors.New("mock cmb sm2 pik is empty") } - //encryptBody, err := cmb.Encrypt(s.bc.Cmb.Sm2Puk, bizContent) encryptBody, err := cmb.EncryptBody(&cmb.Encrypts{SoaPubKey: s.bc.Cmb.CmbSm2Puk, JsonParam: bizContent}) if err != nil { return nil, err @@ -234,7 +231,6 @@ func (s *CmbMixRepoImpl) VerifyResponse(_ context.Context, req *v1.CmbReply) err str := cmb.SortStructStr(req) - //b, err := cmb.Verify(s.bc.Cmb.CmbSm2Puk, str, req.Sign) b, err := cmb.VerifyBody(str, req.Sign, s.bc.Cmb.CmbSm2Puk) if err != nil { return err @@ -295,7 +291,7 @@ func (s *CmbMixRepoImpl) Request(ctx context.Context, req *v1.CmbRequest, uri st _, bodyBytes, err := request.Post(ctx, r, nil, request.WithHeaders(h)) if err != nil { - log.Errorf("请求掌上生活报错,url=%s,err=%v", r, err) + log.Errorf("请求掌上生活报错,url:%s,err:%v", r, err) return nil, err } @@ -303,12 +299,12 @@ func (s *CmbMixRepoImpl) Request(ctx context.Context, req *v1.CmbRequest, uri st var response *v1.CmbReply if err = json.Unmarshal(bodyBytes, &response); err != nil { - log.Errorf("请求掌上生活返回数据解析报错,err:%s", string(bodyBytes), err.Error()) + log.Errorf("请求掌上生活返回数据解析报错:%s", err.Error()) return nil, err } if response.RespCode != vo.CmbResponseStatusSuccess.GetValue() { - log.Errorf("请求掌上生活返回报错,err:%s", r, response.RespMsg) + log.Errorf("请求掌上生活返回报错:%s", r, response.RespMsg) return nil, fmt.Errorf(response.RespMsg) } @@ -320,7 +316,11 @@ func (s *CmbMixRepoImpl) Decrypt(_ context.Context, encryptBody string) (string, if len(s.bc.Cmb.CmbSm2Pik) == 0 { return "", errors.New("mock CmbSm2Pik is empty") } + rs, err := cmb.DecryptBody(&cmb.Decrypts{EncryptBody: encryptBody, PrivateKey: s.bc.Cmb.CmbSm2Pik}) - return string(rs), err - //return cmb.Decrypt(s.bc.Cmb.CmbSm2Pik, encryptBody) + if err != nil { + return "", err + } + + return string(rs), nil }