Date: Tue, 11 Jan 2022 09:02:16 +0800
Subject: [PATCH 138/178] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E7=BE=A4?=
=?UTF-8?q?=E5=8F=B7=EF=BC=9A264312783?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
.../src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java | 2 +-
ruoyi-ui/src/views/index.vue | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index 3d7053780..07dbeebf9 100644
--- a/README.md
+++ b/README.md
@@ -94,4 +94,4 @@
## 若依前后端分离交流群
-QQ群： [](https://jq.qq.com/?_wv=1027&k=5bVB1og) [](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [](https://jq.qq.com/?_wv=1027&k=51G72yr) [](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) 点击按钮入群。
\ No newline at end of file
+QQ群： [](https://jq.qq.com/?_wv=1027&k=5bVB1og) [](https://jq.qq.com/?_wv=1027&k=5eiA4DH) [](https://jq.qq.com/?_wv=1027&k=5AxMKlC) [](https://jq.qq.com/?_wv=1027&k=51G72yr) [](https://jq.qq.com/?_wv=1027&k=VvjN2nvu) [](https://jq.qq.com/?_wv=1027&k=5vYAqA05) [](https://jq.qq.com/?_wv=1027&k=kOIINEb5) [](https://jq.qq.com/?_wv=1027&k=UKtX5jhs) [](https://jq.qq.com/?_wv=1027&k=EI9an8lJ) 点击按钮入群。
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
index 00d07f419..ec2e0b88c 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
@@ -121,7 +121,7 @@ public class ScheduleUtils
*/
public static boolean whiteList(String invokeTarget)
{
- String packageName = StringUtils.substringBefore(invokeTarget, ")");
+ String packageName = StringUtils.substringBefore(invokeTarget, "(");
int count = StringUtils.countMatches(packageName, ".");
if (count > 1)
{
diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue
index f136d1aa9..1cf7954be 100644
--- a/ruoyi-ui/src/views/index.vue
+++ b/ruoyi-ui/src/views/index.vue
@@ -120,9 +120,9 @@
QQ群：满937441
满887144332 满180251782 满104180207
- 满186866453 满201396349 满101456076
-
- 101539465满186866453 满201396349 满101456076 满101539465
+
+ 264312783
From 6f222ab02bb4afdc22cbe6ae98c726db6f1f312a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Tue, 11 Jan 2022 09:30:38 +0800
Subject: [PATCH 139/178] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E9=80=9A?=
=?UTF-8?q?=E9=85=8D=E7=AC=A6=E5=8C=B9=E9=85=8D=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../src/main/java/com/ruoyi/common/utils/StringUtils.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
index f96c1e5a5..53bc3d4dd 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/StringUtils.java
@@ -5,10 +5,10 @@ import cn.hutool.core.lang.Validator;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil;
-import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
+import org.springframework.util.AntPathMatcher;
import java.util.*;
@@ -347,7 +347,8 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
* @return
*/
public static boolean isMatch(String pattern, String url) {
- return ReUtil.isMatch(pattern, url);
+ AntPathMatcher matcher = new AntPathMatcher();
+ return matcher.match(pattern, url);
}
@SuppressWarnings("unchecked")
From 9bad713db5419c764117626d626bb3072bda4e4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Tue, 11 Jan 2022 11:30:53 +0800
Subject: [PATCH 140/178] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20index-tree.v?=
=?UTF-8?q?ue.vm=20=E6=BC=8F=E5=88=A0=20#end?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm | 1 -
1 file changed, 1 deletion(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
index cc0c7acc5..f8c894151 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -261,7 +261,6 @@
#end
#end
-#end
#end
From fc8c96399f027117d2afc425b607ef5013c62006 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Tue, 11 Jan 2022 12:36:33 +0800
Subject: [PATCH 141/178] =?UTF-8?q?update=20=E9=98=B2=E9=87=8D=E5=A4=8D?=
=?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A0=87=E8=AF=86=E7=BB=84=E5=90=88=20?=
=?UTF-8?q?=E6=94=B9=E4=B8=BA=20key=20+=20url=20+=20header?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ruoyi/framework/aspectj/RepeatSubmitAspect.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
index 5c249a2dd..48761ac29 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RepeatSubmitAspect.java
@@ -57,13 +57,11 @@ public class RepeatSubmitAspect {
String url = request.getRequestURI();
// 唯一值（没有消息头则使用请求地址）
- String submitKey = request.getHeader(tokenProperties.getHeader());
- if (StringUtils.isEmpty(submitKey)) {
- submitKey = url;
- }
+ String submitKey = StringUtils.trimToEmpty(request.getHeader(tokenProperties.getHeader()));
+
submitKey = SecureUtil.md5(submitKey + ":" + nowParams);
- // 唯一标识（指定key + 消息头）
- String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + submitKey;
+ // 唯一标识（指定key + url + 消息头）
+ String cacheRepeatKey = Constants.REPEAT_SUBMIT_KEY + url + submitKey;
String key = RedisUtils.getCacheObject(cacheRepeatKey);
if (key == null) {
RedisUtils.setCacheObject(cacheRepeatKey, "", interval, TimeUnit.MILLISECONDS);
From 766361ac83d06b3843ebee241e7eed906ffe2c57 Mon Sep 17 00:00:00 2001
From: guxin0123
Date: Tue, 11 Jan 2022 04:57:26 +0000
Subject: [PATCH 142/178] =?UTF-8?q?update=20ruoyi-generator/src/main/resou?=
=?UTF-8?q?rces/vm/vue/v3/index.vue.vm.=20=E7=BF=BB=E9=A1=B5=E7=BB=84?=
=?UTF-8?q?=E4=BB=B6=E5=A4=9A=E4=BA=86=E4=B8=80=E4=B8=AA=20:p=20=E5=AF=BC?=
=?UTF-8?q?=E8=87=B4=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E6=97=A0=E6=B3=95?=
=?UTF-8?q?=E7=BF=BB=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
index 1a6cb355f..06ec7b185 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm
@@ -176,8 +176,8 @@
From 26fc652d33fb82a75d6ec7771ca50ee414b21723 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90li?=
<15040126243@163.com>
Date: Tue, 11 Jan 2022 16:58:47 +0800
Subject: [PATCH 143/178] =?UTF-8?q?update=20=E7=BB=9F=E4=B8=80=E4=BB=A3?=
=?UTF-8?q?=E7=A0=81=E9=97=B4=E9=9A=94=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../common/captcha/UnsignedMathGenerator.java | 118 ++--
.../common/convert/ExcelBigNumberConvert.java | 48 +-
.../common/convert/ExcelDictConvert.java | 80 +--
.../ruoyi/common/core/domain/AjaxResult.java | 196 +++---
.../ruoyi/common/core/domain/BaseEntity.java | 74 +--
.../ruoyi/common/core/domain/PageQuery.java | 2 +-
.../ruoyi/common/core/domain/TreeEntity.java | 36 +-
.../common/core/domain/entity/SysDept.java | 108 ++--
.../core/domain/entity/SysDictData.java | 140 ++--
.../core/domain/entity/SysDictType.java | 70 +-
.../common/core/domain/entity/SysMenu.java | 148 ++---
.../common/core/domain/entity/SysRole.java | 186 +++---
.../common/core/domain/entity/SysUser.java | 248 +++----
.../core/mybatisplus/core/BaseMapperPlus.java | 14 +-
.../core/mybatisplus/core/IServicePlus.java | 160 ++---
.../mybatisplus/core/ServicePlusImpl.java | 268 ++++----
.../core/mybatisplus/methods/InsertAll.java | 146 ++---
.../ruoyi/common/core/page/TableDataInfo.java | 62 +-
.../com/ruoyi/common/utils/StringUtils.java | 604 +++++++++---------
.../ruoyi/common/utils/ValidatorUtils.java | 4 +-
.../demo/controller/TestI18nController.java | 26 +-
.../java/com/ruoyi/demo/domain/TestDemo.java | 10 +-
.../java/com/ruoyi/demo/domain/TestTree.java | 2 +-
.../com/ruoyi/demo/domain/bo/TestDemoBo.java | 24 +-
.../com/ruoyi/demo/domain/bo/TestTreeBo.java | 16 +-
.../com/ruoyi/demo/domain/vo/TestDemoVo.java | 67 +-
.../com/ruoyi/demo/domain/vo/TestTreeVo.java | 41 +-
.../ruoyi/demo/service/ITestDemoService.java | 84 +--
.../ruoyi/demo/service/ITestTreeService.java | 66 +-
.../service/impl/TestDemoServiceImpl.java | 120 ++--
.../service/impl/TestTreeServiceImpl.java | 94 +--
.../admin/MonitorAdminApplication.java | 8 +-
.../monitor/admin/config/SecurityConfig.java | 48 +-
.../ruoyi/framework/config/AsyncConfig.java | 8 +-
.../ruoyi/framework/config/DruidConfig.java | 19 +-
.../ruoyi/framework/config/I18nConfig.java | 44 +-
.../ruoyi/framework/config/JacksonConfig.java | 36 +-
.../framework/config/MybatisPlusConfig.java | 132 ++--
.../ruoyi/framework/config/SwaggerConfig.java | 80 +--
.../config/properties/CaptchaProperties.java | 24 +-
.../config/properties/RedissonProperties.java | 336 +++++-----
.../config/properties/SwaggerProperties.java | 76 +--
.../CreateAndUpdateMetaObjectHandler.java | 108 ++--
.../jackson/BigNumberSerializer.java | 42 +-
.../framework/manager/ShutdownManager.java | 36 +-
.../handle/LogoutSuccessHandlerImpl.java | 38 +-
.../com/ruoyi/system/domain/SysConfig.java | 2 +-
.../com/ruoyi/system/domain/SysOperLog.java | 6 +-
.../java/com/ruoyi/system/domain/SysOss.java | 50 +-
.../java/com/ruoyi/system/domain/SysPost.java | 4 +-
.../service/impl/SysMenuServiceImpl.java | 7 +-
51 files changed, 2184 insertions(+), 2182 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 9c0f26f5b..ec2d68258 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
@@ -13,73 +13,73 @@ import com.ruoyi.common.utils.StringUtils;
*/
public class UnsignedMathGenerator implements CodeGenerator {
- private static final long serialVersionUID = -5514819971774091076L;
+ private static final long serialVersionUID = -5514819971774091076L;
- private static final String operators = "+-*";
+ private static final String operators = "+-*";
- /**
- * 参与计算数字最大长度
- */
- private final int numberLength;
+ /**
+ * 参与计算数字最大长度
+ */
+ private final int numberLength;
- /**
- * 构造
- */
- public UnsignedMathGenerator() {
- this(2);
- }
+ /**
+ * 构造
+ */
+ public UnsignedMathGenerator() {
+ this(2);
+ }
- /**
- * 构造
- *
- * @param numberLength 参与计算最大数字位数
- */
- public UnsignedMathGenerator(int numberLength) {
- this.numberLength = numberLength;
- }
+ /**
+ * 构造
+ *
+ * @param numberLength 参与计算最大数字位数
+ */
+ public UnsignedMathGenerator(int numberLength) {
+ this.numberLength = numberLength;
+ }
- @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);
+ @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);
- return number1 + RandomUtil.randomChar(operators) + number2 + '=';
- }
+ return number1 + RandomUtil.randomChar(operators) + number2 + '=';
+ }
- @Override
- public boolean verify(String code, String userInputCode) {
- int result;
- try {
- result = Integer.parseInt(userInputCode);
- } catch (NumberFormatException e) {
- // 用户输入非数字
- return false;
- }
+ @Override
+ public boolean verify(String code, String userInputCode) {
+ int result;
+ try {
+ result = Integer.parseInt(userInputCode);
+ } catch (NumberFormatException e) {
+ // 用户输入非数字
+ return false;
+ }
- final int calculateResult = (int) Calculator.conversion(code);
- return result == calculateResult;
- }
+ final int calculateResult = (int) Calculator.conversion(code);
+ return result == calculateResult;
+ }
- /**
- * 获取验证码长度
- *
- * @return 验证码长度
- */
- public int getLength() {
- return this.numberLength * 2 + 2;
- }
+ /**
+ * 获取验证码长度
+ *
+ * @return 验证码长度
+ */
+ public int getLength() {
+ return this.numberLength * 2 + 2;
+ }
- /**
- * 根据长度获取参与计算数字最大值
- *
- * @return 最大值
- */
- private int getLimit() {
- return Integer.parseInt("1" + StringUtils.repeat('0', this.numberLength));
- }
+ /**
+ * 根据长度获取参与计算数字最大值
+ *
+ * @return 最大值
+ */
+ private int getLimit() {
+ return Integer.parseInt("1" + StringUtils.repeat('0', this.numberLength));
+ }
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
index df1f95a0f..690b47917 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/convert/ExcelBigNumberConvert.java
@@ -20,32 +20,32 @@ import java.math.BigDecimal;
@Slf4j
public class ExcelBigNumberConvert implements Converter {
- @Override
- public Class supportJavaTypeKey() {
- return Long.class;
- }
+ @Override
+ public Class supportJavaTypeKey() {
+ return Long.class;
+ }
- @Override
- public CellDataTypeEnum supportExcelTypeKey() {
- return CellDataTypeEnum.STRING;
- }
+ @Override
+ public CellDataTypeEnum supportExcelTypeKey() {
+ return CellDataTypeEnum.STRING;
+ }
- @Override
- public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
- return Convert.toLong(cellData.getData());
- }
+ @Override
+ public Long convertToJavaData(CellData cellData, ExcelContentProperty contentProperty, GlobalConfiguration globalConfiguration) {
+ return Convert.toLong(cellData.getData());
+ }
- @Override
- public CellData
+
+ 
+ 
+