!191 发布 2.2.2 正式版

Merge pull request !191 from 疯狂的狮子Li/dev
dromara · Oct 25, 2024 · 31c1c69 · 31c1c69
2 parents a703385 + daae5a8
commit 31c1c69
Show file tree

Hide file tree

Showing 80 changed files with 721 additions and 370 deletions.
diff --git a/.run/ruoyi-auth.run.xml b/.run/ruoyi-auth.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-auth" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-auth:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-auth:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-auth/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-gateway.run.xml b/.run/ruoyi-gateway.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-gateway" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-gateway:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-gateway:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-gateway/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-gen.run.xml b/.run/ruoyi-gen.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-gen" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-gen:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-gen:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-modules/ruoyi-gen/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-job.run.xml b/.run/ruoyi-job.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-job" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-job:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-job:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-modules/ruoyi-job/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-monitor.run.xml b/.run/ruoyi-monitor.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-monitor" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-monitor:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-visual/ruoyi-monitor/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-nacos.run.xml b/.run/ruoyi-nacos.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-nacos" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-nacos:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-nacos:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-visual/ruoyi-nacos/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-resource.run.xml b/.run/ruoyi-resource.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-resource" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-resource:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-resource:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-modules/ruoyi-resource/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-seata-server.run.xml b/.run/ruoyi-seata-server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-seata-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-seata-server:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-seata-server:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-visual/ruoyi-seata-server/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-sentinel-dashboard.run.xml b/.run/ruoyi-sentinel-dashboard.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-sentinel-dashboard" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-snailjob-server.run.xml b/.run/ruoyi-snailjob-server.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-visual/ruoyi-snailjob-server/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-system.run.xml b/.run/ruoyi-system.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-system" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-system:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-system:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-modules/ruoyi-system/Dockerfile" />
       </settings>

diff --git a/.run/ruoyi-workflow.run.xml b/.run/ruoyi-workflow.run.xml
@@ -2,7 +2,7 @@
   <configuration default="false" name="ruoyi-workflow" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
     <deployment type="dockerfile">
       <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-workflow:2.2.1" />
+        <option name="imageTag" value="ruoyi/ruoyi-workflow:2.2.2" />
         <option name="buildOnly" value="true" />
         <option name="sourceFilePath" value="ruoyi-modules/ruoyi-workflow/Dockerfile" />
       </settings>

diff --git a/README.md b/README.md
@@ -9,7 +9,7 @@
 [![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus/blob/master/LICENSE)
 [![使用IntelliJ IDEA开发维护](https://img.shields.io/badge/IntelliJ%20IDEA-提供支持-blue.svg)](https://www.jetbrains.com/?from=RuoYi-Cloud-Plus)
 <br>
-[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-2.2.1-success.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus)
+[![RuoYi-Cloud-Plus](https://img.shields.io/badge/RuoYi_Cloud_Plus-2.2.2-success.svg)](https://gitee.com/dromara/RuoYi-Cloud-Plus)
 [![Spring Boot](https://img.shields.io/badge/Spring%20Boot-3.1-blue.svg)]()
 [![JDK-17](https://img.shields.io/badge/JDK-17-green.svg)]()
 [![JDK-21](https://img.shields.io/badge/JDK-21-green.svg)]()

diff --git a/config/nacos/application-common.yml b/config/nacos/application-common.yml
@@ -222,6 +222,14 @@ api-decrypt:
   # 对应前端加密公钥 MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ==
   privateKey: MIIBVAIBADANBgkqhkiG9w0BAQEFAASCAT4wggE6AgEAAkEAqhHyZfSsYourNxaY7Nt+PrgrxkiA50efORdI5U5lsW79MmFnusUA355oaSXcLhu5xxB38SMSyP2KvuKNPuH3owIDAQABAkAfoiLyL+Z4lf4Myxk6xUDgLaWGximj20CUf+5BKKnlrK+Ed8gAkM0HqoTt2UZwA5E2MzS4EI2gjfQhz5X28uqxAiEA3wNFxfrCZlSZHb0gn2zDpWowcSxQAgiCstxGUoOqlW8CIQDDOerGKH5OmCJ4Z21v+F25WaHYPxCFMvwxpcw99EcvDQIgIdhDTIqD2jfYjPTY8Jj3EDGPbH2HHuffvflECt3Ek60CIQCFRlCkHpi7hthhYhovyloRYsM+IS9h/0BzlEAuO0ktMQIgSPT3aFAgJYwKpqRYKlLDVcflZFCKY7u3UP8iWi1Qw0Y=
 
+# 防止XSS攻击
+xss:
+  enabled: true
+  excludeUrls:
+    - /system/notice
+    - /workflow/model/save
+    - /workflow/model/editModelXml
+
 # 接口文档配置
 springdoc:
   api-docs:

diff --git a/config/nacos/ruoyi-gateway.yml b/config/nacos/ruoyi-gateway.yml
@@ -1,12 +1,5 @@
 # 安全配置
 security:
-  # 防止XSS攻击
-  xss:
-    enabled: true
-    excludeUrls:
-      - /system/notice
-      - /workflow/model/save
-      - /workflow/model/editModelXml
   # 不校验白名单
   ignore:
     whites:

diff --git a/config/nacos/ruoyi-job.yml b/config/nacos/ruoyi-job.yml
@@ -29,3 +29,5 @@ snail-job:
   namespace: ${spring.profiles.active}
   # 随主应用端口飘逸
   port: 2${server.port}
+  # 客户端ip指定
+  host:
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -29,7 +29,7 @@ services:
     network_mode: "host"
 
   nacos:
-    image: ruoyi/ruoyi-nacos:2.2.1
+    image: ruoyi/ruoyi-nacos:2.2.2
     container_name: nacos
     ports:
       - "8848:8848"
@@ -96,7 +96,7 @@ services:
     network_mode: "host"
 
   seata-server:
-    image: ruoyi/ruoyi-seata-server:2.2.1
+    image: ruoyi/ruoyi-seata-server:2.2.2
     container_name: seata-server
     ports:
       - "7091:7091"
@@ -135,7 +135,7 @@ services:
     network_mode: "host"
 
   sentinel:
-    image: ruoyi/ruoyi-sentinel-dashboard:2.2.1
+    image: ruoyi/ruoyi-sentinel-dashboard:2.2.2
     container_name: sentinel
     environment:
       TZ: Asia/Shanghai
@@ -150,7 +150,7 @@ services:
     network_mode: "host"
 
   ruoyi-monitor:
-    image: ruoyi/ruoyi-monitor:2.2.1
+    image: ruoyi/ruoyi-monitor:2.2.2
     container_name: ruoyi-monitor
     environment:
       # 时区上海
@@ -166,7 +166,7 @@ services:
     network_mode: "host"
 
   ruoyi-snailjob-server:
-    image: ruoyi/ruoyi-snailjob-server:2.2.1
+    image: ruoyi/ruoyi-snailjob-server:2.2.2
     container_name: ruoyi-snailjob-server
     environment:
       # 时区上海
@@ -180,7 +180,7 @@ services:
     network_mode: "host"
 
   ruoyi-gateway:
-    image: ruoyi/ruoyi-gateway:2.2.1
+    image: ruoyi/ruoyi-gateway:2.2.2
     container_name: ruoyi-gateway
     environment:
       # 时区上海
@@ -196,7 +196,7 @@ services:
     network_mode: "host"
 
   ruoyi-auth:
-    image: ruoyi/ruoyi-auth:2.2.1
+    image: ruoyi/ruoyi-auth:2.2.2
     container_name: ruoyi-auth
     environment:
       # 时区上海
@@ -212,7 +212,7 @@ services:
     network_mode: "host"
 
   ruoyi-system:
-    image: ruoyi/ruoyi-system:2.2.1
+    image: ruoyi/ruoyi-system:2.2.2
     container_name: ruoyi-system
     environment:
       # 时区上海
@@ -228,7 +228,7 @@ services:
     network_mode: "host"
 
   ruoyi-gen:
-    image: ruoyi/ruoyi-gen:2.2.1
+    image: ruoyi/ruoyi-gen:2.2.2
     container_name: ruoyi-gen
     environment:
       # 时区上海
@@ -244,7 +244,7 @@ services:
     network_mode: "host"
 
   ruoyi-job:
-    image: ruoyi/ruoyi-job:2.2.1
+    image: ruoyi/ruoyi-job:2.2.2
     container_name: ruoyi-job
     environment:
       # 时区上海
@@ -260,7 +260,7 @@ services:
     network_mode: "host"
 
   ruoyi-resource:
-    image: ruoyi/ruoyi-resource:2.2.1
+    image: ruoyi/ruoyi-resource:2.2.2
     container_name: ruoyi-resource
     environment:
       # 时区上海
@@ -276,7 +276,7 @@ services:
     network_mode: "host"
 
   ruoyi-workflow:
-    image: ruoyi/ruoyi-workflow:2.2.1
+    image: ruoyi/ruoyi-workflow:2.2.2
     container_name: ruoyi-workflow
     environment:
       # 时区上海

diff --git a/pom.xml b/pom.xml
@@ -13,51 +13,49 @@
     <description>RuoYi-Cloud-Plus微服务系统</description>
 
     <properties>
-        <revision>2.2.1</revision>
+        <revision>2.2.2</revision>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>17</java.version>
-        <spring-boot.version>3.2.9</spring-boot.version>
+        <spring-boot.version>3.2.11</spring-boot.version>
         <spring-cloud.version>2023.0.3</spring-cloud.version>
         <spring-boot-admin.version>3.2.3</spring-boot-admin.version>
         <mybatis.version>3.5.16</mybatis.version>
-        <mybatis-plus.version>3.5.7</mybatis-plus.version>
+        <mybatis-plus.version>3.5.8</mybatis-plus.version>
         <p6spy.version>3.9.1</p6spy.version>
         <dynamic-ds.version>4.3.1</dynamic-ds.version>
         <velocity.version>2.3</velocity.version>
         <swagger.core.version>2.2.22</swagger.core.version>
         <springdoc.version>2.6.0</springdoc.version>
         <therapi-javadoc.version>0.15.0</therapi-javadoc.version>
-        <easyexcel.version>4.0.2</easyexcel.version>
+        <easyexcel.version>4.0.3</easyexcel.version>
         <hutool.version>5.8.31</hutool.version>
-        <redisson.version>3.34.1</redisson.version>
+        <redisson.version>3.37.0</redisson.version>
         <lock4j.version>2.2.7</lock4j.version>
         <snailjob.version>1.1.2</snailjob.version>
-        <satoken.version>1.38.0</satoken.version>
+        <satoken.version>1.39.0</satoken.version>
         <lombok.version>1.18.34</lombok.version>
         <logstash.version>7.4</logstash.version>
         <easy-es.version>2.0.0</easy-es.version>
         <elasticsearch.version>7.14.0</elasticsearch.version>
         <skywalking-toolkit.version>9.2.0</skywalking-toolkit.version>
         <bouncycastle.version>1.76</bouncycastle.version>
-        <mapstruct-plus.version>1.4.4</mapstruct-plus.version>
+        <mapstruct-plus.version>1.4.5</mapstruct-plus.version>
         <mapstruct-plus.lombok.version>0.2.0</mapstruct-plus.lombok.version>
         <justauth.version>1.16.6</justauth.version>
         <!-- 离线IP地址定位库 -->
         <ip2region.version>2.7.0</ip2region.version>
-        <undertow.version>2.3.15.Final</undertow.version>
         <!-- 临时修复 fastjson 漏洞 -->
         <fastjson.version>1.2.83</fastjson.version>
 
         <!-- OSS 配置 -->
-        <aws.sdk.version>2.25.15</aws.sdk.version>
-        <aws.crt.version>0.29.13</aws.crt.version>
-        <okhttp.version>4.10.0</okhttp.version>
+        <aws.sdk.version>2.28.22</aws.sdk.version>
+        <aws.crt.version>0.31.3</aws.crt.version>
 
         <!-- SMS 配置 -->
-        <sms4j.version>3.3.2</sms4j.version>
+        <sms4j.version>3.3.3</sms4j.version>
         <!-- 面向运行时的D-ORM依赖 -->
-        <anyline.version>8.7.2-20240808</anyline.version>
+        <anyline.version>8.7.2-20241022</anyline.version>
         <!-- 工作流配置 -->
         <flowable.version>7.0.1</flowable.version>
         <!-- mq配置 -->
@@ -314,12 +312,6 @@
                 <version>${skywalking-toolkit.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>com.squareup.okhttp3</groupId>
-                <artifactId>okhttp</artifactId>
-                <version>${okhttp.version}</version>
-            </dependency>
-
             <!--  AWS SDK for Java 2.x  -->
             <dependency>
                 <groupId>software.amazon.awssdk</groupId>
@@ -353,28 +345,6 @@
                 <version>${ip2region.version}</version>
             </dependency>
 
-            <dependency>
-                <groupId>io.undertow</groupId>
-                <artifactId>undertow-core</artifactId>
-                <version>${undertow.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.undertow</groupId>
-                <artifactId>undertow-servlet</artifactId>
-                <version>${undertow.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>io.undertow</groupId>
-                <artifactId>undertow-websockets-jsr</artifactId>
-                <version>${undertow.version}</version>
-            </dependency>
-
-            <dependency>
-                <artifactId>commons-compress</artifactId>
-                <groupId>org.apache.commons</groupId>
-                <version>1.26.2</version>
-            </dependency>
-
             <dependency>
                 <groupId>com.alibaba</groupId>
                 <artifactId>fastjson</artifactId>

diff --git a/ruoyi-api/ruoyi-api-bom/pom.xml b/ruoyi-api/ruoyi-api-bom/pom.xml
@@ -15,7 +15,7 @@
     </description>
 
     <properties>
-        <revision>2.2.1</revision>
+        <revision>2.2.2</revision>
     </properties>
 
     <dependencyManagement>

diff --git a/...i/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java b/...i/ruoyi-api-resource/src/main/java/org/dromara/resource/api/RemoteMessageServiceStub.java
@@ -25,7 +25,7 @@ public void publishMessage(Long sessionKey, String message) {
         try {
             remoteMessageService.publishMessage(sessionKey, message);
         } catch (Exception e) {
-            log.warn("websocket 功能未开启或服务未找到");
+            log.warn("推送功能未开启或服务未找到");
         }
     }
 
@@ -39,7 +39,7 @@ public void publishAll(String message) {
         try {
             remoteMessageService.publishAll(message);
         } catch (Exception e) {
-            log.warn("websocket 功能未开启或服务未找到");
+            log.warn("推送功能未开启或服务未找到");
         }
     }
 }
diff --git a/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml b/ruoyi-common/ruoyi-common-alibaba-bom/pom.xml
@@ -14,7 +14,7 @@
     </description>
 
     <properties>
-        <revision>2.2.1</revision>
+        <revision>2.2.2</revision>
         <spring-cloud-alibaba.version>2023.0.1.2</spring-cloud-alibaba.version>
         <sentinel.version>1.8.8</sentinel.version>
         <seata.version>1.7.1</seata.version>