UserRegistry 中添加 captchaCode, verifyCode 和 enableCode 三个字段, 用于指定在测试时使用的固定验证码

account/account-service/src/main/java/cn/reghao/tnb/account/app/model/po/UserRegistry.java

@@ -15,9 +15,13 @@ import lombok.Setter;
 public class UserRegistry extends BaseObject<Integer> {
     private final Boolean enabled;
     private String rule;
+    private String captchaCode;
+    private String verifyCode;
+    private Boolean enableCode;
 
     public UserRegistry() {
         this.enabled = true;
+        this.enableCode = false;
         this.rule = "*";
     }
 }

account/account-service/src/main/java/cn/reghao/tnb/account/app/service/CodeService.java

@@ -7,6 +7,7 @@ import cn.reghao.tnb.account.api.constant.VerifyChannel;
 import cn.reghao.tnb.account.api.dto.VerifyCode;
 import cn.reghao.tnb.account.app.db.repository.AccountRepository;
 import cn.reghao.tnb.account.app.model.po.UserAccount;
+import cn.reghao.tnb.account.app.model.po.UserRegistry;
 import cn.reghao.tnb.account.app.util.CaptchaUtil;
 import cn.reghao.tnb.account.app.redis.RedisKeys;
 import cn.reghao.tnb.account.app.redis.ds.RedisString;
@@ -44,8 +45,13 @@ public class CodeService {
     }
 
     public InputStream generateCaptcha() throws IOException {
-        String captchaCode = RandomString.getString(5);
-        //captchaCode = "ab8il";
+        String captchaCode;
+        UserRegistry userRegistry = accountRepository.getUserRegistry();
+        if (!userRegistry.getEnableCode()) {
+            captchaCode = RandomString.getString(5);
+        } else {
+            captchaCode = userRegistry.getCaptchaCode();
+        }
         redisString.setWithTimeout(RedisKeys.getCaptchaKey(), captchaCode, sessionTimeout);
 
         ByteArrayOutputStream baos = CaptchaUtil.captchaWithDisturb(captchaCode, 130, 48);
@@ -60,8 +66,8 @@ public class CodeService {
         Integer channel = verifyCode.getChannel();
         String receiver = verifyCode.getReceiver();
 
-        boolean registry = accountRepository.getUserRegistry().getEnabled();
-        if (channel == VerifyChannel.registryChannel.getValue() && !registry) {
+        UserRegistry userRegistry = accountRepository.getUserRegistry();
+        if (channel == VerifyChannel.registryChannel.getValue() && !userRegistry.getEnabled()) {
             return Result.fail("系统当前未开放注册");
         }
 
@@ -81,8 +87,13 @@ public class CodeService {
             return Result.fail("邮箱/手机号已存在");
         }
 
-        String code = RandomString.getNumber(6);
-        code = "220233";
+        String code;
+        if (userRegistry.getEnableCode()) {
+            code = userRegistry.getVerifyCode();
+        } else {
+            code = RandomString.getNumber(6);
+        }
+
         redisString.setWithTimeout(RedisKeys.getVerifyCodeKey(channel, receiver), code, sessionTimeout);
 
         String title = "验证码";

account/account-service/src/main/resources/mapper/UserRegistryMapper.xml

@@ -4,9 +4,9 @@
 <mapper namespace="cn.reghao.tnb.account.app.db.mapper.UserRegistryMapper">
     <insert id="save">
         insert into user_registry
-        (`enabled`,`rule`)
+        (`enabled`,`rule`,`captcha_code`,`verify_code`,`enable_code`)
         values
-        (#{enabled},#{rule})
+        (#{enabled},#{rule},#{captchaCode},#{verifyCode},#{enableCode})
     </insert>
     
     <update id="update">