From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:22:30 +0800
Subject: [PATCH] update 适配 新序列化注解
---
ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java b/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
index 7b908a2..022fefc 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java
@@ -6,6 +6,8 @@
import cn.hutool.core.util.RandomUtil;
import com.ruoyi.common.utils.StringUtils;
+import java.io.Serial;
+
/**
* 鏃犵鍙疯绠楃敓鎴愬櫒
*
@@ -13,6 +15,7 @@
*/
public class UnsignedMathGenerator implements CodeGenerator {
+ @Serial
private static final long serialVersionUID = -5514819971774091076L;
private static final String OPERATORS = "+-*";
@@ -41,14 +44,14 @@
@Override
public String generate() {
final int limit = getLimit();
- int min = RandomUtil.randomInt(limit);
- int max = RandomUtil.randomInt(min, limit);
- String number1 = Integer.toString(max);
- String number2 = Integer.toString(min);
- number1 = StringUtils.rightPad(number1, this.numberLength, CharUtil.SPACE);
- number2 = StringUtils.rightPad(number2, this.numberLength, CharUtil.SPACE);
+ int a = RandomUtil.randomInt(limit);
+ int b = RandomUtil.randomInt(limit);
+ String max = Integer.toString(Math.max(a,b));
+ String min = Integer.toString(Math.min(a,b));
+ max = StringUtils.rightPad(max, this.numberLength, CharUtil.SPACE);
+ min = StringUtils.rightPad(min, this.numberLength, CharUtil.SPACE);
- return number1 + RandomUtil.randomChar(OPERATORS) + number2 + '=';
+ return max + RandomUtil.randomChar(OPERATORS) + min + '=';
}
@Override
--
Gitblit v1.9.3