diff --git a/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts b/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts index e703e17a9..76275588c 100644 --- a/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts +++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfig.api.ts @@ -45,15 +45,13 @@ export interface AlipayConfig extends MchEntity { notifyUrl?: string // 页面跳转同步通知页面路径 returnUrl?: string - // 请求网关地址 - serverUrl?: string // 认证方式 authType?: string // 签名类型 signType?: string // 支付宝公钥 alipayPublicKey?: string - // 私钥 + // 应用私钥 privateKey?: string // 应用公钥 appCert?: string diff --git a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue index bd931de24..02e1f5c08 100644 --- a/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue +++ b/src/views/daxpay/common/channel/alipay/config/AlipayConfigEdit.vue @@ -55,9 +55,6 @@ - - - @@ -89,7 +86,7 @@ placeholder="请输入支付宝公钥" /> - + @@ -215,7 +212,6 @@ limitAmount: 20000, notifyUrl: '', returnUrl: '', - serverUrl: '', authType: 'key', signType: 'RSA2', alipayPublicKey: '', @@ -233,11 +229,10 @@ aliAppId: [{ required: true, message: '请输入AppId' }], enable: [{ required: true, message: '请选择是否启用' }], limitAmount: [{ required: true, message: '请输入单次支付限额' }], - serverUrl: [{ required: true, message: '请输入请求网关地址' }], authType: [{ required: true, message: '请选择认证方式' }], signType: [{ required: true, message: '请选择加密类型' }], alipayPublicKey: [{ required: form.value.authType === 'key', message: '请输入支付宝公钥' }], - privateKey: [{ required: form.value.authType === 'key', message: '请输入支付私钥' }], + privateKey: [{ required: true, message: '请输入应用私钥' }], appCert: [{ required: form.value.authType === 'cart', message: '请输入应用证书' }], alipayCert: [{ required: form.value.authType === 'cart', message: '请输入支付宝证书' }], alipayRootCert: [ diff --git a/src/views/daxpay/common/merchant/app/MchAppEdit.vue b/src/views/daxpay/common/merchant/app/MchAppEdit.vue index 27332a859..f9500f584 100644 --- a/src/views/daxpay/common/merchant/app/MchAppEdit.vue +++ b/src/views/daxpay/common/merchant/app/MchAppEdit.vue @@ -145,7 +145,7 @@ notifyType: 'none', signType: 'hmac_sha256', limitAmount: 200.0, - orderTimeout: 5, + orderTimeout: 30, reqSign: true, }) const signTypes = ref([])