From 3a9e0a0efc14796d96b003ebe4989b534030194e Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Thu, 31 Oct 2024 11:42:13 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E9=83=A8=E5=93=8D=E5=BA=94=E5=A4=84?= =?UTF-8?q?=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/api/internal/service/west_dex_service.go | 36 +++++++------------ 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/apps/api/internal/service/west_dex_service.go b/apps/api/internal/service/west_dex_service.go index 14085a6..d3a4c33 100644 --- a/apps/api/internal/service/west_dex_service.go +++ b/apps/api/internal/service/west_dex_service.go @@ -104,22 +104,17 @@ func (w *WestDexService) CallAPI(code string, reqData map[string]interface{}, se logx.Infof("西部流水号: %s", westDexResp.ID) if westDexResp.Code != "00000" { - if westDexResp.Code == "-1" { - if westDexResp.Data == "" { - logx.Errorf("【西部数据请求】业务失败时响应数据为空: %s %s", westDexResp.Message, westDexResp.Reason) - return nil, errs.ErrSystem - } - decryptedData, DecryptErr := crypto.WestDexDecrypt(westDexResp.Data, w.config.Key) - if DecryptErr != nil { - logx.Errorf("【西部数据请求】响应数据解密错误: %v", DecryptErr) - return nil, errs.ErrSystem - } - logx.Errorf("【西部数据请求】响应数据业务异常: %s %s %s", westDexResp.Message, westDexResp.Reason, string(decryptedData)) - return decryptedData, errs.ErrDataSource - } else { - logx.Errorf("【西部数据请求】响应数据异常: %s %s", westDexResp.Message, westDexResp.Reason) + if westDexResp.Data == "" { + logx.Errorf("【西部数据请求】业务失败时响应数据为空: %s %s", westDexResp.Message, westDexResp.Reason) return nil, errs.ErrSystem } + decryptedData, DecryptErr := crypto.WestDexDecrypt(westDexResp.Data, w.config.Key) + if DecryptErr != nil { + logx.Errorf("【西部数据请求】响应数据解密错误: %v", DecryptErr) + return nil, errs.ErrSystem + } + logx.Errorf("【西部数据请求】响应数据业务异常: %s %s %s", westDexResp.Message, westDexResp.Reason, string(decryptedData)) + return decryptedData, errs.ErrDataSource } if westDexResp.Data == "" { logx.Errorf("【西部数据请求】响应Data字段数据为空") @@ -199,17 +194,12 @@ func (w *WestDexService) CallAPISecond(code string, reqData map[string]interface logx.Infof("西部流水号: %s", westDexResp.ID) if westDexResp.Code != "0000" { - if westDexResp.Code == "-1" { - if westDexResp.Data == nil { - logx.Errorf("【西部数据请求】业务失败时响应数据为空: %s %s", westDexResp.Message, westDexResp.Reason) - return nil, errs.ErrSystem - } - logx.Errorf("【西部数据请求】响应数据业务异常: %s %s %s", westDexResp.Message, westDexResp.Reason, string(westDexResp.Data)) - return westDexResp.Data, errs.ErrDataSource - } else { - logx.Errorf("【西部数据请求】响应数据异常: %s %s", westDexResp.Message, westDexResp.Reason) + if westDexResp.Data == nil { + logx.Errorf("【西部数据请求】业务失败时响应数据为空: %s %s", westDexResp.Message, westDexResp.Reason) return nil, errs.ErrSystem } + logx.Errorf("【西部数据请求】响应数据业务异常: %s %s %s", westDexResp.Message, westDexResp.Reason, string(westDexResp.Data)) + return westDexResp.Data, errs.ErrDataSource } if westDexResp.Data == nil { logx.Errorf("【西部数据请求】响应Data字段数据为空")