Merge remote-tracking branch 'origin/master'

# Conflicts:
#	docker/copy.sh

.gitignore

@@ -44,3 +44,4 @@ nbdist/
 !*/build/*.java
 !*/build/*.html
 !*/build/*.xml
+docker

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.6</h1>
+<h1 align="center" style="margin: 30px 0 30px; font-weight: bold;">RuoYi v3.6.4</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.6-brightgreen.svg"></a>
+	<a href="https://gitee.com/y_project/RuoYi-Cloud"><img src="https://img.shields.io/badge/RuoYi-v3.6.4-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>
 
@@ -17,9 +17,12 @@
 * 后端采用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)，保持同步更新。
+* 提供了技术栈（[Vue3](https://v3.cn.vuejs.org) [Element Plus](https://element-plus.org/zh-CN) [Vite](https://cn.vitejs.dev)）版本[RuoYi-Cloud-Vue3](https://github.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;
+* 阿里云折扣场：[点我进入](http://aly.ruoyi.vip)，腾讯云秒杀场：[点我进入](http://txy.ruoyi.vip)&nbsp;&nbsp;
+* 阿里云优惠券：[点我领取](https://www.aliyun.com/minisite/goods?userCode=brki8iof&share_source=copy_link)，腾讯云优惠券：[点我领取](https://cloud.tencent.com/redirect.php?redirect=1025&cps_key=198c8df2ed259157187173bc7f4f32fd&from=console)&nbsp;&nbsp;
+
+#### 友情链接 [若依/RuoYi-Cloud](https://gitee.com/zhangmrit/ruoyi-cloud) Ant Design版本。
 
 ## 系统模块
 
@@ -38,7 +41,6 @@ com.ruoyi
 │       └── ruoyi-common-redis                        // 缓存服务
 │       └── ruoyi-common-seata                        // 分布式事务
 │       └── ruoyi-common-security                     // 安全模块
-│       └── ruoyi-common-sensitive                    // 数据脱敏
 │       └── ruoyi-common-swagger                      // 系统接口
 ├── ruoyi-modules         // 业务模块
 │       └── ruoyi-system                              // 系统模块 [9201]

docker/copy.sh

@@ -9,8 +9,9 @@ usage() {
 
 # copy sql
 echo "begin copy sql "
-cp ../sql/ry_20250523.sql ./mysql/db
+cp ../sql/ry_*.sql ./mysql/db
-cp ../sql/ry_config_20250224.sql ./mysql/db
+cp ../sql/ry_config_*.sql ./mysql/db
+cp ../sql/ry_seata_*.sql ./mysql/db
 
 # copy html
 echo "begin copy html "

docker/docker-compose.yml

@@ -27,6 +27,7 @@ services:
       - ./mysql/conf:/etc/mysql/conf.d
       - ./mysql/logs:/logs
       - ./mysql/data:/var/lib/mysql
+      - ./mysql/db:/docker-entrypoint-initdb.d
     command: [
           'mysqld',
           '--innodb-buffer-pool-size=80M',

docker/nginx/conf/nginx.conf

@@ -29,7 +29,7 @@ http {
         }
 
         # 避免actuator暴露
-        if ($uri ~ "/actuator") {
+        if ($request_uri ~ "/actuator") {
             return 403;
         }
 

pom.xml

@@ -6,45 +6,42 @@
 
     <groupId>com.ruoyi</groupId>
     <artifactId>ruoyi</artifactId>
-    <version>3.6.6</version>
+    <version>3.6.4</version>
 
     <name>ruoyi</name>
     <url>http://www.ruoyi.vip</url>
     <description>若依微服务系统</description>
 
     <properties>
-        <ruoyi.version>3.6.6</ruoyi.version>
+        <ruoyi.version>3.6.4</ruoyi.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
         <spring-boot.version>2.7.18</spring-boot.version>
-        <spring-cloud.version>2021.0.9</spring-cloud.version>
+        <spring-cloud.version>2021.0.8</spring-cloud.version>
-        <spring-cloud-alibaba.version>2021.0.6.1</spring-cloud-alibaba.version>
+        <spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
-        <spring-boot-admin.version>2.7.16</spring-boot-admin.version>
+        <spring-framework.version>5.3.33</spring-framework.version>
+        <spring-boot-admin.version>2.7.15</spring-boot-admin.version>
         <tobato.version>1.27.2</tobato.version>
         <kaptcha.version>2.3.3</kaptcha.version>
         <pagehelper.boot.version>2.0.0</pagehelper.boot.version>
         <druid.version>1.2.23</druid.version>
-        <dynamic-ds.version>4.3.1</dynamic-ds.version>
+        <dynamic-ds.version>4.2.0</dynamic-ds.version>
-        <commons.io.version>2.19.0</commons.io.version>
+        <commons.io.version>2.13.0</commons.io.version>
         <velocity.version>2.3</velocity.version>
-        <fastjson.version>2.0.57</fastjson.version>
+        <fastjson.version>2.0.43</fastjson.version>
         <jjwt.version>0.9.1</jjwt.version>
         <minio.version>8.2.2</minio.version>
         <poi.version>4.1.2</poi.version>
         <springdoc.version>1.6.9</springdoc.version>
         <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的依赖配置-->
+            <!-- SpringFramework的依赖配置-->
             <dependency>
                 <groupId>org.springframework</groupId>
                 <artifactId>spring-framework-bom</artifactId>
@@ -80,38 +77,6 @@
                 <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>

ruoyi-api/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.6</version>
+        <version>3.6.4</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.6</version>
+        <version>3.6.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

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

@@ -8,7 +8,6 @@ import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.annotation.Excel.ColumnType;
 import com.ruoyi.common.core.annotation.Excel.Type;
-import com.ruoyi.common.core.constant.UserConstants;
 import com.ruoyi.common.core.annotation.Excels;
 import com.ruoyi.common.core.web.domain.BaseEntity;
 import com.ruoyi.common.core.xss.Xss;
@@ -56,8 +55,8 @@ public class SysUser extends BaseEntity
     /** 密码 */
     private String password;
 
-    /** 账号状态（0正常 1停用） */
+    /** 帐号状态（0正常 1停用） */
-    @Excel(name = "账号状态", readConverterExp = "0=正常,1=停用")
+    @Excel(name = "帐号状态", readConverterExp = "0=正常,1=停用")
     private String status;
 
     /** 删除标志（0代表存在 2代表删除） */
@@ -71,9 +70,6 @@ public class SysUser extends BaseEntity
     @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),
@@ -120,7 +116,7 @@ public class SysUser extends BaseEntity
 
     public static boolean isAdmin(Long userId)
     {
-        return UserConstants.isAdmin(userId);
+        return userId != null && 1L == userId;
     }
 
     public Long getDeptId()
@@ -251,16 +247,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;
@@ -310,7 +296,6 @@ public class SysUser extends BaseEntity
     {
         this.roleId = roleId;
     }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -327,7 +312,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-auth/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-auth/pom.xml

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

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

@@ -143,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-common/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi</artifactId>
-        <version>3.6.6</version>
+        <version>3.6.4</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.6</version>
+        <version>3.6.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

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

@@ -78,11 +78,6 @@ public @interface Excel
      */
     public String prompt() default "";
 
-    /**
-     * 是否允许内容换行 
-     */
-    public boolean wrapText() default false;
-
     /**
      * 设置只能选择不能输入的列内容.
      */

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

@@ -20,7 +20,7 @@ public class SecurityConstants
     /**
      * 授权信息字段
      */
-    public static final String AUTHORIZATION_HEADER = "Authorization";
+    public static final String AUTHORIZATION_HEADER = "authorization";
 
     /**
      * 请求来源

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

@@ -7,6 +7,11 @@ package com.ruoyi.common.core.constant;
  */
 public class TokenConstants
 {
+    /**
+     * 令牌自定义标识
+     */
+    public static final String AUTHENTICATION = "Authorization";
+
     /**
      * 令牌前缀
      */

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

@@ -21,9 +21,6 @@ public class UserConstants
     /** 用户封禁状态 */
     public static final String USER_DISABLE = "1";
 
-    /** 角色正常状态 */
-    public static final String ROLE_NORMAL = "0";
-
     /** 角色封禁状态 */
     public static final String ROLE_DISABLE = "1";
 
@@ -80,9 +77,4 @@ public class UserConstants
     public static final int PASSWORD_MIN_LENGTH = 5;
 
     public static final int PASSWORD_MAX_LENGTH = 20;
-
-    public static boolean isAdmin(Long userId)
-    {
-        return userId != null && 1L == userId;
-    }
 }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/text/Convert.java

@@ -540,7 +540,7 @@ public class Convert
 
     /**
      * 转换为boolean<br>
-     * String支持的值为：true、false、yes、ok、no、1、0、是、否, 如果给定的值为空，或者转换失败，返回默认值<br>
+     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
      * 转换失败不会报错
      * 
      * @param value 被转换的值
@@ -569,12 +569,10 @@ public class Convert
             case "yes":
             case "ok":
             case "1":
-            case "是":
                 return true;
             case "false":
             case "no":
             case "0":
-            case "否":
                 return false;
             default:
                 return defaultValue;

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

@@ -136,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/StringUtils.java

@@ -283,32 +283,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils
         return str.substring(start, end);
     }
 
-    /**
-     * 在字符串中查找第一个出现的 `open` 和最后一个出现的 `close` 之间的子字符串
-     * 
-     * @param str 要截取的字符串
-     * @param open 起始字符串
-     * @param close 结束字符串
-     * @return 截取结果
-     */
-    public static String substringBetweenLast(final String str, final String open, final String close)
-    {
-        if (isEmpty(str) || isEmpty(open) || isEmpty(close))
-        {
-            return NULLSTR;
-        }
-        final int start = str.indexOf(open);
-        if (start != INDEX_NOT_FOUND)
-        {
-            final int end = str.lastIndexOf(close);
-            if (end != INDEX_NOT_FOUND)
-            {
-                return str.substring(start + open.length(), end);
-            }
-        }
-        return NULLSTR;
-    }
-
     /**
      * 判断是否为空，并且不是空白字符
      * 

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

@@ -167,11 +167,6 @@ public class ExcelUtil<T>
      */
     public Class<T> clazz;
 
-    /**
-     * 需要显示列属性
-     */
-    public String[] includeFields;
-
     /**
      * 需要排除列属性
      */
@@ -182,20 +177,11 @@ public class ExcelUtil<T>
         this.clazz = clazz;
     }
 
-    /**
-     * 仅在Excel中显示列属性
-     *
-     * @param fields 列属性名 示例[单个"name"/多个"id","name"]
-     */
-    public void showColumn(String... fields)
-    {
-        this.includeFields = fields;
-    }
-
     /**
      * 隐藏Excel中列属性
      *
      * @param fields 列属性名 示例[单个"name"/多个"id","name"]
+     * @throws Exception
      */
     public void hideColumn(String... fields)
     {
@@ -225,6 +211,8 @@ public class ExcelUtil<T>
     {
         if (StringUtils.isNotEmpty(title))
         {
+            subMergedFirstRowNum++;
+            subMergedLastRowNum++;
             int titleLastCol = this.fields.size() - 1;
             if (isSubList())
             {
@@ -235,7 +223,7 @@ public class ExcelUtil<T>
             Cell titleCell = titleRow.createCell(0);
             titleCell.setCellStyle(styles.get("title"));
             titleCell.setCellValue(title);
-            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), 0, titleLastCol));
+            sheet.addMergedRegion(new CellRangeAddress(titleRow.getRowNum(), titleRow.getRowNum(), titleRow.getRowNum(), titleLastCol));
         }
     }
 
@@ -246,31 +234,23 @@ public class ExcelUtil<T>
     {
         if (isSubList())
         {
+            subMergedFirstRowNum++;
+            subMergedLastRowNum++;
             Row subRow = sheet.createRow(rownum);
-            int column = 0;
+            int excelNum = 0;
-            int subFieldSize = subFields != null ? subFields.size() : 0;
             for (Object[] objects : fields)
             {
-                Field field = (Field) objects[0];
                 Excel attr = (Excel) objects[1];
-                if (Collection.class.isAssignableFrom(field.getType()))
+                Cell headCell1 = subRow.createCell(excelNum);
-                {
+                headCell1.setCellValue(attr.name());
-                    Cell cell = subRow.createCell(column);
+                headCell1.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
-                    cell.setCellValue(attr.name());
+                excelNum++;
-                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
-                    if (subFieldSize > 1)
-                    {
-                        CellRangeAddress cellAddress = new CellRangeAddress(rownum, rownum, column, column + subFieldSize - 1);
-                        sheet.addMergedRegion(cellAddress);
             }
-                    column += subFieldSize;
+            int headFirstRow = excelNum - 1;
-                }
+            int headLastRow = headFirstRow + subFields.size() - 1;
-                else
+            if (headLastRow > headFirstRow)
             {
-                    Cell cell = subRow.createCell(column++);
+                sheet.addMergedRegion(new CellRangeAddress(rownum, rownum, headFirstRow, headLastRow));
-                    cell.setCellValue(attr.name());
-                    cell.setCellStyle(styles.get(StringUtils.format("header_{}_{}", attr.headerColor(), attr.headerBackgroundColor())));
-                }
             }
             rownum++;
         }
@@ -283,23 +263,11 @@ public class ExcelUtil<T>
      * @return 转换后集合
      */
     public List<T> importExcel(InputStream is)
-    {
-        return importExcel(is, 0);
-    }
-
-    /**
-     * 对excel表单默认第一个索引名转换成list
-     * 
-     * @param is 输入流
-     * @param titleNum 标题占用行数
-     * @return 转换后集合
-     */
-    public List<T> importExcel(InputStream is, int titleNum)
     {
         List<T> list = null;
         try
         {
-            list = importExcel(StringUtils.EMPTY, is, titleNum);
+            list = importExcel(is, 0);
         }
         catch (Exception e)
         {
@@ -313,6 +281,18 @@ public class ExcelUtil<T>
         return list;
     }
 
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     * 
+     * @param is 输入流
+     * @param titleNum 标题占用行数
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is, int titleNum) throws Exception
+    {
+        return importExcel(StringUtils.EMPTY, is, titleNum);
+    }
+
     /**
      * 对excel表单指定表格索引名转换成list
      * 
@@ -390,7 +370,7 @@ public class ExcelUtil<T>
                     if (String.class == fieldType)
                     {
                         String s = Convert.toStr(val);
-                        if (s.matches("^\\d+\\.0$"))
+                        if (StringUtils.endsWith(s, ".0"))
                         {
                             val = StringUtils.substringBefore(s, ".0");
                         }
@@ -595,91 +575,64 @@ public class ExcelUtil<T>
     {
         int startNo = index * sheetSize;
         int endNo = Math.min(startNo + sheetSize, list.size());
-        int currentRowNum = rownum + 1; // 从标题行后开始
+        int rowNo = (1 + rownum) - startNo;
-
         for (int i = startNo; i < endNo; i++)
         {
-            row = sheet.createRow(currentRowNum);
+            rowNo = isSubList() ? (i > 1 ? rowNo + 1 : rowNo + i) : i + 1 + rownum - startNo;
+            row = sheet.createRow(rowNo);
+            // 得到导出对象.
             T vo = (T) list.get(i);
+            Collection<?> subList = null;
+            if (isSubList())
+            {
+                if (isSubListValue(vo))
+                {
+                    subList = getListCellValue(vo);
+                    subMergedLastRowNum = subMergedLastRowNum + subList.size();
+                }
+                else
+                {
+                    subMergedFirstRowNum++;
+                    subMergedLastRowNum++;
+                }
+            }
             int column = 0;
-            int maxSubListSize = getCurrentMaxSubListSize(vo);
             for (Object[] os : fields)
             {
                 Field field = (Field) os[0];
                 Excel excel = (Excel) os[1];
-                if (Collection.class.isAssignableFrom(field.getType()))
+                if (Collection.class.isAssignableFrom(field.getType()) && StringUtils.isNotNull(subList))
                 {
-                    try
+                    boolean subFirst = false;
+                    for (Object obj : subList)
                     {
-                        Collection<?> subList = (Collection<?>) getTargetValue(vo, field, excel);
+                        if (subFirst)
-                        if (subList != null && !subList.isEmpty())
                         {
-                            int subIndex = 0;
+                            rowNo++;
-                            for (Object subVo : subList)
+                            row = sheet.createRow(rowNo);
-                            {
-                                Row subRow = sheet.getRow(currentRowNum + subIndex);
-                                if (subRow == null)
-                                {
-                                    subRow = sheet.createRow(currentRowNum + subIndex);
                         }
-
+                        List<Field> subFields = FieldUtils.getFieldsListWithAnnotation(obj.getClass(), Excel.class);
-                                int subColumn = column;
+                        int subIndex = 0;
                         for (Field subField : subFields)
                         {
-                                    Excel subExcel = subField.getAnnotation(Excel.class);
+                            if (subField.isAnnotationPresent(Excel.class))
-                                    addCell(subExcel, subRow, (T) subVo, subField, subColumn++);
+                            {
+                                subField.setAccessible(true);
+                                Excel attr = subField.getAnnotation(Excel.class);
+                                this.addCell(attr, row, (T) obj, subField, column + subIndex);
                             }
                             subIndex++;
                         }
-                            column += subFields.size();
+                        subFirst = true;
-                        }
-                    }
-                    catch (Exception e)
-                    {
-                        log.error("填充集合数据失败", e);
                     }
+                    this.subMergedFirstRowNum = this.subMergedFirstRowNum + subList.size();
                 }
                 else
                 {
-                    // 创建单元格并设置值
+                    this.addCell(excel, row, vo, field, column++);
-                    addCell(excel, row, vo, field, column);
-                    if (maxSubListSize > 1 && excel.needMerge())
-                    {
-                        sheet.addMergedRegion(new CellRangeAddress(currentRowNum, currentRowNum + maxSubListSize - 1, column, column));
-                    }
-                    column++;
-                }
-            }
-            currentRowNum += maxSubListSize;
-        }
-    }
-
-    /**
-     * 获取子列表最大数
-     */
-    private int getCurrentMaxSubListSize(T vo)
-    {
-        int maxSubListSize = 1;
-        for (Object[] os : fields)
-        {
-            Field field = (Field) os[0];
-            if (Collection.class.isAssignableFrom(field.getType()))
-            {
-                try
-                {
-                    Collection<?> subList = (Collection<?>) getTargetValue(vo, field, (Excel) os[1]);
-                    if (subList != null && !subList.isEmpty())
-                    {
-                        maxSubListSize = Math.max(maxSubListSize, subList.size());
-                    }
-                }
-                catch (Exception e)
-                {
-                    log.error("获取集合大小失败", e);
                 }
             }
         }
-        return maxSubListSize;
     }
 
     /**
@@ -814,7 +767,7 @@ public class ExcelUtil<T>
      */
     public void annotationDataStyles(Map<String, CellStyle> styles, Field field, Excel excel)
     {
-        String key = StringUtils.format("data_{}_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType(), excel.wrapText());
+        String key = StringUtils.format("data_{}_{}_{}_{}", excel.align(), excel.color(), excel.backgroundColor(), excel.cellType());
         if (!styles.containsKey(key))
         {
             CellStyle style = wb.createCellStyle();
@@ -830,7 +783,6 @@ public class ExcelUtil<T>
             style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
             style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
             style.setFillForegroundColor(excel.backgroundColor().getIndex());
-            style.setWrapText(excel.wrapText());
             Font dataFont = wb.createFont();
             dataFont.setFontName("Arial");
             dataFont.setFontHeightInPoints((short) 10);
@@ -859,7 +811,7 @@ public class ExcelUtil<T>
         if (isSubList())
         {
             // 填充默认样式，防止合并单元格样式失效
-            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));
+            sheet.setDefaultColumnStyle(column, styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
             if (attr.needMerge())
             {
                 sheet.addMergedRegion(new CellRangeAddress(rownum - 1, rownum, column, column));
@@ -986,12 +938,10 @@ public class ExcelUtil<T>
                 cell = row.createCell(column);
                 if (isSubListValue(vo) && getListCellValue(vo).size() > 1 && attr.needMerge())
                 {
-                    if (subMergedLastRowNum >= subMergedFirstRowNum)
+                    CellRangeAddress cellAddress = new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column);
-                    {
+                    sheet.addMergedRegion(cellAddress);
-                        sheet.addMergedRegion(new CellRangeAddress(subMergedFirstRowNum, subMergedLastRowNum, column, column));
                 }
-                }
+                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType())));
-                cell.setCellStyle(styles.get(StringUtils.format("data_{}_{}_{}_{}_{}", attr.align(), attr.color(), attr.backgroundColor(), attr.cellType(), attr.wrapText())));
 
                 // 用于读取对象中的属性
                 Object value = getTargetValue(vo, field, attr);
@@ -1000,7 +950,6 @@ public class ExcelUtil<T>
                 String separator = attr.separator();
                 if (StringUtils.isNotEmpty(dateFormat) && StringUtils.isNotNull(value))
                 {
-                    cell.getCellStyle().setDataFormat(this.wb.getCreationHelper().createDataFormat().getFormat(dateFormat));
                     cell.setCellValue(parseDateToStr(dateFormat, value));
                 }
                 else if (StringUtils.isNotEmpty(readConverterExp) && StringUtils.isNotNull(value))
@@ -1272,7 +1221,6 @@ public class ExcelUtil<T>
      */
     private Object getTargetValue(T vo, Field field, Excel excel) throws Exception
     {
-        field.setAccessible(true);
         Object o = field.get(vo);
         if (StringUtils.isNotEmpty(excel.targetAttr()))
         {
@@ -1332,40 +1280,9 @@ public class ExcelUtil<T>
         List<Field> tempFields = new ArrayList<>();
         tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
         tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
-        if (StringUtils.isNotEmpty(includeFields))
-        {
-            for (Field field : tempFields)
-            {
-                if (ArrayUtils.contains(this.includeFields, field.getName()) || field.isAnnotationPresent(Excels.class))
-                {
-                    addField(fields, field);
-                }
-            }
-        }
-        else if (StringUtils.isNotEmpty(excludeFields))
-        {
         for (Field field : tempFields)
         {
             if (!ArrayUtils.contains(this.excludeFields, field.getName()))
-                {
-                    addField(fields, field);
-                }
-            }
-        }
-        else
-        {
-            for (Field field : tempFields)
-            {
-                addField(fields, field);
-            }
-        }
-        return fields;
-    }
-
-    /**
-     * 添加字段信息
-     */
-    public void addField(List<Object[]> fields, Field field)
             {
                 // 单注解
                 if (field.isAnnotationPresent(Excel.class))
@@ -1373,6 +1290,7 @@ public class ExcelUtil<T>
                     Excel attr = field.getAnnotation(Excel.class);
                     if (attr != null && (attr.type() == Type.ALL || attr.type() == type))
                     {
+                        field.setAccessible(true);
                         fields.add(new Object[] { field, attr });
                     }
                     if (Collection.class.isAssignableFrom(field.getType()))
@@ -1390,26 +1308,19 @@ public class ExcelUtil<T>
                     Excels attrs = field.getAnnotation(Excels.class);
                     Excel[] excels = attrs.value();
                     for (Excel attr : excels)
-            {
-                if (StringUtils.isNotEmpty(includeFields))
-                {
-                    if (ArrayUtils.contains(this.includeFields, field.getName() + "." + attr.targetAttr())
-                            && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
-                    {
-                        fields.add(new Object[] { field, attr });
-                    }
-                }
-                else
                     {
                         if (!ArrayUtils.contains(this.excludeFields, field.getName() + "." + attr.targetAttr())
                                 && (attr != null && (attr.type() == Type.ALL || attr.type() == type)))
                         {
+                            field.setAccessible(true);
                             fields.add(new Object[] { field, attr });
                         }
                     }
                 }
             }
         }
+        return fields;
+    }
 
     /**
      * 根据注解获取最大行高

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/sql/SqlUtil.java

@@ -13,7 +13,7 @@ public class SqlUtil
     /**
      * 定义常用的 sql关键字
      */
-    public static String SQL_REGEX = "\u000B|and |extractvalue|updatexml|sleep|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |union |like |+|/*|user()";
+    public static String SQL_REGEX = "and |extractvalue|updatexml|exec |insert |select |delete |update |drop |count |chr |mid |master |truncate |char |declare |or |+|user()";
 
     /**
      * 仅支持字母、数字、下划线、空格、逗号、小数点（支持多个字段排序）

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/uuid/UUID.java

@@ -343,25 +343,25 @@ public final class UUID implements java.io.Serializable, Comparable<UUID>
         final StringBuilder builder = new StringBuilder(isSimple ? 32 : 36);
         // time_low
         builder.append(digits(mostSigBits >> 32, 8));
-        if (!isSimple)
+        if (false == isSimple)
         {
             builder.append('-');
         }
         // time_mid
         builder.append(digits(mostSigBits >> 16, 4));
-        if (!isSimple)
+        if (false == isSimple)
         {
             builder.append('-');
         }
         // time_high_and_version
         builder.append(digits(mostSigBits, 4));
-        if (!isSimple)
+        if (false == isSimple)
         {
             builder.append('-');
         }
         // variant_and_sequence
         builder.append(digits(leastSigBits >> 48, 4));
-        if (!isSimple)
+        if (false == isSimple)
         {
             builder.append('-');
         }

ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/web/controller/BaseController.java

@@ -7,17 +7,12 @@ 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层通用数据处理
@@ -53,19 +48,6 @@ 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/web/page/TableDataInfo.java

@@ -37,7 +37,7 @@ public class TableDataInfo implements Serializable
      * @param list 列表数据
      * @param total 总记录数
      */
-    public TableDataInfo(List<?> list, long total)
+    public TableDataInfo(List<?> list, int total)
     {
         this.rows = list;
         this.total = total;

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

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

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.UserConstants;
 import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.core.text.Convert;
 import com.ruoyi.common.core.utils.StringUtils;
@@ -74,7 +73,8 @@ public class DataScopeAspect
             if (StringUtils.isNotNull(currentUser) && !currentUser.isAdmin())
             {
                 String permission = StringUtils.defaultIfEmpty(controllerDataScope.permission(), SecurityContextHolder.getPermission());
-                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(), controllerDataScope.userAlias(), permission);
+                dataScopeFilter(joinPoint, currentUser, controllerDataScope.deptAlias(),
+                        controllerDataScope.userAlias(), permission);
             }
         }
     }
@@ -94,7 +94,7 @@ public class DataScopeAspect
         List<String> conditions = new ArrayList<String>();
         List<String> scopeCustomIds = new ArrayList<String>();
         user.getRoles().forEach(role -> {
-            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
+            if (DATA_SCOPE_CUSTOM.equals(role.getDataScope()) && StringUtils.containsAny(role.getPermissions(), Convert.toStrArray(permission)))
             {
                 scopeCustomIds.add(Convert.toStr(role.getRoleId()));
             }
@@ -103,7 +103,7 @@ public class DataScopeAspect
         for (SysRole role : user.getRoles())
         {
             String dataScope = role.getDataScope();
-            if (conditions.contains(dataScope) || StringUtils.equals(role.getStatus(), UserConstants.ROLE_DISABLE))
+            if (conditions.contains(dataScope))
             {
                 continue;
             }

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

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

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

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

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

@@ -19,8 +19,6 @@ import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
 import com.alibaba.fastjson2.JSON;
-import com.ruoyi.common.core.text.Convert;
-import com.ruoyi.common.core.utils.ExceptionUtil;
 import com.ruoyi.common.core.utils.ServletUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.ip.IpUtils;
@@ -55,7 +53,7 @@ public class LogAspect
      * 处理请求前执行
      */
     @Before(value = "@annotation(controllerLog)")
-    public void doBefore(JoinPoint joinPoint, Log controllerLog)
+    public void boBefore(JoinPoint joinPoint, Log controllerLog)
     {
         TIME_THREADLOCAL.set(System.currentTimeMillis());
     }
@@ -103,7 +101,7 @@ public class LogAspect
             if (e != null)
             {
                 operLog.setStatus(BusinessStatus.FAIL.ordinal());
-                operLog.setErrorMsg(StringUtils.substring(Convert.toStr(e.getMessage(), ExceptionUtil.getExceptionMessage(e)), 0, 2000));
+                operLog.setErrorMsg(StringUtils.substring(e.getMessage(), 0, 2000));
             }
             // 设置方法名称
             String className = joinPoint.getTarget().getClass().getName();
@@ -166,9 +164,10 @@ public class LogAspect
      */
     private void setRequestValue(JoinPoint joinPoint, SysOperLog operLog, String[] excludeParamNames) throws Exception
     {
-        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()))
+        Map<?, ?> paramsMap = ServletUtils.getParamMap(ServletUtils.getRequest());
+        if (StringUtils.isEmpty(paramsMap)
+                && (HttpMethod.PUT.name().equals(requestMethod) || HttpMethod.POST.name().equals(requestMethod)))
         {
             String params = argsArrayToString(joinPoint.getArgs(), excludeParamNames);
             operLog.setOperParam(StringUtils.substring(params, 0, 2000));

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

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

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.6</version>
+        <version>3.6.4</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.6</version>
+        <version>3.6.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     

ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java

@@ -56,8 +56,16 @@ public class PreAuthorizeAspect
         // 注解鉴权
         MethodSignature signature = (MethodSignature) joinPoint.getSignature();
         checkMethodAnnotation(signature.getMethod());
+        try
+        {
             // 执行原有逻辑
-        return joinPoint.proceed();
+            Object obj = joinPoint.proceed();
+            return obj;
+        }
+        catch (Throwable e)
+        {
+            throw e;
+        }
     }
 
     /**

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

@@ -36,11 +36,11 @@ public class TokenService
 
     protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
 
-    private final static long TOKEN_EXPIRE_TIME = CacheConstants.EXPIRATION;
+    private final static long expireTime = CacheConstants.EXPIRATION;
 
     private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY;
 
-    private final static Long TOKEN_REFRESH_THRESHOLD_MINUTES = CacheConstants.REFRESH_TIME * MILLIS_MINUTE;
+    private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE;
 
     /**
      * 创建令牌
@@ -65,7 +65,7 @@ public class TokenService
         // 接口返回信息
         Map<String, Object> rspMap = new HashMap<String, Object>();
         rspMap.put("access_token", JwtUtils.createToken(claimsMap));
-        rspMap.put("expires_in", TOKEN_EXPIRE_TIME);
+        rspMap.put("expires_in", expireTime);
         return rspMap;
     }
 
@@ -147,7 +147,7 @@ public class TokenService
     {
         long expireTime = loginUser.getExpireTime();
         long currentTime = System.currentTimeMillis();
-        if (expireTime - currentTime <= TOKEN_REFRESH_THRESHOLD_MINUTES)
+        if (expireTime - currentTime <= MILLIS_MINUTE_TEN)
         {
             refreshToken(loginUser);
         }
@@ -161,10 +161,10 @@ public class TokenService
     public void refreshToken(LoginUser loginUser)
     {
         loginUser.setLoginTime(System.currentTimeMillis());
-        loginUser.setExpireTime(loginUser.getLoginTime() + TOKEN_EXPIRE_TIME * MILLIS_MINUTE);
+        loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
-        redisService.setCacheObject(userKey, loginUser, TOKEN_EXPIRE_TIME, TimeUnit.MINUTES);
+        redisService.setCacheObject(userKey, loginUser, expireTime, TimeUnit.MINUTES);
     }
 
     private String getTokenKey(String token)

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

@@ -62,7 +62,7 @@ public class SecurityUtils
     public static String getToken(HttpServletRequest request)
     {
         // 从header获取token标识
-        String token = request.getHeader(SecurityConstants.AUTHORIZATION_HEADER);
+        String token = request.getHeader(TokenConstants.AUTHENTICATION);
         return replaceTokenPrefix(token);
     }
 

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

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.ruoyi</groupId>
         <artifactId>ruoyi-common</artifactId>
-        <version>3.6.6</version>
+        <version>3.6.4</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     
@@ -17,10 +17,10 @@
 
     <dependencies>
 
-        <!-- RuoYi Common Core -->
+        <!-- RuoYi Common Security -->
         <dependency>
             <groupId>com.ruoyi</groupId>
-            <artifactId>ruoyi-common-core</artifactId>
+            <artifactId>ruoyi-common-security</artifactId>
         </dependency>
 
     </dependencies>

ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/config/SensitiveJsonSerializer.java

@@ -8,10 +8,10 @@ import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.JsonSerializer;
 import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
-import com.ruoyi.common.core.constant.UserConstants;
+import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.common.core.context.SecurityContextHolder;
 import com.ruoyi.common.sensitive.annotation.Sensitive;
 import com.ruoyi.common.sensitive.enums.DesensitizedType;
+import com.ruoyi.system.api.model.LoginUser;
 
 /**
  * 数据脱敏序列化过滤
@@ -55,9 +55,9 @@ public class SensitiveJsonSerializer extends JsonSerializer<String> implements C
     {
         try
         {
-            Long userId = SecurityContextHolder.getUserId();
+            LoginUser securityUser = SecurityUtils.getLoginUser();
             // 管理员不脱敏
-            return !UserConstants.isAdmin(userId);
+            return !securityUser.getSysUser().isAdmin();
         }
         catch (Exception e)
         {

ruoyi-common/ruoyi-common-sensitive/src/main/java/com/ruoyi/common/sensitive/enums/DesensitizedType.java

@@ -23,7 +23,7 @@ public enum DesensitizedType
     /**
      * 身份证，中间10位星号替换
      */
-    ID_CARD(s -> s.replaceAll("(\\d{4})\\d{10}(\\d{3}[Xx]|\\d{4})", "$1** **** ****$2")),
+    ID_CARD(s -> s.replaceAll("(\\d{4})\\d{10}(\\d{4})", "$1** **** ****$2")),
 
     /**
      * 手机号，中间4位星号替换

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

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

ruoyi-gateway/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-gateway/pom.xml

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

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

@@ -118,7 +118,7 @@ public class AuthFilter implements GlobalFilter, Ordered
      */
     private String getToken(ServerHttpRequest request)
     {
-        String token = request.getHeaders().getFirst(SecurityConstants.AUTHORIZATION_HEADER);
+        String token = request.getHeaders().getFirst(TokenConstants.AUTHENTICATION);
         // 如果前端设置了令牌前缀，则裁剪掉前缀
         if (StringUtils.isNotEmpty(token) && token.startsWith(TokenConstants.PREFIX))
         {

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

@@ -0,0 +1,87 @@
+package com.ruoyi.gateway.filter;
+
+import java.util.Collections;
+import java.util.List;
+import org.springframework.cloud.gateway.filter.GatewayFilter;
+import org.springframework.cloud.gateway.filter.GatewayFilterChain;
+import org.springframework.cloud.gateway.filter.OrderedGatewayFilter;
+import org.springframework.cloud.gateway.filter.factory.AbstractGatewayFilterFactory;
+import org.springframework.cloud.gateway.support.ServerWebExchangeUtils;
+import org.springframework.http.HttpMethod;
+import org.springframework.stereotype.Component;
+import org.springframework.web.server.ServerWebExchange;
+import reactor.core.publisher.Mono;
+
+/**
+ * 获取body请求数据（解决流不能重复读取问题）
+ * 
+ * @author ruoyi
+ */
+@Component
+public class CacheRequestFilter extends AbstractGatewayFilterFactory<CacheRequestFilter.Config>
+{
+    public CacheRequestFilter()
+    {
+        super(Config.class);
+    }
+
+    @Override
+    public String name()
+    {
+        return "CacheRequestFilter";
+    }
+
+    @Override
+    public GatewayFilter apply(Config config)
+    {
+        CacheRequestGatewayFilter cacheRequestGatewayFilter = new CacheRequestGatewayFilter();
+        Integer order = config.getOrder();
+        if (order == null)
+        {
+            return cacheRequestGatewayFilter;
+        }
+        return new OrderedGatewayFilter(cacheRequestGatewayFilter, order);
+    }
+
+    public static class CacheRequestGatewayFilter implements GatewayFilter
+    {
+        @Override
+        public Mono<Void> filter(ServerWebExchange exchange, GatewayFilterChain chain)
+        {
+            // GET DELETE 不过滤
+            HttpMethod method = exchange.getRequest().getMethod();
+            if (method == null || method == HttpMethod.GET || method == HttpMethod.DELETE)
+            {
+                return chain.filter(exchange);
+            }
+            return ServerWebExchangeUtils.cacheRequestBodyAndRequest(exchange, (serverHttpRequest) -> {
+                if (serverHttpRequest == exchange.getRequest())
+                {
+                    return chain.filter(exchange);
+                }
+                return chain.filter(exchange.mutate().request(serverHttpRequest).build());
+            });
+        }
+    }
+
+    @Override
+    public List<String> shortcutFieldOrder()
+    {
+        return Collections.singletonList("order");
+    }
+
+    static class Config
+    {
+        private Integer order;
+
+        public Integer getOrder()
+        {
+            return order;
+        }
+
+        public void setOrder(Integer order)
+        {
+            this.order = order;
+        }
+    }
+}

ruoyi-modules/pom.xml

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

ruoyi-modules/ruoyi-file/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-file/pom.xml

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

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

@@ -37,20 +37,10 @@ public class FastDfsSysFileServiceImpl implements ISysFileService
     @Override
     public String uploadFile(MultipartFile file) throws Exception
     {
-        InputStream inputStream = null;
+        InputStream inputStream = file.getInputStream();
-        try
+        StorePath storePath = storageClient.uploadFile(inputStream, file.getSize(),
-        {
+                FileTypeUtils.getExtension(file), null);
-            inputStream = file.getInputStream();
+        IoUtils.closeQuietly(inputStream);
-            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/MinioSysFileServiceImpl.java

@@ -33,12 +33,9 @@ public class MinioSysFileServiceImpl implements ISysFileService
      */
     @Override
     public String uploadFile(MultipartFile file) throws Exception
-    {
-        InputStream inputStream = null;
-        try
     {
         String fileName = FileUploadUtils.extractFilename(file);
-            inputStream = file.getInputStream();
+        InputStream inputStream = file.getInputStream();
         PutObjectArgs args = PutObjectArgs.builder()
                 .bucket(minioConfig.getBucketName())
                 .object(fileName)
@@ -46,15 +43,7 @@ public class MinioSysFileServiceImpl implements ISysFileService
                 .contentType(file.getContentType())
                 .build();
         client.putObject(args);
+        IoUtils.closeQuietly(inputStream);
         return minioConfig.getUrl() + "/" + minioConfig.getBucketName() + "/" + fileName;
     }
-        catch (Exception e)
-        {
-            throw new RuntimeException("Minio Failed to upload file", e);
-        }
-        finally
-        {
-            IoUtils.closeQuietly(inputStream);
-        }
-    }
 }

ruoyi-modules/ruoyi-gen/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-gen/pom.xml

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

ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/config/GenConfig.java

@@ -18,15 +18,12 @@ public class GenConfig
     /** 生成包路径 */
     public static String packageName;
 
-    /** 自动去除表前缀 */
+    /** 自动去除表前缀，默认是false */
     public static boolean autoRemovePre;
 
-    /** 表前缀 */
+    /** 表前缀(类名不会包含表前缀) */
     public static String tablePrefix;
 
-    /** 是否允许生成文件覆盖到本地（自定义路径） */
-    public static boolean allowOverwrite;
-
     public static String getAuthor()
     {
         return author;
@@ -66,14 +63,4 @@ public class GenConfig
     {
         GenConfig.tablePrefix = tablePrefix;
     }
-
-    public static boolean isAllowOverwrite()
-    {
-        return allowOverwrite;
-    }
-
-    public void setAllowOverwrite(boolean allowOverwrite)
-    {
-        GenConfig.allowOverwrite = allowOverwrite;
-    }
 }

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

@@ -23,7 +23,6 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.gen.config.GenConfig;
 import com.ruoyi.gen.domain.GenTable;
 import com.ruoyi.gen.domain.GenTableColumn;
 import com.ruoyi.gen.service.IGenTableColumnService;
@@ -57,7 +56,7 @@ public class GenController extends BaseController
     }
 
     /**
-     * 获取代码生成信息
+     * 修改代码生成业务
      */
     @RequiresPermissions("tool:gen:query")
     @GetMapping(value = "/{tableId}")
@@ -169,10 +168,6 @@ public class GenController extends BaseController
     @GetMapping("/genCode/{tableName}")
     public AjaxResult genCode(@PathVariable("tableName") String tableName)
     {
-        if (!GenConfig.isAllowOverwrite())
-        {
-            return AjaxResult.error("【系统预设】不允许生成文件覆盖到本地");
-        }
         genTableService.generatorCode(tableName);
         return success();
     }

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

@@ -93,7 +93,7 @@ public class GenTable extends BaseEntity
     private String treeName;
 
     /** 上级菜单ID字段 */
-    private Long parentMenuId;
+    private String parentMenuId;
 
     /** 上级菜单名称字段 */
     private String parentMenuName;
@@ -317,12 +317,12 @@ public class GenTable extends BaseEntity
         this.treeName = treeName;
     }
 
-    public Long getParentMenuId()
+    public String getParentMenuId()
     {
         return parentMenuId;
     }
 
-    public void setParentMenuId(Long parentMenuId)
+    public void setParentMenuId(String parentMenuId)
     {
         this.parentMenuId = parentMenuId;
     }

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

@@ -129,9 +129,9 @@ public class GenTableServiceImpl implements IGenTableService
         int row = genTableMapper.updateGenTable(genTable);
         if (row > 0)
         {
-            for (GenTableColumn genTableColumn : genTable.getColumns())
+            for (GenTableColumn cenTableColumn : genTable.getColumns())
             {
-                genTableColumnMapper.updateGenTableColumn(genTableColumn);
+                genTableColumnMapper.updateGenTableColumn(cenTableColumn);
             }
         }
     }
@@ -414,7 +414,6 @@ public class GenTableServiceImpl implements IGenTableService
             {
                 throw new ServiceException("树名称字段不能为空");
             }
-        }
             else if (GenConstants.TPL_SUB.equals(genTable.getTplCategory()))
             {
                 if (StringUtils.isEmpty(genTable.getSubTableName()))
@@ -427,6 +426,7 @@ public class GenTableServiceImpl implements IGenTableService
                 }
             }
         }
+    }
 
     /**
      * 设置主键列信息
@@ -491,7 +491,7 @@ public class GenTableServiceImpl implements IGenTableService
             String treeCode = paramsObj.getString(GenConstants.TREE_CODE);
             String treeParentCode = paramsObj.getString(GenConstants.TREE_PARENT_CODE);
             String treeName = paramsObj.getString(GenConstants.TREE_NAME);
-            Long parentMenuId = paramsObj.getLongValue(GenConstants.PARENT_MENU_ID);
+            String parentMenuId = paramsObj.getString(GenConstants.PARENT_MENU_ID);
             String parentMenuName = paramsObj.getString(GenConstants.PARENT_MENU_NAME);
 
             genTable.setTreeCode(treeCode);

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

@@ -71,9 +71,9 @@ public class ${ClassName} extends ${Entity}
     {
         return $column.javaField;
     }
+#end
+#end
 
-#end
-#end
 #if($table.sub)
     public List<${subClassName}> get${subClassName}List()
     {

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

@@ -75,7 +75,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['${permissionPrefix}:add']"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -144,21 +144,21 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['${permissionPrefix}:edit']"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-plus"
             @click="handleAdd(scope.row)"
-            v-hasPermi="['${permissionPrefix}:add']"
+            v-hasPermi="['${moduleName}:${businessName}:add']"
           >新增</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['${permissionPrefix}:remove']"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -283,9 +283,9 @@
 </template>
 
 <script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
-import Treeselect from "@riophae/vue-treeselect"
+import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css"
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "${BusinessName}",
@@ -346,18 +346,18 @@ export default {
 #end
 #end
       }
-    }
+    };
   },
   created() {
-    this.getList()
+    this.getList();
   },
   methods: {
     /** 查询${functionName}列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      this.queryParams.params = {}
+      this.queryParams.params = {};
 #break
 #end
 #end
@@ -365,40 +365,40 @@ export default {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
       if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
       }
 #end
 #end
       list${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
+        this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
-        this.loading = false
+        this.loading = false;
-      })
+      });
     },
     /** 转换${functionName}数据结构 */
     normalizer(node) {
       if (node.children && !node.children.length) {
-        delete node.children
+        delete node.children;
       }
       return {
         id: node.${treeCode},
         label: node.${treeName},
         children: node.children
-      }
+      };
     },
 	/** 查询${functionName}下拉树结构 */
     getTreeselect() {
       list${BusinessName}().then(response => {
-        this.${businessName}Options = []
+        this.${businessName}Options = [];
-        const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] }
+        const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
-        data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
+        data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
-        this.${businessName}Options.push(data)
+        this.${businessName}Options.push(data);
-      })
+      });
     },
     // 取消按钮
     cancel() {
-      this.open = false
+      this.open = false;
-      this.reset()
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -410,61 +410,61 @@ export default {
         $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-      }
+      };
-      this.resetForm("form")
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.getList()
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = []
+      this.daterange${AttrName} = [];
 #end
 #end
-      this.resetForm("queryForm")
+      this.resetForm("queryForm");
-      this.handleQuery()
+      this.handleQuery();
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset()
+      this.reset();
-      this.getTreeselect()
+      this.getTreeselect();
       if (row != null && row.${treeCode}) {
-        this.form.${treeParentCode} = row.${treeCode}
+        this.form.${treeParentCode} = row.${treeCode};
       } else {
-        this.form.${treeParentCode} = 0
+        this.form.${treeParentCode} = 0;
       }
-      this.open = true
+      this.open = true;
-      this.title = "添加${functionName}"
+      this.title = "添加${functionName}";
     },
     /** 展开/折叠操作 */
     toggleExpandAll() {
-      this.refreshTable = false
+      this.refreshTable = false;
-      this.isExpandAll = !this.isExpandAll
+      this.isExpandAll = !this.isExpandAll;
       this.$nextTick(() => {
-        this.refreshTable = true
+        this.refreshTable = true;
-      })
+      });
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
+      this.reset();
-      this.getTreeselect()
+      this.getTreeselect();
       if (row != null) {
-        this.form.${treeParentCode} = row.${treeParentCode}
+        this.form.${treeParentCode} = row.${treeCode};
       }
       get${BusinessName}(row.${pkColumn.javaField}).then(response => {
-        this.form = response.data
+        this.form = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
 #end
 #end
-        this.open = true
+        this.open = true;
-        this.title = "修改${functionName}"
+        this.title = "修改${functionName}";
-      })
+      });
     },
     /** 提交按钮 */
     submitForm() {
@@ -472,34 +472,34 @@ export default {
         if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-          this.form.$column.javaField = this.form.${column.javaField}.join(",")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
 #end
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功")
+              this.#[[$modal]]#.msgSuccess("修改成功");
-              this.open = false
+              this.open = false;
-              this.getList()
+              this.getList();
-            })
+            });
           } else {
             add${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("新增成功")
+              this.#[[$modal]]#.msgSuccess("新增成功");
-              this.open = false
+              this.open = false;
-              this.getList()
+              this.getList();
-            })
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
       this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-        return del${BusinessName}(row.${pkColumn.javaField})
+        return del${BusinessName}(row.${pkColumn.javaField});
       }).then(() => {
-        this.getList()
+        this.getList();
-        this.#[[$modal]]#.msgSuccess("删除成功")
+        this.#[[$modal]]#.msgSuccess("删除成功");
-      }).catch(() => {})
+      }).catch(() => {});
     }
   }
-}
+};
 </script>

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

@@ -75,7 +75,7 @@
           icon="el-icon-plus"
           size="mini"
           @click="handleAdd"
-          v-hasPermi="['${permissionPrefix}:add']"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -86,7 +86,7 @@
           size="mini"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['${permissionPrefix}:edit']"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -97,7 +97,7 @@
           size="mini"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['${permissionPrefix}:remove']"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -107,7 +107,7 @@
           icon="el-icon-download"
           size="mini"
           @click="handleExport"
-          v-hasPermi="['${permissionPrefix}:export']"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
@@ -158,14 +158,14 @@
             type="text"
             icon="el-icon-edit"
             @click="handleUpdate(scope.row)"
-            v-hasPermi="['${permissionPrefix}:edit']"
+            v-hasPermi="['${moduleName}:${businessName}:edit']"
           >修改</el-button>
           <el-button
             size="mini"
             type="text"
             icon="el-icon-delete"
             @click="handleDelete(scope.row)"
-            v-hasPermi="['${permissionPrefix}:remove']"
+            v-hasPermi="['${moduleName}:${businessName}:remove']"
           >删除</el-button>
         </template>
       </el-table-column>
@@ -353,7 +353,7 @@
 </template>
 
 <script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
 
 export default {
   name: "${BusinessName}",
@@ -423,18 +423,18 @@ export default {
 #end
 #end
       }
-    }
+    };
   },
   created() {
-    this.getList()
+    this.getList();
   },
   methods: {
     /** 查询${functionName}列表 */
     getList() {
-      this.loading = true
+      this.loading = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      this.queryParams.params = {}
+      this.queryParams.params = {};
 #break
 #end
 #end
@@ -442,21 +442,21 @@ export default {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
       if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
-        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
+        this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
-        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
+        this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
       }
 #end
 #end
       list${BusinessName}(this.queryParams).then(response => {
-        this.${businessName}List = response.rows
+        this.${businessName}List = response.rows;
-        this.total = response.total
+        this.total = response.total;
-        this.loading = false
+        this.loading = false;
-      })
+      });
     },
     // 取消按钮
     cancel() {
-      this.open = false
+      this.open = false;
-      this.reset()
+      this.reset();
     },
     // 表单重置
     reset() {
@@ -468,27 +468,27 @@ export default {
         $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-      }
+      };
 #if($table.sub)
-      this.${subclassName}List = []
+      this.${subclassName}List = [];
 #end
-      this.resetForm("form")
+      this.resetForm("form");
     },
     /** 搜索按钮操作 */
     handleQuery() {
-      this.queryParams.pageNum = 1
+      this.queryParams.pageNum = 1;
-      this.getList()
+      this.getList();
     },
     /** 重置按钮操作 */
     resetQuery() {
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
-      this.daterange${AttrName} = []
+      this.daterange${AttrName} = [];
 #end
 #end
-      this.resetForm("queryForm")
+      this.resetForm("queryForm");
-      this.handleQuery()
+      this.handleQuery();
     },
     // 多选框选中数据
     handleSelectionChange(selection) {
@@ -498,27 +498,27 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
-      this.reset()
+      this.reset();
-      this.open = true
+      this.open = true;
-      this.title = "添加${functionName}"
+      this.title = "添加${functionName}";
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
+      this.reset();
       const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
       get${BusinessName}(${pkColumn.javaField}).then(response => {
-        this.form = response.data
+        this.form = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-        this.form.$column.javaField = this.form.${column.javaField}.split(",")
+        this.form.$column.javaField = this.form.${column.javaField}.split(",");
 #end
 #end
 #if($table.sub)
-        this.${subclassName}List = response.data.${subclassName}List
+        this.${subclassName}List = response.data.${subclassName}List;
 #end
-        this.open = true
+        this.open = true;
-        this.title = "修改${functionName}"
+        this.title = "修改${functionName}";
-      })
+      });
     },
     /** 提交按钮 */
     submitForm() {
@@ -526,64 +526,64 @@ export default {
         if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-          this.form.$column.javaField = this.form.${column.javaField}.join(",")
+          this.form.$column.javaField = this.form.${column.javaField}.join(",");
 #end
 #end
 #if($table.sub)
-          this.form.${subclassName}List = this.${subclassName}List
+          this.form.${subclassName}List = this.${subclassName}List;
 #end
           if (this.form.${pkColumn.javaField} != null) {
             update${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("修改成功")
+              this.#[[$modal]]#.msgSuccess("修改成功");
-              this.open = false
+              this.open = false;
-              this.getList()
+              this.getList();
-            })
+            });
           } else {
             add${BusinessName}(this.form).then(response => {
-              this.#[[$modal]]#.msgSuccess("新增成功")
+              this.#[[$modal]]#.msgSuccess("新增成功");
-              this.open = false
+              this.open = false;
-              this.getList()
+              this.getList();
-            })
+            });
           }
         }
-      })
+      });
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids
+      const ${pkColumn.javaField}s = row.${pkColumn.javaField} || this.ids;
       this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + ${pkColumn.javaField}s + '"的数据项？').then(function() {
-        return del${BusinessName}(${pkColumn.javaField}s)
+        return del${BusinessName}(${pkColumn.javaField}s);
       }).then(() => {
-        this.getList()
+        this.getList();
-        this.#[[$modal]]#.msgSuccess("删除成功")
+        this.#[[$modal]]#.msgSuccess("删除成功");
-      }).catch(() => {})
+      }).catch(() => {});
     },
 #if($table.sub)
 	/** ${subTable.functionName}序号 */
     row${subClassName}Index({ row, rowIndex }) {
-      row.index = rowIndex + 1
+      row.index = rowIndex + 1;
     },
     /** ${subTable.functionName}添加按钮操作 */
     handleAdd${subClassName}() {
-      let obj = {}
+      let obj = {};
 #foreach($column in $subTable.columns)
 #if($column.pk || $column.javaField == ${subTableFkclassName})
 #elseif($column.list && "" != $javaField)
-      obj.$column.javaField = ""
+      obj.$column.javaField = "";
 #end
 #end
-      this.${subclassName}List.push(obj)
+      this.${subclassName}List.push(obj);
     },
     /** ${subTable.functionName}删除按钮操作 */
     handleDelete${subClassName}() {
       if (this.checked${subClassName}.length == 0) {
-        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据")
+        this.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
       } else {
-        const ${subclassName}List = this.${subclassName}List
+        const ${subclassName}List = this.${subclassName}List;
-        const checked${subClassName} = this.checked${subClassName}
+        const checked${subClassName} = this.checked${subClassName};
         this.${subclassName}List = ${subclassName}List.filter(function(item) {
           return checked${subClassName}.indexOf(item.index) == -1
-        })
+        });
       }
     },
     /** 复选框选中数据 */
@@ -598,5 +598,5 @@ export default {
       }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
     }
   }
-}
+};
 </script>

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

@@ -73,7 +73,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['${permissionPrefix}:add']"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -136,9 +136,9 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}: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="Plus" @click="handleAdd(scope.row)" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -271,26 +271,26 @@
 </template>
 
 <script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
 
-const { proxy } = getCurrentInstance()
+const { proxy } = getCurrentInstance();
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
 #end
 
-const ${businessName}List = ref([])
+const ${businessName}List = ref([]);
-const ${businessName}Options = ref([])
+const ${businessName}Options = ref([]);
-const open = ref(false)
+const open = ref(false);
-const loading = ref(true)
+const loading = ref(true);
-const showSearch = ref(true)
+const showSearch = ref(true);
-const title = ref("")
+const title = ref("");
-const isExpandAll = ref(true)
+const isExpandAll = ref(true);
-const refreshTable = ref(true)
+const refreshTable = ref(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([])
+const daterange${AttrName} = ref([]);
 #end
 #end
 
@@ -318,16 +318,16 @@ const data = reactive({
 #end
 #end
   }
-})
+});
 
-const { queryParams, form, rules } = toRefs(data)
+const { queryParams, form, rules } = toRefs(data);
 
 /** 查询${functionName}列表 */
 function getList() {
-  loading.value = true
+  loading.value = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {}
+  queryParams.value.params = {};
 #break
 #end
 #end
@@ -335,31 +335,31 @@ function getList() {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
   if (null != daterange${AttrName} && '' != daterange${AttrName}) {
-    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
-    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
+    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}")
+    ${businessName}List.value = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
-    loading.value = false
+    loading.value = false;
-  })
+  });
 }
 
 /** 查询${functionName}下拉树结构 */
 function getTreeselect() {
   list${BusinessName}().then(response => {
-    ${businessName}Options.value = []
+    ${businessName}Options.value = [];
-    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] }
+    const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
-    data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}")
+    data.children = proxy.handleTree(response.data, "${treeCode}", "${treeParentCode}");
-    ${businessName}Options.value.push(data)
+    ${businessName}Options.value.push(data);
-  })
+  });
 }
 	
 // 取消按钮
 function cancel() {
-  open.value = false
+  open.value = false;
-  reset()
+  reset();
 }
 
 // 表单重置
@@ -372,13 +372,13 @@ function reset() {
     $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-  }
+  };
-  proxy.resetForm("${businessName}Ref")
+  proxy.resetForm("${businessName}Ref");
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  getList()
+  getList();
 }
 
 /** 重置按钮操作 */
@@ -386,52 +386,52 @@ 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 = []
+  daterange${AttrName}.value = [];
 #end
 #end
-  proxy.resetForm("queryRef")
+  proxy.resetForm("queryRef");
-  handleQuery()
+  handleQuery();
 }
 
 /** 新增按钮操作 */
 function handleAdd(row) {
-  reset()
+  reset();
-  getTreeselect()
+  getTreeselect();
   if (row != null && row.${treeCode}) {
-    form.value.${treeParentCode} = row.${treeCode}
+    form.value.${treeParentCode} = row.${treeCode};
   } else {
-    form.value.${treeParentCode} = 0
+    form.value.${treeParentCode} = 0;
   }
-  open.value = true
+  open.value = true;
-  title.value = "添加${functionName}"
+  title.value = "添加${functionName}";
 }
 
 /** 展开/折叠操作 */
 function toggleExpandAll() {
-  refreshTable.value = false
+  refreshTable.value = false;
-  isExpandAll.value = !isExpandAll.value
+  isExpandAll.value = !isExpandAll.value;
   nextTick(() => {
-    refreshTable.value = true
+    refreshTable.value = true;
-  })
+  });
 }
 
 /** 修改按钮操作 */
 async function handleUpdate(row) {
-  reset()
+  reset();
-  await getTreeselect()
+  await getTreeselect();
   if (row != null) {
-    form.value.${treeParentCode} = row.${treeParentCode}
+    form.value.${treeParentCode} = row.${treeCode};
   }
   get${BusinessName}(row.${pkColumn.javaField}).then(response => {
-    form.value = response.data
+    form.value = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-    form.value.$column.javaField = form.value.${column.javaField}.split(",")
+    form.value.$column.javaField = form.value.${column.javaField}.split(",");
 #end
 #end
-    open.value = true
+    open.value = true;
-    title.value = "修改${functionName}"
+    title.value = "修改${functionName}";
-  })
+  });
 }
 
 /** 提交按钮 */
@@ -440,35 +440,35 @@ function submitForm() {
     if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-      form.value.$column.javaField = form.value.${column.javaField}.join(",")
+      form.value.$column.javaField = form.value.${column.javaField}.join(",");
 #end
 #end
       if (form.value.${pkColumn.javaField} != null) {
         update${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("修改成功")
+          proxy.#[[$modal]]#.msgSuccess("修改成功");
-          open.value = false
+          open.value = false;
-          getList()
+          getList();
-        })
+        });
       } else {
         add${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("新增成功")
+          proxy.#[[$modal]]#.msgSuccess("新增成功");
-          open.value = false
+          open.value = false;
-          getList()
+          getList();
-        })
+        });
       }
     }
-  })
+  });
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
   proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
-    return del${BusinessName}(row.${pkColumn.javaField})
+    return del${BusinessName}(row.${pkColumn.javaField});
   }).then(() => {
-    getList()
+    getList();
-    proxy.#[[$modal]]#.msgSuccess("删除成功")
+    proxy.#[[$modal]]#.msgSuccess("删除成功");
-  }).catch(() => {})
+  }).catch(() => {});
 }
 
-getList()
+getList();
 </script>

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

@@ -73,7 +73,7 @@
           plain
           icon="Plus"
           @click="handleAdd"
-          v-hasPermi="['${permissionPrefix}:add']"
+          v-hasPermi="['${moduleName}:${businessName}:add']"
         >新增</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -83,7 +83,7 @@
           icon="Edit"
           :disabled="single"
           @click="handleUpdate"
-          v-hasPermi="['${permissionPrefix}:edit']"
+          v-hasPermi="['${moduleName}:${businessName}:edit']"
         >修改</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -93,7 +93,7 @@
           icon="Delete"
           :disabled="multiple"
           @click="handleDelete"
-          v-hasPermi="['${permissionPrefix}:remove']"
+          v-hasPermi="['${moduleName}:${businessName}:remove']"
         >删除</el-button>
       </el-col>
       <el-col :span="1.5">
@@ -102,7 +102,7 @@
           plain
           icon="Download"
           @click="handleExport"
-          v-hasPermi="['${permissionPrefix}:export']"
+          v-hasPermi="['${moduleName}:${businessName}:export']"
         >导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
@@ -148,8 +148,8 @@
 #end
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${permissionPrefix}:edit']">修改</el-button>
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${permissionPrefix}:remove']">删除</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -343,33 +343,33 @@
 </template>
 
 <script setup name="${BusinessName}">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}";
 
-const { proxy } = getCurrentInstance()
+const { proxy } = getCurrentInstance();
 #if(${dicts} != '')
 #set($dictsNoSymbol=$dicts.replace("'", ""))
-const { ${dictsNoSymbol} } = proxy.useDict(${dicts})
+const { ${dictsNoSymbol} } = proxy.useDict(${dicts});
 #end
 
-const ${businessName}List = ref([])
+const ${businessName}List = ref([]);
 #if($table.sub)
-const ${subclassName}List = ref([])
+const ${subclassName}List = ref([]);
 #end
-const open = ref(false)
+const open = ref(false);
-const loading = ref(true)
+const loading = ref(true);
-const showSearch = ref(true)
+const showSearch = ref(true);
-const ids = ref([])
+const ids = ref([]);
 #if($table.sub)
-const checked${subClassName} = ref([])
+const checked${subClassName} = ref([]);
 #end
-const single = ref(true)
+const single = ref(true);
-const multiple = ref(true)
+const multiple = ref(true);
-const total = ref(0)
+const total = ref(0);
-const title = ref("")
+const title = ref("");
 #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([])
+const daterange${AttrName} = ref([]);
 #end
 #end
 
@@ -399,16 +399,16 @@ const data = reactive({
 #end
 #end
   }
-})
+});
 
-const { queryParams, form, rules } = toRefs(data)
+const { queryParams, form, rules } = toRefs(data);
 
 /** 查询${functionName}列表 */
 function getList() {
-  loading.value = true
+  loading.value = true;
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-  queryParams.value.params = {}
+  queryParams.value.params = {};
 #break
 #end
 #end
@@ -416,22 +416,22 @@ function getList() {
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
   if (null != daterange${AttrName} && '' != daterange${AttrName}) {
-    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0]
+    queryParams.value.params["begin${AttrName}"] = daterange${AttrName}.value[0];
-    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1]
+    queryParams.value.params["end${AttrName}"] = daterange${AttrName}.value[1];
   }
 #end
 #end
   list${BusinessName}(queryParams.value).then(response => {
-    ${businessName}List.value = response.rows
+    ${businessName}List.value = response.rows;
-    total.value = response.total
+    total.value = response.total;
-    loading.value = false
+    loading.value = false;
-  })
+  });
 }
 
 // 取消按钮
 function cancel() {
-  open.value = false
+  open.value = false;
-  reset()
+  reset();
 }
 
 // 表单重置
@@ -444,17 +444,17 @@ function reset() {
     $column.javaField: null#if($foreach.count != $columns.size()),#end
 #end
 #end
-  }
+  };
 #if($table.sub)
-  ${subclassName}List.value = []
+  ${subclassName}List.value = [];
 #end
-  proxy.resetForm("${businessName}Ref")
+  proxy.resetForm("${businessName}Ref");
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
+  queryParams.value.pageNum = 1;
-  getList()
+  getList();
 }
 
 /** 重置按钮操作 */
@@ -462,44 +462,44 @@ 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 = []
+  daterange${AttrName}.value = [];
 #end
 #end
-  proxy.resetForm("queryRef")
+  proxy.resetForm("queryRef");
-  handleQuery()
+  handleQuery();
 }
 
 // 多选框选中数据
 function handleSelectionChange(selection) {
-  ids.value = selection.map(item => item.${pkColumn.javaField})
+  ids.value = selection.map(item => item.${pkColumn.javaField});
-  single.value = selection.length != 1
+  single.value = selection.length != 1;
-  multiple.value = !selection.length
+  multiple.value = !selection.length;
 }
 
 /** 新增按钮操作 */
 function handleAdd() {
-  reset()
+  reset();
-  open.value = true
+  open.value = true;
-  title.value = "添加${functionName}"
+  title.value = "添加${functionName}";
 }
 
 /** 修改按钮操作 */
 function handleUpdate(row) {
-  reset()
+  reset();
   const _${pkColumn.javaField} = row.${pkColumn.javaField} || ids.value
   get${BusinessName}(_${pkColumn.javaField}).then(response => {
-    form.value = response.data
+    form.value = response.data;
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-    form.value.$column.javaField = form.value.${column.javaField}.split(",")
+    form.value.$column.javaField = form.value.${column.javaField}.split(",");
 #end
 #end
 #if($table.sub)
-    ${subclassName}List.value = response.data.${subclassName}List
+    ${subclassName}List.value = response.data.${subclassName}List;
 #end
-    open.value = true
+    open.value = true;
-    title.value = "修改${functionName}"
+    title.value = "修改${functionName}";
-  })
+  });
 }
 
 /** 提交按钮 */
@@ -508,68 +508,68 @@ function submitForm() {
     if (valid) {
 #foreach ($column in $columns)
 #if($column.htmlType == "checkbox")
-      form.value.$column.javaField = form.value.${column.javaField}.join(",")
+      form.value.$column.javaField = form.value.${column.javaField}.join(",");
 #end
 #end
 #if($table.sub)
-      form.value.${subclassName}List = ${subclassName}List.value
+      form.value.${subclassName}List = ${subclassName}List.value;
 #end
       if (form.value.${pkColumn.javaField} != null) {
         update${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("修改成功")
+          proxy.#[[$modal]]#.msgSuccess("修改成功");
-          open.value = false
+          open.value = false;
-          getList()
+          getList();
-        })
+        });
       } else {
         add${BusinessName}(form.value).then(response => {
-          proxy.#[[$modal]]#.msgSuccess("新增成功")
+          proxy.#[[$modal]]#.msgSuccess("新增成功");
-          open.value = false
+          open.value = false;
-          getList()
+          getList();
-        })
+        });
       }
     }
-  })
+  });
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value
+  const _${pkColumn.javaField}s = row.${pkColumn.javaField} || ids.value;
   proxy.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').then(function() {
-    return del${BusinessName}(_${pkColumn.javaField}s)
+    return del${BusinessName}(_${pkColumn.javaField}s);
   }).then(() => {
-    getList()
+    getList();
-    proxy.#[[$modal]]#.msgSuccess("删除成功")
+    proxy.#[[$modal]]#.msgSuccess("删除成功");
-  }).catch(() => {})
+  }).catch(() => {});
 }
 
 #if($table.sub)
 /** ${subTable.functionName}序号 */
 function row${subClassName}Index({ row, rowIndex }) {
-  row.index = rowIndex + 1
+  row.index = rowIndex + 1;
 }
 
 /** ${subTable.functionName}添加按钮操作 */
 function handleAdd${subClassName}() {
-  let obj = {}
+  let obj = {};
 #foreach($column in $subTable.columns)
 #if($column.pk || $column.javaField == ${subTableFkclassName})
 #elseif($column.list && "" != $javaField)
-  obj.$column.javaField = ""
+  obj.$column.javaField = "";
 #end
 #end
-  ${subclassName}List.value.push(obj)
+  ${subclassName}List.value.push(obj);
 }
 
 /** ${subTable.functionName}删除按钮操作 */
 function handleDelete${subClassName}() {
   if (checked${subClassName}.value.length == 0) {
-    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据")
+    proxy.#[[$modal]]#.msgError("请先选择要删除的${subTable.functionName}数据");
   } else {
-    const ${subclassName}s = ${subclassName}List.value
+    const ${subclassName}s = ${subclassName}List.value;
-    const checked${subClassName}s = checked${subClassName}.value
+    const checked${subClassName}s = checked${subClassName}.value;
     ${subclassName}List.value = ${subclassName}s.filter(function(item) {
       return checked${subClassName}s.indexOf(item.index) == -1
-    })
+    });
   }
 }
 
@@ -586,5 +586,5 @@ function handleExport() {
   }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
 }
 
-getList()
+getList();
 </script>

ruoyi-modules/ruoyi-job/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-job/pom.xml

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

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/controller/SysJobController.java

@@ -178,7 +178,7 @@ public class SysJobController extends BaseController
     @RequiresPermissions("monitor:job:remove")
     @Log(title = "定时任务", businessType = BusinessType.DELETE)
     @DeleteMapping("/{jobIds}")
-    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException
+    public AjaxResult remove(@PathVariable Long[] jobIds) throws SchedulerException, TaskException
     {
         jobService.deleteJobByIds(jobIds);
         return success();

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/AbstractQuartzJob.java

@@ -3,6 +3,7 @@ package com.ruoyi.job.util;
 import java.util.Date;
 import org.quartz.Job;
 import org.quartz.JobExecutionContext;
+import org.quartz.JobExecutionException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.ruoyi.common.core.constant.ScheduleConstants;
@@ -29,7 +30,7 @@ public abstract class AbstractQuartzJob implements Job
     private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
 
     @Override
-    public void execute(JobExecutionContext context)
+    public void execute(JobExecutionContext context) throws JobExecutionException
     {
         SysJob sysJob = new SysJob();
         BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));

ruoyi-modules/ruoyi-job/src/main/java/com/ruoyi/job/util/JobInvokeUtil.java

@@ -105,7 +105,7 @@ public class JobInvokeUtil
      */
     public static List<Object[]> getMethodParams(String invokeTarget)
     {
-        String methodStr = StringUtils.substringBetweenLast(invokeTarget, "(", ")");
+        String methodStr = StringUtils.substringBetween(invokeTarget, "(", ")");
         if (StringUtils.isEmpty(methodStr))
         {
             return null;

ruoyi-modules/ruoyi-system/Dockerfile

@@ -0,0 +1,12 @@
+FROM openjdk:8-jdk
+LABEL maintainer=duhongming
+
+
+#docker run -e PARAMS="--server.port 9090"
+ENV PARAMS="--server.port=8080 --spring.profiles.active=prod --spring.cloud.nacos.discovery.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.server-addr=nacos.ruoyi:8848 --spring.cloud.nacos.config.namespace=prod --spring.cloud.nacos.config.file-extension=yml"
+RUN /bin/cp /usr/share/zoneinfo/Asia/Shanghai /etc/localtime && echo 'Asia/Shanghai' >/etc/timezone
+
+COPY target/*.jar /app.jar
+EXPOSE 8080
+
+ENTRYPOINT ["/bin/sh","-c","java -jar app.jar ${PARAMS}"]

ruoyi-modules/ruoyi-system/pom.xml

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

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.controller;
 
 import java.util.Arrays;
-import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 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.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.file.FileTypeUtils;
 import com.ruoyi.common.core.utils.file.MimeTypeUtils;
@@ -95,13 +93,11 @@ public class SysProfileController extends BaseController
      */
     @Log(title = "个人信息", businessType = BusinessType.UPDATE)
     @PutMapping("/updatePwd")
-    public AjaxResult updatePwd(@RequestBody Map<String, String> params)
+    public AjaxResult updatePwd(String oldPassword, String newPassword)
     {
-        String oldPassword = params.get("oldPassword");
+        String username = SecurityUtils.getUsername();
-        String newPassword = params.get("newPassword");
+        SysUser user = userService.selectUserByUserName(username);
-        LoginUser loginUser = SecurityUtils.getLoginUser();
+        String password = user.getPassword();
-        String userName = loginUser.getUsername();
-        String password = loginUser.getSysUser().getPassword();
         if (!SecurityUtils.matchesPassword(oldPassword, password))
         {
             return error("修改密码失败，旧密码错误");
@@ -111,10 +107,10 @@ public class SysProfileController extends BaseController
             return error("新密码不能与旧密码相同");
         }
         newPassword = SecurityUtils.encryptPassword(newPassword);
-        if (userService.resetUserPwd(userName, newPassword) > 0)
+        if (userService.resetUserPwd(username, newPassword) > 0)
         {
-            // 更新缓存用户密码&密码最后更新时间
+            // 更新缓存用户密码
-            loginUser.getSysUser().setPwdUpdateDate(DateUtils.getNowDate());
+            LoginUser loginUser = SecurityUtils.getLoginUser();
             loginUser.getSysUser().setPassword(newPassword);
             tokenService.setLoginUser(loginUser);
             return success();

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java

@@ -1,7 +1,6 @@
 package com.ruoyi.system.controller;
 
 import java.io.IOException;
-import java.util.Date;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -19,8 +18,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 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.text.Convert;
-import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.web.controller.BaseController;
@@ -30,7 +27,6 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.InnerAuth;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.service.TokenService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.api.domain.SysRole;
@@ -70,9 +66,6 @@ public class SysUserController extends BaseController
     @Autowired
     private ISysConfigService configService;
 
-    @Autowired
-    private TokenService tokenService;
-
     /**
      * 获取用户列表
      */
@@ -174,50 +167,18 @@ public class SysUserController extends BaseController
     @GetMapping("getInfo")
     public AjaxResult getInfo()
     {
-        LoginUser loginUser = SecurityUtils.getLoginUser();
+        SysUser user = userService.selectUserById(SecurityUtils.getUserId());
-        SysUser user = loginUser.getSysUser();
         // 角色集合
         Set<String> roles = permissionService.getRolePermission(user);
         // 权限集合
         Set<String> permissions = permissionService.getMenuPermission(user);
-        if (!loginUser.getPermissions().equals(permissions))
-        {
-            loginUser.setPermissions(permissions);
-            tokenService.refreshToken(loginUser);
-        }
         AjaxResult ajax = AjaxResult.success();
         ajax.put("user", user);
         ajax.put("roles", roles);
         ajax.put("permissions", permissions);
-        ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate()));
-        ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate()));
         return ajax;
     }
 
-    // 检查初始密码是否提醒修改
-    public boolean initPasswordIsModify(Date pwdUpdateDate)
-    {
-        Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify"));
-        return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null;
-    }
-
-    // 检查密码是否过期
-    public boolean passwordIsExpiration(Date pwdUpdateDate)
-    {
-        Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays"));
-        if (passwordValidateDays != null && passwordValidateDays > 0)
-        {
-            if (StringUtils.isNull(pwdUpdateDate))
-            {
-                // 如果从未修改过初始密码，直接提醒过期
-                return true;
-            }
-            Date nowDate = DateUtils.getNowDate();
-            return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays;
-        }
-        return false;
-    }
-
     /**
      * 根据用户编号获取详细信息
      */
@@ -225,18 +186,18 @@ public class SysUserController extends BaseController
     @GetMapping(value = { "/", "/{userId}" })
     public AjaxResult getInfo(@PathVariable(value = "userId", required = false) Long userId)
     {
+        userService.checkUserDataScope(userId);
         AjaxResult ajax = AjaxResult.success();
+        List<SysRole> roles = roleService.selectRoleAll();
+        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
+        ajax.put("posts", postService.selectPostAll());
         if (StringUtils.isNotNull(userId))
         {
-            userService.checkUserDataScope(userId);
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
             ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
-        List<SysRole> roles = roleService.selectRoleAll();
-        ajax.put("roles", SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList()));
-        ajax.put("posts", postService.selectPostAll());
         return ajax;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TreeSelect.java

@@ -4,8 +4,6 @@ import java.io.Serializable;
 import java.util.List;
 import java.util.stream.Collectors;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.domain.SysDept;
 import com.ruoyi.system.domain.SysMenu;
 
@@ -24,9 +22,6 @@ public class TreeSelect implements Serializable
     /** 节点名称 */
     private String label;
 
-    /** 节点禁用 */
-    private boolean disabled = false;
-
     /** 子节点 */
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<TreeSelect> children;
@@ -40,7 +35,6 @@ public class TreeSelect implements Serializable
     {
         this.id = dept.getDeptId();
         this.label = dept.getDeptName();
-        this.disabled = StringUtils.equals(UserConstants.DEPT_DISABLE, dept.getStatus());
         this.children = dept.getChildren().stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
@@ -71,16 +65,6 @@ public class TreeSelect implements Serializable
         this.label = label;
     }
 
-    public boolean isDisabled()
-    {
-        return disabled;
-    }
-
-    public void setDisabled(boolean disabled)
-    {
-        this.disabled = disabled;
-    }
-
     public List<TreeSelect> getChildren()
     {
         return children;

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java

@@ -365,7 +365,7 @@ public class SysMenuServiceImpl implements ISysMenuService
     /**
      * 获取路由名称，如没有配置路由名称则取路由地址
      * 
-     * @param name 路由名称
+     * @param routerName 路由名称
      * @param path 路由地址
      * @return 路由名称（驼峰格式）
      */

ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java

@@ -6,8 +6,6 @@ import java.util.Set;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
-import com.ruoyi.common.core.constant.UserConstants;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.system.api.domain.SysRole;
 import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.service.ISysMenuService;
@@ -72,15 +70,12 @@ public class SysPermissionServiceImpl implements ISysPermissionService
             {
                 // 多角色设置permissions属性，以便数据权限匹配权限
                 for (SysRole role : roles)
-                {
-                    if (StringUtils.equals(role.getStatus(), UserConstants.ROLE_NORMAL) && !role.isAdmin())
                 {
                     Set<String> rolePerms = menuService.selectMenuPermsByRoleId(role.getRoleId());
                     role.setPermissions(rolePerms);
                     perms.addAll(rolePerms);
                 }
             }
-            }
             else
             {
                 perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -18,7 +18,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="delFlag"      column="del_flag"     />
         <result property="loginIp"      column="login_ip"     />
         <result property="loginDate"    column="login_date"   />
-        <result property="pwdUpdateDate" column="pwd_update_date" />
         <result property="createBy"     column="create_by"    />
         <result property="createTime"   column="create_time"  />
         <result property="updateBy"     column="update_by"    />
@@ -48,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 	
 	<sql id="selectUserVo">
-        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.pwd_update_date, u.create_by, u.create_time, u.remark, 
+        select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, 
         d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
         r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
         from sys_user u
@@ -155,7 +154,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="sex != null and sex != ''">sex,</if>
  			<if test="password != null and password != ''">password,</if>
  			<if test="status != null and status != ''">status,</if>
- 			<if test="pwdUpdateDate != null">pwd_update_date,</if>
  			<if test="createBy != null and createBy != ''">create_by,</if>
  			<if test="remark != null and remark != ''">remark,</if>
  			create_time
@@ -170,7 +168,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  			<if test="sex != null and sex != ''">#{sex},</if>
  			<if test="password != null and password != ''">#{password},</if>
  			<if test="status != null and status != ''">#{status},</if>
- 			<if test="pwdUpdateDate != null">#{pwdUpdateDate},</if>
  			<if test="createBy != null and createBy != ''">#{createBy},</if>
  			<if test="remark != null and remark != ''">#{remark},</if>
  			sysdate()
@@ -181,6 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
  		update sys_user
  		<set>
  			<if test="deptId != null and deptId != 0">dept_id = #{deptId},</if>
+ 			<if test="userName != null and userName != ''">user_name = #{userName},</if>
  			<if test="nickName != null and nickName != ''">nick_name = #{nickName},</if>
  			<if test="email != null ">email = #{email},</if>
  			<if test="phonenumber != null ">phonenumber = #{phonenumber},</if>
@@ -206,7 +204,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	</update>
 	
 	<update id="resetUserPwd" parameterType="SysUser">
- 		update sys_user set pwd_update_date = sysdate(), password = #{password} where user_name = #{userName}
+ 		update sys_user set password = #{password} where user_name = #{userName}
 	</update>
 	
 	<delete id="deleteUserById" parameterType="Long">

ruoyi-ui/.env.staging

@@ -1,8 +1,6 @@
 # 页面标题
 VUE_APP_TITLE = 若依管理系统
 
-BABEL_ENV = production
-
 NODE_ENV = production
 
 # 测试环境配置

ruoyi-ui/.eslintignore

@@ -0,0 +1,10 @@
+# 忽略build目录下类型为js的文件的语法检查
+build/*.js
+# 忽略src/assets目录下文件的语法检查
+src/assets
+# 忽略public目录下文件的语法检查
+public
+# 忽略当前目录下为js的文件的语法检查
+*.js
+# 忽略当前目录下为vue的文件的语法检查
+*.vue

ruoyi-ui/.eslintrc.js

@@ -0,0 +1,199 @@
+// ESlint 检查配置
+module.exports = {
+  root: true,
+  parserOptions: {
+    parser: 'babel-eslint',
+    sourceType: 'module'
+  },
+  env: {
+    browser: true,
+    node: true,
+    es6: true,
+  },
+  extends: ['plugin:vue/recommended', 'eslint:recommended'],
+
+  // add your custom rules here
+  //it is base on https://github.com/vuejs/eslint-config-vue
+  rules: {
+    "vue/max-attributes-per-line": [2, {
+      "singleline": 10,
+      "multiline": {
+        "max": 1,
+        "allowFirstLine": false
+      }
+    }],
+    "vue/singleline-html-element-content-newline": "off",
+    "vue/multiline-html-element-content-newline":"off",
+    "vue/name-property-casing": ["error", "PascalCase"],
+    "vue/no-v-html": "off",
+    'accessor-pairs': 2,
+    'arrow-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'block-spacing': [2, 'always'],
+    'brace-style': [2, '1tbs', {
+      'allowSingleLine': true
+    }],
+    'camelcase': [0, {
+      'properties': 'always'
+    }],
+    'comma-dangle': [2, 'never'],
+    'comma-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'comma-style': [2, 'last'],
+    'constructor-super': 2,
+    'curly': [2, 'multi-line'],
+    'dot-location': [2, 'property'],
+    'eol-last': 2,
+    'eqeqeq': ["error", "always", {"null": "ignore"}],
+    'generator-star-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'handle-callback-err': [2, '^(err|error)$'],
+    'indent': [2, 2, {
+      'SwitchCase': 1
+    }],
+    'jsx-quotes': [2, 'prefer-single'],
+    'key-spacing': [2, {
+      'beforeColon': false,
+      'afterColon': true
+    }],
+    'keyword-spacing': [2, {
+      'before': true,
+      'after': true
+    }],
+    'new-cap': [2, {
+      'newIsCap': true,
+      'capIsNew': false
+    }],
+    'new-parens': 2,
+    'no-array-constructor': 2,
+    'no-caller': 2,
+    'no-console': 'off',
+    'no-class-assign': 2,
+    'no-cond-assign': 2,
+    'no-const-assign': 2,
+    'no-control-regex': 0,
+    'no-delete-var': 2,
+    'no-dupe-args': 2,
+    'no-dupe-class-members': 2,
+    'no-dupe-keys': 2,
+    'no-duplicate-case': 2,
+    'no-empty-character-class': 2,
+    'no-empty-pattern': 2,
+    'no-eval': 2,
+    'no-ex-assign': 2,
+    'no-extend-native': 2,
+    'no-extra-bind': 2,
+    'no-extra-boolean-cast': 2,
+    'no-extra-parens': [2, 'functions'],
+    'no-fallthrough': 2,
+    'no-floating-decimal': 2,
+    'no-func-assign': 2,
+    'no-implied-eval': 2,
+    'no-inner-declarations': [2, 'functions'],
+    'no-invalid-regexp': 2,
+    'no-irregular-whitespace': 2,
+    'no-iterator': 2,
+    'no-label-var': 2,
+    'no-labels': [2, {
+      'allowLoop': false,
+      'allowSwitch': false
+    }],
+    'no-lone-blocks': 2,
+    'no-mixed-spaces-and-tabs': 2,
+    'no-multi-spaces': 2,
+    'no-multi-str': 2,
+    'no-multiple-empty-lines': [2, {
+      'max': 1
+    }],
+    'no-native-reassign': 2,
+    'no-negated-in-lhs': 2,
+    'no-new-object': 2,
+    'no-new-require': 2,
+    'no-new-symbol': 2,
+    'no-new-wrappers': 2,
+    'no-obj-calls': 2,
+    'no-octal': 2,
+    'no-octal-escape': 2,
+    'no-path-concat': 2,
+    'no-proto': 2,
+    'no-redeclare': 2,
+    'no-regex-spaces': 2,
+    'no-return-assign': [2, 'except-parens'],
+    'no-self-assign': 2,
+    'no-self-compare': 2,
+    'no-sequences': 2,
+    'no-shadow-restricted-names': 2,
+    'no-spaced-func': 2,
+    'no-sparse-arrays': 2,
+    'no-this-before-super': 2,
+    'no-throw-literal': 2,
+    'no-trailing-spaces': 2,
+    'no-undef': 2,
+    'no-undef-init': 2,
+    'no-unexpected-multiline': 2,
+    'no-unmodified-loop-condition': 2,
+    'no-unneeded-ternary': [2, {
+      'defaultAssignment': false
+    }],
+    'no-unreachable': 2,
+    'no-unsafe-finally': 2,
+    'no-unused-vars': [2, {
+      'vars': 'all',
+      'args': 'none'
+    }],
+    'no-useless-call': 2,
+    'no-useless-computed-key': 2,
+    'no-useless-constructor': 2,
+    'no-useless-escape': 0,
+    'no-whitespace-before-property': 2,
+    'no-with': 2,
+    'one-var': [2, {
+      'initialized': 'never'
+    }],
+    'operator-linebreak': [2, 'after', {
+      'overrides': {
+        '?': 'before',
+        ':': 'before'
+      }
+    }],
+    'padded-blocks': [2, 'never'],
+    'quotes': [2, 'single', {
+      'avoidEscape': true,
+      'allowTemplateLiterals': true
+    }],
+    'semi': [2, 'never'],
+    'semi-spacing': [2, {
+      'before': false,
+      'after': true
+    }],
+    'space-before-blocks': [2, 'always'],
+    'space-before-function-paren': [2, 'never'],
+    'space-in-parens': [2, 'never'],
+    'space-infix-ops': 2,
+    'space-unary-ops': [2, {
+      'words': true,
+      'nonwords': false
+    }],
+    'spaced-comment': [2, 'always', {
+      'markers': ['global', 'globals', 'eslint', 'eslint-disable', '*package', '!', ',']
+    }],
+    'template-curly-spacing': [2, 'never'],
+    'use-isnan': 2,
+    'valid-typeof': 2,
+    'wrap-iife': [2, 'any'],
+    'yield-star-spacing': [2, 'both'],
+    'yoda': [2, 'never'],
+    'prefer-const': 2,
+    'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0,
+    'object-curly-spacing': [2, 'always', {
+      objectsInObjects: false
+    }],
+    'array-bracket-spacing': [2, 'never']
+  }
+}

ruoyi-ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ruoyi",
-  "version": "3.6.6",
+  "version": "3.6.4",
   "description": "若依管理系统",
   "author": "若依",
   "license": "MIT",
@@ -8,7 +8,19 @@
     "dev": "vue-cli-service serve",
     "build:prod": "vue-cli-service build",
     "build:stage": "vue-cli-service build --mode staging",
-    "preview": "node build/index.js --preview"
+    "preview": "node build/index.js --preview",
+    "lint": "eslint --ext .js,.vue src"
+  },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged"
+    }
+  },
+  "lint-staged": {
+    "src/**/*.{js,vue}": [
+      "eslint --fix",
+      "git add"
+    ]
   },
   "keywords": [
     "vue",
@@ -37,24 +49,30 @@
     "js-cookie": "3.0.1",
     "jsencrypt": "3.0.0-rc.1",
     "nprogress": "0.2.0",
-    "quill": "2.0.2",
+    "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
-    "splitpanes": "2.4.1",
     "vue": "2.6.12",
     "vue-count-to": "1.0.13",
     "vue-cropper": "0.5.5",
+    "vue-meta": "2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
     "vuex": "3.6.0"
   },
   "devDependencies": {
     "@vue/cli-plugin-babel": "4.4.6",
+    "@vue/cli-plugin-eslint": "4.4.6",
     "@vue/cli-service": "4.4.6",
+    "babel-eslint": "10.1.0",
     "babel-plugin-dynamic-import-node": "2.3.3",
     "chalk": "4.1.0",
     "compression-webpack-plugin": "6.1.2",
     "connect": "3.6.6",
+    "eslint": "7.15.0",
+    "eslint-plugin-vue": "7.2.0",
+    "lint-staged": "10.5.3",
+    "runjs": "4.4.2",
     "sass": "1.32.13",
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",

ruoyi-ui/src/App.vue

@@ -6,12 +6,20 @@
 </template>
 
 <script>
-import ThemePicker from "@/components/ThemePicker"
+import ThemePicker from "@/components/ThemePicker";
 
 export default {
   name: "App",
-  components: { ThemePicker }
+  components: { ThemePicker },
-}
+  metaInfo() {
+    return {
+      title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
+      titleTemplate: title => {
+        return title ? `${title} - ${process.env.VUE_APP_TITLE}` : process.env.VUE_APP_TITLE
+      }
+    }
+  }
+};
 </script>
 <style scoped>
 #app .theme-picker {

ruoyi-ui/src/api/system/user.js

@@ -96,7 +96,7 @@ export function updateUserPwd(oldPassword, newPassword) {
   return request({
     url: '/system/user/profile/updatePwd',
     method: 'put',
-    data: data
+    params: data
   })
 }
 

ruoyi-ui/src/assets/icons/svg/enter.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1746590936918" class="icon" viewBox="0 0 1194 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5378" xmlns:xlink="http://www.w3.org/1999/xlink" width="233.203125" height="200"><path d="M1151.9144 325.11999969V89.12a57.04000031 57.04000031 0 0 0-28.8-49.44 58.15999969 58.15999969 0 0 0-57.76000031 0 57.04000031 57.04000031 0 0 0-28.8 49.44v235.99999969c0.24 84.31999969-33.6 152.56000031-94.08 212.00000062-60.07999969 59.83999969-141.84 80.64-227.04 80.4H225.91440031L388.07439969 457.11999969a56.80000031 56.80000031 0 0 0 12.40000031-62.16 57.76000031 57.76000031 0 0 0-94.00000031-18.63999938L48.8744 631.20000031a56.88 56.88 0 0 0 0 80.79999938l264.96 262.56a58.08 58.08 0 0 0 96.55999969-25.59999938 56.80000031 56.80000031 0 0 0-14.95999969-55.2L232.07439969 731.67999969h483.44000062c116.56000031 0 226.15999969-32.08000031 308.64-113.76 82.15999969-80.80000031 128.23999969-178.15999969 127.83999938-292.87999969" p-id="5379"></path></svg>

ruoyi-ui/src/assets/icons/svg/more-up.svg

@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1746760911144" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12537" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M395.21211 182.914448c0 62.669318 49.541323 113.472378 110.642936 113.472378 61.093427 0 110.652146-50.80306 110.65214601-113.472378 0-62.685691-49.559742-113.487727-110.65214601-113.487727C444.75241 69.426721 395.21211 120.22978 395.21211 182.914448zM395.21211 523.34693101c0 62.668295 49.541323 113.487727 110.642936 113.48772699 61.093427 0 110.652146-50.820456 110.652146-113.487727 0-62.669318-49.559742-113.472378-110.652146-113.472378C444.75241 409.874553 395.21211 460.67761301 395.21211 523.34693101zM395.21211 841.084529c0 62.686714 49.541323 113.488751 110.642936 113.488751 61.093427 0 110.652146-50.80203599 110.65214601-113.488751 0-62.669318-49.559742-113.471354-110.65214601-113.471354C444.75241 727.614198 395.21211 778.416234 395.21211 841.084529z" p-id="12538"></path></svg>

ruoyi-ui/src/assets/styles/index.scss

@@ -129,6 +129,10 @@ aside {
   position: relative;
 }
 
+.pagination-container {
+  margin-top: 30px;
+}
+
 .text-center {
   text-align: center
 }

ruoyi-ui/src/assets/styles/ruoyi.scss

@@ -117,9 +117,11 @@
 
 /** 表格布局 **/
 .pagination-container {
-  display: flex;
+  position: relative;
-  justify-content: flex-end;
+  height: 25px;
-  margin-top: 20px;
+  margin-bottom: 10px;
+  margin-top: 15px;
+  padding: 10px 20px !important;
 }
 
 /* tree border */
@@ -130,6 +132,11 @@
   border-radius: 4px;
 }
 
+.pagination-container .el-pagination {
+  right: 0;
+  position: absolute;
+}
+
 @media (max-width: 768px) {
   .pagination-container .el-pagination > .el-pagination__jump {
     display: none !important;
@@ -194,6 +201,8 @@
 }
 
 .card-box {
+  padding-right: 15px;
+  padding-left: 15px;
   margin-bottom: 10px;
 }
 
@@ -280,8 +289,3 @@
   position: relative;
   float: right;
 }
-
-/* 分割面板样式 */
-.splitpanes.default-theme .splitpanes__pane {
-  background-color: #fff!important;
-}

ruoyi-ui/src/assets/styles/sidebar.scss

@@ -25,7 +25,7 @@
     z-index: 1001;
     overflow: hidden;
     -webkit-box-shadow: 2px 0 6px rgba(0,21,41,.35);
-    box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.1);
+    box-shadow: 2px 0 6px rgba(0,21,41,.35);
 
     // reset element-ui css
     .horizontal-collapse-transition {

ruoyi-ui/src/components/Breadcrumb/index.vue

@@ -1,7 +1,7 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+      <el-breadcrumb-item v-for="(item,index) in levelList" :key="item.path">
         <span v-if="item.redirect === 'noRedirect' || index == levelList.length - 1" class="no-redirect">{{ item.meta.title }}</span>
         <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
@@ -31,45 +31,15 @@ export default {
   methods: {
     getBreadcrumb() {
       // only show routes with meta.title
-      let matched = []
+      let matched = this.$route.matched.filter(item => item.meta && item.meta.title)
-      const router = this.$route
+      const first = matched[0]
-      const pathNum = this.findPathNum(router.path)
+
-      // multi-level menu
+      if (!this.isDashboard(first)) {
-      if (pathNum > 2) {
+        matched = [{ path: '/index', meta: { title: '首页' }}].concat(matched)
-        const reg = /\/\w+/gi
-        const pathList = router.path.match(reg).map((item, index) => {
-          if (index !== 0) item = item.slice(1)
-          return item
-        })
-        this.getMatched(pathList, this.$store.getters.defaultRoutes, matched)
-      } else {
-        matched = router.matched.filter(item => item.meta && item.meta.title)
-      }
-      // 判断是否为首页
-      if (!this.isDashboard(matched[0])) {
-        matched = [{ path: "/index", meta: { title: "首页" } }].concat(matched)
       }
+
       this.levelList = matched.filter(item => item.meta && item.meta.title && item.meta.breadcrumb !== false)
     },
-    findPathNum(str, char = "/") {
-      let index = str.indexOf(char)
-      let num = 0
-      while (index !== -1) {
-        num++
-        index = str.indexOf(char, index + 1)
-      }
-      return num
-    },
-    getMatched(pathList, routeList, matched) {
-      let data = routeList.find(item => item.path == pathList[0] || (item.name += '').toLowerCase() == pathList[0])
-      if (data) {
-        matched.push(data)
-        if (data.children && pathList.length) {
-          pathList.shift()
-          this.getMatched(pathList, data.children, matched)
-        }
-      }
-    },
     isDashboard(route) {
       const name = route && route.name
       if (!name) {
@@ -95,6 +65,7 @@ export default {
   font-size: 14px;
   line-height: 50px;
   margin-left: 8px;
+
   .no-redirect {
     color: #97a8be;
     cursor: text;

ruoyi-ui/src/components/Crontab/day.vue

@@ -71,58 +71,58 @@ export default {
 	methods: {
 		// 单选按钮值变化时
 		radioChange() {
-			('day rachange')
+			('day rachange');
 			if (this.radioValue !== 2 && this.cron.week !== '?') {
 				this.$emit('update', 'week', '?', 'day')
 			}
 
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'day', '*')
+					this.$emit('update', 'day', '*');
-					break
+					break;
 				case 2:
-					this.$emit('update', 'day', '?')
+					this.$emit('update', 'day', '?');
-					break
+					break;
 				case 3:
-					this.$emit('update', 'day', this.cycleTotal)
+					this.$emit('update', 'day', this.cycleTotal);
-					break
+					break;
 				case 4:
-					this.$emit('update', 'day', this.averageTotal)
+					this.$emit('update', 'day', this.averageTotal);
-					break
+					break;
 				case 5:
-					this.$emit('update', 'day', this.workday + 'W')
+					this.$emit('update', 'day', this.workday + 'W');
-					break
+					break;
 				case 6:
-					this.$emit('update', 'day', 'L')
+					this.$emit('update', 'day', 'L');
-					break
+					break;
 				case 7:
-					this.$emit('update', 'day', this.checkboxString)
+					this.$emit('update', 'day', this.checkboxString);
-					break
+					break;
 			}
-			('day rachange end')
+			('day rachange end');
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'day', this.cycleTotal)
+				this.$emit('update', 'day', this.cycleTotal);
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'day', this.averageTotal)
+				this.$emit('update', 'day', this.averageTotal);
 			}
 		},
 		// 最近工作日值变化时
 		workdayChange() {
 			if (this.radioValue == '5') {
-				this.$emit('update', 'day', this.workdayCheck + 'W')
+				this.$emit('update', 'day', this.workdayCheck + 'W');
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '7') {
-				this.$emit('update', 'day', this.checkboxString)
+				this.$emit('update', 'day', this.checkboxString);
 			}
 		}
 	},
@@ -138,23 +138,23 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 1, 30)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 31, 31)
-			return cycle01 + '-' + cycle02
+			return cycle01 + '-' + cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 1, 30)
 			const average02 = this.checkNum(this.average02, 1, 31 - average01 || 0)
-			return average01 + '/' + average02
+			return average01 + '/' + average02;
 		},
 		// 计算工作日格式
 		workdayCheck: function () {
 			const workday = this.checkNum(this.workday, 1, 31)
-			return workday
+			return workday;
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join()
+			let str = this.checkboxList.join();
-			return str == '' ? '*' : str
+			return str == '' ? '*' : str;
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/hour.vue

@@ -51,43 +51,37 @@ export default {
 	methods: {
 		// 单选按钮值变化时
 		radioChange() {
-			if (this.cron.min === '*') {
-			    this.$emit('update', 'min', '0', 'hour')
-			}
-			if (this.cron.second === '*') {
-			    this.$emit('update', 'second', '0', 'hour')
-			}
 			switch (this.radioValue) {
 				case 1:
         	this.$emit('update', 'hour', '*')
-					break
+        	break;
 				case 2:
-					this.$emit('update', 'hour', this.cycleTotal)
+					this.$emit('update', 'hour', this.cycleTotal);
-					break
+					break;
 				case 3:
-					this.$emit('update', 'hour', this.averageTotal)
+					this.$emit('update', 'hour', this.averageTotal);
-					break
+					break;
 				case 4:
-					this.$emit('update', 'hour', this.checkboxString)
+					this.$emit('update', 'hour', this.checkboxString);
-					break
+					break;
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'hour', this.cycleTotal)
+				this.$emit('update', 'hour', this.cycleTotal);
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'hour', this.averageTotal)
+				this.$emit('update', 'hour', this.averageTotal);
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'hour', this.checkboxString)
+				this.$emit('update', 'hour', this.checkboxString);
 			}
 		}
 	},
@@ -102,18 +96,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 0, 22)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 23)
-			return cycle01 + '-' + cycle02
+			return cycle01 + '-' + cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 0, 22)
 			const average02 = this.checkNum(this.average02, 1, 23 - average01 || 0)
-			return average01 + '/' + average02
+			return average01 + '/' + average02;
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join()
+			let str = this.checkboxList.join();
-			return str == '' ? '*' : str
+			return str == '' ? '*' : str;
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/index.vue

@@ -113,14 +113,14 @@
 </template>
 
 <script>
-import CrontabSecond from "./second.vue"
+import CrontabSecond from "./second.vue";
-import CrontabMin from "./min.vue"
+import CrontabMin from "./min.vue";
-import CrontabHour from "./hour.vue"
+import CrontabHour from "./hour.vue";
-import CrontabDay from "./day.vue"
+import CrontabDay from "./day.vue";
-import CrontabMonth from "./month.vue"
+import CrontabMonth from "./month.vue";
-import CrontabWeek from "./week.vue"
+import CrontabWeek from "./week.vue";
-import CrontabYear from "./year.vue"
+import CrontabYear from "./year.vue";
-import CrontabResult from "./result.vue"
+import CrontabResult from "./result.vue";
 
 export default {
   data() {
@@ -137,19 +137,19 @@ export default {
         week: "?",
         year: "",
       },
-    }
+    };
   },
   name: "vcrontab",
   props: ["expression", "hideComponent"],
   methods: {
     shouldHide(key) {
-      if (this.hideComponent && this.hideComponent.includes(key)) return false
+      if (this.hideComponent && this.hideComponent.includes(key)) return false;
-      return true
+      return true;
     },
     resolveExp() {
       // 反解析 表达式
       if (this.expression) {
-        let arr = this.expression.split(" ")
+        let arr = this.expression.split(" ");
         if (arr.length >= 6) {
           //6 位以上是合法表达式
           let obj = {
@@ -160,160 +160,160 @@ export default {
             month: arr[4],
             week: arr[5],
             year: arr[6] ? arr[6] : "",
-          }
+          };
           this.crontabValueObj = {
             ...obj,
-          }
+          };
           for (let i in obj) {
-            if (obj[i]) this.changeRadio(i, obj[i])
+            if (obj[i]) this.changeRadio(i, obj[i]);
           }
         }
       } else {
         // 没有传入的表达式 则还原
-        this.clearCron()
+        this.clearCron();
       }
     },
     // tab切换值
     tabCheck(index) {
-      this.tabActive = index
+      this.tabActive = index;
     },
     // 由子组件触发，更改表达式组成的字段值
     updateCrontabValue(name, value, from) {
-      "updateCrontabValue", name, value, from
+      "updateCrontabValue", name, value, from;
-      this.crontabValueObj[name] = value
+      this.crontabValueObj[name] = value;
       if (from && from !== name) {
-        console.log(`来自组件 ${from} 改变了 ${name} ${value}`)
+        console.log(`来自组件 ${from} 改变了 ${name} ${value}`);
-        this.changeRadio(name, value)
+        this.changeRadio(name, value);
       }
     },
     // 赋值到组件
     changeRadio(name, value) {
       let arr = ["second", "min", "hour", "month"],
         refName = "cron" + name,
-        insValue
+        insValue;
 
-      if (!this.$refs[refName]) return
+      if (!this.$refs[refName]) return;
 
       if (arr.includes(name)) {
         if (value === "*") {
-          insValue = 1
+          insValue = 1;
         } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-")
+          let indexArr = value.split("-");
           isNaN(indexArr[0])
             ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0])
+            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1]
+          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 2
+          insValue = 2;
         } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/")
+          let indexArr = value.split("/");
           isNaN(indexArr[0])
             ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0])
+            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1]
+          this.$refs[refName].average02 = indexArr[1];
-          insValue = 3
+          insValue = 3;
         } else {
-          insValue = 4
+          insValue = 4;
-          this.$refs[refName].checkboxList = value.split(",")
+          this.$refs[refName].checkboxList = value.split(",");
         }
       } else if (name == "day") {
         if (value === "*") {
-          insValue = 1
+          insValue = 1;
         } else if (value == "?") {
-          insValue = 2
+          insValue = 2;
         } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-")
+          let indexArr = value.split("-");
           isNaN(indexArr[0])
             ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0])
+            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1]
+          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 3
+          insValue = 3;
         } else if (value.indexOf("/") > -1) {
-          let indexArr = value.split("/")
+          let indexArr = value.split("/");
           isNaN(indexArr[0])
             ? (this.$refs[refName].average01 = 0)
-            : (this.$refs[refName].average01 = indexArr[0])
+            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1]
+          this.$refs[refName].average02 = indexArr[1];
-          insValue = 4
+          insValue = 4;
         } else if (value.indexOf("W") > -1) {
-          let indexArr = value.split("W")
+          let indexArr = value.split("W");
           isNaN(indexArr[0])
             ? (this.$refs[refName].workday = 0)
-            : (this.$refs[refName].workday = indexArr[0])
+            : (this.$refs[refName].workday = indexArr[0]);
-          insValue = 5
+          insValue = 5;
         } else if (value === "L") {
-          insValue = 6
+          insValue = 6;
         } else {
-          this.$refs[refName].checkboxList = value.split(",")
+          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 7
+          insValue = 7;
         }
       } else if (name == "week") {
         if (value === "*") {
-          insValue = 1
+          insValue = 1;
         } else if (value == "?") {
-          insValue = 2
+          insValue = 2;
         } else if (value.indexOf("-") > -1) {
-          let indexArr = value.split("-")
+          let indexArr = value.split("-");
           isNaN(indexArr[0])
             ? (this.$refs[refName].cycle01 = 0)
-            : (this.$refs[refName].cycle01 = indexArr[0])
+            : (this.$refs[refName].cycle01 = indexArr[0]);
-          this.$refs[refName].cycle02 = indexArr[1]
+          this.$refs[refName].cycle02 = indexArr[1];
-          insValue = 3
+          insValue = 3;
         } else if (value.indexOf("#") > -1) {
-          let indexArr = value.split("#")
+          let indexArr = value.split("#");
           isNaN(indexArr[0])
             ? (this.$refs[refName].average01 = 1)
-            : (this.$refs[refName].average01 = indexArr[0])
+            : (this.$refs[refName].average01 = indexArr[0]);
-          this.$refs[refName].average02 = indexArr[1]
+          this.$refs[refName].average02 = indexArr[1];
-          insValue = 4
+          insValue = 4;
         } else if (value.indexOf("L") > -1) {
-          let indexArr = value.split("L")
+          let indexArr = value.split("L");
           isNaN(indexArr[0])
             ? (this.$refs[refName].weekday = 1)
-            : (this.$refs[refName].weekday = indexArr[0])
+            : (this.$refs[refName].weekday = indexArr[0]);
-          insValue = 5
+          insValue = 5;
         } else {
-          this.$refs[refName].checkboxList = value.split(",")
+          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 6
+          insValue = 6;
         }
       } else if (name == "year") {
         if (value == "") {
-          insValue = 1
+          insValue = 1;
         } else if (value == "*") {
-          insValue = 2
+          insValue = 2;
         } else if (value.indexOf("-") > -1) {
-          insValue = 3
+          insValue = 3;
         } else if (value.indexOf("/") > -1) {
-          insValue = 4
+          insValue = 4;
         } else {
-          this.$refs[refName].checkboxList = value.split(",")
+          this.$refs[refName].checkboxList = value.split(",");
-          insValue = 5
+          insValue = 5;
         }
       }
-      this.$refs[refName].radioValue = insValue
+      this.$refs[refName].radioValue = insValue;
     },
     // 表单选项的子组件校验数字格式（通过-props传递）
     checkNumber(value, minLimit, maxLimit) {
       // 检查必须为整数
-      value = Math.floor(value)
+      value = Math.floor(value);
       if (value < minLimit) {
-        value = minLimit
+        value = minLimit;
       } else if (value > maxLimit) {
-        value = maxLimit
+        value = maxLimit;
       }
-      return value
+      return value;
     },
     // 隐藏弹窗
     hidePopup() {
-      this.$emit("hide")
+      this.$emit("hide");
     },
     // 填充表达式
     submitFill() {
-      this.$emit("fill", this.crontabValueString)
+      this.$emit("fill", this.crontabValueString);
-      this.hidePopup()
+      this.hidePopup();
     },
     clearCron() {
       // 还原选择项
-      ("准备还原")
+      ("准备还原");
       this.crontabValueObj = {
         second: "*",
         min: "*",
@@ -322,15 +322,15 @@ export default {
         month: "*",
         week: "?",
         year: "",
-      }
+      };
       for (let j in this.crontabValueObj) {
-        this.changeRadio(j, this.crontabValueObj[j])
+        this.changeRadio(j, this.crontabValueObj[j]);
       }
     },
   },
   computed: {
     crontabValueString: function() {
-      let obj = this.crontabValueObj
+      let obj = this.crontabValueObj;
       let str =
         obj.second +
         " " +
@@ -343,8 +343,8 @@ export default {
         obj.month +
         " " +
         obj.week +
-        (obj.year == "" ? "" : " " + obj.year)
+        (obj.year == "" ? "" : " " + obj.year);
-      return str
+      return str;
     },
   },
   components: {
@@ -364,9 +364,9 @@ export default {
     },
   },
   mounted: function() {
-    this.resolveExp()
+    this.resolveExp();
   },
-}
+};
 </script>
 <style scoped>
 .pop_btn {

ruoyi-ui/src/components/Crontab/min.vue

@@ -54,35 +54,35 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'min', '*', 'min')
+					this.$emit('update', 'min', '*', 'min');
-					break
+					break;
 				case 2:
-					this.$emit('update', 'min', this.cycleTotal, 'min')
+					this.$emit('update', 'min', this.cycleTotal, 'min');
-					break
+					break;
 				case 3:
-					this.$emit('update', 'min', this.averageTotal, 'min')
+					this.$emit('update', 'min', this.averageTotal, 'min');
-					break
+					break;
 				case 4:
-					this.$emit('update', 'min', this.checkboxString, 'min')
+					this.$emit('update', 'min', this.checkboxString, 'min');
-					break
+					break;
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'min', this.cycleTotal, 'min')
+				this.$emit('update', 'min', this.cycleTotal, 'min');
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'min', this.averageTotal, 'min')
+				this.$emit('update', 'min', this.averageTotal, 'min');
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'min', this.checkboxString, 'min')
+				this.$emit('update', 'min', this.checkboxString, 'min');
 			}
 		},
 
@@ -98,18 +98,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 0, 58)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
-			return cycle01 + '-' + cycle02
+			return cycle01 + '-' + cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 0, 58)
 			const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
-			return average01 + '/' + average02
+			return average01 + '/' + average02;
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join()
+			let str = this.checkboxList.join();
-			return str == '' ? '*' : str
+			return str == '' ? '*' : str;
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/month.vue

@@ -53,35 +53,35 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'month', '*')
+					this.$emit('update', 'month', '*');
-					break
+					break;
 				case 2:
-					this.$emit('update', 'month', this.cycleTotal)
+					this.$emit('update', 'month', this.cycleTotal);
-					break
+					break;
 				case 3:
-					this.$emit('update', 'month', this.averageTotal)
+					this.$emit('update', 'month', this.averageTotal);
-					break
+					break;
 				case 4:
-					this.$emit('update', 'month', this.checkboxString)
+					this.$emit('update', 'month', this.checkboxString);
-					break
+					break;
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'month', this.cycleTotal)
+				this.$emit('update', 'month', this.cycleTotal);
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'month', this.averageTotal)
+				this.$emit('update', 'month', this.averageTotal);
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'month', this.checkboxString)
+				this.$emit('update', 'month', this.checkboxString);
 			}
 		}
 	},
@@ -96,18 +96,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 1, 11)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 2, 12)
-			return cycle01 + '-' + cycle02
+			return cycle01 + '-' + cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 1, 11)
 			const average02 = this.checkNum(this.average02, 1, 12 - average01 || 0)
-			return average01 + '/' + average02
+			return average01 + '/' + average02;
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join()
+			let str = this.checkboxList.join();
-			return str == '' ? '*' : str
+			return str == '' ? '*' : str;
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/result.vue

@@ -27,135 +27,135 @@ export default {
 		expressionChange() {
 
 			// 计算开始-隐藏结果
-			this.isShow = false
+			this.isShow = false;
 			// 获取规则数组[0秒、1分、2时、3日、4月、5星期、6年]
-			let ruleArr = this.$options.propsData.ex.split(' ')
+			let ruleArr = this.$options.propsData.ex.split(' ');
 			// 用于记录进入循环的次数
-			let nums = 0
+			let nums = 0;
 			// 用于暂时存符号时间规则结果的数组
-			let resultArr = []
+			let resultArr = [];
 			// 获取当前时间精确至[年、月、日、时、分、秒]
-			let nTime = new Date()
+			let nTime = new Date();
-			let nYear = nTime.getFullYear()
+			let nYear = nTime.getFullYear();
-			let nMonth = nTime.getMonth() + 1
+			let nMonth = nTime.getMonth() + 1;
-			let nDay = nTime.getDate()
+			let nDay = nTime.getDate();
-			let nHour = nTime.getHours()
+			let nHour = nTime.getHours();
-			let nMin = nTime.getMinutes()
+			let nMin = nTime.getMinutes();
-			let nSecond = nTime.getSeconds()
+			let nSecond = nTime.getSeconds();
 			// 根据规则获取到近100年可能年数组、月数组等等
-			this.getSecondArr(ruleArr[0])
+			this.getSecondArr(ruleArr[0]);
-			this.getMinArr(ruleArr[1])
+			this.getMinArr(ruleArr[1]);
-			this.getHourArr(ruleArr[2])
+			this.getHourArr(ruleArr[2]);
-			this.getDayArr(ruleArr[3])
+			this.getDayArr(ruleArr[3]);
-			this.getMonthArr(ruleArr[4])
+			this.getMonthArr(ruleArr[4]);
-			this.getWeekArr(ruleArr[5])
+			this.getWeekArr(ruleArr[5]);
-			this.getYearArr(ruleArr[6], nYear)
+			this.getYearArr(ruleArr[6], nYear);
 			// 将获取到的数组赋值-方便使用
-			let sDate = this.dateArr[0]
+			let sDate = this.dateArr[0];
-			let mDate = this.dateArr[1]
+			let mDate = this.dateArr[1];
-			let hDate = this.dateArr[2]
+			let hDate = this.dateArr[2];
-			let DDate = this.dateArr[3]
+			let DDate = this.dateArr[3];
-			let MDate = this.dateArr[4]
+			let MDate = this.dateArr[4];
-			let YDate = this.dateArr[5]
+			let YDate = this.dateArr[5];
 			// 获取当前时间在数组中的索引
-			let sIdx = this.getIndex(sDate, nSecond)
+			let sIdx = this.getIndex(sDate, nSecond);
-			let mIdx = this.getIndex(mDate, nMin)
+			let mIdx = this.getIndex(mDate, nMin);
-			let hIdx = this.getIndex(hDate, nHour)
+			let hIdx = this.getIndex(hDate, nHour);
-			let DIdx = this.getIndex(DDate, nDay)
+			let DIdx = this.getIndex(DDate, nDay);
-			let MIdx = this.getIndex(MDate, nMonth)
+			let MIdx = this.getIndex(MDate, nMonth);
-			let YIdx = this.getIndex(YDate, nYear)
+			let YIdx = this.getIndex(YDate, nYear);
 			// 重置月日时分秒的函数(后面用的比较多)
 			const resetSecond = function () {
-				sIdx = 0
+				sIdx = 0;
 				nSecond = sDate[sIdx]
 			}
 			const resetMin = function () {
-				mIdx = 0
+				mIdx = 0;
 				nMin = mDate[mIdx]
-				resetSecond()
+				resetSecond();
 			}
 			const resetHour = function () {
-				hIdx = 0
+				hIdx = 0;
 				nHour = hDate[hIdx]
-				resetMin()
+				resetMin();
 			}
 			const resetDay = function () {
-				DIdx = 0
+				DIdx = 0;
 				nDay = DDate[DIdx]
-				resetHour()
+				resetHour();
 			}
 			const resetMonth = function () {
-				MIdx = 0
+				MIdx = 0;
 				nMonth = MDate[MIdx]
-				resetDay()
+				resetDay();
 			}
 			// 如果当前年份不为数组中当前值
 			if (nYear !== YDate[YIdx]) {
-				resetMonth()
+				resetMonth();
 			}
 			// 如果当前月份不为数组中当前值
 			if (nMonth !== MDate[MIdx]) {
-				resetDay()
+				resetDay();
 			}
 			// 如果当前“日”不为数组中当前值
 			if (nDay !== DDate[DIdx]) {
-				resetHour()
+				resetHour();
 			}
 			// 如果当前“时”不为数组中当前值
 			if (nHour !== hDate[hIdx]) {
-				resetMin()
+				resetMin();
 			}
 			// 如果当前“分”不为数组中当前值
 			if (nMin !== mDate[mIdx]) {
-				resetSecond()
+				resetSecond();
 			}
 
 			// 循环年份数组
 			goYear: for (let Yi = YIdx; Yi < YDate.length; Yi++) {
-				let YY = YDate[Yi]
+				let YY = YDate[Yi];
 				// 如果到达最大值时
 				if (nMonth > MDate[MDate.length - 1]) {
-					resetMonth()
+					resetMonth();
-					continue
+					continue;
 				}
 				// 循环月份数组
 				goMonth: for (let Mi = MIdx; Mi < MDate.length; Mi++) {
 					// 赋值、方便后面运算
 					let MM = MDate[Mi];
-					MM = MM < 10 ? '0' + MM : MM
+					MM = MM < 10 ? '0' + MM : MM;
 					// 如果到达最大值时
 					if (nDay > DDate[DDate.length - 1]) {
-						resetDay()
+						resetDay();
 						if (Mi == MDate.length - 1) {
-							resetMonth()
+							resetMonth();
-							continue goYear
+							continue goYear;
 						}
-						continue
+						continue;
 					}
 					// 循环日期数组
 					goDay: for (let Di = DIdx; Di < DDate.length; Di++) {
 						// 赋值、方便后面运算
-						let DD = DDate[Di]
+						let DD = DDate[Di];
-						let thisDD = DD < 10 ? '0' + DD : DD
+						let thisDD = DD < 10 ? '0' + DD : DD;
 
 						// 如果到达最大值时
 						if (nHour > hDate[hDate.length - 1]) {
-							resetHour()
+							resetHour();
 							if (Di == DDate.length - 1) {
-								resetDay()
+								resetDay();
 								if (Mi == MDate.length - 1) {
-									resetMonth()
+									resetMonth();
-									continue goYear
+									continue goYear;
 								}
-								continue goMonth
+								continue goMonth;
 							}
-							continue
+							continue;
 						}
 
 						// 判断日期的合法性，不合法的话也是跳出当前循环
 						if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true && this.dayRule !== 'workDay' && this.dayRule !== 'lastWeek' && this.dayRule !== 'lastDay') {
-							resetDay()
+							resetDay();
-							continue goMonth
+							continue goMonth;
 						}
 						// 如果日期规则中有值时
 						if (this.dayRule == 'lastDay') {
@@ -163,83 +163,84 @@ export default {
 
 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD--
+									DD--;
-									thisDD = DD < 10 ? '0' + DD : DD
+
+									thisDD = DD < 10 ? '0' + DD : DD;
 								}
 							}
 						} else if (this.dayRule == 'workDay') {
 							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD--
+									DD--;
-									thisDD = DD < 10 ? '0' + DD : DD
+									thisDD = DD < 10 ? '0' + DD : DD;
 								}
 							}
 							// 获取达到条件的日期是星期X
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week')
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
 							// 当星期日时
 							if (thisWeek == 1) {
 								// 先找下一个日，并判断是否为月底
-								DD++
+								DD++;
-								thisDD = DD < 10 ? '0' + DD : DD
+								thisDD = DD < 10 ? '0' + DD : DD;
 								// 判断下一日已经不是合法日期
 								if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD -= 3
+									DD -= 3;
 								}
 							} else if (thisWeek == 7) {
 								// 当星期6时只需判断不是1号就可进行操作
 								if (this.dayRuleSup !== 1) {
-									DD--
+									DD--;
 								} else {
-									DD += 2
+									DD += 2;
 								}
 							}
 						} else if (this.dayRule == 'weekDay') {
 							// 如果指定了是星期几
 							// 获取当前日期是属于星期几
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week')
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
 							// 校验当前星期是否在星期池（dayRuleSup）中
 							if (this.dayRuleSup.indexOf(thisWeek) < 0) {
 								// 如果到达最大值时
 								if (Di == DDate.length - 1) {
-									resetDay()
+									resetDay();
 									if (Mi == MDate.length - 1) {
-										resetMonth()
+										resetMonth();
-										continue goYear
+										continue goYear;
 									}
-									continue goMonth
+									continue goMonth;
 								}
-								continue
+								continue;
 							}
 						} else if (this.dayRule == 'assWeek') {
 							// 如果指定了是第几周的星期几
 							// 获取每月1号是属于星期几
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week')
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + DD + ' 00:00:00'), 'week');
 							if (this.dayRuleSup[1] >= thisWeek) {
-								DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1
+								DD = (this.dayRuleSup[0] - 1) * 7 + this.dayRuleSup[1] - thisWeek + 1;
 							} else {
-								DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1
+								DD = this.dayRuleSup[0] * 7 + this.dayRuleSup[1] - thisWeek + 1;
 							}
 						} else if (this.dayRule == 'lastWeek') {
 							// 如果指定了每月最后一个星期几
 							// 校验并调整如果是2月30号这种日期传进来时需调整至正常月底
 							if (this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
 								while (DD > 0 && this.checkDate(YY + '-' + MM + '-' + thisDD + ' 00:00:00') !== true) {
-									DD--
+									DD--;
-									thisDD = DD < 10 ? '0' + DD : DD
+									thisDD = DD < 10 ? '0' + DD : DD;
 								}
 							}
 							// 获取月末最后一天是星期几
-							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week')
+							let thisWeek = this.formatDate(new Date(YY + '-' + MM + '-' + thisDD + ' 00:00:00'), 'week');
 							// 找到要求中最近的那个星期几
 							if (this.dayRuleSup < thisWeek) {
-								DD -= thisWeek - this.dayRuleSup
+								DD -= thisWeek - this.dayRuleSup;
 							} else if (this.dayRuleSup > thisWeek) {
 								DD -= 7 - (this.dayRuleSup - thisWeek)
 							}
 						}
 						// 判断时间值是否小于10置换成“05”这种格式
-						DD = DD < 10 ? '0' + DD : DD
+						DD = DD < 10 ? '0' + DD : DD;
 
 						// 循环“时”数组
 						goHour: for (let hi = hIdx; hi < hDate.length; hi++) {
@@ -247,76 +248,76 @@ export default {
 
 							// 如果到达最大值时
 							if (nMin > mDate[mDate.length - 1]) {
-								resetMin()
+								resetMin();
 								if (hi == hDate.length - 1) {
-									resetHour()
+									resetHour();
 									if (Di == DDate.length - 1) {
-										resetDay()
+										resetDay();
 										if (Mi == MDate.length - 1) {
-											resetMonth()
+											resetMonth();
-											continue goYear
+											continue goYear;
 										}
-										continue goMonth
+										continue goMonth;
 									}
-									continue goDay
+									continue goDay;
 								}
-								continue
+								continue;
 							}
 							// 循环"分"数组
 							goMin: for (let mi = mIdx; mi < mDate.length; mi++) {
-								let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi]
+								let mm = mDate[mi] < 10 ? '0' + mDate[mi] : mDate[mi];
 
 								// 如果到达最大值时
 								if (nSecond > sDate[sDate.length - 1]) {
-									resetSecond()
+									resetSecond();
 									if (mi == mDate.length - 1) {
-										resetMin()
+										resetMin();
 										if (hi == hDate.length - 1) {
-											resetHour()
+											resetHour();
 											if (Di == DDate.length - 1) {
-												resetDay()
+												resetDay();
 												if (Mi == MDate.length - 1) {
-													resetMonth()
+													resetMonth();
-													continue goYear
+													continue goYear;
 												}
-												continue goMonth
+												continue goMonth;
 											}
-											continue goDay
+											continue goDay;
 										}
-										continue goHour
+										continue goHour;
 									}
-									continue
+									continue;
 								}
 								// 循环"秒"数组
 								goSecond: for (let si = sIdx; si <= sDate.length - 1; si++) {
-									let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si]
+									let ss = sDate[si] < 10 ? '0' + sDate[si] : sDate[si];
 									// 添加当前时间（时间合法性在日期循环时已经判断）
 									if (MM !== '00' && DD !== '00') {
 										resultArr.push(YY + '-' + MM + '-' + DD + ' ' + hh + ':' + mm + ':' + ss)
-										nums++
+										nums++;
 									}
 									// 如果条数满了就退出循环
-									if (nums == 5) break goYear
+									if (nums == 5) break goYear;
 									// 如果到达最大值时
 									if (si == sDate.length - 1) {
-										resetSecond()
+										resetSecond();
 										if (mi == mDate.length - 1) {
-											resetMin()
+											resetMin();
 											if (hi == hDate.length - 1) {
-												resetHour()
+												resetHour();
 												if (Di == DDate.length - 1) {
-													resetDay()
+													resetDay();
 													if (Mi == MDate.length - 1) {
-														resetMonth()
+														resetMonth();
-														continue goYear
+														continue goYear;
 													}
-													continue goMonth
+													continue goMonth;
 												}
-												continue goDay
+												continue goDay;
 											}
-											continue goHour
+											continue goHour;
 										}
-										continue goMin
+										continue goMin;
 									}
 								} //goSecond
 							} //goMin
@@ -326,33 +327,33 @@ export default {
 			}
 			// 判断100年内的结果条数
 			if (resultArr.length == 0) {
-				this.resultList = ['没有达到条件的结果！']
+				this.resultList = ['没有达到条件的结果！'];
 			} else {
-				this.resultList = resultArr
+				this.resultList = resultArr;
 				if (resultArr.length !== 5) {
 					this.resultList.push('最近100年内只有上面' + resultArr.length + '条结果！')
 				}
 			}
 			// 计算完成-显示结果
-			this.isShow = true
+			this.isShow = true;
 
 
 		},
 		// 用于计算某位数字在数组中的索引
 		getIndex(arr, value) {
 			if (value <= arr[0] || value > arr[arr.length - 1]) {
-				return 0
+				return 0;
 			} else {
 				for (let i = 0; i < arr.length - 1; i++) {
 					if (value > arr[i] && value <= arr[i + 1]) {
-						return i + 1
+						return i + 1;
 					}
 				}
 			}
 		},
 		// 获取"年"数组
 		getYearArr(rule, year) {
-			this.dateArr[5] = this.getOrderArr(year, year + 100)
+			this.dateArr[5] = this.getOrderArr(year, year + 100);
 			if (rule !== undefined) {
 				if (rule.indexOf('-') >= 0) {
 					this.dateArr[5] = this.getCycleArr(rule, year + 100, false)
@@ -365,7 +366,7 @@ export default {
 		},
 		// 获取"月"数组
 		getMonthArr(rule) {
-			this.dateArr[4] = this.getOrderArr(1, 12)
+			this.dateArr[4] = this.getOrderArr(1, 12);
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[4] = this.getCycleArr(rule, 12, false)
 			} else if (rule.indexOf('/') >= 0) {
@@ -379,58 +380,58 @@ export default {
 			// 只有当日期规则的两个值均为“”时则表达日期是有选项的
 			if (this.dayRule == '' && this.dayRuleSup == '') {
 				if (rule.indexOf('-') >= 0) {
-					this.dayRule = 'weekDay'
+					this.dayRule = 'weekDay';
 					this.dayRuleSup = this.getCycleArr(rule, 7, false)
 				} else if (rule.indexOf('#') >= 0) {
-					this.dayRule = 'assWeek'
+					this.dayRule = 'assWeek';
-					let matchRule = rule.match(/[0-9]{1}/g)
+					let matchRule = rule.match(/[0-9]{1}/g);
-					this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])]
+					this.dayRuleSup = [Number(matchRule[1]), Number(matchRule[0])];
-					this.dateArr[3] = [1]
+					this.dateArr[3] = [1];
 					if (this.dayRuleSup[1] == 7) {
-						this.dayRuleSup[1] = 0
+						this.dayRuleSup[1] = 0;
 					}
 				} else if (rule.indexOf('L') >= 0) {
-					this.dayRule = 'lastWeek'
+					this.dayRule = 'lastWeek';
-					this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0])
+					this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
-					this.dateArr[3] = [31]
+					this.dateArr[3] = [31];
 					if (this.dayRuleSup == 7) {
-						this.dayRuleSup = 0
+						this.dayRuleSup = 0;
 					}
 				} else if (rule !== '*' && rule !== '?') {
-					this.dayRule = 'weekDay'
+					this.dayRule = 'weekDay';
 					this.dayRuleSup = this.getAssignArr(rule)
 				}
 			}
 		},
 		// 获取"日"数组-少量为日期规则
 		getDayArr(rule) {
-			this.dateArr[3] = this.getOrderArr(1, 31)
+			this.dateArr[3] = this.getOrderArr(1, 31);
-			this.dayRule = ''
+			this.dayRule = '';
-			this.dayRuleSup = ''
+			this.dayRuleSup = '';
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[3] = this.getCycleArr(rule, 31, false)
-				this.dayRuleSup = 'null'
+				this.dayRuleSup = 'null';
 			} else if (rule.indexOf('/') >= 0) {
 				this.dateArr[3] = this.getAverageArr(rule, 31)
-				this.dayRuleSup = 'null'
+				this.dayRuleSup = 'null';
 			} else if (rule.indexOf('W') >= 0) {
-				this.dayRule = 'workDay'
+				this.dayRule = 'workDay';
-				this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0])
+				this.dayRuleSup = Number(rule.match(/[0-9]{1,2}/g)[0]);
-				this.dateArr[3] = [this.dayRuleSup]
+				this.dateArr[3] = [this.dayRuleSup];
 			} else if (rule.indexOf('L') >= 0) {
-				this.dayRule = 'lastDay'
+				this.dayRule = 'lastDay';
-				this.dayRuleSup = 'null'
+				this.dayRuleSup = 'null';
-				this.dateArr[3] = [31]
+				this.dateArr[3] = [31];
 			} else if (rule !== '*' && rule !== '?') {
 				this.dateArr[3] = this.getAssignArr(rule)
-				this.dayRuleSup = 'null'
+				this.dayRuleSup = 'null';
 			} else if (rule == '*') {
-				this.dayRuleSup = 'null'
+				this.dayRuleSup = 'null';
 			}
 		},
 		// 获取"时"数组
 		getHourArr(rule) {
-			this.dateArr[2] = this.getOrderArr(0, 23)
+			this.dateArr[2] = this.getOrderArr(0, 23);
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[2] = this.getCycleArr(rule, 24, true)
 			} else if (rule.indexOf('/') >= 0) {
@@ -441,7 +442,7 @@ export default {
 		},
 		// 获取"分"数组
 		getMinArr(rule) {
-			this.dateArr[1] = this.getOrderArr(0, 59)
+			this.dateArr[1] = this.getOrderArr(0, 59);
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[1] = this.getCycleArr(rule, 60, true)
 			} else if (rule.indexOf('/') >= 0) {
@@ -452,7 +453,7 @@ export default {
 		},
 		// 获取"秒"数组
 		getSecondArr(rule) {
-			this.dateArr[0] = this.getOrderArr(0, 59)
+			this.dateArr[0] = this.getOrderArr(0, 59);
 			if (rule.indexOf('-') >= 0) {
 				this.dateArr[0] = this.getCycleArr(rule, 60, true)
 			} else if (rule.indexOf('/') >= 0) {
@@ -463,86 +464,86 @@ export default {
 		},
 		// 根据传进来的min-max返回一个顺序的数组
 		getOrderArr(min, max) {
-			let arr = []
+			let arr = [];
 			for (let i = min; i <= max; i++) {
-				arr.push(i)
+				arr.push(i);
 			}
-			return arr
+			return arr;
 		},
 		// 根据规则中指定的零散值返回一个数组
 		getAssignArr(rule) {
-			let arr = []
+			let arr = [];
-			let assiginArr = rule.split(',')
+			let assiginArr = rule.split(',');
 			for (let i = 0; i < assiginArr.length; i++) {
 				arr[i] = Number(assiginArr[i])
 			}
 			arr.sort(this.compare)
-			return arr
+			return arr;
 		},
 		// 根据一定算术规则计算返回一个数组
 		getAverageArr(rule, limit) {
-			let arr = []
+			let arr = [];
-			let agArr = rule.split('/')
+			let agArr = rule.split('/');
-			let min = Number(agArr[0])
+			let min = Number(agArr[0]);
-			let step = Number(agArr[1])
+			let step = Number(agArr[1]);
 			while (min <= limit) {
-				arr.push(min)
+				arr.push(min);
-				min += step
+				min += step;
 			}
-			return arr
+			return arr;
 		},
 		// 根据规则返回一个具有周期性的数组
 		getCycleArr(rule, limit, status) {
 			// status--表示是否从0开始（则从1开始）
-			let arr = []
+			let arr = [];
-			let cycleArr = rule.split('-')
+			let cycleArr = rule.split('-');
-			let min = Number(cycleArr[0])
+			let min = Number(cycleArr[0]);
-			let max = Number(cycleArr[1])
+			let max = Number(cycleArr[1]);
 			if (min > max) {
-				max += limit
+				max += limit;
 			}
 			for (let i = min; i <= max; i++) {
-				let add = 0
+				let add = 0;
 				if (status == false && i % limit == 0) {
-					add = limit
+					add = limit;
 				}
 				arr.push(Math.round(i % limit + add))
 			}
 			arr.sort(this.compare)
-			return arr
+			return arr;
 		},
 		// 比较数字大小（用于Array.sort）
 		compare(value1, value2) {
 			if (value2 - value1 > 0) {
-				return -1
+				return -1;
 			} else {
-				return 1
+				return 1;
 			}
 		},
 		// 格式化日期格式如：2017-9-19 18:04:33
 		formatDate(value, type) {
 			// 计算日期相关值
-			let time = typeof value == 'number' ? new Date(value) : value
+			let time = typeof value == 'number' ? new Date(value) : value;
-			let Y = time.getFullYear()
+			let Y = time.getFullYear();
-			let M = time.getMonth() + 1
+			let M = time.getMonth() + 1;
-			let D = time.getDate()
+			let D = time.getDate();
-			let h = time.getHours()
+			let h = time.getHours();
-			let m = time.getMinutes()
+			let m = time.getMinutes();
-			let s = time.getSeconds()
+			let s = time.getSeconds();
-			let week = time.getDay()
+			let week = time.getDay();
 			// 如果传递了type的话
 			if (type == undefined) {
-				return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s)
+				return Y + '-' + (M < 10 ? '0' + M : M) + '-' + (D < 10 ? '0' + D : D) + ' ' + (h < 10 ? '0' + h : h) + ':' + (m < 10 ? '0' + m : m) + ':' + (s < 10 ? '0' + s : s);
 			} else if (type == 'week') {
 				// 在quartz中 1为星期日
-				return week + 1
+				return week + 1;
 			}
 		},
 		// 检查日期是否存在
 		checkDate(value) {
-			let time = new Date(value)
+			let time = new Date(value);
 			let format = this.formatDate(time)
-			return value === format
+			return value === format;
 		}
 	},
 	watch: {
@@ -551,7 +552,7 @@ export default {
 	props: ['ex'],
 	mounted: function () {
 		// 初始化 获取一次结果
-		this.expressionChange()
+		this.expressionChange();
 	}
 }
 

ruoyi-ui/src/components/Crontab/second.vue

@@ -53,35 +53,35 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'second', '*', 'second')
+					this.$emit('update', 'second', '*', 'second');
-					break
+					break;
 				case 2:
-					this.$emit('update', 'second', this.cycleTotal)
+					this.$emit('update', 'second', this.cycleTotal);
-					break
+					break;
 				case 3:
-					this.$emit('update', 'second', this.averageTotal)
+					this.$emit('update', 'second', this.averageTotal);
-					break
+					break;
 				case 4:
-					this.$emit('update', 'second', this.checkboxString)
+					this.$emit('update', 'second', this.checkboxString);
-					break
+					break;
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '2') {
-				this.$emit('update', 'second', this.cycleTotal)
+				this.$emit('update', 'second', this.cycleTotal);
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'second', this.averageTotal)
+				this.$emit('update', 'second', this.averageTotal);
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'second', this.checkboxString)
+				this.$emit('update', 'second', this.checkboxString);
 			}
 		}
 	},
@@ -99,18 +99,18 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, 0, 58)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : 1, 59)
-			return cycle01 + '-' + cycle02
+			return cycle01 + '-' + cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, 0, 58)
 			const average02 = this.checkNum(this.average02, 1, 59 - average01 || 0)
-			return average01 + '/' + average02
+			return average01 + '/' + average02;
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join()
+			let str = this.checkboxList.join();
-			return str == '' ? '*' : str
+			return str == '' ? '*' : str;
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/week.vue

@@ -118,52 +118,52 @@ export default {
 		// 单选按钮值变化时
 		radioChange() {
 			if (this.radioValue !== 2 && this.cron.day !== '?') {
-				this.$emit('update', 'day', '?', 'week')
+				this.$emit('update', 'day', '?', 'week');
 			}
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'week', '*')
+					this.$emit('update', 'week', '*');
-					break
+					break;
 				case 2:
-					this.$emit('update', 'week', '?')
+					this.$emit('update', 'week', '?');
-					break
+					break;
 				case 3:
-					this.$emit('update', 'week', this.cycleTotal)
+					this.$emit('update', 'week', this.cycleTotal);
-					break
+					break;
 				case 4:
-					this.$emit('update', 'week', this.averageTotal)
+					this.$emit('update', 'week', this.averageTotal);
-					break
+					break;
 				case 5:
-					this.$emit('update', 'week', this.weekdayCheck + 'L')
+					this.$emit('update', 'week', this.weekdayCheck + 'L');
-					break
+					break;
 				case 6:
-					this.$emit('update', 'week', this.checkboxString)
+					this.$emit('update', 'week', this.checkboxString);
-					break
+					break;
 			}
 		},
 
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'week', this.cycleTotal)
+				this.$emit('update', 'week', this.cycleTotal);
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'week', this.averageTotal)
+				this.$emit('update', 'week', this.averageTotal);
 			}
 		},
 		// 最近工作日值变化时
 		weekdayChange() {
 			if (this.radioValue == '5') {
-				this.$emit('update', 'week', this.weekday + 'L')
+				this.$emit('update', 'week', this.weekday + 'L');
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '6') {
-				this.$emit('update', 'week', this.checkboxString)
+				this.$emit('update', 'week', this.checkboxString);
 			}
 		},
 	},
@@ -179,23 +179,23 @@ export default {
 		cycleTotal: function () {
 			this.cycle01 = this.checkNum(this.cycle01, 1, 7)
 			this.cycle02 = this.checkNum(this.cycle02, 1, 7)
-			return this.cycle01 + '-' + this.cycle02
+			return this.cycle01 + '-' + this.cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			this.average01 = this.checkNum(this.average01, 1, 4)
 			this.average02 = this.checkNum(this.average02, 1, 7)
-			return this.average02 + '#' + this.average01
+			return this.average02 + '#' + this.average01;
 		},
 		// 最近的工作日（格式）
 		weekdayCheck: function () {
 			this.weekday = this.checkNum(this.weekday, 1, 7)
-			return this.weekday
+			return this.weekday;
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join()
+			let str = this.checkboxList.join();
-			return str == '' ? '*' : str
+			return str == '' ? '*' : str;
 		}
 	}
 }

ruoyi-ui/src/components/Crontab/year.vue

@@ -61,38 +61,38 @@ export default {
 		radioChange() {
 			switch (this.radioValue) {
 				case 1:
-					this.$emit('update', 'year', '')
+					this.$emit('update', 'year', '');
-					break
+					break;
 				case 2:
-					this.$emit('update', 'year', '*')
+					this.$emit('update', 'year', '*');
-					break
+					break;
 				case 3:
-					this.$emit('update', 'year', this.cycleTotal)
+					this.$emit('update', 'year', this.cycleTotal);
-					break
+					break;
 				case 4:
-					this.$emit('update', 'year', this.averageTotal)
+					this.$emit('update', 'year', this.averageTotal);
-					break
+					break;
 				case 5:
-					this.$emit('update', 'year', this.checkboxString)
+					this.$emit('update', 'year', this.checkboxString);
-					break
+					break;
 			}
 		},
 		// 周期两个值变化时
 		cycleChange() {
 			if (this.radioValue == '3') {
-				this.$emit('update', 'year', this.cycleTotal)
+				this.$emit('update', 'year', this.cycleTotal);
 			}
 		},
 		// 平均两个值变化时
 		averageChange() {
 			if (this.radioValue == '4') {
-				this.$emit('update', 'year', this.averageTotal)
+				this.$emit('update', 'year', this.averageTotal);
 			}
 		},
 		// checkbox值变化时
 		checkboxChange() {
 			if (this.radioValue == '5') {
-				this.$emit('update', 'year', this.checkboxString)
+				this.$emit('update', 'year', this.checkboxString);
 			}
 		}
 	},
@@ -107,23 +107,23 @@ export default {
 		cycleTotal: function () {
 			const cycle01 = this.checkNum(this.cycle01, this.fullYear, 2098)
 			const cycle02 = this.checkNum(this.cycle02, cycle01 ? cycle01 + 1 : this.fullYear + 1, 2099)
-			return cycle01 + '-' + cycle02
+			return cycle01 + '-' + cycle02;
 		},
 		// 计算平均用到的值
 		averageTotal: function () {
 			const average01 = this.checkNum(this.average01, this.fullYear, 2098)
 			const average02 = this.checkNum(this.average02, 1, 2099 - average01 || this.fullYear)
-			return average01 + '/' + average02
+			return average01 + '/' + average02;
 		},
 		// 计算勾选的checkbox值合集
 		checkboxString: function () {
-			let str = this.checkboxList.join()
+			let str = this.checkboxList.join();
-			return str
+			return str;
 		}
 	},
 	mounted: function () {
 		// 仅获取当前年份
-		this.fullYear = Number(new Date().getFullYear())
+		this.fullYear = Number(new Date().getFullYear());
 		this.cycle01 = this.fullYear
 		this.average01 = this.fullYear
 	}

ruoyi-ui/src/components/DictTag/index.vue

@@ -74,13 +74,13 @@ export default {
   },
   filters: {
     handleArray(array) {
-      if (array.length === 0) return ''
+      if (array.length === 0) return '';
       return array.reduce((pre, cur) => {
-        return pre + ' ' + cur
+        return pre + ' ' + cur;
       })
     },
   }
-}
+};
 </script>
 <style scoped>
 .el-tag + .el-tag {

ruoyi-ui/src/components/Editor/index.vue

@@ -18,12 +18,11 @@
 </template>
 
 <script>
-import axios from "axios"
+import Quill from "quill";
-import Quill from "quill"
+import "quill/dist/quill.core.css";
-import "quill/dist/quill.core.css"
+import "quill/dist/quill.snow.css";
-import "quill/dist/quill.snow.css"
+import "quill/dist/quill.bubble.css";
-import "quill/dist/quill.bubble.css"
+import { getToken } from "@/utils/auth";
-import { getToken } from "@/utils/auth"
 
 export default {
   name: "Editor",
@@ -89,27 +88,27 @@ export default {
         placeholder: "请输入内容",
         readOnly: this.readOnly,
       },
-    }
+    };
   },
   computed: {
     styles() {
-      let style = {}
+      let style = {};
       if (this.minHeight) {
-        style.minHeight = `${this.minHeight}px`
+        style.minHeight = `${this.minHeight}px`;
       }
       if (this.height) {
-        style.height = `${this.height}px`
+        style.height = `${this.height}px`;
-      }
-      return style
       }
+      return style;
+    },
   },
   watch: {
     value: {
       handler(val) {
         if (val !== this.currentValue) {
-          this.currentValue = val === null ? "" : val
+          this.currentValue = val === null ? "" : val;
           if (this.Quill) {
-            this.Quill.clipboard.dangerouslyPasteHTML(this.currentValue)
+            this.Quill.pasteHTML(this.currentValue);
           }
         }
       },
@@ -117,106 +116,84 @@ export default {
     },
   },
   mounted() {
-    this.init()
+    this.init();
   },
   beforeDestroy() {
-    this.Quill = null
+    this.Quill = null;
   },
   methods: {
     init() {
-      const editor = this.$refs.editor
+      const editor = this.$refs.editor;
-      this.Quill = new Quill(editor, this.options)
+      this.Quill = new Quill(editor, this.options);
       // 如果设置了上传地址则自定义图片上传事件
       if (this.type == 'url') {
-        let toolbar = this.Quill.getModule("toolbar")
+        let toolbar = this.Quill.getModule("toolbar");
         toolbar.addHandler("image", (value) => {
           if (value) {
-            this.$refs.upload.$children[0].$refs.input.click()
+            this.$refs.upload.$children[0].$refs.input.click();
           } else {
-            this.quill.format("image", false)
+            this.quill.format("image", false);
           }
-        })
+        });
-        this.Quill.root.addEventListener('paste', this.handlePasteCapture, true)
       }
-      this.Quill.clipboard.dangerouslyPasteHTML(this.currentValue)
+      this.Quill.pasteHTML(this.currentValue);
       this.Quill.on("text-change", (delta, oldDelta, source) => {
-        const html = this.$refs.editor.children[0].innerHTML
+        const html = this.$refs.editor.children[0].innerHTML;
-        const text = this.Quill.getText()
+        const text = this.Quill.getText();
-        const quill = this.Quill
+        const quill = this.Quill;
-        this.currentValue = html
+        this.currentValue = html;
-        this.$emit("input", html)
+        this.$emit("input", html);
-        this.$emit("on-change", { html, text, quill })
+        this.$emit("on-change", { html, text, quill });
-      })
+      });
       this.Quill.on("text-change", (delta, oldDelta, source) => {
-        this.$emit("on-text-change", delta, oldDelta, source)
+        this.$emit("on-text-change", delta, oldDelta, source);
-      })
+      });
       this.Quill.on("selection-change", (range, oldRange, source) => {
-        this.$emit("on-selection-change", range, oldRange, source)
+        this.$emit("on-selection-change", range, oldRange, source);
-      })
+      });
       this.Quill.on("editor-change", (eventName, ...args) => {
-        this.$emit("on-editor-change", eventName, ...args)
+        this.$emit("on-editor-change", eventName, ...args);
-      })
+      });
     },
     // 上传前校检格式和大小
     handleBeforeUpload(file) {
-      const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"]
+      const type = ["image/jpeg", "image/jpg", "image/png", "image/svg"];
-      const isJPG = type.includes(file.type)
+      const isJPG = type.includes(file.type);
       // 检验文件格式
       if (!isJPG) {
-        this.$message.error(`图片格式错误!`)
+        this.$message.error(`图片格式错误!`);
-        return false
+        return false;
       }
       // 校检文件大小
       if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
         if (!isLt) {
-          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`)
+          this.$message.error(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false
+          return false;
         }
       }
-      return true
+      return true;
     },
     handleUploadSuccess(res, file) {
       // 如果上传成功
       if (res.code == 200) {
         // 获取富文本组件实例
-        let quill = this.Quill
+        let quill = this.Quill;
         // 获取光标所在位置
-        let length = quill.getSelection().index
+        let length = quill.getSelection().index;
         // 插入图片  res.url为服务器返回的图片地址
-        quill.insertEmbed(length, "image", res.data.url)
+        quill.insertEmbed(length, "image", res.data.url);
         // 调整光标到最后
-        quill.setSelection(length + 1)
+        quill.setSelection(length + 1);
       } else {
-        this.$message.error("图片插入失败")
+        this.$message.error("图片插入失败");
       }
     },
     handleUploadError() {
-      this.$message.error("图片插入失败")
+      this.$message.error("图片插入失败");
     },
-    // 复制粘贴图片处理
-    handlePasteCapture(e) {
-      const clipboard = e.clipboardData || window.clipboardData
-      if (clipboard && clipboard.items) {
-        for (let i = 0; i < clipboard.items.length; i++) {
-          const item = clipboard.items[i]
-          if (item.type.indexOf('image') !== -1) {
-            e.preventDefault()
-            const file = item.getAsFile()
-            this.insertImage(file)
-          }
-        }
-      }
   },
-    insertImage(file) {
+};
-      const formData = new FormData()
-      formData.append("file", file)
-      axios.post(this.uploadUrl, formData, { headers: { "Content-Type": "multipart/form-data", Authorization: this.headers.Authorization } }).then(res => {
-        this.handleUploadSuccess(res.data)
-      })
-    }
-  }
-}
 </script>
 
 <style>

ruoyi-ui/src/components/FileUpload/index.vue

@@ -5,7 +5,6 @@
       :action="uploadFileUrl"
       :before-upload="handleBeforeUpload"
       :file-list="fileList"
-      :data="data"
       :limit="limit"
       :on-error="handleUploadError"
       :on-exceed="handleExceed"
@@ -14,7 +13,6 @@
       :headers="headers"
       class="upload-file-uploader"
       ref="fileUpload"
-      v-if="!disabled"
     >
       <!-- 上传按钮 -->
       <el-button size="mini" type="primary">选取文件</el-button>
@@ -28,13 +26,13 @@
     </el-upload>
 
     <!-- 文件列表 -->
-    <transition-group ref="uploadFileList" class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
+    <transition-group class="upload-file-list el-upload-list el-upload-list--text" name="el-fade-in-linear" tag="ul">
       <li :key="file.url" class="el-upload-list__item ele-upload-list__item-content" v-for="(file, index) in fileList">
         <el-link :href="file.url" :underline="false" target="_blank">
           <span class="el-icon-document"> {{ getFileName(file.name) }} </span>
         </el-link>
         <div class="ele-upload-list__item-content-action">
-          <el-link :underline="false" @click="handleDelete(index)" type="danger" v-if="!disabled">删除</el-link>
+          <el-link :underline="false" @click="handleDelete(index)" type="danger">删除</el-link>
         </div>
       </li>
     </transition-group>
@@ -42,98 +40,63 @@
 </template>
 
 <script>
-import { getToken } from "@/utils/auth"
+import { getToken } from "@/utils/auth";
-import Sortable from 'sortablejs'
 
 export default {
   name: "FileUpload",
   props: {
     // 值
     value: [String, Object, Array],
-    // 上传接口地址
-    action: {
-      type: String,
-      default: "/file/upload"
-    },
-    // 上传携带的参数
-    data: {
-      type: Object
-    },
     // 数量限制
     limit: {
       type: Number,
-      default: 5
+      default: 5,
     },
     // 大小限制(MB)
     fileSize: {
       type: Number,
-      default: 5
+      default: 5,
     },
     // 文件类型, 例如['png', 'jpg', 'jpeg']
     fileType: {
       type: Array,
-      default: () => ["doc", "docx", "xls", "xlsx", "ppt", "pptx", "txt", "pdf"]
+      default: () => ["doc", "xls", "ppt", "txt", "pdf"],
     },
     // 是否显示提示
     isShowTip: {
       type: Boolean,
       default: true
-    },
-    // 禁用组件（仅查看文件）
-    disabled: {
-      type: Boolean,
-      default: false
-    },
-    // 拖动排序
-    drag: {
-      type: Boolean,
-      default: true
     }
   },
   data() {
     return {
       number: 0,
       uploadList: [],
-      uploadFileUrl: process.env.VUE_APP_BASE_API + this.action, // 上传文件服务器地址
+      uploadFileUrl: process.env.VUE_APP_BASE_API + "/file/upload", // 上传文件服务器地址
       headers: {
         Authorization: "Bearer " + getToken(),
       },
-      fileList: []
+      fileList: [],
-    }
+    };
-  },
-  mounted() {
-    if (this.drag && !this.disabled) {
-      this.$nextTick(() => {
-        const element = this.$refs.uploadFileList?.$el || this.$refs.uploadFileList
-        Sortable.create(element, {
-          ghostClass: 'file-upload-darg',
-          onEnd: (evt) => {
-            const movedItem = this.fileList.splice(evt.oldIndex, 1)[0]
-            this.fileList.splice(evt.newIndex, 0, movedItem)
-            this.$emit("input", this.listToString(this.fileList))
-          }
-        })
-      })
-    }
   },
   watch: {
     value: {
       handler(val) {
         if (val) {
-          let temp = 1
+          let temp = 1;
           // 首先将值转为数组
-          const list = Array.isArray(val) ? val : this.value.split(',')
+          const list = Array.isArray(val) ? val : this.value.split(',');
           // 然后将数组转为对象数组
           this.fileList = list.map(item => {
             if (typeof item === "string") {
-              item = { name: item, url: item }
+              item = { name: item, url: item };
             }
-            item.uid = item.uid || new Date().getTime() + temp++
+            item.uid = item.uid || new Date().getTime() + temp++;
-            return item
+            return item;
-          })
+          });
         } else {
-          this.fileList = []
+          this.fileList = [];
-          return []
+          return [];
         }
       },
       deep: true,
@@ -143,7 +106,7 @@ export default {
   computed: {
     // 是否显示提示
     showTip() {
-      return this.isShowTip && (this.fileType || this.fileSize)
+      return this.isShowTip && (this.fileType || this.fileSize);
     },
   },
   methods: {
@@ -151,95 +114,86 @@ export default {
     handleBeforeUpload(file) {
       // 校检文件类型
       if (this.fileType) {
-        const fileName = file.name.split('.')
+        const fileName = file.name.split('.');
-        const fileExt = fileName[fileName.length - 1]
+        const fileExt = fileName[fileName.length - 1];
-        const isTypeOk = this.fileType.indexOf(fileExt) >= 0
+        const isTypeOk = this.fileType.indexOf(fileExt) >= 0;
         if (!isTypeOk) {
-          this.$modal.msgError(`文件格式不正确，请上传${this.fileType.join("/")}格式文件!`)
+          this.$modal.msgError(`文件格式不正确, 请上传${this.fileType.join("/")}格式文件!`);
-          return false
+          return false;
         }
       }
-      // 校检文件名是否包含特殊字符
-      if (file.name.includes(',')) {
-        this.$modal.msgError('文件名不正确，不能包含英文逗号!')
-        return false
-      }
       // 校检文件大小
       if (this.fileSize) {
-        const isLt = file.size / 1024 / 1024 < this.fileSize
+        const isLt = file.size / 1024 / 1024 < this.fileSize;
         if (!isLt) {
-          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`)
+          this.$modal.msgError(`上传文件大小不能超过 ${this.fileSize} MB!`);
-          return false
+          return false;
         }
       }
-      this.$modal.loading("正在上传文件，请稍候...")
+      this.$modal.loading("正在上传文件，请稍候...");
-      this.number++
+      this.number++;
-      return true
+      return true;
     },
     // 文件个数超出
     handleExceed() {
-      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`)
+      this.$modal.msgError(`上传文件数量不能超过 ${this.limit} 个!`);
     },
     // 上传失败
     handleUploadError(err) {
-      this.$modal.msgError("上传文件失败，请重试")
+      this.$modal.msgError("上传文件失败，请重试");
       this.$modal.closeLoading()
     },
     // 上传成功回调
     handleUploadSuccess(res, file) {
       if (res.code === 200) {
-        this.uploadList.push({ name: res.data.url, url: res.data.url })
+        this.uploadList.push({ name: res.data.url, url: res.data.url });
-        this.uploadedSuccessfully()
+        this.uploadedSuccessfully();
       } else {
-        this.number--
+        this.number--;
-        this.$modal.closeLoading()
+        this.$modal.closeLoading();
-        this.$modal.msgError(res.msg)
+        this.$modal.msgError(res.msg);
-        this.$refs.fileUpload.handleRemove(file)
+        this.$refs.fileUpload.handleRemove(file);
-        this.uploadedSuccessfully()
+        this.uploadedSuccessfully();
       }
     },
     // 删除文件
     handleDelete(index) {
-      this.fileList.splice(index, 1)
+      this.fileList.splice(index, 1);
-      this.$emit("input", this.listToString(this.fileList))
+      this.$emit("input", this.listToString(this.fileList));
     },
     // 上传结束处理
     uploadedSuccessfully() {
       if (this.number > 0 && this.uploadList.length === this.number) {
-        this.fileList = this.fileList.concat(this.uploadList)
+        this.fileList = this.fileList.concat(this.uploadList);
-        this.uploadList = []
+        this.uploadList = [];
-        this.number = 0
+        this.number = 0;
-        this.$emit("input", this.listToString(this.fileList))
+        this.$emit("input", this.listToString(this.fileList));
-        this.$modal.closeLoading()
+        this.$modal.closeLoading();
       }
     },
     // 获取文件名称
     getFileName(name) {
       // 如果是url那么取最后的名字 如果不是直接返回
       if (name.lastIndexOf("/") > -1) {
-        return name.slice(name.lastIndexOf("/") + 1)
+        return name.slice(name.lastIndexOf("/") + 1);
       } else {
-        return name
+        return name;
       }
     },
     // 对象转成指定字符串分隔
     listToString(list, separator) {
-      let strs = ""
+      let strs = "";
-      separator = separator || ","
+      separator = separator || ",";
       for (let i in list) {
-        strs += list[i].url + separator
+        strs += list[i].url + separator;
       }
-      return strs != '' ? strs.substr(0, strs.length - 1) : ''
+      return strs != '' ? strs.substr(0, strs.length - 1) : '';
     }
   }
-}
+};
 </script>
 
 <style scoped lang="scss">
-.file-upload-darg {
-  opacity: 0.5;
-  background: #c8ebfb;
-}
 .upload-file-uploader {
   margin-bottom: 5px;
 }

ruoyi-ui/src/components/HeaderSearch/index.vue

@@ -1,52 +1,27 @@
 <template>
-  <div class="header-search">
+  <div :class="{'show':show}" class="header-search">
     <svg-icon class-name="search-icon" icon-class="search" @click.stop="click" />
-    <el-dialog
+    <el-select
-      :visible.sync="show"
+      ref="headerSearchSelect"
-      width="600px"
-      @close="close"
-      :show-close="false"
-      append-to-body
-    >
-      <el-input
       v-model="search"
-        ref="headerSearchSelectRef"
+      :remote-method="querySearch"
-        size="large"
+      filterable
-        @input="querySearch"
+      default-first-option
-        prefix-icon="el-icon-search"
+      remote
-        placeholder="菜单搜索，支持标题、URL模糊查询"
+      placeholder="Search"
-        clearable
+      class="header-search-select"
-        @keyup.enter.native="selectActiveResult"
+      @change="change"
-        @keydown.up.native="navigateResult('up')"
-        @keydown.down.native="navigateResult('down')"
     >
-      </el-input>
+      <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
-      <el-scrollbar wrap-class="right-scrollbar-wrapper">
+    </el-select>
-        <div class="result-wrap">
-          <div class="search-item" v-for="(item, index) in options" :key="item.path" :style="activeStyle(index)" @mouseenter="activeIndex = index" @mouseleave="activeIndex = -1">
-            <div class="left">
-              <svg-icon class="menu-icon" :icon-class="item.icon" />
-            </div>
-            <div class="search-info" @click="change(item)">
-              <div class="menu-title">
-                {{ item.title.join(" / ") }}
-              </div>
-              <div class="menu-path">
-                {{ item.path }}
-              </div>
-            </div>
-            <svg-icon icon-class="enter" v-show="index === activeIndex"/>
-          </div>
-       </div>
-      </el-scrollbar>
-    </el-dialog>
   </div>
 </template>
 
 <script>
+// fuse is a lightweight fuzzy-search module
+// make search results more in line with expectations
 import Fuse from 'fuse.js/dist/fuse.min.js'
 import path from 'path'
-import { isHttp } from '@/utils/validate'
 
 export default {
   name: 'HeaderSearch',
@@ -55,17 +30,13 @@ export default {
       search: '',
       options: [],
       searchPool: [],
-      activeIndex: -1,
       show: false,
       fuse: undefined
     }
   },
   computed: {
-    theme() {
-      return this.$store.state.settings.theme
-    },
     routes() {
-      return this.$store.getters.defaultRoutes
+      return this.$store.getters.permission_routes
     }
   },
   watch: {
@@ -74,6 +45,13 @@ export default {
     },
     searchPool(list) {
       this.initFuse(list)
+    },
+    show(value) {
+      if (value) {
+        document.body.addEventListener('click', this.close)
+      } else {
+        document.body.removeEventListener('click', this.close)
+      }
     }
   },
   mounted() {
@@ -84,26 +62,23 @@ export default {
       this.show = !this.show
       if (this.show) {
         this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.focus()
-        this.options = this.searchPool
       }
     },
     close() {
       this.$refs.headerSearchSelect && this.$refs.headerSearchSelect.blur()
-      this.search = ''
       this.options = []
       this.show = false
-      this.activeIndex = -1
     },
     change(val) {
-      const path = val.path
+      const path = val.path;
-      const query = val.query
+      const query = val.query;
-      if(isHttp(val.path)) {
+      if(this.ishttp(val.path)) {
         // http(s):// 路径新窗口打开
-        const pindex = path.indexOf("http")
+        const pindex = path.indexOf("http");
-        window.open(path.substr(pindex, path.length), "_blank")
+        window.open(path.substr(pindex, path.length), "_blank");
       } else {
         if (query) {
-          this.$router.push({ path: path, query: JSON.parse(query) })
+          this.$router.push({ path: path, query: JSON.parse(query) });
         } else {
           this.$router.push(path)
         }
@@ -140,14 +115,12 @@ export default {
         if (router.hidden) { continue }
 
         const data = {
-          path: !isHttp(router.path) ? path.resolve(basePath, router.path) : router.path,
+          path: !this.ishttp(router.path) ? path.resolve(basePath, router.path) : router.path,
-          title: [...prefixTitle],
+          title: [...prefixTitle]
-          icon: ''
         }
 
         if (router.meta && router.meta.title) {
           data.title = [...data.title, router.meta.title]
-          data.icon = router.meta.icon
 
           if (router.redirect !== 'noRedirect') {
             // only push the routes with title
@@ -171,94 +144,55 @@ export default {
       return res
     },
     querySearch(query) {
-      this.activeIndex = -1
       if (query !== '') {
-        this.options = this.fuse.search(query).map((item) => item.item) ?? this.searchPool
+        this.options = this.fuse.search(query)
       } else {
-        this.options = this.searchPool
+        this.options = []
       }
     },
-    activeStyle(index) {
+    ishttp(url) {
-      if (index !== this.activeIndex) return {}
+      return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1
-      return {
-        "background-color": this.theme,
-        "color": "#fff"
-      }
-    },
-    navigateResult(direction) {
-      if (direction === "up") {
-        this.activeIndex = this.activeIndex <= 0 ? this.options.length - 1 : this.activeIndex - 1
-      } else if (direction === "down") {
-        this.activeIndex = this.activeIndex >= this.options.length - 1 ? 0 : this.activeIndex + 1
-      }
-    },
-    selectActiveResult() {
-      if (this.options.length > 0 && this.activeIndex >= 0) {
-        this.change(this.options[this.activeIndex])
-      }
     }
   }
 }
 </script>
 
-<style lang='scss' scoped>
+<style lang="scss" scoped>
-::v-deep {
-  .el-dialog__header {
-    padding: 0 !important;
-  }
-}
-
 .header-search {
+  font-size: 0 !important;
+
   .search-icon {
     cursor: pointer;
     font-size: 18px;
     vertical-align: middle;
   }
-}
 
-.result-wrap {
+  .header-search-select {
-  height: 280px;
+    font-size: 18px;
-  margin: 6px 0;
+    transition: width 0.2s;
+    width: 0;
+    overflow: hidden;
+    background: transparent;
+    border-radius: 0;
+    display: inline-block;
+    vertical-align: middle;
 
-  .search-item {
+    ::v-deep .el-input__inner {
-    display: flex;
+      border-radius: 0;
-    height: 48px;
+      border: 0;
-    align-items: center;
+      padding-left: 0;
-    padding-right: 10px;
+      padding-right: 0;
-
+      box-shadow: none !important;
-    .left {
+      border-bottom: 1px solid #d9d9d9;
-      width: 60px;
+      vertical-align: middle;
-      text-align: center;
-
-      .menu-icon {
-        width: 18px;
-        height: 18px;
     }
   }
 
-    .search-info {
+  &.show {
-      padding-left: 5px;
+    .header-search-select {
-      margin-top: 10px;
+      width: 210px;
-      width: 100%;
+      margin-left: 10px;
-      display: flex;
-      flex-direction: column;
-      justify-content: flex-start;
-      flex: 1;
-
-      .menu-title,
-      .menu-path {
-        height: 20px;
     }
-      .menu-path {
-        color: #ccc;
-        font-size: 10px;
-      }
-    }
-  }
-
-  .search-item:hover {
-    cursor: pointer;
   }
 }
 </style>
-