From 467f081a1a0c228b5e8ee1f23be861ee6083f55e Mon Sep 17 00:00:00 2001 From: Mrx <18278715334@163.com> Date: Mon, 11 May 2026 15:02:57 +0800 Subject: [PATCH] f --- app/main/api/etc/main.dev.yaml | 5 ++--- .../adminbatchunfreezeagentcommissionlogic.go | 0 .../admingetagentcommissiondeductionlistlogic.go | 0 .../admin_agent/admingetagentcommissionlistlogic.go | 0 .../admin_agent/admingetagentlinklistlogic.go | 0 .../admingetagentlinkproductstatisticslogic.go | 0 .../admin_agent/admingetagentlistlogic.go | 0 .../admingetagentmembershipconfiglistlogic.go | 0 ...admingetagentmembershiprechargeorderlistlogic.go | 0 .../admingetagentorderstatisticslogic.go | 0 .../admingetagentplatformdeductionlistlogic.go | 0 .../admingetagentproductionconfiglistlogic.go | 0 .../admin_agent/admingetagentrewardlistlogic.go | 0 .../admin_agent/admingetagentstatisticslogic.go | 0 .../admin_agent/admingetagentwalletlogic.go | 0 .../admingetagentwallettransactionlistlogic.go | 0 .../admin_agent/admingetagentwithdrawallistlogic.go | 0 .../admin_agent/admingetsystemconfiglogic.go | 0 .../admingetwithdrawalstatisticslogic.go | 0 .../adminreviewbankcardwithdrawallogic.go | 0 .../adminupdateagentcommissionstatuslogic.go | 0 .../adminupdateagentmembershipconfiglogic.go | 0 .../adminupdateagentproductionconfiglogic.go | 0 .../adminupdateagentwalletbalancelogic.go | 0 .../admin_agent/adminupdatesystemconfiglogic.go | 0 .../api/internal/logic/query/queryservicelogic.go | 13 ++++++++++--- common/ctxdata/ctxData.go | 4 ++-- 27 files changed, 14 insertions(+), 8 deletions(-) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/adminbatchunfreezeagentcommissionlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentcommissiondeductionlistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentcommissionlistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentlinklistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentlinkproductstatisticslogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentlistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentmembershipconfiglistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentmembershiprechargeorderlistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentorderstatisticslogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentplatformdeductionlistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentproductionconfiglistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentrewardlistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentstatisticslogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentwalletlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentwallettransactionlistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetagentwithdrawallistlogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetsystemconfiglogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/admingetwithdrawalstatisticslogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/adminreviewbankcardwithdrawallogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/adminupdateagentcommissionstatuslogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/adminupdateagentmembershipconfiglogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/adminupdateagentproductionconfiglogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/adminupdateagentwalletbalancelogic.go (100%) rename app/main/api/internal/{logic => handler/admin_agent}/admin_agent/adminupdatesystemconfiglogic.go (100%) diff --git a/app/main/api/etc/main.dev.yaml b/app/main/api/etc/main.dev.yaml index 88a9758..4bef70c 100644 --- a/app/main/api/etc/main.dev.yaml +++ b/app/main/api/etc/main.dev.yaml @@ -52,7 +52,6 @@ Wxpay: MchPlatformRAS: "PUB_KEY_ID_0111052766902026050900112134001605" NotifyUrl: "https://www.tianyuancha.cn/api/v1/pay/wechat/callback" RefundNotifyUrl: "https://www.tianyuancha.cn/api/v1/wechat/refund_callback" -# MchApiv2Key: "Kx9pL2mQ8vR4tY6wE1zA5cD7fH0jN3bS" Applepay: ProductionVerifyURL: "https://api.storekit.itunes.apple.com/inApps/v1/transactions/receipt" @@ -71,8 +70,8 @@ WechatH5: AppID: "wxd391e40295bd9dfb" AppSecret: "f0fa74f7ed8c3c9953677465d44a4c0c" WechatMini: - AppID: "wx781abb66b3368963" # 小程序的AppID - AppSecret: "c7d02cdb0fc23c35c93187af9243b00d" # 小程序的AppSecret + AppID: "wx5bacc94add2da981" # 小程序的AppID + AppSecret: "48a2c1e8ff1b7d4c0ff82fbefa64d2d0" # 小程序的AppSecret TycAppID: "wxe74617f3dd56c196" TycAppSecret: "c8207e54aef5689b2a7c1f91ed7ae8a0" Query: diff --git a/app/main/api/internal/logic/admin_agent/adminbatchunfreezeagentcommissionlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/adminbatchunfreezeagentcommissionlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/adminbatchunfreezeagentcommissionlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/adminbatchunfreezeagentcommissionlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentcommissiondeductionlistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentcommissiondeductionlistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentcommissiondeductionlistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentcommissiondeductionlistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentcommissionlistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentcommissionlistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentcommissionlistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentcommissionlistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentlinklistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentlinklistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentlinklistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentlinklistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentlinkproductstatisticslogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentlinkproductstatisticslogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentlinkproductstatisticslogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentlinkproductstatisticslogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentlistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentlistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentlistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentlistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentmembershipconfiglistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentmembershipconfiglistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentmembershipconfiglistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentmembershipconfiglistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentmembershiprechargeorderlistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentmembershiprechargeorderlistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentmembershiprechargeorderlistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentmembershiprechargeorderlistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentorderstatisticslogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentorderstatisticslogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentorderstatisticslogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentorderstatisticslogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentplatformdeductionlistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentplatformdeductionlistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentplatformdeductionlistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentplatformdeductionlistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentproductionconfiglistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentproductionconfiglistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentproductionconfiglistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentproductionconfiglistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentrewardlistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentrewardlistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentrewardlistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentrewardlistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentstatisticslogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentstatisticslogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentstatisticslogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentstatisticslogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentwalletlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentwalletlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentwalletlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentwalletlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentwallettransactionlistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentwallettransactionlistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentwallettransactionlistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentwallettransactionlistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetagentwithdrawallistlogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetagentwithdrawallistlogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetagentwithdrawallistlogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetagentwithdrawallistlogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetsystemconfiglogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetsystemconfiglogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetsystemconfiglogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetsystemconfiglogic.go diff --git a/app/main/api/internal/logic/admin_agent/admingetwithdrawalstatisticslogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/admingetwithdrawalstatisticslogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/admingetwithdrawalstatisticslogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/admingetwithdrawalstatisticslogic.go diff --git a/app/main/api/internal/logic/admin_agent/adminreviewbankcardwithdrawallogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/adminreviewbankcardwithdrawallogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/adminreviewbankcardwithdrawallogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/adminreviewbankcardwithdrawallogic.go diff --git a/app/main/api/internal/logic/admin_agent/adminupdateagentcommissionstatuslogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentcommissionstatuslogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/adminupdateagentcommissionstatuslogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentcommissionstatuslogic.go diff --git a/app/main/api/internal/logic/admin_agent/adminupdateagentmembershipconfiglogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentmembershipconfiglogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/adminupdateagentmembershipconfiglogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentmembershipconfiglogic.go diff --git a/app/main/api/internal/logic/admin_agent/adminupdateagentproductionconfiglogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentproductionconfiglogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/adminupdateagentproductionconfiglogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentproductionconfiglogic.go diff --git a/app/main/api/internal/logic/admin_agent/adminupdateagentwalletbalancelogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentwalletbalancelogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/adminupdateagentwalletbalancelogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/adminupdateagentwalletbalancelogic.go diff --git a/app/main/api/internal/logic/admin_agent/adminupdatesystemconfiglogic.go b/app/main/api/internal/handler/admin_agent/admin_agent/adminupdatesystemconfiglogic.go similarity index 100% rename from app/main/api/internal/logic/admin_agent/adminupdatesystemconfiglogic.go rename to app/main/api/internal/handler/admin_agent/admin_agent/adminupdatesystemconfiglogic.go diff --git a/app/main/api/internal/logic/query/queryservicelogic.go b/app/main/api/internal/logic/query/queryservicelogic.go index 44329de..bc1a25d 100644 --- a/app/main/api/internal/logic/query/queryservicelogic.go +++ b/app/main/api/internal/logic/query/queryservicelogic.go @@ -113,7 +113,8 @@ var productHandlers = map[string]queryHandlerFunc{ // productHasSmsCode 表示该 product 解密后的请求结构体中是否包含必填短信验证码 Code。 // 有 Code 的产品在「获取验证码」时已经做了滑块，这里不再强制要求 CaptchaVerifyParam。 -// 其他产品（无 Code）在查询时必须传并校验 CaptchaVerifyParam，防止跳过图形验证。 +// 其他产品（无 Code）在查询时必须传并校验 CaptchaVerifyParam，防止跳过图形验证； +// 微信小程序（X-Platform: wxmini，见 ctxdata.GetPlatformFromCtx）不嵌入 H5 滑块，由 PreprocessLogic 跳过图形校验。 func productHasSmsCode(product string) bool { switch product { case "marriage", @@ -140,8 +141,14 @@ func productHasSmsCode(product string) bool { } func (l *QueryServiceLogic) PreprocessLogic(req *types.QueryServiceReq, product string) (*types.QueryServiceResp, error) { - // 无短信验证码 Code 的 product：查询前必须传并校验滑块，否则不允许跳过 - if !productHasSmsCode(product) { + // 无短信验证码 Code 的 product：查询前必须传并校验滑块；微信小程序端跳过（依赖登录态与 X-Platform） + requireCaptcha := !productHasSmsCode(product) + if requireCaptcha { + if plat, platErr := ctxdata.GetPlatformFromCtx(l.ctx); platErr == nil && plat == model.PlatformWxMini { + requireCaptcha = false + } + } + if requireCaptcha { if req.CaptchaVerifyParam == "" { return nil, errors.Wrapf(xerr.NewErrMsg("请完成图形验证"), "product %s requires captcha", product) } diff --git a/common/ctxdata/ctxData.go b/common/ctxdata/ctxData.go index 38f5280..abf7824 100644 --- a/common/ctxdata/ctxData.go +++ b/common/ctxdata/ctxData.go @@ -90,7 +90,7 @@ func GetPlatformFromCtx(ctx context.Context) (string, error) { } switch platform { - case model.PlatformWxMini: + case model.PlatformWxMini, "mp-weixin": // 兼容旧客户端误传的 uni 平台名 return model.PlatformWxMini, nil case model.PlatformWxH5: return model.PlatformWxH5, nil @@ -99,6 +99,6 @@ func GetPlatformFromCtx(ctx context.Context) (string, error) { case model.PlatformH5: return model.PlatformH5, nil default: - return "", fmt.Errorf("不支持的支付平台: %s", platform) + return "", fmt.Errorf("不支持的客户端平台: %s", platform) } }