From 18e4a8080d463e8d28c089ecfdc54a58e63ccafc Mon Sep 17 00:00:00 2001 From: liangzai <2440983361@qq.com> Date: Sun, 13 Oct 2024 01:21:13 +0800 Subject: [PATCH] temp --- aes.go | 9 ++++--- apps/api/api.api | 10 +++---- .../internal/handler/FLXG/flxg3d56handler.go | 7 +++-- apps/api/internal/handler/routes.go | 10 +++---- apps/api/internal/logic/FLXG/flxg3d56logic.go | 27 +++++++++++++++++++ pkg/response/response.go | 5 ---- 6 files changed, 48 insertions(+), 20 deletions(-) diff --git a/aes.go b/aes.go index 4f98573..1313402 100644 --- a/aes.go +++ b/aes.go @@ -96,7 +96,7 @@ func main() { var data interface{} - decrypt, err := AesDecrypt("AEQHGRyEolE4o8GoZaWuEFGpGRLEvEMCNM54KzZ/HdnvfOtyFDfn1PVpD6Cb37rQpJm3CqZYLDJWmEcU0f7IeD0MG8Zh1PIvSEwJVEyI2OkZjooZNjuchARpqeG40sS8hFjQt/xVP3qBVsF6+tdnI8GNc8EdLpZ8ja4c/xVprhjr9yRmRHZOVvECFiJkqwrve8jq2vuC5CowNjc4THK8zRmJI+qWDazUL4vntdWFmqG4YmHDZm/UFecevDNMhWRfdeWE2aI9lTXZ/X/gtHEcVyzbx8cltdn+4KuR3t6VPf3edWDSDM0PTxSNbWwPgaTC1sMbBJiFJLW+cUgxJhfQqE1FF5yY+t6V7l8vfW6cUV4xRCFZ/clFvidnYev2CocvMKzf6gkbO/El2a4VA5ustRwL1G3hxMf9fd+5yGT5dEGci+cbysGHTKzNeHf75az1RgW2WEYUBUc7czNiZgkaIA==", key) + decrypt, err := AesDecrypt("4m/PoMtbeJKATgzUBDfYDUk404jaEa8D6l4LH1J8+u8/Fc5VPA24qWEX+T4Q47APxpedOi5Rsah2Z/op1guL0i4m/VCHii1ysYi2Y7OBvL+bd2LvY7fmAuctmx2YN7V66zyD3yAXYJBez4Ui1xMahsLbgrdprRvIqn/vgcOA+SPZM41qWNdxthczO/SlNkYQs0oAiNSzhSOaB2nX6hKmvWciLdRE3wBi75Lfnuni2FK2FtWnWvDw8MqreEO9xazz8cVXPwdqpIbS61dQOntkFF3QSSGt1lAvCtOrcKd06gEq14QOfFfMGM4Ck/Z+fiB1pXPBV7SAHp8PBcSyr0qtv2VBXid+dWe55EJetkPhJgOg1BaBJHZImAFsTakEnP9ZH67xsiWVajN5hThTsZunzrFyj8Wmn60EvBVJ+oQnKOJ35dt2c2LLRHG/O3/lkMBuiAVp/xtlO5R8vMshpMgM1g==", key) if err != nil { return } @@ -105,9 +105,12 @@ func main() { return } fmt.Println(data) + //data = map[string]interface{}{ - // "id_card": "45212220000827423X", - // "name": "张荣宏", + // "id_card": "45212220000827423X", + // "name": "张荣宏", + // "time_range": "5", + // "mobile_no": "18276151590", //} // //// 将结构体转为 JSON 字符串 diff --git a/apps/api/api.api b/apps/api/api.api index d2c5923..1912fc4 100644 --- a/apps/api/api.api +++ b/apps/api/api.api @@ -18,7 +18,7 @@ type response { @server ( group: IVYZ prefix: /api/v1 - middleware: ApiAuthInterceptor,ApiMqsInterceptor + middleware: ApiAuthInterceptor ) service api-api { @handler IVYZ0B03 @@ -43,7 +43,7 @@ service api-api { @server ( group: FLXG prefix: /api/v1 - middleware: ApiAuthInterceptor,ApiMqsInterceptor + middleware: ApiAuthInterceptor ) service api-api { @handler FLXGCA3D @@ -80,7 +80,7 @@ service api-api { @server ( group: QYGL prefix: /api/v1 - middleware: ApiAuthInterceptor,ApiMqsInterceptor + middleware: ApiAuthInterceptor ) service api-api { @handler QYGLB4C0 @@ -102,7 +102,7 @@ service api-api { @server ( group: YYSY prefix: /api/v1 - middleware: ApiAuthInterceptor,ApiMqsInterceptor + middleware: ApiAuthInterceptor ) service api-api { @handler YYSY6F2E @@ -127,7 +127,7 @@ service api-api { @server ( group: JRZQ prefix: /api/v1 - middleware: ApiAuthInterceptor,ApiMqsInterceptor + middleware: ApiAuthInterceptor ) service api-api { @handler JRZQDCBE diff --git a/apps/api/internal/handler/FLXG/flxg3d56handler.go b/apps/api/internal/handler/FLXG/flxg3d56handler.go index 3590161..e226ef7 100644 --- a/apps/api/internal/handler/FLXG/flxg3d56handler.go +++ b/apps/api/internal/handler/FLXG/flxg3d56handler.go @@ -22,10 +22,13 @@ func FLXG3D56Handler(svcCtx *svc.ServiceContext) http.HandlerFunc { l := FLXG.NewFLXG3D56Logic(r.Context(), svcCtx) resp, err := l.FLXG3D56(&req) + ctx := r.Context() if err != nil { - response.Fail(r.Context(), w, err) + r = r.WithContext(ctx) + response.Fail(ctx, w, err) } else { - response.Success(r.Context(), w, resp) + r = r.WithContext(ctx) + response.Success(ctx, w, resp) } } } diff --git a/apps/api/internal/handler/routes.go b/apps/api/internal/handler/routes.go index ddb6c87..a194362 100644 --- a/apps/api/internal/handler/routes.go +++ b/apps/api/internal/handler/routes.go @@ -19,7 +19,7 @@ import ( func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { server.AddRoutes( rest.WithMiddlewares( - []rest.Middleware{serverCtx.ApiAuthInterceptor, serverCtx.ApiMqsInterceptor}, + []rest.Middleware{serverCtx.ApiAuthInterceptor}, []rest.Route{ { Method: http.MethodPost, @@ -78,7 +78,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { server.AddRoutes( rest.WithMiddlewares( - []rest.Middleware{serverCtx.ApiAuthInterceptor, serverCtx.ApiMqsInterceptor}, + []rest.Middleware{serverCtx.ApiAuthInterceptor}, []rest.Route{ { Method: http.MethodPost, @@ -117,7 +117,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { server.AddRoutes( rest.WithMiddlewares( - []rest.Middleware{serverCtx.ApiAuthInterceptor, serverCtx.ApiMqsInterceptor}, + []rest.Middleware{serverCtx.ApiAuthInterceptor}, []rest.Route{ { Method: http.MethodPost, @@ -146,7 +146,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { server.AddRoutes( rest.WithMiddlewares( - []rest.Middleware{serverCtx.ApiAuthInterceptor, serverCtx.ApiMqsInterceptor}, + []rest.Middleware{serverCtx.ApiAuthInterceptor}, []rest.Route{ { Method: http.MethodPost, @@ -180,7 +180,7 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { server.AddRoutes( rest.WithMiddlewares( - []rest.Middleware{serverCtx.ApiAuthInterceptor, serverCtx.ApiMqsInterceptor}, + []rest.Middleware{serverCtx.ApiAuthInterceptor}, []rest.Route{ { Method: http.MethodPost, diff --git a/apps/api/internal/logic/FLXG/flxg3d56logic.go b/apps/api/internal/logic/FLXG/flxg3d56logic.go index 6c6524d..d961708 100644 --- a/apps/api/internal/logic/FLXG/flxg3d56logic.go +++ b/apps/api/internal/logic/FLXG/flxg3d56logic.go @@ -32,6 +32,9 @@ func NewFLXG3D56Logic(ctx context.Context, svcCtx *svc.ServiceContext) *FLXG3D56 // FLXG3D56 特殊名单 func (l *FLXG3D56Logic) FLXG3D56(req *types.Request) (resp *types.Response, err *errs.AppError) { + var status string + var charges bool + var remark = "" secretKey, ok := l.ctx.Value("secretKey").(string) if !ok { return &types.Response{}, errs.ErrSystem @@ -40,6 +43,29 @@ func (l *FLXG3D56Logic) FLXG3D56(req *types.Request) (resp *types.Response, err if !ok { return &types.Response{}, errs.ErrSystem } + userId, userIdOk := l.ctx.Value("userId").(int64) + if !userIdOk { + return &types.Response{}, errs.ErrSystem + } + productCode, productCodeOk := l.ctx.Value("productCode").(string) + if !productCodeOk || productCode == "" { + return &types.Response{}, errs.ErrSystem + } + + defer func() { + if err != nil { + status = "failed" + charges = false + } else { + status = "success" + charges = true + } + sendApiRequestMessageErr := l.svcCtx.ApiRequestMqsService.SendApiRequestMessage(l.ctx, transactionID, userId, productCode, status, charges, remark) + if sendApiRequestMessageErr != nil { + logx.Errorf("发送 API 请求消息失败: %v", err) + } + }() + // 1、解密 key, decodeErr := hex.DecodeString(secretKey) if decodeErr != nil { @@ -87,6 +113,7 @@ func (l *FLXG3D56Logic) FLXG3D56(req *types.Request) (resp *types.Response, err if aesEncrypt != nil { return nil, errs.ErrSystem } + return &types.Response{ Data: encryptData, }, nil diff --git a/pkg/response/response.go b/pkg/response/response.go index 03f47c7..3507d7e 100644 --- a/pkg/response/response.go +++ b/pkg/response/response.go @@ -44,15 +44,10 @@ func sendResponse(ctx context.Context, w http.ResponseWriter, code int, message // 响应成功 func Success(ctx context.Context, w http.ResponseWriter, data interface{}) { - ctx = context.WithValue(ctx, "status", "success") - ctx = context.WithValue(ctx, "Charges", true) - sendResponse(ctx, w, 0, "success", data) } // 响应失败 func Fail(ctx context.Context, w http.ResponseWriter, err *errs.AppError) { - ctx = context.WithValue(ctx, "status", "failed") - ctx = context.WithValue(ctx, "remark", err.Message) sendResponse(ctx, w, err.Code, err.Message, nil) }