From fe98fba5b51ae4f1ef62cbdbd9b6a8ec20e8e623 Mon Sep 17 00:00:00 2001
From: 若依 <yzz_ivy@163.com>
Date: 星期二, 12 七月 2022 18:01:56 +0800
Subject: [PATCH] !527 调增数组格式声明，random随机转换修正 Merge pull request !527 from 靖少毅/jsy20220705
---
ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java | 4 ++--
ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
index 165f40a..4578a04 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/text/Convert.java
@@ -894,7 +894,7 @@
*/
public static String toSBC(String input, Set<Character> notConvertSet)
{
- char c[] = input.toCharArray();
+ char[] c = input.toCharArray();
for (int i = 0; i < c.length; i++)
{
if (null != notConvertSet && notConvertSet.contains(c[i]))
@@ -936,7 +936,7 @@
*/
public static String toDBC(String text, Set<Character> notConvertSet)
{
- char c[] = text.toCharArray();
+ char[] c = text.toCharArray();
for (int i = 0; i < c.length; i++)
{
if (null != notConvertSet && notConvertSet.contains(c[i]))
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
index 3e74580..976a46a 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/KaptchaTextCreator.java
@@ -5,7 +5,7 @@
/**
* 验证码文本生成器
- *
+ *
* @author ruoyi
*/
public class KaptchaTextCreator extends DefaultTextCreator
@@ -20,7 +20,7 @@
int x = random.nextInt(10);
int y = random.nextInt(10);
StringBuilder suChinese = new StringBuilder();
- int randomoperands = (int) Math.round(Math.random() * 2);
+ int randomoperands = random.nextInt(3);
if (randomoperands == 0)
{
result = x * y;
@@ -30,7 +30,7 @@
}
else if (randomoperands == 1)
{
- if (!(x == 0) && y % x == 0)
+ if ((x != 0) && y % x == 0)
{
result = y / x;
suChinese.append(CNUMBERS[y]);
--
Gitblit v1.9.2