自动导入配置

代码生成修改拖拽时显示手指样式
用户列表新增抽屉效果详细信息
2026-04-26 09:17:52 +08:00 · 2026-04-10 16:37:46 +08:00 · 2026-04-10 16:36:27 +08:00 · 2026-04-09 14:13:45 +08:00 · 2026-04-03 22:34:22 +08:00 · 2026-04-03 15:40:56 +08:00
62 changed files with 708 additions and 1635 deletions
--- a/README.md
+++ b/README.md
@@ -13,8 +13,8 @@

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

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

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

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

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

--- a/pom.xml
+++ b/pom.xml
@@ -17,14 +17,14 @@
        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
        <java.version>17</java.version>
-        <spring-boot.version>3.5.11</spring-boot.version>
-        <spring-cloud.version>2025.0.1</spring-cloud.version>
-        <spring-cloud-alibaba.version>2025.0.0.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>3.5.8</spring-boot-admin.version>
-        <mybatis-spring.version>3.0.5</mybatis-spring.version>
+        <spring-boot.version>4.0.3</spring-boot.version>
+        <spring-cloud.version>2025.1.0</spring-cloud.version>
+        <spring-cloud-alibaba.version>2025.1.0.0</spring-cloud-alibaba.version>
+        <spring-boot-admin.version>4.0.2</spring-boot-admin.version>
+        <mybatis-spring-boot.version>4.0.1</mybatis-spring-boot.version>
        <kaptcha.version>2.3.3</kaptcha.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.5.0</dynamic-ds.version>
        <commons.io.version>2.21.0</commons.io.version>
        <velocity.version>2.3</velocity.version>
@@ -32,7 +32,7 @@
        <jjwt.version>0.9.1</jjwt.version>
        <minio.version>8.2.2</minio.version>
        <poi.version>4.1.2</poi.version>
-        <springdoc.version>2.8.16</springdoc.version>
+        <springdoc.version>3.0.2</springdoc.version>
        <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
    </properties>

@@ -95,9 +95,9 @@
            </dependency>

            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-spring</artifactId>
-                <version>${mybatis-spring.version}</version>
+                <groupId>org.mybatis.spring.boot</groupId>
+                <artifactId>mybatis-spring-boot-starter</artifactId>
+                <version>${mybatis-spring-boot.version}</version>
            </dependency>

            <!-- io常用工具类 -->
--- a/ruoyi-auth/pom.xml
+++ b/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 -->
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/RuoYiAuthApplication.java
+++ b/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;

 /**
--- a/ruoyi-common/ruoyi-common-core/pom.xml
+++ b/ruoyi-common/ruoyi-common-core/pom.xml
@@ -55,8 +55,8 @@

        <!-- Mybatis Spring -->
        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
+            <groupId>org.mybatis.spring.boot</groupId>
+            <artifactId>mybatis-spring-boot-starter</artifactId>
        </dependency>

        <!-- Hibernate Validator -->
@@ -68,7 +68,7 @@
        <!-- Spring Aop -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
+            <artifactId>spring-boot-starter-aspectj</artifactId>
        </dependency>

        <!-- Jackson -->
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java
@@ -31,9 +31,6 @@ public class GenConstants
    /** 上级菜单名称字段 */
    public static final String PARENT_MENU_NAME = "parentMenuName";

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

--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/StringUtils.java
+++ b/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;
@@ -367,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)
    {
@@ -393,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);
+    }
+
    /**
     * 驼峰转下划线命名
     */
@@ -464,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
     * 
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/reflect/ReflectUtils.java
@@ -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过的真实类等工具函数.
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java
@@ -7,12 +7,17 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.ruoyi.common.core.constant.HttpStatus;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.PageUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.sql.SqlUtil;
 import com.ruoyi.common.core.web.domain.AjaxResult;
+import com.ruoyi.common.core.web.page.PageDomain;
 import com.ruoyi.common.core.web.page.TableDataInfo;
+import com.ruoyi.common.core.web.page.TableSupport;

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

+    /**
+     * 设置请求排序数据
+     */
+    protected void startOrderBy()
+    {
+        PageDomain pageDomain = TableSupport.buildPageRequest();
+        if (StringUtils.isNotEmpty(pageDomain.getOrderBy()))
+        {
+            String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy());
+            PageHelper.orderBy(orderBy);
+        }
+    }
+
    /**
     * 清理分页的线程变量
     */
--- a/ruoyi-common/ruoyi-common-datasource/pom.xml
+++ b/ruoyi-common/ruoyi-common-datasource/pom.xml
@@ -20,15 +20,21 @@
        <!-- Druid -->
        <dependency>
            <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-3-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-boot3-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>
--- a/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
+++ b/ruoyi-common/ruoyi-common-redis/src/main/java/com/ruoyi/common/redis/configure/RedisConfig.java
@@ -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,15 +14,15 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 * 
 * @author ruoyi
 */
+@SuppressWarnings("deprecation")
@Configuration
@EnableCaching
-@AutoConfigureBefore(RedisAutoConfiguration.class)
-@SuppressWarnings("deprecation")
 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);
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/EnableRyFeignClients.java
+++ b/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 {};
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/config/ApplicationConfig.java
+++ b/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;
    }
 }
--- a/ruoyi-common/ruoyi-common-swagger/pom.xml
+++ b/ruoyi-common/ruoyi-common-swagger/pom.xml
@@ -20,7 +20,7 @@
        <!-- SpringBoot Web -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
        </dependency>

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

 import java.util.ArrayList;
 import java.util.List;
-import org.springdoc.core.configuration.SpringDocConfiguration;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
@@ -21,7 +19,6 @@ import io.swagger.v3.oas.models.servers.Server;
 *
 * @author ruoyi
 */
-@AutoConfiguration(before = SpringDocConfiguration.class)
@EnableConfigurationProperties(SpringDocProperties.class)
@ConditionalOnProperty(name = "springdoc.api-docs.enabled", havingValue = "true", matchIfMissing = true)
 public class SpringDocAutoConfiguration
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/RuoYiGatewayApplication.java
+++ b/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;

 /**
 * 网关启动程序
--- a/ruoyi-gateway/src/main/java/com/ruoyi/gateway/handler/GatewayExceptionHandler.java
+++ b/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);

--- a/ruoyi-modules/ruoyi-file/pom.xml
+++ b/ruoyi-modules/ruoyi-file/pom.xml
@@ -44,7 +44,7 @@
        <!-- SpringBoot Web -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
        </dependency>
        
        <!-- Minio -->
--- a/ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/RuoYiFileApplication.java
+++ b/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;

 /**
 * 文件服务
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/domain/GenTable.java
@@ -101,9 +101,6 @@ public class GenTable extends BaseEntity
    /** 上级菜单名称字段 */
    private String parentMenuName;

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

-    public boolean isView()
-    {
-        return isView;
-    }
-
-    public void setView(boolean isView)
-    {
-        this.isView = isView;
-    }
-
    public boolean isSub()
    {
        return isSub(this.tplCategory);
--- a/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
+++ b/ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java
@@ -209,7 +209,7 @@ public class GenTableServiceImpl implements IGenTableService
        VelocityContext context = VelocityUtils.prepareContext(table);

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

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

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

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

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

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

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

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

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

-    /**
-     * 扩展功能/生成详情页
-     * 
-     * @param paramsObj 生成其他选项
-     * @return 是否生成详细页
-     */
-    public static boolean genView(JSONObject paramsObj)
-    {
-        if (StringUtils.isNotNull(paramsObj) && paramsObj.containsKey(GenConstants.GEN_VIEW))
-        {
-            return paramsObj.getBoolean(GenConstants.GEN_VIEW);
-        }
-        return false;
-    }
-
    /**
     * 获取树名称
     *
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml
@@ -94,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <set>
            <if test="columnComment != null">column_comment = #{columnComment},</if>
            <if test="javaType != null">java_type = #{javaType},</if>
-            <if test="columnType != null">column_type = #{columnType},</if>
            <if test="javaField != null">java_field = #{javaField},</if>
            <if test="isInsert != null">is_insert = #{isInsert},</if>
            <if test="isEdit != null">is_edit = #{isEdit},</if>
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -139,15 +139,6 @@
 #end
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-#if($genView)
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleViewData(scope.row)"
-            v-hasPermi="['${permissionPrefix}:query']"
-          >详情</el-button>
-#end
          <el-button
            size="mini"
            type="text"
@@ -173,10 +164,6 @@
      </el-table-column>
    </el-table>

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

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

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

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

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

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

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

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

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

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

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

 <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} != '')
@@ -427,7 +417,7 @@ const data = reactive({
    pageSize: 10,
    #foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
  },
@@ -475,13 +465,13 @@ function getList() {
  })
 }

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

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

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

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

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

 <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'

@@ -403,13 +393,13 @@ function getTreeselect() {
  })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
  open.value = false
  reset()
 }

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

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

-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
    <!-- 添加或修改${functionName}对话框 -->
 #if($table.formColNum == 2)
 #set($dialogWidth = "800px")
@@ -386,16 +379,13 @@
  </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} != '')
@@ -480,13 +470,13 @@ function getList() {
  })
 }

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

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

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

-#end
-#if($genView)
-/** 详情按钮操作 */
-function handleViewData(row: ${ClassName}) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-
 #end
 /** 导出按钮操作 */
 function handleExport() {
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/view.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/view.vue.vm
@@ -1,84 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" v-model="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#elseif($column.htmlType == "imageUpload")
-              <image-preview :src="info.${javaField}" :width="60" :height="60" />
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script setup lang="ts" name="${BusinessName}ViewDrawer">
-import type { ${ClassName} } from "@/types/api/${moduleName}/${businessName}"
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const visible = ref<boolean>(false)
-const loading = ref<boolean>(false)
-const info = reactive<Partial<${ClassName}>>({})
-
-const open = async (#if($pkColumn.javaType == "Long" || $pkColumn.javaType == "Integer")${pkColumn.javaField}: number#else${pkColumn.javaField}: string#end): Promise<void> => {
-  visible.value = true
-  loading.value = true
-  try {
-    const res = await get${BusinessName}(${pkColumn.javaField})
-    Object.assign(info, res.data ?? {})
-  } catch (error) {
-    console.error('获取${functionName}信息失败:', error)
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleClose = (): void => {
-  visible.value = false
-  Object.keys(info).forEach(key => delete (info as any)[key])
-}
-
-defineExpose({ open })
-</script>
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/view.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/view.vue.vm
@@ -1,86 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" :visible.sync="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" custom-class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="dict.type.${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="dict.type.${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script>
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-
-export default {
-  name: '${BusinessName}ViewDrawer',
-#foreach($column in $columns)
-#if("" != $column.dictType)
-#set($hasDicts = true)
-#break
-#end
-#end
-#if($hasDicts)
-  dicts: [#foreach($column in $columns)#if("" != $column.dictType)'${column.dictType}'#if($foreach.hasNext), #end#end#end],
-#end
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      info: {}
-    }
-  },
-  methods: {
-    open(${pkColumn.javaField}) {
-      this.visible = true
-      this.loading = true
-      get${BusinessName}(${pkColumn.javaField}).then(res => {
-        this.info = res.data || {}
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleClose() {
-      this.visible = false
-    }
-  }
-}
-</script>
--- a/ruoyi-modules/ruoyi-job/pom.xml
+++ b/ruoyi-modules/ruoyi-job/pom.xml
@@ -43,14 +43,8 @@
        
        <!-- Quartz -->
        <dependency>
-            <groupId>org.quartz-scheduler</groupId>
-            <artifactId>quartz</artifactId>
-            <exclusions>
-                <exclusion>
-                    <groupId>com.mchange</groupId>
-                    <artifactId>c3p0</artifactId>
-                </exclusion>
-            </exclusions>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-quartz</artifactId>
        </dependency>
        
        <!-- Mysql Connector -->
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysNoticeController.java
@@ -54,6 +54,7 @@ public class SysNoticeController extends BaseController
    /**
     * 根据通知公告编号获取详细信息
     */
+    @RequiresPermissions("system:notice:query")
    @GetMapping(value = "/{noticeId}")
    public AjaxResult getInfo(@PathVariable Long noticeId)
    {
@@ -124,19 +125,6 @@ public class SysNoticeController extends BaseController
        return success();
    }

-    /**
-     * 已读用户列表数据
-     */
-    @RequiresPermissions("system:notice:list")
-    @GetMapping("/readUsers/list")
-    @ResponseBody
-    public TableDataInfo readUsersList(Long noticeId, String searchValue)
-    {
-        startPage();
-        List<?> list = noticeReadService.selectReadUsersByNoticeId(noticeId, searchValue);
-        return getDataTable(list);
-    }
-
    /**
     * 删除通知公告
     */
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -189,18 +189,11 @@ public class SysUserController extends BaseController
        ajax.put("user", user);
        ajax.put("roles", roles);
        ajax.put("permissions", permissions);
-        ajax.put("pwdChrtype", getSysAccountChrtype());
        ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
        ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
        return ajax;
    }

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

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

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

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

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

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

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

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

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

-    /**
-     * 查询已阅读某公告的用户列表
-     */
-    @Override
-    public List<Map<String, Object>> selectReadUsersByNoticeId(Long noticeId, String searchValue)
-    {
-        return noticeReadMapper.selectReadUsersByNoticeId(noticeId, searchValue);
-    }
-
    /**
     * 删除公告时清理对应已读记录
     */
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysNoticeReadMapper.xml
@@ -63,26 +63,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        </foreach>
    </delete>

-    <!-- 查询已阅读某公告的用户列表，支持按登录名/用户名模糊筛选 -->
-    <select id="selectReadUsersByNoticeId" resultType="java.util.Map">
-        select
-            u.user_id      as userId,
-            u.user_name    as userName,
-            u.nick_name    as nickName,
-            d.dept_name    as deptName,
-            u.phonenumber  as phonenumber,
-            r.read_time    as readTime
-        from sys_notice_read r
-        inner join sys_user u on u.user_id = r.user_id and u.del_flag = '0'
-        left join sys_dept d on d.dept_id = u.dept_id
-        where r.notice_id = #{noticeId}
-        <if test="searchValue != null and searchValue != ''">
-            and (
-                u.user_name like concat('%', #{searchValue}, '%')
-                or u.nick_name like concat('%', #{searchValue}, '%')
-            )
-        </if>
-        order by r.read_time desc
-    </select>
-
 </mapper>
--- a/ruoyi-ui/src/api/system/notice.js
+++ b/ruoyi-ui/src/api/system/notice.js
@@ -68,12 +68,3 @@ export function markNoticeReadAll(ids) {
    params: { ids }
  })
 }
-
-// 查询公告已读用户列表
-export function listNoticeReadUsers(query) {
-  return request({
-    url: '/system/notice/readUsers/list',
-    method: 'get',
-    params: query
-  })
-}
--- a/ruoyi-ui/src/components/ThemePicker/index.vue
+++ b/ruoyi-ui/src/components/ThemePicker/index.vue
@@ -1,170 +1,170 @@
-<template>
-  <el-color-picker
-    v-model="theme"
-    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
-    class="theme-picker"
-    popper-class="theme-picker-dropdown"
-  />
-</template>
-
-<script>
-const ORIGINAL_THEME = '#409EFF' // default color
-
-export default {
-  data() {
-    return {
-      chalk: '', // content of theme-chalk css
-      theme: ''
-    }
-  },
-  computed: {
-    defaultTheme() {
-      return this.$store.state.settings.theme
-    }
-  },
-  watch: {
-    defaultTheme: {
-      handler: function(val, oldVal) {
-        this.theme = val
-      },
-      immediate: true
-    },
-    async theme(val) {
-      await this.setTheme(val)
-    }
-  },
-  created() {
-    if(this.defaultTheme !== ORIGINAL_THEME) {
-      this.setTheme(this.defaultTheme)
-    }
-  },
-  methods: {
-    async setTheme(val) {
-      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
-      if (typeof val !== 'string') return
-      const themeCluster = this.getThemeCluster(val.replace('#', ''))
-      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
-
-      const getHandler = (variable, id) => {
-        return () => {
-          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
-          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
-
-          let styleTag = document.getElementById(id)
-          if (!styleTag) {
-            styleTag = document.createElement('style')
-            styleTag.setAttribute('id', id)
-            document.head.appendChild(styleTag)
-          }
-          styleTag.innerText = newStyle
-        }
-      }
-
-      if (!this.chalk) {
-        const url = `/styles/theme-chalk/index.css`
-        await this.getCSSString(url, 'chalk')
-      }
-
-      const chalkHandler = getHandler('chalk', 'chalk-style')
-      chalkHandler()
-
-      const styles = [].slice.call(document.querySelectorAll('style'))
-        .filter(style => {
-          const text = style.innerText
-          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
-        })
-      styles.forEach(style => {
-        const { innerText } = style
-        if (typeof innerText !== 'string') return
-        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
-      })
-
-      this.$emit('change', val)
-    },
-
-    updateStyle(style, oldCluster, newCluster) {
-      let newStyle = style
-      oldCluster.forEach((color, index) => {
-        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
-      })
-      return newStyle
-    },
-
-    getCSSString(url, variable) {
-      return new Promise(resolve => {
-        const xhr = new XMLHttpRequest()
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState === 4 && xhr.status === 200) {
-            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
-            resolve()
-          }
-        }
-        xhr.open('GET', url)
-        xhr.send()
-      })
-    },
-
-    getThemeCluster(theme) {
-      const tintColor = (color, tint) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        if (tint === 0) { // when primary color is in its rgb space
-          return [red, green, blue].join(',')
-        } else {
-          red += Math.round(tint * (255 - red))
-          green += Math.round(tint * (255 - green))
-          blue += Math.round(tint * (255 - blue))
-
-          red = red.toString(16)
-          green = green.toString(16)
-          blue = blue.toString(16)
-
-          return `#${red}${green}${blue}`
-        }
-      }
-
-      const shadeColor = (color, shade) => {
-        let red = parseInt(color.slice(0, 2), 16)
-        let green = parseInt(color.slice(2, 4), 16)
-        let blue = parseInt(color.slice(4, 6), 16)
-
-        red = Math.round((1 - shade) * red)
-        green = Math.round((1 - shade) * green)
-        blue = Math.round((1 - shade) * blue)
-
-        red = red.toString(16)
-        green = green.toString(16)
-        blue = blue.toString(16)
-
-        return `#${red}${green}${blue}`
-      }
-
-      const clusters = [theme]
-      for (let i = 0; i <= 9; i++) {
-        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
-      }
-      clusters.push(shadeColor(theme, 0.1))
-      return clusters
-    }
-  }
-}
-</script>
-
-<style>
-.theme-message,
-.theme-picker-dropdown {
-  z-index: 99999 !important;
-}
-
-.theme-picker .el-color-picker__trigger {
-  height: 26px !important;
-  width: 26px !important;
-  padding: 2px;
-}
-
-.theme-picker-dropdown .el-color-dropdown__link-btn {
-  display: none;
-}
-</style>
+<template>
+  <el-color-picker
+    v-model="theme"
+    :predefine="['#409EFF', '#1890ff', '#304156','#212121','#11a983', '#13c2c2', '#6959CD', '#f5222d', ]"
+    class="theme-picker"
+    popper-class="theme-picker-dropdown"
+  />
+</template>
+
+<script>
+const ORIGINAL_THEME = '#409EFF' // default color
+
+export default {
+  data() {
+    return {
+      chalk: '', // content of theme-chalk css
+      theme: ''
+    }
+  },
+  computed: {
+    defaultTheme() {
+      return this.$store.state.settings.theme
+    }
+  },
+  watch: {
+    defaultTheme: {
+      handler: function(val, oldVal) {
+        this.theme = val
+      },
+      immediate: true
+    },
+    async theme(val) {
+      await this.setTheme(val)
+    }
+  },
+  created() {
+    if(this.defaultTheme !== ORIGINAL_THEME) {
+      this.setTheme(this.defaultTheme)
+    }
+  },
+  methods: {
+    async setTheme(val) {
+      const oldVal = this.chalk ? this.theme : ORIGINAL_THEME
+      if (typeof val !== 'string') return
+      const themeCluster = this.getThemeCluster(val.replace('#', ''))
+      const originalCluster = this.getThemeCluster(oldVal.replace('#', ''))
+
+      const getHandler = (variable, id) => {
+        return () => {
+          const originalCluster = this.getThemeCluster(ORIGINAL_THEME.replace('#', ''))
+          const newStyle = this.updateStyle(this[variable], originalCluster, themeCluster)
+
+          let styleTag = document.getElementById(id)
+          if (!styleTag) {
+            styleTag = document.createElement('style')
+            styleTag.setAttribute('id', id)
+            document.head.appendChild(styleTag)
+          }
+          styleTag.innerText = newStyle
+        }
+      }
+
+      if (!this.chalk) {
+        const url = `/styles/theme-chalk/index.css`
+        await this.getCSSString(url, 'chalk')
+      }
+
+      const chalkHandler = getHandler('chalk', 'chalk-style')
+      chalkHandler()
+
+      const styles = [].slice.call(document.querySelectorAll('style'))
+        .filter(style => {
+          const text = style.innerText
+          return new RegExp(oldVal, 'i').test(text) && !/Chalk Variables/.test(text)
+        })
+      styles.forEach(style => {
+        const { innerText } = style
+        if (typeof innerText !== 'string') return
+        style.innerText = this.updateStyle(innerText, originalCluster, themeCluster)
+      })
+
+      this.$emit('change', val)
+    },
+
+    updateStyle(style, oldCluster, newCluster) {
+      let newStyle = style
+      oldCluster.forEach((color, index) => {
+        newStyle = newStyle.replace(new RegExp(color, 'ig'), newCluster[index])
+      })
+      return newStyle
+    },
+
+    getCSSString(url, variable) {
+      return new Promise(resolve => {
+        const xhr = new XMLHttpRequest()
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState === 4 && xhr.status === 200) {
+            this[variable] = xhr.responseText.replace(/@font-face{[^}]+}/, '')
+            resolve()
+          }
+        }
+        xhr.open('GET', url)
+        xhr.send()
+      })
+    },
+
+    getThemeCluster(theme) {
+      const tintColor = (color, tint) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        if (tint === 0) { // when primary color is in its rgb space
+          return [red, green, blue].join(',')
+        } else {
+          red += Math.round(tint * (255 - red))
+          green += Math.round(tint * (255 - green))
+          blue += Math.round(tint * (255 - blue))
+
+          red = red.toString(16)
+          green = green.toString(16)
+          blue = blue.toString(16)
+
+          return `#${red}${green}${blue}`
+        }
+      }
+
+      const shadeColor = (color, shade) => {
+        let red = parseInt(color.slice(0, 2), 16)
+        let green = parseInt(color.slice(2, 4), 16)
+        let blue = parseInt(color.slice(4, 6), 16)
+
+        red = Math.round((1 - shade) * red)
+        green = Math.round((1 - shade) * green)
+        blue = Math.round((1 - shade) * blue)
+
+        red = red.toString(16)
+        green = green.toString(16)
+        blue = blue.toString(16)
+
+        return `#${red}${green}${blue}`
+      }
+
+      const clusters = [theme]
+      for (let i = 0; i <= 9; i++) {
+        clusters.push(tintColor(theme, Number((i / 10).toFixed(2))))
+      }
+      clusters.push(shadeColor(theme, 0.1))
+      return clusters
+    }
+  }
+}
+</script>
+
+<style>
+.theme-message,
+.theme-picker-dropdown {
+  z-index: 99999 !important;
+}
+
+.theme-picker .el-color-picker__trigger {
+  height: 26px !important;
+  width: 26px !important;
+  padding: 2px;
+}
+
+.theme-picker-dropdown .el-color-dropdown__link-btn {
+  display: none;
+}
+</style>
--- a/ruoyi-ui/src/layout/components/HeaderNotice/DetailView.vue
+++ b/ruoyi-ui/src/layout/components/HeaderNotice/DetailView.vue
@@ -1,362 +0,0 @@
-<template>
-  <el-drawer title="公告详情" :visible.sync="visible" direction="rtl" size="50%" append-to-body :before-close="handleClose" custom-class="notice-detail-drawer">
-    <div v-loading="loading" class="notice-detail-drawer__body">
-      <div v-if="!detail" class="notice-empty">
-        <i class="el-icon-document"></i>
-        <span>暂无数据</span>
-      </div>
-      <div v-else class="notice-page">
-        <div class="notice-type-wrap">
-          <span v-if="detail.noticeType === '1'" class="notice-type-tag type-notify">
-            <i class="el-icon-bell"></i> 通知
-          </span>
-          <span v-else-if="detail.noticeType === '2'" class="notice-type-tag type-announce">
-            <i class="el-icon-message"></i> 公告
-          </span>
-          <span v-else class="notice-type-tag type-notify">
-            <i class="el-icon-document"></i> 消息
-          </span>
-        </div>
-
-        <h1 class="notice-title">{{ detail.noticeTitle }}</h1>
-
-        <div class="notice-meta">
-          <span class="meta-item">
-            <i class="el-icon-user"></i>
-            <span>{{ detail.createBy || '—' }}</span>
-          </span>
-          <span class="meta-item">
-            <i class="el-icon-time"></i>
-            <span>{{ detail.createTime || '—' }}</span>
-          </span>
-          <span class="meta-item">
-            <span :class="['status-dot', isStatusNormal ? 'status-ok' : 'status-off']"></span>
-            <span>{{ isStatusNormal ? '正常' : '已关闭' }}</span>
-          </span>
-        </div>
-
-        <div class="notice-divider">
-          <span class="notice-divider-dot"></span>
-          <span class="notice-divider-dot"></span>
-          <span class="notice-divider-dot"></span>
-        </div>
-
-        <div class="notice-body">
-          <div v-if="hasContent" class="notice-content" v-html="detail.noticeContent" />
-          <div v-else class="notice-empty notice-empty--inner">
-            <i class="el-icon-document"></i> 暂无内容
-          </div>
-        </div>
-      </div>
-    </div>
-  </el-drawer>
-</template>
-
-<script>
-import { getNotice } from '@/api/system/notice'
-
-export default {
-  name: 'NoticeDetailView',
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      detail: null
-    }
-  },
-  computed: {
-    isStatusNormal() {
-      const s = this.detail && this.detail.status
-      return s === '0' || s === 0
-    },
-    hasContent() {
-      const c = this.detail && this.detail.noticeContent
-      return c != null && String(c).trim() !== ''
-    }
-  },
-  methods: {
-    open(payload) {
-      let id = null
-      let preset = null
-      if (payload != null && typeof payload === 'object') {
-        id = payload.noticeId
-        if (payload.noticeContent != null) {
-          preset = payload
-        }
-      } else {
-        id = payload
-      }
-      this.visible = true
-      if (preset) {
-        this.detail = preset
-        return
-      }
-      if (id == null || id === '') {
-        this.detail = null
-        return
-      }
-      this.loading = true
-      this.detail = null
-      getNotice(id).then(res => {
-        this.detail = res.data
-      }).catch(() => {
-        this.detail = null
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleClose() {
-      this.visible = false
-      this.detail = null
-      this.loading = false
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.notice-page {
-  max-width: 760px;
-  margin: 0 auto;
-  padding: 8px 8px 20px;
-  animation: notice-fade-up 0.28s ease both;
-}
-
-@keyframes notice-fade-up {
-  from {
-    opacity: 0;
-    transform: translateY(14px);
-  }
-  to {
-    opacity: 1;
-    transform: translateY(0);
-  }
-}
-
-.notice-type-tag {
-  display: inline-flex;
-  align-items: center;
-  gap: 5px;
-  padding: 3px 12px;
-  border-radius: 2px;
-  font-size: 11px;
-  font-weight: 700;
-  letter-spacing: 1px;
-  text-transform: uppercase;
-  margin-bottom: 14px;
-}
-
-.type-notify {
-  background: #fff8e6;
-  color: #b7791f;
-  border-left: 3px solid #d97706;
-}
-
-.type-announce {
-  background: #e8f5e9;
-  color: #276749;
-  border-left: 3px solid #38a169;
-}
-
-.notice-title {
-  font-size: 22px;
-  font-weight: 700;
-  color: #1a202c;
-  line-height: 1.45;
-  margin: 0 0 16px;
-  letter-spacing: -0.2px;
-}
-
-.notice-meta {
-  display: flex;
-  align-items: center;
-  flex-wrap: wrap;
-  gap: 16px;
-  padding: 12px 0;
-  border-top: 1px solid #e9ecef;
-  border-bottom: 1px solid #e9ecef;
-  margin-bottom: 28px;
-}
-
-.meta-item {
-  display: flex;
-  align-items: center;
-  gap: 5px;
-  font-size: 12px;
-  color: #718096;
-}
-
-.meta-item i {
-  font-size: 12px;
-  color: #a0aec0;
-}
-
-.status-dot {
-  display: inline-block;
-  width: 7px;
-  height: 7px;
-  border-radius: 50%;
-  margin-right: 4px;
-}
-
-.status-ok {
-  background: #38a169;
-}
-
-.status-off {
-  background: #e53e3e;
-}
-
-.notice-divider {
-  display: flex;
-  align-items: center;
-  gap: 12px;
-  margin-bottom: 24px;
-}
-
-.notice-divider::before,
-.notice-divider::after {
-  content: '';
-  flex: 1;
-  height: 1px;
-  background: linear-gradient(to right, transparent, #dee2e6, transparent);
-}
-
-.notice-divider-dot {
-  width: 6px;
-  height: 6px;
-  border-radius: 50%;
-  background: #cbd5e0;
-}
-
-.notice-body {
-  background: #fff;
-  border-radius: 6px;
-  padding: 28px 32px;
-  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06), 0 0 0 1px rgba(0, 0, 0, 0.04);
-  min-height: 120px;
-}
-
-.notice-content {
-  font-size: 14px;
-  line-height: 1.85;
-  color: #2d3748;
-  word-break: break-word;
-}
-
-.notice-content ::v-deep p {
-  margin: 0 0 1em;
-}
-
-.notice-content ::v-deep h1,
-.notice-content ::v-deep h2,
-.notice-content ::v-deep h3 {
-  font-weight: 700;
-  color: #1a202c;
-  margin: 1.4em 0 0.6em;
-}
-
-.notice-content ::v-deep h1 {
-  font-size: 18px;
-}
-
-.notice-content ::v-deep h2 {
-  font-size: 16px;
-}
-
-.notice-content ::v-deep h3 {
-  font-size: 14px;
-}
-
-.notice-content ::v-deep a {
-  color: #3182ce;
-  text-decoration: underline;
-}
-
-.notice-content ::v-deep a:hover {
-  color: #2b6cb0;
-}
-
-.notice-content ::v-deep img {
-  max-width: 100%;
-  border-radius: 4px;
-  margin: 8px 0;
-}
-
-.notice-content ::v-deep ul,
-.notice-content ::v-deep ol {
-  padding-left: 20px;
-  margin: 0 0 1em;
-}
-
-.notice-content ::v-deep li {
-  margin-bottom: 4px;
-}
-
-.notice-content ::v-deep blockquote {
-  border-left: 3px solid #cbd5e0;
-  margin: 1em 0;
-  padding: 6px 16px;
-  color: #718096;
-  background: #f7fafc;
-}
-
-.notice-content ::v-deep table {
-  border-collapse: collapse;
-  width: 100%;
-  margin: 1em 0;
-  font-size: 13px;
-}
-
-.notice-content ::v-deep table th,
-.notice-content ::v-deep table td {
-  border: 1px solid #e2e8f0;
-  padding: 7px 12px;
-}
-
-.notice-content ::v-deep table th {
-  background: #f7fafc;
-  font-weight: 600;
-}
-
-.notice-empty {
-  text-align: center;
-  padding: 40px 0;
-  color: #a0aec0;
-  font-size: 13px;
-}
-
-.notice-empty i {
-  font-size: 28px;
-  display: block;
-  margin-bottom: 10px;
-}
-
-.notice-empty--inner {
-  padding: 32px 0;
-}
-
-.notice-empty--inner i {
-  font-size: 28px;
-}
-
-::v-deep .notice-detail-drawer {
-  .el-drawer__header {
-    margin-bottom: 0;
-    padding: 16px 20px;
-    border-bottom: 1px solid #ebeef5;
-    font-size: 16px;
-    font-weight: 600;
-    color: #303133;
-  }
-  .el-drawer__body {
-    background: #f5f6f8;
-  }
-}
-
-.notice-detail-drawer__body {
-  height: 100%;
-  overflow: auto;
-  padding: 10px 16px 22px;
-}
-</style>
--- a/ruoyi-ui/src/layout/components/HeaderNotice/index.vue
+++ b/ruoyi-ui/src/layout/components/HeaderNotice/index.vue
@@ -23,24 +23,38 @@
      <span v-if="unreadCount > 0" class="notice-badge">{{ unreadCount }}</span>
    </div>

-    <notice-detail-view ref="noticeViewRef" />
+    <el-dialog :title="previewTitle" :visible.sync="previewVisible" width="680px" append-to-body custom-class="notice-preview-dialog">
+      <div class="notice-preview-meta">
+        <el-tag size="small" :type="previewNoticeType === '1' ? 'warning' : 'success'">
+          {{ previewNoticeType === '1' ? '通知' : '公告' }}
+        </el-tag>
+        <span class="notice-preview-info"><i class="el-icon-user"></i> {{ previewCreateBy }}</span>
+        <span class="notice-preview-info"><i class="el-icon-time"></i> {{ previewCreateTime }}</span>
+      </div>
+      <div class="notice-preview-divider"></div>
+      <div class="notice-preview-content" v-html="previewContent"></div>
+    </el-dialog>
  </div>
 </template>

 <script>
-import NoticeDetailView from './DetailView'
-import { listNoticeTop, markNoticeRead, markNoticeReadAll } from '@/api/system/notice'
+import { listNoticeTop, markNoticeRead, markNoticeReadAll, getNotice } from '@/api/system/notice'

 export default {
  name: 'HeaderNotice',
-  components: { NoticeDetailView },
  data() {
    return {
      noticeList: [], // 通知列表
      unreadCount: 0, // 未读数量
      noticeLoading: false, // 加载状态
      noticeVisible: false, // 弹出层显示状态
-      noticeLeaveTimer: null // 鼠标离开计时器
+      noticeLeaveTimer: null, // 鼠标离开计时器
+      previewVisible: false, // 预览弹窗显示状态
+      previewTitle: '', // 预览弹窗标题
+      previewContent: '', // 预览弹窗内容
+      previewNoticeType: '', // 预览弹窗类型
+      previewCreateBy: '', // 预览弹窗创建人
+      previewCreateTime: '' // 预览弹窗创建时间
    }
  },
  mounted() {
@@ -85,7 +99,15 @@ export default {
        if (idx !== -1) this.$set(this.noticeList, idx, { ...item, isRead: true })
        this.unreadCount = Math.max(0, this.unreadCount - 1)
      }
-      this.$refs.noticeViewRef.open(item.noticeId)
+      getNotice(item.noticeId).then(res => {
+        const notice = res.data
+        this.previewTitle = notice.noticeTitle
+        this.previewContent = notice.noticeContent
+        this.previewNoticeType = notice.noticeType
+        this.previewCreateBy = notice.createBy
+        this.previewCreateTime = notice.createTime
+        this.previewVisible = true
+      })
    },
    // 全部已读
    markAllRead() {
@@ -178,4 +200,30 @@ export default {
  font-size: 11px;
  color: #bbb;
 }
+::v-deep .notice-preview-dialog {
+  .el-dialog__body { padding: 0 20px 20px; }
+  .notice-preview-meta {
+    display: flex;
+    align-items: center;
+    gap: 14px;
+    padding: 12px 0;
+    font-size: 12px;
+    color: #888;
+    .notice-preview-info { display: flex; align-items: center; gap: 4px; }
+  }
+  .notice-preview-divider {
+    height: 1px;
+    background: linear-gradient(to right, transparent, #e2e8f0, transparent);
+    margin-bottom: 16px;
+  }
+  .notice-preview-content {
+    font-size: 14px;
+    line-height: 1.85;
+    color: #2d3748;
+    word-break: break-word;
+    img { max-width: 100%; border-radius: 4px; }
+    p { margin: 0 0 1em; }
+    a { color: #409EFF; text-decoration: underline; }
+  }
+}
 </style>
--- a/ruoyi-ui/src/layout/components/Settings/index.vue
+++ b/ruoyi-ui/src/layout/components/Settings/index.vue
@@ -61,7 +61,7 @@
        <h3 class="drawer-title">系统布局配置</h3>

        <div class="drawer-item">
-          <span>开启页签</span>
+          <span>开启 Tags-Views</span>
          <el-switch v-model="tagsView" class="drawer-switch" />
        </div>

@@ -75,14 +75,6 @@
          <el-switch v-model="tagsIcon" :disabled="!tagsView" class="drawer-switch" />
        </div>

-        <div class="drawer-item">
-          <span>标签页样式</span>
-          <el-radio-group v-model="tagsViewStyle" :disabled="!tagsView" size="mini" class="drawer-switch">
-            <el-radio-button label="card">卡片</el-radio-button>
-            <el-radio-button label="chrome">谷歌</el-radio-button>
-          </el-radio-group>
-        </div>
-
        <div class="drawer-item">
          <span>固定 Header</span>
          <el-switch v-model="fixedHeader" class="drawer-switch" />
@@ -171,17 +163,6 @@ export default {
        })
      }
    },
-    tagsViewStyle: {
-      get() {
-        return this.$store.state.settings.tagsViewStyle
-      },
-      set(val) {
-        this.$store.dispatch('settings/changeSetting', {
-          key: 'tagsViewStyle',
-          value: val
-        })
-      }
-    },
    sidebarLogo: {
      get() {
        return this.$store.state.settings.sidebarLogo
@@ -275,7 +256,6 @@ export default {
            "navType":${this.navType},
            "tagsView":${this.tagsView},
            "tagsIcon":${this.tagsIcon},
-            "tagsViewStyle":"${this.tagsViewStyle}",
            "tagsViewPersist":${this.tagsViewPersist},
            "fixedHeader":${this.fixedHeader},
            "sidebarLogo":${this.sidebarLogo},
--- a/ruoyi-ui/src/layout/components/TagsView/index.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="tags-view-container" class="tags-view-container" :class="{ 'tags-view-container--chrome': tagsViewStyle === 'chrome' }" :style="chromeVars">
+  <div id="tags-view-container" class="tags-view-container">
    <!-- 左切换箭头 -->
    <span class="tags-nav-btn tags-nav-btn--left" :class="{ disabled: !canScrollLeft }" @click="scrollLeft">
      <i class="el-icon-arrow-left" />
@@ -15,11 +15,11 @@
        :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }"
        tag="span"
        class="tags-view-item"
-        :style="tagActiveStyle(tag)"
+        :style="activeStyle(tag)"
        @click.middle.native="!isAffix(tag) ? closeSelectedTag(tag) : ''"
        @contextmenu.prevent.native="openMenu(tag, $event)"
      >
-        <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" style="margin-right: 3px;" />
+        <svg-icon v-if="tagsIcon && tag.meta && tag.meta.icon && tag.meta.icon !== '#'" :icon-class="tag.meta.icon" />
        {{ tag.title }}
        <span v-if="!isAffix(tag)" class="el-icon-close" @click.prevent.stop="closeSelectedTag(tag)" />
      </router-link>
@@ -97,20 +97,8 @@ export default {
    tagsIcon() {
      return this.$store.state.settings.tagsIcon
    },
-    tagsViewStyle() {
-      return this.$store.state.settings.tagsViewStyle
-    },
    selectedDropdownTag() {
      return this.visitedViews.find(v => this.isActive(v)) || {}
-    },
-    chromeVars() {
-      if (this.tagsViewStyle !== 'chrome') return {}
-      const primary = this.theme || '#409EFF'
-      return {
-        '--chrome-tab-active-bg': this.mixHexWithWhite(primary, 0.15),
-        '--chrome-tab-text-active': primary,
-        '--chrome-wing-r': '14px'
-      }
    }
  },
  watch: {
@@ -148,21 +136,11 @@ export default {
        this.toggleFullscreen()
      }
    },
-    mixHexWithWhite(hex, ratio) {
-      const clean = hex.replace('#', '')
-      const r = parseInt(clean.substring(0, 2), 16)
-      const g = parseInt(clean.substring(2, 4), 16)
-      const b = parseInt(clean.substring(4, 6), 16)
-      const mr = Math.round(r * ratio + 255 * (1 - ratio))
-      const mg = Math.round(g * ratio + 255 * (1 - ratio))
-      const mb = Math.round(b * ratio + 255 * (1 - ratio))
-      return `rgb(${mr}, ${mg}, ${mb})`
-    },
    isActive(route) {
      return route.path === this.$route.path
    },
-    tagActiveStyle(tag) {
-      if (!this.isActive(tag) || this.tagsViewStyle !== 'card') return {}
+    activeStyle(tag) {
+      if (!this.isActive(tag)) return {}
      return {
        "background-color": this.theme,
        "border-color": this.theme
@@ -389,16 +367,13 @@ export default {
 </script>

 <style lang="scss" scoped>
-$tags-bar-height: 34px;
-
 .tags-view-container {
-  height: $tags-bar-height;
+  height: 34px;
  width: 100%;
  background: #fff;
  border-bottom: 1px solid #d8dce5;
  display: flex;
  align-items: center;
-  overflow: hidden;

  $btn-width: 28px;
  $btn-color: #71717a;
@@ -413,7 +388,7 @@ $tags-bar-height: 34px;
    align-items: center;
    justify-content: center;
    width: $btn-width;
-    height: $tags-bar-height;
+    height: 34px;
    cursor: pointer;
    color: $btn-color;
    font-size: 13px;
@@ -430,14 +405,18 @@ $tags-bar-height: 34px;
      cursor: not-allowed;
    }

-    &--left  { border-right: $divider; }
-    &--right { border-left: $divider; }
+    &--left {
+      border-right: $divider;
+    }
+
+    &--right {
+      border-left: $divider;
+    }
  }

  .tags-view-wrapper {
    flex: 1;
    min-width: 0;
-    height: 100%;

    .tags-view-item {
      display: inline-block;
@@ -453,27 +432,31 @@ $tags-bar-height: 34px;
      margin-left: 5px;
      border-radius: 3px;

-      &:first-of-type { margin-left: 6px; }
-      &:last-of-type  { margin-right: 15px; }
-    }
-  }
-  &:not(.tags-view-container--chrome) .tags-view-wrapper .tags-view-item.active {
-    background-color: #42b983;
-    color: #fff;
-    border-color: #42b983;
-    &::before {
-      content: '';
-      background: #fff;
-      display: inline-block;
-      width: 8px;
-      height: 8px;
-      border-radius: 50%;
-      position: relative;
-      margin-right: 2px;
+      &:first-of-type {
+        margin-left: 6px;
+      }
+      &:last-of-type {
+        margin-right: 15px;
+      }
+      &.active {
+        background-color: #42b983;
+        color: #fff;
+        border-color: #42b983;
+        &::before {
+          content: '';
+          background: #fff;
+          display: inline-block;
+          width: 8px;
+          height: 8px;
+          border-radius: 50%;
+          position: relative;
+          margin-right: 2px;
+        }
+      }
    }
  }

-  &:not(.tags-view-container--chrome) .tags-view-wrapper .tags-view-item.active.has-icon::before {
+  .tags-view-item.active.has-icon::before {
    content: none !important;
  }

@@ -488,7 +471,7 @@ $tags-bar-height: 34px;
    align-items: center;
    justify-content: center;
    width: $btn-width;
-    height: $tags-bar-height;
+    height: 34px;
    cursor: pointer;
    color: $btn-color;
    font-size: 13px;
@@ -528,174 +511,11 @@ $tags-bar-height: 34px;
      }
    }
  }
-  &.tags-view-container--chrome {
-    --chrome-strip-bg: #ffffff;
-    --chrome-strip-border: #e4e7ed;
-    --chrome-tab-text: #606266;
-
-    overflow: visible;
-    background: var(--chrome-strip-bg);
-    border-bottom: 1px solid var(--chrome-strip-border);
-    align-items: flex-end;
-
-    .tags-nav-btn {
-      align-self: stretch;
-      height: auto;
-      min-height: $tags-bar-height;
-      border-color: var(--chrome-strip-border);
-    }
-
-    .tags-action-btn {
-      border-color: var(--chrome-strip-border);
-    }
-
-    .tags-view-wrapper {
-      .tags-view-item {
-        display: inline-flex !important;
-        align-items: center;
-        justify-content: center;
-        position: relative;
-        z-index: 1;
-        height: 30px;
-        min-height: 30px;
-        margin: 0 0 -1px;
-        padding: 0 12px;
-        font-size: 13px;
-        font-weight: 400;
-        line-height: 1.2;
-        border: none !important;
-        border-radius: 0;
-        background: transparent !important;
-        color: var(--chrome-tab-text) !important;
-        padding-top: 0 !important;
-        box-shadow: none !important;
-        transition: background 0.12s ease, color 0.12s ease, border-radius 0.12s ease;
-
-        &::before,
-        &::after {
-          content: '' !important;
-          display: block !important;
-          position: absolute;
-          bottom: 0;
-          width: var(--chrome-wing-r);
-          height: var(--chrome-wing-r);
-          margin: 0 !important;
-          pointer-events: none;
-          background: transparent !important;
-          border-radius: 0 !important;
-          transition: box-shadow 0.12s ease;
-        }
-
-        &::before {
-          left: calc(-1 * var(--chrome-wing-r));
-          border-bottom-right-radius: var(--chrome-wing-r) !important;
-          box-shadow: none;
-        }
-
-        &::after {
-          right: calc(-1 * var(--chrome-wing-r));
-          border-bottom-left-radius: var(--chrome-wing-r) !important;
-          box-shadow: none;
-        }
-
-        &:first-of-type { margin-left: 6px; }
-        &:last-of-type  { margin-right: 10px; }
-
-        &:not(.active) + .tags-view-item:not(.active) {
-          border-left: 1px solid #e4e7ed;
-          padding-left: 11px;
-        }
-
-        &:hover:not(.active) {
-          background: #f5f7fa !important;
-          border-radius: 6px 6px 0 0;
-          color: #303133 !important;
-        }
-
-        &.active {
-          height: 31px;
-          min-height: 31px;
-          padding: 0 14px;
-          color: var(--chrome-tab-text-active) !important;
-          font-weight: 500;
-          background: var(--chrome-tab-active-bg) !important;
-          border: none !important;
-          border-radius: var(--chrome-wing-r) var(--chrome-wing-r) 0 0;
-          box-shadow: 0 1px 4px rgba(0, 0, 0, 0.06);
-
-          &::before {
-            box-shadow: calc(var(--chrome-wing-r) * 0.5) calc(var(--chrome-wing-r) * 0.5) 0 calc(var(--chrome-wing-r) * 0.5) var(--chrome-tab-active-bg);
-          }
-
-          &::after {
-            box-shadow: calc(var(--chrome-wing-r) * -0.5) calc(var(--chrome-wing-r) * 0.5) 0 calc(var(--chrome-wing-r) * 0.5) var(--chrome-tab-active-bg);
-          }
-        }
-        .el-icon-close {
-          margin-left: 3px;
-          &:before {
-            vertical-align: -2px;
-          }
-        }
-      }
-    }
-  }
 }
 </style>

 <style lang="scss">
 .tags-view-wrapper {
-  .el-scrollbar {
-    height: 100%;
-    overflow: hidden;
-  }
-
-  .el-scrollbar__wrap {
-    height: 34px !important;
-    display: flex;
-    align-items: center;
-    overflow-x: auto;
-    overflow-y: hidden;
-    
-    &::-webkit-scrollbar {
-      width: 0;
-      height: 0;
-    }
-    
-    .tags-view-container:hover & {
-      &::-webkit-scrollbar {
-        width: 6px;
-        height: 6px;
-      }
-      
-      &::-webkit-scrollbar-track {
-        background: transparent;
-      }
-      
-      &::-webkit-scrollbar-thumb {
-        background-color: rgba(0, 0, 0, 0.2);
-        border-radius: 3px;
-        transition: background-color 0.2s;
-        
-        &:hover {
-          background-color: rgba(0, 0, 0, 0.4);
-        }
-      }
-    }
-    
-    scrollbar-width: none;
-    -ms-overflow-style: none;
-  }
-
-  .el-scrollbar__bar {
-    opacity: 0;
-    transition: opacity 0.3s;
-    
-    .tags-view-container:hover & {
-      opacity: 1;
-    }
-  }
-
  .tags-view-item {
    .el-icon-close {
      width: 16px;
@@ -757,4 +577,4 @@ $tags-bar-height: 34px;
  min-height: calc(100vh - 34px) !important;
  overflow: auto;
 }
-</style>
+</style>
--- a/ruoyi-ui/src/settings.js
+++ b/ruoyi-ui/src/settings.js
@@ -34,11 +34,6 @@ module.exports = {
   */
  tagsIcon: false,

-  /**
-   * 标签页样式：card 卡片（默认）、chrome 谷歌浏览器风格
-   */
-  tagsViewStyle: 'card',
-
  /**
   * 是否固定头部
   */
--- a/ruoyi-ui/src/store/modules/settings.js
+++ b/ruoyi-ui/src/store/modules/settings.js
@@ -1,7 +1,7 @@
 import defaultSettings from '@/settings'
 import { useDynamicTitle } from '@/utils/dynamicTitle'

-const { sideTheme, showSettings, navType, tagsView, tagsViewPersist, tagsIcon, tagsViewStyle, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings
+const { sideTheme, showSettings, navType, tagsView, tagsViewPersist, tagsIcon, fixedHeader, sidebarLogo, dynamicTitle, footerVisible, footerContent } = defaultSettings

 const storageSetting = JSON.parse(localStorage.getItem('layout-setting')) || ''
 const state = {
@@ -13,7 +13,6 @@ const state = {
  tagsView: storageSetting.tagsView === undefined ? tagsView : storageSetting.tagsView,
  tagsViewPersist: storageSetting.tagsViewPersist === undefined ? tagsViewPersist : storageSetting.tagsViewPersist,
  tagsIcon: storageSetting.tagsIcon === undefined ? tagsIcon : storageSetting.tagsIcon,
-  tagsViewStyle: storageSetting.tagsViewStyle === undefined ? tagsViewStyle : storageSetting.tagsViewStyle,
  fixedHeader: storageSetting.fixedHeader === undefined ? fixedHeader : storageSetting.fixedHeader,
  sidebarLogo: storageSetting.sidebarLogo === undefined ? sidebarLogo : storageSetting.sidebarLogo,
  dynamicTitle: storageSetting.dynamicTitle === undefined ? dynamicTitle : storageSetting.dynamicTitle,
--- a/ruoyi-ui/src/store/modules/user.js
+++ b/ruoyi-ui/src/store/modules/user.js
@@ -1,6 +1,5 @@
 import store from '@/store'
 import router from '@/router'
-import cache from '@/plugins/cache'
 import { MessageBox, } from 'element-ui'
 import { login, logout, getInfo, refreshToken } from '@/api/login'
 import { getToken, setToken, setExpiresIn, removeToken } from '@/utils/auth'
@@ -83,7 +82,6 @@ const user = {
          commit('SET_NAME', user.userName)
          commit('SET_NICK_NAME', user.nickName)
          commit('SET_AVATAR', avatar)
-          cache.session.set('pwrChrtype', res.pwdChrtype)
          /* 初始密码提示 */
          if(res.isDefaultModifyPwd) {
            MessageBox.confirm('您的密码还是初始密码，请修改密码！',  '安全提示', {  confirmButtonText: '确定',  cancelButtonText: '取消',  type: 'warning' }).then(() => {
--- a/ruoyi-ui/src/utils/passwordRule.js
+++ b/ruoyi-ui/src/utils/passwordRule.js
@@ -1,71 +0,0 @@
-/**
- * 密码强度规则
- * 根据参数 chrtype 动态生成校验规则
- *
- * chrtype 说明：
- *   0 - 任意字符（默认）
- *   1 - 纯数字（0-9）
- *   2 - 纯字母（a-z / A-Z）
- *   3 - 字母 + 数字（必须同时包含）
- *   4 - 字母 + 数字 + 特殊字符（必须同时包含，特殊字符：~!@#$%^&*()-=_+）
- */
-import cache from '@/plugins/cache'
-
-// 各类型对应的正则、错误提示
-const PWD_RULES = {
-  '0': { pattern: /^[^<>"'|\\]+$/, message: '密码不能包含非法字符：< > " \' \\ |' },
-  '1': { pattern: /^[0-9]+$/, message: '密码只能为数字（0-9）' },
-  '2': { pattern: /^[a-zA-Z]+$/, message: '密码只能为英文字母（a-z、A-Z）' },
-  '3': { pattern: /^(?=.*[a-zA-Z])(?=.*[0-9])[a-zA-Z0-9]+$/, message: '密码必须同时包含字母和数字' },
-  '4': { pattern: /^(?=.*[A-Za-z])(?=.*\d)(?=.*[~!@#$%^&*()\-=_+])[A-Za-z\d~!@#$%^&*()\-=_+]+$/, message: '密码必须同时包含字母、数字和特殊字符（~!@#$%^&*()-=_+）' }
-}
-
-export default {
-  data() {
-    return {
-      // 密码限制类型
-      pwdChrType: cache.session.get('pwrChrtype') || '0'
-    }
-  },
-  computed: {
-    // 默认密码校验
-    pwdValidator() {
-      const rule = PWD_RULES[this.pwdChrType] || PWD_RULES['0']
-      return [
-        { required: true, message: '密码不能为空', trigger: 'blur' },
-        { min: 6, max: 20, message: '密码长度必须介于 6 和 20 之间', trigger: 'blur' },
-        { pattern: rule.pattern, message: rule.message, trigger: 'blur' }
-      ]
-    },
-    // 校验prompt的inputValidator函数
-    pwdPromptValidator() {
-      const rule = PWD_RULES['0']
-      return (value) => {
-        if (!value || value.length < 6 || value.length > 20) {
-          return '密码长度必须介于 6 和 20 之间'
-        }
-        if (!rule.pattern.test(value)) {
-          return rule.message
-        }
-      }
-    },
-    // 个人中心密码校验
-    infoPwdValidator() {
-      const rule = PWD_RULES[this.pwdChrType] || PWD_RULES['0']
-      return [
-        { required: true, message: '新密码不能为空', trigger: 'blur' },
-        { min: 6, max: 20, message: '新密码长度必须介于 6 和 20 之间', trigger: 'blur' },
-        { pattern: rule.pattern, message: rule.message, trigger: 'blur' }
-      ]
-    },
-    // 注册页面密码校验
-    registerPwdValidator() {
-      const rule = PWD_RULES['0']
-      return [
-        { required: true, message: '请输入您的密码', trigger: 'blur' },
-        { min: 6, max: 20, message: '用户密码长度必须介于 6 和 20 之间', trigger: 'blur' },
-        { pattern: rule.pattern, message: rule.message, trigger: 'blur' }
-      ]
-    }
-  }
-}
--- a/ruoyi-ui/src/utils/validate.js
+++ b/ruoyi-ui/src/utils/validate.js
@@ -5,12 +5,7 @@
 * @returns {Boolean}
 */
 export function isPathMatch(pattern, path) {
-  const regexPattern = pattern
-    .replace(/([.+^${}()|\[\]\\])/g, '\\$1')
-    .replace(/\*\*/g, '__DOUBLE_STAR__')
-    .replace(/\*/g, '[^/]*')
-    .replace(/__DOUBLE_STAR__/g, '.*')
-    .replace(/\?/g, '[^/]')
+  const regexPattern = pattern.replace(/\//g, '\\/').replace(/\*\*/g, '.*').replace(/\*/g, '[^\\/]*')
  const regex = new RegExp(`^${regexPattern}$`)
  return regex.test(path)
 }
--- a/ruoyi-ui/src/views/register.vue
+++ b/ruoyi-ui/src/views/register.vue
@@ -7,7 +7,7 @@
          <svg-icon slot="prefix" icon-class="user" class="el-input__icon input-icon" />
        </el-input>
      </el-form-item>
-      <el-form-item prop="password" :rules="registerPwdValidator">
+      <el-form-item prop="password">
        <el-input
          v-model="registerForm.password"
          type="password"
@@ -68,12 +68,18 @@

 <script>
 import { getCodeImg, register } from "@/api/login"
-import passwordRule from "@/utils/passwordRule"
 import defaultSettings from '@/settings'

 export default {
-  mixins: [passwordRule],
+  name: "Register",
  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.registerForm.password !== value) {
+        callback(new Error("两次输入的密码不一致"))
+      } else {
+        callback()
+      }
+    }
    return {
      title: process.env.VUE_APP_TITLE,
      footerContent: defaultSettings.footerContent,
@@ -85,31 +91,24 @@ export default {
        code: "",
        uuid: ""
      },
-      loading: false,
-      captchaEnabled: true
-    }
-  },
-  computed: {
-    registerRules() {
-      return {
+      registerRules: {
        username: [
          { required: true, trigger: "blur", message: "请输入您的账号" },
          { min: 2, max: 20, message: '用户账号长度必须介于 2 和 20 之间', trigger: 'blur' }
        ],
+        password: [
+          { required: true, trigger: "blur", message: "请输入您的密码" },
+          { min: 5, max: 20, message: "用户密码长度必须介于 5 和 20 之间", trigger: "blur" },
+          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+        ],
        confirmPassword: [
-          { required: true, message: "请再次输入您的密码", trigger: "blur" },
-          {
-            validator: (rule, value, callback) => {
-              if (this.registerForm.password !== value) {
-                callback(new Error("两次输入的密码不一致"))
-              } else {
-                callback()
-              }
-            }, trigger: "blur"
-          }
+          { required: true, trigger: "blur", message: "请再次输入您的密码" },
+          { required: true, validator: equalToPassword, trigger: "blur" }
        ],
        code: [{ required: true, trigger: "change", message: "请输入验证码" }]
-      }
+      },
+      loading: false,
+      captchaEnabled: true
    }
  },
  created() {
--- a/ruoyi-ui/src/views/system/notice/ReadUsers.vue
+++ b/ruoyi-ui/src/views/system/notice/ReadUsers.vue
@@ -1,109 +0,0 @@
-<template>
-  <el-dialog :title="`「${noticeTitle}」已读用户`" :visible.sync="visible" width="760px" top="6vh" append-to-body @close="handleClose">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" style="margin-bottom: 4px;">
-      <el-form-item prop="searchValue">
-        <el-input
-          v-model="queryParams.searchValue"
-          placeholder="登录名称 / 用户名称"
-          clearable
-          prefix-icon="el-icon-search"
-          style="width: 220px;"
-          @keyup.enter.native="handleQuery"
-          @clear="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-      <el-form-item style="float: right; margin-right: 0;">
-        <span class="read-stat">
-          共 <strong>{{ total }}</strong> 人已读
-        </span>
-      </el-form-item>
-    </el-form>
-    <el-table v-loading="loading" :data="userList" size="small" stripe height="340px">
-      <el-table-column type="index" label="序号" width="55" align="center" />
-      <el-table-column label="登录名称" prop="userName" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="用户名称" prop="nickName" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="所属部门" prop="deptName" align="center" :show-overflow-tooltip="true" />
-      <el-table-column label="手机号码" prop="phonenumber" align="center" width="120" />
-      <el-table-column label="阅读时间" prop="readTime" align="center" width="160">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.readTime) }}</span>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" style="padding: 6px 0px;"/>
-  </el-dialog>
-</template>
-
-<script>
-import { listNoticeReadUsers } from "@/api/system/notice"
-
-export default {
-  name: "ReadUsers",
-  data() {
-    return {
-      visible: false,
-      loading: false,
-      noticeId: undefined,
-      noticeTitle: "",
-      total: 0,
-      userList: [],
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        noticeId: undefined,
-        searchValue: undefined
-      }
-    }
-  },
-  methods: {
-    open(row) {
-      this.noticeId = row.noticeId
-      this.noticeTitle = row.noticeTitle
-      this.queryParams.noticeId = row.noticeId
-      this.queryParams.searchValue = undefined
-      this.queryParams.pageNum = 1
-      this.visible = true
-      this.getList()
-    },
-    getList() {
-      this.loading = true
-      listNoticeReadUsers(this.queryParams).then(res => {
-        this.userList = res.rows
-        this.total = res.total
-      }).finally(() => {
-        this.loading = false
-      })
-    },
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    resetQuery() {
-      this.resetForm("queryForm")
-      this.handleQuery()
-    },
-    handleClose() {
-      this.userList = []
-      this.total = 0
-      this.queryParams.searchValue = undefined
-    }
-  }
-}
-</script>
-
-<style scoped>
-.read-stat {
-  font-size: 13px;
-  color: #606266;
-  line-height: 28px;
-}
-.read-stat strong {
-  color: #409eff;
-  font-size: 15px;
-  margin: 0 2px;
-}
-</style>
--- a/ruoyi-ui/src/views/system/notice/index.vue
+++ b/ruoyi-ui/src/views/system/notice/index.vue
@@ -72,11 +72,12 @@
    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
      <el-table-column type="selection" width="55" align="center" />
      <el-table-column label="序号" align="center" prop="noticeId" width="100" />
-      <el-table-column label="公告标题" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <a class="link-type" style="cursor:pointer" @click="handleViewData(scope.row)">{{ scope.row.noticeTitle }}</a>
-        </template>
-      </el-table-column>
+      <el-table-column
+        label="公告标题"
+        align="center"
+        prop="noticeTitle"
+        :show-overflow-tooltip="true"
+      />
      <el-table-column label="公告类型" align="center" prop="noticeType" width="100">
        <template slot-scope="scope">
          <dict-tag :options="dict.type.sys_notice_type" :value="scope.row.noticeType"/>
@@ -95,13 +96,6 @@
      </el-table-column>
      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-user"
-            @click="handleReadUsers(scope.row)"
-            v-hasPermi="['system:notice:list']"
-          >阅读用户</el-button>
          <el-button
            size="mini"
            type="text"
@@ -172,20 +166,14 @@
        <el-button @click="cancel">取 消</el-button>
      </div>
    </el-dialog>
-
-    <notice-detail-view ref="noticeViewRef" />
-    <read-users-dialog ref="readUsersRef" />
  </div>
 </template>

 <script>
-import NoticeDetailView from "@/layout/components/HeaderNotice/DetailView"
-import ReadUsersDialog from "./ReadUsers"
 import { listNotice, getNotice, delNotice, addNotice, updateNotice } from "@/api/system/notice"

 export default {
  name: "Notice",
-  components: { NoticeDetailView, ReadUsersDialog },
  dicts: ['sys_notice_status', 'sys_notice_type'],
  data() {
    return {
@@ -309,14 +297,6 @@ export default {
        }
      })
    },
-    /** 查看公告详情 */
-    handleViewData(row) {
-      this.$refs.noticeViewRef.open(row)
-    },
-    /** 查看已读用户 */
-    handleReadUsers(row) {
-      this.$refs.readUsersRef.open(row)
-    },
    /** 删除按钮操作 */
    handleDelete(row) {
      const noticeIds = row.noticeId || this.ids
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -116,7 +116,7 @@
            </el-form-item>
          </el-col>
          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password" :rules="pwdValidator">
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password />
            </el-form-item>
          </el-col>
@@ -181,11 +181,9 @@ import "@riophae/vue-treeselect/dist/vue-treeselect.css"
 import TreePanel from "@/components/TreePanel"
 import ExcelImportDialog from "@/components/ExcelImportDialog"
 import UserViewDrawer from "./view"
-import passwordRule from "@/utils/passwordRule"

 export default {
  name: "User",
-  mixins: [passwordRule],
  dicts: ['sys_normal_disable', 'sys_user_sex'],
  components: { Treeselect, TreePanel, ExcelImportDialog, UserViewDrawer },
  data() {
@@ -250,6 +248,11 @@ export default {
        nickName: [
          { required: true, message: "用户昵称不能为空", trigger: "blur" }
        ],
+        password: [
+          { required: true, message: "用户密码不能为空", trigger: "blur" },
+          { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
+          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+        ],
        email: [
          {
            type: "email",
@@ -402,11 +405,17 @@ export default {
    },
    /** 重置密码按钮操作 */
    handleResetPwd(row) {
-      this.$prompt(`请输入「${row.userName}」的新密码`, "重置密码", {
+      this.$prompt('请输入"' + row.userName + '"的新密码', "提示", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        closeOnClickModal: false,
-        inputValidator: this.pwdPromptValidator
+        inputPattern: /^.{5,20}$/,
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+        inputValidator: (value) => {
+          if (/<|>|"|'|\||\\/.test(value)) {
+            return "不能包含非法字符：< > \" ' \\\ |"
+          }
+        },
      }).then(({ value }) => {
        resetUserPwd(row.userId, value).then(() => {
          this.$modal.msgSuccess("修改成功，新密码是：" + value)
--- a/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
+++ b/ruoyi-ui/src/views/system/user/profile/resetPwd.vue
@@ -1,9 +1,9 @@
 <template>
-  <el-form ref="form" :model="user" :rules="formRules" label-width="80px">
+  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
    <el-form-item label="旧密码" prop="oldPassword">
      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password/>
    </el-form-item>
-    <el-form-item label="新密码" prop="newPassword" :rules="infoPwdValidator">
+    <el-form-item label="新密码" prop="newPassword">
      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password/>
    </el-form-item>
    <el-form-item label="确认密码" prop="confirmPassword">
@@ -18,36 +18,35 @@

 <script>
 import { updateUserPwd } from "@/api/system/user"
-import passwordRule from "@/utils/passwordRule"

 export default {
-  mixins: [passwordRule],
  data() {
+    const equalToPassword = (rule, value, callback) => {
+      if (this.user.newPassword !== value) {
+        callback(new Error("两次输入的密码不一致"))
+      } else {
+        callback()
+      }
+    }
    return {
      user: {
        oldPassword: undefined,
        newPassword: undefined,
        confirmPassword: undefined
-      }
-    }
-  },
-  computed: {
-    formRules() {
-      return {
+      },
+      // 表单校验
+      rules: {
        oldPassword: [
          { required: true, message: "旧密码不能为空", trigger: "blur" }
        ],
+        newPassword: [
+          { required: true, message: "新密码不能为空", trigger: "blur" },
+          { min: 6, max: 20, message: "长度在 6 到 20 个字符", trigger: "blur" },
+          { pattern: /^[^<>"'|\\]+$/, message: "不能包含非法字符：< > \" ' \\\ |", trigger: "blur" }
+        ],
        confirmPassword: [
          { required: true, message: "确认密码不能为空", trigger: "blur" },
-          {
-            validator: (rule, value, callback) => {
-              if (this.user.newPassword !== value) {
-                callback(new Error("两次输入的密码不一致"))
-              } else {
-                callback()
-              }
-            }, trigger: "blur"
-          }
+          { required: true, validator: equalToPassword, trigger: "blur" }
        ]
      }
    }
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -183,7 +183,6 @@ export default {
          const genTable = Object.assign({}, basicForm.model, genForm.model)
          genTable.columns = this.columns
          genTable.params = {
-            genView: genTable.view ? '1' : '0',
            treeCode: genTable.treeCode,
            treeName: genTable.treeName,
            treeParentCode: genTable.treeParentCode,
--- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
+++ b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
@@ -69,7 +69,7 @@
        </el-form-item>
      </el-col>

-      <el-col :span="12">
+      <el-col :span="24">
        <el-form-item prop="formColNum">
          <span slot="label">
            表单布局
@@ -85,13 +85,6 @@
        </el-form-item>
      </el-col>

-      <el-col :span="12">
-        <el-form-item prop="genView">
-          <span slot="label">扩展功能</span>
-          <el-checkbox v-model="info.view">生成详情页</el-checkbox>
-        </el-form-item>
-      </el-col>
-
      <el-col :span="12">
        <el-form-item prop="genType">
          <span slot="label">
--- a/ruoyi-visual/ruoyi-monitor/pom.xml
+++ b/ruoyi-visual/ruoyi-monitor/pom.xml
@@ -44,7 +44,7 @@
        <!-- SpringBoot Web -->
        <dependency>
            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
+            <artifactId>spring-boot-starter-webmvc</artifactId>
        </dependency>
 		
        <!-- Spring Security -->
--- a/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
+++ b/ruoyi-visual/ruoyi-monitor/src/main/java/com/ruoyi/modules/monitor/config/WebSecurityConfigurer.java
@@ -13,7 +13,7 @@ import org.springframework.security.web.authentication.SavedRequestAwareAuthenti

 /**
 * 监控权限配置
- *
+ * 
 * @author ruoyi
 */
@EnableWebSecurity
--- a/sql/ry_20260402.sql
+++ b/sql/ry_20260402.sql
@@ -552,7 +552,6 @@ insert into sys_config values(4, '账号自助-是否开启用户注册功能',
 insert into sys_config values(5, '用户登录-黑名单列表',           'sys.login.blackIPList',            '',              'Y', 'admin', sysdate(), '', null, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）');
 insert into sys_config values(6, '用户管理-初始密码修改策略',     'sys.account.initPasswordModify',   '1',             'Y', 'admin', sysdate(), '', null, '0：初始密码修改策略关闭，没有任何提示，1：提醒用户，如果未修改初始密码，则在登录时就会提醒修改密码对话框');
 insert into sys_config values(7, '用户管理-账号密码更新周期',     'sys.account.passwordValidateDays', '0',             'Y', 'admin', sysdate(), '', null, '密码更新周期（填写数字，数据初始化值为0不限制，若修改必须为大于0小于365的正整数），如果超过这个周期登录系统时，则在登录时就会提醒修改密码对话框');
-insert into sys_config values(8, '用户管理-密码字符范围',         'sys.account.chrtype',              '0',             'Y', 'admin', sysdate(), '', null, '默认任意字符范围，0任意（密码可以输入任意字符），1数字（密码只能为0-9数字），2英文字母（密码只能为a-z和A-Z字母），3字母和数字（密码必须包含字母，数字）,4字母数字和特殊字符（目前支持的特殊字符包括：~!@#$%^&*()-=_+）');


 -- ----------------------------
--- a/sql/ry_config_20260311.sql
+++ b/sql/ry_config_20260311.sql
@@ -34,7 +34,7 @@ CREATE TABLE `config_info` (

 insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_modified, src_user, src_ip, app_name, tenant_id, c_desc, c_use, effect, type, c_schema, encrypted_data_key) values 
 (1,'application-dev.yml','DEFAULT_GROUP','spring:\n  autoconfigure:\n    exclude: com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure\n\n# feign 配置\nfeign:\n  sentinel:\n    enabled: true\n  okhttp:\n    enabled: true\n  httpclient:\n    enabled: false\n  client:\n    config:\n      default:\n        connectTimeout: 10000\n        readTimeout: 10000\n  compression:\n    request:\n      enabled: true\n      min-request-size: 8192\n    response:\n      enabled: true\n\n# 暴露监控端点\nmanagement:\n  endpoints:\n    web:\n      exposure:\n        include: \'*\'\n','9928f41dfb10386ad38b3254af5692e0','2020-05-20 12:00:00','2024-08-29 12:14:45','nacos','0:0:0:0:0:0:0:1','','','通用配置','null','null','yaml','',''),
-(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n  data:\n    redis:\n      host: localhost\n      port: 6379\n      password: \n  cloud:\n    gateway:\n      server:\n        webflux:\n          discovery:\n            locator:\n              lowerCaseServiceId: true\n              enabled: true\n          routes:\n            # 认证中心\n            - id: ruoyi-auth\n              uri: lb://ruoyi-auth\n              predicates:\n                - Path=/auth/**\n              filters:\n                # 验证码处理\n                - CacheRequestBody\n                - ValidateCodeFilter\n                - StripPrefix=1\n            # 代码生成\n            - id: ruoyi-gen\n              uri: lb://ruoyi-gen\n              predicates:\n                - Path=/code/**\n              filters:\n                - StripPrefix=1\n            # 定时任务\n            - id: ruoyi-job\n              uri: lb://ruoyi-job\n              predicates:\n                - Path=/schedule/**\n              filters:\n                - StripPrefix=1\n            # 系统模块\n            - id: ruoyi-system\n              uri: lb://ruoyi-system\n              predicates:\n                - Path=/system/**\n              filters:\n                - StripPrefix=1\n            # 文件服务\n            - id: ruoyi-file\n              uri: lb://ruoyi-file\n              predicates:\n                - Path=/file/**\n              filters:\n                - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /*/v3/api-docs\n      - /csrf\n\n# springdoc配置\nspringdoc:\n  webjars:\n    # 访问前缀\n    prefix:\n','1650061c268e8065f4ca40a1ee99808d','2020-05-14 14:17:55','2026-03-10 10:57:46','nacos_namespace_migrate','192.168.137.1','','','网关模块',NULL,NULL,'yaml',NULL,''),
+(2,'ruoyi-gateway-dev.yml','DEFAULT_GROUP','spring:\n  data:\n    redis:\n      host: localhost\n      port: 6379\n      password: \n  cloud:\n    gateway:\n      server:\n        webflux:\n          discovery:\n            locator:\n              lowerCaseServiceId: true\n              enabled: true\n          routes:\n            # 认证中心\n            - id: ruoyi-auth\n              uri: lb://ruoyi-auth\n              predicates:\n                - Path=/auth/**\n              filters:\n                # 验证码处理\n                - name: CacheRequestBody\n                  args:\n                    bodyClass: java.lang.String\n                - ValidateCodeFilter\n                - StripPrefix=1\n            # 代码生成\n            - id: ruoyi-gen\n              uri: lb://ruoyi-gen\n              predicates:\n                - Path=/code/**\n              filters:\n                - StripPrefix=1\n            # 定时任务\n            - id: ruoyi-job\n              uri: lb://ruoyi-job\n              predicates:\n                - Path=/schedule/**\n              filters:\n                - StripPrefix=1\n            # 系统模块\n            - id: ruoyi-system\n              uri: lb://ruoyi-system\n              predicates:\n                - Path=/system/**\n              filters:\n                - StripPrefix=1\n            # 文件服务\n            - id: ruoyi-file\n              uri: lb://ruoyi-file\n              predicates:\n                - Path=/file/**\n              filters:\n                - StripPrefix=1\n\n# 安全配置\nsecurity:\n  # 验证码\n  captcha:\n    enabled: true\n    type: math\n  # 防止XSS攻击\n  xss:\n    enabled: true\n    excludeUrls:\n      - /system/notice\n\n  # 不校验白名单\n  ignore:\n    whites:\n      - /auth/logout\n      - /auth/login\n      - /auth/register\n      - /*/v2/api-docs\n      - /*/v3/api-docs\n      - /csrf\n\n# springdoc配置\nspringdoc:\n  webjars:\n    # 访问前缀\n    prefix:\n','1650061c268e8065f4ca40a1ee99808d','2020-05-14 14:17:55','2026-03-10 10:57:46','nacos_namespace_migrate','192.168.137.1','','','网关模块',NULL,NULL,'yaml',NULL,''),
 (3,'ruoyi-auth-dev.yml','DEFAULT_GROUP','spring:\n  data:\n    redis:\n      host: localhost\n      port: 6379\n      password: \n','72565b1a725e013154ee57c8fd3045c4','2020-11-20 00:00:00','2024-09-14 04:49:42','nacos','0:0:0:0:0:0:0:1','','','认证中心','null','null','yaml','',''),
 (4,'ruoyi-monitor-dev.yml','DEFAULT_GROUP','# spring\nspring:\n  security:\n    user:\n      name: ruoyi\n      password: 123456\n  boot:\n    admin:\n      ui:\n        title: 若依服务状态监控\n','6f122fd2bfb8d45f858e7d6529a9cd44','2020-11-20 00:00:00','2024-08-29 12:15:11','nacos','0:0:0:0:0:0:0:1','','','监控中心','null','null','yaml','',''),
 (5,'ruoyi-system-dev.yml','DEFAULT_GROUP','# spring配置\nspring:\n  data:\n    redis:\n      host: localhost\n      port: 6379\n      password: \n  datasource:\n    druid:\n      stat-view-servlet:\n        enabled: true\n        loginUsername: ruoyi\n        loginPassword: 123456\n    dynamic:\n      druid:\n        initial-size: 5\n        min-idle: 5\n        maxActive: 20\n        maxWait: 60000\n        connectTimeout: 30000\n        socketTimeout: 60000\n        timeBetweenEvictionRunsMillis: 60000\n        minEvictableIdleTimeMillis: 300000\n        validationQuery: SELECT 1 FROM DUAL\n        testWhileIdle: true\n        testOnBorrow: false\n        testOnReturn: false\n        poolPreparedStatements: true\n        maxPoolPreparedStatementPerConnectionSize: 20\n        filters: stat,slf4j\n        connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n      datasource:\n          # 主库数据源\n          master:\n            driver-class-name: com.mysql.cj.jdbc.Driver\n            url: jdbc:mysql://localhost:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n            username: root\n            password: password\n          # 从库数据源\n          # slave:\n            # username: \n            # password: \n            # url: \n            # driver-class-name: \n\n# mybatis配置\nmybatis:\n    # 搜索指定包别名\n    typeAliasesPackage: com.ruoyi.system\n    # 配置mapper的扫描，找到所有的mapper.xml映射文件\n    mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n  gatewayUrl: http://localhost:8080/${spring.application.name}\n  api-docs:\n    # 是否开启接口文档\n    enabled: true\n  info:\n    # 标题\n    title: \'系统模块接口文档\'\n    # 描述\n    description: \'系统模块接口描述\'\n    # 作者信息\n    contact:\n      name: RuoYi\n      url: https://ruoyi.vip\n','a79ae256018abb7f3bbaba923baeb6af','2020-11-20 00:00:00','2024-09-14 04:49:54','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''),
Author	SHA1	Message	Date
RuoYi	31d588a7c9	自动导入配置	2026-04-10 16:37:46 +08:00
RuoYi	6ca82c4965	代码生成修改拖拽时显示手指样式	2026-04-10 16:36:27 +08:00
RuoYi	a67ca21f15	用户列表新增抽屉效果详细信息	2026-04-09 14:13:45 +08:00
RuoYi	85447bbc62	优化样式	2026-04-03 22:34:22 +08:00
RuoYi	cc4fe8f7cb	数据权限注解支持自定义字段名	2026-04-03 15:40:56 +08:00
RuoYi	bf023fc2f7	新增Excel导入组件ExcelImportDialog	2026-04-03 08:56:31 +08:00
RuoYi	19cb8327f0	新增树分割组件TreePanel	2026-04-02 11:36:59 +08:00
RuoYi	86cb7555eb	代码生成支持表单布局选项	2026-04-02 11:08:38 +08:00
RuoYi	b52c250cd4	支持表格列显隐状态记忆	2026-03-31 19:49:48 +08:00
RuoYi	461dc25c3b	支持多sheet导出	2026-03-31 18:48:28 +08:00
RuoYi	63a556bd3a	若依 3.6.8	2026-03-30 08:01:13 +08:00
RuoYi	d94b7d1a5f	优化页签全屏显示	2026-03-26 00:53:31 +08:00
RuoYi	385fc50c19	优化快速点击页签刷新出现404问题	2026-03-25 21:22:47 +08:00
RuoYi	50fc2989ee	修复typescript版多表代码生成报错问题	2026-03-25 13:03:12 +08:00
RuoYi	80483dd17c	菜单管理列表新增类型显示	2026-03-24 15:34:28 +08:00
RuoYi	ab77b8cb8d	优化菜单主题风格	2026-03-24 10:52:30 +08:00
RuoYi	14e8885fba	升级axios到最新版本0.30.3	2026-03-23 11:45:11 +08:00
RuoYi	c29f5e2c04	优化页签显示	2026-03-23 11:43:40 +08:00
RuoYi	b33ea72445	添加持久化标签页开关功能	2026-03-22 23:29:55 +08:00
RuoYi	543d169827	添加持久化标签页开关功能	2026-03-22 21:13:35 +08:00
RuoYi	9ddcb875a1	菜单搜索支持文本高亮&数量提示	2026-03-22 16:55:37 +08:00
RuoYi	aa5530f51b	优化页签功能&支持全屏按钮操作	2026-03-22 15:03:02 +08:00
RuoYi	0017cc8862	首页新增通知公告消息提醒	2026-03-22 00:15:34 +08:00
RuoYi	88c2e4979a	新增锁定屏幕功能	2026-03-21 23:29:22 +08:00
RuoYi	b43048a589	菜单管理支持批量保存排序	2026-03-21 22:54:21 +08:00
RuoYi	0025941824	保存排序添加编辑权限	2026-03-21 22:41:49 +08:00
RuoYi	784fe5c399	优化定时任务详情页展示&补充执行时间字段	2026-03-21 22:23:32 +08:00
RuoYi	af2d446a5f	字典类型列表新增抽屉效果详细信息	2026-03-21 22:07:16 +08:00
RuoYi	1f8dd5feb5	操作日志详细页面优化	2026-03-21 21:11:40 +08:00
RuoYi	d3b5e93952	优化RightToolbar搜索栏切换动画	2026-03-21 20:51:34 +08:00
RuoYi	8d84783daf	update README.md	2026-03-14 13:44:17 +08:00
若依	0bf6679753	!453 readme中添加nacos版本说明 Merge pull request !453 from magic/update/readme	2026-03-14 05:39:09 +00:00
gowshwah	e1e8b541db	readme中添加nacos版本说明	2026-03-14 00:31:55 +08:00
若依	d30a6450c9	!450 update docker image version for master branch Merge pull request !450 from magic/fix/docker	2026-03-12 14:22:10 +00:00
gowshwah	571a25d486	update docker image version for master branch	2026-03-12 16:42:31 +08:00
RuoYi	b0ff5a01a1	TypeScript前端代码生成模板同步到最新	2026-03-12 14:13:11 +08:00
RuoYi	39c1dafced	update README.md	2026-03-11 14:38:42 +08:00
RuoYi	33694fe082	项目升级到 Spring Boot 4	2026-03-11 14:33:22 +08:00
RuoYi	8c122a9609	升级fastjson到最新版2.0.61	2026-03-09 17:41:30 +08:00
RuoYi	de1dbe61a5	update userid default value	2026-03-09 17:38:37 +08:00
RuoYi	156471d638	优化Excel自定义格式样式重复创建问题	2026-03-09 15:12:11 +08:00
RuoYi	661e8cf7b4	优化字典类型属性提醒说明	2026-02-11 15:38:13 +08:00
RuoYi	28be96930c	README.md	2026-01-28 21:21:10 +08:00
RuoYi	6c6a2c0623	update README.md	2026-01-28 21:16:49 +08:00
RuoYi	7d821ed043	优化代码	2026-01-28 21:16:05 +08:00
RuoYi	5d54693b27	添加菜单路由地址和名称的校验规则	2026-01-09 11:19:02 +08:00
RuoYi	cfd619fa4f	优化防重提交间隔时间可自定义	2026-01-08 13:42:00 +08:00
RuoYi	e942847b89	修复Excel自定义格式样式污染问题	2026-01-06 13:54:27 +08:00
RuoYi	0b09d7c1da	copyright 2026	2026-01-05 14:50:53 +08:00
RuoYi	1c0562ba18	将isAdmin方法统一到SecurityUtils	2026-01-05 14:50:37 +08:00
RuoYi	da65996e69	若依 3.6.7	2025-12-22 09:17:03 +08:00
RuoYi	873444dd0b	优化topbar顶部菜单样式	2025-12-18 14:45:57 +08:00
RuoYi	2301280c4d	默认固定头部	2025-12-18 14:42:34 +08:00
RuoYi	4eebb27956	优化字典组件值宽松匹配	2025-12-16 16:42:15 +08:00
RuoYi	c2ff461ff0	升级fastjson到最新版2.0.60	2025-12-16 13:44:40 +08:00
RuoYi	eb489bda83	升级commons.io到最新版本2.21.0	2025-12-16 13:44:16 +08:00
RuoYi	1db2086163	升级druid到最新版本1.2.27	2025-12-16 13:43:20 +08:00
RuoYi	839e4f35f5	菜单导航设置支持纯顶部	2025-12-16 11:42:07 +08:00
RuoYi	f53b783049	优化数据权限控制逻辑，放开permission限制	2025-12-04 17:35:47 +08:00
RuoYi	97f30a5415	支持Excel导出对象的多个子列表	2025-12-04 16:48:19 +08:00
RuoYi	ad1d009165	升级tomcat到最新版本9.0.112	2025-12-04 16:43:11 +08:00
RuoYi	90cbabb7a7	优化代码	2025-12-04 16:42:55 +08:00
RuoYi	1c4dbb1e46	优化表单构建关闭页签销毁复制插件	2025-12-04 13:15:50 +08:00
RuoYi	a3eefb6bad	优化生成代码下载的zip文件名	2025-12-03 10:27:23 +08:00
RuoYi	09e8e9995a	网页标题设置新增SET_TITLE方法	2025-12-02 19:31:23 +08:00
RuoYi	381151bc50	支持Excel导出对象的多个子列表	2025-12-02 19:14:04 +08:00
RuoYi	66e502727a	登录/注册页面底部版权信息修改为读取配置	2025-12-02 15:34:27 +08:00
RuoYi	4265f8ecb7	修复v3时间控件between选择后清空报错问题	2025-12-02 15:00:36 +08:00
RuoYi	2c82079d04	修复表单构建移除所有控件后切换路由回来空白问题	2025-12-02 13:12:55 +08:00
RuoYi	6aecd35a4f	修复combo属性过多sheet出现的异常问题	2025-11-13 11:58:03 +08:00
RuoYi	ac92ae3ae6	修复固定头部时出现的导航栏偏移问题	2025-09-04 20:06:26 +08:00
RuoYi	1d2c8378f7	文件支持防盗链配置	2025-09-02 13:26:33 +08:00
RuoYi	50a9337ee8	优化代码	2025-08-28 13:51:15 +08:00
RuoYi	e6a3415a71	优化代码	2025-08-27 16:01:28 +08:00
RuoYi	7919af54da	用户导入添加验证提示	2025-08-23 11:46:49 +08:00
RuoYi	3503005f9d	优化布局设置显示	2025-08-23 11:46:39 +08:00
RuoYi	b304a41194	修复用户归属部门无法修改为空问题	2025-08-21 14:59:10 +08:00
RuoYi	a39ae33c82	columns default value	2025-08-09 16:13:49 +08:00
RuoYi	b9a27657c5	显示列信息支持对象格式	2025-08-09 15:19:13 +08:00
RuoYi	2e009841ca	自动识别json对象白名单配置范围缩小	2025-08-09 15:18:29 +08:00
RuoYi	2cbe4a8234	升级tomcat到最新版本9.0.108	2025-08-09 15:17:10 +08:00
RuoYi	4b37049713	添加新群号：112869560	2025-07-19 19:28:44 +08:00
RuoYi	e549210ad6	优化定时任务包名白名单匹配方式	2025-06-20 11:56:03 +08:00
RuoYi	ad988d54bb	优化Excel统计行数值的单元格样式显示	2025-06-19 14:54:00 +08:00
RuoYi	51a6fce0a5	升级tomcat到最新版本9.0.106	2025-06-18 13:41:37 +08:00
RuoYi	c86bfa9243	用户头像更换后移除旧头像文件	2025-06-06 19:36:36 +08:00
RuoYi	8aca11c2a2	若依 3.6.6	2025-05-30 08:03:00 +08:00
RuoYi	725033e361	升级fastjson到最新版2.0.57	2025-05-26 11:14:45 +08:00
RuoYi	d29e49e23b	注册账号设置默认密码最后更新时间	2025-05-26 11:14:06 +08:00
RuoYi	706c3bb69b	添加底部版权信息及开关	2025-05-24 14:33:51 +08:00
RuoYi	cd0ee95b9c	添加页签图标显示开关功能	2025-05-23 14:57:49 +08:00
RuoYi	3293e2fb56	账号密码支持自定义更新周期	2025-05-23 10:19:47 +08:00
RuoYi	924ec0eb6e	初始密码支持自定义修改策略	2025-05-23 09:58:23 +08:00
RuoYi	135b1204a9	升级tomcat到最新版本9.0.105	2025-05-15 10:55:18 +08:00
RuoYi	cb566a704b	升级commons.io到最新版本2.19.0	2025-05-15 10:23:50 +08:00
RuoYi	aadba0382e	delete vue-meta	2025-05-15 10:23:34 +08:00
RuoYi	a0ce1cf33b	delete eslint	2025-05-15 10:22:46 +08:00
RuoYi	3915c77391	优化导航栏显示昵称&设置	2025-05-09 14:02:09 +08:00
RuoYi	b80932ceb4	菜单搜索支持键盘选择&悬浮主题背景	2025-05-07 13:27:13 +08:00
RuoYi	056cf94082	图片上传组件新增disabled属性	2025-05-06 19:14:54 +08:00
RuoYi	0dcd3e6183	add columnName Drag	2025-05-06 14:54:44 +08:00
RuoYi	07be5ceb26	修复上传组件被多次引用拖动仅对第一个有效的问题	2025-05-06 13:46:21 +08:00
RuoYi	cc59502d7c	update icon	2025-05-05 11:22:35 +08:00
RuoYi	98738f23ad	上传组件新增拖动排序属性	2025-04-30 10:31:03 +08:00
RuoYi	57fe1c663e	优化Excel匹配数值型.0结尾	2025-04-28 11:20:48 +08:00
RuoYi	7b6fdb3a89	remove all semicolons	2025-04-27 11:56:21 +08:00
RuoYi	79c885decb	使用Gateway CacheRequestBody代替CacheRequestFilter	2025-04-25 15:11:17 +08:00
RuoYi	1a0f37a2dc	富文本复制粘贴图片上传至url	2025-04-24 18:19:16 +08:00
RuoYi	02de344d8c	update package.json	2025-04-24 18:18:44 +08:00
RuoYi	189100f74e	优化低版本node无法启动的问题	2025-04-22 12:07:07 +08:00
RuoYi	e29284e687	优化代码	2025-04-22 12:06:59 +08:00
RuoYi	d4af286f41	显隐列组件支持全选/全不选	2025-04-21 15:30:32 +08:00
RuoYi	60e2d55a23	优化菜单搜索查询页	2025-04-21 13:28:32 +08:00
RuoYi	bbd112d5a3	支持文件&图片组件自定义地址&参数	2025-04-18 13:25:28 +08:00
RuoYi	90922844ea	优化角色禁用不允许分配	2025-04-17 15:36:18 +08:00
RuoYi	3a9f56f04b	update status name	2025-04-17 15:35:58 +08:00
RuoYi	a1ec1d57d4	remove dev runjs	2025-03-18 16:01:46 +08:00
RuoYi	060959a7c5	登录页和注册页表头使用VUE_APP_TITLE配置值	2025-03-18 16:01:20 +08:00
RuoYi	43e1d8d573	升级tomcat到最新版本9.0.102	2025-03-14 16:12:40 +08:00
RuoYi	67cf51ba77	update handleTree	2025-03-14 16:12:29 +08:00
RuoYi	a256618d5d	优化代码	2025-03-11 12:52:17 +08:00
若依	a6bcebb62b	!397 修复actuator暴漏问题 Merge pull request !397 from 威士忌的纯度/N/A	2025-03-10 03:45:34 +00:00
威士忌的纯度	1cb262daa3	修复actuator暴漏问题 Signed-off-by: 威士忌的纯度 <whr888888@vip.qq.com>	2025-03-07 10:22:52 +00:00
RuoYi	8c096cba8d	优化isAdmin方法,避免脱敏模块security依赖	2025-03-07 12:56:31 +08:00
RuoYi	088cec8adf	菜单管理新增路由名称	2025-03-06 11:09:34 +08:00
RuoYi	85ff6a9910	优化顶部菜单搜索栏为多层级显示	2025-03-05 18:14:13 +08:00
RuoYi	cab5beaca7	文件上传组件新增disabled属性&类型	2025-03-05 18:13:40 +08:00
RuoYi	fc8069a250	优化导出Excel日期格式双击离开后与设定的格式不一致问题	2025-03-05 18:13:12 +08:00
RuoYi	924e705dca	代码生成列表支持按时间排序	2025-03-05 18:12:52 +08:00
RuoYi	049ba453d1	优化空指针异常时无法获取错误信息问题	2025-03-05 18:10:56 +08:00
RuoYi	4aa261e8f7	优化定时任务字符包含多个括号导致数据错误	2025-03-05 18:10:12 +08:00
RuoYi	914a6620f5	升级tomcat到最新版本9.0.98	2025-03-05 18:08:29 +08:00
RuoYi	3dcee7057d	优化代码	2025-03-05 18:01:33 +08:00
RuoYi	0467631319	update ry_config.sql	2025-02-24 16:24:36 +08:00
若依	a11df90255	!393 config(nacos):增加nacos2.5.0配置文件sql Merge pull request !393 from 牟雷/master	2025-02-18 00:33:39 +00:00
牟雷	596e4fe756	config(nacos):增加nacos2.5.0配置文件sql	2025-02-17 20:19:22 +08:00
RuoYi	37219e4ae6	copyright 2025	2025-01-07 10:55:58 +08:00
RuoYi	adaa3e1db8	代码生成新增配置是否允许文件覆盖到本地	2024-12-25 16:30:44 +08:00
RuoYi	88ad5a2c19	优化导入带标题文件关闭清理	2024-12-25 16:24:38 +08:00
RuoYi	b45dc2ec25	update sqlkeyword	2024-12-25 16:24:02 +08:00
RuoYi	67b17da06f	优化特殊字符密码修改失败问题	2024-12-17 14:28:17 +08:00
RuoYi	b25a280ebb	优化TopNav内链菜单点击没有高亮(IB8WHJ)	2024-12-17 11:57:05 +08:00
RuoYi	cc026e75a3	优化菜单管理切换Mini布局错乱问题	2024-12-17 11:25:03 +08:00
RuoYi	7216b56a56	用户管理过滤掉已禁用部门	2024-12-11 11:43:00 +08:00
RuoYi	a326e880a1	修改主题样式本地读取	2024-12-07 17:08:53 +08:00
RuoYi	92c6d21855	优化文件异常输入流未关闭的问题	2024-12-05 14:27:54 +08:00
RuoYi	2335157f6e	白名单支持对通配符路径匹配	2024-12-04 08:52:13 +08:00
RuoYi	6c3b01c3c5	Excel注解支持wrapText是否允许内容换行	2024-12-03 09:07:04 +08:00
RuoYi	8faea60191	修复导出子列表对象只能在最后的问题	2024-12-02 20:37:12 +08:00
RuoYi	28a16d9878	修复默认关闭Tags-Views时，内链页面打不开	2024-11-27 19:49:12 +08:00
RuoYi	dd3cf18e27	修复TopNav无法正确获取active的问题	2024-11-27 09:02:26 +08:00
RuoYi	65d03dc014	优化代码	2024-11-25 22:30:03 +08:00
RuoYi	7912fd81bd	面板兼容移动端显示	2024-11-25 15:41:00 +08:00
RuoYi	e2175e5b9d	参数键值更换为多行文本	2024-11-25 12:15:49 +08:00
RuoYi	c0e119f8e0	菜单面包屑导航支持多层级显示	2024-11-22 20:45:08 +08:00
RuoYi	fa77b2a08c	分栏参数微调	2024-11-22 14:46:59 +08:00
RuoYi	a222c24796	用户管理支持分栏拖动	2024-11-22 13:58:37 +08:00
RuoYi	08f4b877ce	优化代码	2024-11-20 11:13:24 +08:00
RuoYi	aa607d135c	update .env.staging	2024-11-20 10:43:07 +08:00
RuoYi	6d34cdb8a3	若依 3.6.5	2024-11-13 08:38:24 +08:00
RuoYi	d47352253e	升级spring-cloud相关组件到最新版	2024-11-12 15:12:01 +08:00
RuoYi	61cbd470e1	update datascope	2024-11-12 15:10:47 +08:00
RuoYi	b3ef4adfed	支持自定义显示Excel属性列	2024-11-07 22:25:48 +08:00
RuoYi	856c471472	优化代码	2024-11-06 10:20:18 +08:00
RuoYi	bec5600f16	优化无用户编号不校验数据权限	2024-11-05 16:30:15 +08:00
RuoYi	5b485e7934	校检文件名是否包含特殊字符	2024-11-05 12:50:12 +08:00
RuoYi	73a752d3ab	优化身份证脱敏正则	2024-10-21 17:16:01 +08:00
RuoYi	1899a832b9	优化权限更新后同步缓存	2024-10-21 17:15:30 +08:00
RuoYi	e6796c0954	操作日志记录DELETE请求参数	2024-10-17 13:17:25 +08:00
RuoYi	4987289a98	升级quill到最新版本2.0.2	2024-10-15 16:21:20 +08:00
RuoYi	18409922a5	修改代码生成上级菜单字段类型	2024-09-27 16:23:36 +08:00
RuoYi	3dca02b306	修复角色禁用权限不失效问题	2024-09-21 12:08:41 +08:00
RuoYi	75f3275e15	修复角色禁用权限不失效问题	2024-09-21 12:01:48 +08:00
RuoYi	b2e4a7046b	update ry_config	2024-09-02 20:21:30 +08:00
RuoYi	60618c1da9	优化提示	2024-09-02 20:21:15 +08:00
RuoYi	3b499b1344	使用SpringDoc代替Swagger	2024-08-30 11:26:57 +08:00