From f991ad94d37718258f34e2a1b90fbb3128e7cbf9 Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Sun, 3 Aug 2025 19:18:53 +0800 Subject: [PATCH] fix yushan --- config.yaml | 2 +- .../infrastructure/external/yushan/yushan_service.go | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/config.yaml b/config.yaml index fd8072a..f1b5dc3 100644 --- a/config.yaml +++ b/config.yaml @@ -191,7 +191,7 @@ westdex: # 🌍 羽山配置 # =========================================== yushan: - url: https://api.yushanshuju.com/credit-gw/service" + url: https://api.yushanshuju.com/credit-gw/service api_key: "4c566c4a4b543164535455685655316c" acct_id: "YSSJ843926726" diff --git a/internal/infrastructure/external/yushan/yushan_service.go b/internal/infrastructure/external/yushan/yushan_service.go index e1ee709..813460c 100644 --- a/internal/infrastructure/external/yushan/yushan_service.go +++ b/internal/infrastructure/external/yushan/yushan_service.go @@ -103,11 +103,15 @@ func (y *YushanService) CallAPI(code string, params map[string]interface{}) (res var respData []byte - sDec, err := base64.StdEncoding.DecodeString(string(body)) - if err != nil { - return nil, fmt.Errorf("%w: %s", ErrSystem, err.Error()) + if IsJSON(string(body)) { + respData = body + } else { + sDec, err := base64.StdEncoding.DecodeString(string(body)) + if err != nil { + return nil, fmt.Errorf("%w: %s", ErrSystem, err.Error()) + } + respData = y.AES_CBC_Decrypt(sDec, key) } - respData = y.AES_CBC_Decrypt(sDec, key) retCode := gjson.GetBytes(respData, "retcode").String() if retCode == "100000" {