From 70f39cb1eecbb742dab0eb517a48a6bab8d0a576 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 29 十二月 2022 15:42:31 +0800
Subject: [PATCH] update 优化 代码生成与框架主体使用相同的主键生成器 全局统一避免问题
---
ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 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 ec2d682..5dd00ec 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
@@ -15,7 +15,7 @@
private static final long serialVersionUID = -5514819971774091076L;
- private static final String operators = "+-*";
+ private static final String OPERATORS = "+-*";
/**
* 鍙備笌璁＄畻鏁板瓧鏈�澶ч暱搴�
@@ -41,14 +41,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