autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-04-20 19:15:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

第三方推送还原为原来的版本代码,测试改到dev-zzx1分支

Browse Source
This commit is contained in:
YAS\29473
2025-09-15 09:28:46 +08:00
parent c9264800d4
commit 1d790d7761
8 changed files with 224 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
jsowell-admin/src/main/java/com/jsowell/service/OrderService.java
View File

@@ -810,23 +810,23 @@ public class OrderService {
log.info("人工结算订单-end orderCode:{}", dto.getOrderCode());
// 异步推送第三方平台订单信息
// CompletableFuture.runAsync(() -> {
// try {
// commonService.commonPushOrderInfo(orderBasicInfo);
// } catch (Exception e) {
// log.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e);
// }
// }, thirdpartyTaskExecutor);
CompletableFuture.runAsync(() -> {
try {
commonService.commonPushOrderInfo(orderBasicInfo);
} catch (Exception e) {
log.error("人工结算订单 推送第三方平台订单信息error, orderCode:{}", orderBasicInfo.getOrderCode(), e);
}
}, thirdpartyTaskExecutor);
// TODO 测试mq
// 向mq中发送实时数据消息,给第三方服务消费
CompletableFuture.runAsync(() -> {
try {
rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH ,orderBasicInfo );
} catch (Exception e) {
log.error("向mq中发送实时数据消息供第三方服务消费 error, " , e);
}
}, thirdpartyTaskExecutor);
// CompletableFuture.runAsync(() -> {
// try {
// rabbitTemplate.convertAndSend(ThirdPartyRabbitConstants.WCC_THIRDPARTY_NAME , ThirdPartyRabbitConstants.ROUTING_KEY_CHARGE_ORDER_PUSH ,orderBasicInfo );
// } catch (Exception e) {
// log.error("向mq中发送实时数据消息供第三方服务消费 error, " , e);
// }
// }, thirdpartyTaskExecutor);
return true;
}

24
jsowell-admin/src/main/resources/application-pre.yml
View File

@@ -8,17 +8,17 @@ spring:
# redis 配置
redis:
# 地址
# host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
host: 106.14.94.149
host: r-uf6k0uet7mihr5z78f.redis.rds.aliyuncs.com
# host: 106.14.94.149
# 端口，默认为6379
port: 6379
# 数据库索引
database: 0
# 账号
# username: jsowell
# 密码
# password: js@160829
password: js160829
username: jsowell
# 密码
password: js@160829
# password: js160829
# 连接超时时间
timeout: 10s
lettuce:
@@ -38,12 +38,12 @@ spring:
druid:
# 主库数据源
master:
# url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell
# password: js@160829
url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell_pre
password: Js@160829
url: jdbc:mysql://rm-uf6ra51u33dc3798l.mysql.rds.aliyuncs.com:3306/jsowell_prd?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
username: jsowell
password: js@160829
# url: jdbc:mysql://106.14.94.149:3306/jsowell_pre?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
# username: jsowell_pre
# password: Js@160829
# 从库数据源
slave:
# 从数据源开关/默认关闭