From 00b6ca5dfe5328444efca61afdff609228621ffd 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, 10 Jan 2023 17:40:42 +0800 Subject: [PATCH 01/13] update springboot-admin 2.7.9 => 2.7.10 update easyexcel 3.1.4 => 3.1.5 update redisson 3.19.0 => 3.19.1 --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 30d5132c8..de150be38 100644 --- a/pom.xml +++ b/pom.xml @@ -22,15 +22,15 @@ 2.2.2 1.6.14 5.2.3 - 3.1.4 + 3.1.5 2.3 1.33.0 3.5.3.1 3.9.1 5.8.11 4.10.0 - 2.7.9 - 3.19.0 + 2.7.10 + 3.19.1 2.2.3 3.5.2 2.14.2 From d8b486c793848d560bb4f97db96ae38941f39ff9 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: Wed, 11 Jan 2023 15:12:32 +0800 Subject: [PATCH 02/13] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E6=8F=90=E4=BA=A4=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-admin/src/main/resources/application.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 77c68e496..0468a33ac 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -132,10 +132,6 @@ security: - /favicon.ico - /*/api-docs - /*/api-docs/** - - /swagger-ui/** - - /webjars/** - - /swagger-ui.html - - /doc.html # actuator 监控配置 - /actuator - /actuator/** From 52d33195ec8fd9c664c7cdf5b6a6c0836c099031 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: Wed, 11 Jan 2023 15:24:35 +0800 Subject: [PATCH 03/13] update sa-token 1.33.0 => 1.34.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index de150be38..8afb73f2b 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 5.2.3 3.1.5 2.3 - 1.33.0 + 1.34.0 3.5.3.1 3.9.1 5.8.11 From 242e26abee1dcf8b75b1d26b2c9f252a26512155 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: Thu, 12 Jan 2023 09:54:54 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=F0=9F=A7=A7=E5=8F=91=E5=B8=83=204.5.0=20?= =?UTF-8?q?=E6=96=B0=E6=98=A5=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .run/ruoyi-monitor-admin.run.xml | 2 +- .run/ruoyi-server.run.xml | 2 +- .run/ruoyi-xxl-job-admin.run.xml | 2 +- README.md | 2 +- pom.xml | 4 ++-- ruoyi-admin/pom.xml | 2 +- ruoyi-common/pom.xml | 2 +- ruoyi-demo/pom.xml | 2 +- ruoyi-extend/pom.xml | 2 +- ruoyi-extend/ruoyi-monitor-admin/pom.xml | 2 +- ruoyi-extend/ruoyi-xxl-job-admin/pom.xml | 2 +- ruoyi-framework/pom.xml | 2 +- ruoyi-generator/pom.xml | 2 +- ruoyi-job/pom.xml | 2 +- ruoyi-oss/pom.xml | 2 +- ruoyi-sms/pom.xml | 2 +- ruoyi-system/pom.xml | 2 +- ruoyi-ui/package.json | 2 +- ruoyi-ui/src/views/index.vue | 2 +- script/docker/docker-compose.yml | 8 ++++---- 20 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.run/ruoyi-monitor-admin.run.xml b/.run/ruoyi-monitor-admin.run.xml index 0eb44eec6..35b6b07f8 100644 --- a/.run/ruoyi-monitor-admin.run.xml +++ b/.run/ruoyi-monitor-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-server.run.xml b/.run/ruoyi-server.run.xml index c75e92af0..c0c575bee 100644 --- a/.run/ruoyi-server.run.xml +++ b/.run/ruoyi-server.run.xml @@ -2,7 +2,7 @@ - diff --git a/.run/ruoyi-xxl-job-admin.run.xml b/.run/ruoyi-xxl-job-admin.run.xml index 2a30437f1..ae25907a8 100644 --- a/.run/ruoyi-xxl-job-admin.run.xml +++ b/.run/ruoyi-xxl-job-admin.run.xml @@ -2,7 +2,7 @@ - diff --git a/README.md b/README.md index 1fd86c0c4..728871149 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus/blob/master/LICENSE) [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Vue-Plus)
-[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.4.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) +[![RuoYi-Vue-Plus](https://img.shields.io/badge/RuoYi_Vue_Plus-4.5.0-success.svg)](https://gitee.com/JavaLionLi/RuoYi-Vue-Plus) [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-2.7-blue.svg)]() [![JDK-8+](https://img.shields.io/badge/JDK-8-green.svg)]() [![JDK-11](https://img.shields.io/badge/JDK-11-green.svg)]() diff --git a/pom.xml b/pom.xml index 8afb73f2b..d17587a0f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,14 +6,14 @@ com.ruoyi ruoyi-vue-plus - 4.4.0 + 4.5.0 RuoYi-Vue-Plus https://gitee.com/JavaLionLi/RuoYi-Vue-Plus RuoYi-Vue-Plus后台管理系统 - 4.4.0 + 4.5.0 2.7.7 UTF-8 UTF-8 diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index a588f62da..91baa5cfa 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 jar diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index f88534367..94896ecaa 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 diff --git a/ruoyi-demo/pom.xml b/ruoyi-demo/pom.xml index 46b45981d..31f712cbc 100644 --- a/ruoyi-demo/pom.xml +++ b/ruoyi-demo/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 diff --git a/ruoyi-extend/pom.xml b/ruoyi-extend/pom.xml index 8b0e2fb67..a55645806 100644 --- a/ruoyi-extend/pom.xml +++ b/ruoyi-extend/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 ruoyi-extend diff --git a/ruoyi-extend/ruoyi-monitor-admin/pom.xml b/ruoyi-extend/ruoyi-monitor-admin/pom.xml index 687d95853..19fc04e20 100644 --- a/ruoyi-extend/ruoyi-monitor-admin/pom.xml +++ b/ruoyi-extend/ruoyi-monitor-admin/pom.xml @@ -5,7 +5,7 @@ ruoyi-extend com.ruoyi - 4.4.0 + 4.5.0 4.0.0 jar diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml index 9305051d9..7e65df583 100644 --- a/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml +++ b/ruoyi-extend/ruoyi-xxl-job-admin/pom.xml @@ -4,7 +4,7 @@ ruoyi-extend com.ruoyi - 4.4.0 + 4.5.0 ruoyi-xxl-job-admin jar diff --git a/ruoyi-framework/pom.xml b/ruoyi-framework/pom.xml index 52e1b0651..072b5b2f2 100644 --- a/ruoyi-framework/pom.xml +++ b/ruoyi-framework/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 diff --git a/ruoyi-generator/pom.xml b/ruoyi-generator/pom.xml index 3e55d4424..529048eed 100644 --- a/ruoyi-generator/pom.xml +++ b/ruoyi-generator/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 diff --git a/ruoyi-job/pom.xml b/ruoyi-job/pom.xml index 4162183f4..1146c9254 100644 --- a/ruoyi-job/pom.xml +++ b/ruoyi-job/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 jar diff --git a/ruoyi-oss/pom.xml b/ruoyi-oss/pom.xml index 78e618e95..d25f2b8df 100644 --- a/ruoyi-oss/pom.xml +++ b/ruoyi-oss/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 diff --git a/ruoyi-sms/pom.xml b/ruoyi-sms/pom.xml index 0ebabbb25..7180b058a 100644 --- a/ruoyi-sms/pom.xml +++ b/ruoyi-sms/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml index daa5aba7b..c1c28d9f8 100644 --- a/ruoyi-system/pom.xml +++ b/ruoyi-system/pom.xml @@ -5,7 +5,7 @@ ruoyi-vue-plus com.ruoyi - 4.4.0 + 4.5.0 4.0.0 diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json index 61a89f433..c1975834f 100644 --- a/ruoyi-ui/package.json +++ b/ruoyi-ui/package.json @@ -1,6 +1,6 @@ { "name": "ruoyi-vue-plus", - "version": "4.4.0", + "version": "4.5.0", "description": "RuoYi-Vue-Plus后台管理系统", "author": "LionLi", "license": "MIT", diff --git a/ruoyi-ui/src/views/index.vue b/ruoyi-ui/src/views/index.vue index 52f1a8768..7f7008e43 100644 --- a/ruoyi-ui/src/views/index.vue +++ b/ruoyi-ui/src/views/index.vue @@ -114,7 +114,7 @@ export default { data() { return { // 版本号 - version: "4.4.0", + version: "4.5.0", }; }, methods: { diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 414069737..f0a489875 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -100,7 +100,7 @@ services: network_mode: "host" ruoyi-server1: - image: ruoyi/ruoyi-server:4.4.0 + image: ruoyi/ruoyi-server:4.5.0 container_name: ruoyi-server1 environment: # 时区上海 @@ -115,7 +115,7 @@ services: network_mode: "host" ruoyi-server2: - image: "ruoyi/ruoyi-server:4.4.0" + image: "ruoyi/ruoyi-server:4.5.0" container_name: ruoyi-server2 environment: # 时区上海 @@ -130,7 +130,7 @@ services: network_mode: "host" ruoyi-monitor-admin: - image: ruoyi/ruoyi-monitor-admin:4.4.0 + image: ruoyi/ruoyi-monitor-admin:4.5.0 container_name: ruoyi-monitor-admin environment: # 时区上海 @@ -142,7 +142,7 @@ services: network_mode: "host" ruoyi-xxl-job-admin: - image: ruoyi/ruoyi-xxl-job-admin:4.4.0 + image: ruoyi/ruoyi-xxl-job-admin:4.5.0 container_name: ruoyi-xxl-job-admin environment: # 时区上海 From f9d9eb2d70458839d292a5d34d18ddc79888f80e 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: Thu, 12 Jan 2023 15:11:56 +0800 Subject: [PATCH 05/13] =?UTF-8?q?fix=20=E4=BF=AE=E5=A4=8D=20=E6=96=B0?= =?UTF-8?q?=E7=89=88=E6=9C=AC=20Redisson=20=E5=AD=98=E5=9C=A8=E4=B8=8E=20b?= =?UTF-8?q?oot=202.X=20=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 12 ++++++++++++ ruoyi-common/pom.xml | 6 ++++++ 2 files changed, 18 insertions(+) diff --git a/pom.xml b/pom.xml index d17587a0f..5efd58c9a 100644 --- a/pom.xml +++ b/pom.xml @@ -225,7 +225,19 @@ org.redisson redisson-spring-boot-starter ${redisson.version} + + + org.redisson + redisson-spring-data-30 + + + + org.redisson + redisson-spring-data-27 + ${redisson.version} + + com.baomidou lock4j-redisson-spring-boot-starter diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 94896ecaa..c438bf73c 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -143,6 +143,12 @@ redisson-spring-boot-starter + + org.redisson + redisson-spring-data-27 + ${redisson.version} + + com.baomidou lock4j-redisson-spring-boot-starter From c79c3ee5b6f6b90751e5b96169db748762659972 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: Thu, 12 Jan 2023 15:18:18 +0800 Subject: [PATCH 06/13] =?UTF-8?q?remove=20=E5=88=A0=E9=99=A4=20=E5=A4=9A?= =?UTF-8?q?=E4=BD=99=E7=89=88=E6=9C=AC=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-common/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index c438bf73c..dfeead2a2 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -146,7 +146,6 @@ org.redisson redisson-spring-data-27 - ${redisson.version} From 10f88f54587bd7d6bb20b6b68e1dc9a806e59694 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: Thu, 12 Jan 2023 16:51:46 +0800 Subject: [PATCH 07/13] =?UTF-8?q?add=20=E6=96=B0=E5=A2=9E=20BeanCopyUtils#?= =?UTF-8?q?mapToMap=20=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/utils/BeanCopyUtils.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java index 88161daac..e1bafee22 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/BeanCopyUtils.java @@ -12,6 +12,7 @@ import org.springframework.cglib.beans.BeanCopier; import org.springframework.cglib.beans.BeanMap; import org.springframework.cglib.core.Converter; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -135,6 +136,25 @@ public class BeanCopyUtils { return bean; } + /** + * map拷贝到map + * + * @param map 数据来源 + * @param clazz 返回的对象类型 + * @return map对象 + */ + public static Map mapToMap(Map map, Class clazz) { + if (MapUtil.isEmpty(map)) { + return null; + } + if (ObjectUtil.isNull(clazz)) { + return null; + } + Map copyMap = new LinkedHashMap<>(map.size()); + map.forEach((k, v) -> copyMap.put(k, copy(v, clazz))); + return copyMap; + } + /** * BeanCopier属性缓存
* 缓存用于防止多次反射造成的性能问题 @@ -174,7 +194,7 @@ public class BeanCopyUtils { private String genKey(Class srcClass, Class targetClass, Converter converter) { final StringBuilder key = StrUtil.builder() .append(srcClass.getName()).append('#').append(targetClass.getName()); - if(null != converter){ + if (null != converter) { key.append('#').append(converter.getClass().getName()); } return key.toString(); From d8062087c7eaa46dcf2c756d8f82a59613a4b3ab Mon Sep 17 00:00:00 2001 From: zenghuafan <862592396@qq.com> Date: Tue, 17 Jan 2023 14:24:42 +0800 Subject: [PATCH 08/13] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E4=B8=AD=E6=A0=A1=E9=AA=8C=E6=B3=A8=E8=A7=A3?= =?UTF-8?q?=E7=9A=84=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/common/core/domain/entity/SysDept.java | 6 +++--- .../ruoyi/common/core/domain/entity/SysDictData.java | 8 ++++---- .../ruoyi/common/core/domain/entity/SysDictType.java | 4 ++-- .../com/ruoyi/common/core/domain/entity/SysMenu.java | 8 ++++---- .../com/ruoyi/common/core/domain/entity/SysRole.java | 4 ++-- .../com/ruoyi/common/core/domain/entity/SysUser.java | 6 +++--- .../main/java/com/ruoyi/system/domain/SysConfig.java | 6 +++--- .../main/java/com/ruoyi/system/domain/SysNotice.java | 2 +- .../src/main/java/com/ruoyi/system/domain/SysPost.java | 4 ++-- .../com/ruoyi/system/domain/bo/SysOssConfigBo.java | 10 +++++----- 10 files changed, 29 insertions(+), 29 deletions(-) diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java index 857f9b8db..ba4a382c7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java @@ -34,7 +34,7 @@ public class SysDept extends TreeEntity { * 部门名称 */ @NotBlank(message = "部门名称不能为空") - @Size(min = 0, max = 30, message = "部门名称长度不能超过30个字符") + @Size(min = 0, max = 30, message = "部门名称长度不能超过{max}个字符") private String deptName; /** @@ -51,14 +51,14 @@ public class SysDept extends TreeEntity { /** * 联系电话 */ - @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") + @Size(min = 0, max = 11, message = "联系电话长度不能超过{max}个字符") private String phone; /** * 邮箱 */ @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") + @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") private String email; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java index e20f96aa7..4ed2c5483 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictData.java @@ -44,7 +44,7 @@ public class SysDictData extends BaseEntity { */ @ExcelProperty(value = "字典标签") @NotBlank(message = "字典标签不能为空") - @Size(min = 0, max = 100, message = "字典标签长度不能超过100个字符") + @Size(min = 0, max = 100, message = "字典标签长度不能超过{max}个字符") private String dictLabel; /** @@ -52,7 +52,7 @@ public class SysDictData extends BaseEntity { */ @ExcelProperty(value = "字典键值") @NotBlank(message = "字典键值不能为空") - @Size(min = 0, max = 100, message = "字典键值长度不能超过100个字符") + @Size(min = 0, max = 100, message = "字典键值长度不能超过{max}个字符") private String dictValue; /** @@ -60,13 +60,13 @@ public class SysDictData extends BaseEntity { */ @ExcelProperty(value = "字典类型") @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型长度不能超过100个字符") + @Size(min = 0, max = 100, message = "字典类型长度不能超过{max}个字符") private String dictType; /** * 样式属性（其他样式扩展） */ - @Size(min = 0, max = 100, message = "样式属性长度不能超过100个字符") + @Size(min = 0, max = 100, message = "样式属性长度不能超过{max}个字符") private String cssClass; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java index 36e38a971..76c20e102 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDictType.java @@ -38,7 +38,7 @@ public class SysDictType extends BaseEntity { */ @ExcelProperty(value = "字典名称") @NotBlank(message = "字典名称不能为空") - @Size(min = 0, max = 100, message = "字典类型名称长度不能超过100个字符") + @Size(min = 0, max = 100, message = "字典类型名称长度不能超过{max}个字符") private String dictName; /** @@ -46,7 +46,7 @@ public class SysDictType extends BaseEntity { */ @ExcelProperty(value = "字典类型") @NotBlank(message = "字典类型不能为空") - @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符") + @Size(min = 0, max = 100, message = "字典类型类型长度不能超过{max}个字符") @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）") private String dictType; diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java index 201605f96..38bd93659 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java @@ -32,7 +32,7 @@ public class SysMenu extends TreeEntity { * 菜单名称 */ @NotBlank(message = "菜单名称不能为空") - @Size(min = 0, max = 50, message = "菜单名称长度不能超过50个字符") + @Size(min = 0, max = 50, message = "菜单名称长度不能超过{max}个字符") private String menuName; /** @@ -44,13 +44,13 @@ public class SysMenu extends TreeEntity { /** * 路由地址 */ - @Size(min = 0, max = 200, message = "路由地址不能超过200个字符") + @Size(min = 0, max = 200, message = "路由地址不能超过{max}个字符") private String path; /** * 组件路径 */ - @Size(min = 0, max = 200, message = "组件路径不能超过255个字符") + @Size(min = 0, max = 200, message = "组件路径不能超过{max}个字符") private String component; /** @@ -88,7 +88,7 @@ public class SysMenu extends TreeEntity { * 权限字符串 */ @JsonInclude(JsonInclude.Include.NON_NULL) - @Size(min = 0, max = 100, message = "权限标识长度不能超过100个字符") + @Size(min = 0, max = 100, message = "权限标识长度不能超过{max}个字符") private String perms; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java index 52682894a..a78cb03e7 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysRole.java @@ -44,7 +44,7 @@ public class SysRole extends BaseEntity { */ @ExcelProperty(value = "角色名称") @NotBlank(message = "角色名称不能为空") - @Size(min = 0, max = 30, message = "角色名称长度不能超过30个字符") + @Size(min = 0, max = 30, message = "角色名称长度不能超过{max}个字符") private String roleName; /** @@ -52,7 +52,7 @@ public class SysRole extends BaseEntity { */ @ExcelProperty(value = "角色权限") @NotBlank(message = "权限字符不能为空") - @Size(min = 0, max = 100, message = "权限字符长度不能超过100个字符") + @Size(min = 0, max = 100, message = "权限字符长度不能超过{max}个字符") private String roleKey; /** diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java index f2d961b7a..8533b2f8f 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysUser.java @@ -44,14 +44,14 @@ public class SysUser extends BaseEntity { */ @Xss(message = "用户账号不能包含脚本字符") @NotBlank(message = "用户账号不能为空") - @Size(min = 0, max = 30, message = "用户账号长度不能超过30个字符") + @Size(min = 0, max = 30, message = "用户账号长度不能超过{max}个字符") private String userName; /** * 用户昵称 */ @Xss(message = "用户昵称不能包含脚本字符") - @Size(min = 0, max = 30, message = "用户昵称长度不能超过30个字符") + @Size(min = 0, max = 30, message = "用户昵称长度不能超过{max}个字符") private String nickName; /** @@ -64,7 +64,7 @@ public class SysUser extends BaseEntity { */ @Sensitive(strategy = SensitiveStrategy.EMAIL) @Email(message = "邮箱格式不正确") - @Size(min = 0, max = 50, message = "邮箱长度不能超过50个字符") + @Size(min = 0, max = 50, message = "邮箱长度不能超过{max}个字符") private String email; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java index 40bc2821d..ca9a77ce3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java @@ -37,7 +37,7 @@ public class SysConfig extends BaseEntity { */ @ExcelProperty(value = "参数名称") @NotBlank(message = "参数名称不能为空") - @Size(min = 0, max = 100, message = "参数名称不能超过100个字符") + @Size(min = 0, max = 100, message = "参数名称不能超过{max}个字符") private String configName; /** @@ -45,7 +45,7 @@ public class SysConfig extends BaseEntity { */ @ExcelProperty(value = "参数键名") @NotBlank(message = "参数键名长度不能为空") - @Size(min = 0, max = 100, message = "参数键名长度不能超过100个字符") + @Size(min = 0, max = 100, message = "参数键名长度不能超过{max}个字符") private String configKey; /** @@ -53,7 +53,7 @@ public class SysConfig extends BaseEntity { */ @ExcelProperty(value = "参数键值") @NotBlank(message = "参数键值不能为空") - @Size(min = 0, max = 500, message = "参数键值长度不能超过500个字符") + @Size(min = 0, max = 500, message = "参数键值长度不能超过{max}个字符") private String configValue; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java index f9457406a..dec401e3e 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java @@ -32,7 +32,7 @@ public class SysNotice extends BaseEntity { */ @Xss(message = "公告标题不能包含脚本字符") @NotBlank(message = "公告标题不能为空") - @Size(min = 0, max = 50, message = "公告标题不能超过50个字符") + @Size(min = 0, max = 50, message = "公告标题不能超过{max}个字符") private String noticeTitle; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java index 1edabf509..ecb84f4b4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java @@ -39,7 +39,7 @@ public class SysPost extends BaseEntity { */ @ExcelProperty(value = "岗位编码") @NotBlank(message = "岗位编码不能为空") - @Size(min = 0, max = 64, message = "岗位编码长度不能超过64个字符") + @Size(min = 0, max = 64, message = "岗位编码长度不能超过{max}个字符") private String postCode; /** @@ -47,7 +47,7 @@ public class SysPost extends BaseEntity { */ @ExcelProperty(value = "岗位名称") @NotBlank(message = "岗位名称不能为空") - @Size(min = 0, max = 50, message = "岗位名称长度不能超过50个字符") + @Size(min = 0, max = 50, message = "岗位名称长度不能超过{max}个字符") private String postName; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java index af289376c..fdaf62c47 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysOssConfigBo.java @@ -32,28 +32,28 @@ public class SysOssConfigBo extends BaseEntity { * 配置key */ @NotBlank(message = "配置key不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "configKey长度必须介于2和20 之间") + @Size(min = 2, max = 100, message = "configKey长度必须介于{min}和{max} 之间") private String configKey; /** * accessKey */ @NotBlank(message = "accessKey不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "accessKey长度必须介于2和100 之间") + @Size(min = 2, max = 100, message = "accessKey长度必须介于{min}和{max} 之间") private String accessKey; /** * 秘钥 */ @NotBlank(message = "secretKey不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "secretKey长度必须介于2和100 之间") + @Size(min = 2, max = 100, message = "secretKey长度必须介于{min}和{max} 之间") private String secretKey; /** * 桶名称 */ @NotBlank(message = "桶名称不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "bucketName长度必须介于2和100之间") + @Size(min = 2, max = 100, message = "bucketName长度必须介于{min}和{max}之间") private String bucketName; /** @@ -65,7 +65,7 @@ public class SysOssConfigBo extends BaseEntity { * 访问站点 */ @NotBlank(message = "访问站点不能为空", groups = {AddGroup.class, EditGroup.class}) - @Size(min = 2, max = 100, message = "endpoint长度必须介于2和100之间") + @Size(min = 2, max = 100, message = "endpoint长度必须介于{min}和{max}之间") private String endpoint; /** From 6fb34a771751935191d511957f2c0b7e0d2b15a2 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: Wed, 18 Jan 2023 11:42:34 +0800 Subject: [PATCH 09/13] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20oss=20=E9=85=8D=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=BC=80?= =?UTF-8?q?=E5=85=B3=E8=AF=B4=E6=98=8E=20=E9=81=BF=E5=85=8D=E9=80=A0?= =?UTF-8?q?=E6=88=90=E8=AF=AF=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/views/system/oss/config.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruoyi-ui/src/views/system/oss/config.vue b/ruoyi-ui/src/views/system/oss/config.vue index 0120641d8..4ae44495a 100644 --- a/ruoyi-ui/src/views/system/oss/config.vue +++ b/ruoyi-ui/src/views/system/oss/config.vue @@ -87,7 +87,7 @@ custom - +