diff --git a/.gitignore b/.gitignore index 88fdfbd..2f8421e 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ Thumbs.db # 临时文件 tmp/ temp/ +console # 依赖目录 vendor/ diff --git a/internal/domains/api/services/api_request_service.go b/internal/domains/api/services/api_request_service.go index 370b6cb..69cbe99 100644 --- a/internal/domains/api/services/api_request_service.go +++ b/internal/domains/api/services/api_request_service.go @@ -82,6 +82,7 @@ func registerAllProcessors(combService *comb.CombService) { "FLXG8A3F": flxg.ProcessFLXG8A3FRequest, "FLXG5B2E": flxg.ProcessFLXG5B2ERequest, "FLXG0687": flxg.ProcessFLXG0687Request, + "FLXGBC21": flxg.ProcessFLXGBC21Request, // JRZQ系列处理器 "JRZQ8203": jrzq.ProcessJRZQ8203Request, diff --git a/internal/domains/api/services/processors/flxg/flxgbc21_processor.go b/internal/domains/api/services/processors/flxg/flxgbc21_processor.go index a09d214..d0116bf 100644 --- a/internal/domains/api/services/processors/flxg/flxgbc21_processor.go +++ b/internal/domains/api/services/processors/flxg/flxgbc21_processor.go @@ -11,8 +11,8 @@ import ( "tyapi-server/internal/infrastructure/external/westdex" ) -// ProcessFLXGbc21Request FLXGbc21 API处理方法 -func ProcessFLXGbc21Request(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) { +// ProcessFLXGBC21Request FLXGbc21 API处理方法 +func ProcessFLXGBC21Request(ctx context.Context, params []byte, deps *processors.ProcessorDependencies) ([]byte, error) { var paramsDto dto.FLXG21Req if err := json.Unmarshal(params, ¶msDto); err != nil { return nil, fmt.Errorf("%s: %w", processors.ErrSystem, err) diff --git a/internal/infrastructure/external/yushan/yushan_service.go b/internal/infrastructure/external/yushan/yushan_service.go index 813460c..e1ee709 100644 --- a/internal/infrastructure/external/yushan/yushan_service.go +++ b/internal/infrastructure/external/yushan/yushan_service.go @@ -103,15 +103,11 @@ func (y *YushanService) CallAPI(code string, params map[string]interface{}) (res var respData []byte - 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) + 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) retCode := gjson.GetBytes(respData, "retcode").String() if retCode == "100000" {