From 1b00bd124c94629f700425066167883a85022928 Mon Sep 17 00:00:00 2001 From: DaxPay Dev Date: Fri, 10 Jul 2026 17:06:01 +0800 Subject: [PATCH] =?UTF-8?q?refactor(admin):=20=E9=80=9A=E9=81=93=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E8=AE=A4=E8=AF=81=E9=85=8D=E7=BD=AE=E5=8E=BB=E6=8E=89?= =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=9B=9E=E8=B0=83=E5=9C=B0=E5=9D=80=E8=A1=A8?= =?UTF-8?q?=E5=8D=95=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 与后端移除 authCallbackUrl 字段对齐，清理表单、类型与 i18n。 --- .../api/payment/channel/alipay/isv-app.api.ts | 2 -- .../api/payment/channel/alipay/mch-app.api.ts | 2 -- .../api/payment/channel/douyin/mch-app.api.ts | 2 -- .../api/payment/channel/wechat/isv-app.api.ts | 2 -- .../payment/channel/wechat/isv-mch-app.api.ts | 2 -- .../api/payment/channel/wechat/mch-app.api.ts | 2 -- .../en-US/payment/channel/alipayIsv.json | 5 +---- .../en-US/payment/channel/douyinMchApp.json | 3 --- .../en-US/payment/channel/wechatManage.json | 5 +---- .../en-US/payment/channel/wechatMchApp.json | 5 +---- .../zh-CN/payment/channel/alipayIsv.json | 5 +---- .../zh-CN/payment/channel/douyinMchApp.json | 3 --- .../zh-CN/payment/channel/wechatManage.json | 5 +---- .../zh-CN/payment/channel/wechatMchApp.json | 5 +---- .../app/tabs/AlipayIsvAppAuthConfig.vue | 13 ------------ .../mch/app/tabs/AlipayMchAppAuthConfig.vue | 13 ------------ .../app/tabs/DouyinMchAppAuthConfig.vue | 17 ---------------- .../app/tabs/WechatIsvAppAuthConfig.vue | 20 ------------------- .../mch/app/tabs/WechatMchAppAuthConfig.vue | 19 ------------------ .../tabs/WechatIsvMchAppAuthConfig.vue | 18 ----------------- 20 files changed, 6 insertions(+), 142 deletions(-) diff --git a/apps/daxpay-admin/src/api/payment/channel/alipay/isv-app.api.ts b/apps/daxpay-admin/src/api/payment/channel/alipay/isv-app.api.ts index c5037a912..527485baa 100644 --- a/apps/daxpay-admin/src/api/payment/channel/alipay/isv-app.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/alipay/isv-app.api.ts @@ -120,6 +120,4 @@ export interface AlipayIsvAppAuthConfig { alipayIsvAppId?: string; /** 用户标识类型 */ userIdType?: string; - /** 授权回调地址 */ - authCallbackUrl?: string; } diff --git a/apps/daxpay-admin/src/api/payment/channel/alipay/mch-app.api.ts b/apps/daxpay-admin/src/api/payment/channel/alipay/mch-app.api.ts index 39d594094..bb96b1e1a 100644 --- a/apps/daxpay-admin/src/api/payment/channel/alipay/mch-app.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/alipay/mch-app.api.ts @@ -120,6 +120,4 @@ export interface AlipayMchAppAuthConfig { channelMchNo?: string; /** 用户标识类型 */ userIdType?: string; - /** 授权回调地址 */ - authCallbackUrl?: string; } diff --git a/apps/daxpay-admin/src/api/payment/channel/douyin/mch-app.api.ts b/apps/daxpay-admin/src/api/payment/channel/douyin/mch-app.api.ts index bb4e8f93a..c0b93712e 100644 --- a/apps/daxpay-admin/src/api/payment/channel/douyin/mch-app.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/douyin/mch-app.api.ts @@ -83,6 +83,4 @@ export interface DouyinMchAppAuthConfig { channelMchNo?: string; /** 应用密钥 (已脱敏) */ appSecret?: string; - /** 授权回调地址 */ - authCallbackUrl?: string; } diff --git a/apps/daxpay-admin/src/api/payment/channel/wechat/isv-app.api.ts b/apps/daxpay-admin/src/api/payment/channel/wechat/isv-app.api.ts index 4659756c4..cfd33a7a8 100644 --- a/apps/daxpay-admin/src/api/payment/channel/wechat/isv-app.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/wechat/isv-app.api.ts @@ -69,6 +69,4 @@ export interface WechatIsvAppAuthConfig { wechatIsvAppId?: string; /** 应用密钥（已脱敏） */ appSecret?: string; - /** 授权回调地址（仅公众号） */ - authCallbackUrl?: string; } diff --git a/apps/daxpay-admin/src/api/payment/channel/wechat/isv-mch-app.api.ts b/apps/daxpay-admin/src/api/payment/channel/wechat/isv-mch-app.api.ts index 9deb6692e..5480c3ad7 100644 --- a/apps/daxpay-admin/src/api/payment/channel/wechat/isv-mch-app.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/wechat/isv-mch-app.api.ts @@ -78,6 +78,4 @@ export interface WechatIsvMchAppAuthConfig { channelMchNo?: string; /** 应用密钥（已脱敏） */ appSecret?: string; - /** 授权回调地址（仅公众号） */ - authCallbackUrl?: string; } diff --git a/apps/daxpay-admin/src/api/payment/channel/wechat/mch-app.api.ts b/apps/daxpay-admin/src/api/payment/channel/wechat/mch-app.api.ts index 496aaff2f..93d9b394a 100644 --- a/apps/daxpay-admin/src/api/payment/channel/wechat/mch-app.api.ts +++ b/apps/daxpay-admin/src/api/payment/channel/wechat/mch-app.api.ts @@ -83,6 +83,4 @@ export interface WechatMchAppAuthConfig { channelMchNo?: string; /** 应用密钥（已脱敏） */ appSecret?: string; - /** 授权回调地址（仅公众号） */ - authCallbackUrl?: string; } diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/alipayIsv.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/alipayIsv.json index 00c04249e..bda92a4ed 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/alipayIsv.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/alipayIsv.json @@ -29,8 +29,6 @@ "userIdTypeOpenid": "OpenId", "userIdTypeUserid": "UserId", "userIdTypeBoth": "Both OpenId and UserId", - "authCallbackUrl": "Authorization Callback URL", - "authCallbackUrlPlaceholder": "Please enter authorization callback URL", "validation": { "authType": "Please select auth type", "alipayPublicKey": "Please enter Alipay public key", @@ -38,7 +36,6 @@ "appCert": "App certificate is required", "alipayCert": "Alipay certificate is required", "alipayRootCert": "Alipay root certificate is required", - "userIdType": "Please select user ID type", - "authCallbackUrl": "Please enter authorization callback URL" + "userIdType": "Please select user ID type" } } diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/douyinMchApp.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/douyinMchApp.json index 51dd72bd0..18b950815 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/douyinMchApp.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/douyinMchApp.json @@ -25,10 +25,7 @@ "appSecretTooltipMiniProgram": "Mini Program AppSecret, used for code2session to obtain OpenId", "appSecretTooltipMobileApp": "Mobile App Client Secret, used for OAuth authorization", "appSecretTooltipWebApp": "Web App Client Secret, used for OAuth authorization", - "authCallbackUrl": "Auth Callback URL", - "authCallbackUrlPlaceholder": "Enter auth callback URL", "validation": { - "authCallbackUrl": "Auth callback URL is required", "appSecret": "App secret is required" }, "appType": "App Type", diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatManage.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatManage.json index be9f5260c..5729e12ab 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatManage.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatManage.json @@ -40,8 +40,6 @@ "appSecretTooltipOfficialAccount": "Official account AppSecret for OAuth web authorization", "appSecretTooltipMiniProgram": "Mini program AppSecret for code2session", "appSecretTooltipMobileApp": "Mobile app AppSecret for OAuth", - "authCallbackUrl": "Auth Callback URL", - "authCallbackUrlPlaceholder": "Enter auth callback URL", "directKeyConfigTitle": "Direct Key Config", "cardDirectKeyConfig": "Direct Key Config", "cardDirectKeyConfigDesc": "Configure direct merchant API V3 key, public key and certificates", @@ -68,7 +66,6 @@ "authAppTypeConfirm": "Confirm changing the auth application type?", "authAppTypeSaveSuccess": "Auth application type saved successfully", "validation": { - "appSecret": "App secret is required", - "authCallbackUrl": "Auth callback URL is required" + "appSecret": "App secret is required" } } diff --git a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatMchApp.json b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatMchApp.json index eb2449efb..81c051119 100644 --- a/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatMchApp.json +++ b/apps/daxpay-admin/src/locales/langs/en-US/payment/channel/wechatMchApp.json @@ -32,10 +32,7 @@ "appSecretTooltipOfficialAccount": "Official account AppSecret for OAuth OpenId", "appSecretTooltipMiniProgram": "Mini program AppSecret for code2session OpenId", "appSecretTooltipMobileApp": "Mobile app AppSecret for OAuth", - "authCallbackUrl": "OAuth Callback URL", - "authCallbackUrlPlaceholder": "Enter OAuth callback URL", "validation": { - "appSecret": "Please enter App Secret", - "authCallbackUrl": "Please enter OAuth callback URL" + "appSecret": "Please enter App Secret" } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/alipayIsv.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/alipayIsv.json index 30e930c24..d61d4292b 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/alipayIsv.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/alipayIsv.json @@ -29,8 +29,6 @@ "userIdTypeOpenid": "OpenId", "userIdTypeUserid": "UserId", "userIdTypeBoth": "同时支持 OpenId 和 UserId", - "authCallbackUrl": "授权回调地址", - "authCallbackUrlPlaceholder": "请输入授权回调地址", "validation": { "authType": "请选择认证方式", "alipayPublicKey": "请输入支付宝公钥", @@ -38,7 +36,6 @@ "appCert": "请上传应用公钥证书", "alipayCert": "请上传支付宝公钥证书", "alipayRootCert": "请上传支付宝根证书", - "userIdType": "请选择用户标识类型", - "authCallbackUrl": "请输入授权回调地址" + "userIdType": "请选择用户标识类型" } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/douyinMchApp.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/douyinMchApp.json index b1bb6b58b..449396146 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/douyinMchApp.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/douyinMchApp.json @@ -25,10 +25,7 @@ "appSecretTooltipMiniProgram": "小程序 AppSecret，用于 code2session 获取 OpenId", "appSecretTooltipMobileApp": "移动应用 Client Secret，用于 OAuth 授权", "appSecretTooltipWebApp": "网站应用 Client Secret，用于 OAuth 授权", - "authCallbackUrl": "授权回调地址", - "authCallbackUrlPlaceholder": "请输入授权回调地址", "validation": { - "authCallbackUrl": "请输入授权回调地址", "appSecret": "请输入应用密钥" }, "appType": "应用类型", diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatManage.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatManage.json index 96620ab95..b92cda559 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatManage.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatManage.json @@ -40,8 +40,6 @@ "appSecretTooltipOfficialAccount": "公众号 AppSecret，用于 OAuth 网页授权获取 OpenId", "appSecretTooltipMiniProgram": "小程序 AppSecret，用于 code2session 获取 OpenId", "appSecretTooltipMobileApp": "移动应用 AppSecret，用于 OAuth 授权", - "authCallbackUrl": "授权回调地址", - "authCallbackUrlPlaceholder": "请输入授权回调地址", "directKeyConfigTitle": "直连密钥配置", "cardDirectKeyConfig": "直连密钥配置", "cardDirectKeyConfigDesc": "配置直连商户API V3密钥、平台公钥及证书", @@ -68,7 +66,6 @@ "authAppTypeConfirm": "确认修改认证应用类型？", "authAppTypeSaveSuccess": "认证应用类型保存成功", "validation": { - "appSecret": "请输入应用密钥", - "authCallbackUrl": "请输入授权回调地址" + "appSecret": "请输入应用密钥" } } diff --git a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatMchApp.json b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatMchApp.json index a3da13f03..6fae87f0a 100644 --- a/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatMchApp.json +++ b/apps/daxpay-admin/src/locales/langs/zh-CN/payment/channel/wechatMchApp.json @@ -32,10 +32,7 @@ "appSecretTooltipOfficialAccount": "公众号 AppSecret，用于 OAuth 网页授权获取 OpenId", "appSecretTooltipMiniProgram": "小程序 AppSecret，用于 code2session 获取 OpenId", "appSecretTooltipMobileApp": "移动应用 AppSecret，用于 OAuth 授权", - "authCallbackUrl": "授权回调地址", - "authCallbackUrlPlaceholder": "请输入授权回调地址", "validation": { - "appSecret": "请输入应用密钥", - "authCallbackUrl": "请输入授权回调地址" + "appSecret": "请输入应用密钥" } } diff --git a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/app/tabs/AlipayIsvAppAuthConfig.vue b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/app/tabs/AlipayIsvAppAuthConfig.vue index b51812ec1..f5042ef70 100644 --- a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/app/tabs/AlipayIsvAppAuthConfig.vue +++ b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/app/tabs/AlipayIsvAppAuthConfig.vue @@ -31,9 +31,6 @@ /** 表单校验规则 */ const formRules = computed(() => ({ userIdType: [{ required: true, message: $t('payment.channel.alipayIsv.validation.userIdType') }], - authCallbackUrl: [ - { required: true, message: $t('payment.channel.alipayIsv.validation.authCallbackUrl') }, - ], })); /** @@ -166,16 +163,6 @@ {{ $t('payment.channel.alipayIsv.userIdTypeBoth') }} - - - - - diff --git a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/app/tabs/AlipayMchAppAuthConfig.vue b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/app/tabs/AlipayMchAppAuthConfig.vue index ee939be95..c73244021 100644 --- a/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/app/tabs/AlipayMchAppAuthConfig.vue +++ b/apps/daxpay-admin/src/views/payment/channel/alipay/manage/mch/app/tabs/AlipayMchAppAuthConfig.vue @@ -33,9 +33,6 @@ /** 表单校验规则 */ const formRules = computed(() => ({ userIdType: [{ required: true, message: $t('payment.channel.alipayIsv.validation.userIdType') }], - authCallbackUrl: [ - { required: true, message: $t('payment.channel.alipayIsv.validation.authCallbackUrl') }, - ], })); /** @@ -172,16 +169,6 @@ {{ $t('payment.channel.alipayIsv.userIdTypeBoth') }} - - - - - diff --git a/apps/daxpay-admin/src/views/payment/channel/douyin/manage/app/tabs/DouyinMchAppAuthConfig.vue b/apps/daxpay-admin/src/views/payment/channel/douyin/manage/app/tabs/DouyinMchAppAuthConfig.vue index 8d4e9d66d..fc91d717d 100644 --- a/apps/daxpay-admin/src/views/payment/channel/douyin/manage/app/tabs/DouyinMchAppAuthConfig.vue +++ b/apps/daxpay-admin/src/views/payment/channel/douyin/manage/app/tabs/DouyinMchAppAuthConfig.vue @@ -60,9 +60,6 @@ message: $t('payment.channel.douyinMchApp.validation.appSecret'), }, ], - authCallbackUrl: isMiniProgram.value - ? [] - : [{ required: true, message: $t('payment.channel.douyinMchApp.validation.authCallbackUrl') }], })); function loadConfig() { @@ -125,7 +122,6 @@ douyinDirectAppId: props.appId, mchNo: props.mchNo, channelMchNo: props.channelMchNo, - authCallbackUrl: isMiniProgram.value ? undefined : formState.value.authCallbackUrl, }; return DouyinMchAppApi.saveAuthConfig(submitData) .then(() => { @@ -196,19 +192,6 @@ allow-clear /> - - - - diff --git a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/app/tabs/WechatIsvAppAuthConfig.vue b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/app/tabs/WechatIsvAppAuthConfig.vue index c33d1ef24..22e7ac2bb 100644 --- a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/app/tabs/WechatIsvAppAuthConfig.vue +++ b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/app/tabs/WechatIsvAppAuthConfig.vue @@ -27,9 +27,6 @@ const canEdit = computed(() => hasPermission(PermCodes.Payment.WechatIsv.MANAGE)); - // 仅公众号需要配置 OAuth 授权回调地址 - const isOfficialAccount = computed(() => props.appType === 'official_account'); - /** AppSecret 提示文案（按应用类型） */ const appSecretTooltip = computed(() => { const map: Record = { @@ -42,7 +39,6 @@ }); // 应用密钥：始终必填（星号常显）；编辑时预填脱敏值，未修改由 diffForm 比对跳过更新 - // 授权回调地址：非必填（公众号可按需配置 OAuth 回调地址） const formRules = computed(() => ({ appSecret: [ { @@ -50,7 +46,6 @@ message: $t('payment.channel.wechatManage.validation.appSecret'), }, ], - authCallbackUrl: [], })); function loadConfig() { @@ -106,8 +101,6 @@ ...formState.value, ...sensitiveData, wechatIsvAppId: props.wechatIsvAppId, - // 非公众号不传授权回调地址 - authCallbackUrl: isOfficialAccount.value ? formState.value.authCallbackUrl : undefined, }; return WechatIsvAppApi.saveAuthConfig(submitData) .then(() => { @@ -178,19 +171,6 @@ allow-clear /> - - - - diff --git a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/app/tabs/WechatMchAppAuthConfig.vue b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/app/tabs/WechatMchAppAuthConfig.vue index c37aea81f..152ae0717 100644 --- a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/app/tabs/WechatMchAppAuthConfig.vue +++ b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/app/tabs/WechatMchAppAuthConfig.vue @@ -32,9 +32,6 @@ const canEdit = computed(() => hasPermission(PermCodes.Channel.WechatApp.MANAGE)); - // 仅公众号需要配置 OAuth 授权回调地址 - const isOfficialAccount = computed(() => props.appType === 'official_account'); - /** AppSecret 提示文案（按应用类型） */ const appSecretTooltip = computed(() => { const map: Record = { @@ -47,7 +44,6 @@ }); // 应用密钥：始终必填（星号常显）；编辑时预填脱敏值，未修改由 diffForm 比对跳过更新 - // 授权回调地址：非必填（公众号可按需配置 OAuth 回调地址） const formRules = computed(() => ({ appSecret: [ { @@ -55,7 +51,6 @@ message: $t('payment.channel.wechatMchApp.validation.appSecret'), }, ], - authCallbackUrl: [], })); function loadConfig() { @@ -117,7 +112,6 @@ wechatDirectAppId: props.wechatDirectAppId, mchNo: props.mchNo, channelMchNo: props.channelMchNo, - authCallbackUrl: isOfficialAccount.value ? formState.value.authCallbackUrl : undefined, }; return WechatMchAppApi.saveAuthConfig(submitData) .then(() => { @@ -188,19 +182,6 @@ allow-clear /> - - - - diff --git a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/isv-app/tabs/WechatIsvMchAppAuthConfig.vue b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/isv-app/tabs/WechatIsvMchAppAuthConfig.vue index 3e7ed9600..af8f41f88 100644 --- a/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/isv-app/tabs/WechatIsvMchAppAuthConfig.vue +++ b/apps/daxpay-admin/src/views/payment/channel/wechat/manage/mch/isv-app/tabs/WechatIsvMchAppAuthConfig.vue @@ -29,9 +29,6 @@ const canEdit = computed(() => hasPermission(PermCodes.Channel.WechatApp.MANAGE)); - // 仅公众号需要配置 OAuth 授权回调地址 - const isOfficialAccount = computed(() => props.appType === 'official_account'); - /** AppSecret 提示文案（按应用类型） */ const appSecretTooltip = computed(() => { const map: Record = { @@ -50,7 +47,6 @@ message: $t('payment.channel.wechatMchApp.validation.appSecret'), }, ], - authCallbackUrl: [], })); function loadConfig() { @@ -111,7 +107,6 @@ wechatIsvMchAppId: props.wechatIsvMchAppId, mchNo: props.mchNo, channelMchNo: props.channelMchNo, - authCallbackUrl: isOfficialAccount.value ? formState.value.authCallbackUrl : undefined, }; return WechatIsvMchAppApi.saveAuthConfig(submitData) .then(() => { @@ -182,19 +177,6 @@ allow-clear /> - - - -