Pre Merge pull request !401 from D哥/N/A

解决数据权限过滤处理逻辑中，莫名其妙添加AND (d.dept_id = 0)的问题。
修改前生成sql语句：
SELECT d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.tenant_id FROM sys_dept d WHERE d.del_flag = '0' AND (d.dept_id = 0) ORDER BY d.parent_id, d.order_num

修改后生成sql语句：
SELECT d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time, d.tenant_id FROM sys_dept d WHERE d.del_flag = '0' ORDER BY d.parent_id, d.order_num

Signed-off-by: D哥 <12271764+darrenteng@user.noreply.gitee.com>

README.md

@@ -1,11 +1,11 @@
 <p align="center">
 	<img alt="logo" src="https://oscimg.oschina.net/oscnet/up-b99b286755aef70355a7084753f89cdb7c9.png">
 </p>
-<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.8</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.5</h1>
 <h4 align="center">基于 Vue/Element UI 和 Spring Boot/Spring Cloud & Alibaba 前后端分离的分布式微服务架构</h4>
 <p align="center">
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/stargazers"><img src="https://gitee.com/y_project/RuoYi-Cloud/badge/star.svg?theme=dark"></a>
-	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.8-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.5-brightgreen.svg"></a>
 	<a href="https://gitee.com/y_project/RuoYi-Cloud/blob/master/LICENSE"><img src="https://img.shields.io/github/license/mashape/apistatus.svg"></a>
 </p>
 
@@ -13,35 +13,14 @@
 
 若依是一套全部开源的快速开发平台，毫无保留给个人及企业免费使用。
 
-* 本仓库为RuoYi-Cloud的Spring Boot 3 的版本，保持同步更新。
+* 采用前后端分离的模式，微服务版本前端(基于 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue))。
-* 后端采用Spring Boot3、Spring Cloud & Alibaba。
+* 后端采用Spring Boot、Spring Cloud & Alibaba。
 * 注册中心、配置中心选型Nacos，权限认证使用Redis。
 * 流量控制框架选型Sentinel，分布式事务选型Seata。
+* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3)，保持同步更新。
+* 如需不分离应用，请移步 [RuoYi](https://gitee.com/y_project/RuoYi)，如需分离应用，请移步 [RuoYi-Vue](https://gitee.com/y_project/RuoYi-Vue)
 * 阿里云优惠券：[点我进入](http://aly.ruoyi.vip)，腾讯云优惠券：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
 
-# 版本分支
-
-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  |  
-
-RuoYi-Cloud 前端项目提供 Vue 2.x / 3.x / JavaScript TypeScript 版本均可混用搭配
-
-| 项目名称      | **RuoYi-Cloud** | **RuoYi-Cloud-Vue3** | **RuoYi-Cloud-Vue3-TypeScript**   |
-| :---          | :---            | :---                 | :---                              |
-| **前端框架**  | Vue 2           | Vue 3                | Vue 3                             |
-| **脚本语言**  | JavaScript      | JavaScript           | TypeScript                        |
-| **构建工具**  | Vue CLI         | Vite                 | Vite                              |
-| **UI 组件库** | Element UI      | Element Plus         | Element Plus                      |
-| **状态管理**  | Vuex            | Pinia                | Pinia                             |
-| **路由管理**  | Vue Router 3    | Vue Router 4         | Vue Router 4                      |
-| **核心特点**  | 1. 技术栈经典稳定<br>2. 社区资料丰富<br>3. 当前维护重心已转移 | 1. 现代前端技术栈<br>2. 开发体验与性能更优<br>3. 官方主推的活跃版本 | 1. 类型加持，减少沟通成本<br>2. 开发时有提示，效率更高<br>3. 多人协作企业级开发项目 |
-| **仓库地址**  | [RuoYi-Cloud](https://gitee.com/y_project/RuoYi-Cloud) | [RuoYi-Cloud-Vue3](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3) | [RuoYi-Cloud-Vue3-TypeScript](https://gitcode.com/yangzongzhuan/RuoYi-Cloud-Vue3/tree/typescript) |
-
 ## 系统模块
 
 ~~~
@@ -147,4 +126,4 @@ com.ruoyi
 
 ## 若依微服务交流群
 
-QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/已满-128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) [![加入QQ群](https://img.shields.io/badge/已满-179219821-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=irnwcXhbLOQEv1g-TwGifjNTA_f4wZiA&authKey=4bpzEwhcUY%2FvsPDHvzYn6xfoS%2FtOArvZ%2BGXzfr7O0%2FEqLfkKA%2BuCDXlzHIFg8t93&noverify=0&group_code=179219821) [![加入QQ群](https://img.shields.io/badge/已满-158753145-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lx1uEdEDuxeM7rUvF3qmlFdqKqdJ5Z-R&authKey=rgyPW9yhhh4IIURKVFa6NgP3qiqH04WAzrJ0trsgkr3pjzm6sKIOGyA58oOjoj%2FJ&noverify=0&group_code=158753145) [![加入QQ群](https://img.shields.io/badge/112869560-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=Kuaw0Xdlw2Nlgn6s8h9elzuquHGxGObD&authKey=cSrQcWQ%2BzQZAFFrwxaR%2BbzcumX4WRduZnd1O6JO1dlclQMiu%2BKwxAy8t2JfNp67V&noverify=0&group_code=112869560) 点击按钮入群。
+QQ群： [![加入QQ群](https://img.shields.io/badge/已满-42799195-blue.svg)](https://jq.qq.com/?_wv=1027&k=yqInfq0S) [![加入QQ群](https://img.shields.io/badge/已满-170157040-blue.svg)](https://jq.qq.com/?_wv=1027&k=Oy1mb3p8) [![加入QQ群](https://img.shields.io/badge/已满-130643120-blue.svg)](https://jq.qq.com/?_wv=1027&k=rvxkJtXK) [![加入QQ群](https://img.shields.io/badge/已满-225920371-blue.svg)](https://jq.qq.com/?_wv=1027&k=0Ck3PvTe) [![加入QQ群](https://img.shields.io/badge/已满-201705537-blue.svg)](https://jq.qq.com/?_wv=1027&k=FnHHP4TT) [![加入QQ群](https://img.shields.io/badge/已满-236543183-blue.svg)](https://jq.qq.com/?_wv=1027&k=qdT1Ojpz) [![加入QQ群](https://img.shields.io/badge/已满-213618602-blue.svg)](https://jq.qq.com/?_wv=1027&k=nw3OiyXs) [![加入QQ群](https://img.shields.io/badge/已满-148794840-blue.svg)](https://jq.qq.com/?_wv=1027&k=kiU5WDls) [![加入QQ群](https://img.shields.io/badge/已满-118752664-blue.svg)](https://jq.qq.com/?_wv=1027&k=MtBy6YfT) [![加入QQ群](https://img.shields.io/badge/已满-101038945-blue.svg)](https://jq.qq.com/?_wv=1027&k=FqImHgH2) [![加入QQ群](https://img.shields.io/badge/已满-128355254-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=G4jZ4EtdT50PhnMBudTnEwgonxkXOscJ&authKey=FkGHYfoTKlGE6wHdKdjH9bVoOgQjtLP9WM%2Fj7pqGY1msoqw9uxDiBo39E2mLgzYg&noverify=0&group_code=128355254) [![加入QQ群](https://img.shields.io/badge/已满-179219821-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=irnwcXhbLOQEv1g-TwGifjNTA_f4wZiA&authKey=4bpzEwhcUY%2FvsPDHvzYn6xfoS%2FtOArvZ%2BGXzfr7O0%2FEqLfkKA%2BuCDXlzHIFg8t93&noverify=0&group_code=179219821) [![加入QQ群](https://img.shields.io/badge/158753145-blue.svg)](http://qm.qq.com/cgi-bin/qm/qr?_wv=1027&k=lx1uEdEDuxeM7rUvF3qmlFdqKqdJ5Z-R&authKey=rgyPW9yhhh4IIURKVFa6NgP3qiqH04WAzrJ0trsgkr3pjzm6sKIOGyA58oOjoj%2FJ&noverify=0&group_code=158753145) 点击按钮入群。

docker/copy.sh

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

docker/docker-compose.yml

@@ -2,14 +2,11 @@ version : '3.8'
 services:
   ruoyi-nacos:
     container_name: ruoyi-nacos
-    image: nacos/nacos-server:v3.0.2
+    image: nacos/nacos-server
     build:
       context: ./nacos
     environment:
       - MODE=standalone
-      - NACOS_AUTH_TOKEN=your_auth_token
-      - NACOS_AUTH_IDENTITY_KEY=your_identity_key
-      - NACOS_AUTH_IDENTITY_VALUE=your_identity_value
     volumes:
       - ./nacos/logs/:/home/nacos/logs
       - ./nacos/conf/application.properties:/home/nacos/conf/application.properties

docker/nacos/conf/application.properties

@@ -24,7 +24,6 @@ nacos.core.auth.system.type=nacos
 nacos.core.auth.enabled=false
 nacos.core.auth.default.token.expire.seconds=18000
 nacos.core.auth.default.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
-nacos.core.auth.plugin.nacos.token.secret.key=SecretKey012345678901234567890123456789012345678901234567890123456789
 nacos.core.auth.caching.enabled=true
 nacos.core.auth.enable.userAgentAuthWhite=false
 nacos.core.auth.server.identity.key=serverIdentity

docker/nacos/dockerfile

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

docker/ruoyi/auth/dockerfile

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

docker/ruoyi/gateway/dockerfile

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

docker/ruoyi/modules/file/dockerfile

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

docker/ruoyi/modules/gen/dockerfile

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

docker/ruoyi/modules/job/dockerfile

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

docker/ruoyi/modules/system/dockerfile

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

docker/ruoyi/visual/monitor/dockerfile

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

pom.xml

@@ -6,40 +6,53 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.6.8</version>
+    <version>3.6.5</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
     <properties>
-        <ruoyi.version>3.6.8</ruoyi.version>
+        <ruoyi.version>3.6.5</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>17</java.version>
+        <java.version>1.8</java.version>
-        <spring-boot.version>3.5.11</spring-boot.version>
+        <spring-boot.version>2.7.18</spring-boot.version>
-        <spring-cloud.version>2025.0.1</spring-cloud.version>
+        <spring-cloud.version>2021.0.9</spring-cloud.version>
-        <spring-cloud-alibaba.version>2025.0.0.0</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>3.5.8</spring-boot-admin.version>
+        <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
-        <mybatis-spring.version>3.0.5</mybatis-spring.version>
+        <tobato.version>1.27.2</tobato.version>
         <kaptcha.version>2.3.3</kaptcha.version>
-        <pagehelper.boot.version>2.1.0</pagehelper.boot.version>
+        <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
-        <druid.version>1.2.27</druid.version>
+        <druid.version>1.2.23</druid.version>
-        <dynamic-ds.version>4.5.0</dynamic-ds.version>
+        <dynamic-ds.version>4.3.1</dynamic-ds.version>
-        <commons.io.version>2.21.0</commons.io.version>
+        <commons.io.version>2.19.0</commons.io.version>
         <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.61</fastjson.version>
+        <fastjson.version>2.0.53</fastjson.version>
         <jjwt.version>0.9.1</jjwt.version>
         <minio.version>8.2.2</minio.version>
         <poi.version>4.1.2</poi.version>
-        <springdoc.version>2.8.16</springdoc.version>
+        <springdoc.version>1.6.9</springdoc.version>
-        <transmittable-thread-local.version>2.14.5</transmittable-thread-local.version>
+        <transmittable-thread-local.version>2.14.4</transmittable-thread-local.version>
+        <!-- override dependency version -->
+        <tomcat.version>9.0.105</tomcat.version>
+        <logback.version>1.2.13</logback.version>
+        <spring-framework.version>5.3.39</spring-framework.version>
     </properties>
 
     <!-- 依赖声明 -->
     <dependencyManagement>
         <dependencies>
 
+            <!-- 覆盖SpringFramework的依赖配置-->
+            <dependency>
+                <groupId>org.springframework</groupId>
+                <artifactId>spring-framework-bom</artifactId>
+                <version>${spring-framework.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+
             <!-- SpringCloud 微服务 -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
@@ -67,10 +80,49 @@
                 <scope>import</scope>
             </dependency>
 
+            <!-- 覆盖logback的依赖配置-->
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-core</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>ch.qos.logback</groupId>
+                <artifactId>logback-classic</artifactId>
+                <version>${logback.version}</version>
+            </dependency>
+
+            <!-- 覆盖tomcat的依赖配置-->
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-core</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-el</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.tomcat.embed</groupId>
+                <artifactId>tomcat-embed-websocket</artifactId>
+                <version>${tomcat.version}</version>
+            </dependency>
+
+            <!-- FastDFS 分布式文件系统 -->
+            <dependency>
+                <groupId>com.github.tobato</groupId>
+                <artifactId>fastdfs-client</artifactId>
+                <version>${tobato.version}</version>
+            </dependency>
+
             <!-- Springdoc webmvc 依赖配置 -->
             <dependency>
                 <groupId>org.springdoc</groupId>
-                <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+                <artifactId>springdoc-openapi-ui</artifactId>
                 <version>${springdoc.version}</version>
             </dependency>
 
@@ -86,18 +138,6 @@
                 <groupId>com.github.pagehelper</groupId>
                 <artifactId>pagehelper-spring-boot-starter</artifactId>
                 <version>${pagehelper.boot.version}</version>
-                <exclusions>
-                    <exclusion>
-                        <artifactId>mybatis-spring</artifactId>
-                        <groupId>org.mybatis</groupId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <dependency>
-                <groupId>org.mybatis</groupId>
-                <artifactId>mybatis-spring</artifactId>
-                <version>${mybatis-spring.version}</version>
             </dependency>
 
             <!-- io常用工具类 -->
@@ -238,9 +278,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.11.0</version>
                 <configuration>
-                    <parameters>true</parameters>
                     <source>${java.version}</source>
                     <target>${java.version}</target>
                     <encoding>${project.build.sourceEncoding}</encoding>

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-api/ruoyi-api-system/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-api</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteFileService.java

@@ -2,9 +2,7 @@ package com.ruoyi.system.api;
 
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.constant.ServiceNameConstants;
@@ -28,13 +26,4 @@ public interface RemoteFileService
      */
     @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public R<SysFile> upload(@RequestPart(value = "file") MultipartFile file);
-
-    /**
-     * 删除文件
-     *
-     * @param fileUrl 文件地址
-     * @return 结果
-     */
-    @DeleteMapping(value = "/delete", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
-    public R<Boolean> delete(@RequestParam("fileUrl") String fileUrl);
 }

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDept.java

@@ -2,10 +2,10 @@ package com.ruoyi.system.api.domain;
 
 import java.util.ArrayList;
 import java.util.List;
-import jakarta.validation.constraints.Email;
+import javax.validation.constraints.Email;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
+import javax.validation.constraints.NotNull;
-import jakarta.validation.constraints.Size;
+import javax.validation.constraints.Size;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.web.domain.BaseEntity;

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictData.java

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

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysDictType.java

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

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysRole.java

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

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -2,8 +2,7 @@ package com.ruoyi.system.api.domain;
 
 import java.util.Date;
 import java.util.List;
-import jakarta.validation.constraints.*;
+import javax.validation.constraints.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -69,13 +68,9 @@ public class SysUser extends BaseEntity
     private String loginIp;
 
     /** 最后登录时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Excel(name = "最后登录时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss", type = Type.EXPORT)
     private Date loginDate;
 
-    /** 密码最后更新时间 */
-    private Date pwdUpdateDate;
-
     /** 部门对象 */
     @Excels({
         @Excel(name = "部门名称", targetAttr = "deptName", type = Type.EXPORT),
@@ -116,6 +111,11 @@ public class SysUser extends BaseEntity
     }
 
     public boolean isAdmin()
+    {
+        return isAdmin(this.userId);
+    }
+
+    public static boolean isAdmin(Long userId)
     {
         return UserConstants.isAdmin(userId);
     }
@@ -248,16 +248,6 @@ public class SysUser extends BaseEntity
         this.loginDate = loginDate;
     }
 
-    public Date getPwdUpdateDate()
-    {
-        return pwdUpdateDate;
-    }
-
-    public void setPwdUpdateDate(Date pwdUpdateDate)
-    {
-        this.pwdUpdateDate = pwdUpdateDate;
-    }
-
     public SysDept getDept()
     {
         return dept;
@@ -324,7 +314,6 @@ public class SysUser extends BaseEntity
             .append("delFlag", getDelFlag())
             .append("loginIp", getLoginIp())
             .append("loginDate", getLoginDate())
-            .append("pwdUpdateDate", getPwdUpdateDate())
             .append("createBy", getCreateBy())
             .append("createTime", getCreateTime())
             .append("updateBy", getUpdateBy())

ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteFileFallbackFactory.java

@@ -30,12 +30,6 @@ public class RemoteFileFallbackFactory implements FallbackFactory<RemoteFileServ
             {
                 return R.fail("上传文件失败:" + throwable.getMessage());
             }
-
-            @Override
-            public R<Boolean> delete(String fileUrl)
-            {
-                return R.fail("删除文件失败:" + throwable.getMessage());
-            }
         };
     }
 }

ruoyi-auth/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

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

@@ -1,6 +1,6 @@
 package com.ruoyi.auth.controller;
 
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.auth.form.LoginBody;
 import com.ruoyi.auth.form.RegisterBody;
-import com.ruoyi.auth.form.UnLockBody;
 import com.ruoyi.auth.service.SysLoginService;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.JwtUtils;
@@ -76,14 +75,4 @@ public class TokenController
         sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
         return R.ok();
     }
-
-    /**
-     * 解锁屏幕
-     */
-    @PostMapping("/unlockscreen")
-    public R<?> unlockScreen(@RequestBody UnLockBody unLockBody)
-    {
-        sysLoginService.unlock(unLockBody.getPassword());
-        return R.ok();
-    }
 }

ruoyi-auth/src/main/java/com/ruoyi/auth/form/UnLockBody.java

@@ -1,24 +0,0 @@
-package com.ruoyi.auth.form;
-
-/**
- * 系统解锁对象
- * 
- * @author ruoyi
- */
-public class UnLockBody
-{
-    /**
-     * 用户密码
-     */
-    private String password;
-
-    public String getPassword()
-    {
-        return password;
-    }
-
-    public void setPassword(String password)
-    {
-        this.password = password;
-    }
-}

ruoyi-auth/src/main/java/com/ruoyi/auth/service/SysLoginService.java

@@ -113,40 +113,11 @@ public class SysLoginService
         remoteUserService.recordUserLogin(sysUser, SecurityConstants.INNER);
     }
 
-    /**
-     * 退出
-     */
     public void logout(String loginName)
     {
         recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功");
     }
 
-    /**
-     * 解锁
-     */
-    public void unlock(String password)
-    {
-        String username = SecurityUtils.getUsername();
-        // 或密码为空 错误
-        if (StringUtils.isEmpty(password))
-        {
-            throw new ServiceException("密码不能为空");
-        }
-        // 查询用户信息
-        R<LoginUser> userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER);
-
-        if (R.FAIL == userResult.getCode())
-        {
-            throw new ServiceException(userResult.getMsg());
-        }
-
-        SysUser user = userResult.getData().getSysUser();
-        if (!SecurityUtils.matchesPassword(password, user.getPassword()))
-        {
-            throw new ServiceException("密码错误，请重新输入");
-        }
-    }
-
     /**
      * 注册
      */
@@ -172,7 +143,6 @@ public class SysLoginService
         SysUser sysUser = new SysUser();
         sysUser.setUserName(username);
         sysUser.setNickName(username);
-        sysUser.setPwdUpdateDate(DateUtils.getNowDate());
         sysUser.setPassword(SecurityUtils.encryptPassword(password));
         R<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
 

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

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

ruoyi-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -53,24 +53,12 @@
             <artifactId>pagehelper-spring-boot-starter</artifactId>
         </dependency>
 
-        <!-- Mybatis Spring -->
-        <dependency>
-            <groupId>org.mybatis</groupId>
-            <artifactId>mybatis-spring</artifactId>
-        </dependency>
-
         <!-- Hibernate Validator -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-validation</artifactId>
         </dependency>
 
-        <!-- Spring Aop -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-aop</artifactId>
-        </dependency>
-
         <!-- Jackson -->
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
@@ -93,7 +81,6 @@
         <dependency>
             <groupId>javax.xml.bind</groupId>
             <artifactId>jaxb-api</artifactId>
-            <version>2.3.1</version>
         </dependency>
 
         <!-- Apache Lang3 -->
@@ -116,8 +103,8 @@
 
         <!-- Java Servlet -->
         <dependency>
-            <groupId>jakarta.servlet</groupId>
+            <groupId>javax.servlet</groupId>
-            <artifactId>jakarta.servlet-api</artifactId>
+            <artifactId>javax.servlet-api</artifactId>
         </dependency>
 
     </dependencies>

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

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

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java

@@ -87,16 +87,6 @@ public class Constants
      */
     public static final String LOGIN_FAIL = "Error";
 
-    /**
-     * 所有权限标识
-     */
-    public static final String ALL_PERMISSION = "*:*:*";
-
-    /**
-     * 管理员角色权限标识
-     */
-    public static final String SUPER_ADMIN = "admin";
-
     /**
      * 当前记录起始索引
      */
@@ -130,7 +120,7 @@ public class Constants
     /**
      * 自动识别json对象白名单配置（仅允许解析的包名，范围越小越安全）
      */
-    public static final String[] JSON_WHITELIST_STR = { "com.ruoyi" };
+    public static final String[] JSON_WHITELIST_STR = { "org.springframework", "com.ruoyi" };
 
     /**
      * 定时任务白名单配置（仅允许访问的包名，如其他需要可以自行添加）
@@ -142,35 +132,4 @@ public class Constants
      */
     public static final String[] JOB_ERROR_STR = { "java.net.URL", "javax.naming.InitialContext", "org.yaml.snakeyaml",
             "org.springframework", "org.apache", "com.ruoyi.common.core.utils.file" };
-
-    /**
-     * 部门相关常量
-     */
-    public static class Dept
-    {
-        /**
-         * 全部数据权限
-         */
-        public static final String DATA_SCOPE_ALL = "1";
-
-        /**
-         * 自定数据权限
-         */
-        public static final String DATA_SCOPE_CUSTOM = "2";
-
-        /**
-         * 部门数据权限
-         */
-        public static final String DATA_SCOPE_DEPT = "3";
-
-        /**
-         * 部门及以下数据权限
-         */
-        public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
-
-        /**
-         * 仅本人数据权限
-         */
-        public static final String DATA_SCOPE_SELF = "5";
-    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/GenConstants.java

@@ -31,9 +31,6 @@ public class GenConstants
     /** 上级菜单名称字段 */
     public static final String PARENT_MENU_NAME = "parentMenuName";
 
-    /** 生成详情页开关 */
-    public static final String GEN_VIEW = "genView";
-
     /** 数据库字符串类型 */
     public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2" };
 

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java

@@ -53,7 +53,7 @@ public class SecurityContextHolder
 
     public static Long getUserId()
     {
-        return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), null);
+        return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
     }
 
     public static void setUserId(String account)

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/file/InvalidExtensionException.java

@@ -3,7 +3,7 @@ package com.ruoyi.common.core.exception.file;
 import java.util.Arrays;
 
 /**
- * 文件上传无效扩展名异常类
+ * 文件上传 误异常类
  * 
  * @author ruoyi
  */

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

@@ -16,7 +16,6 @@ import org.apache.commons.lang3.time.DateFormatUtils;
  *
  * @author ruoyi
  */
-@SuppressWarnings("deprecation")
 public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 {
     public static String YYYY = "yyyy";
@@ -137,14 +136,6 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         return new Date(time);
     }
 
-    /**
-     * 计算相差天数
-     */
-    public static int differentDaysByMillisecond(Date date1, Date date2)
-    {
-        return Math.abs((int) ((date2.getTime() - date1.getTime()) / (1000 * 3600 * 24)));
-    }
-
     /**
      * 计算时间差
      *

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

@@ -8,10 +8,10 @@ import java.util.Collections;
 import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.servlet.ServletRequest;
+import javax.servlet.ServletRequest;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
-import jakarta.servlet.http.HttpSession;
+import javax.servlet.http.HttpSession;
 import org.springframework.core.io.buffer.DataBuffer;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;

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

@@ -12,7 +12,6 @@ import com.ruoyi.common.core.text.StrFormatter;
  * 
  * @author ruoyi
  */
-@SuppressWarnings("deprecation")
 public class StringUtils extends org.apache.commons.lang3.StringUtils
 {
     /** 空字符串 */

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/bean/BeanValidators.java

@@ -1,9 +1,9 @@
 package com.ruoyi.common.core.utils.bean;
 
 import java.util.Set;
-import jakarta.validation.ConstraintViolation;
+import javax.validation.ConstraintViolation;
-import jakarta.validation.ConstraintViolationException;
+import javax.validation.ConstraintViolationException;
-import jakarta.validation.Validator;
+import javax.validation.Validator;
 
 /**
  * bean对象属性验证

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/file/FileUtils.java

@@ -8,8 +8,8 @@ import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 
@@ -114,20 +114,20 @@ public class FileUtils
     }
 
     /**
-     * 校验文件路径合法性（安全性与扩展名）
+     * 检查文件是否可下载
      * 
-     * @param fileUrl 待校验的文件地址
+     * @param resource 需要下载的文件
      * @return true 正常 false 非法
      */
-    public static boolean validateFilePath(String fileUrl)
+    public static boolean checkAllowDownload(String resource)
     {
         // 禁止目录上跳级别
-        if (StringUtils.contains(fileUrl, ".."))
+        if (StringUtils.contains(resource, ".."))
         {
             return false;
         }
         // 判断是否在允许下载的文件规则内
-        return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(fileUrl));
+        return ArrayUtils.contains(MimeTypeUtils.DEFAULT_ALLOWED_EXTENSION, FileTypeUtils.getFileType(resource));
     }
 
     /**

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/ip/IpUtils.java

@@ -2,7 +2,7 @@ package com.ruoyi.common.core.utils.ip;
 
 import java.net.InetAddress;
 import java.net.UnknownHostException;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 

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

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

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

@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.RegExUtils;
 import org.apache.commons.lang3.reflect.FieldUtils;
@@ -73,17 +73,10 @@ public class ExcelUtil<T>
 {
     private static final Logger log = LoggerFactory.getLogger(ExcelUtil.class);
 
-    public static final String SEPARATOR = ",";
-
     public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
 
     public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
 
-    /**
-     * 单元格样式缓存
-     */
-    private Map<String, CellStyle> cellStyleCache = new HashMap<String, CellStyle>();
-
     /**
      * Excel sheet最大行数，默认65536
      */
@@ -152,18 +145,23 @@ public class ExcelUtil<T>
     /**
      * 对象的子列表方法
      */
-    private Map<String, Method> subMethods;
+    private Method subMethod;
 
     /**
      * 对象的子列表属性
      */
-    private Map<String, List<Field>> subFieldsMap;
+    private List<Field> subFields;
 
     /**
      * 统计列表
      */
     private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
 
+    /**
+     * 数字格式
+     */
+    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
+
     /**
      * 实体对象
      */
@@ -230,10 +228,7 @@ public class ExcelUtil<T>
             int titleLastCol = this.fields.size() - 1;
             if (isSubList())
             {
-                for (List<Field> currentSubFields : subFieldsMap.values())
+                titleLastCol = titleLastCol + subFields.size() - 1;
-                {
-                    titleLastCol = titleLastCol + currentSubFields.size() - 1;
-                }
             }
             Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
             titleRow.setHeightInPoints(30);
@@ -253,17 +248,16 @@ public class ExcelUtil<T>
         {
             Row subRow = sheet.createRow(rownum);
             int column = 0;
+            int subFieldSize = subFields != null ? subFields.size() : 0;
             for (Object[] objects : fields)
             {
                 Field field = (Field) objects[0];
                 Excel attr = (Excel) objects[1];
-                CellStyle cellStyle = styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor()));
                 if (Collection.class.isAssignableFrom(field.getType()))
                 {
                     Cell cell = subRow.createCell(column);
                     cell.setCellValue(attr.name());
-                    cell.setCellStyle(cellStyle);
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
-                    int subFieldSize = subFieldsMap != null ? subFieldsMap.get(field.getName()).size() : 0;
                     if (subFieldSize > 1)
                     {
                         CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
@@ -275,7 +269,7 @@ public class ExcelUtil<T>
                 {
                     Cell cell = subRow.createCell(column++);
                     cell.setCellValue(attr.name());
-                    cell.setCellStyle(cellStyle);
+                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
                 }
             }
             rownum++;
@@ -347,11 +341,7 @@ public class ExcelUtil<T>
             Map<String, Integer> cellMap = new HashMap<String, Integer>();
             // 获取表头
             Row heard = sheet.getRow(titleNum);
-            if (heard == null)
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++)
-            {
-                throw new UtilException("文件标题行为空，请检查Excel文件格式");
-            }
-            for (int i = 0; i < heard.getLastCellNum(); i++)
             {
                 Cell cell = heard.getCell(i);
                 if (StringUtils.isNotNull(cell))
@@ -359,6 +349,10 @@ public class ExcelUtil<T>
                     String value = this.getCellValue(heard, i).toString();
                     cellMap.put(value, i);
                 }
+                else
+                {
+                    cellMap.put(null, i);
+                }
             }
             // 有数据时才处理 得到类的所有field.
             List<Object[]> fields = this.getFields();
@@ -387,7 +381,7 @@ public class ExcelUtil<T>
                     Object val = this.getCellValue(row, entry.getKey());
 
                     // 如果不存在实例则新建.
-                    entity = (entity == null ? clazz.getDeclaredConstructor().newInstance() : entity);
+                    entity = (entity == null ? clazz.newInstance() : entity);
                     // 从map中得到对应列的field.
                     Field field = (Field) entry.getValue()[0];
                     Excel attr = (Excel) entry.getValue()[1];
@@ -502,82 +496,6 @@ public class ExcelUtil<T>
         exportExcel(response);
     }
 
-    /**
-     * 多 Sheet 导出 —— 将多个不同类型的数据集合写入同一 Excel，直接输出到 HttpServletResponse
-     *
-     * @param response HTTP 响应
-     * @param sheets   Sheet 描述列表
-     */
-    public static void exportMultiSheet(HttpServletResponse response, List<ExcelSheet<?>> sheets)
-    {
-        if (sheets == null || sheets.isEmpty())
-        {
-            return;
-        }
-        SXSSFWorkbook wb = buildWorkbook(sheets);
-        try
-        {
-            response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-            response.setCharacterEncoding("utf-8");
-            wb.write(response.getOutputStream());
-        }
-        catch (Exception e)
-        {
-            log.error("多Sheet导出Excel异常{}", e.getMessage());
-        }
-        finally
-        {
-            IOUtils.closeQuietly(wb);
-        }
-    }
-
-    /**
-     * 构建多 Sheet Workbook —— 创建 SXSSFWorkbook 并将所有 Sheet 数据写入
-     *
-     * @param sheets Sheet 描述列表
-     * @return 已写入所有 Sheet 数据的 SXSSFWorkbook
-     */
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-    private static SXSSFWorkbook buildWorkbook(List<ExcelSheet<?>> sheets)
-    {
-        SXSSFWorkbook wb = new SXSSFWorkbook(500);
-        for (ExcelSheet<?> excelSheet : sheets)
-        {
-            ExcelUtil util = new ExcelUtil(excelSheet.getClazz());
-            util.initWithWorkbook(wb, excelSheet.getList(), excelSheet.getSheetName(), excelSheet.getTitle());
-            util.writeSheet();
-        }
-        return wb;
-    }
-
-    /**
-     * 使用外部传入的 Workbook 初始化（多 Sheet 导出专用）
-     * 与 init() 的区别：不新建 Workbook，而是在已有 wb 上追加新 Sheet
-     *
-     * @param wb        已有工作簿
-     * @param list      数据集合
-     * @param sheetName Sheet 名称
-     * @param title     大标题（可为空）
-     */
-    public void initWithWorkbook(SXSSFWorkbook wb, List<T> list, String sheetName, String title)
-    {
-        if (list == null)
-        {
-            list = new ArrayList<T>();
-        }
-        this.list      = list;
-        this.sheetName = sheetName;
-        this.title     = title != null ? title : "";
-        this.type      = Type.EXPORT;
-        this.rownum    = 0;
-        this.wb        = wb;
-        this.sheet     = wb.createSheet(sheetName);
-        createExcelField();
-        this.styles    = createStyles(wb);
-        createTitle();
-        createSubHead();
-    }
-
     /**
      * 对list数据源将其里面的数据导入到excel表单
      *
@@ -647,8 +565,7 @@ public class ExcelUtil<T>
                 Excel excel = (Excel) os[1];
                 if (Collection.class.isAssignableFrom(field.getType()))
                 {
-                    List<Field> currentSubFields = subFieldsMap.get(field.getName());
+                    for (Field subField : subFields)
-                    for (Field subField : currentSubFields)
                     {
                         Excel subExcel = subField.getAnnotation(Excel.class);
                         this.createHeadCell(subExcel, row, column++);
@@ -661,7 +578,7 @@ public class ExcelUtil<T>
             }
             if (Type.EXPORT.equals(type))
             {
-                fillExcelData(index);
+                fillExcelData(index, row);
                 addStatisticsRow();
             }
         }
@@ -671,9 +588,10 @@ public class ExcelUtil<T>
      * 填充excel数据
      * 
      * @param index 序号
+     * @param row 单元格行
      */
     @SuppressWarnings("unchecked")
-    public void fillExcelData(int index)
+    public void fillExcelData(int index, Row row)
     {
         int startNo = index * sheetSize;
         int endNo = Math.min(startNo + sheetSize, list.size());
@@ -681,7 +599,7 @@ public class ExcelUtil<T>
 
         for (int i = startNo; i < endNo; i++)
         {
-            Row row = sheet.createRow(currentRowNum);
+            row = sheet.createRow(currentRowNum);
             T vo = (T) list.get(i);
             int column = 0;
             int maxSubListSize = getCurrentMaxSubListSize(vo);
@@ -694,7 +612,6 @@ public class ExcelUtil<T>
                     try
                     {
                         Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);
-                        List<Field> currentSubFields = subFieldsMap.get(field.getName());
                         if (subList != null && !subList.isEmpty())
                         {
                             int subIndex = 0;
@@ -707,15 +624,15 @@ public class ExcelUtil<T>
                                 }
 
                                 int subColumn = column;
-                                for (Field subField : currentSubFields)
+                                for (Field subField : subFields)
                                 {
                                     Excel subExcel = subField.getAnnotation(Excel.class);
                                     addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
                                 }
                                 subIndex++;
                             }
+                            column += subFields.size();
                         }
-                        column += currentSubFields.size();
                     }
                     catch (Exception e)
                     {
@@ -807,7 +724,6 @@ public class ExcelUtil<T>
         style = wb.createCellStyle();
         style.setAlignment(HorizontalAlignment.CENTER);
         style.setVerticalAlignment(VerticalAlignment.CENTER);
-        style.setDataFormat(dataFormat.getFormat("######0.00"));
         Font totalFont = wb.createFont();
         totalFont.setFontName("Arial");
         totalFont.setFontHeightInPoints((short) 10);
@@ -1056,7 +972,6 @@ public class ExcelUtil<T>
     /**
      * 添加单元格
      */
-    @SuppressWarnings("deprecation")
     public Cell addCell(Excel attr, Row row, T vo, Field field, int column)
     {
         Cell cell = null;
@@ -1069,7 +984,7 @@ public class ExcelUtil<T>
             {
                 // 创建cell
                 cell = row.createCell(column);
-                if (isSubListValue(vo) && getListCellValue(vo) > 1 && attr.needMerge())
+                if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
                 {
                     if (subMergedLastRowNum >= subMergedFirstRowNum)
                     {
@@ -1085,7 +1000,7 @@ public class ExcelUtil<T>
                 String separator = attr.separator();
                 if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
-                    cell.setCellStyle(createCellStyle(cell.getCellStyle(), dateFormat));
+                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
                     cell.setCellValue(parseDateToStr(dateFormat, value));
                 }
                 else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
@@ -1115,28 +1030,6 @@ public class ExcelUtil<T>
         return cell;
     }
 
-    /**
-     * 使用自定义格式，同时避免样式污染
-     * 
-     * @param cellStyle 从此样式复制
-     * @param format 格式匹配的字符串
-     * @return 格式化后CellStyle对象
-     */
-    private CellStyle createCellStyle(CellStyle cellStyle, String format)
-    {
-        String key = cellStyle.getIndex() + "|" + format;
-        CellStyle cached = cellStyleCache.get(key);
-        if (cached != null)
-        {
-            return cached;
-        }
-        CellStyle style = wb.createCellStyle();
-        style.cloneStyleFrom(cellStyle);
-        style.setDataFormat(wb.getCreationHelper().createDataFormat().getFormat(format));
-        cellStyleCache.put(key, style);
-        return style;
-    }
-
     /**
      * 设置 POI XSSFSheet 单元格提示或选择框
      * 
@@ -1188,36 +1081,18 @@ public class ExcelUtil<T>
     public void setXSSFValidationWithHidden(Sheet sheet, String[] textlist, String promptContent, int firstRow, int endRow, int firstCol, int endCol)
     {
         String hideSheetName = "combo_" + firstCol + "_" + endCol;
-        Sheet hideSheet = null;
+        Sheet hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据
-        String hideSheetDataName = hideSheetName + "_data";
+        for (int i = 0; i < textlist.length; i++)
-        Name name = wb.getName(hideSheetDataName);
-        if (name != null)
         {
-            // 名称已存在，尝试从名称的引用中找到sheet名称
+            hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
-            String refersToFormula = name.getRefersToFormula();
-            if (StringUtils.isNotEmpty(refersToFormula) && refersToFormula.contains("!"))
-            {
-                String sheetNameFromFormula = refersToFormula.substring(0, refersToFormula.indexOf("!"));
-                hideSheet = wb.getSheet(sheetNameFromFormula);
-            }
         }
-
+        // 创建名称，可被其他单元格引用
-        if (hideSheet == null)
+        Name name = wb.createName();
-        {
+        name.setNameName(hideSheetName + "_data");
-            hideSheet = wb.createSheet(hideSheetName); // 用于存储 下拉菜单数据
+        name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);
-            for (int i = 0; i < textlist.length; i++)
-            {
-                hideSheet.createRow(i).createCell(0).setCellValue(textlist[i]);
-            }
-            // 创建名称，可被其他单元格引用
-            name = wb.createName();
-            name.setNameName(hideSheetDataName);
-            name.setRefersToFormula(hideSheetName + "!$A$1:$A$" + textlist.length);
-        }
-
         DataValidationHelper helper = sheet.getDataValidationHelper();
         // 加载下拉列表内容
-        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetDataName);
+        DataValidationConstraint constraint = helper.createFormulaListConstraint(hideSheetName + "_data");
         // 设置数据有效性加载在哪个单元格上,四个参数分别是：起始行、终止行、起始列、终止列
         CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
         // 数据有效性对象
@@ -1255,7 +1130,7 @@ public class ExcelUtil<T>
     public static String convertByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(SEPARATOR);
+        String[] convertSource = converterExp.split(",");
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1292,7 +1167,7 @@ public class ExcelUtil<T>
     public static String reverseByExp(String propertyValue, String converterExp, String separator)
     {
         StringBuilder propertyString = new StringBuilder();
-        String[] convertSource = converterExp.split(SEPARATOR);
+        String[] convertSource = converterExp.split(",");
         for (String item : convertSource)
         {
             String[] itemArray = item.split("=");
@@ -1329,7 +1204,7 @@ public class ExcelUtil<T>
     {
         try
         {
-            Object instance = excel.handler().getDeclaredConstructor().newInstance();
+            Object instance = excel.handler().newInstance();
             Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class, Cell.class, Workbook.class });
             value = formatMethod.invoke(instance, value, excel.args(), cell, this.wb);
         }
@@ -1380,7 +1255,7 @@ public class ExcelUtil<T>
             {
                 cell = row.createCell(key);
                 cell.setCellStyle(styles.get("total"));
-                cell.setCellValue(statistics.get(key));
+                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
             }
             statistics.clear();
         }
@@ -1455,8 +1330,6 @@ public class ExcelUtil<T>
     {
         List<Object[]> fields = new ArrayList<Object[]>();
         List<Field> tempFields = new ArrayList<>();
-        subFieldsMap = new HashMap<>();
-        subMethods = new HashMap<>();
         tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
         tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
         if (StringUtils.isNotEmpty(includeFields))
@@ -1504,11 +1377,10 @@ public class ExcelUtil<T>
             }
             if (Collection.class.isAssignableFrom(field.getType()))
             {
-                String fieldName = field.getName();
+                subMethod = getSubMethod(field.getName(), clazz);
-                subMethods.put(fieldName, getSubMethod(fieldName, clazz));
                 ParameterizedType pt = (ParameterizedType) field.getGenericType();
                 Class<?> subClass = (Class<?>) pt.getActualTypeArguments()[0];
-                subFieldsMap.put(fieldName, FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class));
+                this.subFields = FieldUtils.getFieldsListWithAnnotation(subClass, Excel.class);
             }
         }
 
@@ -1577,8 +1449,7 @@ public class ExcelUtil<T>
         {
             this.sheet = wb.createSheet();
             this.createTitle();
-            int actualIndex = wb.getSheetIndex(this.sheet);
+            wb.setSheetName(index, sheetName + index);
-            wb.setSheetName(actualIndex, sheetName + index);
         }
     }
 
@@ -1703,7 +1574,7 @@ public class ExcelUtil<T>
      */
     public boolean isSubList()
     {
-        return !StringUtils.isEmpty(subFieldsMap);
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0;
     }
 
     /**
@@ -1711,32 +1582,24 @@ public class ExcelUtil<T>
      */
     public boolean isSubListValue(T vo)
     {
-        return !StringUtils.isEmpty(subFieldsMap) && getListCellValue(vo) > 0;
+        return StringUtils.isNotNull(subFields) && subFields.size() > 0 && StringUtils.isNotNull(getListCellValue(vo)) && getListCellValue(vo).size() > 0;
     }
 
     /**
      * 获取集合的值
      */
-    public int getListCellValue(Object obj)
+    public Collection<?> getListCellValue(Object obj)
     {
-        Collection<?> value;
+        Object value;
-        int max = 0;
         try
         {
-            for (String s : subMethods.keySet())
+            value = subMethod.invoke(obj, new Object[] {});
-            {
-                value = (Collection<?>) subMethods.get(s).invoke(obj);
-                if (value.size() > max)
-                {
-                    max = value.size();
-                }
-            }
         }
         catch (Exception e)
         {
-            return 0;
+            return new ArrayList<Object>();
         }
-        return max;
+        return (Collection<?>) value;
     }
 
     /**

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

@@ -310,8 +310,7 @@ public class ReflectUtils
     /**
      * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
      */
-    @SuppressWarnings("deprecation")
+    public static void makeAccessible(Method method)
-	public static void makeAccessible(Method method)
     {
         if ((!Modifier.isPublic(method.getModifiers()) || !Modifier.isPublic(method.getDeclaringClass().getModifiers()))
                 && !method.isAccessible())
@@ -323,8 +322,7 @@ public class ReflectUtils
     /**
      * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
      */
-    @SuppressWarnings("deprecation")
+    public static void makeAccessible(Field field)
-	public static void makeAccessible(Field field)
     {
         if ((!Modifier.isPublic(field.getModifiers()) || !Modifier.isPublic(field.getDeclaringClass().getModifiers())
                 || Modifier.isFinal(field.getModifiers())) && !field.isAccessible())

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);
+        }
+    }
+
     /**
      * 清理分页的线程变量
      */

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/Xss.java

@@ -1,7 +1,7 @@
 package com.ruoyi.common.core.xss;
 
-import jakarta.validation.Constraint;
+import javax.validation.Constraint;
-import jakarta.validation.Payload;
+import javax.validation.Payload;
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/xss/XssValidator.java

@@ -2,8 +2,8 @@ package com.ruoyi.common.core.xss;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
-import jakarta.validation.ConstraintValidator;
+import javax.validation.ConstraintValidator;
-import jakarta.validation.ConstraintValidatorContext;
+import javax.validation.ConstraintValidatorContext;
 import com.ruoyi.common.core.utils.StringUtils;
 
 /**

ruoyi-common/ruoyi-common-datascope/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/annotation/DataScope.java

@@ -16,25 +16,15 @@ import java.lang.annotation.Target;
 @Documented
 public @interface DataScope
 {
-    /**
-     * 用户表的别名
-     */
-    public String userAlias() default "";
-
     /**
      * 部门表的别名
      */
     public String deptAlias() default "";
 
     /**
-     * 用户字段名
+     * 用户表的别名
      */
-    public String userField() default "user_id";
+    public String userAlias() default "";
-
-    /**
-     * 部门字段名
-     */
-    public String deptField() default "dept_id";
 
     /**
      * 权限字符（用于多个角色匹配符合要求的权限）默认根据权限注解@RequiresPermissions获取，多个权限用逗号分隔开来

ruoyi-common/ruoyi-common-datascope/src/main/java/com/ruoyi/common/datascope/aspect/DataScopeAspect.java

@@ -6,7 +6,6 @@ import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Before;
 import org.springframework.stereotype.Component;
-import com.ruoyi.common.core.constant.Constants;
 import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.text.Convert;
@@ -27,6 +26,31 @@ import com.ruoyi.system.api.model.LoginUser;
 @Component
 public class DataScopeAspect
 {
+    /**
+     * 全部数据权限
+     */
+    public static final String DATA_SCOPE_ALL = "1";
+
+    /**
+     * 自定数据权限
+     */
+    public static final String DATA_SCOPE_CUSTOM = "2";
+
+    /**
+     * 部门数据权限
+     */
+    public static final String DATA_SCOPE_DEPT = "3";
+
+    /**
+     * 部门及以下数据权限
+     */
+    public static final String DATA_SCOPE_DEPT_AND_CHILD = "4";
+
+    /**
+     * 仅本人数据权限
+     */
+    public static final String DATA_SCOPE_SELF = "5";
+
     /**
      * 数据权限过滤关键字
      */
@@ -50,7 +74,7 @@ public class DataScopeAspect
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
                 String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.userAlias(), controllerDataScope.deptAlias(), controllerDataScope.userField(), controllerDataScope.deptField(), permission);
+                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
             }
         }
     }
@@ -64,13 +88,13 @@ public class DataScopeAspect
      * @param userAlias 用户别名
      * @param permission 权限字符
      */
-    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String userAlias, String deptAlias, String userField, String deptField, String permission)
+    public static void dataScopeFilter(JoinPoint joinPoint, SysUser user, String deptAlias, String userAlias, String permission)
     {
         StringBuilder sqlString = new StringBuilder();
         List<String> conditions = new ArrayList<String>();
         List<String> scopeCustomIds = new ArrayList<String>();
         user.getRoles().forEach(role -> {
-            if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && (StringUtils.isEmpty(permission) || StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission))))
+            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
             {
                 scopeCustomIds.add(Convert.toStr(role.getRoleId()));
             }
@@ -83,64 +107,65 @@ public class DataScopeAspect
             {
                 continue;
             }
-            if (StringUtils.isNotEmpty(permission) && !StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+            if (!StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
             {
                 continue;
             }
-            if (Constants.Dept.DATA_SCOPE_ALL.equals(dataScope))
+            if (DATA_SCOPE_ALL.equals(dataScope))
             {
+                // 全部数据权限，不添加额外条件
                 sqlString = new StringBuilder();
-                conditions.add(dataScope);
+                conditions.clear();
-                break;
+                return;
             }
-            else if (Constants.Dept.DATA_SCOPE_CUSTOM.equals(dataScope))
+            else if (DATA_SCOPE_CUSTOM.equals(dataScope))
             {
                 if (scopeCustomIds.size() > 1)
                 {
                     // 多个自定数据权限使用in查询，避免多次拼接。
-                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, deptField, String.join(",", scopeCustomIds)));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id in ({}) ) ", deptAlias, String.join(",", scopeCustomIds)));
                 }
                 else
                 {
-                    sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, deptField, role.getRoleId()));
+                    sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_role_dept WHERE role_id = {} ) ", deptAlias, role.getRoleId()));
                 }
             }
-            else if (Constants.Dept.DATA_SCOPE_DEPT.equals(dataScope))
+            else if (DATA_SCOPE_DEPT.equals(dataScope))
             {
-                sqlString.append(StringUtils.format(" OR {}.{} = {} ", deptAlias, deptField, user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.dept_id = {} ", deptAlias, user.getDeptId()));
             }
-            else if (Constants.Dept.DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
+            else if (DATA_SCOPE_DEPT_AND_CHILD.equals(dataScope))
             {
-                sqlString.append(StringUtils.format(" OR {}.{} IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, deptField, user.getDeptId(), user.getDeptId()));
+                sqlString.append(StringUtils.format(" OR {}.dept_id IN ( SELECT dept_id FROM sys_dept WHERE dept_id = {} or find_in_set( {} , ancestors ) )", deptAlias, user.getDeptId(), user.getDeptId()));
             }
-            else if (Constants.Dept.DATA_SCOPE_SELF.equals(dataScope))
+            else if (DATA_SCOPE_SELF.equals(dataScope))
             {
                 if (StringUtils.isNotBlank(userAlias))
                 {
-                    sqlString.append(StringUtils.format(" OR {}.{} = {} ", userAlias, userField, user.getUserId()));
+                    sqlString.append(StringUtils.format(" OR {}.user_id = {} ", userAlias, user.getUserId()));
-                }
-                else
-                {
-                    // 数据权限为仅本人且没有userAlias别名不查询任何数据
-                    sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
                 }
+                // 当没有 userAlias 时，不添加任何条件
             }
             conditions.add(dataScope);
         }
 
-        // 角色都不包含传递过来的权限字符，这个时候sqlString也会为空，所以要限制一下,不查询任何数据
+        // 角色都不包含传递过来的权限字符，这个时候不添加任何条件
         if (StringUtils.isEmpty(conditions))
         {
-            sqlString.append(StringUtils.format(" OR {}.{} = 0 ", deptAlias, deptField));
+            sqlString = new StringBuilder();
         }
 
-        if (StringUtils.isNotBlank(sqlString.toString()))
+        String sql = sqlString.toString().trim();
+        if (sql.startsWith("OR ")) {
+            sql = sql.substring(3);
+        }
+        if (StringUtils.isNotBlank(sql))
         {
             Object params = joinPoint.getArgs()[0];
-            if (StringUtils.isNotNull(params) && params instanceof BaseEntity)
+            if (params instanceof BaseEntity)
             {
                 BaseEntity baseEntity = (BaseEntity) params;
-                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")");
+                baseEntity.getParams().put(DATA_SCOPE, " AND (" + sql + ")");
             }
         }
     }

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -20,14 +20,14 @@
         <!-- Druid -->
         <dependency>
             <groupId>com.alibaba</groupId>
-            <artifactId>druid-spring-boot-3-starter</artifactId>
+            <artifactId>druid-spring-boot-starter</artifactId>
             <version>${druid.version}</version>
         </dependency>
 
         <!-- Dynamic DataSource -->
         <dependency>
             <groupId>com.baomidou</groupId>
-            <artifactId>dynamic-datasource-spring-boot3-starter</artifactId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
             <version>${dynamic-ds.version}</version>
         </dependency>
 

ruoyi-common/ruoyi-common-log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-log/src/main/java/com/ruoyi/common/log/aspect/LogAspect.java

@@ -2,8 +2,8 @@ package com.ruoyi.common.log.aspect;
 
 import java.util.Collection;
 import java.util.Map;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.lang3.ArrayUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
@@ -48,9 +48,6 @@ public class LogAspect
     /** 计算操作消耗时间 */
     private static final ThreadLocal<Long> TIME_THREADLOCAL = new NamedThreadLocal<Long>("Cost Time");
 
-    /** 参数最大长度限制 */
-    private static final int PARAM_MAX_LENGTH = 2000;
-
     @Autowired
     private AsyncLogService asyncLogService;
 
@@ -169,16 +166,16 @@ public class LogAspect
      */
     private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception
     {
-        String requestMethod = operLog.getRequestMethod();
         Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
+        String requestMethod = operLog.getRequestMethod();
         if (StringUtils.isEmpty(paramsMap) && StringUtils.equalsAny(requestMethod, HttpMethod.PUT.name(), HttpMethod.POST.name(), HttpMethod.DELETE.name()))
         {
             String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
-            operLog.setOperParam(params);
+            operLog.setOperParam(StringUtils.substring(params, 0, 2000));
         }
         else
         {
-            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, PARAM_MAX_LENGTH));
+            operLog.setOperParam(StringUtils.substring(JSON.toJSONString(paramsMap, excludePropertyPreFilter(excludeParamNames)), 0, 2000));
         }
     }
 
@@ -187,7 +184,7 @@ public class LogAspect
      */
     private String argsArrayToString(Object[] paramsArray, String[] excludeParamNames)
     {
-        StringBuilder params = new StringBuilder();
+        String params = "";
         if (paramsArray != null && paramsArray.length > 0)
         {
             for (Object o : paramsArray)
@@ -197,20 +194,15 @@ public class LogAspect
                     try
                     {
                         String jsonObj = JSON.toJSONString(o, excludePropertyPreFilter(excludeParamNames));
-                        params.append(jsonObj).append(" ");
+                        params += jsonObj.toString() + " ";
-                        if (params.length() >= PARAM_MAX_LENGTH)
-                        {
-                            return StringUtils.substring(params.toString(), 0, PARAM_MAX_LENGTH);
-                        }
                     }
                     catch (Exception e)
                     {
-                        log.error("请求参数拼装异常 msg:{}, 参数:{}", e.getMessage(), paramsArray, e);
                     }
                 }
             }
         }
-        return params.toString();
+        return params.trim();
     }
 
     /**

ruoyi-common/ruoyi-common-redis/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

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

@@ -18,7 +18,6 @@ import org.springframework.data.redis.serializer.StringRedisSerializer;
 @Configuration
 @EnableCaching
 @AutoConfigureBefore(RedisAutoConfiguration.class)
-@SuppressWarnings("deprecation")
 public class RedisConfig extends CachingConfigurerSupport
 {
     @Bean

ruoyi-common/ruoyi-common-seata/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-common/ruoyi-common-security/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/feign/FeignRequestInterceptor.java

@@ -1,7 +1,7 @@
 package com.ruoyi.common.security.feign;
 
 import java.util.Map;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.springframework.stereotype.Component;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.utils.ServletUtils;

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/handler/GlobalExceptionHandler.java

@@ -1,6 +1,6 @@
 package com.ruoyi.common.security.handler;
 
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.validation.BindException;

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/interceptor/HeaderInterceptor.java

@@ -1,7 +1,7 @@
 package com.ruoyi.common.security.interceptor;
 
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.method.HandlerMethod;
 import org.springframework.web.servlet.AsyncHandlerInterceptor;
 import com.ruoyi.common.core.constant.SecurityConstants;

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/service/TokenService.java

@@ -3,7 +3,7 @@ package com.ruoyi.common.security.service;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import jakarta.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

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

@@ -1,14 +1,13 @@
 package com.ruoyi.common.security.utils;
 
+import javax.servlet.http.HttpServletRequest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import com.ruoyi.common.core.constant.SecurityConstants;
 import com.ruoyi.common.core.constant.TokenConstants;
-import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.model.LoginUser;
-import jakarta.servlet.http.HttpServletRequest;
 
 /**
  * 权限获取工具类
@@ -80,16 +79,6 @@ public class SecurityUtils
         return token;
     }
 
-    /**
-     * 是否为管理员
-     * 
-     * @return 结果
-     */
-    public static boolean isAdmin()
-    {
-        return isAdmin(getUserId());
-    }
-
     /**
      * 是否为管理员
      * 
@@ -98,7 +87,7 @@ public class SecurityUtils
      */
     public static boolean isAdmin(Long userId)
     {
-        return UserConstants.isAdmin(userId);
+        return userId != null && 1L == userId;
     }
 
     /**

ruoyi-common/ruoyi-common-sensitive/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -26,7 +26,7 @@
         <!-- SpringDoc webmvc -->
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
+            <artifactId>springdoc-openapi-ui</artifactId>
         </dependency>
 
 	</dependencies>

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

ruoyi-gateway/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -19,7 +19,7 @@
         <!-- SpringCloud Gateway -->
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-gateway-server-webflux</artifactId>
+            <artifactId>spring-cloud-starter-gateway</artifactId>
         </dependency>
 
         <!-- SpringCloud Alibaba Nacos -->
@@ -79,7 +79,7 @@
         <!-- Springdoc -->
         <dependency>
             <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webflux-ui</artifactId>
+            <artifactId>springdoc-openapi-webflux-ui</artifactId>
             <version>${springdoc.version}</version>
         </dependency>
 

ruoyi-gateway/src/main/java/com/ruoyi/gateway/config/SpringDocConfig.java

@@ -2,8 +2,8 @@ package com.ruoyi.gateway.config;
 
 import java.util.Set;
 import java.util.stream.Collectors;
-import org.springdoc.core.properties.AbstractSwaggerUiConfigProperties;
+import org.springdoc.core.AbstractSwaggerUiConfigProperties;
-import org.springdoc.core.properties.SwaggerUiConfigProperties;
+import org.springdoc.core.SwaggerUiConfigProperties;
 import org.springframework.beans.factory.InitializingBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

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

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

ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -3,7 +3,7 @@ package com.ruoyi.gateway.service.impl;
 import java.awt.image.BufferedImage;
 import java.io.IOException;
 import java.util.concurrent.TimeUnit;
-import jakarta.annotation.Resource;
+import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -18,6 +18,11 @@ spring:
       config:
         # 配置中心地址
         server-addr: 127.0.0.1:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
     sentinel:
       # 取消控制台懒加载
       eager: true
@@ -33,9 +38,3 @@ spring:
             groupId: DEFAULT_GROUP
             data-type: json
             rule-type: gw-flow
-  config:
-    # 配置文件格式
-    file-extension: yml
-    import:
-      - nacos:application-${spring.profiles.active}.${spring.config.file-extension}
-      - nacos:${spring.application.name}-${spring.profiles.active}.${spring.config.file-extension}

ruoyi-modules/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-file/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -47,6 +47,12 @@
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
 		
+        <!-- FastDFS -->
+        <dependency>
+            <groupId>com.github.tobato</groupId>
+            <artifactId>fastdfs-client</artifactId>
+        </dependency>
+        
         <!-- Minio -->
         <dependency>
             <groupId>io.minio</groupId>

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/config/FilterConfig.java

@@ -1,46 +0,0 @@
-package com.ruoyi.file.config;
-
-import java.util.HashMap;
-import java.util.Map;
-import jakarta.servlet.DispatcherType;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import com.ruoyi.file.filter.RefererFilter;
-
-/**
- * Filter配置
- *
- * @author ruoyi
- */
-@Configuration
-public class FilterConfig
-{
-    /**
-     * 资源映射路径 前缀
-     */
-    @Value("${file.prefix}")
-    public String localFilePrefix;
-    
-    @Value("${referer.allowed-domains}")
-    private String allowedDomains;
-    
-    @SuppressWarnings({"rawtypes", "unchecked"})
-    @Bean
-    @ConditionalOnProperty(value = "referer.enabled", havingValue = "true")
-    public FilterRegistrationBean refererFilterRegistration()
-    {
-        FilterRegistrationBean registration = new FilterRegistrationBean();
-        registration.setDispatcherTypes(DispatcherType.REQUEST);
-        registration.setFilter(new RefererFilter());
-        registration.addUrlPatterns(localFilePrefix + "/*");
-        registration.setName("refererFilter");
-        registration.setOrder(FilterRegistrationBean.HIGHEST_PRECEDENCE);
-        Map<String, String> initParameters = new HashMap<String, String>();
-        initParameters.put("allowedDomains", allowedDomains);
-        registration.setInitParameters(initParameters);
-        return registration;
-    }
-}

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/controller/SysFileController.java

@@ -3,12 +3,10 @@ package com.ruoyi.file.controller;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 import com.ruoyi.common.core.domain.R;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.file.FileUtils;
 import com.ruoyi.file.service.ISysFileService;
 import com.ruoyi.system.api.domain.SysFile;
@@ -47,26 +45,4 @@ public class SysFileController
             return R.fail(e.getMessage());
         }
     }
-
-    /**
-     * 文件删除请求
-     */
-    @DeleteMapping("delete")
-    public R<Boolean> delete(String fileUrl)
-    {
-        try
-        {
-            if (!FileUtils.validateFilePath(fileUrl))
-            {
-                throw new Exception(StringUtils.format("资源文件({})非法，不允许删除。 ", fileUrl));
-            }
-            sysFileService.deleteFile(fileUrl);
-            return R.ok();
-        }
-        catch (Exception e)
-        {
-            log.error("删除文件失败", e);
-            return R.fail(e.getMessage());
-        }
-    }
 }

ruoyi-modules/ruoyi-file/src/main/java/com/ruoyi/file/filter/RefererFilter.java

@@ -1,77 +0,0 @@
-package com.ruoyi.file.filter;
-
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
-import jakarta.servlet.Filter;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.FilterConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-
-/**
- * 防盗链过滤器
- * 
- * @author ruoyi
- */
-public class RefererFilter implements Filter
-{
-    /**
-     * 允许的域名列表
-     */
-    public List<String> allowedDomains;
-
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException
-    {
-        String domains = filterConfig.getInitParameter("allowedDomains");
-        this.allowedDomains = Arrays.asList(domains.split(","));
-    }
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
-            throws IOException, ServletException
-    {
-        HttpServletRequest req = (HttpServletRequest) request;
-        HttpServletResponse resp = (HttpServletResponse) response;
-
-        String referer = req.getHeader("Referer");
-
-        // 如果Referer为空，拒绝访问
-        if (referer == null || referer.isEmpty())
-        {
-            resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Access denied: Referer header is required");
-            return;
-        }
-
-        // 检查Referer是否在允许的域名列表中
-        boolean allowed = false;
-        for (String domain : allowedDomains)
-        {
-            if (referer.contains(domain))
-            {
-                allowed = true;
-                break;
-            }
-        }
-
-        // 根据检查结果决定是否放行
-        if (allowed)
-        {
-            chain.doFilter(request, response);
-        }
-        else
-        {
-            resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Access denied: Referer '" + referer + "' is not allowed");
-        }
-    }
-
-    @Override
-    public void destroy()
-    {
-
-    }
-}

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

@@ -0,0 +1,56 @@
+package com.ruoyi.file.service;
+
+import java.io.InputStream;
+import com.alibaba.nacos.common.utils.IoUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import com.github.tobato.fastdfs.domain.fdfs.StorePath;
+import com.github.tobato.fastdfs.service.FastFileStorageClient;
+import com.ruoyi.common.core.utils.file.FileTypeUtils;
+
+/**
+ * FastDFS 文件存储
+ *
+ * @author ruoyi
+ */
+@Service
+public class FastDfsSysFileServiceImpl implements ISysFileService
+{
+    /**
+     * 域名或本机访问地址
+     */
+    @Value("${fdfs.domain}")
+    public String domain;
+
+    @Autowired
+    private FastFileStorageClient storageClient;
+
+    /**
+     * FastDfs文件上传接口
+     *
+     * @param file 上传的文件
+     * @return 访问地址
+     * @throws Exception
+     */
+    @Override
+    public String uploadFile(MultipartFile file) throws Exception
+    {
+        InputStream inputStream = null;
+        try
+        {
+            inputStream = file.getInputStream();
+            StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(), FileTypeUtils.getExtension(file), null);
+            return domain + "/" + storePath.getFullPath();
+        }
+        catch (Exception e)
+        {
+            throw new RuntimeException("FastDfs Failed to upload file", e);
+        }
+        finally
+        {
+            IoUtils.closeQuietly(inputStream);
+        }
+    }
+}

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

@@ -17,12 +17,4 @@ public interface ISysFileService
      * @throws Exception
      */
     public String uploadFile(MultipartFile file) throws Exception;
-
-    /**
-     * 文件删除接口
-     * 
-     * @param fileUrl 文件访问URL
-     * @throws Exception
-     */
-    public void deleteFile(String fileUrl) throws Exception;
 }

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

@@ -4,8 +4,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Primary;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.file.FileUtils;
 import com.ruoyi.file.utils.FileUploadUtils;
 
 /**
@@ -49,17 +47,4 @@ public class LocalSysFileServiceImpl implements ISysFileService
         String url = domain + localFilePrefix + name;
         return url;
     }
-
-    /**
-     * 本地文件删除接口
-     * 
-     * @param fileUrl 文件访问URL
-     * @throws Exception
-     */
-    @Override
-    public void deleteFile(String fileUrl) throws Exception
-    {
-        String localFile = StringUtils.substringAfter(fileUrl, localFilePrefix);
-        FileUtils.deleteFile(localFilePath + localFile);
-    }
 }

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

@@ -5,12 +5,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.nacos.common.utils.IoUtils;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.file.config.MinioConfig;
 import com.ruoyi.file.utils.FileUploadUtils;
 import io.minio.MinioClient;
 import io.minio.PutObjectArgs;
-import io.minio.RemoveObjectArgs;
 
 /**
  * Minio 文件存储
@@ -59,24 +57,4 @@ public class MinioSysFileServiceImpl implements ISysFileService
             IoUtils.closeQuietly(inputStream);
         }
     }
-
-    /**
-     * Minio文件删除接口
-     * 
-     * @param fileUrl 文件访问URL
-     * @throws Exception
-     */
-    @Override
-    public void deleteFile(String fileUrl) throws Exception
-    {
-        try
-        {
-            String minioFile = StringUtils.substringAfter(fileUrl, minioConfig.getBucketName());
-            client.removeObject(RemoveObjectArgs.builder().bucket(minioConfig.getBucketName()).object(minioFile).build());
-        }
-        catch (Exception e)
-        {
-            throw new RuntimeException("Minio Failed to delete file", e);
-        }
-    }
 }

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

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

ruoyi-modules/ruoyi-gen/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-modules</artifactId>
-        <version>3.6.8</version>
+        <version>3.6.5</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/controller/GenController.java

@@ -4,7 +4,7 @@ import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpServletResponse;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -105,12 +104,12 @@ public class GenController extends BaseController
     @RequiresPermissions("tool:gen:import")
     @Log(title = "代码生成", businessType = BusinessType.IMPORT)
     @PostMapping("/importTable")
-    public AjaxResult importTableSave(@RequestParam("tables") String tables, @RequestParam("tplWebType") String tplWebType)
+    public AjaxResult importTableSave(String tables)
     {
         String[] tableNames = Convert.toStrArray(tables);
         // 查询表信息
         List<GenTable> tableList = genTableService.selectDbTableListByNames(tableNames);
-        genTableService.importGenTable(tableList, tplWebType);
+        genTableService.importGenTable(tableList);
         return success();
     }
 

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

@@ -1,8 +1,8 @@
 package com.ruoyi.gen.domain;
 
 import java.util.List;
-import jakarta.validation.Valid;
+import javax.validation.Valid;
-import jakarta.validation.constraints.NotBlank;
+import javax.validation.constraints.NotBlank;
 import org.apache.commons.lang3.ArrayUtils;
 import com.ruoyi.common.core.constant.GenConstants;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -41,7 +41,7 @@ public class GenTable extends BaseEntity
     /** 使用的模板（crud单表操作 tree树表操作 sub主子表操作） */
     private String tplCategory;
 
-    /** 前端类型（element-ui模版 element-plus模版 element-plus-typescript模版） */
+    /** 前端类型（element-ui模版 element-plus模版） */
     private String tplWebType;
 
     /** 生成包路径 */
@@ -64,9 +64,6 @@ public class GenTable extends BaseEntity
     @NotBlank(message = "作者不能为空")
     private String functionAuthor;
 
-    /** 表单布局（单列 双列 三列） */
-    private Integer formColNum;
-
     /** 生成代码方式（0zip压缩包 1自定义路径） */
     private String genType;
 
@@ -101,9 +98,6 @@ public class GenTable extends BaseEntity
     /** 上级菜单名称字段 */
     private String parentMenuName;
 
-    /** 是否生成详情页 */
-    private boolean isView;
-
     public Long getTableId()
     {
         return tableId;
@@ -234,16 +228,6 @@ public class GenTable extends BaseEntity
         this.functionAuthor = functionAuthor;
     }
 
-    public Integer getFormColNum()
-    {
-        return formColNum;
-    }
-
-    public void setFormColNum(Integer formColNum)
-    {
-        this.formColNum = formColNum;
-    }
-
     public String getGenType()
     {
         return genType;
@@ -283,7 +267,6 @@ public class GenTable extends BaseEntity
     {
         this.subTable = subTable;
     }
-
     public List<GenTableColumn> getColumns()
     {
         return columns;
@@ -354,16 +337,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);
@@ -373,7 +346,6 @@ public class GenTable extends BaseEntity
     {
         return tplCategory != null && StringUtils.equals(GenConstants.TPL_SUB, tplCategory);
     }
-
     public boolean isTree()
     {
         return isTree(this.tplCategory);

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

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

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/GenTableServiceImpl.java

@@ -4,8 +4,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -159,7 +157,7 @@ public class GenTableServiceImpl implements IGenTableService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void importGenTable(List<GenTable> tableList, String tplWebType)
+    public void importGenTable(List<GenTable> tableList)
     {
         String operName = SecurityUtils.getUsername();
         try
@@ -167,7 +165,6 @@ public class GenTableServiceImpl implements IGenTableService
             for (GenTable table : tableList)
             {
                 String tableName = table.getTableName();
-                table.setTplWebType(tplWebType);
                 GenUtils.initTable(table, operName);
                 int row = genTableMapper.insertGenTable(table);
                 if (row > 0)
@@ -209,7 +206,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)
         {
             // 渲染模板
@@ -230,7 +227,11 @@ public class GenTableServiceImpl implements IGenTableService
     @Override
     public byte[] downloadCode(String tableName)
     {
-        return downloadCode(new String[] { tableName });
+        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+        ZipOutputStream zip = new ZipOutputStream(outputStream);
+        generatorCode(tableName, zip);
+        IOUtils.closeQuietly(zip);
+        return outputStream.toByteArray();
     }
 
     /**
@@ -253,10 +254,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();
@@ -341,14 +342,9 @@ public class GenTableServiceImpl implements IGenTableService
     {
         ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
         ZipOutputStream zip = new ZipOutputStream(outputStream);
-        Map<String, StringBuffer> typeFiles = new HashMap<>();
         for (String tableName : tableNames)
         {
-            generatorCode(tableName, zip, typeFiles);
+            generatorCode(tableName, zip);
-        }
-        for (Map.Entry<String, StringBuffer> entry : typeFiles.entrySet())
-        {
-            writeToZip(zip, entry.getKey(), entry.getValue().toString());
         }
         IOUtils.closeQuietly(zip);
         return outputStream.toByteArray();
@@ -357,7 +353,7 @@ public class GenTableServiceImpl implements IGenTableService
     /**
      * 查询表信息并生成代码
      */
-    private void generatorCode(String tableName, ZipOutputStream zip, Map<String, StringBuffer> typeFiles)
+    private void generatorCode(String tableName, ZipOutputStream zip)
     {
         // 查询表信息
         GenTable table = genTableMapper.selectGenTableByName(tableName);
@@ -371,56 +367,29 @@ 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)
         {
             // 渲染模板
             StringWriter sw = new StringWriter();
             Template tpl = Velocity.getTemplate(template, Constants.UTF8);
             tpl.merge(context, sw);
-            String fileName = VelocityUtils.getFileName(template, table);
+            try
-            // index-bak.ts 模版，追加内容
-            if (fileName.contains("index-bak.ts"))
             {
-                if (!typeFiles.containsKey(fileName))
+                // 添加到zip
-                {
+                zip.putNextEntry(new ZipEntry(VelocityUtils.getFileName(template, table)));
-                    typeFiles.put(fileName, new StringBuffer(sw.toString()));
+                IOUtils.write(sw.toString(), zip, Constants.UTF8);
-                }
+                IOUtils.closeQuietly(sw);
-                else
+                zip.flush();
-                {
+                zip.closeEntry();
-                    Arrays.stream(sw.toString().split("\n")).filter(line -> line.startsWith("export * from")).forEach(line -> typeFiles.get(fileName).append("\n").append(line));
-                }
             }
-            else
+            catch (IOException e)
             {
-                // 其他文件正常添加
+                log.error("渲染模板失败，表名：" + table.getTableName(), e);
-                writeToZip(zip, fileName, sw.toString());
             }
         }
     }
 
-    /**
-     * 将字符串内容写入ZIP输出流
-     * 
-     * @param zip ZIP输出流
-     * @param fileName ZIP条目名称（即文件名）
-     * @param content 要写入的内容
-     */
-    private void writeToZip(ZipOutputStream zip, String fileName, String content)
-    {
-        try
-        {
-            zip.putNextEntry(new ZipEntry(fileName));
-            IOUtils.write(content, zip, Constants.UTF8);
-            zip.flush();
-            zip.closeEntry();
-        }
-        catch (IOException e)
-        {
-            log.error("写入ZIP文件失败，文件名: " + fileName, e);
-        }
-    }
-
     /**
      * 修改保存参数校验
      * 
@@ -524,14 +493,12 @@ public class GenTableServiceImpl implements IGenTableService
             String treeName = paramsObj.getString(GenConstants.TREE_NAME);
             Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);
             String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
-            boolean isView = paramsObj.getBooleanValue(GenConstants.GEN_VIEW);
 
             genTable.setTreeCode(treeCode);
             genTable.setTreeParentCode(treeParentCode);
             genTable.setTreeName(treeName);
             genTable.setParentMenuId(parentMenuId);
             genTable.setParentMenuName(parentMenuName);
-            genTable.setView(isView);
         }
     }
 

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/service/IGenTableService.java

@@ -70,9 +70,8 @@ public interface IGenTableService
      * 导入表结构
      * 
      * @param tableList 导入表列表
-     * @param tplWebType 前端类型
      */
-    public void importGenTable(List<GenTable> tableList, String tplWebType);
+    public void importGenTable(List<GenTable> tableList);
 
     /**
      * 预览代码

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
  */
@@ -29,12 +29,6 @@ public class VelocityUtils
     /** 默认上级菜单，系统工具 */
     private static final String DEFAULT_PARENT_MENU_ID = "3";
 
-    /** Vue3 Element Plus 模版 */
-    private static final String ELEMENT_PLUS = "element-plus";
-
-    /** Vue3 Element Plus TypeScript 模版 */
-    private static final String ELEMENT_PLUS_TYPESSRIPT = "element-plus-typescript";
-
     /**
      * 设置模板变量信息
      *
@@ -60,7 +54,6 @@ public class VelocityUtils
         velocityContext.put("basePackage", getPackagePrefix(packageName));
         velocityContext.put("packageName", packageName);
         velocityContext.put("author", genTable.getFunctionAuthor());
-        velocityContext.put("colSpan", getColSpan(genTable.getFormColNum()));
         velocityContext.put("datetime", DateUtils.getDate());
         velocityContext.put("pkColumn", genTable.getPkColumn());
         velocityContext.put("importList", getImportList(genTable));
@@ -68,7 +61,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 +73,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,23 +127,13 @@ 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 ("element-plus".equals(tplWebType))
-        if (StringUtils.equals(ELEMENT_PLUS, tplWebType))
         {
             useWebType = "vm/vue/v3";
         }
-        else if (StringUtils.equals(ELEMENT_PLUS_TYPESSRIPT, tplWebType))
-        {
-            useWebType = "vm/vue/v3ts";
-            apiTemplate = "vm/ts/api.ts.vm";
-        }
         List<String> templates = new ArrayList<String>();
         templates.add("vm/java/domain.java.vm");
         templates.add("vm/java/mapper.java.vm");
@@ -167,12 +142,7 @@ public class VelocityUtils
         templates.add("vm/java/controller.java.vm");
         templates.add("vm/xml/mapper.xml.vm");
         templates.add("vm/sql/sql.vm");
-        templates.add(apiTemplate);
+        templates.add("vm/js/api.js.vm");
-        if (StringUtils.equals(ELEMENT_PLUS_TYPESSRIPT, tplWebType))
-        {
-            templates.add("vm/ts/type.ts.vm");
-            templates.add("vm/ts/index.ts.vm");
-        }
         if (GenConstants.TPL_CRUD.equals(tplCategory))
         {
             templates.add(useWebType + "/index.vue.vm");
@@ -186,10 +156,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;
     }
 
@@ -249,18 +215,6 @@ public class VelocityUtils
         {
             fileName = StringUtils.format("{}/api/{}/{}.js", vuePath, moduleName, businessName);
         }
-        else if (template.contains("api.ts.vm"))
-        {
-            fileName = StringUtils.format("{}/api/{}/{}.ts", vuePath, moduleName, businessName);
-        }
-        else if (template.contains("type.ts.vm"))
-        {
-            fileName = StringUtils.format("{}/types/api/{}/{}.ts", vuePath, moduleName, businessName);
-        }
-        else if (template.contains("index.ts.vm"))
-        {
-            fileName = StringUtils.format("{}/types/api/index-bak.ts", vuePath);
-        }
         else if (template.contains("index.vue.vm"))
         {
             fileName = StringUtils.format("{}/views/{}/{}/index.vue", vuePath, moduleName, businessName);
@@ -269,10 +223,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 +364,6 @@ public class VelocityUtils
         return StringUtils.EMPTY;
     }
 
-    /**
-     * 扩展功能/生成详情页
-     * 
-     * @param paramsObj 生成其他选项
-     * @return 是否生成详细页
-     */
-    public static boolean genView(JSONObject paramsObj)
-    {
-        if (StringUtils.isNotNull(paramsObj) && paramsObj.containsKey(GenConstants.GEN_VIEW))
-        {
-            return paramsObj.getBoolean(GenConstants.GEN_VIEW);
-        }
-        return false;
-    }
-
     /**
      * 获取树名称
      *
@@ -470,23 +405,4 @@ public class VelocityUtils
         }
         return num;
     }
-
-    /**
-     * 获取表单 el-col span
-     * 
-     * @param formColNum 表单布局方式（1单列 2双列 3三列）
-     * @return span 数值字符串
-     */
-    public static String getColSpan(int formColNum)
-    {
-        if (formColNum == 2)
-        {
-            return "12";
-        }
-        else if (formColNum == 3)
-        {
-            return "8";
-        }
-        return "24";
-    }
 }

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

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

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

@@ -94,7 +94,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <set>
             <if test="columnComment != null">column_comment = #{columnComment},</if>
             <if test="javaType != null">java_type = #{javaType},</if>
-            <if test="columnType != null">column_type = #{columnType},</if>
             <if test="javaField != null">java_field = #{javaField},</if>
             <if test="isInsert != null">is_insert = #{isInsert},</if>
             <if test="isEdit != null">is_edit = #{isEdit},</if>

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

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

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

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

ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/api.ts.vm

@@ -1,51 +0,0 @@
-import request from '@/utils/request'
-import type { AjaxResult, TableDataInfo, ${BusinessName}QueryParams, ${ClassName} } from '@/types'
-
-// 查询${functionName}列表
-#if($table.tree)
-export function list${BusinessName}(query?: ${BusinessName}QueryParams): Promise<AjaxResult<${ClassName}[]>> {
-#else
-export function list${BusinessName}(query: ${BusinessName}QueryParams): Promise<TableDataInfo<${ClassName}[]>> {
-#end
-  return request({
-    url: '/${moduleName}/${businessName}/list',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询${functionName}详细
-export function get${BusinessName}(${pkColumn.javaField}: number): Promise<AjaxResult<${ClassName}>> {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'get'
-  })
-}
-
-// 新增${functionName}
-export function add${BusinessName}(data: ${ClassName}): Promise<AjaxResult> {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改${functionName}
-export function update${BusinessName}(data: ${ClassName}): Promise<AjaxResult> {
-  return request({
-    url: '/${moduleName}/${businessName}',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除${functionName}
-export function del${BusinessName}(${pkColumn.javaField}: number | number[]): Promise<AjaxResult> {
-  return request({
-    url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField},
-    method: 'delete'
-  })
-}
-
-

ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/index.ts.vm

@@ -1,9 +0,0 @@
-/**
- * API 类型统一导出
- */
-....
-
-// 防止覆盖，需手动追加下面代码到index.ts文件中，追加好后此文件可删除
-
-// ${moduleName} 模块
-export * from "./${moduleName}/${businessName}";

ruoyi-modules/ruoyi-gen/src/main/resources/vm/ts/type.ts.vm

@@ -1,51 +0,0 @@
-import type { PageDomain, BaseEntity } from "../common";
-
-/** ${functionName}配置分页查询参数 */
-export interface ${BusinessName}QueryParams extends PageDomain {
-#foreach($column in $columns)
-#if($column.query)
-#set($type = "string")
-#if($column.javaType == "Long" || $column.javaType == "Integer")
-  #set($type = "number")
-#elseif($column.javaType == "Boolean")
-  #set($type = "boolean")
-#end
-  /** ${column.columnComment} */
-  ${column.javaField}?: ${type};
-#end
-#end
-}
-
-/** ${functionName}配置信息 */
-export interface ${ClassName} extends BaseEntity {
-#foreach($column in $columns)
-#set($type = "string")
-#if($column.javaType == "Long" || $column.javaType == "Integer")
-  #set($type = "number")
-#elseif($column.javaType == "Boolean")
-  #set($type = "boolean")
-#end
-  /** ${column.columnComment} */
-  ${column.javaField}?: ${type};
-#end
-#if($table.sub)
-  /** $table.subTable.functionName信息 */
-  ${subclassName}List?: ${subClassName}[];
-#end
-}
-#if($table.sub)
-
-/** ${subTable.functionName}配置信息 */
-export interface ${subClassName} extends BaseEntity {
-#foreach ($column in $subTable.columns)
-#set($type = "string")
-#if($column.javaType == "Long" || $column.javaType == "Integer")
-  #set($type = "number")
-#elseif($column.javaType == "Boolean")
-  #set($type = "boolean")
-#end
-  /** ${column.columnComment} */
-  ${column.javaField}?: ${type};
-#end
-}
-#end

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm

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

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -153,15 +153,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
-#if($genView)
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="handleViewData(scope.row)"
-            v-hasPermi="['${permissionPrefix}:query']"
-          >详情</el-button>
-#end
           <el-button
             size="mini"
             type="text"
@@ -188,21 +179,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -215,121 +194,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in dict.type.${dictType}"
-                  v-for="dict in dict.type.${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="yyyy-MM-dd"
-                value-format="yyyy-MM-dd"
+            placeholder="请选择${comment}">
-                placeholder="请选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -400,15 +354,9 @@
 
 <script>
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 
 export default {
   name: "${BusinessName}",
-#if($genView)
-  components: { ${BusinessName}ViewDrawer },
-#end
 #if(${dicts} != '')
   dicts: [${dicts}],
 #end
@@ -545,7 +493,7 @@ export default {
     // 多选框选中数据
     handleSelectionChange(selection) {
       this.ids = selection.map(item => item.${pkColumn.javaField})
-      this.single = selection.length !== 1
+      this.single = selection.length!==1
       this.multiple = !selection.length
     },
     /** 新增按钮操作 */
@@ -642,12 +590,6 @@ export default {
     handle${subClassName}SelectionChange(selection) {
       this.checked${subClassName} = selection.map(item => item.index)
     },
-#end
-#if($genView)
-    /** 详情按钮操作 */
-    handleViewData(row) {
-      this.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-    },
 #end
     /** 导出按钮操作 */
     handleExport() {

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index-tree.vue.vm

@@ -136,9 +136,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
           <el-button link type="primary" icon="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${permissionPrefix}:add']">新增</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
@@ -146,21 +143,9 @@
       </el-table-column>
     </el-table>
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -173,134 +158,107 @@
 #end
 #set($dictType=$column.dictType)
 #if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${treeParentCode}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
+          <el-tree-select
-              <el-tree-select
+            v-model="form.${treeParentCode}"
-                v-model="form.${treeParentCode}"
+            :data="${businessName}Options"
-                :data="${businessName}Options"
+            :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
-                :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
+            value-key="${treeCode}"
-                value-key="${treeCode}"
+            placeholder="请选择${comment}"
-                placeholder="请选择${comment}"
+            check-strictly
-                check-strictly
+          />
-              />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+            placeholder="选择${comment}">
-                placeholder="选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -314,14 +272,11 @@
 
 <script setup name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
 const ${businessName}List = ref([])
@@ -344,7 +299,7 @@ const data = reactive({
   queryParams: {
     #foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
   },
@@ -379,7 +334,7 @@ function getList() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
     queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
     queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
   }
@@ -401,13 +356,13 @@ function getTreeselect() {
   })
 }
 	
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -459,13 +414,6 @@ function toggleExpandAll() {
     refreshTable.value = true
   })
 }
-#if($genView)
-
-/** 详情按钮操作 */
-function handleViewData(row) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-#end
 
 /** 修改按钮操作 */
 async function handleUpdate(row) {
@@ -496,13 +444,13 @@ function submitForm() {
 #end
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
+        update${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(() => {
+        add${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm

@@ -148,9 +148,6 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-#if($genView)
-          <el-button link type="primary" icon="View" @click="handleViewData(scope.row)" v-hasPermi="['${permissionPrefix}:query']">详情</el-button>
-#end
           <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
           <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
         </template>
@@ -165,21 +162,9 @@
       @pagination="getList"
     />
 
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
     <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-#set($dialogWidth = "800px")
+      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="80px">
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
 #foreach($column in $columns)
 #set($field=$column.javaField)
 #if($column.insert && !$column.pk)
@@ -192,121 +177,96 @@
 #end
 #set($dictType=$column.dictType)
 #if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="form.${field}"/>
-              <image-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="form.${field}"/>
-              <file-upload v-model="form.${field}"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "editor")
-          <el-col :span="24">
+        <el-form-item label="${comment}">
-            <el-form-item label="${comment}">
+          <editor v-model="form.${field}" :min-height="192"/>
-              <editor v-model="form.${field}" :min-height="192"/>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option
-                <el-option
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.label"
-                  :label="dict.label"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
+              :value="parseInt(dict.value)"
 #else
-                  :value="dict.value"
+              :value="dict.value"
 #end
-                ></el-option>
+            ></el-option>
-              </el-select>
+          </el-select>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="form.${field}" placeholder="请选择${comment}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
-                <el-option label="请选择字典生成" value="" />
+          </el-select>
-              </el-select>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox
-                <el-checkbox
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
+              :label="dict.value">
-                  :label="dict.value">
+              {{dict.label}}
-                  {{dict.label}}
+            </el-checkbox>
-                </el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="form.${field}">
-              <el-checkbox-group v-model="form.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
-                <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
-              </el-checkbox-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio
-                <el-radio
+              v-for="dict in ${dictType}"
-                  v-for="dict in ${dictType}"
+              :key="dict.value"
-                  :key="dict.value"
 #if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
+              :label="parseInt(dict.value)"
 #else
-                  :label="dict.value"
+              :label="dict.value"
 #end
-                >{{dict.label}}</el-radio>
+            >{{dict.label}}</el-radio>
-              </el-radio-group>
+          </el-radio-group>
-            </el-form-item>
+        </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="form.${field}">
-              <el-radio-group v-model="form.${field}">
+            <el-radio label="1">请选择字典生成</el-radio>
-                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
-              </el-radio-group>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
-              <el-date-picker clearable
+            v-model="form.${field}"
-                v-model="form.${field}"
+            type="date"
-                type="date"
+            value-format="YYYY-MM-DD"
-                value-format="YYYY-MM-DD"
+            placeholder="请选择${comment}">
-                placeholder="请选择${comment}">
+          </el-date-picker>
-              </el-date-picker>
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #elseif($column.htmlType == "textarea")
-          <el-col :span="24">
+        <el-form-item label="${comment}" prop="${field}">
-            <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
-            </el-form-item>
-          </el-col>
 #end
 #end
 #end
 #end
-        </el-row>
 #if($table.sub)
         <el-divider content-position="center">${subTable.functionName}信息</el-divider>
         <el-row :gutter="10" class="mb8">
@@ -317,13 +277,9 @@
             <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
           </el-col>
         </el-row>
-        <el-table :data="${subclassName}List" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
+        <el-table :data="${subclassName}List" :row-class-name="row${subClassName}Index" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
           <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" width="60">
+          <el-table-column label="序号" align="center" prop="index" width="50"/>
-            <template #default="{ $index }">
-              {{ $index + 1 }}
-            </template>
-          </el-table-column>
 #foreach($column in $subTable.columns)
 #set($javaField=$column.javaField)
 #set($parentheseIndex=$column.columnComment.indexOf("（"))
@@ -388,14 +344,11 @@
 
 <script setup name="${BusinessName}">
 import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
 
 const { proxy } = getCurrentInstance()
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
 #end
 
 const ${businessName}List = ref([])
@@ -427,7 +380,7 @@ const data = reactive({
     pageSize: 10,
     #foreach ($column in $columns)
 #if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
   },
@@ -462,7 +415,7 @@ function getList() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
+  if (null != daterange${AttrName} && '' != daterange${AttrName}) {
     queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
     queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
   }
@@ -475,13 +428,13 @@ function getList() {
   })
 }
 
-/** 取消按钮 */
+// 取消按钮
 function cancel() {
   open.value = false
   reset()
 }
 
-/** 表单重置 */
+// 表单重置
 function reset() {
   form.value = {
 #foreach ($column in $columns)
@@ -516,7 +469,7 @@ function resetQuery() {
   handleQuery()
 }
 
-/** 多选框选中数据 */
+// 多选框选中数据
 function handleSelectionChange(selection) {
   ids.value = selection.map(item => item.${pkColumn.javaField})
   single.value = selection.length != 1
@@ -562,13 +515,13 @@ function submitForm() {
       form.value.${subclassName}List = ${subclassName}List.value
 #end
       if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
+        update${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("修改成功")
           open.value = false
           getList()
         })
       } else {
-        add${BusinessName}(form.value).then(() => {
+        add${BusinessName}(form.value).then(response => {
           proxy.#[[$modal]]#.msgSuccess("新增成功")
           open.value = false
           getList()
@@ -590,13 +543,18 @@ function handleDelete(row) {
 }
 
 #if($table.sub)
+/** ${subTable.functionName}序号 */
+function row${subClassName}Index({ row, rowIndex }) {
+  row.index = rowIndex + 1
+}
+
 /** ${subTable.functionName}添加按钮操作 */
 function handleAdd${subClassName}() {
   let obj = {}
 #foreach($column in $subTable.columns)
 #if($column.pk || $column.javaField == ${subTableFkclassName})
 #elseif($column.list && "" != $javaField)
-  obj.$column.javaField = undefined
+  obj.$column.javaField = ""
 #end
 #end
   ${subclassName}List.value.push(obj)
@@ -620,13 +578,6 @@ function handle${subClassName}SelectionChange(selection) {
   checked${subClassName}.value = selection.map(item => item.index)
 }
 
-#end
-#if($genView)
-/** 详情按钮操作 */
-function handleViewData(row) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-
 #end
 /** 导出按钮操作 */
 function handleExport() {

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/view.vue.vm

@@ -1,83 +0,0 @@
-<template>
-  <el-drawer title="${functionName}详情" v-model="visible" direction="rtl" size="60%" append-to-body :before-close="handleClose" class="detail-drawer">
-    <div v-loading="loading" class="drawer-content">
-      <h4 class="section-header">基本信息</h4>
-#set($i = 0)
-#foreach($column in $columns)
-#if(!$column.pk && $column.list)
-#set($dictType=$column.dictType)
-#set($javaField=$column.javaField)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($i % 2 == 0)
-      <el-row :gutter="20" class="mb8">
-#end
-        <el-col :span="12">
-          <div class="info-item">
-            <label class="info-label">${comment}：</label>
-            <span class="info-value plaintext">
-#if("" != $dictType)
-#if($column.htmlType == "checkbox")
-              <dict-tag :options="${dictType}" :value="info.${javaField} ? info.${javaField}.split(',') : []" />
-#else
-              <dict-tag :options="${dictType}" :value="info.${javaField}" />
-#end
-#elseif($column.htmlType == "datetime")
-              {{ parseTime(info.${javaField}, '{y}-{m}-{d}') }}
-#elseif($column.htmlType == "imageUpload")
-              <image-preview :src="info.${javaField}" :width="60" :height="60" />
-#else
-              {{ info.${javaField} }}
-#end
-            </span>
-          </div>
-        </el-col>
-#set($i = $i + 1)
-#if($i % 2 == 0)
-      </el-row>
-#end
-#end
-#end
-#if($i % 2 != 0)
-      </el-row>
-#end
-    </div>
-  </el-drawer>
-</template>
-
-<script setup name="${BusinessName}ViewDrawer">
-import { get${BusinessName} } from '@/api/${moduleName}/${businessName}'
-
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const visible = ref(false)
-const loading = ref(false)
-const info = reactive({})
-
-const open = async (${pkColumn.javaField}) => {
-  visible.value = true
-  loading.value = true
-  try {
-    const res = await get${BusinessName}(${pkColumn.javaField})
-    Object.assign(info, res.data || {})
-  } catch (error) {
-    console.error('获取${functionName}信息失败:', error)
-  } finally {
-    loading.value = false
-  }
-}
-
-function handleClose() {
-  visible.value = false
-  Object.keys(info).forEach(key => delete info[key])
-}
-
-defineExpose({ open })
-</script>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index-tree.vue.vm

@@ -1,528 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-input
-          v-model="queryParams.${column.javaField}"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option
-            v-for="dict in ${dictType}"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-date-picker clearable
-          v-model="queryParams.${column.javaField}"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="选择${comment}">
-        </el-date-picker>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      <el-form-item label="${comment}" style="width: 308px">
-        <el-date-picker
-          v-model="daterange${AttrName}"
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-#end
-#end
-#end
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['${permissionPrefix}:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="info"
-          plain
-          icon="Sort"
-          @click="toggleExpandAll"
-        >展开/折叠</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table
-      v-if="refreshTable"
-      v-loading="loading"
-      :data="${businessName}List"
-      row-key="${treeCode}"
-      :default-expand-all="isExpandAll"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-#foreach($column in $columns)
-#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($column.pk)
-#elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-        <template #default="scope">
-          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
-        <template #default="scope">
-#if($column.htmlType == "checkbox")
-          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $javaField)
-#if(${foreach.index} == 1)
-      <el-table-column label="${comment}" prop="${javaField}" />
-#else
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#end
-#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>
-        </template>
-      </el-table-column>
-    </el-table>
-
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
-    <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if("" != $treeParentCode && $column.javaField == $treeParentCode)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${treeParentCode}">
-              <el-tree-select
-                v-model="form.${treeParentCode}"
-                :data="${businessName}Options"
-                :props="{ value: '${treeCode}', label: '${treeName}', children: 'children' }"
-                value-key="${treeCode}"
-                placeholder="请选择${comment}"
-                check-strictly
-              />
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
-#else
-                  :value="dict.value"
-#end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
-#else
-                  :label="dict.value"
-#end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-#end
-#end
-#end
-#end
-        </el-row>
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts" name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
-import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
-import type { TreeSelect } from '@/types/api/common'
-
-const { proxy } = getCurrentInstance()
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const ${businessName}List = ref<any[]>([])
-const ${businessName}Options = ref<TreeSelect[]>([])
-const open = ref<boolean>(false)
-const loading = ref<boolean>(true)
-const showSearch = ref<boolean>(true)
-const title = ref<string>("")
-const isExpandAll = ref<boolean>(true)
-const refreshTable = ref<boolean>(true)
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref([])
-#end
-#end
-
-const data = reactive({
-  form: {} as ${ClassName},
-  queryParams: {
-    #foreach ($column in $columns)
-#if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-  } as ${BusinessName}QueryParams,
-  rules: {
-    #foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-    ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-  }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询${functionName}列表 */
-function getList() {
-  loading.value = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
-    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
-    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
-  }
-#end
-#end
-  list${BusinessName}(queryParams.value).then(response => {
-    ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
-    loading.value = false
-  })
-}
-
-/** 查询${functionName}下拉树结构 */
-function getTreeselect() {
-  list${BusinessName}().then(response => {
-    ${businessName}Options.value = []
-    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] }
-    data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
-    ${businessName}Options.value.push(data)
-  })
-}
-	
-/** 取消按钮 */
-function cancel() {
-  open.value = false
-  reset()
-}
-
-/** 表单重置 */
-function reset() {
-  form.value = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-    $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
-    $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
-  }
-  proxy.resetForm("${businessName}Ref")
-}
-
-/** 搜索按钮操作 */
-function handleQuery() {
-  getList()
-}
-
-/** 重置按钮操作 */
-function resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  daterange${AttrName}.value = []
-#end
-#end
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
-
-/** 新增按钮操作 */
-function handleAdd(row: ${ClassName}) {
-  reset()
-  getTreeselect()
-  if (row != null && row.${treeCode}) {
-    form.value.${treeParentCode} = row.${treeCode}
-  } else {
-    form.value.${treeParentCode} = 0
-  }
-  open.value = true
-  title.value = "添加${functionName}"
-}
-
-/** 展开/折叠操作 */
-function toggleExpandAll() {
-  refreshTable.value = false
-  isExpandAll.value = !isExpandAll.value
-  nextTick(() => {
-    refreshTable.value = true
-  })
-}
-#if($genView)
-
-/** 详情按钮操作 */
-function handleViewData(row: ${ClassName}) {
-  proxy.#[[$]]#refs["${businessName}ViewRef"].open(row.${pkColumn.javaField})
-}
-#end
-
-/** 修改按钮操作 */
-async function handleUpdate(row: ${ClassName}) {
-  reset()
-  await getTreeselect()
-  if (row != null) {
-    form.value.${treeParentCode} = row.${treeParentCode}
-  }
-  get${BusinessName}(row.${pkColumn.javaField}!).then(response => {
-    form.value = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-    form.value.$column.javaField = form.value.${column.javaField}.split(",")
-#end
-#end
-    open.value = true
-    title.value = "修改${functionName}"
-  })
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.#[[$]]#refs["${businessName}Ref"].validate((valid: boolean) => {
-    if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-      form.value.$column.javaField = form.value.${column.javaField}.join(",")
-#end
-#end
-      if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
-          proxy.#[[$modal]]#.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        add${BusinessName}(form.value).then(() => {
-          proxy.#[[$modal]]#.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
-    }
-  })
-}
-
-/** 删除按钮操作 */
-function handleDelete(row: ${ClassName}) {
-  proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-    return del${BusinessName}(row.${pkColumn.javaField}!)
-  }).then(() => {
-    getList()
-    proxy.#[[$modal]]#.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-getList()
-</script>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3ts/index.vue.vm

@@ -1,644 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
-#foreach($column in $columns)
-#if($column.query)
-#set($dictType=$column.dictType)
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if($column.htmlType == "input")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-input
-          v-model="queryParams.${column.javaField}"
-          placeholder="请输入${comment}"
-          clearable
-          @keyup.enter="handleQuery"
-        />
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option
-            v-for="dict in ${dictType}"
-            :key="dict.value"
-            :label="dict.label"
-            :value="dict.value"
-          />
-        </el-select>
-      </el-form-item>
-#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
-          <el-option label="请选择字典生成" value="" />
-        </el-select>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
-      <el-form-item label="${comment}" prop="${column.javaField}">
-        <el-date-picker clearable
-          v-model="queryParams.${column.javaField}"
-          type="date"
-          value-format="YYYY-MM-DD"
-          placeholder="请选择${comment}">
-        </el-date-picker>
-      </el-form-item>
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      <el-form-item label="${comment}" style="width: 308px">
-        <el-date-picker
-          v-model="daterange${AttrName}"
-          value-format="YYYY-MM-DD"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        ></el-date-picker>
-      </el-form-item>
-#end
-#end
-#end
-      <el-form-item>
-        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="Plus"
-          @click="handleAdd"
-          v-hasPermi="['${permissionPrefix}:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="Edit"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['${permissionPrefix}:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="Delete"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['${permissionPrefix}:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="Download"
-          @click="handleExport"
-          v-hasPermi="['${permissionPrefix}:export']"
-        >导出</el-button>
-      </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-    </el-row>
-
-    <el-table v-loading="loading" :data="${businessName}List" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-#foreach($column in $columns)
-#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($column.pk)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#elseif($column.list && $column.htmlType == "datetime")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="180">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-#elseif($column.list && $column.htmlType == "imageUpload")
-      <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
-        <template #default="scope">
-          <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $column.dictType)
-      <el-table-column label="${comment}" align="center" prop="${javaField}">
-        <template #default="scope">
-#if($column.htmlType == "checkbox")
-          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
-#else
-          <dict-tag :options="${column.dictType}" :value="scope.row.${javaField}"/>
-#end
-        </template>
-      </el-table-column>
-#elseif($column.list && "" != $javaField)
-      <el-table-column label="${comment}" align="center" prop="${javaField}" />
-#end
-#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>
-      </el-table-column>
-    </el-table>
-    
-    <pagination
-      v-show="total>0"
-      :total="total"
-      v-model:page="queryParams.pageNum"
-      v-model:limit="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-#if($genView)
-    <!-- ${functionName}详情抽屉 -->
-    <${businessName}-view-drawer ref="${businessName}ViewRef" />
-#end
-    <!-- 添加或修改${functionName}对话框 -->
-#if($table.formColNum == 2)
-#set($dialogWidth = "800px")
-#elseif($table.formColNum == 3)
-#set($dialogWidth = "1100px")
-#else
-#set($dialogWidth = "500px")
-#end
-    <el-dialog :title="title" v-model="open" width="${dialogWidth}" append-to-body>
-      <el-form ref="${businessName}Ref" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if($column.insert && !$column.pk)
-#if(($column.usableColumn) || (!$column.superColumn))
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "imageUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <image-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "fileUpload")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <file-upload v-model="form.${field}"/>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "editor")
-          <el-col :span="24">
-            <el-form-item label="${comment}">
-              <editor v-model="form.${field}" :min-height="192"/>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "select" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.label"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :value="parseInt(dict.value)"
-#else
-                  :value="dict.value"
-#end
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "select" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-select v-model="form.${field}" placeholder="请选择${comment}">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-                  :label="dict.value">
-                  {{dict.label}}
-                </el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "checkbox" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-checkbox-group v-model="form.${field}">
-                <el-checkbox>请选择字典生成</el-checkbox>
-              </el-checkbox-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio
-                  v-for="dict in ${dictType}"
-                  :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-                  :label="parseInt(dict.value)"
-#else
-                  :label="dict.value"
-#end
-                >{{dict.label}}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "radio" && $dictType)
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-radio-group v-model="form.${field}">
-                <el-radio label="1">请选择字典生成</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "datetime")
-          <el-col :span="${colSpan}">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-date-picker clearable
-                v-model="form.${field}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择${comment}">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
-#elseif($column.htmlType == "textarea")
-          <el-col :span="24">
-            <el-form-item label="${comment}" prop="${field}">
-              <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-            </el-form-item>
-          </el-col>
-#end
-#end
-#end
-#end
-        </el-row>
-#if($table.sub)
-        <el-divider content-position="center">${subTable.functionName}信息</el-divider>
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button type="primary" icon="Plus" @click="handleAdd${subClassName}">添加</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="danger" icon="Delete" @click="handleDelete${subClassName}">删除</el-button>
-          </el-col>
-        </el-row>
-        <el-table :data="${subclassName}List" @selection-change="handle${subClassName}SelectionChange" ref="${subclassName}">
-          <el-table-column type="selection" width="50" align="center" />
-          <el-table-column label="序号" width="60">
-            <template #default="{ $index }">
-              {{ $index + 1 }}
-            </template>
-          </el-table-column>
-#foreach($column in $subTable.columns)
-#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($column.pk || $javaField == ${subTableFkclassName})
-#elseif($column.list && $column.htmlType == "input")
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template #default="scope">
-              <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" />
-            </template>
-          </el-table-column>
-#elseif($column.list && $column.htmlType == "datetime")
-          <el-table-column label="$comment" prop="${javaField}" width="240">
-            <template #default="scope">
-              <el-date-picker clearable
-                v-model="scope.row.$javaField"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择$comment">
-              </el-date-picker>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template #default="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option
-                  v-for="dict in $column.dictType"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-                ></el-option>
-              </el-select>
-            </template>
-          </el-table-column>
-#elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType)
-          <el-table-column label="$comment" prop="${javaField}" width="150">
-            <template #default="scope">
-              <el-select v-model="scope.row.$javaField" placeholder="请选择$comment">
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </template>
-          </el-table-column>
-#end
-#end
-        </el-table>
-#end
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts" name="${BusinessName}">
-#if($table.sub)
-import type { ${ClassName}, ${subClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
-#else
-import type { ${ClassName}, ${BusinessName}QueryParams } from "@/types/api/${moduleName}/${businessName}"
-#end
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
-#if($genView)
-import ${BusinessName}ViewDrawer from "./view"
-#end
-
-const { proxy } = getCurrentInstance()
-#if(${dicts} != '')
-#set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = useDict(${dicts})
-#end
-
-const ${businessName}List = ref<${ClassName}[]>([])
-#if($table.sub)
-const ${subclassName}List = ref([])
-#end
-const open = ref<boolean>(false)
-const loading = ref<boolean>(true)
-const showSearch = ref<boolean>(true)
-const ids = ref<number[]>([])
-#if($table.sub)
-const checked${subClassName} = ref([])
-#end
-const single = ref<boolean>(true)
-const multiple = ref<boolean>(true)
-const total = ref<number>(0)
-const title = ref<string>("")
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-const daterange${AttrName} = ref<string[]>([])
-#end
-#end
-
-const data = reactive({
-  form: {} as ${ClassName},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    #foreach ($column in $columns)
-#if($column.query)
-    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-  } as ${BusinessName}QueryParams,
-  rules: {
-    #foreach ($column in $columns)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-    ]#if($foreach.count != $columns.size()),#end
-#end
-#end
-  }
-})
-
-const { queryParams, form, rules } = toRefs(data)
-
-/** 查询${functionName}列表 */
-function getList() {
-  loading.value = true
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {}
-#break
-#end
-#end
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  if (null != daterange${AttrName}.value && '' != daterange${AttrName}.value) {
-    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
-    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
-  }
-#end
-#end
-  list${BusinessName}(queryParams.value).then(response => {
-    ${businessName}List.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
-}
-
-/** 取消按钮 */
-function cancel() {
-  open.value = false
-  reset()
-}
-
-/** 表单重置 */
-function reset() {
-  form.value = {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-    $column.javaField: []#if($foreach.count != $columns.size()),#end
-#else
-    $column.javaField: null#if($foreach.count != $columns.size()),#end
-#end
-#end
-  }
-#if($table.sub)
-  ${subclassName}List.value = []
-#end
-  proxy.resetForm("${businessName}Ref")
-}
-
-/** 搜索按钮操作 */
-function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
-}
-
-/** 重置按钮操作 */
-function resetQuery() {
-#foreach ($column in $columns)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-  daterange${AttrName}.value = []
-#end
-#end
-  proxy.resetForm("queryRef")
-  handleQuery()
-}
-
-/** 多选框选中数据 */
-function handleSelectionChange(selection: ${ClassName}[]) {
-  ids.value = selection.map(item => item.${pkColumn.javaField})
-  single.value = selection.length != 1
-  multiple.value = !selection.length
-}
-
-/** 新增按钮操作 */
-function handleAdd() {
-  reset()
-  open.value = true
-  title.value = "添加${functionName}"
-}
-
-/** 修改按钮操作 */
-function handleUpdate(row: ${ClassName}) {
-  reset()
-  const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value[0]
-  get${BusinessName}(_${pkColumn.javaField}).then(response => {
-    form.value = response.data
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-    form.value.$column.javaField = form.value.${column.javaField}.split(",")
-#end
-#end
-#if($table.sub)
-    ${subclassName}List.value = response.data?.${subclassName}List ?? []
-#end
-    open.value = true
-    title.value = "修改${functionName}"
-  })
-}
-
-/** 提交按钮 */
-function submitForm() {
-  proxy.#[[$]]#refs["${businessName}Ref"].validate((valid: boolean) => {
-    if (valid) {
-#foreach ($column in $columns)
-#if($column.htmlType == "checkbox")
-      form.value.$column.javaField = form.value.${column.javaField}.join(",")
-#end
-#end
-#if($table.sub)
-      form.value.${subclassName}List = ${subclassName}List.value
-#end
-      if (form.value.${pkColumn.javaField} != null) {
-        update${BusinessName}(form.value).then(() => {
-          proxy.#[[$modal]]#.msgSuccess("修改成功")
-          open.value = false
-          getList()
-        })
-      } else {
-        add${BusinessName}(form.value).then(() => {
-          proxy.#[[$modal]]#.msgSuccess("新增成功")
-          open.value = false
-          getList()
-        })
-      }
-    }
-  })
-}
-
-/** 删除按钮操作 */
-function handleDelete(row: ${ClassName}) {
-  const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value
-  proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').then(function() {
-    return del${BusinessName}(_${pkColumn.javaField}s)
-  }).then(() => {
-    getList()
-    proxy.#[[$modal]]#.msgSuccess("删除成功")
-  }).catch(() => {})
-}
-
-#if($table.sub)
-/** ${subTable.functionName}添加按钮操作 */
-function handleAdd${subClassName}() {
-  let obj: ${subClassName} = {}
-#foreach($column in $subTable.columns)
-#if($column.pk || $column.javaField == ${subTableFkclassName})
-#elseif($column.list && "" != $javaField)
-  obj.$column.javaField = undefined
-#end
-#end
-  ${subclassName}List.value.push(obj)
-}
-
-/** ${subTable.functionName}删除按钮操作 */
-function handleDelete${subClassName}() {
-  if (checked${subClassName}.value.length == 0) {
-    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据")
-  } else {
-    const ${subclassName}s = ${subclassName}List.value
-    const checked${subClassName}s = checked${subClassName}.value
-    ${subclassName}List.value = ${subclassName}s.filter(function(item: any) {
-      return checked${subClassName}s.indexOf(item.index) == -1
-    })
-  }
-}
-
-/** 复选框选中数据 */
-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() {
-  proxy.download('${moduleName}/${businessName}/export', {
-    ...queryParams.value
-  }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
-}
-
-getList()
-</script>