From 0fc796b90d3f44b81ef30285edb897223df439f7 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:04:09 +0800
Subject: [PATCH] update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更换继承 JakartaServletUtil
---
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysMenu.java | 33 +++++++--------------------------
1 files changed, 7 insertions(+), 26 deletions(-)
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 d0a8dd8..9955381 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
@@ -1,18 +1,15 @@
package com.ruoyi.common.core.domain.entity;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.ruoyi.common.core.domain.TreeEntity;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Size;
/**
* 鑿滃崟鏉冮檺琛� sys_menu
@@ -23,20 +20,17 @@
@Data
@EqualsAndHashCode(callSuper = true)
@TableName("sys_menu")
-@ApiModel("鑿滃崟鏉冮檺涓氬姟瀵硅薄")
-public class SysMenu extends TreeEntity {
+public class SysMenu extends TreeEntity<SysMenu> {
/**
* 鑿滃崟ID
*/
- @ApiModelProperty(value = "鑿滃崟ID")
@TableId(value = "menu_id")
private Long menuId;
/**
* 鑿滃崟鍚嶇О
*/
- @ApiModelProperty(value = "鑿滃崟鍚嶇О")
@NotBlank(message = "鑿滃崟鍚嶇О涓嶈兘涓虹┖")
@Size(min = 0, max = 50, message = "鑿滃崟鍚嶇О闀垮害涓嶈兘瓒呰繃50涓瓧绗�")
private String menuName;
@@ -44,66 +38,55 @@
/**
* 鏄剧ず椤哄簭
*/
- @ApiModelProperty(value = "鏄剧ず椤哄簭")
@NotNull(message = "鏄剧ず椤哄簭涓嶈兘涓虹┖")
- private Long orderNum;
+ private Integer orderNum;
/**
* 璺敱鍦板潃
*/
- @ApiModelProperty(value = "璺敱鍦板潃")
@Size(min = 0, max = 200, message = "璺敱鍦板潃涓嶈兘瓒呰繃200涓瓧绗�")
private String path;
/**
* 缁勪欢璺緞
*/
- @ApiModelProperty(value = "缁勪欢璺緞")
@Size(min = 0, max = 200, message = "缁勪欢璺緞涓嶈兘瓒呰繃255涓瓧绗�")
private String component;
/**
* 璺敱鍙傛暟
*/
- @ApiModelProperty(value = "璺敱鍙傛暟")
- @TableField("`query`")
- private String query;
+ private String queryParam;
/**
* 鏄惁涓哄閾撅紙0鏄� 1鍚︼級
*/
- @ApiModelProperty(value = "鏄惁涓哄閾撅紙0鏄� 1鍚︼級")
private String isFrame;
/**
* 鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級
*/
- @ApiModelProperty(value = "鏄惁缂撳瓨锛�0缂撳瓨 1涓嶇紦瀛橈級")
private String isCache;
/**
* 绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�
*/
- @ApiModelProperty(value = "绫诲瀷锛圡鐩綍 C鑿滃崟 F鎸夐挳锛�")
@NotBlank(message = "鑿滃崟绫诲瀷涓嶈兘涓虹┖")
private String menuType;
/**
* 鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
*/
- @ApiModelProperty(value = "鏄剧ず鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
private String visible;
/**
- * 鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�
+ * 鑿滃崟鐘舵�侊紙0姝ｅ父 1鍋滅敤锛�
*/
- @ApiModelProperty(value = "鑿滃崟鐘舵�侊紙0鏄剧ず 1闅愯棌锛�")
private String status;
/**
* 鏉冮檺瀛楃涓�
*/
- @ApiModelProperty(value = "鏉冮檺瀛楃涓�")
@JsonInclude(JsonInclude.Include.NON_NULL)
@Size(min = 0, max = 100, message = "鏉冮檺鏍囪瘑闀垮害涓嶈兘瓒呰繃100涓瓧绗�")
private String perms;
@@ -111,13 +94,11 @@
/**
* 鑿滃崟鍥炬爣
*/
- @ApiModelProperty(value = "鑿滃崟鍥炬爣")
private String icon;
/**
* 澶囨敞
*/
- @ApiModelProperty(value = "澶囨敞")
private String remark;
}
--
Gitblit v1.9.3