shi
/
game-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

main-p
998998 2025-02-24 17:45:23 +08:00
parent 6b2390f5e7 1e495270a9
commit 7ed35400b9
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ff-admin/src/main/java/com/ff/common/service/impl/TenantGameQuotaServiceImpl.java
View File

@ -323,12 +323,12 @@ public class TenantGameQuotaServiceImpl implements ITenantGameQuotaService {
.tenantKey(gameBalanceExchange.getTenantKey()) .tenantKey(gameBalanceExchange.getTenantKey())
.memberId(member.getId()) .memberId(member.getId())
.build()); .build());
BigDecimal balanceOut = tenantGameQuotaFlowService.getExchangeMoneyByMemberId(TenantGameQuotaFlow.builder() BigDecimal balanceOut = NumberUtil.add(tenantGameQuotaFlowService.getExchangeMoneyByMemberId(TenantGameQuotaFlow.builder()
.isOut(Boolean.FALSE) .isOut(Boolean.FALSE)
.quotaType(quotaType) .quotaType(quotaType)
.tenantKey(gameBalanceExchange.getTenantKey()) .tenantKey(gameBalanceExchange.getTenantKey())
.memberId(member.getId()) .memberId(member.getId())
.build()); .build()),BigDecimal.ZERO);
// 初始化平台额度 // 初始化平台额度
BigDecimal platformBalance = BigDecimal.ZERO; BigDecimal platformBalance = BigDecimal.ZERO;

7
ff-admin/src/main/resources/application-prod.yml
View File

@ -1,15 +1,16 @@
# 项目相关配置 # 项目相关配置
ff: ff:
# 文件路径 示例（ Windows配置D:/ff/uploadPath，Linux配置 /home/ff/uploadPath） # 文件路径 示例（ Windows配置D:/ff/uploadPath，Linux配置 /home/ff/uploadPath）
profile: D:/opt/sever/dist/ff-admin/uploadPath profile: /opt/gameApi/dist/game-api/uploadPath
# 开发环境配置 # 开发环境配置
server: server:
# 服务器的HTTP端口，默认为8080 # 服务器的HTTP端口，默认为8080
port: 28080 port: 38080
servlet: servlet:
# 应用的访问路径 # 应用的访问路径
context-path: /ff-api context-path: /ff-api
# 日志配置 # 日志配置
logging: logging:
level: level:
@ -49,7 +50,7 @@ spring:
druid: druid:
# 主库数据源 # 主库数据源
master: master:
url: jdbc:mysql://192.168.1.11:23306/ff-admin?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true url: jdbc:mysql://127.0.0.1:23306/ff-game?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true
username: root username: root
password: myAa123456 password: myAa123456
# 初始连接数 # 初始连接数

2
sh/linux/publish.sh
View File

@ -8,7 +8,7 @@ fi
git pull git pull
mvn -Dmaven.test.skip=true clean package mvn -Dmaven.test.skip=true clean package
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
cp ff-admin/target/ff-*.jar /opt/sever/dist/ff-admin/ cp ff-admin/target/ff-*.jar /opt/gameApi/dist/game-api/
else else
echo "fail" echo "fail"