ldeyun/RUOYI-geek
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新支付配置，添加通知URL并移除不必要的属性

Browse Source
This commit is contained in:
Dftre 2025-03-10 00:44:26 +08:00
parent 7b8c68f565
commit 0fcd26552b
6 changed files with 124 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ruoyi-admin/src/main/resources/application-pay.yml
View File

@ -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:

29
ruoyi-pay/ruoyi-pay-alipay/src/main/resources/META-INF/additional-spring-configuration-metadata.json Normal file
View File

@ -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": "支付宝支付回调地址"
}
]
}

32
ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/config/SqbConfig.java
View File

@ -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() {

16
ruoyi-pay/ruoyi-pay-sqb/src/main/java/com/ruoyi/pay/sqb/service/Impl/SQBServiceImpl.java
View File

@ -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() +
"&notify_url=" + orderNotifyUrl +

49
ruoyi-pay/ruoyi-pay-sqb/src/main/resources/META-INF/additional-spring-configuration-metadata.json Normal file
View File

@ -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": "收钱吧支付回调地址"
}
]
}

39
ruoyi-pay/ruoyi-pay-wx/src/main/resources/META-INF/additional-spring-configuration-metadata.json Normal file
View File

@ -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": "微信支付回调地址"
}
]
}