From 0fcd26552b5a5b73e0a787a3cfb4e8fc67dcd670 Mon Sep 17 00:00:00 2001 From: Dftre <3066417822@qq.com> Date: Mon, 10 Mar 2025 00:44:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=94=AF=E4=BB=98=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0=E9=80=9A=E7=9F=A5URL?= =?UTF-8?q?=E5=B9=B6=E7=A7=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-pay.yml | 3 +- ...itional-spring-configuration-metadata.json | 29 +++++++++++ .../com/ruoyi/pay/sqb/config/SqbConfig.java | 32 ++---------- .../pay/sqb/service/Impl/SQBServiceImpl.java | 16 +----- ...itional-spring-configuration-metadata.json | 49 +++++++++++++++++++ ...itional-spring-configuration-metadata.json | 39 +++++++++++++++ 6 files changed, 124 insertions(+), 44 deletions(-) create mode 100644 ruoyi-pay/ruoyi-pay-alipay/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 ruoyi-pay/ruoyi-pay-sqb/src/main/resources/META-INF/additional-spring-configuration-metadata.json create mode 100644 ruoyi-pay/ruoyi-pay-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/ruoyi-admin/src/main/resources/application-pay.yml b/ruoyi-admin/src/main/resources/application-pay.yml index 2e73f19..86d865a 100644 --- a/ruoyi-admin/src/main/resources/application-pay.yml +++ b/ruoyi-admin/src/main/resources/application-pay.yml @@ -8,12 +8,11 @@ pay: vendorSn: "vendorSn" vendorKey: "vendorKey" publicKey: classpath:pay/sqb/sqb_public_key.pem + notifyUrl: http://e2vca6.natappfree.cc/pay/sqb/notify alipay: enabled: false appId: appid - # 应用私钥 appPrivateKey: classpath:pay/alipay/alipay_private_key.pem - # 支付宝公钥 alipayPublicKey: classpath:pay/alipay/alipay_public_key.pem notifyUrl: http://e2vca6.natappfree.cc/alipay/notify wechat: diff --git a/ruoyi-pay/ruoyi-pay-alipay/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ruoyi-pay/ruoyi-pay-alipay/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..9d3fbe3 --- /dev/null +++ b/ruoyi-pay/ruoyi-pay-alipay/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,29 @@ +{ + "properties": [ + { + "name": "pay.alipay.enabled", + "type": "java.lang.Boolean", + "description": "是否启用支付宝支付" + }, + { + "name": "pay.alipay.appId", + "type": "java.lang.String", + "description": "支付宝appid" + }, + { + "name": "pay.alipay.appPrivateKey", + "type": "java.lang.String", + "description": "支付宝应用私钥，可以直接用字符串，也可以是基于classpath的文件路径" + }, + { + "name": "pay.alipay.alipayPublicKey", + "type": "java.lang.String", + "description": "支付宝应用公钥，可以直接用字符串，也可以是基于classpath的文件路径" + }, + { + "name": "pay.alipay.notifyUrl", + "type": "java.lang.String", + "description": "支付宝支付回调地址" + } + ] +} \ No newline at end of file diff --git a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/config/SqbConfig.java b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/config/SqbConfig.java index 33fcdea..b70dd7a 100644 --- a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/config/SqbConfig.java +++ b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/config/SqbConfig.java @@ -34,13 +34,7 @@ public class SqbConfig { private String vendorKey; @Value("${pay.sqb.notifyUrl}") - private String defaultNotifyUrl; - - @Value("${pay.sqb.notifyBaseUrl}") - private String defaultNotifyBaseUrl; - - @Value("${pay.sqb.proxy}") - private String proxyPath; + private String notifyUrl; @Value("${pay.sqb.publicKey}") private String publicKey; @@ -64,28 +58,12 @@ public class SqbConfig { this.publicKey = publicKey; } - public String getDefaultNotifyUrl() { - return defaultNotifyUrl; + public String getNotifyUrl() { + return notifyUrl; } - public void setDefaultNotifyUrl(String defaultNotifyUrl) { - this.defaultNotifyUrl = defaultNotifyUrl; - } - - public String getDefaultNotifyBaseUrl() { - return defaultNotifyBaseUrl; - } - - public void setDefaultNotifyBaseUrl(String defaultNotifyBaseUrl) { - this.defaultNotifyBaseUrl = defaultNotifyBaseUrl; - } - - public String getProxyPath() { - return proxyPath; - } - - public void setProxyPath(String proxyPath) { - this.proxyPath = proxyPath; + public void setNotifyUrl(String notifyUrl) { + this.notifyUrl = notifyUrl; } public String getApiDomain() { diff --git a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java index a1f22fd..4207414 100644 --- a/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java +++ b/ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java @@ -25,7 +25,6 @@ import com.alibaba.fastjson2.JSON; import com.alibaba.fastjson2.JSONObject; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.SecurityUtils; -import com.ruoyi.common.utils.ServletUtils; import com.ruoyi.common.utils.http.HttpClientUtil; import com.ruoyi.common.utils.sign.Md5Utils; import com.ruoyi.pay.domain.PayOrder; @@ -202,20 +201,7 @@ public class SQBServiceImpl implements ISqbPayService { if (payOrder.getRemark() == null) { payOrder.setRemark("支付"); } - String orderNotifyUrl; - String defaultNotifyUrl = sqbConfig.getDefaultNotifyUrl(); - String defaultNotifyBaseUrl = sqbConfig.getDefaultNotifyBaseUrl(); - String proxyPath = sqbConfig.getProxyPath(); - if (notifyBaseUrl != null && !notifyBaseUrl.trim().equals("")) { - orderNotifyUrl = notifyBaseUrl + defaultNotifyUrl; - } else { - if (defaultNotifyBaseUrl != null && !defaultNotifyBaseUrl.trim().equals("")) { - orderNotifyUrl = defaultNotifyBaseUrl + proxyPath + defaultNotifyUrl; - } else { - orderNotifyUrl = "http://" + ServletUtils.getRequest().getServerName() + proxyPath + defaultNotifyUrl; - } - } - + String orderNotifyUrl = sqbConfig.getNotifyUrl(); String param = "" + "client_sn=" + payOrder.getOrderNumber() + "¬ify_url=" + orderNotifyUrl + diff --git a/ruoyi-pay/ruoyi-pay-sqb/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ruoyi-pay/ruoyi-pay-sqb/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..cf85b11 --- /dev/null +++ b/ruoyi-pay/ruoyi-pay-sqb/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,49 @@ +{ + "properties": [ + { + "name": "pay.sqb.enabled", + "type": "java.lang.Boolean", + "description": "启用收钱吧支付" + }, + { + "name": "pay.sqb.appId", + "type": "java.lang.String", + "description": "收钱吧appId" + }, + { + "name": "pay.sqb.apiDomain", + "type": "java.lang.String", + "description": "收钱吧apiDomain" + }, + { + "name": "pay.sqb.terminalSn", + "type": "java.lang.String", + "description": "收钱吧terminalSn" + }, + { + "name": "pay.sqb.terminalKey", + "type": "java.lang.String", + "description": "收钱吧terminalKey" + }, + { + "name": "pay.sqb.vendorSn", + "type": "java.lang.String", + "description": "收钱吧vendorSn" + }, + { + "name": "pay.sqb.vendorKey", + "type": "java.lang.String", + "description": "收钱吧vendorKey" + }, + { + "name": "pay.sqb.publicKey", + "type": "java.lang.String", + "description": "收钱吧公钥，可以直接用字符串，也可以是基于classpath的文件路径" + }, + { + "name": "pay.sqb.notifyUrl", + "type": "java.lang.String", + "description": "收钱吧支付回调地址" + } + ] +} \ No newline at end of file diff --git a/ruoyi-pay/ruoyi-pay-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/ruoyi-pay/ruoyi-pay-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json new file mode 100644 index 0000000..edafe82 --- /dev/null +++ b/ruoyi-pay/ruoyi-pay-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json @@ -0,0 +1,39 @@ +{ + "properties": [ + { + "name": "pay.wechat.enabled", + "type": "java.lang.Boolean", + "description": "是否启用微信支付" + }, + { + "name": "pay.wechat.appId", + "type": "java.lang.String", + "description": "微信支付appid" + }, + { + "name": "pay.wechat.apiV3Key", + "type": "java.lang.String", + "description": "微信支付apiV3Key" + }, + { + "name": "pay.wechat.privateKeyPath", + "type": "java.lang.String", + "description": "微信支付私钥，可以直接用字符串，也可以是基于classpath的文件路径" + }, + { + "name": "pay.wechat.merchantId", + "type": "java.lang.String", + "description": "微信支付merchantId" + }, + { + "name": "pay.wechat.merchantSerialNumber", + "type": "java.lang.String", + "description": "微信支付merchantSerialNumber" + }, + { + "name": "pay.wechat.notifyUrl", + "type": "java.lang.String", + "description": "微信支付回调地址" + } + ] +} \ No newline at end of file