b2894lxlx/yunxinwei-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20260716

Browse Source
This commit is contained in:
b2894lxlx
2026-07-16 14:45:28 +08:00
parent de7ae7fb7c
commit 1a5ff59324
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/gxwebsoft/open/controller/OpenAlipayController.java
View File

@@ -79,14 +79,14 @@ public class OpenAlipayController extends BaseController {
// 验证签名 // 验证签名
isCheckSign(); isCheckSign();
// 读取缓存信息 // 读取缓存信息
String key = "setting:register:" + getTenantId(); // String key = "setting:register:" + getTenantId();
String setting = redisUtil.get(key); // String setting = redisUtil.get(key);
// if (setting == null) { // if (setting == null) {
// throw new BusinessException("请先配置注册设置"); // throw new BusinessException("请先配置注册设置");
// } // }
JSONObject jsonObject = JSONObject.parseObject(setting); // JSONObject jsonObject = JSONObject.parseObject(setting);
String roleId = jsonObject.getString("roleId"); // String roleId = jsonObject.getString("roleId");
// 实例化客户端 // 实例化客户端
DefaultAlipayClient alipayClient = alipayConfig.alipayClient(param.getTenantId()); DefaultAlipayClient alipayClient = alipayConfig.alipayClient(param.getTenantId());
try { try {

2
src/main/java/com/gxwebsoft/shop/controller/PaymentController.java
View File

@@ -297,7 +297,7 @@ public class PaymentController extends BaseController {
// log.info("支付宝支付返回信息:{}", response); // log.info("支付宝支付返回信息:{}", response);
if(!response.isSuccess()){ if(!response.isSuccess()){
String subCode = response.getSubCode(); String subCode = response.getSubCode();
if("ACQ.TRADE_HAS_CLOSE".equals(subCode)){ if("ACQ.TRADE_HAS_CLOSE".equals(subCode) || "ACQ.TRADE_HAS_SUCCESS".equals(subCode)){
String orderNoNew = IdUtil.getSnowflakeNextIdStr(); String orderNoNew = IdUtil.getSnowflakeNextIdStr();
log.warn("原支付宝支付订单{}已关闭！重新生成支付订单号{}！", orderNo, orderNoNew); log.warn("原支付宝支付订单{}已关闭！重新生成支付订单号{}！", orderNo, orderNoNew);
order.setOrderNo(orderNoNew); order.setOrderNo(orderNoNew);

4
src/main/resources/application-prod.yml
View File

@@ -3,9 +3,9 @@
# 数据源配置 # 数据源配置
spring: spring:
datasource: datasource:
url: jdbc:mysql://1.14.159.185:3318/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8 url: jdbc:mysql://1Panel-mysql-LCaM:3306/yunxinwei?useUnicode=true&characterEncoding=utf8&useSSL=false&serverTimezone=GMT%2B8
username: yunxinwei username: yunxinwei
password: A56sK6aW2FA3wBy2 password: T4xEYiwTdEmS2ZED
driver-class-name: com.mysql.cj.jdbc.Driver driver-class-name: com.mysql.cj.jdbc.Driver
type: com.alibaba.druid.pool.DruidDataSource type: com.alibaba.druid.pool.DruidDataSource

6
src/main/resources/application.yml
View File

@@ -1,6 +1,6 @@
# 端口 # 端口
server: server:
port: 9090 port: 9200
# socketIo # socketIo
socketio: socketio:
port: 9190 port: 9190
@@ -47,9 +47,9 @@ spring:
max-request-size: 100MB max-request-size: 100MB
redis: redis:
database: 7 database: 7
host: 127.0.0.1 host: 1Panel-redis-CnJa
port: 6379 port: 6379
password: password: redis_xGXDip
# 邮件服务器配置 # 邮件服务器配置
mail: mail: