From a1f8979edb3388f7b39e75fdb7f45000c06dcb42 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Fri, 10 Jul 2026 17:05:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(channel):=20=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E9=80=9A=E9=81=93=E5=BA=94=E7=94=A8=E8=AE=A4=E8=AF=81=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E4=B8=AD=E7=9A=84=E6=8E=88=E6=9D=83=E5=9B=9E=E8=B0=83?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OAuth 回调由平台网关统一生成,不再由微信/支付宝/抖音应用级配置。 --- _config/sql/update-tables.sql | 4 +--- .../alipay/entity/direct/AlipayDirectAppAuthConfig.java | 5 +---- .../channel/alipay/entity/isv/AlipayIsvAppAuthConfig.java | 5 +---- .../param/direct/AlipayDirectAppAuthConfigParam.java | 8 +------- .../alipay/param/isv/AlipayIsvAppAuthConfigParam.java | 8 +------- .../result/direct/AlipayDirectAppAuthConfigResult.java | 5 +---- .../alipay/result/isv/AlipayIsvAppAuthConfigResult.java | 6 +----- .../service/direct/AlipayDirectAppAuthConfigService.java | 1 - .../alipay/service/isv/AlipayIsvAppAuthConfigService.java | 1 - .../douyin/entity/direct/DouyinDirectAppAuthConfig.java | 5 +---- .../param/direct/DouyinDirectAppAuthConfigParam.java | 6 +----- .../result/direct/DouyinDirectAppAuthConfigResult.java | 3 --- .../service/direct/DouyinDirectAppAuthConfigService.java | 1 - .../wechat/entity/direct/WechatDirectAppAuthConfig.java | 5 +---- .../channel/wechat/entity/isv/WechatIsvAppAuthConfig.java | 5 +---- .../wechat/entity/isv/WechatIsvMchAppAuthConfig.java | 5 +---- .../param/direct/WechatDirectAppAuthConfigParam.java | 7 +------ .../wechat/param/isv/WechatIsvAppAuthConfigParam.java | 5 ----- .../wechat/param/isv/WechatIsvMchAppAuthConfigParam.java | 7 +------ .../result/direct/WechatDirectAppAuthConfigResult.java | 5 +---- .../wechat/result/isv/WechatIsvAppAuthConfigResult.java | 3 --- .../result/isv/WechatIsvMchAppAuthConfigResult.java | 5 +---- .../service/direct/WechatDirectAppAuthConfigService.java | 1 - .../wechat/service/isv/WechatIsvAppAuthConfigService.java | 1 - .../core/strategy/auth/AbsChannelAuthStrategy.java | 2 +- .../src/main/resources/i18n/en-US/validation.json | 4 ---- .../src/main/resources/i18n/zh-CN/validation.json | 4 ---- 27 files changed, 17 insertions(+), 100 deletions(-) diff --git a/_config/sql/update-tables.sql b/_config/sql/update-tables.sql index d899b5222..6f5dac934 100644 --- a/_config/sql/update-tables.sql +++ b/_config/sql/update-tables.sql @@ -58,7 +58,7 @@ COMMENT ON COLUMN wechat_isv_channel_merchant.auth_app_type IS '认证应用类 -- ------------------------------------------------------------ -- 微信服务商通道商户应用授权认证配置表 --- 配置服务商通道商户应用(子商户应用)的应用密钥和授权回调地址, 用于微信OAuth授权流程中的身份验证与回调跳转 +-- 配置服务商通道商户应用(子商户应用)的应用密钥, 用于微信OAuth授权流程中的身份验证 -- 一个应用对应一份授权配置(由唯一约束 channel_mch_no + wechat_isv_mch_app_id 保证) -- ------------------------------------------------------------ CREATE TABLE IF NOT EXISTS wechat_isv_mch_app_auth_config ( @@ -66,7 +66,6 @@ CREATE TABLE IF NOT EXISTS wechat_isv_mch_app_auth_config ( channel_mch_no varchar(32) NOT NULL, wechat_isv_mch_app_id int8 NOT NULL, app_secret varchar(255), - auth_callback_url varchar(255), mch_no varchar(32), creator int8, create_time timestamptz(6), @@ -82,7 +81,6 @@ COMMENT ON COLUMN wechat_isv_mch_app_auth_config.id IS '主键'; COMMENT ON COLUMN wechat_isv_mch_app_auth_config.channel_mch_no IS '通道商户号(服务商特约商户)'; COMMENT ON COLUMN wechat_isv_mch_app_auth_config.wechat_isv_mch_app_id IS '关联服务商通道商户应用ID'; COMMENT ON COLUMN wechat_isv_mch_app_auth_config.app_secret IS '应用密钥(加密存储)'; -COMMENT ON COLUMN wechat_isv_mch_app_auth_config.auth_callback_url IS '授权回调地址'; COMMENT ON COLUMN wechat_isv_mch_app_auth_config.mch_no IS '商户号'; COMMENT ON COLUMN wechat_isv_mch_app_auth_config.creator IS '创建者ID'; COMMENT ON COLUMN wechat_isv_mch_app_auth_config.create_time IS '创建时间'; diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/direct/AlipayDirectAppAuthConfig.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/direct/AlipayDirectAppAuthConfig.java index 7122479d5..cecd3cb73 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/direct/AlipayDirectAppAuthConfig.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/direct/AlipayDirectAppAuthConfig.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; /// # 支付宝直连商户应用授权认证配置 /// -/// 配置直连商户应用的用户标识类型和授权回调地址,用于支付宝用户授权流程中的身份识别与回调跳转。 +/// 配置直连商户应用的用户标识类型,用于支付宝用户授权流程中的身份识别。 /// @EqualsAndHashCode(callSuper = true) @Data @@ -32,9 +32,6 @@ public class AlipayDirectAppAuthConfig extends MchBaseEntity implements ToResult /// 用户标识类型 private String userIdType; - /// 授权回调地址 - private String authCallbackUrl; - /// 转换 @Override public AlipayDirectAppAuthConfigResult toResult() { diff --git a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/isv/AlipayIsvAppAuthConfig.java b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/isv/AlipayIsvAppAuthConfig.java index 3c1c27f25..ba6cdb1b6 100644 --- a/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/isv/AlipayIsvAppAuthConfig.java +++ b/daxpay-channel/daxpay-channel-alipay/src/main/java/cn/daxpay/open/channel/alipay/entity/isv/AlipayIsvAppAuthConfig.java @@ -13,7 +13,7 @@ import lombok.experimental.Accessors; /// # 支付宝服务商应用授权认证配置 /// -/// 配置服务商应用的用户标识类型和授权回调地址,用于支付宝用户授权流程中的身份识别与回调跳转。 +/// 配置服务商应用的用户标识类型,用于支付宝用户授权流程中的身份识别。 /// @EqualsAndHashCode(callSuper = true) @Data @@ -28,9 +28,6 @@ public class AlipayIsvAppAuthConfig extends MpBaseEntity implements ToResult