Merge remote-tracking branch 'origin/main'

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

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

ff-admin/src/main/resources/application-prod.yml

@@ -1,15 +1,16 @@
 # 项目相关配置
 ff:
     # 文件路径 示例（ Windows配置D:/ff/uploadPath，Linux配置 /home/ff/uploadPath）
-    profile: D:/opt/sever/dist/ff-admin/uploadPath
+    profile: /opt/gameApi/dist/game-api/uploadPath
 # 开发环境配置
 server:
     # 服务器的HTTP端口，默认为8080
-    port: 28080
+    port: 38080
     servlet:
         # 应用的访问路径
         context-path: /ff-api
 
+
 # 日志配置
 logging:
     level:
@@ -49,7 +50,7 @@ spring:
         druid:
             # 主库数据源
             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
                 password: myAa123456
             # 初始连接数

sh/linux/publish.sh

@@ -8,7 +8,7 @@ fi
 git pull
 mvn -Dmaven.test.skip=true clean package
 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
     echo "fail"