Skip to content

Commit e240822

Browse files
whiteshaderwhiteshader
committed
release: backend update to v3.6.3
1 parent 15e7128 commit e240822

File tree

39 files changed

+483
-437
lines changed

39 files changed

+483
-437
lines changed

‎pom.xml

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,35 @@
66

77
<groupId>com.ruoyi</groupId>
88
<artifactId>ruoyi</artifactId>
9-
<version>3.6.2</version>
9+
<version>3.6.3</version>
1010

1111
<name>ruoyi</name>
1212
<url>http://www.ruoyi.vip</url>
1313
<description>若依微服务系统</description>
1414

1515
<properties>
16-
<ruoyi.version>3.6.2</ruoyi.version>
16+
<ruoyi.version>3.6.3</ruoyi.version>
1717
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1818
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
1919
<java.version>1.8</java.version>
20-
<spring-boot.version>2.7.7</spring-boot.version>
21-
<spring-cloud.version>2021.0.5</spring-cloud.version>
22-
<spring-cloud-alibaba.version>2021.0.4.0</spring-cloud-alibaba.version>
20+
<spring-boot.version>2.7.13</spring-boot.version>
21+
<spring-cloud.version>2021.0.8</spring-cloud.version>
22+
<spring-cloud-alibaba.version>2021.0.5.0</spring-cloud-alibaba.version>
2323
<spring-boot-admin.version>2.7.10</spring-boot-admin.version>
2424
<swagger.fox.version>3.0.0</swagger.fox.version>
2525
<swagger.core.version>1.6.2</swagger.core.version>
2626
<tobato.version>1.27.2</tobato.version>
2727
<kaptcha.version>2.3.3</kaptcha.version>
28-
<pagehelper.boot.version>1.4.6</pagehelper.boot.version>
28+
<pagehelper.boot.version>1.4.7</pagehelper.boot.version>
2929
<druid.version>1.2.16</druid.version>
3030
<dynamic-ds.version>3.5.2</dynamic-ds.version>
3131
<commons.io.version>2.11.0</commons.io.version>
3232
<velocity.version>2.3</velocity.version>
33-
<fastjson.version>2.0.25</fastjson.version>
33+
<fastjson.version>2.0.34</fastjson.version>
3434
<jjwt.version>0.9.1</jjwt.version>
3535
<minio.version>8.2.2</minio.version>
3636
<poi.version>4.1.2</poi.version>
37-
<transmittable-thread-local.version>2.14.2</transmittable-thread-local.version>
37+
<transmittable-thread-local.version>2.14.3</transmittable-thread-local.version>
3838
</properties>
3939

4040
<!-- 依赖声明 -->

‎ruoyi-api/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.ruoyi</groupId>
66
<artifactId>ruoyi</artifactId>
7-
<version>3.6.2</version>
7+
<version>3.6.3</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.ruoyi</groupId>
77
<artifactId>ruoyi-api</artifactId>
8-
<version>3.6.2</version>
8+
<version>3.6.3</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

‎ruoyi-auth/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.ruoyi</groupId>
66
<artifactId>ruoyi</artifactId>
7-
<version>3.6.2</version>
7+
<version>3.6.3</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

‎ruoyi-auth/src/main/java/com/ruoyi/auth/form/LoginBody.java

+39-39
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
1-
package com.ruoyi.auth.form;
2-
3-
/**
4-
* 用户登录对象
5-
*
6-
* @author ruoyi
7-
*/
8-
public class LoginBody
9-
{
10-
/**
11-
* 用户名
12-
*/
13-
private String username;
14-
15-
/**
16-
* 用户密码
17-
*/
18-
private String password;
19-
20-
public String getUsername()
21-
{
22-
return username;
23-
}
24-
25-
public void setUsername(String username)
26-
{
27-
this.username = username;
28-
}
29-
30-
public String getPassword()
31-
{
32-
return password;
33-
}
34-
35-
public void setPassword(String password)
36-
{
37-
this.password = password;
38-
}
39-
}
1+
package com.ruoyi.auth.form;
2+
3+
/**
4+
* 用户登录对象
5+
*
6+
* @author ruoyi
7+
*/
8+
public class LoginBody
9+
{
10+
/**
11+
* 用户名
12+
*/
13+
private String username;
14+
15+
/**
16+
* 用户密码
17+
*/
18+
private String password;
19+
20+
public String getUsername()
21+
{
22+
return username;
23+
}
24+
25+
public void setUsername(String username)
26+
{
27+
this.username = username;
28+
}
29+
30+
public String getPassword()
31+
{
32+
return password;
33+
}
34+
35+
public void setPassword(String password)
36+
{
37+
this.password = password;
38+
}
39+
}

‎ruoyi-auth/src/main/resources/logback.xml

+73-73
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,74 @@
1-
<?xml version="1.0" encoding="UTF-8"?>
2-
<configuration scan="true" scanPeriod="60 seconds" debug="false">
3-
<!-- 日志存放路径 -->
4-
<property name="log.path" value="logs/ruoyi-auth" />
5-
<!-- 日志输出格式 -->
6-
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
7-
8-
<!-- 控制台输出 -->
9-
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
10-
<encoder>
11-
<pattern>${log.pattern}</pattern>
12-
</encoder>
13-
</appender>
14-
15-
<!-- 系统日志输出 -->
16-
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
17-
<file>${log.path}/info.log</file>
18-
<!-- 循环政策：基于时间创建日志文件 -->
19-
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
20-
<!-- 日志文件名格式 -->
21-
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
22-
<!-- 日志最大的历史 60天 -->
23-
<maxHistory>60</maxHistory>
24-
</rollingPolicy>
25-
<encoder>
26-
<pattern>${log.pattern}</pattern>
27-
</encoder>
28-
<filter class="ch.qos.logback.classic.filter.LevelFilter">
29-
<!-- 过滤的级别 -->
30-
<level>INFO</level>
31-
<!-- 匹配时的操作：接收（记录） -->
32-
<onMatch>ACCEPT</onMatch>
33-
<!-- 不匹配时的操作：拒绝（不记录） -->
34-
<onMismatch>DENY</onMismatch>
35-
</filter>
36-
</appender>
37-
38-
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
39-
<file>${log.path}/error.log</file>
40-
<!-- 循环政策：基于时间创建日志文件 -->
41-
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
42-
<!-- 日志文件名格式 -->
43-
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
44-
<!-- 日志最大的历史 60天 -->
45-
<maxHistory>60</maxHistory>
46-
</rollingPolicy>
47-
<encoder>
48-
<pattern>${log.pattern}</pattern>
49-
</encoder>
50-
<filter class="ch.qos.logback.classic.filter.LevelFilter">
51-
<!-- 过滤的级别 -->
52-
<level>ERROR</level>
53-
<!-- 匹配时的操作：接收（记录） -->
54-
<onMatch>ACCEPT</onMatch>
55-
<!-- 不匹配时的操作：拒绝（不记录） -->
56-
<onMismatch>DENY</onMismatch>
57-
</filter>
58-
</appender>
59-
60-
<!-- 系统模块日志级别控制 -->
61-
<logger name="com.ruoyi" level="info" />
62-
<!-- Spring日志级别控制 -->
63-
<logger name="org.springframework" level="warn" />
64-
65-
<root level="info">
66-
<appender-ref ref="console" />
67-
</root>
68-
69-
<!--系统操作日志-->
70-
<root level="info">
71-
<appender-ref ref="file_info" />
72-
<appender-ref ref="file_error" />
73-
</root>
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<configuration scan="true" scanPeriod="60 seconds" debug="false">
3+
<!-- 日志存放路径 -->
4+
<property name="log.path" value="logs/ruoyi-auth" />
5+
<!-- 日志输出格式 -->
6+
<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
7+
8+
<!-- 控制台输出 -->
9+
<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
10+
<encoder>
11+
<pattern>${log.pattern}</pattern>
12+
</encoder>
13+
</appender>
14+
15+
<!-- 系统日志输出 -->
16+
<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
17+
<file>${log.path}/info.log</file>
18+
<!-- 循环政策：基于时间创建日志文件 -->
19+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
20+
<!-- 日志文件名格式 -->
21+
<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
22+
<!-- 日志最大的历史 60天 -->
23+
<maxHistory>60</maxHistory>
24+
</rollingPolicy>
25+
<encoder>
26+
<pattern>${log.pattern}</pattern>
27+
</encoder>
28+
<filter class="ch.qos.logback.classic.filter.LevelFilter">
29+
<!-- 过滤的级别 -->
30+
<level>INFO</level>
31+
<!-- 匹配时的操作：接收（记录） -->
32+
<onMatch>ACCEPT</onMatch>
33+
<!-- 不匹配时的操作：拒绝（不记录） -->
34+
<onMismatch>DENY</onMismatch>
35+
</filter>
36+
</appender>
37+
38+
<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
39+
<file>${log.path}/error.log</file>
40+
<!-- 循环政策：基于时间创建日志文件 -->
41+
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
42+
<!-- 日志文件名格式 -->
43+
<fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
44+
<!-- 日志最大的历史 60天 -->
45+
<maxHistory>60</maxHistory>
46+
</rollingPolicy>
47+
<encoder>
48+
<pattern>${log.pattern}</pattern>
49+
</encoder>
50+
<filter class="ch.qos.logback.classic.filter.LevelFilter">
51+
<!-- 过滤的级别 -->
52+
<level>ERROR</level>
53+
<!-- 匹配时的操作：接收（记录） -->
54+
<onMatch>ACCEPT</onMatch>
55+
<!-- 不匹配时的操作：拒绝（不记录） -->
56+
<onMismatch>DENY</onMismatch>
57+
</filter>
58+
</appender>
59+
60+
<!-- 系统模块日志级别控制 -->
61+
<logger name="com.ruoyi" level="info" />
62+
<!-- Spring日志级别控制 -->
63+
<logger name="org.springframework" level="warn" />
64+
65+
<root level="info">
66+
<appender-ref ref="console" />
67+
</root>
68+
69+
<!--系统操作日志-->
70+
<root level="info">
71+
<appender-ref ref="file_info" />
72+
<appender-ref ref="file_error" />
73+
</root>
7474
</configuration>

‎ruoyi-common/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>com.ruoyi</groupId>
66
<artifactId>ruoyi</artifactId>
7-
<version>3.6.2</version>
7+
<version>3.6.3</version>
88
</parent>
99
<modelVersion>4.0.0</modelVersion>
1010

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>com.ruoyi</groupId>
77
<artifactId>ruoyi-common</artifactId>
8-
<version>3.6.2</version>
8+
<version>3.6.3</version>
99
</parent>
1010
<modelVersion>4.0.0</modelVersion>
1111

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -54,12 +54,12 @@
5454
public int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
5555

5656
/**
57-
* 导出时在excel中每个列的高度 单位为字符
57+
* 导出时在excel中每个列的高度
5858
*/
5959
public double height() default 14;
6060

6161
/**
62-
* 导出时在excel中每个列的宽 单位为字符
62+
* 导出时在excel中每个列的宽度
6363
*/
6464
public double width() default 16;
6565

@@ -109,7 +109,7 @@
109109
public ColumnType cellType() default ColumnType.STRING;
110110

111111
/**
112-
* 导出列头背景色
112+
* 导出列头背景颜色
113113
*/
114114
public IndexedColors headerBackgroundColor() default IndexedColors.GREY_50_PERCENT;
115115

@@ -119,7 +119,7 @@
119119
public IndexedColors headerColor() default IndexedColors.WHITE;
120120

121121
/**
122-
* 导出单元格背景色
122+
* 导出单元格背景颜色
123123
*/
124124
public IndexedColors backgroundColor() default IndexedColors.WHITE;
125125

‎ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/exception/PreAuthorizeException.java

+15-15
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package com.ruoyi.common.core.exception;
2-
3-
/**
4-
* 权限异常
5-
*
6-
* @author ruoyi
7-
*/
8-
public class PreAuthorizeException extends RuntimeException
9-
{
10-
private static final long serialVersionUID = 1L;
11-
12-
public PreAuthorizeException()
13-
{
14-
}
15-
}
1+
package com.ruoyi.common.core.exception;
2+
3+
/**
4+
* 权限异常
5+
*
6+
* @author ruoyi
7+
*/
8+
public class PreAuthorizeException extends RuntimeException
9+
{
10+
private static final long serialVersionUID = 1L;
11+
12+
public PreAuthorizeException()
13+
{
14+
}
15+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public static Date getServerStartDate()
139139
/**
140140
* 计算时间差
141141
*
142-
* @param endTime 最后时间
142+
* @param endDate 最后时间
143143
* @param startTime 开始时间
144144
* @return 时间差（天/小时/分钟）
145145
*/

0 commit comments

Comments
 (0)