From 79b1717f9a58796c06fc214914c5f6a1677cf9ee Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 18 Jan 2022 11:42:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?vue3=E4=B8=8B=E7=82=B9=E5=87=BB=E7=BC=96?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=8F=96=E6=B6=88=E4=BF=AE=E6=94=B9=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/job/controller/SysJobController.java | 2 +- .../src/main/java/com/ruoyi/system/domain/SysMenu.java | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java index e261c9d1..fec09a5c 100644 --- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java +++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java @@ -129,7 +129,7 @@ public class SysJobController extends BaseController } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS })) { - return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap'调用"); + return error("修改任务'" + job.getJobName() + "'失败，目标字符串不允许'ldap(s)'调用"); } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[] { Constants.HTTP, Constants.HTTPS })) { diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 5878a07e..4e22a578 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -3,6 +3,7 @@ package com.ruoyi.system.domain; import java.util.ArrayList; import java.util.List; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -30,7 +31,7 @@ public class SysMenu extends BaseEntity private Long parentId; /** 显示顺序 */ - private String orderNum; + private Integer orderNum; /** 路由地址 */ private String path; @@ -107,13 +108,13 @@ public class SysMenu extends BaseEntity this.parentId = parentId; } - @NotBlank(message = "显示顺序不能为空") - public String getOrderNum() + @NotNull(message = "显示顺序不能为空") + public Integer getOrderNum() { return orderNum; } - public void setOrderNum(String orderNum) + public void setOrderNum(Integer orderNum) { this.orderNum = orderNum; } From fa753467632e5fb25761a9749c6bd0831e9216a7 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Tue, 18 Jan 2022 11:44:30 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=89=E9=A1=B9?= =?UTF-8?q?=E5=8D=A1=E7=82=B9=E5=87=BB=E5=8F=B3=E9=94=AE=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E5=8F=82=E6=95=B0=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ruoyi-ui/src/plugins/tab.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ruoyi-ui/src/plugins/tab.js b/ruoyi-ui/src/plugins/tab.js index 95a3848b..c8058a94 100644 --- a/ruoyi-ui/src/plugins/tab.js +++ b/ruoyi-ui/src/plugins/tab.js @@ -4,20 +4,21 @@ import router from '@/router'; export default { // 刷新当前tab页签 refreshPage(obj) { - const { path, matched } = router.currentRoute; + const { path, query, matched } = router.currentRoute; if (obj === undefined) { matched.forEach((m) => { if (m.components && m.components.default && m.components.default.name) { if (!['Layout', 'ParentView'].includes(m.components.default.name)) { - obj = { name: m.components.default.name, path: path }; + obj = { name: m.components.default.name, path: path, query: query }; } } }); } return store.dispatch('tagsView/delCachedView', obj).then(() => { - const { path } = obj + const { path, query } = obj router.replace({ - path: '/redirect' + path + path: '/redirect' + path, + query: query }) }) }, From d511f1bd94c2e86885466749fc8591f7c0414d31 Mon Sep 17 00:00:00 2001 From: RuoYi Date: Thu, 20 Jan 2022 11:37:26 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=8D=87=E7=BA=A7spring-boot-admin?= =?UTF-8?q?=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=882.6.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc2f97e8..62c2fdd5 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 2021.0.0 2021.1 2.0.3 - 2.6.0 + 2.6.1 2.2.0 3.0.0 1.6.2