From af8d62e5e20b8a8d131bdf326b7d2304d0a96b88 Mon Sep 17 00:00:00 2001
From: PowderSnow <1109835296@qq.com>
Date: Mon, 13 May 2024 03:21:59 +0800
Subject: [PATCH] update ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java. 目前报”验证码已失效“的场景是uuid为空，应通过判断captcha是否为null得出验证码是否已过期的结果。
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
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 9dc62df..0d674d7 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,10 +3,10 @@
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;
-
import com.ruoyi.common.core.web.domain.BaseEntity;
/**
@@ -31,13 +31,16 @@
private Long parentId;
/** 显示顺序 */
- private String orderNum;
+ private Integer orderNum;
/** 路由地址 */
private String path;
/** 组件路径 */
private String component;
+
+ /** 路由参数 */
+ private String query;
/** 是否为外链（0是 1否） */
private String isFrame;
@@ -51,7 +54,7 @@
/** 显示状态（0显示 1隐藏） */
private String visible;
- /** 菜单状态（0显示 1隐藏） */
+ /** 菜单状态（0正常 1停用） */
private String status;
/** 权限字符串 */
@@ -105,13 +108,13 @@
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;
}
@@ -138,6 +141,16 @@
this.component = component;
}
+ public String getQuery()
+ {
+ return query;
+ }
+
+ public void setQuery(String query)
+ {
+ this.query = query;
+ }
+
public String getIsFrame()
{
return isFrame;
--
Gitblit v1.9.3