build 更新版本号和数据脚本, 再调整TLS版本机制

DavidAlphaFox · Feb 26, 2024 · 503f48f · 503f48f
1 parent 4dca512
commit 503f48f
Show file tree

Hide file tree

Showing 18 changed files with 4,657 additions and 185 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <p>
  <img src='https://gitee.com/bootx/dax-pay/badge/star.svg?theme=dark' alt='star'/>
- <img src="https://img.shields.io/badge/Dax%20Pay-2.0.0-success.svg" alt="Build Status"/>
+ <img src="https://img.shields.io/badge/Dax%20Pay-2.0.1-success.svg" alt="Build Status"/>
  <img src="https://img.shields.io/badge/Boot%20Platform-1.3.6-success.svg" alt="Build Status"/>
  <img src="https://img.shields.io/badge/Author-Bootx-orange.svg" alt="Build Status"/>
  <img src="https://img.shields.io/badge/Spring%20Boot-2.7.18-blue.svg" alt="Downloads"/>

diff --git a/_config/sql/2.0.0/dax-pay.backup.sql b/_config/sql/2.0.0/dax-pay.backup.sql
diff --git a/_config/sql/2.0.1/2.0.1.update.data.sql b/_config/sql/2.0.1/2.0.1.update.data.sql
diff --git a/_config/sql/2.0.1/2.0.1.update.table.sql b/_config/sql/2.0.1/2.0.1.update.table.sql
diff --git a/_config/sql/dax-pay.sql b/_config/sql/dax-pay.sql
diff --git a/_doc/ChangeLog.md b/_doc/ChangeLog.md
@@ -20,7 +20,7 @@
 - fix: 修复简单退款选择全部退款时报错问题
 - fix: 修复退款时未检验退款金额问题，导致可以退款余额可以大于可退余额
 
-## [v2.0.0]
+## [v2.0.1]
 - 支持支付宝支付: 扫码支付、付款码支付、PC支付、H5支付
 - 支持微信支付: 扫码支付、WAP支付、公众号支付
 - 增加聚合支付演示功能，支持支付宝和微信支付

diff --git a/daxpay-single-demo/pom.xml b/daxpay-single-demo/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>dax-pay</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </parent>
 
  <artifactId>daxpay-single-demo</artifactId>
@@ -36,7 +36,7 @@
  <dependency>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>daxpay-single-sdk</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </dependency>
  </dependencies>
 

diff --git a/daxpay-single-sdk/pom.xml b/daxpay-single-sdk/pom.xml
@@ -6,7 +6,7 @@
 
  <groupId>cn.bootx.platform</groupId>
  <artifactId>daxpay-single-sdk</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  <packaging>jar</packaging>
 
  <!-- 项目信息 -->

diff --git a/daxpay-single/daxpay-single-admin/pom.xml b/daxpay-single/daxpay-single-admin/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>daxpay-single</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </parent>
 
  <artifactId>daxpay-single-admin</artifactId>

diff --git a/daxpay-single/daxpay-single-core/pom.xml b/daxpay-single/daxpay-single-core/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>daxpay-single</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </parent>
 
  <artifactId>daxpay-single-core</artifactId>

diff --git a/daxpay-single/daxpay-single-gateway/pom.xml b/daxpay-single/daxpay-single-gateway/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>daxpay-single</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </parent>
 
  <artifactId>daxpay-single-gateway</artifactId>

diff --git a/daxpay-single/daxpay-single-service/pom.xml b/daxpay-single/daxpay-single-service/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>daxpay-single</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </parent>
 
  <artifactId>daxpay-single-service</artifactId>

diff --git a/...rc/main/java/cn/bootx/platform/daxpay/service/configuration/ijpay/IJPayConfiguration.java b/...rc/main/java/cn/bootx/platform/daxpay/service/configuration/ijpay/IJPayConfiguration.java
@@ -1,12 +1,15 @@
 package cn.bootx.platform.daxpay.service.configuration.ijpay;
 
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.net.SSLProtocols;
 import com.ijpay.core.kit.HttpKit;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.context.annotation.Configuration;
 
 import javax.annotation.PostConstruct;
 import javax.net.ssl.SSLContext;
 import java.security.NoSuchAlgorithmException;
+import java.util.List;
 
 /**
  * IJPau配置类
@@ -23,10 +26,23 @@ public class IJPayConfiguration {
  @PostConstruct
  public void initHttpDelegate() throws NoSuchAlgorithmException {
  log.info("初始化IJPay配置类");
- String tlsVersion = SSLContext.getDefault()
+
+ String[] protocols = SSLContext.getDefault()
  .getSupportedSSLParameters()
- .getProtocols()[0];
- HttpKit.setDelegate(new DaxPayHttpDelegate(tlsVersion));
+ .getProtocols();
+ List<String> list = ListUtil.toList(protocols);
+ // 是否支持TLS1.2
+ if (list.contains(SSLProtocols.TLSv12)) {
+ HttpKit.setDelegate(new DaxPayHttpDelegate(SSLProtocols.TLSv12));
+ return;
+ }
+ // 是否支持TLS1.1
+ if (list.contains(SSLProtocols.TLSv11)) {
+ HttpKit.setDelegate(new DaxPayHttpDelegate(SSLProtocols.TLSv11));
+ return;
+ }
+ // 如果都不支持, 使用TLS_V1
+ HttpKit.setDelegate(new DaxPayHttpDelegate(SSLProtocols.TLSv1));
  }
 
 }
diff --git a/...java/cn/bootx/platform/daxpay/service/core/channel/cash/service/CashPayConfigService.java b/...java/cn/bootx/platform/daxpay/service/core/channel/cash/service/CashPayConfigService.java
@@ -35,7 +35,7 @@ public class CashPayConfigService {
  * 获取钱包配置
  */
  public CashConfig getConfig(){
- return cashConfigManager.findById(ID).orElseThrow(() -> new DataNotExistException("钱包配置不存在"));
+ return cashConfigManager.findById(ID).orElseThrow(() -> new DataNotExistException("现金配置不存在"));
  }
 
  /**

diff --git a/daxpay-single/daxpay-single-start/pom.xml b/daxpay-single/daxpay-single-start/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>daxpay-single</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </parent>
 
  <artifactId>daxpay-single-start</artifactId>

diff --git a/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml b/daxpay-single/daxpay-single-start/src/main/resources/application-dev.yml
@@ -65,7 +65,7 @@ bootx:
  swagger:
  enabled: true
  author: bootx
- version: 2.0.0
+ version: 2.0.1
  title: 开源支付平台-单商户
  description: 开源支付平台-单商户版
  # 多模块扫码
@@ -169,3 +169,5 @@ dax-pay:
  front-h5-url: http:https://pay1.bootx.cn/h5/#
  # 签名秘钥
  sign-secret: 123456
+ # 签名方式
+ sign-type: hmac_sha256
diff --git a/daxpay-single/pom.xml b/daxpay-single/pom.xml
@@ -6,7 +6,7 @@
  <parent>
  <groupId>cn.bootx.platform</groupId>
  <artifactId>dax-pay</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
  </parent>
 
  <artifactId>daxpay-single</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
  <groupId>cn.bootx.platform</groupId>
  <artifactId>dax-pay</artifactId>
  <packaging>pom</packaging>
- <version>2.0.0</version>
+ <version>2.0.1</version>
 
  <modules>
  <module>daxpay-single</module>
@@ -30,7 +30,7 @@
 
  <!-- 二方库版本 -->
  <bootx-platform.version>1.3.6.1</bootx-platform.version>
- <daxpay.version>2.0.0</daxpay.version>
+ <daxpay.version>2.0.1</daxpay.version>
  <!-- 三方库 -->
  <slf4j.version>1.7.30</slf4j.version>
  <redisson.version>3.16.8</redisson.version>