mirror of
https://gitee.com/zhijiantianya/yudao-cloud.git
synced 2025-12-30 01:12:26 +00:00
Merge branch 'master-jdk17' of https://gitee.com/zhijiantianya/yudao-cloud
# Conflicts: # yudao-dependencies/pom.xml
This commit is contained in:
@@ -84,6 +84,7 @@
|
|||||||
<jimureport.version>2.1.3</jimureport.version>
|
<jimureport.version>2.1.3</jimureport.version>
|
||||||
<jimubi.version>2.3.0</jimubi.version>
|
<jimubi.version>2.3.0</jimubi.version>
|
||||||
<weixin-java.version>4.7.9-20251224.161447</weixin-java.version>
|
<weixin-java.version>4.7.9-20251224.161447</weixin-java.version>
|
||||||
|
<alipay-sdk-java.version>4.40.607.ALL</alipay-sdk-java.version>
|
||||||
<!-- 专属于 JDK8 安全漏洞升级 -->
|
<!-- 专属于 JDK8 安全漏洞升级 -->
|
||||||
<logback.version>1.2.13</logback.version> <!-- 无法使用 1.3.X 版本,启动会报错 -->
|
<logback.version>1.2.13</logback.version> <!-- 无法使用 1.3.X 版本,启动会报错 -->
|
||||||
</properties>
|
</properties>
|
||||||
@@ -632,6 +633,18 @@
|
|||||||
<version>${awssdk.version}</version>
|
<version>${awssdk.version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>com.alipay.sdk</groupId>
|
||||||
|
<artifactId>alipay-sdk-java</artifactId>
|
||||||
|
<version>${alipay-sdk-java.version}</version>
|
||||||
|
<exclusions>
|
||||||
|
<exclusion>
|
||||||
|
<groupId>org.bouncycastle</groupId>
|
||||||
|
<artifactId>bcprov-jdk15on</artifactId>
|
||||||
|
</exclusion>
|
||||||
|
</exclusions>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.binarywang</groupId>
|
<groupId>com.github.binarywang</groupId>
|
||||||
<artifactId>weixin-java-pay</artifactId>
|
<artifactId>weixin-java-pay</artifactId>
|
||||||
|
|||||||
@@ -130,4 +130,18 @@ public class PayTransferCreateReqDTO {
|
|||||||
return channelExtras;
|
return channelExtras;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ========== 支付宝场景 ==========
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 【支付宝】构建转账渠道额外参数
|
||||||
|
*
|
||||||
|
* @param sceneName 转账场景名称,用于描述转账用途
|
||||||
|
* @return channelExtras
|
||||||
|
*/
|
||||||
|
public static Map<String, String> buildAlipayChannelExtra(String sceneName) {
|
||||||
|
Map<String, String> channelExtras = new HashMap<>();
|
||||||
|
channelExtras.put("sceneName", sceneName);
|
||||||
|
return channelExtras;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -106,13 +106,6 @@
|
|||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.alipay.sdk</groupId>
|
<groupId>com.alipay.sdk</groupId>
|
||||||
<artifactId>alipay-sdk-java</artifactId>
|
<artifactId>alipay-sdk-java</artifactId>
|
||||||
<version>4.35.79.ALL</version>
|
|
||||||
<exclusions>
|
|
||||||
<exclusion>
|
|
||||||
<groupId>org.bouncycastle</groupId>
|
|
||||||
<artifactId>bcprov-jdk15on</artifactId>
|
|
||||||
</exclusion>
|
|
||||||
</exclusions>
|
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.github.binarywang</groupId>
|
<groupId>com.github.binarywang</groupId>
|
||||||
|
|||||||
@@ -234,6 +234,10 @@ public abstract class AbstractAlipayPayClient extends AbstractPayClient<AlipayPa
|
|||||||
if (reqDTO.getChannelExtras() != null) {
|
if (reqDTO.getChannelExtras() != null) {
|
||||||
model.setBusinessParams(JsonUtils.toJsonString(reqDTO.getChannelExtras()));
|
model.setBusinessParams(JsonUtils.toJsonString(reqDTO.getChannelExtras()));
|
||||||
}
|
}
|
||||||
|
String sceneName = MapUtil.getStr(reqDTO.getChannelExtras(), "sceneName");
|
||||||
|
if (StrUtil.isNotBlank(sceneName)) {
|
||||||
|
model.setTransferSceneName(sceneName);
|
||||||
|
}
|
||||||
// ② 个性化的参数
|
// ② 个性化的参数
|
||||||
Participant payeeInfo = new Participant();
|
Participant payeeInfo = new Participant();
|
||||||
payeeInfo.setIdentityType("ALIPAY_LOGON_ID"); // 暂时只考虑转账到支付宝,银行没有权限 https://opendocs.alipay.com/open/02byvc?scene=66dd06f5a923403393b85de68d3c0055
|
payeeInfo.setIdentityType("ALIPAY_LOGON_ID"); // 暂时只考虑转账到支付宝,银行没有权限 https://opendocs.alipay.com/open/02byvc?scene=66dd06f5a923403393b85de68d3c0055
|
||||||
|
|||||||
Reference in New Issue
Block a user