若依 3.6.8

Merge pull request !453 from magic/update/readme

README.md

@@ -13,8 +13,8 @@
 
 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
 
-* 本仓库为RuoYi-Cloud的Spring Boot 2 的版本，保持同步更新。
+* 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。
-* 后端采用Spring Boot2、Spring Cloud & Alibaba。
+* 后端采用Spring Boot、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
 * 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)  

docker/copy.sh

@@ -9,7 +9,7 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20260402.sql ./mysql/db
+cp ../sql/ry_20260321.sql ./mysql/db
 cp ../sql/ry_config_20260311.sql ./mysql/db
 
 # copy html

docker/docker-compose.yml

@@ -2,11 +2,14 @@ version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
-    image: nacos/nacos-server:v2.4.2
+    image: nacos/nacos-server:v3.0.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

docker/nacos/conf/application.properties

@@ -24,6 +24,7 @@ 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

docker/nacos/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM nacos/nacos-server:v2.4.2
+FROM nacos/nacos-server:v3.0.2
 # author
 MAINTAINER ruoyi
 

docker/ruoyi/auth/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:17
 # author
 MAINTAINER ruoyi
 

docker/ruoyi/gateway/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:17
 # author
 MAINTAINER ruoyi
 

docker/ruoyi/modules/file/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:17
 # author
 MAINTAINER ruoyi
 

docker/ruoyi/modules/gen/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:17
 # author
 MAINTAINER ruoyi
 

docker/ruoyi/modules/job/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:17
 # author
 MAINTAINER ruoyi
 

docker/ruoyi/modules/system/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:17
 # author
 MAINTAINER ruoyi
 

docker/ruoyi/visual/monitor/dockerfile

@@ -1,5 +1,5 @@
 # 基础镜像
-FROM  openjdk:8-jre
+FROM  openjdk:17
 # author
 MAINTAINER ruoyi
 

pom.xml

@@ -16,43 +16,30 @@
         <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>1.8</java.version>
+        <java.version>17</java.version>
-        <spring-boot.version>2.7.18</spring-boot.version>
+        <spring-boot.version>4.0.3</spring-boot.version>
-        <spring-cloud.version>2021.0.9</spring-cloud.version>
+        <spring-cloud.version>2025.1.0</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2025.1.0.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
+        <spring-boot-admin.version>4.0.2</spring-boot-admin.version>
-        <tobato.version>1.27.2</tobato.version>
+        <mybatis-spring-boot.version>4.0.1</mybatis-spring-boot.version>
         <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
+        <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
-        <druid.version>1.2.27</druid.version>
+        <druid.version>1.2.28</druid.version>
-        <dynamic-ds.version>4.3.1</dynamic-ds.version>
+        <dynamic-ds.version>4.5.0</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>1.6.9</springdoc.version>
+        <springdoc.version>3.0.2</springdoc.version>
-        <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
+        <transmittable-thread-local.version>2.14.5</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>
@@ -80,49 +67,10 @@
                 <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-ui</artifactId>
+                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
                 <version>${springdoc.version}</version>
             </dependency>
 
@@ -138,6 +86,18 @@
                 <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.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${mybatis-spring-boot.version}</version>
             </dependency>
 
             <!-- io常用工具类 -->
@@ -278,7 +238,9 @@
             <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>

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 javax.validation.constraints.Email;
+import jakarta.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.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;

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

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 javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import jakarta.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;

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 javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;

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 javax.validation.constraints.*;
+import jakarta.validation.constraints.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
 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;
 

ruoyi-auth/pom.xml

@@ -37,7 +37,7 @@
         <!-- SpringBoot Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
         
         <!-- SpringBoot Actuator -->

ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java

@@ -2,7 +2,7 @@ package com.ruoyi.auth;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 import com.ruoyi.common.security.annotation.EnableRyFeignClients;
 
 /**

ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java

@@ -1,6 +1,6 @@
 package com.ruoyi.auth.controller;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;

ruoyi-auth/src/main/resources/bootstrap.yml

@@ -18,8 +18,9 @@ spring:
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
-        # 配置文件格式
+  config:
-        file-extension: yml
+    # 配置文件格式
-        # 共享配置
+    file-extension: yml
-        shared-configs:
+    import:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
+      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}

ruoyi-common/ruoyi-common-core/pom.xml

@@ -53,12 +53,24 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
+        <!-- Mybatis Spring -->
+        <dependency>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</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-aspectj</artifactId>
+        </dependency>
+
         <!-- Jackson -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -81,6 +93,7 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
+            <version>2.3.1</version>
         </dependency>
 
         <!-- Apache Lang3 -->
@@ -103,8 +116,8 @@
 
         <!-- Java Servlet -->
         <dependency>
-            <groupId>javax.servlet</groupId>
+            <groupId>jakarta.servlet</groupId>
-            <artifactId>javax.servlet-api</artifactId>
+            <artifactId>jakarta.servlet-api</artifactId>
         </dependency>
 
     </dependencies>

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/annotation/Excel.java

@@ -51,7 +51,8 @@ public @interface Excel
     /**
      * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
      */
-    public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
+    @SuppressWarnings("deprecation")
+	public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
 
     /**
      * 导出时在excel中每个列的高度

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";
-    }
 }

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" };
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/DateUtils.java

@@ -16,6 +16,7 @@ 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";

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 javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java

@@ -1,8 +1,12 @@
 package com.ruoyi.common.core.utils;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
+import org.apache.commons.lang3.Strings;
 import org.springframework.util.AntPathMatcher;
 import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.text.StrFormatter;
@@ -12,6 +16,7 @@ import com.ruoyi.common.core.text.StrFormatter;
  * 
  * @author ruoyi
  */
+@SuppressWarnings("deprecation")
 public class StringUtils extends org.apache.commons.lang3.StringUtils
 {
     /** 空字符串 */
@@ -366,12 +371,87 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return StringUtils.startsWithAny(link, Constants.HTTP, Constants.HTTPS);
     }
 
+    /**
+     * 字符串转set
+     * 
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return set集合
+     */
+    public static final Set<String> str2Set(String str, String sep)
+    {
+        return new HashSet<String>(str2List(str, sep, true, false));
+    }
+
+    /**
+     * 字符串转list
+     * 
+     * @param str 字符串
+     * @param sep 分隔符
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep)
+    {
+        return str2List(str, sep, true, false);
+    }
+
+    /**
+     * 字符串转list
+     * 
+     * @param str 字符串
+     * @param sep 分隔符
+     * @param filterBlank 过滤纯空白
+     * @param trim 去掉首尾空白
+     * @return list集合
+     */
+    public static final List<String> str2List(String str, String sep, boolean filterBlank, boolean trim)
+    {
+        List<String> list = new ArrayList<String>();
+        if (StringUtils.isEmpty(str))
+        {
+            return list;
+        }
+
+        // 过滤空白字符串
+        if (filterBlank && StringUtils.isBlank(str))
+        {
+            return list;
+        }
+        String[] split = str.split(sep);
+        for (String string : split)
+        {
+            if (filterBlank && StringUtils.isBlank(string))
+            {
+                continue;
+            }
+            if (trim)
+            {
+                string = string.trim();
+            }
+            list.add(string);
+        }
+
+        return list;
+    }
+
+    /**
+     * 检查子字符串是否存在
+     *
+     * @param seq 检查的字符串
+     * @param searchSeq 查找的字符串
+     * @return 结果
+     */
+    public static boolean contains(final CharSequence seq, final CharSequence searchSeq)
+    {
+        return Strings.CS.contains(seq, searchSeq);
+    }
+
     /**
      * 判断给定的collection列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
      *
      * @param collection 给定的集合
      * @param array 给定的数组
-     * @return boolean 结果
+     * @return 结果
      */
     public static boolean containsAny(Collection<String> collection, String... array)
     {
@@ -392,6 +472,198 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         }
     }
 
+    /**
+     * 判断是否包含给定数组中的任意一个。
+     *
+     * @param cs 要判断的字符串
+     * @param searchCharSequences 要判断的数组
+     * @return 结果
+     */
+    public static boolean containsAny(final CharSequence cs, final CharSequence... searchCharSequences)
+    {
+        return Strings.CS.containsAny(cs, searchCharSequences);
+    }
+
+    /**
+     * 查找指定字符串是否包含指定字符串列表中的任意一个字符串同时串忽略大小写
+     *
+     * @param cs 指定字符串
+     * @param searchCharSequences 需要检查的字符串数组
+     * @return 是否包含任意一个字符串
+     */
+    public static boolean containsAnyIgnoreCase(CharSequence cs, CharSequence... searchCharSequences)
+    {
+        if (isEmpty(cs) || isEmpty(searchCharSequences))
+        {
+            return false;
+        }
+        for (CharSequence testStr : searchCharSequences)
+        {
+            if (containsIgnoreCase(cs, testStr))
+            {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * 检查是否包含要搜索的字符串，忽略大小写
+     *
+     * @param str 要检查的字符串
+     * @param searchStr 要查找的字符串
+     * @return 如果包含要搜索的字符串（忽略大小写）则返回true，如果不包含或返回false
+     */
+    public static boolean containsIgnoreCase(final CharSequence str, final CharSequence searchStr)
+    {
+        return Strings.CI.contains(str, searchStr);
+    }
+
+    /**
+     * 检查字符串是否以任意前缀开始
+     *
+     * @param sequence 要检查的字符串
+     * @param searchStrings 区分大小写的字符串前缀数组
+     * @return 结果
+     */
+    public static boolean startsWithAny(final CharSequence sequence, final CharSequence... searchStrings)
+    {
+        return Strings.CS.startsWithAny(sequence, searchStrings);
+    }
+
+    /**
+     * 不区分大小写地检查一个字符串是否以指定前缀开头。
+     *
+     * @param str 待检查的字符串
+     * @param 要查找的前缀
+     * @return 结果
+     */
+    public static boolean startsWithIgnoreCase(final CharSequence str, final CharSequence prefix)
+    {
+        return Strings.CI.startsWith(str, prefix);
+    }
+
+    /**
+     * 比较两个字符串是否相同
+     *
+     * @param cs1 第一个字符串
+     * @param cs2 第二个字符串
+     * @return 如果给定对象与字符串相等，则返回 true；否则返回 false
+     */
+    public static boolean equals(final CharSequence cs1, final CharSequence cs2)
+    {
+        return Strings.CS.equals(cs1, cs2);
+    }
+
+    /**
+     * 替换字符串中所有匹配的字符
+     *
+     * @param text 要搜索和替换的文本
+     * @param searchString 要搜索的字符串
+     * @param replacement  用于替换的字符串
+     * @return 处理完所有替换后的文本
+     */
+    public static String replace(final String text, final String searchString, final String replacement)
+    {
+        return Strings.CS.replace(text, searchString, replacement);
+    }
+
+    /**
+     * 仅当子字符串位于源字符串末尾时才将其移除，否则返回源字符串。
+     * @param str 要搜索的源字符串
+     * @param remove 要搜索并移除的字符串
+     * @return 如果找到并移除了字符串，则返回移除后的子字符串
+     */
+    public static String removeEnd(final String str, final String remove)
+    {
+        return Strings.CS.removeEnd(str, remove);
+    }
+
+    /**
+     * 查找字符串首次出现位置的索引
+     *
+     * @param seq 要检查的字符串
+     * @param searchSeq 要查找的字符串
+     * @return 返回指定字符在字符串中第一次出现处的索引，如果此字符串中没有这样的字符，则返回 -1
+     */
+    public static int indexOf(final CharSequence seq, final CharSequence searchSeq)
+    {
+        return Strings.CS.indexOf(seq, searchSeq);
+    }
+
+    /**
+     * 检查字符串是否以指定的后缀结尾
+     *
+     * @param str 要检查的字符
+     * @param suffix 要检查的后缀
+     * @return 若参数与该字符串末尾相符 true;否则 false
+     */
+    public static boolean endsWith(final CharSequence str, final CharSequence suffix)
+    {
+        return Strings.CS.endsWith(str, suffix);
+    }
+
+    /**
+     * 将给定的字符串与数组进行比较
+     *
+     * @param string 要比较的字符串
+     * @param searchStrings 字符串数组
+     * @return 如果字符串等于（区分大小写）{@code searchStrings}中的任意其他元素，则返回true；如果{@code searchStrings}为null或不包含匹配项，则返回false
+     */
+    public static boolean equalsAny(final CharSequence string, final CharSequence... searchStrings)
+    {
+        return Strings.CS.equalsAny(string, searchStrings);
+    }
+
+    /**
+     * 检查一个字符串是否以任意提供的区分大小写的后缀结尾。
+     *
+     * @param sequence 要检查的字符串
+     * @param searchStrings 要查找的区分大小写的字符串数组
+     * @return 如果输入参数{@code sequence}为null且未提供任何{@code searchStrings}，或者输入{@code sequence}以任意提供的区分大小写的{@code searchStrings}结尾，则返回{@code true}。
+     */
+    public static boolean endsWithAny(final CharSequence sequence, final CharSequence... searchStrings)
+    {
+        return Strings.CS.endsWithAny(sequence, searchStrings);
+    }
+
+    /**
+     * 不区分大小写地检查字符序列是否以指定的后缀结尾
+     *
+     * @param str 要检查的字符序列
+     * @param suffix 要查找的后缀
+     * @return 如果字符序列以该后缀结尾（不区分大小写），或两者均为{@code null}，则返回{@code true}
+     */
+    public static boolean endsWithIgnoreCase(final CharSequence str, final CharSequence suffix)
+    {
+        return Strings.CI.endsWith(str, suffix);
+    }
+
+    /**
+     * 指定范围内查找字符串,忽略大小写
+     *
+     * @param str 要检查的字符串
+     * @param searchStr 要查找的字符串
+     * @return 搜索字符串的第一个索引，如果未找到匹配项则返回 -1
+     */
+    public static int indexOfIgnoreCase(final CharSequence str, final CharSequence searchStr)
+    {
+        return Strings.CI.indexOf(str, searchStr);
+    }
+
+    /**
+     * Compares given {@code string} to a CharSequences vararg of {@code searchStrings},
+     * returning {@code true} if the {@code string} is equal to any of the {@code searchStrings}, ignoring case.
+     *
+     * @param string to compare, may be {@code null}.
+     * @param searchStrings a vararg of strings, may be {@code null}.
+     * @return {@code true} if the string is equal (case-insensitive) to any other element of {@code searchStrings};
+     */
+    public static boolean equalsAnyIgnoreCase(final CharSequence string, final CharSequence... searchStrings)
+    {
+        return Strings.CI.equalsAny(string, searchStrings);
+    }
+
     /**
      * 驼峰转下划线命名
      */
@@ -463,6 +735,22 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return false;
     }
 
+    /**
+     * 删除最后一个字符串
+     *
+     * @param str 输入字符串
+     * @param spit 以什么类型结尾的
+     * @return 截取后的字符串
+     */
+    public static String lastStringDel(String str, String spit)
+    {
+        if (!StringUtils.isEmpty(str) && str.endsWith(spit))
+        {
+            return str.subSequence(0, str.length() - 1).toString();
+        }
+        return str;
+    }
+
     /**
      * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
      * 

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 javax.validation.ConstraintViolation;
+import jakarta.validation.ConstraintViolation;
-import javax.validation.ConstraintViolationException;
+import jakarta.validation.ConstraintViolationException;
-import javax.validation.Validator;
+import jakarta.validation.Validator;
 
 /**
  * bean对象属性验证

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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 

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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelSheet.java

@@ -1,85 +0,0 @@
-package com.ruoyi.common.core.utils.poi;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * 多 Sheet 导出时的数据信息
- *
- * 使用示例：
- * <pre>
- *   List<ExcelSheet<?>> sheets = new ArrayList<>();
- *   sheets.add(new ExcelSheet<>("参数数据", configList, Config.class, "参数信息"));
- *   sheets.add(new ExcelSheet<>("岗位数据", postList, Post.class, "岗位信息"));
- *   return ExcelUtil.exportMultiSheet(sheets);
- * </pre>
- * 
- * @author ruoyi
- */
-public class ExcelSheet<T>
-{
-    /** Sheet 名称 */
-    private String sheetName;
-
-    /** 导出数据集合 */
-    private List<T> list;
-
-    /** 数据对应的实体 Class */
-    private Class<T> clazz;
-
-    /** Sheet 顶部大标题（可为空） */
-    private String title;
-
-    public ExcelSheet(String sheetName, List<T> list, Class<T> clazz)
-    {
-        this(sheetName, list, clazz, "");
-    }
-
-    public ExcelSheet(String sheetName, List<T> list, Class<T> clazz, String title)
-    {
-        this.sheetName = sheetName;
-        this.list = list != null ? list : new ArrayList<>();
-        this.clazz = clazz;
-        this.title = title != null ? title : "";
-    }
-
-    public String getSheetName()
-    {
-        return sheetName;
-    }
-
-    public List<T> getList()
-    {
-        return list;
-    }
-
-    public Class<T> getClazz()
-    {
-        return clazz;
-    }
-
-    public String getTitle()
-    {
-        return title;
-    }
-
-    public void setSheetName(String sheetName)
-    {
-        this.sheetName = sheetName;
-    }
-
-    public void setList(List<T> list)
-    {
-        this.list = list;
-    }
-
-    public void setClazz(Class<T> clazz)
-    {
-        this.clazz = clazz;
-    }
-
-    public void setTitle(String title)
-    {
-        this.title = title;
-    }
-}

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 javax.servlet.http.HttpServletResponse;
+import jakarta.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.newInstance() : entity);
+                    entity = (entity == null ? clazz.getDeclaredConstructor().newInstance() : entity);
                     // 从map中得到对应列的field.
                     Field field = (Field) entry.getValue()[0];
                     Excel attr = (Excel) entry.getValue()[1];
@@ -502,82 +502,6 @@ public class ExcelUtil<T>
         exportExcel(response);
     }
 
-    /**
-     * 多 Sheet 导出 —— 将多个不同类型的数据集合写入同一 Excel，直接输出到 HttpServletResponse
-     *
-     * @param response HTTP 响应
-     * @param sheets   Sheet 描述列表
-     */
-    public static void exportMultiSheet(HttpServletResponse response, List<ExcelSheet<?>> sheets)
-    {
-        if (sheets == null || sheets.isEmpty())
-        {
-            return;
-        }
-        SXSSFWorkbook wb = buildWorkbook(sheets);
-        try
-        {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
-            wb.write(response.getOutputStream());
-        }
-        catch (Exception e)
-        {
-            log.error("多Sheet导出Excel异常{}", e.getMessage());
-        }
-        finally
-        {
-            IOUtils.closeQuietly(wb);
-        }
-    }
-
-    /**
-     * 构建多 Sheet Workbook —— 创建 SXSSFWorkbook 并将所有 Sheet 数据写入
-     *
-     * @param sheets Sheet 描述列表
-     * @return 已写入所有 Sheet 数据的 SXSSFWorkbook
-     */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private static SXSSFWorkbook buildWorkbook(List<ExcelSheet<?>> sheets)
-    {
-        SXSSFWorkbook wb = new SXSSFWorkbook(500);
-        for (ExcelSheet<?> excelSheet : sheets)
-        {
-            ExcelUtil util = new ExcelUtil(excelSheet.getClazz());
-            util.initWithWorkbook(wb, excelSheet.getList(), excelSheet.getSheetName(), excelSheet.getTitle());
-            util.writeSheet();
-        }
-        return wb;
-    }
-
-    /**
-     * 使用外部传入的 Workbook 初始化（多 Sheet 导出专用）
-     * 与 init() 的区别：不新建 Workbook，而是在已有 wb 上追加新 Sheet
-     *
-     * @param wb        已有工作簿
-     * @param list      数据集合
-     * @param sheetName Sheet 名称
-     * @param title     大标题（可为空）
-     */
-    public void initWithWorkbook(SXSSFWorkbook wb, List<T> list, String sheetName, String title)
-    {
-        if (list == null)
-        {
-            list = new ArrayList<T>();
-        }
-        this.list      = list;
-        this.sheetName = sheetName;
-        this.title     = title != null ? title : "";
-        this.type      = Type.EXPORT;
-        this.rownum    = 0;
-        this.wb        = wb;
-        this.sheet     = wb.createSheet(sheetName);
-        createExcelField();
-        this.styles    = createStyles(wb);
-        createTitle();
-        createSubHead();
-    }
-
     /**
      * 对list数据源将其里面的数据导入到excel表单
      *
@@ -1056,6 +980,7 @@ public class ExcelUtil<T>
     /**
      * 添加单元格
      */
+    @SuppressWarnings("deprecation")
     public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
     {
         Cell cell = null;
@@ -1328,7 +1253,7 @@ public class ExcelUtil<T>
     {
         try
         {
-            Object instance = excel.handler().newInstance();
+            Object instance = excel.handler().getDeclaredConstructor().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);
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java

@@ -7,13 +7,13 @@ import java.lang.reflect.Modifier;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.Date;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.poi.ss.usermodel.DateUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
 
 /**
  * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
@@ -310,7 +310,8 @@ public class ReflectUtils
     /**
      * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
      */
-    public static void makeAccessible(Method method)
+    @SuppressWarnings("deprecation")
+	public static void makeAccessible(Method method)
     {
         if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
                 && !method.isAccessible())
@@ -322,7 +323,8 @@ public class ReflectUtils
     /**
      * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
      */
-    public static void makeAccessible(Field field)
+    @SuppressWarnings("deprecation")
+	public static void makeAccessible(Field field)
     {
         if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
                 || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())

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 javax.validation.Constraint;
+import jakarta.validation.Constraint;
-import javax.validation.Payload;
+import jakarta.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

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 javax.validation.ConstraintValidator;
+import jakarta.validation.ConstraintValidator;
-import javax.validation.ConstraintValidatorContext;
+import jakarta.validation.ConstraintValidatorContext;
 import com.ruoyi.common.core.utils.StringUtils;
 
 /**

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 userAlias() default "";
-
-    /**
-     * 部门字段名
-     */
-    public String deptField() default "dept_id";
 
     /**
      * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来

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()))

ruoyi-common/ruoyi-common-datasource/pom.xml

@@ -20,15 +20,21 @@
         <!-- Druid -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-starter</artifactId>
+            <artifactId>druid-spring-boot-4-starter</artifactId>
             <version>${druid.version}</version>
         </dependency>
 
         <!-- Dynamic DataSource -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <artifactId>dynamic-datasource-spring-boot4-starter</artifactId>
             <version>${dynamic-ds.version}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>mybatis-spring</artifactId>
+                    <groupId>org.mybatis</groupId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
     </dependencies>

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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;

ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java

@@ -1,11 +1,10 @@
 package com.ruoyi.common.redis.configure;
 
-import org.springframework.boot.autoconfigure.AutoConfigureBefore;
-import org.springframework.boot.autoconfigure.data.redis.RedisAutoConfiguration;
 import org.springframework.cache.annotation.CachingConfigurerSupport;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
 import org.springframework.data.redis.connection.RedisConnectionFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
@@ -15,14 +14,15 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
  * 
  * @author ruoyi
  */
+@SuppressWarnings("deprecation")
 @Configuration
 @EnableCaching
-@AutoConfigureBefore(RedisAutoConfiguration.class)
 public class RedisConfig extends CachingConfigurerSupport
 {
-    @Bean
+    @Bean(name = "ruoyiRedisTemplate")
+    @Primary
     @SuppressWarnings(value = { "unchecked", "rawtypes" })
-    public RedisTemplate<Object, Object> redisTemplate(RedisConnectionFactory connectionFactory)
+    public RedisTemplate<Object, Object> ruoyiRedisTemplate(RedisConnectionFactory connectionFactory)
     {
         RedisTemplate<Object, Object> template = new RedisTemplate<>();
         template.setConnectionFactory(connectionFactory);

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java

@@ -1,6 +1,7 @@
 package com.ruoyi.common.security.annotation;
 
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.core.annotation.AliasFor;
 import java.lang.annotation.*;
 
 /**
@@ -17,6 +18,7 @@ public @interface EnableRyFeignClients
 {
     String[] value() default {};
 
+    @AliasFor(annotation = EnableFeignClients.class, attribute = "basePackages")
     String[] basePackages() default { "com.ruoyi" };
 
     Class<?>[] basePackageClasses() default {};

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java

@@ -1,7 +1,8 @@
 package com.ruoyi.common.security.config;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.json.JsonMapper;
 import java.util.TimeZone;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 
 /**
@@ -15,8 +16,11 @@ public class ApplicationConfig
      * 时区配置
      */
     @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jacksonObjectMapperCustomization()
+    public ObjectMapper objectMapper()
     {
-        return jacksonObjectMapperBuilder -> jacksonObjectMapperBuilder.timeZone(TimeZone.getDefault());
+        ObjectMapper objectMapper = JsonMapper.builder().build();
+        objectMapper.findAndRegisterModules();
+        objectMapper.setTimeZone(TimeZone.getDefault());
+        return objectMapper;
     }
 }

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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.ServletUtils;

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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;

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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import com.ruoyi.common.core.constant.SecurityConstants;

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 javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/utils/SecurityUtils.java

@@ -1,6 +1,5 @@
 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;
@@ -9,6 +8,7 @@ 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;
 
 /**
  * 权限获取工具类

ruoyi-common/ruoyi-common-swagger/pom.xml

@@ -20,13 +20,13 @@
         <!-- SpringBoot Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
         </dependency>
 
         <!-- SpringDoc webmvc -->
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
         </dependency>
 
 	</dependencies>

ruoyi-gateway/pom.xml

@@ -19,7 +19,7 @@
         <!-- SpringCloud Gateway -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway</artifactId>
+            <artifactId>spring-cloud-starter-gateway-server-webflux</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-webflux-ui</artifactId>
+            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
             <version>${springdoc.version}</version>
         </dependency>
 

ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java

@@ -2,7 +2,7 @@ package com.ruoyi.gateway;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 
 /**
  * 网关启动程序

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.AbstractSwaggerUiConfigProperties;
+import org.springdoc.core.properties.AbstractSwaggerUiConfigProperties;
-import org.springdoc.core.SwaggerUiConfigProperties;
+import org.springdoc.core.properties.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

ruoyi-gateway/src/main/java/com/ruoyi/gateway/filter/ValidateCodeFilter.java

@@ -64,6 +64,7 @@ public class ValidateCodeFilter extends AbstractGatewayFilterFactory<Object>
         };
     }
 
+    @SuppressWarnings("deprecation")
     private String resolveBodyFromRequest(ServerHttpRequest serverHttpRequest)
     {
         // 获取请求体

ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java

@@ -3,12 +3,12 @@ package com.ruoyi.gateway.handler;
 import org.springframework.cloud.gateway.support.NotFoundException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.boot.web.reactive.error.ErrorWebExceptionHandler;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.http.server.reactive.ServerHttpResponse;
 import org.springframework.web.server.ResponseStatusException;
 import org.springframework.web.server.ServerWebExchange;
+import org.springframework.web.server.WebExceptionHandler;
 import com.ruoyi.common.core.utils.ServletUtils;
 import reactor.core.publisher.Mono;
 
@@ -19,7 +19,7 @@ import reactor.core.publisher.Mono;
  */
 @Order(-1)
 @Configuration
-public class GatewayExceptionHandler implements ErrorWebExceptionHandler
+public class GatewayExceptionHandler implements WebExceptionHandler
 {
     private static final Logger log = LoggerFactory.getLogger(GatewayExceptionHandler.class);
 

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 javax.annotation.Resource;
+import jakarta.annotation.Resource;
 import javax.imageio.ImageIO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

ruoyi-gateway/src/main/resources/bootstrap.yml

@@ -18,11 +18,6 @@ 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
@@ -38,3 +33,9 @@ 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}

ruoyi-modules/ruoyi-file/pom.xml

@@ -44,13 +44,7 @@
         <!-- SpringBoot Web -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
-        </dependency>
-		
-        <!-- FastDFS -->
-        <dependency>
-            <groupId>com.github.tobato</groupId>
-            <artifactId>fastdfs-client</artifactId>
         </dependency>
         
         <!-- Minio -->

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java

@@ -2,7 +2,7 @@ package com.ruoyi.file;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
+import org.springframework.boot.jdbc.autoconfigure.DataSourceAutoConfiguration;
 
 /**
  * 文件服务

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 javax.servlet.DispatcherType;
+import jakarta.servlet.DispatcherType;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;

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 javax.servlet.Filter;
+import jakarta.servlet.Filter;
-import javax.servlet.FilterChain;
+import jakarta.servlet.FilterChain;
-import javax.servlet.FilterConfig;
+import jakarta.servlet.FilterConfig;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
-import javax.servlet.ServletRequest;
+import jakarta.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 
 /**
  * 防盗链过滤器

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/service/FastDfsSysFileServiceImpl.java

@@ -1,76 +0,0 @@
-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);
-        }
-    }
-}

ruoyi-modules/ruoyi-file/src/main/resources/bootstrap.yml

@@ -18,8 +18,9 @@ spring:
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
-        # 配置文件格式
+  config:
-        file-extension: yml
+    # 配置文件格式
-        # 共享配置
+    file-extension: yml
-        shared-configs:
+    import:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
+      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

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 javax.validation.Valid;
+import jakarta.validation.Valid;
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -64,9 +64,6 @@ public class GenTable extends BaseEntity
     @NotBlank(message = "作者不能为空")
     private String functionAuthor;
 
-    /** 表单布局（单列 双列 三列） */
-    private Integer formColNum;
-
     /** 生成代码方式（0zip压缩包 1自定义路径） */
     private String genType;
 
@@ -101,9 +98,6 @@ public class GenTable extends BaseEntity
     /** 上级菜单名称字段 */
     private String parentMenuName;
 
-    /** 是否生成详情页 */
-    private boolean isView;
-
     public Long getTableId()
     {
         return tableId;
@@ -234,16 +228,6 @@ public class GenTable extends BaseEntity
         this.functionAuthor = functionAuthor;
     }
 
-    public Integer getFormColNum()
-    {
-        return formColNum;
-    }
-
-    public void setFormColNum(Integer formColNum)
-    {
-        this.formColNum = formColNum;
-    }
-
     public String getGenType()
     {
         return genType;
@@ -354,16 +338,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);

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTableColumn.java

@@ -1,6 +1,6 @@
 package com.ruoyi.gen.domain;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 

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);
         }
     }
 

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
  */
@@ -60,7 +60,6 @@ public class VelocityUtils
         velocityContext.put("basePackage", getPackagePrefix(packageName));
         velocityContext.put("packageName", packageName);
         velocityContext.put("author", genTable.getFunctionAuthor());
-        velocityContext.put("colSpan", getColSpan(genTable.getFormColNum()));
         velocityContext.put("datetime", DateUtils.getDate());
         velocityContext.put("pkColumn", genTable.getPkColumn());
         velocityContext.put("importList", getImportList(genTable));
@@ -68,7 +67,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 +79,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 +133,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 +173,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 +252,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 +393,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;
-    }
-
     /**
      * 获取树名称
      *
@@ -470,23 +434,4 @@ public class VelocityUtils
         }
         return num;
     }
-
-    /**
-     * 获取表单 el-col span
-     * 
-     * @param formColNum 表单布局方式（1单列 2双列 3三列）
-     * @return span 数值字符串
-     */
-    public static String getColSpan(int formColNum)
-    {
-        if (formColNum == 2)
-        {
-            return "12";
-        }
-        else if (formColNum == 3)
-        {
-            return "8";
-        }
-        return "24";
-    }
 }

ruoyi-modules/ruoyi-gen/src/main/resources/bootstrap.yml

@@ -18,8 +18,9 @@ spring:
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
-        # 配置文件格式
+  config:
-        file-extension: yml
+    # 配置文件格式
-        # 共享配置
+    file-extension: yml
-        shared-configs:
+    import:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
+      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}

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>

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="businessName"   column="business_name"     />
 		<result property="functionName"   column="function_name"     />
 		<result property="functionAuthor" column="function_author"   />
-		<result property="formColNum"     column="form_col_num"      />
 		<result property="genType"        column="gen_type"          />
 		<result property="genPath"        column="gen_path"          />
 		<result property="options"        column="options"           />
@@ -56,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectGenTableVo">
-        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, form_col_num, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
+        select table_id, table_name, table_comment, sub_table_name, sub_table_fk_name, class_name, tpl_category, tpl_web_type, package_name, module_name, business_name, function_name, function_author, gen_type, gen_path, options, create_by, create_time, update_by, update_time, remark from gen_table
     </sql>
     
     <select id="selectGenTableList" parameterType="GenTable" resultMap="GenTableResult">
@@ -113,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.gen_type, t.gen_path, t.options, t.remark,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -121,7 +120,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableByName" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.gen_type, t.gen_path, t.options, t.remark,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.gen_type, t.gen_path, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -129,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</select>
 	
 	<select id="selectGenTableAll" parameterType="String" resultMap="GenTableResult">
-	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.form_col_num, t.options, t.remark,
+	    SELECT t.table_id, t.table_name, t.table_comment, t.sub_table_name, t.sub_table_fk_name, t.class_name, t.tpl_category, t.tpl_web_type, t.package_name, t.module_name, t.business_name, t.function_name, t.function_author, t.options, t.remark,
 			   c.column_id, c.column_name, c.column_comment, c.column_type, c.java_type, c.java_field, c.is_pk, c.is_increment, c.is_required, c.is_insert, c.is_edit, c.is_list, c.is_query, c.query_type, c.html_type, c.dict_type, c.sort
 		FROM gen_table t
 			 LEFT JOIN gen_table_column c ON t.table_id = c.table_id
@@ -148,7 +147,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="businessName != null and businessName != ''">business_name,</if>
 			<if test="functionName != null and functionName != ''">function_name,</if>
 			<if test="functionAuthor != null and functionAuthor != ''">function_author,</if>
-			<if test="formColNum != null">form_col_num,</if>
 			<if test="genType != null and genType != ''">gen_type,</if>
 			<if test="genPath != null and genPath != ''">gen_path,</if>
 			<if test="remark != null and remark != ''">remark,</if>
@@ -165,7 +163,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			<if test="businessName != null and businessName != ''">#{businessName},</if>
 			<if test="functionName != null and functionName != ''">#{functionName},</if>
 			<if test="functionAuthor != null and functionAuthor != ''">#{functionAuthor},</if>
-			<if test="formColNum != null">#{formColNum},</if>
 			<if test="genType != null and genType != ''">#{genType},</if>
 			<if test="genPath != null and genPath != ''">#{genPath},</if>
 			<if test="remark != null and remark != ''">#{remark},</if>
@@ -183,7 +180,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="subTableFkName != null">sub_table_fk_name = #{subTableFkName},</if>
             <if test="className != null and className != ''">class_name = #{className},</if>
             <if test="functionAuthor != null and functionAuthor != ''">function_author = #{functionAuthor},</if>
-            <if test="formColNum != null">form_col_num = #{formColNum},</if>
             <if test="genType != null and genType != ''">gen_type = #{genType},</if>
             <if test="genPath != null and genPath != ''">gen_path = #{genPath},</if>
             <if test="tplCategory != null and tplCategory != ''">tpl_category = #{tplCategory},</if>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/java/controller.java.vm

@@ -1,7 +1,7 @@
 package ${packageName}.controller;
 
 import java.util.List;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;

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,21 +164,9 @@
       </el-table-column>
     </el-table>
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -200,127 +179,100 @@
 #end
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${treeParentCode}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
+          <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
-              <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
+            placeholder="选择${comment}">
-                placeholder="选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -332,9 +284,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 +293,6 @@ export default {
   dicts: [${dicts}],
 #end
   components: {
-#if($genView)
-    ${BusinessName}ViewDrawer,
-#end
     Treeselect
   },
   data() {
@@ -502,12 +448,6 @@ export default {
         this.refreshTable = true
       })
     },
-#if($genView)
-    /** 详情按钮操作 */
-    handleViewData(row) {
-      this.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-    },
-#end
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset()

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,21 +179,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -215,121 +194,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
+            placeholder="请选择${comment}">
-                placeholder="请选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -400,15 +354,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 +493,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 +590,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() {

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,21 +143,9 @@
       </el-table-column>
     </el-table>
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -173,134 +158,107 @@
 #end
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${treeParentCode}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
+          <el-tree-select
-              <el-tree-select
+            v-model="form.${treeParentCode}"
-                v-model="form.${treeParentCode}"
+            :data="${businessName}Options"
-                :data="${businessName}Options"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
-                :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
-                value-key="${treeCode}"
+            placeholder="请选择${comment}"
-                placeholder="请选择${comment}"
+            check-strictly
-                check-strictly
+          />
-              />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
-                placeholder="选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -314,14 +272,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 +299,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 +356,13 @@ function getTreeselect() {
   })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -459,13 +414,6 @@ function toggleExpandAll() {
     refreshTable.value = true
   })
 }
-#if($genView)
-
-/** 详情按钮操作 */
-function handleViewData(row) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-#end
 
 /** 修改按钮操作 */
 async function handleUpdate(row) {
@@ -496,13 +444,13 @@ function submitForm() {
 #end
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
+        update${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(() => {
+        add${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()

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,21 +162,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -192,121 +177,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+            placeholder="请选择${comment}">
-                placeholder="请选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -317,13 +277,9 @@
             <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
           </el-col>
         </el-row>
-        <el-table :data="${subclassName}List" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" width="60">
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
-            <template #default="{ $index }">
-              {{ $index + 1 }}
-            </template>
-          </el-table-column>
 #foreach($column in $subTable.columns)
 #set($javaField=$column.javaField)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -388,14 +344,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 +380,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 +428,13 @@ function getList() {
   })
 }
 
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -516,7 +469,7 @@ function resetQuery() {
   handleQuery()
 }
 
-/** 多选框选中数据 */
+// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.${pkColumn.javaField})
   single.value = selection.length != 1
@@ -562,13 +515,13 @@ function submitForm() {
       form.value.${subclassName}List = ${subclassName}List.value
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
+        update${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(() => {
+        add${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -590,13 +543,18 @@ function handleDelete(row) {
 }
 
 #if($table.sub)
+/** ${subTable.functionName}序号 */
+function row${subClassName}Index({ row, rowIndex }) {
+  row.index = rowIndex + 1
+}
+
 /** ${subTable.functionName}添加按钮操作 */
 function handleAdd${subClassName}() {
   let obj = {}
 #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 +578,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() {

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>

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,21 +143,9 @@
       </el-table-column>
     </el-table>
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -173,134 +158,107 @@
 #end
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${treeParentCode}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
+          <el-tree-select
-              <el-tree-select
+            v-model="form.${treeParentCode}"
-                v-model="form.${treeParentCode}"
+            :data="${businessName}Options"
-                :data="${businessName}Options"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
-                :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
-                value-key="${treeCode}"
+            placeholder="请选择${comment}"
-                placeholder="请选择${comment}"
+            check-strictly
-                check-strictly
+          />
-              />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
-                placeholder="选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -314,16 +272,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 +358,13 @@ function getTreeselect() {
   })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -461,13 +416,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}) {

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,21 +162,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -192,121 +177,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+            placeholder="请选择${comment}">
-                placeholder="请选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -386,21 +346,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 +437,13 @@ function getList() {
   })
 }
 
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -521,7 +478,7 @@ function resetQuery() {
   handleQuery()
 }
 
-/** 多选框选中数据 */
+// 多选框选中数据
 function handleSelectionChange(selection: ${ClassName}[]) {
   ids.value = selection.map(item => item.${pkColumn.javaField})
   single.value = selection.length != 1
@@ -625,13 +582,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() {

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>

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>

ruoyi-modules/ruoyi-job/pom.xml

@@ -43,14 +43,8 @@
         
         <!-- Quartz -->
         <dependency>
-            <groupId>org.quartz-scheduler</groupId>
+            <groupId>org.springframework.boot</groupId>
-            <artifactId>quartz</artifactId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.mchange</groupId>
-                    <artifactId>c3p0</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         
         <!-- Mysql Connector -->

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.quartz.SchedulerException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;

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 javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonFormat;

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 javax.annotation.PostConstruct;
+import jakarta.annotation.PostConstruct;
 import org.quartz.JobDataMap;
 import org.quartz.JobKey;
 import org.quartz.Scheduler;

ruoyi-modules/ruoyi-job/src/main/resources/bootstrap.yml

@@ -18,8 +18,9 @@ spring:
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
-        # 配置文件格式
+  config:
-        file-extension: yml
+    # 配置文件格式
-        # 共享配置
+    file-extension: yml
-        shared-configs:
+    import:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
+      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;

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);
-    }
-
     /**
      * 删除通知公告
      */

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

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 javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;

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 javax.servlet.http.HttpServletResponse;
+import jakarta.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)
     {

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysConfig.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.domain;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;

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 javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.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;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysNotice.java

@@ -1,7 +1,7 @@
 package com.ruoyi.system.domain;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fasterxml.jackson.annotation.JsonProperty;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -1,8 +1,8 @@
 package com.ruoyi.system.domain;
 
-import javax.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import jakarta.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import jakarta.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;