From a237bc29871e15df6300c9b31a1d01fed42dd26f Mon Sep 17 00:00:00 2001
From: ziin <hiziying@hotmail.com>
Date: Wed, 17 Dec 2025 13:24:38 +0800
Subject: [PATCH] =?UTF-8?q?refactor(config):=20=E5=90=88=E5=B9=B6=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E6=B3=A8=E5=86=8C=E9=85=8D=E7=BD=AE=E5=B9=B6=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E9=BB=98=E8=AE=A4=E9=85=8D=E9=A2=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将 UserRegisterProperties 内嵌到 AppConfig，删除独立配置类；
freeTrialQuota 由 5 改为 3，新增 rewardBalance 字段；
同步更新 UserServiceImpl 初始化逻辑及 yml 配置。
---
 .../com/yolo/keyborad/config/AppConfig.java   |  5 ++++-
 .../config/UserRegisterProperties.java        | 20 -------------------
 .../service/impl/UserServiceImpl.java         | 18 +++++++----------
 src/main/resources/application-dev.yml        | 15 --------------
 src/main/resources/application-prod.yml       |  6 ++++--
 5 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 src/main/java/com/yolo/keyborad/config/UserRegisterProperties.java

diff --git a/src/main/java/com/yolo/keyborad/config/AppConfig.java b/src/main/java/com/yolo/keyborad/config/AppConfig.java
index 990c608..6bb11d1 100644
--- a/src/main/java/com/yolo/keyborad/config/AppConfig.java
+++ b/src/main/java/com/yolo/keyborad/config/AppConfig.java
@@ -2,6 +2,8 @@ package com.yolo.keyborad.config;
 
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /*
  * @author: ziin
  * @date: 2025/12/16 21:18
@@ -18,7 +20,8 @@ public class AppConfig {
         /**
          * 新用户注册时的免费使用次数
          */
-        private Integer freeTrialQuota = 5;
+        private Integer freeTrialQuota = 3;
 
+        private BigDecimal rewardBalance = BigDecimal.valueOf(0);
     }
 }
diff --git a/src/main/java/com/yolo/keyborad/config/UserRegisterProperties.java b/src/main/java/com/yolo/keyborad/config/UserRegisterProperties.java
deleted file mode 100644
index 909e620..0000000
--- a/src/main/java/com/yolo/keyborad/config/UserRegisterProperties.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.yolo.keyborad.config;
-
-import lombok.Data;
-import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.stereotype.Component;
-
-/**
- * 用户注册配置属性
- */
-@ConfigurationProperties(prefix = "user.register")
-@Component
-@Data
-public class UserRegisterProperties {
-
-    /**
-     * 新用户注册时的免费使用次数
-     */
-    private Integer freeTrialQuota;
-
-}
diff --git a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java
index 47edbb5..f87d943 100644
--- a/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java
+++ b/src/main/java/com/yolo/keyborad/service/impl/UserServiceImpl.java
@@ -5,16 +5,15 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.RandomUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yolo.keyborad.common.ErrorCode;
 import com.yolo.keyborad.config.AppConfig;
 import com.yolo.keyborad.config.NacosAppConfigCenter;
-import com.yolo.keyborad.config.UserRegisterProperties;
 import com.yolo.keyborad.exception.BusinessException;
 import com.yolo.keyborad.mapper.KeyboardUserMapper;
 import com.yolo.keyborad.model.dto.user.*;
 import com.yolo.keyborad.model.entity.KeyboardUser;
+import com.yolo.keyborad.model.entity.KeyboardUserQuotaTotal;
 import com.yolo.keyborad.model.entity.KeyboardUserWallet;
 import com.yolo.keyborad.model.vo.user.KeyboardUserRespVO;
 import com.yolo.keyborad.service.*;
@@ -63,9 +62,6 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
     @Resource
     private KeyboardUserQuotaTotalService quotaTotalService;
 
-    @Resource
-    private UserRegisterProperties userRegisterProperties;
-
     private final NacosAppConfigCenter.DynamicAppConfig cfgHolder;
 
     public UserServiceImpl(NacosAppConfigCenter.DynamicAppConfig cfgHolder) {
@@ -89,10 +85,12 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
         keyboardUserMapper.insert(keyboardUser);
         keyboardCharacterService.addDefaultUserCharacter(keyboardUser.getId());
 
+        AppConfig appConfig = cfgHolder.getRef().get();
+
         // 初始化用户钱包（余额为0）
         KeyboardUserWallet wallet = new KeyboardUserWallet();
         wallet.setUserId(keyboardUser.getId());
-        wallet.setBalance(BigDecimal.ZERO);
+        wallet.setBalance(BigDecimal.valueOf(appConfig.getUserRegisterProperties().getFreeTrialQuota()));
         wallet.setVersion(0);
         wallet.setStatus((short) 1);
         wallet.setCreatedAt(new Date());
@@ -100,10 +98,8 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
         walletService.save(wallet);
 
         // 初始化用户免费使用次数配额
-        com.yolo.keyborad.model.entity.KeyboardUserQuotaTotal quotaTotal =
-                new com.yolo.keyborad.model.entity.KeyboardUserQuotaTotal();
+        KeyboardUserQuotaTotal quotaTotal = new KeyboardUserQuotaTotal();
         quotaTotal.setUserId(keyboardUser.getId());
-        AppConfig appConfig = cfgHolder.getRef().get();
         quotaTotal.setTotalQuota(appConfig.getUserRegisterProperties().getFreeTrialQuota());
         quotaTotal.setUsedQuota(0);
         quotaTotal.setVersion(0);
@@ -222,6 +218,7 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
         if (!userRegisterDTO.getVerifyCode().equals(s)) {
             throw new BusinessException(ErrorCode.VERIFY_CODE_ERROR);
         }
+        AppConfig appConfig = cfgHolder.getRef().get();
         keyboardUser.setEmailVerified(true);
         redisUtil.delete("user:" + userRegisterDTO.getMailAddress());
         int insertCount = keyboardUserMapper.insert(keyboardUser);
@@ -231,7 +228,7 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
             // 初始化用户钱包（余额为0）
             KeyboardUserWallet wallet = new KeyboardUserWallet();
             wallet.setUserId(keyboardUser.getId());
-            wallet.setBalance(BigDecimal.ZERO);
+            wallet.setBalance(appConfig.getUserRegisterProperties().getRewardBalance());
             wallet.setVersion(0);
             wallet.setStatus((short) 1);
             wallet.setCreatedAt(new Date());
@@ -242,7 +239,6 @@ public class UserServiceImpl extends ServiceImpl<KeyboardUserMapper, KeyboardUse
             com.yolo.keyborad.model.entity.KeyboardUserQuotaTotal quotaTotal =
                     new com.yolo.keyborad.model.entity.KeyboardUserQuotaTotal();
             quotaTotal.setUserId(keyboardUser.getId());
-            AppConfig appConfig = cfgHolder.getRef().get();
             quotaTotal.setTotalQuota(appConfig.getUserRegisterProperties().getFreeTrialQuota());
             quotaTotal.setUsedQuota(0);
             quotaTotal.setVersion(0);
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 8198c41..6f656b4 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -69,21 +69,6 @@ dromara:
         domain: https://resource.loveamorkey.com/ # ????????/???????https://abcd.s3.ap-east-1.amazonaws.com/
         base-path: avatar/ # ????
 
-
-mailgun:
-  api-key: ${MAILGUN_API_KEY}          # ?? Private API Key
-  domain: sandboxxxxxxx.mailgun.org    # ?????????
-  from-email: no-reply@yourdomain.com  # ?????
-  from-name: Key Of Love             # ?????????
-
-# ??????
-user:
-  register:
-    # ?????????????
-    free-trial-quota: 5
-
-
-
 ############## Sa-Token ?? (??: https://sa-token.cc) ##############
 sa-token:
   # token ??????? cookie ???
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index ed1460c..e9da938 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -25,9 +25,11 @@ logging:
     # ??????????
     name: logs/keyborad-backend.log
     # ????????
-    max-size: 10MB
     # ?????????
-    max-history: 30
+  logback:
+    rollingpolicy:
+      max-file-size: 10MB
+      max-history: 30
 
 # ??????
 user: