新增树分割组件TreePanel

代码生成支持表单布局选项
支持表格列显隐状态记忆
2026-04-26 01:07:52 +08:00 · 2026-04-02 11:37:05 +08:00 · 2026-04-02 11:11:26 +08:00 · 2026-03-31 19:50:01 +08:00 · 2026-03-31 18:48:52 +08:00 · 2026-03-30 08:01:38 +08:00
128 changed files with 790 additions and 2253 deletions
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@

 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。

-* 本仓库为RuoYi-Cloud的Spring Boot 3 的版本，保持同步更新。
-* 后端采用Spring Boot3、Spring Cloud & Alibaba。
+* 本仓库为RuoYi-Cloud的Spring Boot 2 的版本，保持同步更新。
+* 后端采用Spring Boot2、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
 * 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
@@ -23,11 +23,11 @@

 RuoYi-Cloud 后端项目提供 Spring Boot 2.x / 3.x / 4.x 多版本分支的并行维护。

-| 名称              | 说明                      | 地址                                                      |
-| :---------------- | :------------------------ | :-------------------------------------------------------- |
+| 名称              | 说明                                 | 地址                                                      |
+| :---------------- | :----------------------------------- | :-------------------------------------------------------- |
 | master 默认分支   | Spring Boot 4.x (JDK 17+、Nacos 3.x) | https://gitee.com/y_project/RuoYi-Cloud                   |
 | springboot3 分支  | Spring Boot 3.x (JDK 17+、Nacos 3.x) | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot3  |
-| springboot2 分支  | Spring Boot 2.x (JDK 8+、Nacos 2.x)  | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot2  |  
+| springboot2 分支  | Spring Boot 2.x (JDK 8+、 Nacos 2.x) | https://gitee.com/y_project/RuoYi-Cloud/tree/springboot2  |

 RuoYi-Cloud 前端项目提供 Vue 2.x / 3.x / JavaScript TypeScript 版本均可混用搭配

--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -2,14 +2,11 @@ version : '3.8'
 services:
  ruoyi-nacos:
    container_name: ruoyi-nacos
-    image: nacos/nacos-server:v3.0.2
+    image: nacos/nacos-server:v2.4.2
    build:
      context: ./nacos
    environment:
      - MODE=standalone
-      - NACOS_AUTH_TOKEN=your_auth_token
-      - NACOS_AUTH_IDENTITY_KEY=your_identity_key
-      - NACOS_AUTH_IDENTITY_VALUE=your_identity_value
    volumes:
      - ./nacos/logs/:/home/nacos/logs
      - ./nacos/conf/application.properties:/home/nacos/conf/application.properties
--- a/docker/nacos/conf/application.properties
+++ b/docker/nacos/conf/application.properties
@@ -24,7 +24,6 @@ nacos.core.auth.system.type=nacos
 nacos.core.auth.enabled=false
 nacos.core.auth.default.token.expire.seconds=18000
 nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
-nacos.core.auth.plugin.nacos.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
 nacos.core.auth.caching.enabled=true
 nacos.core.auth.enable.userAgentAuthWhite=false
 nacos.core.auth.server.identity.key=serverIdentity
--- a/docker/nacos/dockerfile
+++ b/docker/nacos/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM nacos/nacos-server:v3.0.2
+FROM nacos/nacos-server:v2.4.2
 # author
 MAINTAINER ruoyi

--- a/docker/ruoyi/auth/dockerfile
+++ b/docker/ruoyi/auth/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:17
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

--- a/docker/ruoyi/gateway/dockerfile
+++ b/docker/ruoyi/gateway/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:17
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

--- a/docker/ruoyi/modules/file/dockerfile
+++ b/docker/ruoyi/modules/file/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:17
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

--- a/docker/ruoyi/modules/gen/dockerfile
+++ b/docker/ruoyi/modules/gen/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:17
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

--- a/docker/ruoyi/modules/job/dockerfile
+++ b/docker/ruoyi/modules/job/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:17
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

--- a/docker/ruoyi/modules/system/dockerfile
+++ b/docker/ruoyi/modules/system/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:17
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

--- a/docker/ruoyi/visual/monitor/dockerfile
+++ b/docker/ruoyi/visual/monitor/dockerfile
@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:17
+FROM  openjdk:8-jre
 # author
 MAINTAINER ruoyi

--- a/pom.xml
+++ b/pom.xml
@@ -16,30 +16,43 @@
        <ruoyi.version>3.6.8</ruoyi.version>
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
-        <spring-boot.version>3.5.11</spring-boot.version>
-        <spring-cloud.version>2025.0.1</spring-cloud.version>
-        <spring-cloud-alibaba.version>2025.0.0.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>3.5.8</spring-boot-admin.version>
-        <mybatis-spring.version>3.0.5</mybatis-spring.version>
+        <java.version>1.8</java.version>
+        <spring-boot.version>2.7.18</spring-boot.version>
+        <spring-cloud.version>2021.0.9</spring-cloud.version>
+        <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
+        <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
+        <tobato.version>1.27.2</tobato.version>
        <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
+        <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
        <druid.version>1.2.27</druid.version>
-        <dynamic-ds.version>4.5.0</dynamic-ds.version>
+        <dynamic-ds.version>4.3.1</dynamic-ds.version>
        <commons.io.version>2.21.0</commons.io.version>
        <velocity.version>2.3</velocity.version>
        <fastjson.version>2.0.61</fastjson.version>
        <jjwt.version>0.9.1</jjwt.version>
        <minio.version>8.2.2</minio.version>
        <poi.version>4.1.2</poi.version>
-        <springdoc.version>2.8.16</springdoc.version>
-        <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
+        <springdoc.version>1.6.9</springdoc.version>
+        <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
+        <!-- override dependency version -->
+        <tomcat.version>9.0.112</tomcat.version>
+        <logback.version>1.2.13</logback.version>
+        <spring-framework.version>5.3.39</spring-framework.version>
    </properties>

    <!-- 依赖声明 -->
    <dependencyManagement>
        <dependencies>

+            <!-- 覆盖SpringFramework的依赖配置-->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring-framework.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
            <!-- SpringCloud 微服务 -->
            <dependency>
                <groupId>org.springframework.cloud</groupId>
@@ -67,10 +80,49 @@
                <scope>import</scope>
            </dependency>

+            <!-- 覆盖logback的依赖配置-->
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+            <!-- 覆盖tomcat的依赖配置-->
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-el</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <!-- FastDFS 分布式文件系统 -->
+            <dependency>
+                <groupId>com.github.tobato</groupId>
+                <artifactId>fastdfs-client</artifactId>
+                <version>${tobato.version}</version>
+            </dependency>
+
            <!-- Springdoc webmvc 依赖配置 -->
            <dependency>
                <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                <artifactId>springdoc-openapi-ui</artifactId>
                <version>${springdoc.version}</version>
            </dependency>

@@ -86,18 +138,6 @@
                <groupId>com.github.pagehelper</groupId>
                <artifactId>pagehelper-spring-boot-starter</artifactId>
                <version>${pagehelper.boot.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>mybatis-spring</artifactId>
-                        <groupId>org.mybatis</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-spring</artifactId>
-                <version>${mybatis-spring.version}</version>
            </dependency>

            <!-- io常用工具类 -->
@@ -238,9 +278,7 @@
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
                <configuration>
-                    <parameters>true</parameters>
                    <source>${java.version}</source>
                    <target>${java.version}</target>
                    <encoding>${project.build.sourceEncoding}</encoding>
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java
@@ -2,10 +2,10 @@ package com.ruoyi.system.api.domain;

 import java.util.ArrayList;
 import java.util.List;
-import jakarta.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.Email;
+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;
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.api.domain;

-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java
@@ -1,8 +1,8 @@
 package com.ruoyi.system.api.domain;

-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Pattern;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java
@@ -1,9 +1,9 @@
 package com.ruoyi.system.api.domain;

 import java.util.Set;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+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.annotation.Excel;
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -2,8 +2,7 @@ package com.ruoyi.system.api.domain;

 import java.util.Date;
 import java.util.List;
-import jakarta.validation.constraints.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import javax.validation.constraints.*;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -69,7 +68,6 @@ public class SysUser extends BaseEntity
    private String loginIp;

    /** 最后登录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
    private Date loginDate;

--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -1,6 +1,6 @@
 package com.ruoyi.auth.controller;

-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
--- a/ruoyi-auth/src/main/resources/bootstrap.yml
+++ b/ruoyi-auth/src/main/resources/bootstrap.yml
@@ -18,9 +18,8 @@ spring:
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
-  config:
-    # 配置文件格式
-    file-extension: yml
-    import:
-      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
-      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -53,24 +53,12 @@
            <artifactId>pagehelper-spring-boot-starter</artifactId>
        </dependency>

-        <!-- Mybatis Spring -->
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-        </dependency>
-
        <!-- Hibernate Validator -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-validation</artifactId>
        </dependency>

-        <!-- Spring Aop -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
        <!-- Jackson -->
        <dependency>
            <groupId>com.fasterxml.jackson.core</groupId>
@@ -93,7 +81,6 @@
        <dependency>
            <groupId>javax.xml.bind</groupId>
            <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
        </dependency>

        <!-- Apache Lang3 -->
@@ -116,8 +103,8 @@

        <!-- Java Servlet -->
        <dependency>
-            <groupId>jakarta.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
        </dependency>

    </dependencies>
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java
@@ -51,8 +51,7 @@ public @interface Excel
    /**
     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
     */
-    @SuppressWarnings("deprecation")
-	public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;

    /**
     * 导出时在excel中每个列的高度
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -142,35 +142,4 @@ public class Constants
     */
    public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
            "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
-
-    /**
-     * 部门相关常量
-     */
-    public static class Dept
-    {
-        /**
-         * 全部数据权限
-         */
-        public static final String DATA_SCOPE_ALL = "1";
-
-        /**
-         * 自定数据权限
-         */
-        public static final String DATA_SCOPE_CUSTOM = "2";
-
-        /**
-         * 部门数据权限
-         */
-        public static final String DATA_SCOPE_DEPT = "3";
-
-        /**
-         * 部门及以下数据权限
-         */
-        public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
-        /**
-         * 仅本人数据权限
-         */
-        public static final String DATA_SCOPE_SELF = "5";
-    }
 }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
@@ -31,9 +31,6 @@ public class GenConstants
    /** 上级菜单名称字段 */
    public static final String PARENT_MENU_NAME = "parentMenuName";

-    /** 生成详情页开关 */
-    public static final String GEN_VIEW = "genView";
-
    /** 数据库字符串类型 */
    public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };

--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java
@@ -16,7 +16,6 @@ import org.apache.commons.lang3.time.DateFormatUtils;
 *
 * @author ruoyi
 */
-@SuppressWarnings("deprecation")
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 {
    public static String YYYY = "yyyy";
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ServletUtils.java
@@ -8,10 +8,10 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.ServletRequest;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
@@ -12,7 +12,6 @@ import com.ruoyi.common.core.text.StrFormatter;
 * 
 * @author ruoyi
 */
-@SuppressWarnings("deprecation")
 public class StringUtils extends org.apache.commons.lang3.StringUtils
 {
    /** 空字符串 */
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java
@@ -1,9 +1,9 @@
 package com.ruoyi.common.core.utils.bean;

 import java.util.Set;
-import jakarta.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
-import jakarta.validation.Validator;
+import javax.validation.ConstraintViolation;
+import javax.validation.ConstraintViolationException;
+import javax.validation.Validator;

 /**
 * bean对象属性验证
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java
@@ -8,8 +8,8 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.utils.StringUtils;

--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java
@@ -2,7 +2,7 @@ package com.ruoyi.common.core.utils.ip;

 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;

--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
@@ -387,7 +387,7 @@ public class ExcelUtil<T>
                    Object val = this.getCellValue(row, entry.getKey());

                    // 如果不存在实例则新建.
-                    entity = (entity == null ? clazz.getDeclaredConstructor().newInstance() : entity);
+                    entity = (entity == null ? clazz.newInstance() : entity);
                    // 从map中得到对应列的field.
                    Field field = (Field) entry.getValue()[0];
                    Excel attr = (Excel) entry.getValue()[1];
@@ -1056,7 +1056,6 @@ public class ExcelUtil<T>
    /**
     * 添加单元格
     */
-    @SuppressWarnings("deprecation")
    public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
    {
        Cell cell = null;
@@ -1329,7 +1328,7 @@ public class ExcelUtil<T>
    {
        try
        {
-            Object instance = excel.handler().getDeclaredConstructor().newInstance();
+            Object instance = excel.handler().newInstance();
            Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class, Cell.class, Workbook.class });
            value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
        }
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
@@ -310,8 +310,7 @@ public class ReflectUtils
    /**
     * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
     */
-    @SuppressWarnings("deprecation")
-	public static void makeAccessible(Method method)
+    public static void makeAccessible(Method method)
    {
        if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
                && !method.isAccessible())
@@ -323,8 +322,7 @@ public class ReflectUtils
    /**
     * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
     */
-    @SuppressWarnings("deprecation")
-	public static void makeAccessible(Field field)
+    public static void makeAccessible(Field field)
    {
        if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
                || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
@@ -7,12 +7,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.PageUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.sql.SqlUtil;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;

 /**
 * web层通用数据处理
@@ -48,6 +53,19 @@ public class BaseController
        PageUtils.startPage();
    }

+    /**
+     * 设置请求排序数据
+     */
+    protected void startOrderBy()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.orderBy(orderBy);
+        }
+    }
+
    /**
     * 清理分页的线程变量
     */
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java
@@ -1,7 +1,7 @@
 package com.ruoyi.common.core.xss;

-import jakarta.validation.Constraint;
-import jakarta.validation.Payload;
+import javax.validation.Constraint;
+import javax.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java
@@ -2,8 +2,8 @@ package com.ruoyi.common.core.xss;

 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jakarta.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
+import javax.validation.ConstraintValidator;
+import javax.validation.ConstraintValidatorContext;
 import com.ruoyi.common.core.utils.StringUtils;

 /**
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java
@@ -16,25 +16,15 @@ import java.lang.annotation.Target;
@Documented
 public @interface DataScope
 {
-    /**
-     * 用户表的别名
-     */
-    public String userAlias() default "";
-
    /**
     * 部门表的别名
     */
    public String deptAlias() default "";

    /**
-     * 用户字段名
+     * 用户表的别名
     */
-    public String userField() default "user_id";
-
-    /**
-     * 部门字段名
-     */
-    public String deptField() default "dept_id";
+    public String userAlias() default "";

    /**
     * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来
--- a/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
+++ b/ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java
@@ -6,7 +6,6 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.text.Convert;
@@ -27,6 +26,31 @@ import com.ruoyi.system.api.model.LoginUser;
@Component
 public class DataScopeAspect
 {
+    /**
+     * 全部数据权限
+     */
+    public static final String DATA_SCOPE_ALL = "1";
+
+    /**
+     * 自定数据权限
+     */
+    public static final String DATA_SCOPE_CUSTOM = "2";
+
+    /**
+     * 部门数据权限
+     */
+    public static final String DATA_SCOPE_DEPT = "3";
+
+    /**
+     * 部门及以下数据权限
+     */
+    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+    /**
+     * 仅本人数据权限
+     */
+    public static final String DATA_SCOPE_SELF = "5";
+
    /**
     * 数据权限过滤关键字
     */
@@ -50,7 +74,7 @@ public class DataScopeAspect
            if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
            {
                String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.userAlias(), controllerDataScope.deptAlias(), controllerDataScope.userField(), controllerDataScope.deptField(), permission);
+                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
            }
        }
    }
@@ -64,13 +88,13 @@ public class DataScopeAspect
     * @param userAlias 用户别名
     * @param permission 权限字符
     */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String userAlias, String deptAlias, String userField, String deptField, String permission)
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
    {
        StringBuilder sqlString = new StringBuilder();
        List<String> conditions = new ArrayList<String>();
        List<String> scopeCustomIds = new ArrayList<String>();
        user.getRoles().forEach(role -> {
-            if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
+            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
            {
                scopeCustomIds.add(Convert.toStr(role.getRoleId()));
            }
@@ -87,42 +111,42 @@ public class DataScopeAspect
            {
                continue;
            }
-            if (Constants.Dept.DATA_SCOPE_ALL.equals(dataScope))
+            if (DATA_SCOPE_ALL.equals(dataScope))
            {
                sqlString = new StringBuilder();
                conditions.add(dataScope);
                break;
            }
-            else if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(dataScope))
+            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
            {
                if (scopeCustomIds.size() > 1)
                {
                    // 多个自定数据权限使用in查询，避免多次拼接。
-                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, deptField, String.join(",", scopeCustomIds)));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
                }
                else
                {
-                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, deptField, role.getRoleId()));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
                }
            }
-            else if (Constants.Dept.DATA_SCOPE_DEPT.equals(dataScope))
+            else if (DATA_SCOPE_DEPT.equals(dataScope))
            {
-                sqlString.append(StringUtils.format(" OR {}.{} = {} ", deptAlias, deptField, user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
            }
-            else if (Constants.Dept.DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
+            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
            {
-                sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, deptField, user.getDeptId(), user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
            }
-            else if (Constants.Dept.DATA_SCOPE_SELF.equals(dataScope))
+            else if (DATA_SCOPE_SELF.equals(dataScope))
            {
                if (StringUtils.isNotBlank(userAlias))
                {
-                    sqlString.append(StringUtils.format(" OR {}.{} = {} ", userAlias, userField, user.getUserId()));
+                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
                }
                else
                {
                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
                }
            }
            conditions.add(dataScope);
@@ -131,7 +155,7 @@ public class DataScopeAspect
        // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
        if (StringUtils.isEmpty(conditions))
        {
-            sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
+            sqlString.append(StringUtils.format(" OR {}.dept_id = 0 ", deptAlias));
        }

        if (StringUtils.isNotBlank(sqlString.toString()))
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -20,14 +20,14 @@
        <!-- Druid -->
        <dependency>
            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-3-starter</artifactId>
+            <artifactId>druid-spring-boot-starter</artifactId>
            <version>${druid.version}</version>
        </dependency>

        <!-- Dynamic DataSource -->
        <dependency>
            <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
            <version>${dynamic-ds.version}</version>
        </dependency>

--- a/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
+++ b/ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java
@@ -2,8 +2,8 @@ package com.ruoyi.common.log.aspect;

 import java.util.Collection;
 import java.util.Map;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
@@ -18,7 +18,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
@Configuration
@EnableCaching
@AutoConfigureBefore(RedisAutoConfiguration.class)
-@SuppressWarnings("deprecation")
 public class RedisConfig extends CachingConfigurerSupport
 {
    @Bean
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java
@@ -1,7 +1,7 @@
 package com.ruoyi.common.security.feign;

 import java.util.Map;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.ServletUtils;
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java
@@ -1,6 +1,6 @@
 package com.ruoyi.common.security.handler;

-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java
@@ -1,7 +1,7 @@
 package com.ruoyi.common.security.interceptor;

-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import com.ruoyi.common.core.constant.SecurityConstants;
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java
@@ -3,7 +3,7 @@ package com.ruoyi.common.security.service;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java
@@ -1,5 +1,6 @@
 package com.ruoyi.common.security.utils;

+import javax.servlet.http.HttpServletRequest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.TokenConstants;
@@ -8,7 +9,6 @@ import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.model.LoginUser;
-import jakarta.servlet.http.HttpServletRequest;

 /**
 * 权限获取工具类
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -26,7 +26,7 @@
        <!-- SpringDoc webmvc -->
        <dependency>
            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <artifactId>springdoc-openapi-ui</artifactId>
        </dependency>

 	</dependencies>
--- a/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SpringDocAutoConfiguration.java
+++ b/ruoyi-common/ruoyi-common-swagger/src/main/java/com/ruoyi/common/swagger/config/SpringDocAutoConfiguration.java
@@ -2,8 +2,6 @@ package com.ruoyi.common.swagger.config;

 import java.util.ArrayList;
 import java.util.List;
-import org.springdoc.core.configuration.SpringDocConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -21,7 +19,6 @@ import io.swagger.v3.oas.models.servers.Server;
 *
 * @author ruoyi
 */
-@AutoConfiguration(before = SpringDocConfiguration.class)
@EnableConfigurationProperties(SpringDocProperties.class)
@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true)
 public class SpringDocAutoConfiguration
--- a/ruoyi-gateway/pom.xml
+++ b/ruoyi-gateway/pom.xml
@@ -19,7 +19,7 @@
        <!-- SpringCloud Gateway -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
        </dependency>

        <!-- SpringCloud Alibaba Nacos -->
@@ -57,7 +57,7 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
-
+        
        <!-- SpringCloud Loadbalancer -->
        <dependency>
            <groupId>org.springframework.cloud</groupId>
@@ -79,7 +79,7 @@
        <!-- Springdoc -->
        <dependency>
            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+            <artifactId>springdoc-openapi-webflux-ui</artifactId>
            <version>${springdoc.version}</version>
        </dependency>

--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java
@@ -2,8 +2,8 @@ package com.ruoyi.gateway.config;

 import java.util.Set;
 import java.util.stream.Collectors;
-import org.springdoc.core.properties.AbstractSwaggerUiConfigProperties;
-import org.springdoc.core.properties.SwaggerUiConfigProperties;
+import org.springdoc.core.AbstractSwaggerUiConfigProperties;
+import org.springdoc.core.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java
@@ -64,7 +64,6 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
        };
    }

-    @SuppressWarnings("deprecation")
    private String resolveBodyFromRequest(ServerHttpRequest serverHttpRequest)
    {
        // 获取请求体
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
+++ b/ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java
@@ -3,7 +3,7 @@ package com.ruoyi.gateway.service.impl;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
--- a/ruoyi-gateway/src/main/resources/bootstrap.yml
+++ b/ruoyi-gateway/src/main/resources/bootstrap.yml
@@ -18,6 +18,11 @@ spring:
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
    sentinel:
      # 取消控制台懒加载
      eager: true
@@ -33,9 +38,3 @@ spring:
            groupId: DEFAULT_GROUP
            data-type: json
            rule-type: gw-flow
-  config:
-    # 配置文件格式
-    file-extension: yml
-    import:
-      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
-      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}
--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -46,6 +46,12 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
+		
+        <!-- FastDFS -->
+        <dependency>
+            <groupId>com.github.tobato</groupId>
+            <artifactId>fastdfs-client</artifactId>
+        </dependency>
        
        <!-- Minio -->
        <dependency>
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java
@@ -2,7 +2,7 @@ package com.ruoyi.file.config;

 import java.util.HashMap;
 import java.util.Map;
-import jakarta.servlet.DispatcherType;
+import javax.servlet.DispatcherType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java
@@ -3,14 +3,14 @@ package com.ruoyi.file.filter;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;

 /**
 * 防盗链过滤器
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
+++ b/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java
@@ -0,0 +1,76 @@
+package com.ruoyi.file.service;
+
+import java.io.InputStream;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import com.alibaba.nacos.common.utils.IoUtils;
+import com.github.tobato.fastdfs.domain.fdfs.StorePath;
+import com.github.tobato.fastdfs.service.FastFileStorageClient;
+import com.ruoyi.common.core.utils.file.FileTypeUtils;
+
+/**
+ * FastDFS 文件存储
+ *
+ * @author ruoyi
+ */
+@Service
+public class FastDfsSysFileServiceImpl implements ISysFileService
+{
+    /**
+     * 域名或本机访问地址
+     */
+    @Value("${fdfs.domain}")
+    public String domain;
+
+    @Autowired
+    private FastFileStorageClient storageClient;
+
+    /**
+     * FastDfs文件上传接口
+     *
+     * @param file 上传的文件
+     * @return 访问地址
+     * @throws Exception
+     */
+    @Override
+    public String uploadFile(MultipartFile file) throws Exception
+    {
+        InputStream inputStream = null;
+        try
+        {
+            inputStream = file.getInputStream();
+            StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), FileTypeUtils.getExtension(file), null);
+            return domain + "/" + storePath.getFullPath();
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("FastDfs Failed to upload file", e);
+        }
+        finally
+        {
+            IoUtils.closeQuietly(inputStream);
+        }
+    }
+
+    /**
+     * FastDFS文件删除接口
+     * 
+     * @param fileUrl 文件访问URL
+     * @throws Exception
+     */
+    @Override
+    public void deleteFile(String fileUrl) throws Exception
+    {
+        try
+        {
+            StorePath storePath = StorePath.parseFromUrl(fileUrl);
+            storageClient.deleteFile(storePath.getGroup(), storePath.getPath());
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("FastDfs Failed to delete file: ", e);
+        }
+    }
+}
--- a/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml
@@ -18,9 +18,8 @@ spring:
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
-  config:
-    # 配置文件格式
-    file-extension: yml
-    import:
-      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
-      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java
@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
@@ -1,8 +1,8 @@
 package com.ruoyi.gen.domain;

 import java.util.List;
-import jakarta.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.Valid;
+import javax.validation.constraints.NotBlank;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -101,9 +101,6 @@ public class GenTable extends BaseEntity
    /** 上级菜单名称字段 */
    private String parentMenuName;

-    /** 是否生成详情页 */
-    private boolean isView;
-
    public Long getTableId()
    {
        return tableId;
@@ -354,16 +351,6 @@ public class GenTable extends BaseEntity
        this.parentMenuName = parentMenuName;
    }

-    public boolean isView()
-    {
-        return isView;
-    }
-
-    public void setView(boolean isView)
-    {
-        this.isView = isView;
-    }
-
    public boolean isSub()
    {
        return isSub(this.tplCategory);
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java
@@ -1,6 +1,6 @@
 package com.ruoyi.gen.domain;

-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;

--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
@@ -209,7 +209,7 @@ public class GenTableServiceImpl implements IGenTableService
        VelocityContext context = VelocityUtils.prepareContext(table);

        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table);
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
        for (String template : templates)
        {
            // 渲染模板
@@ -253,10 +253,10 @@ public class GenTableServiceImpl implements IGenTableService
        VelocityContext context = VelocityUtils.prepareContext(table);

        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table);
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
        for (String template : templates)
        {
-            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "api.ts.vm", "type.ts.vm", "index.ts.vm", "index.vue.vm", "index-tree.vue.vm", "view.vue.vm"))
+            if (!StringUtils.containsAny(template, "sql.vm", "api.js.vm", "index.vue.vm", "index-tree.vue.vm"))
            {
                // 渲染模板
                StringWriter sw = new StringWriter();
@@ -371,7 +371,7 @@ public class GenTableServiceImpl implements IGenTableService
        VelocityContext context = VelocityUtils.prepareContext(table);

        // 获取模板列表
-        List<String> templates = VelocityUtils.getTemplateList(table);
+        List<String> templates = VelocityUtils.getTemplateList(table.getTplCategory(), table.getTplWebType());
        for (String template : templates)
        {
            // 渲染模板
@@ -524,14 +524,12 @@ public class GenTableServiceImpl implements IGenTableService
            String treeName = paramsObj.getString(GenConstants.TREE_NAME);
            Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);
            String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
-            boolean isView = paramsObj.getBooleanValue(GenConstants.GEN_VIEW);

            genTable.setTreeCode(treeCode);
            genTable.setTreeParentCode(treeParentCode);
            genTable.setTreeName(treeName);
            genTable.setParentMenuId(parentMenuId);
            genTable.setParentMenuName(parentMenuName);
-            genTable.setView(isView);
        }
    }

--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
@@ -14,7 +14,7 @@ import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;

 /**
- * 模板处理工具类
+ * 模板工具类
 * 
 * @author ruoyi
 */
@@ -68,7 +68,6 @@ public class VelocityUtils
        velocityContext.put("columns", genTable.getColumns());
        velocityContext.put("table", genTable);
        velocityContext.put("dicts", getDicts(genTable));
-        setExtensionsContext(velocityContext, genTable.getOptions());
        setMenuVelocityContext(velocityContext, genTable);
        if (GenConstants.TPL_TREE.equals(tplCategory))
        {
@@ -81,13 +80,6 @@ public class VelocityUtils
        return velocityContext;
    }

-    public static void setExtensionsContext(VelocityContext context, String options)
-    {
-        JSONObject paramsObj = JSONObject.parseObject(options);
-        boolean genView = genView(paramsObj);
-        context.put("genView", genView);
-    }
-
    public static void setMenuVelocityContext(VelocityContext context, GenTable genTable)
    {
        String options = genTable.getOptions();
@@ -142,12 +134,8 @@ public class VelocityUtils
     * @param tplWebType 前端类型
     * @return 模板列表
     */
-    public static List<String> getTemplateList(GenTable table)
+    public static List<String> getTemplateList(String tplCategory, String tplWebType)
    {
-        String tplWebType = table.getTplWebType();
-        String tplCategory = table.getTplCategory();
-        JSONObject paramsObj = JSONObject.parseObject(table.getOptions());
-        boolean isView = genView(paramsObj);
        String useWebType = "vm/vue";
        String apiTemplate = "vm/js/api.js.vm";
        if (StringUtils.equals(ELEMENT_PLUS, tplWebType))
@@ -186,10 +174,6 @@ public class VelocityUtils
            templates.add(useWebType + "/index.vue.vm");
            templates.add("vm/java/sub-domain.java.vm");
        }
-        if (isView)
-        {
-            templates.add(useWebType + "/view.vue.vm");
-        }
        return templates;
    }

@@ -269,10 +253,6 @@ public class VelocityUtils
        {
            fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
        }
-        else if (template.contains("view.vue.vm"))
-        {
-            fileName = StringUtils.format("{}/views/{}/{}/view.vue", vuePath, moduleName, businessName);
-        }
        return fileName;
    }

@@ -414,21 +394,6 @@ public class VelocityUtils
        return StringUtils.EMPTY;
    }

-    /**
-     * 扩展功能/生成详情页
-     * 
-     * @param paramsObj 生成其他选项
-     * @return 是否生成详细页
-     */
-    public static boolean genView(JSONObject paramsObj)
-    {
-        if (StringUtils.isNotNull(paramsObj) && paramsObj.containsKey(GenConstants.GEN_VIEW))
-        {
-            return paramsObj.getBoolean(GenConstants.GEN_VIEW);
-        }
-        return false;
-    }
-
    /**
     * 获取树名称
     *
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml
@@ -18,9 +18,8 @@ spring:
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
-  config:
-    # 配置文件格式
-    file-extension: yml
-    import:
-      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
-      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -94,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <set>
            <if test="columnComment != null">column_comment = #{columnComment},</if>
            <if test="javaType != null">java_type = #{javaType},</if>
-            <if test="columnType != null">column_type = #{columnType},</if>
            <if test="javaField != null">java_field = #{javaField},</if>
            <if test="isInsert != null">is_insert = #{isInsert},</if>
            <if test="isEdit != null">is_edit = #{isEdit},</if>
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm
@@ -1,7 +1,7 @@
 package ${packageName}.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -139,15 +139,6 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-#if($genView)
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleViewData(scope.row)"
-            v-hasPermi="['${permissionPrefix}:query']"
-          >详情</el-button>
-#end
          <el-button
            size="mini"
            type="text"
@@ -173,10 +164,6 @@
      </el-table-column>
    </el-table>

-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
    <!-- 添加或修改${functionName}对话框 -->
 #if($table.formColNum == 2)
 #set($dialogWidth = "800px")
@@ -332,9 +319,6 @@

 <script>
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 import Treeselect from "@riophae/vue-treeselect"
 import "@riophae/vue-treeselect/dist/vue-treeselect.css"

@@ -344,9 +328,6 @@ export default {
  dicts: [${dicts}],
 #end
  components: {
-#if($genView)
-    ${BusinessName}ViewDrawer,
-#end
    Treeselect
  },
  data() {
@@ -502,12 +483,6 @@ export default {
        this.refreshTable = true
      })
    },
-#if($genView)
-    /** 详情按钮操作 */
-    handleViewData(row) {
-      this.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-    },
-#end
    /** 修改按钮操作 */
    handleUpdate(row) {
      this.reset()
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
@@ -153,15 +153,6 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-#if($genView)
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleViewData(scope.row)"
-            v-hasPermi="['${permissionPrefix}:query']"
-          >详情</el-button>
-#end
          <el-button
            size="mini"
            type="text"
@@ -188,10 +179,6 @@
      @pagination="getList"
    />

-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
    <!-- 添加或修改${functionName}对话框 -->
 #if($table.formColNum == 2)
 #set($dialogWidth = "800px")
@@ -400,15 +387,9 @@

 <script>
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end

 export default {
  name: "${BusinessName}",
-#if($genView)
-  components: { ${BusinessName}ViewDrawer },
-#end
 #if(${dicts} != '')
  dicts: [${dicts}],
 #end
@@ -545,7 +526,7 @@ export default {
    // 多选框选中数据
    handleSelectionChange(selection) {
      this.ids = selection.map(item => item.${pkColumn.javaField})
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
      this.multiple = !selection.length
    },
    /** 新增按钮操作 */
@@ -642,12 +623,6 @@ export default {
    handle${subClassName}SelectionChange(selection) {
      this.checked${subClassName} = selection.map(item => item.index)
    },
-#end
-#if($genView)
-    /** 详情按钮操作 */
-    handleViewData(row) {
-      this.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-    },
 #end
    /** 导出按钮操作 */
    handleExport() {
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm
@@ -136,9 +136,6 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">新增</el-button>
          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
@@ -146,10 +143,6 @@
      </el-table-column>
    </el-table>

-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
    <!-- 添加或修改${functionName}对话框 -->
 #if($table.formColNum == 2)
 #set($dialogWidth = "800px")
@@ -314,14 +307,11 @@

 <script setup name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end

 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end

 const ${businessName}List = ref([])
@@ -344,7 +334,7 @@ const data = reactive({
  queryParams: {
    #foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
  },
@@ -401,13 +391,13 @@ function getTreeselect() {
  })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
  open.value = false
  reset()
 }

-/** 表单重置 */
+// 表单重置
 function reset() {
  form.value = {
 #foreach ($column in $columns)
@@ -459,13 +449,6 @@ function toggleExpandAll() {
    refreshTable.value = true
  })
 }
-#if($genView)
-
-/** 详情按钮操作 */
-function handleViewData(row) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-#end

 /** 修改按钮操作 */
 async function handleUpdate(row) {
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
@@ -148,9 +148,6 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
        </template>
@@ -165,10 +162,6 @@
      @pagination="getList"
    />

-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
    <!-- 添加或修改${functionName}对话框 -->
 #if($table.formColNum == 2)
 #set($dialogWidth = "800px")
@@ -388,14 +381,11 @@

 <script setup name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end

 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end

 const ${businessName}List = ref([])
@@ -427,7 +417,7 @@ const data = reactive({
    pageSize: 10,
    #foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
  },
@@ -475,13 +465,13 @@ function getList() {
  })
 }

-/** 取消按钮 */
+// 取消按钮
 function cancel() {
  open.value = false
  reset()
 }

-/** 表单重置 */
+// 表单重置
 function reset() {
  form.value = {
 #foreach ($column in $columns)
@@ -516,7 +506,7 @@ function resetQuery() {
  handleQuery()
 }

-/** 多选框选中数据 */
+// 多选框选中数据
 function handleSelectionChange(selection) {
  ids.value = selection.map(item => item.${pkColumn.javaField})
  single.value = selection.length != 1
@@ -596,7 +586,7 @@ function handleAdd${subClassName}() {
 #foreach($column in $subTable.columns)
 #if($column.pk || $column.javaField == ${subTableFkclassName})
 #elseif($column.list && "" != $javaField)
-  obj.$column.javaField = undefined
+  obj.$column.javaField = ""
 #end
 #end
  ${subclassName}List.value.push(obj)
@@ -620,13 +610,6 @@ function handle${subClassName}SelectionChange(selection) {
  checked${subClassName}.value = selection.map(item => item.index)
 }

-#end
-#if($genView)
-/** 详情按钮操作 */
-function handleViewData(row) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-
 #end
 /** 导出按钮操作 */
 function handleExport() {
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/view.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/view.vue.vm
@@ -1,83 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" v-model="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#elseif($column.htmlType == "imageUpload")
-              <image-preview :src="info.${javaField}" :width="60" :height="60" />
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script setup name="${BusinessName}ViewDrawer">
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const visible = ref(false)
-const loading = ref(false)
-const info = reactive({})
-
-const open = async (${pkColumn.javaField}) => {
-  visible.value = true
-  loading.value = true
-  try {
-    const res = await get${BusinessName}(${pkColumn.javaField})
-    Object.assign(info, res.data || {})
-  } catch (error) {
-    console.error('获取${functionName}信息失败:', error)
-  } finally {
-    loading.value = false
-  }
-}
-
-function handleClose() {
-  visible.value = false
-  Object.keys(info).forEach(key => delete info[key])
-}
-
-defineExpose({ open })
-</script>
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index-tree.vue.vm
@@ -136,9 +136,6 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
          <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">新增</el-button>
          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
@@ -146,10 +143,6 @@
      </el-table-column>
    </el-table>

-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
    <!-- 添加或修改${functionName}对话框 -->
 #if($table.formColNum == 2)
 #set($dialogWidth = "800px")
@@ -314,16 +307,13 @@

 <script setup lang="ts" name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
 import type { TreeSelect } from '@/types/api/common'

 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end

 const ${businessName}List = ref<any[]>([])
@@ -403,13 +393,13 @@ function getTreeselect() {
  })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
  open.value = false
  reset()
 }

-/** 表单重置 */
+// 表单重置
 function reset() {
  form.value = {
 #foreach ($column in $columns)
@@ -461,13 +451,6 @@ function toggleExpandAll() {
    refreshTable.value = true
  })
 }
-#if($genView)
-
-/** 详情按钮操作 */
-function handleViewData(row: ${ClassName}) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-#end

 /** 修改按钮操作 */
 async function handleUpdate(row: ${ClassName}) {
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index.vue.vm
@@ -148,9 +148,6 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
        </template>
@@ -165,10 +162,6 @@
      @pagination="getList"
    />

-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
    <!-- 添加或修改${functionName}对话框 -->
 #if($table.formColNum == 2)
 #set($dialogWidth = "800px")
@@ -386,21 +379,18 @@
  </div>
 </template>

-<script setup lang="ts" name="${BusinessName}">
+<script setup lang="ts" name="Config">
 #if($table.sub)
 import type { ${ClassName}, ${subClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
 #else
 import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
 #end
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end

 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end

 const ${businessName}List = ref<${ClassName}[]>([])
@@ -480,13 +470,13 @@ function getList() {
  })
 }

-/** 取消按钮 */
+// 取消按钮
 function cancel() {
  open.value = false
  reset()
 }

-/** 表单重置 */
+// 表单重置
 function reset() {
  form.value = {
 #foreach ($column in $columns)
@@ -521,7 +511,7 @@ function resetQuery() {
  handleQuery()
 }

-/** 多选框选中数据 */
+// 多选框选中数据
 function handleSelectionChange(selection: ${ClassName}[]) {
  ids.value = selection.map(item => item.${pkColumn.javaField})
  single.value = selection.length != 1
@@ -625,13 +615,6 @@ function handle${subClassName}SelectionChange(selection: any[]) {
  checked${subClassName}.value = selection.map(item => item.index)
 }

-#end
-#if($genView)
-/** 详情按钮操作 */
-function handleViewData(row: ${ClassName}) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-
 #end
 /** 导出按钮操作 */
 function handleExport() {
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/view.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/view.vue.vm
@@ -1,84 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" v-model="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#elseif($column.htmlType == "imageUpload")
-              <image-preview :src="info.${javaField}" :width="60" :height="60" />
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script setup lang="ts" name="${BusinessName}ViewDrawer">
-import type { ${ClassName} } from "@/types/api/${moduleName}/${businessName}"
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const visible = ref<boolean>(false)
-const loading = ref<boolean>(false)
-const info = reactive<Partial<${ClassName}>>({})
-
-const open = async (#if($pkColumn.javaType == "Long" || $pkColumn.javaType == "Integer")${pkColumn.javaField}: number#else${pkColumn.javaField}: string#end): Promise<void> => {
-  visible.value = true
-  loading.value = true
-  try {
-    const res = await get${BusinessName}(${pkColumn.javaField})
-    Object.assign(info, res.data ?? {})
-  } catch (error) {
-    console.error('获取${functionName}信息失败:', error)
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleClose = (): void => {
-  visible.value = false
-  Object.keys(info).forEach(key => delete (info as any)[key])
-}
-
-defineExpose({ open })
-</script>
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/view.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/view.vue.vm
@@ -1,86 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" :visible.sync="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" custom-class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="dict.type.${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="dict.type.${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script>
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-
-export default {
-  name: '${BusinessName}ViewDrawer',
-#foreach($column in $columns)
-#if("" != $column.dictType)
-#set($hasDicts = true)
-#break
-#end
-#end
-#if($hasDicts)
-  dicts: [#foreach($column in $columns)#if("" != $column.dictType)'${column.dictType}'#if($foreach.hasNext), #end#end#end],
-#end
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      info: {}
-    }
-  },
-  methods: {
-    open(${pkColumn.javaField}) {
-      this.visible = true
-      this.loading = true
-      get${BusinessName}(${pkColumn.javaField}).then(res => {
-        this.info = res.data || {}
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleClose() {
-      this.visible = false
-    }
-  }
-}
-</script>
--- 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
@@ -1,7 +1,7 @@
 package com.ruoyi.job.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobLogController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.job.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/domain/SysJob.java
@@ -1,8 +1,8 @@
 package com.ruoyi.job.domain;

 import java.util.Date;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;
--- a/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
+++ b/ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/service/SysJobServiceImpl.java
@@ -1,7 +1,7 @@
 package com.ruoyi.job.service;

 import java.util.List;
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
 import org.quartz.Scheduler;
--- a/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml
@@ -18,9 +18,8 @@ spring:
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
-  config:
-    # 配置文件格式
-    file-extension: yml
-    import:
-      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
-      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysConfigController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictDataController.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.controller;

 import java.util.ArrayList;
 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysLogininforController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
@@ -54,6 +54,7 @@ public class SysNoticeController extends BaseController
    /**
     * 根据通知公告编号获取详细信息
     */
+    @RequiresPermissions("system:notice:query")
    @GetMapping(value = "/{noticeId}")
    public AjaxResult getInfo(@PathVariable Long noticeId)
    {
@@ -124,19 +125,6 @@ public class SysNoticeController extends BaseController
        return success();
    }

-    /**
-     * 已读用户列表数据
-     */
-    @RequiresPermissions("system:notice:list")
-    @GetMapping("/readUsers/list")
-    @ResponseBody
-    public TableDataInfo readUsersList(Long noticeId, String searchValue)
-    {
-        startPage();
-        List<?> list = noticeReadService.selectReadUsersByNoticeId(noticeId, searchValue);
-        return getDataTable(list);
-    }
-
    /**
     * 删除通知公告
     */
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysOperlogController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysPostController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysRoleController.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.controller;

 import java.util.List;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -5,7 +5,7 @@ import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -189,18 +189,11 @@ public class SysUserController extends BaseController
        ajax.put("user", user);
        ajax.put("roles", roles);
        ajax.put("permissions", permissions);
-        ajax.put("pwdChrtype", getSysAccountChrtype());
        ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
        ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
        return ajax;
    }

-    // 获取用户密码自定义配置规则
-    public String getSysAccountChrtype()
-    {
-        return Convert.toStr(configService.selectConfigByKey("sys.account.chrtype"), "0");
-    }
-
    // 检查初始密码是否提醒修改
    public boolean initPasswordIsModify(Date pwdUpdateDate)
    {
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.domain;

-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
--- 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
@@ -2,9 +2,9 @@ package com.ruoyi.system.domain;

 import java.util.ArrayList;
 import java.util.List;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+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;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java
@@ -1,7 +1,7 @@
 package com.ruoyi.system.domain;

-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonProperty;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java
@@ -1,8 +1,8 @@
 package com.ruoyi.system.domain;

-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+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.annotation.Excel;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeReadMapper.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysNoticeReadMapper.java
@@ -1,10 +1,9 @@
 package com.ruoyi.system.mapper;

 import java.util.List;
-import java.util.Map;
 import org.apache.ibatis.annotations.Param;
-import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.domain.SysNoticeRead;
+import com.ruoyi.system.domain.SysNotice;

 /**
 * 公告已读记录 数据层
@@ -56,15 +55,6 @@ public interface SysNoticeReadMapper
     */
    public List<SysNotice> selectNoticeListWithReadStatus(@Param("userId") Long userId, @Param("limit") int limit);

-    /**
-     * 查询已阅读某公告的用户列表
-     *
-     * @param noticeId 公告ID
-     * @param searchValue 搜索值
-     * @return 已读用户列表
-     */
-    public List<Map<String, Object>> selectReadUsersByNoticeId(@Param("noticeId") Long noticeId, @Param("searchValue") String searchValue);
-
    /**
     * 公告删除时清理对应已读记录
     *
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeReadService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeReadService.java
@@ -1,7 +1,6 @@
 package com.ruoyi.system.service;

 import java.util.List;
-import java.util.Map;
 import com.ruoyi.system.domain.SysNotice;

 /**
@@ -44,15 +43,6 @@ public interface ISysNoticeReadService
     */
    public void markReadBatch(Long userId, Long[] noticeIds);

-    /**
-     * 查询已阅读某公告的用户列表
-     *
-     * @param noticeId  公告ID
-     * @param searchValue 搜索值
-     * @return 已读用户列表
-     */
-    public List<Map<String, Object>> selectReadUsersByNoticeId(Long noticeId, String searchValue);
-
    /**
     * 删除公告时清理对应已读记录
     *
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysNoticeService.java
@@ -49,7 +49,7 @@ public interface ISysNoticeService
     * @return 结果
     */
    public int deleteNoticeById(Long noticeId);
-
+    
    /**
     * 批量删除公告信息
     * 
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -2,7 +2,7 @@ package com.ruoyi.system.service.impl;

 import java.util.Collection;
 import java.util.List;
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.core.constant.CacheConstants;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java
@@ -4,7 +4,7 @@ import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
-import jakarta.annotation.PostConstruct;
+import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeReadServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysNoticeReadServiceImpl.java
@@ -1,11 +1,10 @@
 package com.ruoyi.system.service.impl;

 import java.util.List;
-import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.domain.SysNoticeRead;
+import com.ruoyi.system.domain.SysNotice;
 import com.ruoyi.system.mapper.SysNoticeReadMapper;
 import com.ruoyi.system.service.ISysNoticeReadService;

@@ -63,15 +62,6 @@ public class SysNoticeReadServiceImpl implements ISysNoticeReadService
        noticeReadMapper.insertNoticeReadBatch(userId, noticeIds);
    }

-    /**
-     * 查询已阅读某公告的用户列表
-     */
-    @Override
-    public List<Map<String, Object>> selectReadUsersByNoticeId(Long noticeId, String searchValue)
-    {
-        return noticeReadMapper.selectReadUsersByNoticeId(noticeId, searchValue);
-    }
-
    /**
     * 删除公告时清理对应已读记录
     */
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java
@@ -3,7 +3,7 @@ package com.ruoyi.system.service.impl;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
-import jakarta.validation.Validator;
+import javax.validation.Validator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
--- a/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/bootstrap.yml
@@ -18,9 +18,8 @@ spring:
      config:
        # 配置中心地址
        server-addr: 127.0.0.1:8848
-  config:
-    # 配置文件格式
-    file-extension: yml
-    import:
-      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
-      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml
@@ -63,26 +63,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </foreach>
    </delete>

-    <!-- 查询已阅读某公告的用户列表，支持按登录名/用户名模糊筛选 -->
-    <select id="selectReadUsersByNoticeId" resultType="java.util.Map">
-        select
-            u.user_id      as userId,
-            u.user_name    as userName,
-            u.nick_name    as nickName,
-            d.dept_name    as deptName,
-            u.phonenumber  as phonenumber,
-            r.read_time    as readTime
-        from sys_notice_read r
-        inner join sys_user u on u.user_id = r.user_id and u.del_flag = '0'
-        left join sys_dept d on d.dept_id = u.dept_id
-        where r.notice_id = #{noticeId}
-        <if test="searchValue != null and searchValue != ''">
-            and (
-                u.user_name like concat('%', #{searchValue}, '%')
-                or u.nick_name like concat('%', #{searchValue}, '%')
-            )
-        </if>
-        order by r.read_time desc
-    </select>
-
 </mapper>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
RuoYi	566cbc8c5d	新增树分割组件TreePanel	2026-04-02 11:37:05 +08:00
RuoYi	3b0982515e	代码生成支持表单布局选项	2026-04-02 11:11:26 +08:00
RuoYi	d9a6263626	支持表格列显隐状态记忆	2026-03-31 19:50:01 +08:00
RuoYi	b2685bf8e8	支持多sheet导出	2026-03-31 18:48:52 +08:00
RuoYi	b0b4d2e446	若依 3.6.8	2026-03-30 08:01:38 +08:00
RuoYi	af768553bb	优化页签全屏显示	2026-03-26 00:53:45 +08:00
RuoYi	74bd4562bd	优化快速点击页签刷新出现404问题	2026-03-25 21:22:56 +08:00
RuoYi	219848fdb7	修复typescript版多表代码生成报错问题	2026-03-25 13:03:24 +08:00
RuoYi	b232e394c6	菜单管理列表新增类型显示	2026-03-24 15:34:39 +08:00
RuoYi	9df5446d5f	优化菜单主题风格	2026-03-24 10:55:47 +08:00
RuoYi	997dc3968e	升级axios到最新版本0.30.3	2026-03-23 11:45:19 +08:00
RuoYi	751844f441	优化页签显示	2026-03-23 11:43:46 +08:00
RuoYi	74207e2593	添加持久化标签页开关功能	2026-03-22 23:30:05 +08:00
RuoYi	943be56511	添加持久化标签页开关功能	2026-03-22 21:17:08 +08:00
RuoYi	e30ecdbf2d	优化tag全屏为页签内区域	2026-03-22 21:16:36 +08:00
RuoYi	4c952fbe36	菜单搜索支持文本高亮&数量提示	2026-03-22 16:56:12 +08:00
RuoYi	00ac3e3df6	首页新增通知公告消息提醒	2026-03-21 23:57:52 +08:00
RuoYi	1eaf3a6ec7	新增锁定屏幕功能	2026-03-21 23:30:07 +08:00
RuoYi	59392c7b35	菜单管理支持批量保存排序	2026-03-21 22:52:41 +08:00
RuoYi	29d4ea24e0	保存排序添加编辑权限	2026-03-21 22:40:02 +08:00
RuoYi	ca80568837	优化定时任务详情页展示&补充执行时间字段	2026-03-21 22:20:52 +08:00
RuoYi	254e7522db	字典类型列表新增抽屉效果详细信息	2026-03-21 22:07:25 +08:00
RuoYi	466f0f559d	操作日志详细页面优化	2026-03-21 21:12:17 +08:00
RuoYi	970f718351	优化RightToolbar搜索栏切换动画	2026-03-21 20:51:40 +08:00
RuoYi	97759ec0ed	TypeScript前端代码生成模板同步到最新	2026-03-18 13:07:43 +08:00
RuoYi	114e806326	update README.md	2026-03-14 13:44:46 +08:00
RuoYi	09e7ccdc61	update README.md	2026-03-14 13:42:31 +08:00
若依	7a829c44cb	!452 固定nacos版本 Merge pull request !452 from magic/fix/docker-sp2	2026-03-12 14:22:06 +00:00
gowshwah	2844201b6f	固定nacos版本	2026-03-12 17:22:12 +08:00
RuoYi	18079f70d0	TypeScript前端代码生成模板同步到最新	2026-03-12 14:13:31 +08:00
RuoYi	1a3f3ebaea	update README.md	2026-03-11 14:42:39 +08:00
RuoYi	8c122a9609	升级fastjson到最新版2.0.61	2026-03-09 17:41:30 +08:00
RuoYi	de1dbe61a5	update userid default value	2026-03-09 17:38:37 +08:00
RuoYi	156471d638	优化Excel自定义格式样式重复创建问题	2026-03-09 15:12:11 +08:00
RuoYi	661e8cf7b4	优化字典类型属性提醒说明	2026-02-11 15:38:13 +08:00
RuoYi	28be96930c	README.md	2026-01-28 21:21:10 +08:00
RuoYi	6c6a2c0623	update README.md	2026-01-28 21:16:49 +08:00
RuoYi	7d821ed043	优化代码	2026-01-28 21:16:05 +08:00
RuoYi	5d54693b27	添加菜单路由地址和名称的校验规则	2026-01-09 11:19:02 +08:00
RuoYi	cfd619fa4f	优化防重提交间隔时间可自定义	2026-01-08 13:42:00 +08:00
RuoYi	e942847b89	修复Excel自定义格式样式污染问题	2026-01-06 13:54:27 +08:00
RuoYi	0b09d7c1da	copyright 2026	2026-01-05 14:50:53 +08:00
RuoYi	1c0562ba18	将isAdmin方法统一到SecurityUtils	2026-01-05 14:50:37 +08:00
RuoYi	da65996e69	若依 3.6.7	2025-12-22 09:17:03 +08:00
RuoYi	873444dd0b	优化topbar顶部菜单样式	2025-12-18 14:45:57 +08:00
RuoYi	2301280c4d	默认固定头部	2025-12-18 14:42:34 +08:00
RuoYi	4eebb27956	优化字典组件值宽松匹配	2025-12-16 16:42:15 +08:00
RuoYi	c2ff461ff0	升级fastjson到最新版2.0.60	2025-12-16 13:44:40 +08:00
RuoYi	eb489bda83	升级commons.io到最新版本2.21.0	2025-12-16 13:44:16 +08:00
RuoYi	1db2086163	升级druid到最新版本1.2.27	2025-12-16 13:43:20 +08:00
RuoYi	839e4f35f5	菜单导航设置支持纯顶部	2025-12-16 11:42:07 +08:00
RuoYi	f53b783049	优化数据权限控制逻辑，放开permission限制	2025-12-04 17:35:47 +08:00
RuoYi	97f30a5415	支持Excel导出对象的多个子列表	2025-12-04 16:48:19 +08:00
RuoYi	ad1d009165	升级tomcat到最新版本9.0.112	2025-12-04 16:43:11 +08:00
RuoYi	90cbabb7a7	优化代码	2025-12-04 16:42:55 +08:00
RuoYi	1c4dbb1e46	优化表单构建关闭页签销毁复制插件	2025-12-04 13:15:50 +08:00
RuoYi	a3eefb6bad	优化生成代码下载的zip文件名	2025-12-03 10:27:23 +08:00
RuoYi	09e8e9995a	网页标题设置新增SET_TITLE方法	2025-12-02 19:31:23 +08:00
RuoYi	381151bc50	支持Excel导出对象的多个子列表	2025-12-02 19:14:04 +08:00
RuoYi	66e502727a	登录/注册页面底部版权信息修改为读取配置	2025-12-02 15:34:27 +08:00
RuoYi	4265f8ecb7	修复v3时间控件between选择后清空报错问题	2025-12-02 15:00:36 +08:00
RuoYi	2c82079d04	修复表单构建移除所有控件后切换路由回来空白问题	2025-12-02 13:12:55 +08:00
RuoYi	6aecd35a4f	修复combo属性过多sheet出现的异常问题	2025-11-13 11:58:03 +08:00
RuoYi	ac92ae3ae6	修复固定头部时出现的导航栏偏移问题	2025-09-04 20:06:26 +08:00
RuoYi	1d2c8378f7	文件支持防盗链配置	2025-09-02 13:26:33 +08:00
RuoYi	50a9337ee8	优化代码	2025-08-28 13:51:15 +08:00
RuoYi	e6a3415a71	优化代码	2025-08-27 16:01:28 +08:00
RuoYi	7919af54da	用户导入添加验证提示	2025-08-23 11:46:49 +08:00
RuoYi	3503005f9d	优化布局设置显示	2025-08-23 11:46:39 +08:00
RuoYi	b304a41194	修复用户归属部门无法修改为空问题	2025-08-21 14:59:10 +08:00
RuoYi	a39ae33c82	columns default value	2025-08-09 16:13:49 +08:00
RuoYi	b9a27657c5	显示列信息支持对象格式	2025-08-09 15:19:13 +08:00
RuoYi	2e009841ca	自动识别json对象白名单配置范围缩小	2025-08-09 15:18:29 +08:00
RuoYi	2cbe4a8234	升级tomcat到最新版本9.0.108	2025-08-09 15:17:10 +08:00
RuoYi	4b37049713	添加新群号：112869560	2025-07-19 19:28:44 +08:00
RuoYi	e549210ad6	优化定时任务包名白名单匹配方式	2025-06-20 11:56:03 +08:00
RuoYi	ad988d54bb	优化Excel统计行数值的单元格样式显示	2025-06-19 14:54:00 +08:00
RuoYi	51a6fce0a5	升级tomcat到最新版本9.0.106	2025-06-18 13:41:37 +08:00
RuoYi	c86bfa9243	用户头像更换后移除旧头像文件	2025-06-06 19:36:36 +08:00
RuoYi	8aca11c2a2	若依 3.6.6	2025-05-30 08:03:00 +08:00
RuoYi	725033e361	升级fastjson到最新版2.0.57	2025-05-26 11:14:45 +08:00
RuoYi	d29e49e23b	注册账号设置默认密码最后更新时间	2025-05-26 11:14:06 +08:00
RuoYi	706c3bb69b	添加底部版权信息及开关	2025-05-24 14:33:51 +08:00
RuoYi	cd0ee95b9c	添加页签图标显示开关功能	2025-05-23 14:57:49 +08:00
RuoYi	3293e2fb56	账号密码支持自定义更新周期	2025-05-23 10:19:47 +08:00
RuoYi	924ec0eb6e	初始密码支持自定义修改策略	2025-05-23 09:58:23 +08:00
RuoYi	135b1204a9	升级tomcat到最新版本9.0.105	2025-05-15 10:55:18 +08:00
RuoYi	cb566a704b	升级commons.io到最新版本2.19.0	2025-05-15 10:23:50 +08:00
RuoYi	aadba0382e	delete vue-meta	2025-05-15 10:23:34 +08:00
RuoYi	a0ce1cf33b	delete eslint	2025-05-15 10:22:46 +08:00
RuoYi	3915c77391	优化导航栏显示昵称&设置	2025-05-09 14:02:09 +08:00
RuoYi	b80932ceb4	菜单搜索支持键盘选择&悬浮主题背景	2025-05-07 13:27:13 +08:00
RuoYi	056cf94082	图片上传组件新增disabled属性	2025-05-06 19:14:54 +08:00
RuoYi	0dcd3e6183	add columnName Drag	2025-05-06 14:54:44 +08:00
RuoYi	07be5ceb26	修复上传组件被多次引用拖动仅对第一个有效的问题	2025-05-06 13:46:21 +08:00
RuoYi	cc59502d7c	update icon	2025-05-05 11:22:35 +08:00
RuoYi	98738f23ad	上传组件新增拖动排序属性	2025-04-30 10:31:03 +08:00
RuoYi	57fe1c663e	优化Excel匹配数值型.0结尾	2025-04-28 11:20:48 +08:00
RuoYi	7b6fdb3a89	remove all semicolons	2025-04-27 11:56:21 +08:00
RuoYi	79c885decb	使用Gateway CacheRequestBody代替CacheRequestFilter	2025-04-25 15:11:17 +08:00
RuoYi	1a0f37a2dc	富文本复制粘贴图片上传至url	2025-04-24 18:19:16 +08:00
RuoYi	02de344d8c	update package.json	2025-04-24 18:18:44 +08:00
RuoYi	189100f74e	优化低版本node无法启动的问题	2025-04-22 12:07:07 +08:00
RuoYi	e29284e687	优化代码	2025-04-22 12:06:59 +08:00
RuoYi	d4af286f41	显隐列组件支持全选/全不选	2025-04-21 15:30:32 +08:00
RuoYi	60e2d55a23	优化菜单搜索查询页	2025-04-21 13:28:32 +08:00
RuoYi	bbd112d5a3	支持文件&图片组件自定义地址&参数	2025-04-18 13:25:28 +08:00
RuoYi	90922844ea	优化角色禁用不允许分配	2025-04-17 15:36:18 +08:00
RuoYi	3a9f56f04b	update status name	2025-04-17 15:35:58 +08:00
RuoYi	a1ec1d57d4	remove dev runjs	2025-03-18 16:01:46 +08:00
RuoYi	060959a7c5	登录页和注册页表头使用VUE_APP_TITLE配置值	2025-03-18 16:01:20 +08:00
RuoYi	43e1d8d573	升级tomcat到最新版本9.0.102	2025-03-14 16:12:40 +08:00
RuoYi	67cf51ba77	update handleTree	2025-03-14 16:12:29 +08:00
RuoYi	a256618d5d	优化代码	2025-03-11 12:52:17 +08:00
若依	a6bcebb62b	!397 修复actuator暴漏问题 Merge pull request !397 from 威士忌的纯度/N/A	2025-03-10 03:45:34 +00:00
威士忌的纯度	1cb262daa3	修复actuator暴漏问题 Signed-off-by: 威士忌的纯度 <whr888888@vip.qq.com>	2025-03-07 10:22:52 +00:00
RuoYi	8c096cba8d	优化isAdmin方法,避免脱敏模块security依赖	2025-03-07 12:56:31 +08:00
RuoYi	088cec8adf	菜单管理新增路由名称	2025-03-06 11:09:34 +08:00
RuoYi	85ff6a9910	优化顶部菜单搜索栏为多层级显示	2025-03-05 18:14:13 +08:00
RuoYi	cab5beaca7	文件上传组件新增disabled属性&类型	2025-03-05 18:13:40 +08:00
RuoYi	fc8069a250	优化导出Excel日期格式双击离开后与设定的格式不一致问题	2025-03-05 18:13:12 +08:00
RuoYi	924e705dca	代码生成列表支持按时间排序	2025-03-05 18:12:52 +08:00
RuoYi	049ba453d1	优化空指针异常时无法获取错误信息问题	2025-03-05 18:10:56 +08:00
RuoYi	4aa261e8f7	优化定时任务字符包含多个括号导致数据错误	2025-03-05 18:10:12 +08:00
RuoYi	914a6620f5	升级tomcat到最新版本9.0.98	2025-03-05 18:08:29 +08:00
RuoYi	3dcee7057d	优化代码	2025-03-05 18:01:33 +08:00
RuoYi	0467631319	update ry_config.sql	2025-02-24 16:24:36 +08:00
若依	a11df90255	!393 config(nacos):增加nacos2.5.0配置文件sql Merge pull request !393 from 牟雷/master	2025-02-18 00:33:39 +00:00
牟雷	596e4fe756	config(nacos):增加nacos2.5.0配置文件sql	2025-02-17 20:19:22 +08:00
RuoYi	37219e4ae6	copyright 2025	2025-01-07 10:55:58 +08:00
RuoYi	adaa3e1db8	代码生成新增配置是否允许文件覆盖到本地	2024-12-25 16:30:44 +08:00
RuoYi	88ad5a2c19	优化导入带标题文件关闭清理	2024-12-25 16:24:38 +08:00
RuoYi	b45dc2ec25	update sqlkeyword	2024-12-25 16:24:02 +08:00
RuoYi	67b17da06f	优化特殊字符密码修改失败问题	2024-12-17 14:28:17 +08:00
RuoYi	b25a280ebb	优化TopNav内链菜单点击没有高亮(IB8WHJ)	2024-12-17 11:57:05 +08:00
RuoYi	cc026e75a3	优化菜单管理切换Mini布局错乱问题	2024-12-17 11:25:03 +08:00
RuoYi	7216b56a56	用户管理过滤掉已禁用部门	2024-12-11 11:43:00 +08:00
RuoYi	a326e880a1	修改主题样式本地读取	2024-12-07 17:08:53 +08:00
RuoYi	92c6d21855	优化文件异常输入流未关闭的问题	2024-12-05 14:27:54 +08:00
RuoYi	2335157f6e	白名单支持对通配符路径匹配	2024-12-04 08:52:13 +08:00
RuoYi	6c3b01c3c5	Excel注解支持wrapText是否允许内容换行	2024-12-03 09:07:04 +08:00
RuoYi	8faea60191	修复导出子列表对象只能在最后的问题	2024-12-02 20:37:12 +08:00
RuoYi	28a16d9878	修复默认关闭Tags-Views时，内链页面打不开	2024-11-27 19:49:12 +08:00
RuoYi	dd3cf18e27	修复TopNav无法正确获取active的问题	2024-11-27 09:02:26 +08:00
RuoYi	65d03dc014	优化代码	2024-11-25 22:30:03 +08:00
RuoYi	7912fd81bd	面板兼容移动端显示	2024-11-25 15:41:00 +08:00
RuoYi	e2175e5b9d	参数键值更换为多行文本	2024-11-25 12:15:49 +08:00
RuoYi	c0e119f8e0	菜单面包屑导航支持多层级显示	2024-11-22 20:45:08 +08:00
RuoYi	fa77b2a08c	分栏参数微调	2024-11-22 14:46:59 +08:00
RuoYi	a222c24796	用户管理支持分栏拖动	2024-11-22 13:58:37 +08:00
RuoYi	08f4b877ce	优化代码	2024-11-20 11:13:24 +08:00
RuoYi	aa607d135c	update .env.staging	2024-11-20 10:43:07 +08:00
RuoYi	6d34cdb8a3	若依 3.6.5	2024-11-13 08:38:24 +08:00
RuoYi	d47352253e	升级spring-cloud相关组件到最新版	2024-11-12 15:12:01 +08:00
RuoYi	61cbd470e1	update datascope	2024-11-12 15:10:47 +08:00
RuoYi	b3ef4adfed	支持自定义显示Excel属性列	2024-11-07 22:25:48 +08:00
RuoYi	856c471472	优化代码	2024-11-06 10:20:18 +08:00
RuoYi	bec5600f16	优化无用户编号不校验数据权限	2024-11-05 16:30:15 +08:00
RuoYi	5b485e7934	校检文件名是否包含特殊字符	2024-11-05 12:50:12 +08:00
RuoYi	73a752d3ab	优化身份证脱敏正则	2024-10-21 17:16:01 +08:00
RuoYi	1899a832b9	优化权限更新后同步缓存	2024-10-21 17:15:30 +08:00
RuoYi	e6796c0954	操作日志记录DELETE请求参数	2024-10-17 13:17:25 +08:00
RuoYi	4987289a98	升级quill到最新版本2.0.2	2024-10-15 16:21:20 +08:00
RuoYi	18409922a5	修改代码生成上级菜单字段类型	2024-09-27 16:23:36 +08:00
RuoYi	3dca02b306	修复角色禁用权限不失效问题	2024-09-21 12:08:41 +08:00
RuoYi	75f3275e15	修复角色禁用权限不失效问题	2024-09-21 12:01:48 +08:00
RuoYi	b2e4a7046b	update ry_config	2024-09-02 20:21:30 +08:00
RuoYi	60618c1da9	优化提示	2024-09-02 20:21:15 +08:00
RuoYi	3b499b1344	使用SpringDoc代替Swagger	2024-08-30 11:26:57 +08:00