From f4c181608411d60293c836621dc90b9120e3a451 Mon Sep 17 00:00:00 2001
From: JaneYork <janeyork1314@163.com>
Date: 星期五, 22 七月 2022 15:27:00 +0800
Subject: [PATCH] 主动设置文件公共读,适配天翼云OSS 主动设置文件公共读,适配天翼云OSS。 天翼云,即便bucket设置公共读,文件默认也是private,除非手动设置,详见天翼云:https://console.xstore.ctyun.cn/doc/store/sdk/java/objectOperation/putObject.html 已测试: 所有兼容S3协议的OSS,已测试:阿里云、腾讯云、百度、京东、天翼、自建Minio、七牛

---
 ruoyi-common/src/main/java/com/ruoyi/common/captcha/UnsignedMathGenerator.java |   14 +++++++-------
 1 files changed, 7 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..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
@@ -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