From a186f91080177b6d606c03aa6fdfa27f80eae9a6 Mon Sep 17 00:00:00 2001 From: shi Date: Tue, 18 Feb 2025 15:04:46 +0800 Subject: [PATCH] =?UTF-8?q?refactor(ff-admin):=20=E8=B0=83=E6=95=B4=20Redi?= =?UTF-8?q?s=20=E6=95=B0=E6=8D=AE=E5=BA=93=E7=B4=A2=E5=BC=95=E5=B9=B6?= =?UTF-8?q?=E4=BC=98=E5=8C=96=20GameBettingDetailsMapper?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit -将 Redis 数据库索引从1 改为 2 - 在 GameBettingDetailsMapper 中添加 tenant_key 字段 - 更新 TenantGameQuotaServiceImpl 中的错误提示信息 - 移除 TenantUtils 中的 getTenantId 方法 --- .../impl/TenantGameQuotaServiceImpl.java | 2 +- .../src/main/resources/application-druid.yml | 2 +- .../mapper/game/GameBettingDetailsMapper.xml | 3 ++- .../mapper/game/GameBettingDetailsMapper.xml | 3 ++- .../java/com/ff/base/utils/TenantUtils.java | 22 ------------------- 5 files changed, 6 insertions(+), 26 deletions(-) diff --git a/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java b/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java index 446c372..551fcd2 100644 --- a/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java +++ b/ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java @@ -122,7 +122,7 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService { public Boolean balanceChanges(BalanceChangesDTO balanceChangesDTO) { TenantGameQuota tenantGameQuota = tenantGameQuotaMapper.selectTenantGameQuotaByTenantKey(balanceChangesDTO.getTenantKey(), TenantQuotaType.BALANCE.getCode()); - Assert.isTrue(!ObjectUtils.isEmpty(tenantGameQuota), "余额额度不足"); + Assert.isTrue(!ObjectUtils.isEmpty(tenantGameQuota), "租户余额额度不足"); BigDecimal balanceBefore = tenantGameQuota.getBalance(); BigDecimal balance = balanceChangesDTO.getBalance(); diff --git a/ff-admin/src/main/resources/application-druid.yml b/ff-admin/src/main/resources/application-druid.yml index d86c02e..9589dd6 100644 --- a/ff-admin/src/main/resources/application-druid.yml +++ b/ff-admin/src/main/resources/application-druid.yml @@ -7,7 +7,7 @@ spring: # 端口，默认为6379 port: 6379 # 数据库索引 - database: 1 + database: 2 # 密码 password: # 连接超时时间 diff --git a/ff-admin/src/main/resources/mapper/game/GameBettingDetailsMapper.xml b/ff-admin/src/main/resources/mapper/game/GameBettingDetailsMapper.xml index 8c1449d..0d08319 100644 --- a/ff-admin/src/main/resources/mapper/game/GameBettingDetailsMapper.xml +++ b/ff-admin/src/main/resources/mapper/game/GameBettingDetailsMapper.xml @@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into ff_game_betting_details - game_id, currency_code, member_id, game_code, game_type, platform_code, + tenant_key, game_id, currency_code, member_id, game_code, game_type, platform_code, game_name, game_status, game_status_type, game_currency_code, account, wagers_id, wagers_time, bet_amount, payoff_time, payoff_amount, settlement_time, turnover, order_no, create_by, create_time @@ -200,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values + #{item.tenantKey}, #{item.gameId}, #{item.currencyCode}, #{item.memberId}, diff --git a/ff-admin/target/classes/mapper/game/GameBettingDetailsMapper.xml b/ff-admin/target/classes/mapper/game/GameBettingDetailsMapper.xml index 8c1449d..0d08319 100644 --- a/ff-admin/target/classes/mapper/game/GameBettingDetailsMapper.xml +++ b/ff-admin/target/classes/mapper/game/GameBettingDetailsMapper.xml @@ -192,7 +192,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into ff_game_betting_details - game_id, currency_code, member_id, game_code, game_type, platform_code, + tenant_key, game_id, currency_code, member_id, game_code, game_type, platform_code, game_name, game_status, game_status_type, game_currency_code, account, wagers_id, wagers_time, bet_amount, payoff_time, payoff_amount, settlement_time, turnover, order_no, create_by, create_time @@ -200,6 +200,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values + #{item.tenantKey}, #{item.gameId}, #{item.currencyCode}, #{item.memberId}, diff --git a/ff-base/src/main/java/com/ff/base/utils/TenantUtils.java b/ff-base/src/main/java/com/ff/base/utils/TenantUtils.java index fbacf30..3dd9718 100644 --- a/ff-base/src/main/java/com/ff/base/utils/TenantUtils.java +++ b/ff-base/src/main/java/com/ff/base/utils/TenantUtils.java @@ -15,29 +15,7 @@ import javax.servlet.http.HttpServletRequest; */ public class TenantUtils { - public static String getTenantId() { - // 获取当前请求的 ServletRequestAttributes 对象 - ServletRequestAttributes attributes = - (ServletRequestAttributes) RequestContextHolder.getRequestAttributes(); - if (attributes == null) { - // 当前线程中无法获取请求上下文，返回默认数据源 - return Constants.DATA_SOURCE; - } - - HttpServletRequest request = attributes.getRequest(); - - // 从请求头中获取 tenantId - String tenantId = request.getHeader(Constants.TENANT_ID); - - // 如果 tenantId 为空或缺失，返回默认数据源 - if (StringUtils.isEmpty(tenantId)) { - return Constants.DATA_SOURCE; - } - // 返回有效的 tenantId - return tenantId; - - } /** * 获取租户id redis